Expose connection params via Client (#896)

edgedb · Mar 20, 2024 · 78bf38b · 78bf38b
1 parent 3676ed2
commit 78bf38b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/driver/src/baseClient.ts b/packages/driver/src/baseClient.ts
@@ -22,6 +22,7 @@ import {
   ConnectArgumentsParser,
   ConnectConfig,
   NormalizedConnectConfig,
+  ResolvedConnectConfigReadonly,
 } from "./conUtils";
 import * as errors from "./errors";
 import { Cardinality, Executor, OutputFormat, QueryArgs } from "./ifaces";
@@ -367,6 +368,11 @@ export abstract class BaseClientPool {
     );
   }
 
+  async resolveConnectionParams(): Promise<ResolvedConnectConfigReadonly> {
+    const config = await this._getNormalizedConnectConfig();
+    return config.connectionParams;
+  }
+
   async getNewConnection(): Promise<BaseRawConnection> {
     if (this._closing?.done) {
       throw new errors.InterfaceError("The client is closed");
@@ -551,6 +557,10 @@ export class Client implements Executor {
     return this;
   }
 
+  async resolveConnectionParams(): Promise<ResolvedConnectConfigReadonly> {
+    return this.pool.resolveConnectionParams();
+  }
+
   isClosed(): boolean {
     return this.pool.isClosed();
   }

diff --git a/packages/driver/src/conUtils.ts b/packages/driver/src/conUtils.ts
@@ -124,6 +124,13 @@ type ConnectConfigParams =
   | "tlsSecurity"
   | "waitUntilAvailable";
 
+export type ResolvedConnectConfigReadonly = Readonly<
+  Pick<
+    ResolvedConnectConfig,
+    Exclude<keyof ResolvedConnectConfig, `${"_" | "set" | "add"}${string}`>
+  >
+>;
+
 export class ResolvedConnectConfig {
   _host: string | null = null;
   _hostSource: string | null = null;
@@ -155,7 +162,7 @@ export class ResolvedConnectConfig {
   _waitUntilAvailable: number | null = null;
   _waitUntilAvailableSource: string | null = null;
 
-  serverSettings: { [key: string]: string } = {};
+  serverSettings: { readonly [key: string]: string } = {};
 
   constructor() {
     this.setHost = this.setHost.bind(this);