@mcp-shark/mcp-shark 1.5.6 → 1.5.8

package/core/libraries/TransportLibrary.js

@@ -0,0 +1,70 @@
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js';
+
+/**
+ * Library for MCP transport creation utilities
+ * Pure utility - no dependencies on services or repositories
+ */
+
+/**
+ * Create transport for MCP server based on config
+ * @param {Object} serverConfig - Server configuration
+ * @param {string} [serverConfig.type] - Transport type (stdio, http, websocket)
+ * @param {string} [serverConfig.url] - Server URL (for http/websocket)
+ * @param {Object} [serverConfig.headers] - HTTP headers
+ * @param {string} [serverConfig.command] - Command for stdio transport
+ * @param {Array} [serverConfig.args] - Command arguments
+ * @param {Object} [serverConfig.env] - Environment variables
+ * @param {string} [serverName] - Server name for error messages
+ * @returns {Object} Transport instance
+ * @throws {Error} If transport cannot be created
+ */
+export function createTransport(serverConfig, serverName = null) {
+  const type = serverConfig.type || (serverConfig.url ? 'http' : 'stdio');
+  const {
+    url,
+    headers: configHeaders = {},
+    command,
+    args = [],
+    env: configEnv = {},
+  } = serverConfig;
+
+  const env = {
+    ...process.env,
+    ...configEnv,
+  };
+
+  const requestInit = { headers: { ...configHeaders } };
+
+  const errorPrefix = serverName ? `Server ${serverName}: ` : '';
+
+  switch (type) {
+    case 'stdio':
+      if (!command) {
+        throw new Error(`${errorPrefix}command is required for stdio transport`);
+      }
+      return new StdioClientTransport({ command, args, env });
+
+    case 'http':
+    case 'sse':
+    case 'streamable-http':
+      if (!url) {
+        throw new Error(`${errorPrefix}url is required for ${type} transport`);
+      }
+      return new StreamableHTTPClientTransport(new URL(url), { requestInit });
+
+    case 'ws':
+    case 'websocket':
+      if (!url) {
+        throw new Error(`${errorPrefix}url is required for websocket transport`);
+      }
+      return new WebSocketClientTransport(new URL(url));
+
+    default:
+      if (command) {
+        return new StdioClientTransport({ command, args, env });
+      }
+      throw new Error(`${errorPrefix}unsupported transport type: ${type}`);
+  }
+}

package/core/libraries/index.js

@@ -4,6 +4,7 @@
  */
 export { SerializationLibrary } from './SerializationLibrary.js';
 export { LoggerLibrary } from './LoggerLibrary.js';
