chore: awaitable connection manager factory

Author: himanshusinghs

src/lib.ts

@@ -1,7 +1,17 @@
 export { Server, type ServerOptions } from "./server.js";
-export { Telemetry } from "./telemetry/telemetry.js";
 export { Session, type SessionOptions } from "./common/session.js";
-export { type UserConfig, defaultUserConfig } from "./common/config.js";
-export { StreamableHttpRunner } from "./transports/streamableHttp.js";
+export { defaultUserConfig, type UserConfig } from "./common/config.js";
 export { LoggerBase, CompositeLogger, type LogPayload, type LoggerType, type LogLevel } from "./common/logger.js";
-export * from "./common/connectionManager.js";
+export { StreamableHttpRunner } from "./transports/streamableHttp.js";
+export { type CreateConnectionManagerFn } from "./transports/base.js";
+export {
+    ConnectionManager,
+    type MCPConnectParams,
+    type AnyConnectionState,
+    type ConnectionState,
+    type ConnectionStateConnected,
+    type ConnectionStateConnecting,
+    type ConnectionStateDisconnected,
+    type ConnectionStateErrored,
+} from "./common/connectionManager.js";
+export { Telemetry } from "./telemetry/telemetry.js";

src/transports/base.ts

@@ -13,7 +13,7 @@ import { DeviceId } from "../helpers/deviceId.js";
 export type CreateConnectionManagerFn<ConnectParams extends MCPConnectParams> = (createParams: {
     logger: CompositeLogger;
     deviceId: DeviceId;
-}) => ConnectionManager<ConnectParams>;
+}) => ConnectionManager<ConnectParams> | Promise<ConnectionManager<ConnectParams>>;
 
 export abstract class TransportRunnerBase<ConnectParams extends MCPConnectParams> {
     public logger: LoggerBase;
@@ -43,7 +43,7 @@ export abstract class TransportRunnerBase<ConnectParams extends MCPConnectParams
         this.deviceId = DeviceId.create(this.logger);
     }
 
-    protected setupServer(): Server {
+    protected async setupServer(): Promise<Server> {
         const mcpServer = new McpServer({
             name: packageInfo.mcpServerName,
             version: packageInfo.version,
@@ -56,7 +56,7 @@ export abstract class TransportRunnerBase<ConnectParams extends MCPConnectParams
 
         const logger = new CompositeLogger(...loggers);
         const exportsManager = ExportsManager.init(this.userConfig, logger);
-        const connectionManager = this.createConnectionManager({ logger, deviceId: this.deviceId });
+        const connectionManager = await this.createConnectionManager({ logger, deviceId: this.deviceId });
 
         const session = new Session({
             apiBaseUrl: this.userConfig.apiBaseUrl,

src/transports/stdio.ts

@@ -56,7 +56,7 @@ export class StdioRunner<ConnectParams extends MCPConnectParams> extends Transpo
 
     async start(): Promise<void> {
         try {
-            this.server = this.setupServer();
+            this.server = await this.setupServer();
 
             const transport = createStdioTransport();
 

src/transports/streamableHttp.ts

@@ -108,7 +108,7 @@ export class StreamableHttpRunner<ConnectParams extends MCPConnectParams> extend
                     return;
                 }
 
-                const server = this.setupServer();
+                const server = await this.setupServer();
                 let keepAliveLoop: NodeJS.Timeout;
                 const transport = new StreamableHTTPServerTransport({
                     sessionIdGenerator: (): string => randomUUID().toString(),

tests/integration/build.test.ts

@@ -41,16 +41,17 @@ describe("Build Test", () => {
         const esmKeys = Object.keys(esmModule).sort();
 
         expect(cjsKeys).toEqual(esmKeys);
-        expect(cjsKeys).toContainEqual([
-            "CompositeLogger",
-            "ConnectionManager",
-            "LoggerBase",
-            "Server",
-            "Session",
-            "StreamableHttpRunner",
-            "Telemetry",
-            "defaultUserConfig",
-            "LoggerBase",
-        ]);
+        expect(cjsKeys).toEqual(
+            expect.arrayContaining([
+                "CompositeLogger",
+                "ConnectionManager",
+                "LoggerBase",
+                "Server",
+                "Session",
+                "StreamableHttpRunner",
+                "Telemetry",
+                "defaultUserConfig",
+            ])
+        );
     });
 });