@mcp-shark/mcp-shark 1.4.2 → 1.5.0

package/ui/src/utils/requestPairing.js

@@ -0,0 +1,89 @@
+import { getJsonRpcMethod } from './requestUtils.js';
+
+export function pairRequestsWithResponses(requests) {
+  const pairs = [];
+  const processed = new Set();
+
+  // Helper function to check if two requests match (same session, JSON-RPC method, and optionally jsonrpc_id)
+  const matches = (req, resp) => {
+    // Session ID must match (or both null for initiation)
+    const sessionMatch = req.session_id === resp.session_id;
+    if (!sessionMatch) {
+      return false;
+    }
+
+    // JSON-RPC Method must match
+    const reqMethod = getJsonRpcMethod(req);
+    const respMethod = getJsonRpcMethod(resp);
+
+    // Both must have a method, and they must match
+    if (!reqMethod || !respMethod) {
+      // If either doesn't have a method, we can't match by method
+      // Fall back to JSON-RPC ID matching only
+      if (req.jsonrpc_id && resp.jsonrpc_id) {
+        return req.jsonrpc_id === resp.jsonrpc_id;
+      }
+      // If no method and no ID, we can't match reliably
+      return false;
+    }
+
+    const methodMatch = reqMethod === respMethod;
+    if (!methodMatch) {
+      return false;
+    }
+
+    // If JSON-RPC ID exists, it must match (for more precise pairing)
+    if (req.jsonrpc_id && resp.jsonrpc_id) {
+      return req.jsonrpc_id === resp.jsonrpc_id;
+    }
+
+    // If no JSON-RPC ID, match by session and method only
+    return true;
+  };
+
+  requests.forEach((request) => {
+    if (processed.has(request.frame_number)) {
+      return;
+    }
+
+    if (request.direction === 'request') {
+      // Find matching response - must match session, endpoint, and optionally jsonrpc_id
+      const response = requests.find(
+        (r) =>
+          r.direction === 'response' &&
+          !processed.has(r.frame_number) &&
+          matches(request, r) &&
+          r.frame_number > request.frame_number
+      );
+
+      if (response) {
+        pairs.push({ request, response, frame_number: request.frame_number });
+        processed.add(request.frame_number);
+        processed.add(response.frame_number);
+      } else {
+        // Request without response
+        pairs.push({ request, response: null, frame_number: request.frame_number });
+        processed.add(request.frame_number);
+      }
+    } else if (request.direction === 'response') {
+      // Find matching request - must match session, endpoint, and optionally jsonrpc_id
+      const matchingRequest = requests.find(
+        (r) =>
+          r.direction === 'request' &&
+          !processed.has(r.frame_number) &&
+          matches(r, request) &&
+          r.frame_number < request.frame_number
+      );
+
+      if (!matchingRequest) {
+        // Response without request (orphaned)
+        pairs.push({ request: null, response: request, frame_number: request.frame_number });
+        processed.add(request.frame_number);
+      }
+      // If matching request exists, it will be handled when we iterate over it
+    }
+  });
+
+  // Sort by frame number (descending - latest first)
+  return pairs.sort((a, b) => b.frame_number - a.frame_number);
+}

package/ui/src/utils/requestUtils.js

