cprime-supergateway 3.4.6 → 3.4.8

package/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(grep -r \"spawn\\\\|fork\\\\|exec\\\\|child_process\" --include=*.ts --include=*.js src/)",
+      "Bash(npx tsc:*)"
+    ]
+  }
+}

package/dist/gateways/stdioToSse.js

@@ -41,17 +41,96 @@ export async function stdioToSse(args) {
     logger.info(`  - messagePath: ${messagePath}`);
     logger.info(`  - CORS: ${corsOrigin ? `enabled (${serializeCorsOrigin({ corsOrigin })})` : 'disabled'}`);
     logger.info(`  - Health endpoints: ${healthEndpoints.length ? healthEndpoints.join(', ') : '(none)'}`);
-    onSignals({ logger });
+    let isShuttingDown = false;
+    onSignals({
+        logger,
+        cleanup: () => {
+            isShuttingDown = true;
+            child.kill();
+        },
+    });
+    const sessions = {};
     const child = spawn(stdioCmd, {
         shell: true,
         env: { ...process.env, ...decryptedEnvs },
     });
+    /** Coalesce rapid stderr bursts into one DB log after this idle gap (ms). */
+    const STDERR_LOG_DEBOUNCE_MS = 400;
+    let stderrLogBuffer = '';
+    let stderrLogFlushTimer = null;
+    const flushStderrToLogs = () => {
+        stderrLogFlushTimer = null;
+        if (!stderrLogBuffer)
+            return;
+        const text = stderrLogBuffer;
+        stderrLogBuffer = '';
+        logger.error(`Child stderr: ${text}`);
+        for (const [sid, session] of Object.entries(sessions)) {
+            logService.log(text, 'system', logger, {
+                ...session,
+                sessionId: sid,
+            });
+        }
+    };
+    const scheduleStderrLogFlush = () => {
+        if (stderrLogFlushTimer)
+            clearTimeout(stderrLogFlushTimer);
+        stderrLogFlushTimer = setTimeout(flushStderrToLogs, STDERR_LOG_DEBOUNCE_MS);
+    };
+    const broadcastChildError = (errorParams) => {
+        const notification = {
+            jsonrpc: '2.0',
+            method: 'error',
+            params: errorParams,
+        };
+        for (const [sid, session] of Object.entries(sessions)) {
+            try {
+                session.transport.send(notification);
+            }
+            catch (err) {
+                logger.error(`Failed to send child error to session ${sid}:`, err);
+            }
+        }
+    };
+    const logChildError = async (errorData) => {
+        for (const [sid, session] of Object.entries(sessions)) {
+            await logService.log(errorData, 'system', logger, {
+                ip: session.ip,
+                userId: session.userId,
+                sessionId: sid,
+            });
+        }
+    };
+    child.on('error', (err) => {
+        logger.error(`Child process error: ${err.message}`);
+        const errorData = {
+            type: 'spawn-error',
+            message: err.message,
+            code: err.code ?? null,
+            timestamp: new Date().toISOString(),
+        };
+        broadcastChildError(errorData);
+        logChildError(errorData);
+    });
     child.on('exit', (code, signal) => {
+        if (stderrLogFlushTimer) {
+            clearTimeout(stderrLogFlushTimer);
+            stderrLogFlushTimer = null;
+        }
+        flushStderrToLogs();
         logger.error(`Child exited: code=${code}, signal=${signal}`);
-        process.exit(code ?? 1);
+        if (isShuttingDown || code === 0)
+            return;
+        const errorData = {
+            type: 'exit',
+            exitCode: code,
+            signal: signal ?? null,
+            message: `Child process exited unexpectedly (code=${code}, signal=${signal})`,
+            timestamp: new Date().toISOString(),
+        };
+        broadcastChildError(errorData);
+        logChildError(errorData);
     });
-    const server = new Server({ name: 'supergateway', version: getVersion() }, { capabilities: {} });
-    const sessions = {};
     const app = express();
     if (corsOrigin) {
         app.use(cors({ origin: corsOrigin }));
@@ -76,6 +155,7 @@ export async function stdioToSse(args) {
             res,
             headers,
         });
+        const server = new Server({ name: 'supergateway', version: getVersion() }, { capabilities: {} });
         const sseTransport = new SSEServerTransport(`${baseUrl}${messagePath}`, res);
         await server.connect(sseTransport);
         const sessionId = sseTransport.sessionId;
@@ -93,6 +173,10 @@ export async function stdioToSse(args) {
                 ...sessions[sessionId],
                 sessionId,
             });
