@aiwerk/mcp-bridge 1.1.6 → 1.1.8

package/dist/src/index.d.ts

@@ -7,7 +7,7 @@ export type { RouterToolHint, RouterServerStatus, RouterDispatchResponse, Router
 export { convertJsonSchemaToTypeBox, createToolParameters, setTypeBoxLoader, setSchemaLogger } from "./schema-convert.js";
 export { initializeProtocol, fetchToolsList, PACKAGE_VERSION } from "./protocol.js";
 export { loadConfig, parseEnvFile, initConfigDir, getConfigDir } from "./config.js";
-export type { Logger, McpServerConfig, McpClientConfig, McpTool, McpRequest, McpCallRequest, McpResponse, McpTransport, McpServerConnection, BridgeConfig, } from "./types.js";
+export type { Logger, McpServerConfig, McpClientConfig, McpTool, McpRequest, McpCallRequest, McpResponse, JsonRpcMessage, McpTransport, McpServerConnection, BridgeConfig, } from "./types.js";
 export { nextRequestId } from "./types.js";
 export { pickRegisteredToolName } from "./tool-naming.js";
 export { StandaloneServer } from "./standalone-server.js";

package/dist/src/standalone-server.d.ts

@@ -22,8 +22,10 @@ export declare class StandaloneServer {
     private handleInitialize;
     private handleToolsList;
     private handleToolsCall;
+    private discoveryPromise?;
     /** Connect to all backend servers and discover their tools (direct mode). */
     private discoverDirectTools;
+    private _doDiscovery;
     private createTransport;
     /** Graceful shutdown: disconnect all backend servers. */
     shutdown(): Promise<void>;

package/dist/src/standalone-server.js

@@ -89,9 +89,17 @@ export class StandaloneServer {
         switch (request.method) {
             case "initialize":
                 return this.handleInitialize(id);
+            case "notifications/initialized":
+                return { jsonrpc: "2.0", id, result: {} };
             case "tools/list":
+                if (!this.initialized) {
+                    return { jsonrpc: "2.0", id, error: { code: -32002, message: "Server not initialized. Call 'initialize' first." } };
+                }
                 return this.handleToolsList(id);
             case "tools/call":
+                if (!this.initialized) {
+                    return { jsonrpc: "2.0", id, error: { code: -32002, message: "Server not initialized. Call 'initialize' first." } };
+                }
                 return this.handleToolsCall(id, request.params);
             case "ping":
                 return { jsonrpc: "2.0", id, result: {} };
@@ -245,10 +253,28 @@ export class StandaloneServer {
             };
         }
     }
+    discoveryPromise;
     /** Connect to all backend servers and discover their tools (direct mode). */
     async discoverDirectTools(force = false) {
         if (this.directTools.length > 0 && !force)
             return; // Already discovered
+        if (this.discoveryPromise && !force) {
+            await this.discoveryPromise;
+            return;
+        }
+        const promise = this._doDiscovery(force);
+        this.discoveryPromise = promise;
+        try {
+            await promise;
+        }
+        finally {
+            // Only clear if we're still the active promise (a force call may have replaced us)
+            if (this.discoveryPromise === promise) {
+                this.discoveryPromise = undefined;
+            }
+        }
+    }
+    async _doDiscovery(force) {
         if (force) {
             this.directTools = [];
             for (const [, conn] of this.directConnections) {

package/dist/src/transport-base.d.ts

@@ -1,4 +1,4 @@
-import { McpTransport, McpRequest, McpResponse, McpServerConfig, McpClientConfig, Logger } from "./types.js";
+import { McpTransport, McpRequest, McpResponse, McpServerConfig, McpClientConfig, Logger, JsonRpcMessage } from "./types.js";
 export type PendingRequest = {
     resolve: (value: McpResponse) => void;
     reject: (reason: Error) => void;
@@ -35,7 +35,7 @@ export declare abstract class BaseTransport implements McpTransport {
      * - Other notifications -> debug log
      * - Responses with id -> resolve/reject matching pending request
      */
-    protected handleMessage(message: any): void;
+    protected handleMessage(message: JsonRpcMessage): void;
     /** Reject and clear all pending requests with the given reason. */
     protected rejectAllPending(reason: string): void;
     /**

package/dist/src/transport-base.js

@@ -44,15 +44,18 @@ export class BaseTransport {
             this.logger.debug(`[mcp-bridge] Unhandled ${this.transportName} notification: ${message.method}`);
             return;
         }
-        if (hasId && this.pendingRequests.has(message.id)) {
-            const pending = this.pendingRequests.get(message.id);
-            clearTimeout(pending.timeout);
-            this.pendingRequests.delete(message.id);
-            if (message.error) {
-                pending.reject(new Error(message.error.message || "MCP error"));
-            }
-            else {
-                pending.resolve(message);
+        if (hasId) {
+            const id = message.id;
+            if (this.pendingRequests.has(id)) {
+                const pending = this.pendingRequests.get(id);
+                clearTimeout(pending.timeout);
+                this.pendingRequests.delete(id);
+                if (message.error) {
+                    pending.reject(new Error(message.error.message || "MCP error"));
+                }
+                else {
+                    pending.resolve({ jsonrpc: "2.0", id, result: message.result });
+                }
             }
         }
     }

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

@@ -57,17 +57,34 @@ export class StreamableHttpTransport extends BaseTransport {
                     let jsonResponse;
                     if (contentType.includes("text/event-stream")) {
                         const text = await response.text();
-                        const dataLines = text.split('\n')
-                            .filter((line) => line.startsWith('data:'))
-                            .map((line) => line.substring(5).trim());
-                        if (dataLines.length === 0) {
-                            throw new Error("No data lines in SSE response");
-                        }
-                        for (const dl of dataLines) {
+                        const lines = text.split('\n');
+                        // SSE event boundary parsing: collect data lines, dispatch on empty line
+                        let dataBuffer = [];
+                        const dispatch = () => {
+                            if (dataBuffer.length === 0)
+                                return;
+                            const data = dataBuffer.join("\n");
+                            dataBuffer = [];
                             try {
-                                this.handleMessage(JSON.parse(dl));
+                                this.handleMessage(JSON.parse(data));
+                            }
+                            catch { /* skip malformed events */ }
+                        };
+                        let hasData = false;
+                        for (const line of lines) {
+                            const trimmed = line.trim();
+                            if (trimmed.startsWith("data:")) {
+                                dataBuffer.push(trimmed.substring(5).trimStart());
+                                hasData = true;
                             }
-                            catch { /* skip malformed lines */ }
+                            else if (trimmed === "" && dataBuffer.length > 0) {
+                                dispatch();
+                            }
+                        }
+                        // Dispatch any trailing data (server may omit final empty line)
+                        dispatch();
+                        if (!hasData) {
+                            throw new Error("No data lines in SSE response");
                         }
                     }
                     else {

package/dist/src/types.d.ts

@@ -30,6 +30,18 @@ export interface McpTool {
     description: string;
     inputSchema: any;
 }
+/** Incoming JSON-RPC message (response or notification). */
+export interface JsonRpcMessage {
+    jsonrpc: "2.0";
+    id?: number | null;
+    method?: string;
+    result?: any;
+    error?: {
+        code: number;
+        message: string;
+        data?: unknown;
+    };
+}
 /** MCP JSON-RPC request. id is required for requests (omit only for notifications). */
 export interface McpRequest {
     jsonrpc: "2.0";

package/dist/src/update-checker.js

@@ -1,4 +1,4 @@
-import { execSync, exec as execCb, execFile } from "child_process";
+import { execFileSync, execFile } from "child_process";
 import { PACKAGE_VERSION } from "./protocol.js";
 const PACKAGE_NAME = "@aiwerk/mcp-bridge";
 let cachedUpdateInfo = null;
@@ -66,7 +66,8 @@ export async function runUpdate(logger) {
     }
     logger.info(`[mcp-bridge] Running update: ${info.updateCommand}`);
     try {
-        const output = await execAsync(info.updateCommand, 60_000);
+        const parts = info.updateCommand.split(/\s+/);
+        const output = await execFileAsync(parts[0], parts.slice(1), 60_000);
         // Invalidate cache so next check re-fetches
         cachedUpdateInfo = null;
         noticeDelivered = false;
@@ -100,16 +101,16 @@ function npmViewVersion(_logger) {
 }
 function npmViewVersionSync(_logger) {
     try {
-        return execSync(`npm view ${PACKAGE_NAME} version`, { encoding: "utf-8", timeout: 10_000 }).trim();
+        return execFileSync("npm", ["view", PACKAGE_NAME, "version"], { encoding: "utf-8", timeout: 10_000 }).trim();
     }
     catch {
         return "unknown";
     }
 }
-function execAsync(cmd, timeoutMs) {
+function execFileAsync(file, args, timeoutMs) {
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(() => reject(new Error(`Command timed out after ${timeoutMs}ms`)), timeoutMs);
-        execCb(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout, stderr) => {
+        execFile(file, args, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout, stderr) => {
             clearTimeout(timeout);
             if (err)
                 return reject(new Error(`${err.message}\n${stderr ?? ""}`));

package/package.json

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