test

EventStore · Feb 3, 2025 · 9bc6e91 · 9bc6e91
1 parent b5055c0
commit 9bc6e91
Show file tree

Hide file tree

Showing 96 changed files with 63 additions and 14,357 deletions.
diff --git a/packages/db-client/src/Client/index.ts b/packages/db-client/src/Client/index.ts
@@ -252,7 +252,6 @@ export class Client {
       }
 
       return new Client(
-        rustClient,
         {
           discover,
           nodePreference: options.nodePreference,
@@ -266,13 +265,13 @@ export class Client {
           connectionName: options.connectionName,
         },
         channelCredentials,
-        options.defaultCredentials
+        options.defaultCredentials,
+        rustClient
       );
     }
 
     if (options.hosts.length > 1) {
       return new Client(
-        rustClient,
         {
           endpoints: options.hosts,
           nodePreference: options.nodePreference,
@@ -286,12 +285,12 @@ export class Client {
           connectionName: options.connectionName,
         },
         channelCredentials,
-        options.defaultCredentials
+        options.defaultCredentials,
+        rustClient
       );
     }
 
     return new Client(
-      rustClient,
       {
         endpoint: options.hosts[0],
         throwOnAppendFailure: options.throwOnAppendFailure,
@@ -301,30 +300,30 @@ export class Client {
         connectionName: options.connectionName,
       },
       channelCredentials,
-      options.defaultCredentials
+      options.defaultCredentials,
+      rustClient,
     );
   }
 
   constructor(
-    rustClient: bridge.RustClient,
     connectionSettings: DNSClusterOptions,
     channelCredentials?: ChannelCredentialOptions,
-    defaultUserCredentials?: Credentials
+    defaultUserCredentials?: Credentials,
+    rustClient?: bridge.RustClient,
   );
   constructor(
-    rustClient: bridge.RustClient,
     connectionSettings: GossipClusterOptions,
     channelCredentials?: ChannelCredentialOptions,
-    defaultUserCredentials?: Credentials
+    defaultUserCredentials?: Credentials,
+    rustClient?: bridge.RustClient,
   );
   constructor(
-    rustClient: bridge.RustClient,
     connectionSettings: SingleNodeOptions,
     channelCredentials?: ChannelCredentialOptions,
-    defaultUserCredentials?: Credentials
+    defaultUserCredentials?: Credentials,
+    rustClient?: bridge.RustClient,
   );
   constructor(
-    rustClient: bridge.RustClient,
     {
       throwOnAppendFailure = true,
       keepAliveInterval = 10_000,
@@ -334,7 +333,8 @@ export class Client {
       ...connectionSettings
     }: ConnectionSettings,
     channelCredentials: ChannelCredentialOptions = { insecure: false },
-    defaultUserCredentials?: Credentials
+    defaultUserCredentials?: Credentials,
+    rustClient?: bridge.RustClient,
   ) {
     if (keepAliveInterval < -1) {
       throw new Error(
@@ -366,7 +366,6 @@ export class Client {
       );
     }
 
-    this.#rustClient = rustClient;
     this.#throwOnAppendFailure = throwOnAppendFailure;
     this.#keepAliveInterval = keepAliveInterval;
     this.#keepAliveTimeout = keepAliveTimeout;
@@ -377,6 +376,24 @@ export class Client {
     this.#connectionName = connectionName;
     this.#http = new HTTP(this, channelCredentials, defaultUserCredentials);
 
+    let newRustClient: bridge.RustClient | undefined = rustClient;
+
+    if (newRustClient === undefined) {
+      if ("endpoint" in connectionSettings) {
+        newRustClient = bridge.createClient((this.#connectionSettings as SingleNodeOptions).endpoint.toString());
+      } else if ("endpoints" in connectionSettings) {
+        newRustClient = bridge.createClient((this.#connectionSettings as GossipClusterOptions).endpoints.reduce<string>(
+          (acc, chunk, i) => `${acc}${chunk}${(this.#connectionSettings as GossipClusterOptions).endpoints[i] ?? ""}`,
+          ""));
+      } else if ("discover" in connectionSettings) {
+        newRustClient = bridge.createClient((this.#connectionSettings as GossipClusterOptions).endpoints.reduce<string>(
+          (acc, chunk, i) => `${acc}${chunk}${(this.#connectionSettings as GossipClusterOptions).endpoints[i] ?? ""}`,
+          ""));
+      }
+    }
+
+    this.#rustClient = newRustClient!;
+
     if (this.#insecure) {
       debug.connection("Using insecure channel");
       this.#channelCredentials = grpcCredentials.createInsecure();

diff --git a/packages/test/src/connection/Channel.test.ts b/packages/test/src/connection/Channel.test.ts
diff --git a/packages/test/src/connection/__snapshots__/keepAlive.test.ts.snap b/packages/test/src/connection/__snapshots__/keepAlive.test.ts.snap
diff --git a/packages/test/src/connection/__snapshots__/parseConnectionString.test.ts.snap b/packages/test/src/connection/__snapshots__/parseConnectionString.test.ts.snap
diff --git a/packages/test/src/connection/__snapshots__/tlsCAFile.test.ts.snap b/packages/test/src/connection/__snapshots__/tlsCAFile.test.ts.snap