@imenam/mcp-http-gateway 2.0.14 → 2.0.15

package/package.json

@@ -1,54 +1,57 @@
-{
-  "name": "@imenam/mcp-http-gateway",
-  "version": "2.0.14",
-  "type": "module",
-  "description": "HTTP gateway that exposes MCP servers as REST routes — bridge between MCP and any HTTP-capable agent",
-  "main": "server.js",
-  "bin": {
-    "mcp-http-gateway": "server.js"
-  },
-  "files": [
-    "server.js",
-    "mcp-mode.js",
-    "mcp-endpoint.js",
-    "auth.js",
-    "README.md",
-    "embeddings/",
-    "startup-exposition.js"
-  ],
-  "scripts": {
-    "start": "node server.js",
-    "release": "npm version patch && npm publish --access public && git push origin master --follow-tags"
-  },
-  "keywords": [
-    "mcp",
-    "model-context-protocol",
-    "gateway",
-    "http",
-    "ai",
-    "agent",
-    "llm",
-    "bridge"
-  ],
-  "author": "Matthieu Pesnot-Pin <matthieupin@gmail.com>",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Matthieu-Pesnot-Pin/mcp-http-gateway.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Matthieu-Pesnot-Pin/mcp-http-gateway/issues"
-  },
-  "homepage": "https://github.com/Matthieu-Pesnot-Pin/mcp-http-gateway#readme",
-  "license": "ISC",
-  "engines": {
-    "node": ">=18"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.27.1",
-    "better-sqlite3": "^12.8.0",
-    "dotenv": "^17.3.1",
-    "express": "^5.2.1",
-    "jose": "^6.2.3",
-    "openai": "^6.31.0"
-  }
-}
+{
+  "name": "@imenam/mcp-http-gateway",
+  "version": "2.0.15",
+  "type": "module",
+  "description": "HTTP gateway that exposes MCP servers as REST routes — bridge between MCP and any HTTP-capable agent",
+  "main": "server.js",
+  "bin": {
+    "mcp-http-gateway": "server.js"
+  },
+  "files": [
+    "server.js",
+    "mcp-mode.js",
+    "mcp-endpoint.js",
+    "auth.js",
+    "README.md",
+    "embeddings/",
+    "startup-exposition.js",
+    "http-relay.js",
+    "gateway-exec.js",
+    "gateway-watch.js"
+  ],
+  "scripts": {
+    "start": "node server.js",
+    "release": "npm version patch && npm publish --access public && git push origin master --follow-tags"
+  },
+  "keywords": [
+    "mcp",
+    "model-context-protocol",
+    "gateway",
+    "http",
+    "ai",
+    "agent",
+    "llm",
+    "bridge"
+  ],
+  "author": "Matthieu Pesnot-Pin <matthieupin@gmail.com>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Matthieu-Pesnot-Pin/mcp-http-gateway.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Matthieu-Pesnot-Pin/mcp-http-gateway/issues"
+  },
+  "homepage": "https://github.com/Matthieu-Pesnot-Pin/mcp-http-gateway#readme",
+  "license": "ISC",
+  "engines": {
+    "node": ">=18"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.27.1",
+    "better-sqlite3": "^12.8.0",
+    "dotenv": "^17.3.1",
+    "express": "^5.2.1",
+    "jose": "^6.2.3",
+    "openai": "^6.31.0"
+  }
+}

package/server.js

@@ -1,7 +1,14 @@
 #!/usr/bin/env node
 import 'dotenv/config';
 
