@aiwerk/mcp-bridge 1.8.0 → 2.0.0

package/dist/src/transport-streamable-http.js

@@ -1,15 +1,17 @@
 import { nextRequestId } from "./types.js";
-import { BaseTransport, resolveEnvRecord, warnIfNonTlsRemoteUrl } from "./transport-base.js";
+import { BaseTransport, resolveServerHeaders, warnIfNonTlsRemoteUrl } from "./transport-base.js";
 export class StreamableHttpTransport extends BaseTransport {
     sessionId;
+    resolvedHeaders = null;
+    pendingRequestControllers = new Map();
     get transportName() { return "streamable-http"; }
     async connect() {
         if (!this.config.url) {
             throw new Error("Streamable HTTP transport requires URL");
         }
         warnIfNonTlsRemoteUrl(this.config.url, this.logger);
-        // Validate that all header env vars resolve (fail fast)
-        resolveEnvRecord(this.config.headers || {}, "header");
+        // Validate that all header/auth env vars resolve (fail fast)
+        this.resolvedHeaders = resolveServerHeaders(this.config);
         await this.probeServer();
         this.connected = true;
         this.backoffDelay = this.clientConfig.reconnectIntervalMs || 30000;
@@ -23,25 +25,32 @@ export class StreamableHttpTransport extends BaseTransport {
         const requestWithId = { ...request, id };
         return new Promise((resolve, reject) => {
             const requestTimeout = this.clientConfig.requestTimeoutMs || 60000;
+            const abortController = new AbortController();
             const timeout = setTimeout(() => {
+                abortController.abort();
+                this.pendingRequestControllers.delete(id);
                 this.pendingRequests.delete(id);
                 reject(new Error(`Request timeout after ${requestTimeout}ms`));
             }, requestTimeout);
             this.pendingRequests.set(id, { resolve, reject, timeout });
-            const headers = resolveEnvRecord({
+            this.pendingRequestControllers.set(id, abortController);
+            const base = this.resolvedHeaders ?? resolveServerHeaders(this.config);
+            const headers = {
+                ...base,
                 "Accept": "application/json, text/event-stream",
-                ...this.config.headers,
                 "Content-Type": "application/json"
-            }, "header");
+            };
             if (this.sessionId) {
                 headers["mcp-session-id"] = this.sessionId;
             }
             fetch(this.config.url, {
                 method: "POST",
                 headers,
-                body: JSON.stringify(requestWithId)
+                body: JSON.stringify(requestWithId),
+                signal: abortController.signal
             })
                 .then(async (response) => {
+                this.pendingRequestControllers.delete(id);
                 const responseSessionId = response.headers.get("mcp-session-id");
                 if (responseSessionId) {
                     this.sessionId = responseSessionId;
@@ -98,6 +107,7 @@ export class StreamableHttpTransport extends BaseTransport {
                 }
             })
                 .catch(error => {
+                this.pendingRequestControllers.delete(id);
                 clearTimeout(timeout);
                 this.pendingRequests.delete(id);
                 if (error.name === 'TypeError' && error.message.includes('fetch')) {
@@ -112,11 +122,12 @@ export class StreamableHttpTransport extends BaseTransport {
         if (!this.connected || !this.config.url) {
             throw new Error("Streamable HTTP transport not connected");
         }
-        const headers = resolveEnvRecord({
+        const base = this.resolvedHeaders ?? resolveServerHeaders(this.config);
+        const headers = {
+            ...base,
             "Accept": "application/json, text/event-stream",
-            ...this.config.headers,
             "Content-Type": "application/json"
-        }, "header");
+        };
         if (this.sessionId) {
             headers["mcp-session-id"] = this.sessionId;
         }
@@ -146,10 +157,10 @@ export class StreamableHttpTransport extends BaseTransport {
         if (!this.config.url)
             return;
         try {
-            const optionsResponse = await fetch(this.config.url, { method: "OPTIONS" });
+            const headers = this.resolvedHeaders ?? resolveServerHeaders(this.config);
+            const optionsResponse = await fetch(this.config.url, { method: "OPTIONS", headers });
             if (optionsResponse.ok)
                 return;
-            const headers = resolveEnvRecord(this.config.headers || {}, "header");
             const headResponse = await fetch(this.config.url, { method: "HEAD", headers });
             if (!headResponse.ok) {
                 this.logger.warn(`[mcp-bridge] Streamable HTTP server probe: OPTIONS ${optionsResponse.status}, HEAD ${headResponse.status} (non-blocking, connection continues)`);
@@ -162,11 +173,15 @@ export class StreamableHttpTransport extends BaseTransport {
     async disconnect() {
         this.connected = false;
         this.cleanupReconnectTimer();
+        for (const [, controller] of this.pendingRequestControllers) {
+            controller.abort();
+        }
+        this.pendingRequestControllers.clear();
         // Send DELETE request if we have a session to clean up
         if (this.sessionId && this.config.url) {
             try {
-                const headers = resolveEnvRecord(this.config.headers || {}, "header");
-                headers["mcp-session-id"] = this.sessionId;
+                const base = this.resolvedHeaders ?? resolveServerHeaders(this.config);
+                const headers = { ...base, "mcp-session-id": this.sessionId };
                 await fetch(this.config.url, {
                     method: "DELETE",
                     headers
@@ -180,4 +195,7 @@ export class StreamableHttpTransport extends BaseTransport {
         }
         this.rejectAllPending("Connection closed");
     }
+    async shutdown() {
+        await this.disconnect();
+    }
 }

package/dist/src/types.d.ts

@@ -4,12 +4,26 @@ export interface Logger {
     error: (...args: unknown[]) => void;
     debug: (...args: unknown[]) => void;
 }
+export type HttpAuthConfig = {
+    type: "bearer";
+    token: string;
+} | {
+    type: "header";
+    headers: Record<string, string>;
+};
+export interface RetryConfig {
+    maxAttempts?: number;
+    delayMs?: number;
+    backoffMultiplier?: number;
+    retryOn?: Array<"timeout" | "connection_error">;
+}
 export interface McpServerConfig {
     transport: "sse" | "stdio" | "streamable-http";
     /** Human-readable description for router tool description generation */
     description?: string;
     url?: string;
     headers?: Record<string, string>;
+    auth?: HttpAuthConfig;
     command?: string;
     args?: string[];
     env?: Record<string, string>;
@@ -20,6 +34,7 @@ export interface McpServerConfig {
         allow?: string[];
     };
     maxResultChars?: number;
+    retry?: RetryConfig;
 }
 export interface McpClientConfig {
     servers: Record<string, McpServerConfig>;
@@ -28,8 +43,10 @@ export interface McpClientConfig {
     reconnectIntervalMs?: number;
     connectionTimeoutMs?: number;
     requestTimeoutMs?: number;
+    shutdownTimeoutMs?: number;
     routerIdleTimeoutMs?: number;
     routerMaxConcurrent?: number;
+    maxBatchSize?: number;
     schemaCompression?: {
         enabled?: boolean;
         maxDescriptionLength?: number;
@@ -48,6 +65,13 @@ export interface McpClientConfig {
         minCalls?: number;
         decayMs?: number;
     };
+    retry?: RetryConfig;
+    resultCache?: {
+        enabled?: boolean;
+        maxEntries?: number;
+        defaultTtlMs?: number;
+        cacheTtl?: Record<string, number>;
+    };
 }
 export interface McpTool {
     name: string;
@@ -91,6 +115,7 @@ export interface McpResponse {
 export interface McpTransport {
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    shutdown?(timeoutMs?: number): Promise<void>;
     sendRequest(request: McpRequest): Promise<McpResponse>;
     sendNotification(notification: any): Promise<void>;
     isConnected(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwerk/mcp-bridge",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "description": "Standalone MCP server that multiplexes multiple MCP servers into one interface",
   "type": "module",
   "main": "./dist/src/index.js",