+            if (child.killed || child.exitCode !== null) {
+                logger.error(`Cannot forward message to child — process is not running (session ${sessionId})`);
+                return;
+            }
             child.stdin.write(JSON.stringify(msg) + '\n');
         };
         sseTransport.onclose = () => {
@@ -169,12 +253,7 @@ export async function stdioToSse(args) {
         });
     });
     child.stderr.on('data', (chunk) => {
-        logger.error(`Child stderr: ${chunk.toString('utf8')}`);
-        for (const [sid, session] of Object.entries(sessions)) {
-            logService.log(chunk.toString('utf8'), 'system', logger, {
-                ...session,
-                sessionId: sid,
-            });
-        }
+        stderrLogBuffer += chunk.toString('utf8');
+        scheduleStderrLogFlush();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cprime-supergateway",
-  "version": "3.4.6",
+  "version": "3.4.8",
   "description": "Run MCP stdio servers over SSE, Streamable HTTP or visa versa",
   "repository": {
     "type": "git",

package/src/gateways/stdioToSse.ts

@@ -90,22 +90,15 @@ export async function stdioToSse(args: StdioToSseArgs) {
     `  - Health endpoints: ${healthEndpoints.length ? healthEndpoints.join(', ') : '(none)'}`,
   )
 
-  onSignals({ logger })
-
-  const child: ChildProcessWithoutNullStreams = spawn(stdioCmd, {
-    shell: true,
-    env: { ...process.env, ...decryptedEnvs },
-  })
-  child.on('exit', (code, signal) => {
-    logger.error(`Child exited: code=${code}, signal=${signal}`)
-    process.exit(code ?? 1)
+  let isShuttingDown = false
+  onSignals({
+    logger,
+    cleanup: () => {
+      isShuttingDown = true
+      child.kill()
+    },
   })
 
-  const server = new Server(
-    { name: 'supergateway', version: getVersion() },
-    { capabilities: {} },
-  )
-
   const sessions: Record<
     string,
     {
@@ -116,6 +109,92 @@ export async function stdioToSse(args: StdioToSseArgs) {
     }
   > = {}
 
+  const child: ChildProcessWithoutNullStreams = spawn(stdioCmd, {
+    shell: true,
+    env: { ...process.env, ...decryptedEnvs },
+  })
+
+  /** Coalesce rapid stderr bursts into one DB log after this idle gap (ms). */
+  const STDERR_LOG_DEBOUNCE_MS = 400
+  let stderrLogBuffer = ''
+  let stderrLogFlushTimer: ReturnType<typeof setTimeout> | null = null
+
+  const flushStderrToLogs = () => {
+    stderrLogFlushTimer = null
+    if (!stderrLogBuffer) return
+    const text = stderrLogBuffer
+    stderrLogBuffer = ''
+    logger.error(`Child stderr: ${text}`)
+    for (const [sid, session] of Object.entries(sessions)) {
+      logService.log(text, 'system', logger, {
+        ...session,
+        sessionId: sid,
+      })
+    }
+  }
+
+  const scheduleStderrLogFlush = () => {
+    if (stderrLogFlushTimer) clearTimeout(stderrLogFlushTimer)
+    stderrLogFlushTimer = setTimeout(flushStderrToLogs, STDERR_LOG_DEBOUNCE_MS)
+  }
+
+  const broadcastChildError = (errorParams: Record<string, unknown>) => {
+    const notification: JSONRPCMessage = {
+      jsonrpc: '2.0',
+      method: 'error',
+      params: errorParams,
+    }
+    for (const [sid, session] of Object.entries(sessions)) {
+      try {
+        session.transport.send(notification)
+      } catch (err) {
+        logger.error(`Failed to send child error to session ${sid}:`, err)
+      }
+    }
+  }
+
+  const logChildError = async (errorData: Record<string, unknown>) => {
+    for (const [sid, session] of Object.entries(sessions)) {
+      await logService.log(errorData, 'system', logger, {
+        ip: session.ip,
+        userId: session.userId,
+        sessionId: sid,
+      })
+    }
+  }
+
+  child.on('error', (err) => {
+    logger.error(`Child process error: ${err.message}`)
+    const errorData = {
+      type: 'spawn-error',
+      message: err.message,
+      code: (err as NodeJS.ErrnoException).code ?? null,
+      timestamp: new Date().toISOString(),
+    }
+    broadcastChildError(errorData)
+    logChildError(errorData)
+  })
+
+  child.on('exit', (code, signal) => {
+    if (stderrLogFlushTimer) {
+      clearTimeout(stderrLogFlushTimer)
+      stderrLogFlushTimer = null
+    }
+    flushStderrToLogs()
+
+    logger.error(`Child exited: code=${code}, signal=${signal}`)
+    if (isShuttingDown || code === 0) return
+    const errorData = {
+      type: 'exit',
+      exitCode: code,
+      signal: signal ?? null,
+      message: `Child process exited unexpectedly (code=${code}, signal=${signal})`,
+      timestamp: new Date().toISOString(),
+    }
+    broadcastChildError(errorData)
+    logChildError(errorData)
+  })
+
   const app = express()
 
   if (corsOrigin) {
@@ -145,6 +224,10 @@ export async function stdioToSse(args: StdioToSseArgs) {
       headers,
     })
 
+    const server = new Server(
+      { name: 'supergateway', version: getVersion() },
+      { capabilities: {} },
+    )
     const sseTransport = new SSEServerTransport(`${baseUrl}${messagePath}`, res)
     await server.connect(sseTransport)
 
@@ -164,6 +247,12 @@ export async function stdioToSse(args: StdioToSseArgs) {
         ...sessions[sessionId],
         sessionId,
       })
+      if (child.killed || child.exitCode !== null) {
+        logger.error(
+          `Cannot forward message to child — process is not running (session ${sessionId})`,
+        )
+        return
+      }
       child.stdin.write(JSON.stringify(msg) + '\n')
     }
 
@@ -246,12 +335,7 @@ export async function stdioToSse(args: StdioToSseArgs) {
   })
 
   child.stderr.on('data', (chunk: Buffer) => {
-    logger.error(`Child stderr: ${chunk.toString('utf8')}`)
-    for (const [sid, session] of Object.entries(sessions)) {
-      logService.log(chunk.toString('utf8'), 'system', logger, {
-        ...session,
-        sessionId: sid,
-      })
-    }
+    stderrLogBuffer += chunk.toString('utf8')
+    scheduleStderrLogFlush()
   })
 }