@natomalabs/natoma-mcp-gateway 1.0.3 → 1.0.5

package/build/main.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+import { Gateway } from './gateway.js';
+// Main function
+async function main() {
+    const slug = `${process.env.NATOMA_MCP_SERVER_INSTALLATION_ID}/mcp`;
+    if (!process.env.NATOMA_MCP_SERVER_INSTALLATION_ID) {
+        console.error('Please set NATOMA_MCP_SERVER_INSTALLATION_ID env var');
+        process.exit(1);
+    }
+    const config = {
+        slug,
+        apiKey: process.env.NATOMA_MCP_API_KEY,
+        maxReconnectAttempts: 5,
+        reconnectDelay: 2000,
+        timeout: 60000,
+        isEnterprise: true, // Mandatory flag
+        customUrl: process.env.NATOMA_MCP_CUSTOM_URL // Optional custom URL from env
+    };
+    // Always create Enterprise gateway
+    const gateway = new Gateway(config);
+    console.error(`--- Starting Enterprise Gateway ---`);
+    if (config.customUrl) {
+        console.error(`--- Using custom URL: ${config.customUrl} ---`);
+    }
+    try {
+        await gateway.connect();
+        process.stdin.on('data', (data) => {
+            gateway.processMessage(data).catch((err) => {
+                console.error('Error in processMessage:', err);
+            });
+        });
+        const shutdown = () => {
+            console.error('Shutting down...');
+            gateway.cleanup();
+            process.exit(0);
+        };
+        process.on('SIGINT', shutdown);
+        process.on('SIGTERM', shutdown);
+        process.on('uncaughtException', (err) => {
+            console.error('Uncaught exception:', err);
+            shutdown();
+        });
+        setInterval(async () => {
+            if (gateway.ready) {
+                const ok = await gateway.healthCheck();
+                if (!ok) {
+                    console.error('Health check failed; reconnecting');
+                    await gateway.handleConnectionError(new Error('Health check failed'));
+                }
+            }
+        }, 5 * 60 * 1000); // Every 5 minutes
+    }
+    catch (err) {
+        console.error('Fatal error:', err);
+        process.exit(1);
+    }
+}
+main();