+export { createTransport } from './TransportLibrary.js';
 export { CompositeError, isError, getErrors } from './ErrorLibrary.js';
 export {
   ApplicationError,

package/core/services/McpDiscoveryService.js

@@ -1,5 +1,5 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { createTransport } from '#ui/server/routes/smartscan/transport.js';
+import { createTransport } from '#core/libraries/index.js';
 
 /**
  * Service for MCP server discovery

package/core/services/ServerManagementService.js

@@ -36,13 +36,10 @@ export class ServerManagementService {
 
     // If filePath is provided, restore original config if already patched
     // This ensures processSetup reads the original config, not the patched one
-    let restoreWarning = null;
-    if (filePath && !fileContent) {
-      const restoreResult = this.configPatchingService.restoreIfPatched(filePath);
-      if (restoreResult.warning) {
-        restoreWarning = restoreResult.warning;
-      }
-    }
+    const restoreWarning =
+      filePath && !fileContent
+        ? this.configPatchingService.restoreIfPatched(filePath).warning || null
+        : null;
 
     // Process setup
     const setupResult = this.configService.processSetup(filePath, fileContent, selectedServices);
@@ -80,16 +77,11 @@ export class ServerManagementService {
     });
 
     // Patch the original config file if it exists
-    let patchWarning = null;
-    if (fileData.resolvedFilePath && this.configService.fileExists(fileData.resolvedFilePath)) {
-      const patchResult = this.configPatchingService.patchConfigFile(
-        fileData.resolvedFilePath,
-        updatedConfig
-      );
-      if (patchResult.warning) {
-        patchWarning = patchResult.warning;
-      }
-    }
+    const patchWarning =
+      fileData.resolvedFilePath && this.configService.fileExists(fileData.resolvedFilePath)
+        ? this.configPatchingService.patchConfigFile(fileData.resolvedFilePath, updatedConfig)
+            .warning || null
+        : null;
 
     return {
       success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-shark/mcp-shark",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "Aggregate multiple Model Context Protocol (MCP) servers into a single unified interface with a powerful monitoring UI. Prov deep visibility into every request and response.",
   "type": "module",
   "main": "./bin/mcp-shark.js",

package/ui/server/controllers/ServerManagementController.js

@@ -5,10 +5,11 @@ import { handleError, handleValidationError } from '../utils/errorHandler.js';
  * Controller for server management HTTP endpoints
  */
 export class ServerManagementController {
-  constructor(serverManagementService, logService, logger) {
+  constructor(serverManagementService, logService, logger, configService = null) {
     this.serverManagementService = serverManagementService;
     this.logService = logService;
     this.logger = logger;
+    this.configService = configService;
   }
 
   /**
@@ -76,7 +77,7 @@ export class ServerManagementController {
   stop = async (_req, res) => {
     try {
       const stopped = await this.serverManagementService.stopServer();
-      const restored = this.configService.restoreOriginalConfig();
+      const restored = this.configService ? this.configService.restoreOriginalConfig() : false;
 
       if (stopped) {
         if (restored) {

package/ui/server/routes/composite/index.js

@@ -37,6 +37,7 @@ export function createCompositeRoutes(
   const serverManagementService = container.getService('serverManagement');
   const logService = container.getService('log');
   const logger = container.getLibrary('logger');
+  const configService = container.getService('config');
 
   // Initialize log service with the log array
   logService.initialize(mcpSharkLogs);
@@ -56,7 +57,8 @@ export function createCompositeRoutes(
   const serverManagementController = new ServerManagementController(
     serverManagementService,
     logService,
-    logger
+    logger,
+    configService
   );
 
   // Set cleanup function for shutdown endpoint

package/ui/server/setup.js

@@ -24,7 +24,6 @@ import { createSmartScanRoutes } from './routes/smartscan.js';
 import { createStatisticsRoutes } from './routes/statistics.js';
 import { swaggerSpec } from './swagger/swagger.js';
 import { performCleanup } from './utils/cleanup.js';
-import { restoreConfig } from './utils/config.js';
 import { getMcpSharkProcess, setMcpSharkProcess } from './utils/processState.js';
 import { broadcastLogUpdate, notifyClients } from './websocket/broadcast.js';
 import { handleWebSocketConnection } from './websocket/handler.js';
@@ -110,9 +109,7 @@ export function createUIServer() {
   app.post('/api/config/backup/delete', backupRoutes.deleteBackup);
 
   app.post('/api/composite/setup', compositeRoutes.setup);
-  app.post('/api/composite/stop', (req, res) => {
-    compositeRoutes.stop(req, res, () => restoreConfig(container));
-  });
+  app.post('/api/composite/stop', compositeRoutes.stop);
   app.get('/api/composite/status', compositeRoutes.getStatus);
   app.get('/api/mcp-server/status', compositeRoutes.getMcpServerStatus);
   app.post('/api/composite/shutdown', compositeRoutes.shutdown);

package/ui/server/websocket/handler.js

@@ -9,8 +9,11 @@ import { Server as ServerConstants } from '#core/constants/Server.js';
 export function handleWebSocketConnection(clients, ws, logger) {
   clients.add(ws);
 
+  // Use object to hold timeout ID (allows reassignment while keeping const)
+  const timeoutState = { id: null };
+
   // Set up timeout to close stale connections
-  let timeoutId = setTimeout(() => {
+  timeoutState.id = setTimeout(() => {
     if (ws.readyState === 1) {
       logger?.warn('WebSocket connection timeout, closing');
       ws.close();
@@ -28,8 +31,8 @@ export function handleWebSocketConnection(clients, ws, logger) {
 
   ws.on('pong', () => {
     // Reset timeout on pong
-    clearTimeout(timeoutId);
-    timeoutId = setTimeout(() => {
+    clearTimeout(timeoutState.id);
+    timeoutState.id = setTimeout(() => {
       if (ws.readyState === 1) {
         logger?.warn('WebSocket connection timeout, closing');
         ws.close();
@@ -38,14 +41,14 @@ export function handleWebSocketConnection(clients, ws, logger) {
   });
 
   ws.on('close', () => {
-    clearTimeout(timeoutId);
+    clearTimeout(timeoutState.id);
     clearInterval(heartbeatInterval);
     clients.delete(ws);
   });
 
   ws.on('error', (error) => {
     logger?.error({ error: error.message }, 'WebSocket error');
-    clearTimeout(timeoutId);
+    clearTimeout(timeoutState.id);
     clearInterval(heartbeatInterval);
     clients.delete(ws);
   });

package/ui/server/routes/smartscan/transport.js

@@ -1,53 +0,0 @@
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js';
-
-/**
- * Create transport for MCP server based on config
- */
-export function createTransport(serverConfig, serverName) {
-  const type = serverConfig.type || (serverConfig.url ? 'http' : 'stdio');
-  const {
-    url,
-    headers: configHeaders = {},
-    command,
-    args = [],
-    env: configEnv = {},
-  } = serverConfig;
-
-  const env = {
-    ...process.env,
-    ...configEnv,
-  };
-
-  const requestInit = { headers: { ...configHeaders } };
-
-  switch (type) {
-    case 'stdio':
-      if (!command) {
-        throw new Error(`Server ${serverName}: command is required for stdio transport`);
-      }
-      return new StdioClientTransport({ command, args, env });
-
-    case 'http':
-    case 'sse':
-    case 'streamable-http':
-      if (!url) {
-        throw new Error(`Server ${serverName}: url is required for ${type} transport`);
-      }
-      return new StreamableHTTPClientTransport(new URL(url), { requestInit });
-
-    case 'ws':
-    case 'websocket':
-      if (!url) {
-        throw new Error(`Server ${serverName}: url is required for websocket transport`);
-      }
-      return new WebSocketClientTransport(new URL(url));
-
-    default:
-      if (command) {
-        return new StdioClientTransport({ command, args, env });
-      }
-      throw new Error(`Server ${serverName}: unsupported transport type: ${type}`);
-  }
-}