@mcp-shark/mcp-shark 1.5.5 → 1.5.7

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.5",
+  "version": "1.5.7",
   "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) {
@@ -109,6 +110,26 @@ export class ServerManagementController {
     }
   };
 
+  /**
+   * GET /api/mcp-server/status
+   * Check if the MCP server (gateway) is running
+   * This endpoint specifically indicates whether the MCP gateway server is active
+   * so users can know if they should focus on the traffic page
+   */
+  getMcpServerStatus = (_req, res) => {
+    try {
+      const status = this.serverManagementService.getServerStatus();
+      res.json({
+        running: status.running,
+        message: status.running
+          ? 'MCP server (gateway) is running and ready to receive traffic'
+          : 'MCP server (gateway) is not running. Start the server to begin capturing traffic.',
+      });
+    } catch (error) {
+      handleError(error, res, this.logger, 'Error getting MCP server status');
+    }
+  };
+
   shutdown = async (_req, res) => {
     try {
       if (!this.cleanup) {

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
@@ -69,6 +71,7 @@ export function createCompositeRoutes(
   router.setup = serverManagementController.setup;
   router.stop = serverManagementController.stop;
   router.getStatus = serverManagementController.getStatus;
+  router.getMcpServerStatus = serverManagementController.getMcpServerStatus;
   router.shutdown = serverManagementController.shutdown;
   router.getServers = getServers(container);
 

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,10 +109,9 @@ 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);
   app.get('/api/composite/servers', compositeRoutes.getServers);
 

package/ui/server/swagger/paths/serverManagement.js

@@ -112,6 +112,42 @@ export const serverManagementPaths = {
       },
     },
   },
+  '/api/mcp-server/status': {
+    get: {
+      tags: ['Server Management'],
+      summary: 'Check MCP server (gateway) status',
+      description:
+        'Check if the MCP server (gateway) is running. This endpoint specifically indicates whether the MCP gateway server is active, so users can know if they should focus on the traffic page.',
+      responses: {
+        200: {
+          description: 'MCP server status',
+          content: {
+            'application/json': {
+              schema: {
+                type: 'object',
+                properties: {
+                  running: {
+                    type: 'boolean',
+                    description: 'Whether the MCP server (gateway) is running',
+                    example: true,
+                  },
+                  message: {
+                    type: 'string',
+                    description: 'Human-readable status message',
+                    example: 'MCP server (gateway) is running and ready to receive traffic',
+                  },
+                },
+                required: ['running', 'message'],
+              },
+            },
+          },
+        },
+        500: {
+          description: 'Internal server error',
+        },
+      },
+    },
+  },
   '/api/composite/shutdown': {
     post: {
       tags: ['Server Management'],

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);
   });