cprime-supergateway 3.4.4 → 3.4.6

package/dist/gateways/stdioToSse.js

@@ -10,15 +10,21 @@ import { serializeCorsOrigin } from '../lib/serializeCorsOrigin.js';
 import { EncryptionService } from '../services/encryptionService.js';
 import { initMongoClient } from '../lib/initMongoClient.js';
 import { McpServerLogRepository } from '../lib/mcpServerLogRepository.js';
+import { LogService } from '../services/logService.js';
 const encryptionService = new EncryptionService('env');
-const plaintext = await encryptionService.decryptText(process.env.ENCRYPTED_ENV ?? '', process.env.AAD_JSON ? JSON.parse(process.env.AAD_JSON) : {});
+const mongoClient = initMongoClient();
+const mcpServerLogRepository = new McpServerLogRepository(mongoClient, process.env.MONGO_DB ?? 'localhost', process.env.LOGS_COLLECTION ?? 'mcp_server_logs');
+const logService = new LogService(mcpServerLogRepository);
 let decryptedEnvs = {};
-try {
-    const asObj = JSON.parse(plaintext);
-    decryptedEnvs = asObj;
-}
-catch {
-    console.error('Failed to parse decrypted envs', plaintext);
+if (process.env.ENCRYPTED_ENV) {
+    const plaintext = await encryptionService.decryptText(process.env.ENCRYPTED_ENV, process.env.AAD_JSON ? JSON.parse(process.env.AAD_JSON) : {});
+    try {
+        const asObj = JSON.parse(plaintext);
+        decryptedEnvs = asObj;
+    }
+    catch {
+        console.error('Failed to parse decrypted envs', plaintext);
+    }
 }
 const setResponseHeaders = ({ res, headers, }) => Object.entries(headers).forEach(([key, value]) => {
     res.setHeader(key, value);
@@ -36,8 +42,6 @@ export async function stdioToSse(args) {
     logger.info(`  - CORS: ${corsOrigin ? `enabled (${serializeCorsOrigin({ corsOrigin })})` : 'disabled'}`);
     logger.info(`  - Health endpoints: ${healthEndpoints.length ? healthEndpoints.join(', ') : '(none)'}`);
     onSignals({ logger });
-    const mongoClient = initMongoClient();
-    const mcpServerLogRepository = new McpServerLogRepository(mongoClient, process.env.MONGO_DB ?? 'localhost', process.env.LOGS_COLLECTION ?? 'mcp_server_logs');
     const child = spawn(stdioCmd, {
         shell: true,
         env: { ...process.env, ...decryptedEnvs },
@@ -85,18 +89,9 @@ export async function stdioToSse(args) {
         }
         sseTransport.onmessage = (msg) => {
             logger.info(`SSE → Child (session ${sessionId}): ${JSON.stringify(msg)}`);
-            mcpServerLogRepository
-                .insert({
-                ip: req.ip ?? '',
-                userId: req.query.userId ?? '',
+            logService.log(msg, 'request-rpc', logger, {
+                ...sessions[sessionId],
                 sessionId,
-                type: 'rpc',
-                data: msg,
-                createdAt: new Date(),
-                updatedAt: new Date(),
-            })
-                .catch((err) => {
-                logger.error(`Failed to insert log:`, JSON.stringify(err));
             });
             child.stdin.write(JSON.stringify(msg) + '\n');
         };
@@ -151,18 +146,9 @@ export async function stdioToSse(args) {
                 for (const [sid, session] of Object.entries(sessions)) {
                     try {
                         session.transport.send(jsonMsg);
-                        mcpServerLogRepository
-                            .insert({
-                            ip: session.ip,
-                            userId: session.userId,
+                        logService.log(jsonMsg, 'response-rpc', logger, {
+                            ...session,
                             sessionId: sid,
-                            type: 'system',
-                            data: line,
-                            createdAt: new Date(),
-                            updatedAt: new Date(),
-                        })
-                            .catch((err) => {
-                            logger.error(`Failed to insert log:`, JSON.stringify(err));
                         });
                     }
                     catch (err) {
@@ -173,10 +159,22 @@ export async function stdioToSse(args) {
             }
             catch {
                 logger.error(`Child non-JSON: ${line}`);
+                for (const [sid, session] of Object.entries(sessions)) {
+                    logService.log(line.toString(), 'system', logger, {
+                        ...session,
+                        sessionId: sid,
+                    });
+                }
             }
         });
     });
     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,
+            });
+        }
     });
 }

package/dist/services/logService.js

@@ -0,0 +1,24 @@
+export class LogService {
+    repository;
+    constructor(repository) {
+        this.repository = repository;
+    }
+    async log(data, type, logger, session) {
+        const logDto = {
+            ip: session.ip,
+            userId: session.userId,
+            sessionId: session.sessionId,
+            type: type,
+            data: data,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+        };
+        // Insert to MongoDB with error handling
+        try {
+            await this.repository.insert(logDto);
+        }
+        catch (err) {
+            logger.error(`Failed to insert log:`, JSON.stringify(err));
+        }
+    }
+}

package/package.json

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

package/src/gateways/stdioToSse.ts

@@ -12,6 +12,7 @@ import { serializeCorsOrigin } from '../lib/serializeCorsOrigin.js'
 import { EncryptionService } from '../services/encryptionService.js'
 import { initMongoClient } from '../lib/initMongoClient.js'
 import { McpServerLogRepository } from '../lib/mcpServerLogRepository.js'
+import { ILogService, LogService } from '../services/logService.js'
 
 export interface StdioToSseArgs {
   stdioCmd: string
@@ -26,16 +27,25 @@ export interface StdioToSseArgs {
 }
 
 const encryptionService = new EncryptionService('env')
-const plaintext = await encryptionService.decryptText(
-  process.env.ENCRYPTED_ENV ?? '',
-  process.env.AAD_JSON ? JSON.parse(process.env.AAD_JSON) : {},
+const mongoClient = initMongoClient()
+const mcpServerLogRepository = new McpServerLogRepository(
+  mongoClient,
+  process.env.MONGO_DB ?? 'localhost',
+  process.env.LOGS_COLLECTION ?? 'mcp_server_logs',
 )
+const logService: ILogService = new LogService(mcpServerLogRepository)
 let decryptedEnvs = {}
-try {
-  const asObj = JSON.parse(plaintext)
-  decryptedEnvs = asObj
-} catch {
-  console.error('Failed to parse decrypted envs', plaintext)
+if (process.env.ENCRYPTED_ENV) {
+  const plaintext = await encryptionService.decryptText(
+    process.env.ENCRYPTED_ENV,
+    process.env.AAD_JSON ? JSON.parse(process.env.AAD_JSON) : {},
+  )
+  try {
+    const asObj = JSON.parse(plaintext)
+    decryptedEnvs = asObj
+  } catch {
+    console.error('Failed to parse decrypted envs', plaintext)
+  }
 }
 
 const setResponseHeaders = ({
@@ -82,13 +92,6 @@ export async function stdioToSse(args: StdioToSseArgs) {
 
   onSignals({ logger })
 
-  const mongoClient = initMongoClient()
-  const mcpServerLogRepository = new McpServerLogRepository(
-    mongoClient,
-    process.env.MONGO_DB ?? 'localhost',
-    process.env.LOGS_COLLECTION ?? 'mcp_server_logs',
-  )
-
   const child: ChildProcessWithoutNullStreams = spawn(stdioCmd, {
     shell: true,
     env: { ...process.env, ...decryptedEnvs },
@@ -157,19 +160,10 @@ export async function stdioToSse(args: StdioToSseArgs) {
 
     sseTransport.onmessage = (msg: JSONRPCMessage) => {
       logger.info(`SSE → Child (session ${sessionId}): ${JSON.stringify(msg)}`)
-      mcpServerLogRepository
-        .insert({
-          ip: req.ip ?? '',
-          userId: (req.query.userId as string) ?? '',
-          sessionId,
-          type: 'rpc',
-          data: msg,
-          createdAt: new Date(),
-          updatedAt: new Date(),
-        })
-        .catch((err) => {
-          logger.error(`Failed to insert log:`, JSON.stringify(err))
-        })
+      logService.log(msg, 'request-rpc', logger, {
+        ...sessions[sessionId],
+        sessionId,
+      })
       child.stdin.write(JSON.stringify(msg) + '\n')
     }
 
@@ -230,19 +224,10 @@ export async function stdioToSse(args: StdioToSseArgs) {
         for (const [sid, session] of Object.entries(sessions)) {
           try {
             session.transport.send(jsonMsg)
-            mcpServerLogRepository
-              .insert({
-                ip: session.ip,
-                userId: session.userId,
-                sessionId: sid,
-                type: 'system',
-                data: line,
-                createdAt: new Date(),
-                updatedAt: new Date(),
-              })
-              .catch((err) => {
-                logger.error(`Failed to insert log:`, JSON.stringify(err))
-              })
+            logService.log(jsonMsg, 'response-rpc', logger, {
+              ...session,
+              sessionId: sid,
+            })
           } catch (err) {
             logger.error(`Failed to send to session ${sid}:`, err)
             delete sessions[sid]
@@ -250,11 +235,23 @@ export async function stdioToSse(args: StdioToSseArgs) {
         }
       } catch {
         logger.error(`Child non-JSON: ${line}`)
+        for (const [sid, session] of Object.entries(sessions)) {
+          logService.log(line.toString(), 'system', logger, {
+            ...session,
+            sessionId: sid,
+          })
+        }
       }
     })
   })
 
   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,
+      })
+    }
   })
 }

package/src/lib/mcpServerLogRepository.ts

@@ -39,7 +39,7 @@ export class McpServerLogRepository {
 
 export type McpServerLogDto = {
   ip: string
-  type: 'rpc' | 'error' | 'system'
+  type: 'request-rpc' | 'response-rpc' | 'system'
   userId: string
   sessionId: string
   data: JSONRPCMessage | string

package/src/services/logService.ts

@@ -0,0 +1,43 @@
+import { Logger } from '../types.js'
+import {
+  McpServerLogRepository,
+  type McpServerLogDto,
+} from '../lib/mcpServerLogRepository.js'
+import { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js'
+
+export interface ILogService {
+  log(
+    data: string | object,
+    type: string,
+    logger: Logger,
+    session: { ip: string; userId: string; sessionId: string },
+  ): Promise<void>
+}
+
+export class LogService implements ILogService {
+  constructor(private readonly repository: McpServerLogRepository) {}
+
+  async log(
+    data: string | object,
+    type: string,
+    logger: Logger,
+    session: { ip: string; userId: string; sessionId: string },
+  ): Promise<void> {
+    const logDto: McpServerLogDto = {
+      ip: session.ip,
+      userId: session.userId,
+      sessionId: session.sessionId,
+      type: type as McpServerLogDto['type'],
+      data: data as JSONRPCMessage | string,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    }
+
+    // Insert to MongoDB with error handling
+    try {
+      await this.repository.insert(logDto)
+    } catch (err) {
+      logger.error(`Failed to insert log:`, JSON.stringify(err))
+    }
+  }
+}