@@ -4,11 +4,11 @@ export function extractServerName(request) {
     try {
       const body =
         typeof request.body_json === 'string' ? JSON.parse(request.body_json) : request.body_json;
-      if (body.params && body.params.name) {
+      if (body.params?.name) {
         const fullName = body.params.name;
         return fullName.includes('.') ? fullName.split('.')[0] : fullName;
       }
-    } catch (e) {
+    } catch (_e) {
       // Failed to parse JSON, try body_raw
     }
   }
@@ -17,11 +17,11 @@ export function extractServerName(request) {
     try {
       const body =
         typeof request.body_raw === 'string' ? JSON.parse(request.body_raw) : request.body_raw;
-      if (body.params && body.params.name) {
+      if (body.params?.name) {
         const fullName = body.params.name;
         return fullName.includes('.') ? fullName.split('.')[0] : fullName;
       }
-    } catch (e) {
+    } catch (_e) {
       // Failed to parse
     }
   }
@@ -34,13 +34,17 @@ export function extractServerName(request) {
 }
 
 export function formatRelativeTime(timestampISO, firstTime) {
-  if (!firstTime) return '0.000000';
+  if (!firstTime) {
+    return '0.000000';
+  }
   const diff = new Date(timestampISO) - new Date(firstTime);
   return (diff / 1000).toFixed(6);
 }
 
 export function formatDateTime(timestampISO) {
-  if (!timestampISO) return '-';
+  if (!timestampISO) {
+    return '-';
+  }
   try {
     const date = new Date(timestampISO);
     return date.toLocaleString('en-US', {
@@ -52,7 +56,7 @@ export function formatDateTime(timestampISO) {
       second: '2-digit',
       hour12: false,
     });
-  } catch (e) {
+  } catch (_e) {
     return timestampISO;
   }
 }
@@ -79,7 +83,7 @@ export function getEndpoint(request) {
         if (body && typeof body === 'object' && body.method) {
           return body.method;
         }
-      } catch (e) {
+      } catch (_e) {
         // Failed to parse JSON, try body_raw
       }
     }
@@ -90,7 +94,7 @@ export function getEndpoint(request) {
         if (body && typeof body === 'object' && body.method) {
           return body.method;
         }
-      } catch (e) {
+      } catch (_e) {
         // Failed to parse
       }
     }
@@ -101,7 +105,7 @@ export function getEndpoint(request) {
       try {
         const url = new URL(request.url);
         return url.pathname + (url.search || '');
-      } catch (e) {
+      } catch (_e) {
         const url = request.url;
         const match = url.match(/^https?:\/\/[^\/]+(\/.*)$/);
         return match ? match[1] : url;
@@ -127,15 +131,19 @@ export function getInfo(request) {
       // If we have both HTTP method and endpoint, show both
       if (httpMethod && url) {
         return `${httpMethod} ${endpoint}`;
-      } else if (httpMethod) {
+      }
+      if (httpMethod) {
         return `${httpMethod} ${endpoint}`;
       }
       return endpoint;
-    } else if (httpMethod && url) {
+    }
+    if (httpMethod && url) {
       return `${httpMethod} ${url}`;
-    } else if (httpMethod) {
+    }
+    if (httpMethod) {
       return httpMethod;
-    } else if (url) {
+    }
+    if (url) {
       return url;
     }
     return 'Request';
@@ -149,9 +157,11 @@ export function getInfo(request) {
 
   if (status && rpcMethod) {
     return `${status} ${rpcMethod}`;
-  } else if (status) {
+  }
+  if (status) {
     return `Status: ${status}`;
-  } else if (rpcMethod) {
+  }
+  if (rpcMethod) {
     return rpcMethod;
   }
   return 'Response';
@@ -185,7 +195,7 @@ export function getJsonRpcMethod(req) {
         if (body && typeof body === 'object' && body.method) {
           return body.method;
         }
-      } catch (e) {
+      } catch (_e) {
         // Failed to parse
       }
     }
@@ -195,7 +205,7 @@ export function getJsonRpcMethod(req) {
         if (body && typeof body === 'object' && body.method) {
           return body.method;
         }
-      } catch (e) {
+      } catch (_e) {
         // Failed to parse
       }
     }
@@ -204,10 +214,10 @@ export function getJsonRpcMethod(req) {
   // For responses, try to extract from body if available
   if (req.direction === 'response' && req.body_json) {
     try {
-      const body = typeof req.body_json === 'string' ? JSON.parse(req.body_json) : req.body_json;
+      const _body = typeof req.body_json === 'string' ? JSON.parse(req.body_json) : req.body_json;
       // Responses don't have a method field, but we can check if it's an error response
       // For now, we'll rely on jsonrpc_method field
-    } catch (e) {
+    } catch (_e) {
       // Failed to parse
     }
   }
@@ -215,84 +225,5 @@ export function getJsonRpcMethod(req) {
   return null;
 }
 
-export function pairRequestsWithResponses(requests) {
-  const pairs = [];
-  const processed = new Set();
-
-  // Helper function to check if two requests match (same session, JSON-RPC method, and optionally jsonrpc_id)
-  const matches = (req, resp) => {
-    // Session ID must match (or both null for initiation)
-    const sessionMatch = req.session_id === resp.session_id;
-    if (!sessionMatch) return false;
-
-    // JSON-RPC Method must match
-    const reqMethod = getJsonRpcMethod(req);
-    const respMethod = getJsonRpcMethod(resp);
-
-    // Both must have a method, and they must match
-    if (!reqMethod || !respMethod) {
-      // If either doesn't have a method, we can't match by method
-      // Fall back to JSON-RPC ID matching only
-      if (req.jsonrpc_id && resp.jsonrpc_id) {
-        return req.jsonrpc_id === resp.jsonrpc_id;
-      }
-      // If no method and no ID, we can't match reliably
-      return false;
-    }
-
-    const methodMatch = reqMethod === respMethod;
-    if (!methodMatch) return false;
-
-    // If JSON-RPC ID exists, it must match (for more precise pairing)
-    if (req.jsonrpc_id && resp.jsonrpc_id) {
-      return req.jsonrpc_id === resp.jsonrpc_id;
-    }
-
-    // If no JSON-RPC ID, match by session and method only
-    return true;
-  };
-
-  requests.forEach((request) => {
-    if (processed.has(request.frame_number)) return;
-
-    if (request.direction === 'request') {
-      // Find matching response - must match session, endpoint, and optionally jsonrpc_id
-      const response = requests.find(
-        (r) =>
-          r.direction === 'response' &&
-          !processed.has(r.frame_number) &&
-          matches(request, r) &&
-          r.frame_number > request.frame_number
-      );
-
-      if (response) {
-        pairs.push({ request, response, frame_number: request.frame_number });
-        processed.add(request.frame_number);
-        processed.add(response.frame_number);
-      } else {
-        // Request without response
-        pairs.push({ request, response: null, frame_number: request.frame_number });
-        processed.add(request.frame_number);
-      }
-    } else if (request.direction === 'response') {
-      // Find matching request - must match session, endpoint, and optionally jsonrpc_id
-      const matchingRequest = requests.find(
-        (r) =>
-          r.direction === 'request' &&
-          !processed.has(r.frame_number) &&
-          matches(r, request) &&
-          r.frame_number < request.frame_number
-      );
-
-      if (!matchingRequest) {
-        // Response without request (orphaned)
-        pairs.push({ request: null, response: request, frame_number: request.frame_number });
-        processed.add(request.frame_number);
-      }
-      // If matching request exists, it will be handled when we iterate over it
-    }
-  });
-
-  // Sort by frame number (descending - latest first)
-  return pairs.sort((a, b) => b.frame_number - a.frame_number);
-}
+// Re-export pairRequestsWithResponses from requestPairing.js
+export { pairRequestsWithResponses } from './requestPairing.js';

package/ui/vite.config.js

@@ -1,5 +1,5 @@
-import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
 
 export default defineConfig({
   plugins: [react()],

package/mcp-server/.editorconfig

@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{js,jsx,ts,tsx,json,css,md}]
-indent_style = space
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false
-

package/mcp-server/.prettierignore

@@ -1,11 +0,0 @@
-node_modules
-dist
-build
-coverage
-*.min.js
-.git
-.husky
-package-lock.json
-yarn.lock
-pnpm-lock.yaml
-

package/mcp-server/.prettierrc

@@ -1,12 +0,0 @@
-{
-  "semi": true,
-  "trailingComma": "es5",
-  "singleQuote": true,
-  "printWidth": 80,
-  "tabWidth": 2,
-  "useTabs": false,
-  "arrowParens": "avoid",
-  "endOfLine": "lf",
-  "bracketSpacing": true
-}
-

package/mcp-server/README.md

@@ -1,280 +0,0 @@
-# MCP Shark Server
-
-> **Aggregate multiple Model Context Protocol (MCP) servers into a single unified interface**
-
-MCP Shark Server is a powerful aggregation layer that combines multiple MCP servers (both HTTP and stdio-based) into one cohesive endpoint. It provides a unified API for tools, prompts, and resources from all connected servers, with comprehensive audit logging and session management.
-
-## ✨ Features
-
-- **🔗 Multi-Server Aggregation**: Connect to multiple MCP servers simultaneously (HTTP and stdio)
-- **📊 Comprehensive Audit Logging**: SQLite-based logging with request/response tracking, performance metrics, and error handling
-- **🌐 HTTP Interface**: RESTful API endpoint for easy integration with any MCP client
-- **🔄 Session Management**: Automatic session handling for stateful MCP interactions
-- **🛠️ Unified Tool Access**: Access tools from all connected servers through a single interface
-- **📝 Prompt & Resource Aggregation**: Unified access to prompts and resources across all servers
-- **⚡ Streaming Support**: Full support for async iterable responses (streaming)
-- **🔍 Request Correlation**: Track request/response pairs with correlation IDs
-
-## 🚀 Quick Start
-
-### Installation
-
-```bash
-npm install
-```
-
-### Configuration
-
-**Recommended: Use the UI**
-
-The recommended way to configure the MCP server is through the UI interface, which automatically detects and converts IDE configuration files.
-
-**Alternative: Manual Configuration**
-
-If running the server directly, create a configuration file at `~/.mcp-shark/mcps.json`:
-
-```json
-{
-  "servers": {
-    "github": {
-      "type": "http",
-      "url": "https://api.githubcopilot.com/mcp/",
-      "headers": {
-        "Authorization": "Bearer YOUR_TOKEN"
-      }
-    },
-    "@21st-dev/magic": {
-      "type": "stdio",
-      "command": "npx",
-      "args": ["-y", "@21st-dev/magic@latest", "API_KEY=\"your-api-key\""]
-    }
-  }
-}
-```
-
-### Running
-
-**Recommended: Managed through UI**
-
-The recommended way to run the MCP server is through the UI interface:
-
-1. Start the UI server (see main README)
-2. Use the UI's "MCP Server Setup" tab to configure and start the server
-
-**Alternative: Run Directly**
-
-If you need to run the server independently:
-
-```bash
-npm start
-```
-
-The server will start on `http://localhost:9851/mcp`
-
-**Note:** When running directly, ensure you have a valid configuration file at `~/.mcp-shark/mcps.json` before starting. The UI handles configuration automatically when using the recommended workflow.
-
-## 📖 Usage
-
-### Endpoint
-
-All MCP requests should be sent to:
-
-```
-POST http://localhost:9851/mcp
-```
-
-### Example: List All Tools
-
-```bash
-curl -X POST http://localhost:9851/mcp \
-  -H "Content-Type: application/json" \
-  -d '{
-    "jsonrpc": "2.0",
-    "id": 1,
-    "method": "tools/list"
-  }'
-```
-
-### Example: Call a Tool
-
-Tools from different servers are prefixed with the server name:
-
-```bash
-curl -X POST http://localhost:9851/mcp \
-  -H "Content-Type: application/json" \
-  -d '{
-    "jsonrpc": "2.0",
-    "id": 2,
-    "method": "tools/call",
-    "params": {
-      "name": "github:search_repositories",
-      "arguments": {
-        "query": "language:javascript stars:>1000"
-      }
-    }
-  }'
-```
-
-## 🏗️ Architecture
-
-```
-┌─────────────────┐
-│   MCP Client    │
-└────────┬────────┘
-         │ HTTP
-         ▼
-┌─────────────────────────────────┐
-│   MCP Shark Server               │
-│   (Express on port 9851)         │
-│                                   │
-│  ┌────────────────────────────┐ │
-│  │  Internal MCP Server        │ │
-│  │  - tools/list               │ │
-│  │  - tools/call               │ │
-│  │  - prompts/list             │ │
-│  │  - prompts/get              │ │
-│  │  - resources/list           │ │
-│  │  - resources/read           │ │
-│  └──────────┬──────────────────┘ │
-│             │                     │
-│  ┌──────────▼──────────────────┐ │
-│  │  Audit Logger (SQLite)      │ │
-│  └──────────────────────────────┘ │
-└──────────┬────────────────────────┘
-           │
-           ├──► HTTP MCP Server
-           ├──► stdio MCP Server
-           └──► stdio MCP Server
-```
-
-## 📁 Project Structure
-
-```
-mcp-server/
-├── mcp-shark.js            # Main entry point
-├── lib/
-│   ├── server/
-│   │   ├── internal/           # Internal MCP server (aggregator)
-│   │   │   ├── server.js       # Server creation
-│   │   │   ├── run.js          # Express server setup
-│   │   │   ├── session.js      # Session management
-│   │   │   └── handlers/       # Request handlers
-│   │   └── external/           # External MCP server clients
-│   │       ├── all.js          # Multi-server orchestration
-│   │       ├── config.js       # Configuration parsing
-│   │       ├── kv.js           # Key-value store for servers
-│   │       └── single/         # Single server client
-│   ├── db/
-│   │   ├── init.js             # Database initialization
-│   │   ├── logger.js           # Audit logging
-│   │   └── query.js            # Database queries
-│   └── common/
-│       └── error.js            # Error handling utilities
-└── lib/
-    └── ...
-```
-
-**Note:** Configuration and database files are stored in `~/.mcp-shark/` by default:
-
-- `~/.mcp-shark/mcps.json` - Server configuration
-- `~/.mcp-shark/db/mcp-shark.sqlite` - SQLite database
-
-## 🔧 Configuration Format
-
-### HTTP Server
-
-```json
-{
-  "servers": {
-    "server-name": {
-      "type": "http",
-      "url": "https://api.example.com/mcp/",
-      "headers": {
-        "Authorization": "Bearer TOKEN"
-      }
-    }
-  }
-}
-```
-
-### stdio Server
-
-```json
-{
-  "servers": {
-    "server-name": {
-      "type": "stdio",
-      "command": "node",
-      "args": ["path/to/server.js"]
-    }
-  }
-}
-```
-
-## 📊 Audit Logging
-
-All MCP communications are logged to SQLite (default location: `~/.mcp-shark/db/mcp-shark.sqlite`) with:
-
-- **Request/Response Tracking**: Full payload logging with correlation IDs
-- **Performance Metrics**: Duration, latency, and timing information
-- **Error Tracking**: Comprehensive error logging with stack traces
-- **Session Management**: Session ID tracking for stateful interactions
-- **Server Identification**: Track which external server handled each request
-
-### Database Schema
-
-- `mcp_communications`: All request/response communications
-- `mcp_request_response_pairs`: Correlated request/response pairs
-
-## 🛠️ Development
-
-### Scripts
-
-```bash
-# Start the server
-npm start
-
-# Lint code
-npm run lint
-
-# Fix linting issues
-npm run lint:fix
-
-# Format code
-npm run format
-
-# Check formatting
-npm run format:check
-```
-
-### Dependencies
-
-This package uses `mcp-shark-common` for shared database utilities and configuration management. The database initialization and logging functionality is provided by the common package.
-
-### Code Quality
-
-- **ESLint**: Code linting with Prettier integration
-- **Prettier**: Code formatting
-- **Husky**: Git hooks for pre-commit checks
-- **Commitlint**: Conventional commit message validation
-
-## 🔌 Supported MCP Methods
-
-- `tools/list` - List all tools from all servers
-- `tools/call` - Call a tool from any server
-- `prompts/list` - List all prompts from all servers
-- `prompts/get` - Get a specific prompt
-- `resources/list` - List all resources from all servers
-- `resources/read` - Read a specific resource
-
-## 📝 License
-
-ISC
-
-## 🤝 Contributing
-
-Contributions are welcome! Please ensure your code passes linting and formatting checks before submitting.
-
----
-
-**Built with ❤️ using the Model Context Protocol SDK**

package/mcp-server/commitlint.config.cjs

@@ -1,42 +0,0 @@
-module.exports = {
-  extends: ['@commitlint/config-conventional'],
-  rules: {
-    // Type must be one of the following
-    'type-enum': [
-      2,
-      'always',
-      [
-        'feat', // A new feature
-        'fix', // A bug fix
-        'docs', // Documentation only changes
-        'style', // Changes that do not affect the meaning of the code
-        'refactor', // A code change that neither fixes a bug nor adds a feature
-        'perf', // A code change that improves performance
-        'test', // Adding missing tests or correcting existing tests
-        'build', // Changes that affect the build system or external dependencies
-        'ci', // Changes to CI configuration files and scripts
-        'chore', // Other changes that don't modify src or test files
-        'revert', // Reverts a previous commit
-      ],
-    ],
-    // Type case: must be lowercase
-    'type-case': [2, 'always', 'lower-case'],
-    // Type cannot be empty
-    'type-empty': [2, 'never'],
-    // Scope case: must be lowercase
-    'scope-case': [2, 'always', 'lower-case'],
-    // Subject case: sentence-case (first letter lowercase, rest as written)
-    'subject-case': [2, 'never', ['upper-case', 'pascal-case', 'start-case']],
-    // Subject cannot be empty
-    'subject-empty': [2, 'never'],
-    // Subject must end with a period
-    'subject-full-stop': [0, 'never'],
-    // Header must not exceed 72 characters (disabled, using max line length instead)
-    'header-max-length': [2, 'always', 100],
-    // Body must start with blank line
-    'body-leading-blank': [2, 'always'],
-    // Footer must start with blank line
-    'footer-leading-blank': [2, 'always'],
-  },
-};
-