-if (process.argv.includes('--mcp')) {
+if (process.argv.includes('--watch')) {
+  // Veilleur lancé par l'agent via Monitor (voir gateway-watch.js) : il n'ouvre ni serveur ni relais.
+  const { runWatchMode } = await import('./gateway-watch.js');
+  await runWatchMode(process.argv[process.argv.indexOf('--watch') + 1]).catch((err) => {
+    console.error(`[gateway-watch] ${err.message}`);
+    process.exit(1);
+  });
+} else if (process.argv.includes('--mcp')) {
   await import('./mcp-mode.js');
   // Process stays alive: the MCP transport keeps stdin open until the client disconnects
 }
@@ -16,6 +23,7 @@ import { getEmbedding, cosineSimilarity } from './embeddings/vectorizer.js';
 import { registerMcpEndpoint } from './mcp-endpoint.js';
 import { buildProxyTools, overlongProxyNames, parseExposeFlag } from './startup-exposition.js';
 import { createMcpTokenVerifier } from './auth.js';
+import { HTTP_RELAY_PORT_KEY, parseRelayPort, relayPrefix, isRelayPath, createHttpRelay } from './http-relay.js';
 import { requireBearerAuth } from '@modelcontextprotocol/sdk/server/auth/middleware/bearerAuth.js';
 import { rateLimit } from 'express-rate-limit';
 
@@ -118,7 +126,12 @@ async function main() {
   // contenu d'un fichier encodé en base64 (cf. l'inlining du relais dans mcp-mode.js),
   // qui repartirait sinon en « 413 Payload Too Large » sans explication.
   const BODY_LIMIT = process.env.GATEWAY_BODY_LIMIT ?? '32mb';
-  app.use(express.json({ type: '*/*', limit: BODY_LIMIT }));
+  const jsonParser = express.json({ type: '*/*', limit: BODY_LIMIT });
+  // Les routes de relais HTTP transmettent leur corps en flux, sans le lire ni le borner.
+  const relayPrefixes = new Set();
+  app.use((req, res, next) =>
+    isRelayPath(relayPrefixes, req.path) ? next() : jsonParser(req, res, next)
+  );
 
   const globalWindowMin = parseInt(process.env.RATE_LIMIT_GLOBAL_WINDOW_MINUTES ?? '15', 10);
   const globalMax       = parseInt(process.env.RATE_LIMIT_GLOBAL_MAX ?? '300', 10);
@@ -201,12 +214,25 @@ async function main() {
       console.warn(`[gateway] "${name}": invalid EXPOSE_AT_AGENT_STARTUP="${rawExpose}" (expected true | false) — not pre-exposed`);
     }
 
+    const rawRelayPort = cfg.env?.[HTTP_RELAY_PORT_KEY];
+    const { port: relayPort, valid: relayPortValid } = parseRelayPort(rawRelayPort);
+    if (!relayPortValid) {
+      console.error(`[gateway] Skipping "${name}": invalid ${HTTP_RELAY_PORT_KEY}="${rawRelayPort}" (expected a port 1-65535)`);
+      continue;
+    }
+
     try {
       const client = await connectMcp(name, cfg);
       const { tools } = await client.listTools();
       clients.push(client);
-      registry.push({ name, route, description: cfg.description ?? null, tools, client, exposeAtStartup });
+      registry.push({ name, route, description: cfg.description ?? null, tools, client, exposeAtStartup, relayPort });
       registerMcpRoutes(app, route, client, name);
+      if (relayPort) {
+        const prefix = relayPrefix(route);
+        relayPrefixes.add(prefix);
+        app.use(prefix, createHttpRelay({ name, port: relayPort }));
+        console.log(`[gateway] HTTP relay: ${prefix}/* → 127.0.0.1:${relayPort} (${name})`);
+      }
       for (const tool of tools) {
         if (!tool.description) continue;
         getOrComputeToolEmbedding(name, tool, getEmbedding).catch(err =>
@@ -281,8 +307,9 @@ async function main() {
       '',
       '## Serveurs',
       '',
-      ...registry.map(({ name, route, description }) =>
-        `### ${name}\n- **Route** : \`${route}\`\n- **Description** : ${description ?? 'Non renseignée'}`
+      ...registry.map(({ name, route, description, relayPort }) =>
+        `### ${name}\n- **Route** : \`${route}\`\n- **Description** : ${description ?? 'Non renseignée'}` +
+        (relayPort ? `\n- **Relais HTTP** : \`${relayPrefix(route)}/*\`` : '')
       ),
     ];
     res.type('text/plain').send(lines.join('\n'));
@@ -309,7 +336,7 @@ async function main() {
   process.on('SIGINT', shutdown);
 }
 
-if (!process.argv.includes('--mcp')) {
+if (!process.argv.includes('--mcp') && !process.argv.includes('--watch')) {
   main().catch(err => {
     console.error('[gateway] Fatal error:', err.message);
     process.exit(1);