package/build/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@natomalabs/natoma-mcp-gateway",
-  "version": "1.0.3",
-  "description": "Natoma MCP Gateway with NMS and Enterprise modes",
+  "version": "1.0.5",
+  "description": "Natoma MCP Gateway",
   "license": "MIT",
   "type": "module",
   "bin": {
-    "gateway": "./build/gateway.js"
+    "main": "./build/main.js"
   },
   "files": [
     "build"
@@ -13,10 +13,10 @@
   "scripts": {
     "build": "tsc",
     "prepare": "npm run build",
-    "inspector": "node build/gateway.js",
-    "inspector:enterprise": "node build/gateway.js --enterprise",
-    "dev": "tsx watch src/gateway.ts",
-    "dev:enterprise": "tsx watch src/gateway.ts --enterprise"
+    "inspector": "node build/main.js",
+    "inspector:enterprise": "node build/main.js --enterprise",
+    "dev": "tsx watch src/main.ts",
+    "dev:enterprise": "tsx watch src/main.ts --enterprise"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.3",
@@ -26,7 +26,8 @@
   "devDependencies": {
     "@types/eventsource": "^1.1.15",
     "@types/express": "^5.0.0",
-    "@types/node": "^20.11.0",
+    "@types/node": "^20.19.27",
+    "prettier": "^3.2.5",
     "tsx": "^4.0.0",
     "typescript": "^5.3.3"
   },

package/build/base.js

@@ -1,54 +0,0 @@
-// base.ts
-export const NATOMA_NMS_SERVER_URL = "https://api.natoma.app/api/mcp";
-export const NATOMA_ENTERPRISE_SERVER_URL = "https://api.natoma.app/mcp";
-export const MCP_SESSION_ID_HEADER = "Mcp-Session-Id";
-// Handle EPIPE errors gracefully
-process.stdout.on("error", (err) => {
-    if (err.code === "EPIPE") {
-        process.exit(0);
-    }
-});
-process.stderr.on("error", (err) => {
-    if (err.code === "EPIPE") {
-        process.exit(0);
-    }
-});
-// Base abstract gateway class
-export class BaseMCPGateway {
-    isReady = false;
-    messageQueue = [];
-    reconnectAttempts = 0;
-    baseUrl;
-    maxReconnectAttempts;
-    reconnectDelay;
-    apiKey;
-    constructor(config) {
-        // Set base URL based on gateway type
-        this.baseUrl = config?.isEnterprise
-            ? NATOMA_ENTERPRISE_SERVER_URL
-            : NATOMA_NMS_SERVER_URL;
-        this.maxReconnectAttempts = 3;
-        this.reconnectDelay = 1000;
-        this.apiKey = config?.apiKey;
-        // Validate that API key is provided
-        if (!this.apiKey) {
-            throw new Error("API key is required for MCP Gateway");
-        }
-        // Debug logging
-        console.error(`[BaseMCPGateway] Gateway Type: ${config?.isEnterprise ? "Enterprise" : "NMS"}`);
-        console.error(`[BaseMCPGateway] Base URL set to: ${this.baseUrl}`);
-        console.error(`[BaseMCPGateway] API Key: ${this.apiKey ? "PROVIDED" : "NOT PROVIDED"}`);
-        console.error(`[BaseMCPGateway] Max reconnect attempts: ${this.maxReconnectAttempts}`);
-    }
-    get ready() {
-        return this.isReady;
-    }
-    async processQueuedMessages() {
-        while (this.messageQueue.length > 0) {
-            const message = this.messageQueue.shift();
-            if (message) {
-                await this.processMessage(message);
-            }
-        }
-    }
-}

package/build/cli.js

@@ -1,64 +0,0 @@
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
-import { setupCommand } from './setup.js';
-import { MCPGateway } from './gateway.js';
-import chalk from 'chalk';
-const startCommand = {
-    command: 'start',
-    describe: 'Start the Natoma MCP Gateway',
-    builder: (yargs) => {
-        return yargs
-            .option('url', {
-            type: 'string',
-            describe: 'The Natoma MCP URL to connect to',
-        })
-            .option('apiKey', {
-            type: 'string',
-            describe: 'API key for authentication',
-            demandOption: true,
-        })
-            .option('slug', {
-            type: 'string',
-            describe: 'Installation ID/slug for the connection',
-        });
-    },
-    handler: async (argv) => {
-        try {
-            const { url, apiKey, slug } = argv;
-            console.log(chalk.cyan('🚀 Starting Natoma MCP Gateway...'));
-            if (url) {
-                console.log(chalk.cyan(`   URL: ${url}`));
-            }
-            if (slug) {
-                console.log(chalk.cyan(`   Installation ID: ${slug}`));
-            }
-            const gateway = new MCPGateway({
-                apiKey: apiKey || process.env.NATOMA_MCP_API_KEY,
-                slug: slug || process.env.NATOMA_MCP_SERVER_INSTALLATION_ID,
-            });
-            await gateway.connect();
-            console.log(chalk.green('✅ Connected to Natoma MCP Server'));
-            process.stdin.on("data", (data) => gateway.processMessage(data));
-            // Handle cleanup
-            const cleanup = () => {
-                console.log(chalk.yellow("Shutting down..."));
-                gateway.cleanup();
-                process.exit(0);
-            };
-            process.on("SIGINT", cleanup);
-            process.on("SIGTERM", cleanup);
-        }
-        catch (error) {
-            console.log(chalk.red('\n❌ Error occurred while starting Natoma MCP Gateway:'));
-            console.log(chalk.red(`   ${error.message}`));
-            console.log(chalk.yellow('\nPlease try again or contact support if the issue persists.\n'));
-            process.exit(1);
-        }
-    },
-};
-yargs(hideBin(process.argv))
-    .command(setupCommand)
-    .command(startCommand)
-    .demandCommand(1, 'You need to specify a command.')
-    .help()
-    .argv;

package/build/ent-gateway.js

@@ -1,407 +0,0 @@
-// ent-gateway.ts
-import { BaseMCPGateway, MCP_SESSION_ID_HEADER, } from "./base.js";
-const JSON_RPC_VERSION = "2.0";
-// Enterprise Gateway - Fetch based with enhanced features
-export class EnterpriseGateway extends BaseMCPGateway {
-    sessionHeaders = {};
-    endpointUrl;
-    timeout;
-    sseAbortController = null;
-    constructor(config) {
-        // Set isEnterprise to true for Enterprise Gateway
-        super({ ...config, isEnterprise: true });
-        // Debug the inherited baseUrl
-        console.error(`[EnterpriseGateway] Inherited baseUrl: ${this.baseUrl}`);
-        const slug = config?.slug;
-        this.endpointUrl = slug ? `${this.baseUrl}/${slug}` : `${this.baseUrl}`;
-        this.timeout = config?.timeout ?? 30000;
-        // Debug final endpoint URL
-        console.error(`[EnterpriseGateway] Final endpoint URL: ${this.endpointUrl}`);
-        console.error(`[EnterpriseGateway] Timeout: ${this.timeout}ms`);
-    }
-    // Simplified validation for production - only log errors
-    validateResponse(response, originalRequest) {
-        if (!response || typeof response !== "object") {
-            console.error("❌ Invalid response format");
-            return response;
-        }
-        if (Array.isArray(response)) {
-            response.forEach((elem, idx) => {
-                this.validateSingleResponse(elem, idx);
-            });
-        }
-        else {
-            this.validateSingleResponse(response);
-        }
-        return response;
-    }
-    validateSingleResponse(resp, index) {
-        const prefix = index !== undefined ? `#${index}: ` : "";
-        if (resp.jsonrpc !== JSON_RPC_VERSION) {
-            console.error(`❌ ${prefix}Invalid jsonrpc version`);
-        }
-        const hasResult = resp.hasOwnProperty("result");
-        const hasError = resp.hasOwnProperty("error");
-        if (!hasResult && !hasError) {
-            console.error(`❌ ${prefix}Response missing both 'result' and 'error' fields`);
-        }
-        if (hasError && resp.error) {
-            console.error(`❌ ${prefix}Server error: ${resp.error.message}`);
-        }
-    }
-    async connect() {
-        try {
-            console.error("--- Connecting to MCP server");
-            console.error(`--- Connection URL: ${this.endpointUrl}`);
-            const initializeRequest = {
-                jsonrpc: JSON_RPC_VERSION,
-                method: "initialize",
-                params: {
-                    capabilities: {
-                        tools: {},
-                        prompts: {},
-                        resources: {},
-                        logging: {},
-                    },
-                    clientInfo: {
-                        name: "claude-desktop-gateway",
-                        version: "1.0.0",
-                    },
-                    protocolVersion: "2025-03-26",
-                },
-                id: 1,
-            };
-            const response = await this.makeRequest(initializeRequest);
-            if (response && response.result) {
-                this.isReady = true;
-                this.reconnectAttempts = 0;
-                console.error("--- MCP server connected successfully");
-                await this.processQueuedMessages();
-            }
-            else {
-                throw new Error(`Initialize failed: ${JSON.stringify(response.error)}`);
-            }
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            console.error(`--- Connection failed: ${errorMessage}`);
-            throw error;
-        }
-    }
-    async makeRequest(messageBody) {
-        const isInitialize = messageBody?.method === "initialize";
-        const headers = {
-            "Content-Type": "application/json",
-            Accept: isInitialize
-                ? "application/json"
-                : "application/json, text/event-stream",
-            ...this.sessionHeaders,
-        };
-        if (this.apiKey) {
-            headers["Authorization"] = `Bearer ${this.apiKey}`;
-        }
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), this.timeout);
-        let resp;
-        try {
-            resp = await fetch(this.endpointUrl, {
-                method: "POST",
-                headers,
-                body: JSON.stringify(messageBody),
-                signal: controller.signal,
-            });
-        }
-        catch (err) {
-            if (err instanceof Error && err.name === "AbortError") {
-                throw new Error(`Request timeout after ${this.timeout}ms`);
-            }
-            throw err;
-        }
-        finally {
-            clearTimeout(timeoutId);
-        }
-        // Update session headers
-        resp.headers.forEach((value, key) => {
-            if (key.toLowerCase() === MCP_SESSION_ID_HEADER.toLowerCase()) {
-                this.sessionHeaders[MCP_SESSION_ID_HEADER] = value;
-            }
-        });
-        if (!resp.ok) {
-            const text = await resp.text();
-            console.error(`❌ HTTP Error ${resp.status}: ${text}`);
-            throw new Error(`HTTP ${resp.status}: ${text}`);
-        }
-        const contentType = resp.headers.get("content-type") || "";
-        // Handle JSON response
-        if (contentType.includes("application/json")) {
-            const raw = await resp.text();
-            if (!raw || raw.trim() === "") {
-                throw new Error("Empty JSON response");
-            }
-            let parsed;
-            try {
-                parsed = JSON.parse(raw);
-            }
-            catch (parseErr) {
-                console.error("❌ Failed to parse JSON response");
-                throw new Error(`Invalid JSON: ${parseErr.message}`);
-            }
-            this.validateResponse(parsed, messageBody);
-            return parsed;
-        }
-        // Handle SSE stream
-        if (contentType.includes("text/event-stream")) {
-            if (this.sseAbortController) {
-                this.sseAbortController.abort();
-            }
-            this.sseAbortController = new AbortController();
-            await this.readSSEStream(resp, messageBody);
-            return null;
-        }
-        // Handle 202 Accepted
-        if (resp.status === 202) {
-            return {};
-        }
-        const txt = await resp.text();
-        console.error(`❌ Unexpected Content-Type ${contentType}`);
-        throw new Error(`Unexpected Content-Type: ${contentType}`);
-    }
-    async readSSEStream(response, originalRequest) {
-        if (!response.body) {
-            console.error("❌ No response body for SSE");
-            return;
-        }
-        const reader = response.body.getReader();
-        const decoder = new TextDecoder();
-        let buffer = "";
-        try {
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                buffer += decoder.decode(value, { stream: true });
-                let parts = buffer.split(/\r?\n\r?\n/);
-                buffer = parts.pop() || "";
-                for (const chunk of parts) {
-                    const lines = chunk.split(/\r?\n/);
-                    for (const line of lines) {
-                        if (line.startsWith("data:")) {
-                            const payload = line.slice(5).trim();
-                            // Handle session establishment
-                            const sidMatch = payload.match(/sessionId=([^&]+)/);
-                            if (sidMatch) {
-                                this.sessionHeaders[MCP_SESSION_ID_HEADER] = sidMatch[1];
-                                this.isReady = true;
-                                console.error(`Session established: ${sidMatch[1]}`);
-                                await this.processQueuedMessages();
-                                continue;
-                            }
-                            // Handle JSON-RPC messages
-                            try {
-                                const obj = JSON.parse(payload);
-                                this.validateResponse(obj, originalRequest);
-                                console.log(JSON.stringify(obj));
-                            }
-                            catch {
-                                console.log(payload);
-                            }
-                        }
-                    }
-                }
-            }
-            console.error("⚠️ SSE stream closed by server");
-            await this.handleConnectionError(new Error("SSE closed"));
-        }
-        catch (err) {
-            if (err.name !== "AbortError") {
-                console.error("❌ Error reading SSE:", err);
-                await this.handleConnectionError(err);
-            }
-        }
-        finally {
-            reader.releaseLock();
-        }
-    }
-    async handleConnectionError(error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error(`Connection error: ${errorMessage}`);
-        if (this.sseAbortController) {
-            this.sseAbortController.abort();
-            this.sseAbortController = null;
-        }
-        if (this.reconnectAttempts >= this.maxReconnectAttempts) {
-            console.error(`Max reconnect attempts reached. Exiting.`);
-            process.exit(1);
-        }
-        this.reconnectAttempts++;
-        this.isReady = false;
-        this.sessionHeaders = {};
-        console.error(`Reconnecting in ${this.reconnectDelay}ms (attempt ${this.reconnectAttempts})`);
-        await new Promise((r) => setTimeout(r, this.reconnectDelay));
-        await this.connect();
-    }
-    parseMultipleJSON(input) {
-        const messages = [];
-        let braceCount = 0;
-        let inString = false;
-        let escapeNext = false;
-        let startIndex = -1;
-        for (let i = 0; i < input.length; i++) {
-            const char = input[i];
-            if (escapeNext) {
-                escapeNext = false;
-                continue;
-            }
-            if (char === "\\") {
-                escapeNext = true;
-                continue;
-            }
-            if (char === '"' && !escapeNext) {
-                inString = !inString;
-            }
-            if (!inString) {
-                if (char === "{") {
-                    if (braceCount === 0)
-                        startIndex = i;
-                    braceCount++;
-                }
-                else if (char === "}") {
-                    braceCount--;
-                    if (braceCount === 0 && startIndex >= 0) {
-                        const jsonObj = input.substring(startIndex, i + 1).trim();
-                        if (jsonObj)
-                            messages.push(jsonObj);
-                        startIndex = -1;
-                    }
-                }
-            }
-        }
-        return messages;
-    }
-    async processMessage(input) {
-        if (!this.isReady) {
-            this.messageQueue.push(input);
-            return;
-        }
-        const rawInput = input.toString().trim();
-        try {
-            const fragments = this.parseMultipleJSON(rawInput);
-            if (fragments.length === 0) {
-                console.error("⚠️ No JSON found in input");
-                return;
-            }
-            for (const raw of fragments) {
-                console.error(`--> ${raw}`);
-                const body = JSON.parse(raw);
-                const isNotification = !body.hasOwnProperty("id");
-                if (isNotification) {
-                    await this.makeNotificationRequest(body);
-                    continue;
-                }
-                const responseObj = await this.makeRequest(body);
-                if (responseObj) {
-                    const respStr = JSON.stringify(responseObj);
-                    console.log(respStr);
-                }
-            }
-        }
-        catch (err) {
-            const errMsg = err instanceof Error ? err.message : String(err);
-            console.error(`❌ Request error: ${errMsg}`);
-            if (errMsg.includes("fetch") ||
-                errMsg.includes("timeout") ||
-                errMsg.includes("503") ||
-                errMsg.includes("502")) {
-                await this.handleConnectionError(err);
-            }
-            else {
-                // Send error response if we can determine the request ID
-                let originalId = null;
-                try {
-                    const fragments = this.parseMultipleJSON(rawInput);
-                    if (fragments.length > 0) {
-                        const parsed = JSON.parse(fragments[0]);
-                        if (parsed.hasOwnProperty("id")) {
-                            originalId = parsed.id;
-                        }
-                    }
-                }
-                catch (parseErr) {
-                    console.error(`⚠️ Failed to extract request ID for error response: ${parseErr instanceof Error ? parseErr.message : String(parseErr)}`);
-                }
-                if (originalId !== null) {
-                    const errorResponse = {
-                        jsonrpc: JSON_RPC_VERSION,
-                        error: {
-                            code: -32603,
-                            message: `Gateway error: ${errMsg}`,
-                        },
-                        id: originalId,
-                    };
-                    console.log(JSON.stringify(errorResponse));
-                }
-            }
-        }
-    }
-    async makeNotificationRequest(messageBody) {
-        const headers = {
-            "Content-Type": "application/json",
-            Accept: "application/json, text/event-stream",
-            ...this.sessionHeaders,
-        };
-        if (this.apiKey) {
-            headers["Authorization"] = `Bearer ${this.apiKey}`;
-        }
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), this.timeout);
-        try {
-            const resp = await fetch(this.endpointUrl, {
-                method: "POST",
-                headers,
-                body: JSON.stringify(messageBody),
-                signal: controller.signal,
-            });
-            resp.headers.forEach((value, key) => {
-                if (key.toLowerCase() === MCP_SESSION_ID_HEADER.toLowerCase()) {
-                    this.sessionHeaders[MCP_SESSION_ID_HEADER] = value;
-                }
-            });
-            if (!resp.ok && resp.status !== 202) {
-                const text = await resp.text();
-                console.error(`❌ Notification error ${resp.status}: ${text}`);
-                throw new Error(`HTTP ${resp.status}: ${text}`);
-            }
-        }
-        catch (err) {
-            if (err instanceof Error && err.name === "AbortError") {
-                throw new Error(`Notification timeout after ${this.timeout}ms`);
-            }
-            throw err;
-        }
-        finally {
-            clearTimeout(timeoutId);
-        }
-    }
-    cleanup() {
-        this.isReady = false;
-        this.sessionHeaders = {};
-        if (this.sseAbortController) {
-            this.sseAbortController.abort();
-            this.sseAbortController = null;
-        }
-    }
-    async healthCheck() {
-        try {
-            const pingRequest = {
-                jsonrpc: JSON_RPC_VERSION,
-                method: "ping",
-                id: "health-check",
-            };
-            const resp = await this.makeRequest(pingRequest);
-            return resp !== null && !resp.hasOwnProperty("error");
-        }
-        catch {
-            return false;
-        }
-    }
-}