@mcp-shark/mcp-shark 1.4.1 → 1.5.0

package/mcp-server/lib/server/internal/handlers/prompts-get.js

@@ -1,20 +1,18 @@
-import { getBy, extractName } from '../../external/kv.js';
+import { getBy } from '../../external/kv.js';
 import { InternalServerError } from './error.js';
 
-export function createPromptsGetHandler(logger, mcpServers) {
-  return async req => {
+export function createPromptsGetHandler(logger, mcpServers, requestedMcpServer) {
+  return async (req) => {
     const name = req.params.name;
     const promptArgs = req?.params?.arguments || {};
     logger.debug('Prompt get', name, promptArgs);
 
-    const { typeName } = extractName(name);
-
-    const getPrompt = getBy(mcpServers, name, 'getPrompt', promptArgs);
+    const getPrompt = getBy(mcpServers, requestedMcpServer, name, 'getPrompt', promptArgs);
     if (!getPrompt) {
       throw new InternalServerError(`Prompt not found: ${name}`);
     }
 
-    const result = await getPrompt(typeName, promptArgs);
+    const result = await getPrompt(name, promptArgs);
     logger.debug('Prompt get result', result);
 
     return result;

package/mcp-server/lib/server/internal/handlers/prompts-list.js

@@ -1,10 +1,11 @@
 import { listAll } from '../../external/kv.js';
 
-export function createPromptsListHandler(logger, mcpServers) {
-  return async _req => {
-    logger.debug('Prompts list');
+export function createPromptsListHandler(logger, mcpServers, requestedMcpServer) {
+  return async (req) => {
+    const path = req.path;
+    logger.debug('Prompts list', path);
 
-    const res = await listAll(mcpServers, 'prompts');
+    const res = await listAll(mcpServers, requestedMcpServer, 'prompts');
     const result = Array.isArray(res) ? { prompts: res } : res;
 
     return result;

package/mcp-server/lib/server/internal/handlers/resources-list.js

@@ -1,10 +1,11 @@
 import { listAll } from '../../external/kv.js';
 
-export function createResourcesListHandler(logger, mcpServers) {
-  return async _req => {
-    logger.debug('Resources list');
+export function createResourcesListHandler(logger, mcpServers, requestedMcpServer) {
+  return async (req) => {
+    const path = req.path;
+    logger.debug('Resources list', path);
 
-    const res = await listAll(mcpServers, 'resources');
+    const res = await listAll(mcpServers, requestedMcpServer, 'resources');
     const result = Array.isArray(res) ? { resources: res } : res;
 
     return result;

package/mcp-server/lib/server/internal/handlers/resources-read.js

@@ -1,12 +1,13 @@
 import { getBy } from '../../external/kv.js';
 import { InternalServerError } from './error.js';
 
-export function createResourcesReadHandler(logger, mcpServers) {
-  return async req => {
+export function createResourcesReadHandler(logger, mcpServers, requestedMcpServer) {
+  return async (req) => {
+    const path = req.path;
     const uri = req.params.uri;
-    logger.debug('Resource read', uri);
+    logger.debug('Resource read', path, uri);
 
-    const readResource = getBy(mcpServers, uri, 'readResource');
+    const readResource = getBy(mcpServers, requestedMcpServer, uri, 'readResource');
     if (!readResource) {
       throw new InternalServerError(`Resource not found: ${uri}`);
     }

package/mcp-server/lib/server/internal/handlers/tools-call.js

@@ -1,24 +1,22 @@
-import { getBy, extractName } from '../../external/kv.js';
+import { getBy } from '../../external/kv.js';
 import { InternalServerError } from './error.js';
 
-const isAsyncIterable = v => v && typeof v[Symbol.asyncIterator] === 'function';
+const isAsyncIterable = (v) => v && typeof v[Symbol.asyncIterator] === 'function';
 
-export function createToolsCallHandler(logger, mcpServers) {
-  return async req => {
+export function createToolsCallHandler(logger, mcpServers, requestedMcpServer) {
+  return async (req) => {
+    const path = req.path;
     const { name, arguments: args } = req.params;
-    logger.debug('Tool call', name, args);
+    logger.debug('Tool call', path, name, args);
 
-    // Extract real server name from concatenated name
-    const { typeName } = extractName(name);
-
-    const callTool = getBy(mcpServers, name, 'callTool', args || {});
+    const callTool = getBy(mcpServers, requestedMcpServer, name, 'callTool', args || {});
     if (!callTool) {
       throw new InternalServerError(`Tool not found: ${name}`);
     }
 
     const result = await callTool({
       ...req.params,
-      name: typeName,
+      name,
     });
     logger.debug('Tool call result', result);
 

package/mcp-server/lib/server/internal/handlers/tools-list.js

@@ -1,11 +1,12 @@
 import { listAll } from '../../external/kv.js';
 
-export function createToolsListHandler(logger, mcpServers) {
-  return async req => {
-    logger.debug('Listing tools', req);
+export function createToolsListHandler(logger, mcpServers, requestedMcpServer) {
+  return async (req) => {
+    const path = req.path;
+    logger.debug('Listing tools', path);
 
-    const res = await listAll(mcpServers, 'tools');
-    logger.debug('Tools list result', res);
+    const res = await listAll(mcpServers, requestedMcpServer, 'tools');
+    logger.debug('Tools list result', JSON.stringify(res));
 
     const result = Array.isArray(res) ? { tools: res } : res;
 

package/mcp-server/lib/server/internal/run.js

@@ -1,13 +1,9 @@
-import express from 'express';
 import cors from 'cors';
+import express from 'express';
 
 import { withSession } from './session.js';
 
-export function getInternalServer(
-  serverFactory,
-  auditLogger,
-  withAuditRequestResponseHandler
-) {
+export function getInternalServer(serverFactory, auditLogger, withAuditRequestResponseHandler) {
   const app = express();
 
   // Parse JSON body for POST requests
@@ -22,14 +18,8 @@ export function getInternalServer(
     })
   );
 
-  app.all('/mcp', async (req, res) => {
-    await withSession(
-      serverFactory,
-      withAuditRequestResponseHandler,
-      req,
-      res,
-      auditLogger
-    );
+  app.all('/mcp/*', async (req, res) => {
+    await withSession(serverFactory, withAuditRequestResponseHandler, req, res, auditLogger);
   });
 
   // Catch-all for other routes (404)
@@ -42,8 +32,6 @@ export function getInternalServer(
 
 export function runInternalServer(logger, port, app) {
   app.listen(port, '0.0.0.0', () => {
-    logger.info(
-      `MCP proxy HTTP server listening on http://localhost:${port}/mcp`
-    );
+    logger.info(`MCP proxy HTTP server listening on http://localhost:${port}/mcp`);
   });
 }

package/mcp-server/lib/server/internal/server.js

@@ -1,63 +1,62 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 
 import {
-  ListToolsRequestSchema,
   CallToolRequestSchema,
-  ListPromptsRequestSchema,
   GetPromptRequestSchema,
+  ListPromptsRequestSchema,
   ListResourcesRequestSchema,
+  ListToolsRequestSchema,
   ReadResourceRequestSchema,
 } from '@modelcontextprotocol/sdk/types.js';
 
-import { createToolsListHandler } from './handlers/tools-list.js';
-import { createToolsCallHandler } from './handlers/tools-call.js';
-import { createPromptsListHandler } from './handlers/prompts-list.js';
 import { createPromptsGetHandler } from './handlers/prompts-get.js';
+import { createPromptsListHandler } from './handlers/prompts-list.js';
 import { createResourcesListHandler } from './handlers/resources-list.js';
 import { createResourcesReadHandler } from './handlers/resources-read.js';
-import { SERVER_NAME } from './handlers/common.js';
+import { createToolsCallHandler } from './handlers/tools-call.js';
+import { createToolsListHandler } from './handlers/tools-list.js';
 
-export function createInternalServer(logger, mcpServers) {
+export function createInternalServer(logger, mcpServers, requestedMcpServer) {
   // create MCP server
   const server = new Server(
-    { name: SERVER_NAME, version: '1.0.0' },
+    { name: requestedMcpServer, version: '1.0.0' },
     { capabilities: { tools: {}, prompts: {}, resources: {} } }
   );
 
   // Register handlers
   server.setRequestHandler(
     ListToolsRequestSchema,
-    createToolsListHandler(logger, mcpServers)
+    createToolsListHandler(logger, mcpServers, requestedMcpServer)
   );
 
   server.setRequestHandler(
     CallToolRequestSchema,
-    createToolsCallHandler(logger, mcpServers)
+    createToolsCallHandler(logger, mcpServers, requestedMcpServer)
   );
 
   server.setRequestHandler(
     ListPromptsRequestSchema,
-    createPromptsListHandler(logger, mcpServers)
+    createPromptsListHandler(logger, mcpServers, requestedMcpServer)
   );
 
   server.setRequestHandler(
     GetPromptRequestSchema,
-    createPromptsGetHandler(logger, mcpServers)
+    createPromptsGetHandler(logger, mcpServers, requestedMcpServer)
   );
 
   server.setRequestHandler(
     ListResourcesRequestSchema,
-    createResourcesListHandler(logger, mcpServers)
+    createResourcesListHandler(logger, mcpServers, requestedMcpServer)
   );
 
   server.setRequestHandler(
     ReadResourceRequestSchema,
-    createResourcesReadHandler(logger, mcpServers)
+    createResourcesReadHandler(logger, mcpServers, requestedMcpServer)
   );
 
   return server;
 }
 
 export function createInternalServerFactory(logger, mcpServers) {
-  return () => createInternalServer(logger, mcpServers);
+  return (requestedMcpServer) => createInternalServer(logger, mcpServers, requestedMcpServer);
 }

package/mcp-server/lib/server/internal/session.js

@@ -13,27 +13,22 @@ function getTransportFromSession(sessionId) {
   return sessions.get(sessionId);
 }
 
-export async function withSession(
-  serverFactory,
-  requestHandler,
-  req,
-  res,
-  auditLogger
-) {
+export async function withSession(serverFactory, requestHandler, req, res, auditLogger) {
+  const requestedMcpServer = req.params[0];
   const sessionId = getSessionFromRequest(req);
   if (!sessionId) {
-    const newSessionId = randomUUID();
+    const initialSessionId = randomUUID();
     const transport = new StreamableHTTPServerTransport({
-      sessionIdGenerator: () => newSessionId,
+      sessionIdGenerator: () => initialSessionId,
       enableJsonResponse: true,
     });
-    const server = serverFactory();
+    const server = serverFactory(requestedMcpServer);
     await server.connect(transport);
-    storeTransportInSession(newSessionId, transport);
+    storeTransportInSession(initialSessionId, transport);
     // Session creation will be logged as part of the request packet in audit.js
-    return requestHandler(transport, req, res, auditLogger);
+    return requestHandler(transport, req, res, auditLogger, requestedMcpServer, initialSessionId);
   }
 
   const transport = getTransportFromSession(sessionId);
-  return requestHandler(transport, req, res, auditLogger);
+  return requestHandler(transport, req, res, auditLogger, requestedMcpServer);
 }

package/mcp-server/mcp-shark.js

@@ -1,72 +1,22 @@
-import { consola } from 'consola';
-
-import { runAllExternalServers } from './lib/server/external/all.js';
-import { isError } from './lib/common/error.js';
-
-import { createInternalServerFactory } from './lib/server/internal/server.js';
-import {
-  getInternalServer,
-  runInternalServer,
-} from './lib/server/internal/run.js';
-import { initDb } from 'mcp-shark-common/db/init.js';
-import { getLogger } from 'mcp-shark-common/db/logger.js';
-import {
-  getDatabaseFile,
-  getMcpConfigPath,
-  prepareAppDataSpaces,
-} from 'mcp-shark-common/configs/index.js';
-import { withAuditRequestResponseHandler } from './lib/auditor/audit.js';
-
-function initAuditLogger(logger) {
-  logger.info('Initializing audit logger at', getDatabaseFile());
-  return getLogger(initDb(getDatabaseFile()));
-}
+import logger from '../shared/logger.js';
+// CLI entry point - uses the library
+import { startMcpSharkServer } from './index.js';
 
 async function main() {
-  consola.level = 'info';
-
-  prepareAppDataSpaces();
-
-  const configPath = getMcpConfigPath();
-  console.log('[MCP-Shark] Starting MCP server...');
-  console.log(`[MCP-Shark] Config path: ${configPath}`);
-  console.log(`[MCP-Shark] Database path: ${getDatabaseFile()}`);
-  console.log(`[MCP-Shark] Working directory: ${process.cwd()}`);
-  console.log(`[MCP-Shark] PATH: ${process.env.PATH}`);
-
-  const auditLogger = initAuditLogger(consola);
-  const result = await runAllExternalServers(consola, configPath);
-  if (isError(result)) {
-    console.error(JSON.stringify(result));
+  try {
+    await startMcpSharkServer({
+      onReady: () => {
+        logger.info('[MCP-Shark] MCP server started successfully');
+      },
+      onError: (error) => {
+        logger.error({ error: error.message, stack: error.stack }, 'Error starting MCP server');
+        process.exit(1);
+      },
+    });
+  } catch (error) {
+    logger.error({ error: error.message, stack: error.stack }, 'Error starting MCP server');
     process.exit(1);
   }
-
-  const internalServerFactory = createInternalServerFactory(consola, result);
-  const app = getInternalServer(
-    internalServerFactory,
-    auditLogger,
-    withAuditRequestResponseHandler
-  );
-  await runInternalServer(consola, 9851, app);
 }
 
-main()
-  .then(() => {
-    const successMsg = 'MCP server started successfully';
-    console.log(`[MCP-Shark] ${successMsg}`);
-    consola.info(successMsg);
-  })
-  .catch(error => {
-    const errorMsg = 'Error starting MCP server';
-    console.error(`[MCP-Shark] ${errorMsg}:`, error);
-    console.error(`[MCP-Shark] Error message: ${error.message}`);
-    if (error.stack) {
-      console.error(`[MCP-Shark] Error stack:`, error.stack);
-    }
-    consola.error(errorMsg, error);
-    consola.error(`Error message: ${error.message}`);
-    if (error.stack) {
-      consola.error(`Error stack: ${error.stack}`);
-    }
-    process.exit(1);
-  });
+main();

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@mcp-shark/mcp-shark",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "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",
+  "exports": {
+    ".": "./bin/mcp-shark.js",
+    "./mcp-server": "./mcp-server/index.js"
+  },
   "bin": {
     "mcp-shark": "./bin/mcp-shark.js",
     "@mcp-shark/mcp-shark": "./bin/mcp-shark.js"
@@ -16,40 +20,25 @@
   "bugs": {
     "url": "https://github.com/mcp-shark/mcp-shark/issues"
   },
-  "files": [
-    "bin",
-    "ui",
-    "mcp-server",
-    "README.md",
-    "LICENSE"
-  ],
+  "files": ["bin", "ui", "mcp-server", "README.md", "LICENSE", "package.json"],
   "scripts": {
-    "install:all": "npm install",
-    "start:ui": "cd ui && npm start",
-    "start": "npm run start:ui",
-    "dev:ui": "cd ui && npm run dev",
-    "build:ui": "cd ui && npm run build",
-    "lint:server": "cd mcp-server && npm run lint",
-    "lint:fix:server": "cd mcp-server && npm run lint:fix",
-    "format:server": "cd mcp-server && npm run format",
-    "lint:ui": "cd ui && (eslint . --ext .js,.jsx,.ts,.tsx || echo 'eslint not available in ui')",
-    "lint:fix:ui": "cd ui && (eslint . --ext .js,.jsx,.ts,.tsx --fix || echo 'eslint not available in ui')",
-    "format:ui": "prettier --write \"ui/**/*.{js,jsx,ts,tsx,json,css,md}\"",
-    "lint:fix:all": "(npm run lint:fix:server || true) && (npm run lint:fix:ui || true)",
-    "format:all": "(npm run format:server || true) && (npm run format:ui || true)",
-    "fix:all": "(npm run lint:fix:all || true) && (npm run format:all || true)",
+    "start": "node scripts/start-ui.js",
+    "predev": "npm run build:ui",
+    "dev": "node scripts/start-ui.js'",
+    "build": "bash -c 'cd ui && vite build'",
+    "build:ui": "bash -c 'cd ui && vite build'",
+    "lint": "biome lint .",
+    "lint:fix": "biome lint --write .",
+    "format": "biome format --write .",
+    "check": "biome check .",
+    "check:fix": "biome check --write .",
     "prepare": "husky install || true",
-    "prepublishOnly": "npm run lint:fix:all && npm run format:all",
+    "prepublishOnly": "npm run check:fix && npm run build:ui",
     "publish:public": "npm publish --access public",
     "publish:dry-run": "npm publish --dry-run"
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
-      "prettier --write"
-    ],
-    "*.{json,css,md,yml,yaml}": [
-      "prettier --write"
-    ]
+    "*": ["biome check --write"]
   },
   "keywords": [
     "mcp",
@@ -78,28 +67,24 @@
     "@modelcontextprotocol/sdk": "^1.20.2",
     "@tabler/icons-react": "^3.0.0",
     "animejs": "^3.2.2",
+    "commander": "^14.0.2",
     "consola": "^3.4.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "jsonrpc-lite": "^2.2.0",
     "mcp-shark-common": "github:mcp-shark/mcp-shark-common",
+    "open": "^11.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "ws": "^8.16.0",
-    "open": "^11.0.0",
-    "commander": "^14.0.2"
+    "ws": "^8.16.0"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
-    "@eslint/js": "^9.15.0",
     "@vitejs/plugin-react": "^4.2.1",
-    "eslint": "^9.15.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "prettier": "^3.3.3",
-    "vite": "^5.1.0"
+    "vite": "^7.3.0"
   }
 }

package/ui/dist/assets/index-Cc-IUa83.css

@@ -0,0 +1 @@
+@import"https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&family=Roboto+Mono:wght@400;500&display=swap";*{margin:0;padding:0;box-sizing:border-box}body{font-family:Roboto,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif;background:#fff;color:#202124;overflow:hidden;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}code,pre,.monospace{font-family:Roboto Mono,JetBrains Mono,Fira Code,Consolas,monospace}#root{height:100vh;display:flex;flex-direction:column}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}