@loop_ouroboros/mcp-hub-lite 1.0.2 → 1.1.0

package/dist/server/src/utils/transports/sse-transport.d.ts

@@ -31,9 +31,12 @@ export declare class SseTransport implements Transport {
     private headers;
     private reconnectInterval;
     private maxReconnectAttempts;
+    private proxy?;
     private eventSource;
     private reconnectAttempts;
     private isClosing;
+    private _serverName?;
+    private _compositeKey?;
     onmessage?: (message: JSONRPCMessage) => void;
     onerror?: (error: Error) => void;
     onclose?: () => void;
@@ -44,8 +47,20 @@ export declare class SseTransport implements Transport {
      * @param headers - Optional HTTP headers to include in the SSE connection request
      * @param reconnectInterval - Time interval (in milliseconds) between reconnection attempts (default: 3000ms)
      * @param maxReconnectAttempts - Maximum number of reconnection attempts before giving up (default: 5)
+     * @param proxy - Optional proxy configuration
+     * @param serverName - Optional server name for logging
+     * @param compositeKey - Optional composite key (serverName-serverIndex) for logging
      */
-    constructor(url: string, headers?: Record<string, string>, reconnectInterval?: number, maxReconnectAttempts?: number);
+    constructor(url: string, headers?: Record<string, string>, reconnectInterval?: number, maxReconnectAttempts?: number, proxy?: {
+        url: string;
+    } | undefined, serverName?: string, compositeKey?: string);
+    /**
+     * Helper method to format log messages with server context.
+     *
+     * @param message - The base message
+     * @returns Formatted message with server context if available
+     */
+    private formatLogMessage;
     /**
      * Initializes and starts the SSE connection to the specified URL.
      *

package/dist/server/src/utils/transports/sse-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sse-transport.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/sse-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAM1E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,YAAa,YAAW,SAAS;IAkB1C,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,oBAAoB;IApB9B,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,SAAS,CAAS;IAEnB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B;;;;;;;OAOG;gBAEO,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACpC,iBAAiB,GAAE,MAAa,EAChC,oBAAoB,GAAE,MAAU;IAG1C;;;;;;;;;OASG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA0D5B;;;;;;;;OAQG;YACW,OAAO;IAOrB;;;;;;;OAOG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;;;OAQG;YACW,aAAa;IAQ3B;;;;;;;;;;;;OAYG;IACG,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBnD"}
+{"version":3,"file":"sse-transport.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/sse-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAQ1E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,YAAa,YAAW,SAAS;IAuB1C,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,KAAK,CAAC;IA1BhB,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAC,CAAS;IAExB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B;;;;;;;;;;OAUG;gBAEO,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACpC,iBAAiB,GAAE,MAAa,EAChC,oBAAoB,GAAE,MAAU,EAChC,KAAK,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,YAAA,EAC/B,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM;IAMvB;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;;;;;;;OASG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyG5B;;;;;;;;OAQG;YACW,OAAO;IAOrB;;;;;;;OAOG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;;;OAQG;YACW,aAAa;IAQ3B;;;;;;;;;;;;OAYG;IACG,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBnD"}

package/dist/server/src/utils/transports/sse-transport.js

@@ -1,4 +1,6 @@
 import { logger } from '../logger.js';
+import { LOG_MODULES } from '../logger/log-modules.js';
+import { ProxyAgent, fetch as undiciFetch } from 'undici';
 // Use EventSource from the 'eventsource' package for Node.js compatibility
 import { EventSource } from 'eventsource';
 /**
@@ -32,9 +34,12 @@ export class SseTransport {
     headers;
     reconnectInterval;
     maxReconnectAttempts;
+    proxy;
     eventSource = null;
     reconnectAttempts = 0;
     isClosing = false;
+    _serverName;
+    _compositeKey;
     onmessage;
     onerror;
     onclose;
@@ -45,12 +50,35 @@ export class SseTransport {
      * @param headers - Optional HTTP headers to include in the SSE connection request
      * @param reconnectInterval - Time interval (in milliseconds) between reconnection attempts (default: 3000ms)
      * @param maxReconnectAttempts - Maximum number of reconnection attempts before giving up (default: 5)
+     * @param proxy - Optional proxy configuration
+     * @param serverName - Optional server name for logging
+     * @param compositeKey - Optional composite key (serverName-serverIndex) for logging
      */
-    constructor(url, headers = {}, reconnectInterval = 3000, maxReconnectAttempts = 5) {
+    constructor(url, headers = {}, reconnectInterval = 3000, maxReconnectAttempts = 5, proxy, serverName, compositeKey) {
         this.url = url;
         this.headers = headers;
         this.reconnectInterval = reconnectInterval;
         this.maxReconnectAttempts = maxReconnectAttempts;
+        this.proxy = proxy;
+        this._serverName = serverName;
+        this._compositeKey = compositeKey;
+    }
+    /**
+     * Helper method to format log messages with server context.
+     *
+     * @param message - The base message
+     * @returns Formatted message with server context if available
+     */
+    formatLogMessage(message) {
+        if (this._compositeKey) {
+            return `${message} (compositeKey=${this._compositeKey}, url=${this.url})`;
+        }
+        else if (this._serverName) {
+            return `${message} (server=${this._serverName}, url=${this.url})`;
+        }
+        else {
+            return `${message} (url=${this.url})`;
+        }
     }
     /**
      * Initializes and starts the SSE connection to the specified URL.
@@ -75,6 +103,24 @@ export class SseTransport {
             if (Object.keys(this.headers).length > 0) {
                 options.headers = this.headers;
             }
+            const proxyInfo = this.proxy?.url ? `, proxy=${this.proxy.url}` : '';
+            logger.info(this.formatLogMessage(`Attempting to connect to SSE server${proxyInfo}`), LOG_MODULES.SSE_TRANSPORT);
+            // Add proxy support if configured
+            if (this.proxy?.url) {
+                const agent = new ProxyAgent(this.proxy.url);
+                // Create custom fetch function with proxy
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const customFetch = (input, init) => {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const fetchOptions = {
+                        ...init,
+                        dispatcher: agent
+                    };
+                    return undiciFetch(input, fetchOptions);
+                };
+                options.fetch = customFetch;
+                logger.info(this.formatLogMessage(`SSE transport configured with proxy: ${this.proxy.url}`), LOG_MODULES.SSE_TRANSPORT);
+            }
             this.eventSource = new EventSource(this.url, options);
             this.eventSource.onmessage = (event) => {
                 try {
@@ -83,34 +129,34 @@ export class SseTransport {
                     this.reconnectAttempts = 0; // Reset on successful message
                 }
                 catch (error) {
-                    logger.error('Failed to parse SSE message:', error);
+                    logger.error(this.formatLogMessage('Failed to parse SSE message'), error, LOG_MODULES.SSE_TRANSPORT);
                     this.onerror?.(new Error(`Invalid JSON in SSE message: ${event.data}`));
                 }
             };
             this.eventSource.onerror = () => {
                 const error = new Error(`SSE connection error for ${this.url}`);
-                logger.error('SSE connection error:', error);
+                logger.error(this.formatLogMessage('SSE connection error'), error, LOG_MODULES.SSE_TRANSPORT);
                 if (!this.isClosing) {
                     this.reconnectAttempts++;
                     if (this.reconnectAttempts <= this.maxReconnectAttempts) {
-                        logger.info(`Attempting to reconnect SSE (${this.reconnectAttempts}/${this.maxReconnectAttempts})...`);
+                        logger.info(this.formatLogMessage(`Attempting to reconnect SSE (${this.reconnectAttempts}/${this.maxReconnectAttempts})...`), LOG_MODULES.SSE_TRANSPORT);
                         setTimeout(() => {
                             this.restart();
                         }, this.reconnectInterval);
                     }
                     else {
-                        logger.error('Max reconnection attempts reached for SSE');
+                        logger.error(this.formatLogMessage('Max reconnection attempts reached for SSE'), LOG_MODULES.SSE_TRANSPORT);
                         this.onerror?.(error);
                         this.closeInternal();
                     }
                 }
             };
             this.eventSource.onopen = () => {
-                logger.info(`SSE connection opened to ${this.url}`);
+                logger.info(this.formatLogMessage('SSE connection opened'), LOG_MODULES.SSE_TRANSPORT);
             };
         }
         catch (error) {
-            logger.error('Failed to create SSE connection:', error);
+            logger.error(this.formatLogMessage('Failed to create SSE connection'), error, LOG_MODULES.SSE_TRANSPORT);
             throw error;
         }
     }
@@ -180,10 +226,10 @@ export class SseTransport {
         // Type-safe way to access message properties
         const messageId = 'id' in message ? String(message.id) : 'unknown';
         const method = 'method' in message ? String(message.method) : 'unknown';
-        logger.warn('Attempted to send message via SSE transport', {
+        logger.warn(this.formatLogMessage('Attempted to send message via SSE transport'), {
             messageId,
             method
-        });
+        }, LOG_MODULES.SSE_TRANSPORT);
         throw error;
     }
 }

package/dist/server/src/utils/transports/stdio-transport.d.ts

@@ -1,21 +1,16 @@
-import { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
+import { StdioServerParameters } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
 import type { LogStorageService } from '../../services/log-storage.service.js';
-export interface StdioServerParameters {
-    command: string;
-    args?: string[];
-    env?: NodeJS.ProcessEnv;
-    stderr?: 'inherit' | 'pipe' | 'ignore';
-    cwd?: string;
-}
+import { PassThrough } from 'stream';
 export interface StdioTransportOptions {
-    serverId?: string;
+    compositeKey?: string;
     logStorage?: LogStorageService;
 }
 /**
  * A transport implementation for communicating with MCP (Model Context Protocol) servers
- * via standard input/output streams. This transport spawns a child process and establishes
- * bidirectional communication using stdin/stdout for JSON-RPC message exchange.
+ * via standard input/output streams. This transport wraps the official SDK's StdioClientTransport
+ * and provides consistent logging and integration with the MCP Hub Lite system.
  *
  * The StdioTransport handles:
  * - Cross-platform process spawning (including Windows batch file compatibility)
@@ -30,19 +25,11 @@ export interface StdioTransportOptions {
  * @implements {Transport}
  */
 export declare class StdioTransport implements Transport {
-    private _process?;
-    private _readBuffer;
-    private _stderrStream;
-    private _serverParams;
+    private _transport;
     private _serverName?;
-    private _serverId?;
+    private _compositeKey?;
     private _logStorage?;
-    /**
-     * Gets the process ID of the spawned child process.
-     *
-     * @returns {number | undefined} The PID of the child process, or undefined if not started
-     */
-    get pid(): number | undefined;
+    private _stderrStream;
     onclose?: () => void;
     onerror?: (error: Error) => void;
     onmessage?: (message: JSONRPCMessage) => void;
@@ -59,11 +46,11 @@ export declare class StdioTransport implements Transport {
     /**
      * Starts the transport by spawning the child process and establishing communication channels.
      *
-     * This method handles platform-specific considerations:
-     * - On Windows, it automatically wraps batch commands (like npx, npm, etc.) with cmd.exe /c
-     * - Sets up proper stdio configuration based on the server parameters
-     * - Configures event listeners for process lifecycle events
-     * - Establishes data flow for stdout and stderr handling
+     * This method delegates to the SDK's StdioClientTransport.start() method which handles:
+     * - Platform-specific process spawning (including Windows batch file compatibility)
+     * - Proper stdio configuration
+     * - Event listeners for process lifecycle events
+     * - Data flow for stdout and stderr handling
      *
      * @returns {Promise<void>} Resolves when the child process is successfully spawned
      * @throws {Error} If the transport is already started
@@ -72,36 +59,23 @@ export declare class StdioTransport implements Transport {
     /**
      * Gets the stderr stream for the child process.
      *
-     * Returns a PassThrough stream if stderr is configured as 'pipe', otherwise returns
-     * the actual stderr stream from the child process, or null if no stderr is available.
+     * Returns our PassThrough stream that captures stderr data.
      *
-     * @returns {PassThrough | NodeJS.ReadableStream | null} The stderr stream or null
+     * @returns {PassThrough | null} The stderr stream or null
      */
-    get stderr(): import("node:stream").Readable | null;
+    get stderr(): PassThrough | null;
     /**
-     * Processes the internal read buffer to extract and dispatch JSON-RPC messages.
-     *
-     * This method continuously reads complete JSON-RPC messages from the buffer
-     * and dispatches them to the onmessage callback. It handles partial messages
-     * by leaving incomplete data in the buffer for future processing.
-     *
-     * The method uses a while loop to process all available complete messages
-     * in a single call, ensuring efficient message handling without blocking.
+     * Gets the process ID of the spawned child process.
      *
-     * @private
+     * @returns {number | undefined} The PID of the child process, or undefined if not started
      */
-    processReadBuffer(): void;
+    get pid(): number | undefined;
     /**
      * Closes the transport by gracefully terminating the child process.
      *
-     * This method implements a graceful shutdown sequence:
-     * 1. Sends SIGTERM to allow the child process to clean up
-     * 2. Waits up to 5 seconds for graceful termination
-     * 3. Forces termination with SIGKILL if the process doesn't exit
-     * 4. Cleans up internal state and resolves the promise
-     *
-     * The method ensures proper cleanup of the read buffer and handles
-     * any errors that occur during the shutdown process.
+     * This method delegates to the SDK's StdioClientTransport.close() method which handles:
+     * - Graceful shutdown sequence with SIGTERM/SIGKILL
+     * - Proper cleanup of internal state
      *
      * @returns {Promise<void>} Resolves when the transport is fully closed
      */
@@ -109,13 +83,10 @@ export declare class StdioTransport implements Transport {
     /**
      * Sends a JSON-RPC message to the child process via stdin.
      *
-     * This method serializes the message to JSON, appends a newline character,
-     * and writes it to the child process's stdin stream. It validates that
-     * the transport is connected before attempting to send the message.
+     * This method delegates to the SDK's StdioClientTransport.send() method.
      *
      * @param {JSONRPCMessage} message - The JSON-RPC message to send
      * @returns {Promise<void>} Resolves when the message is written to stdin
-     * @throws {Error} If the transport is not connected (no active child process)
      */
     send(message: JSONRPCMessage): Promise<void>;
 }

package/dist/server/src/utils/transports/stdio-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio-transport.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/stdio-transport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAgC1E,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,CAAe;IAChC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAoB;IAExC;;;;OAIG;IACH,IAAW,GAAG,IAAI,MAAM,GAAG,SAAS,CAEnC;IAEM,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEzC;;;;;;OAMG;gBACS,MAAM,EAAE,qBAAqB,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAU/F;;;;;;;;;;;OAWG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmJ5B;;;;;;;OAOG;IACH,IAAI,MAAM,0CAET;IAED;;;;;;;;;;;OAWG;IACH,iBAAiB;IAcjB;;;;;;;;;;;;;OAaG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA0C5B;;;;;;;;;;OAUG;IACG,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}
+{"version":3,"file":"stdio-transport.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/stdio-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACtB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAC,CAAoB;IACxC,OAAO,CAAC,aAAa,CAA4B;IAE1C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEzC;;;;;;OAMG;gBACS,MAAM,EAAE,qBAAqB,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAiB/F;;;;;;;;;;;OAWG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C5B;;;;;;OAMG;IACH,IAAI,MAAM,uBAET;IAED;;;;OAIG;IACH,IAAW,GAAG,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;;OAQG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAGnD"}