@gavdi/cap-mcp 0.9.0 → 0.9.2

package/lib/mcp.js

@@ -3,89 +3,102 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
 const logger_1 = require("./logger");
-const crypto_1 = require("crypto");
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
 const express_1 = __importDefault(require("express"));
 const parser_1 = require("./annotations/parser");
 const utils_1 = require("./mcp/utils");
-const factory_1 = require("./mcp/factory");
 const constants_1 = require("./mcp/constants");
 const loader_1 = require("./config/loader");
-/* @ts-ignore */
-const cds = global.cds || require("@sap/cds"); // This is a work around for missing cds context
+const session_manager_1 = require("./mcp/session-manager");
 // TODO: Handle auth
+/**
+ * Main MCP plugin class that integrates CAP services with Model Context Protocol
+ * Manages server sessions, API endpoints, and annotation processing
+ */
 class McpPlugin {
-    sessions;
+    sessionManager;
     config;
     expressApp;
     annotations;
+    /**
+     * Creates a new MCP plugin instance with configuration and session management
+     */
     constructor() {
         logger_1.LOGGER.debug("Plugin instance created");
-        this.sessions = new Map();
         this.config = (0, loader_1.loadConfiguration)();
+        this.sessionManager = new session_manager_1.McpSessionManager();
+        logger_1.LOGGER.debug("Running with configuration", this.config);
     }
+    /**
+     * Handles the bootstrap event by setting up Express app and API endpoints
+     * @param app - Express application instance
+     */
     async onBootstrap(app) {
         logger_1.LOGGER.debug("Event received for 'bootstrap'");
         this.expressApp = app;
         this.expressApp.use(express_1.default.json());
-        logger_1.LOGGER.debug("WHAT IS AUTH?", cds.env.requires.auth);
-        logger_1.LOGGER.debug("WHAT IS THIS?!", cds.middlewares.auth);
         await this.registerApiEndpoints();
         logger_1.LOGGER.debug("Bootstrap complete");
     }
+    /**
+     * Handles the loaded event by parsing model definitions for MCP annotations
+     * @param model - CSN model containing definitions
+     */
     async onLoaded(model) {
         logger_1.LOGGER.debug("Event received for 'loaded'");
         this.annotations = (0, parser_1.parseDefinitions)(model);
         logger_1.LOGGER.debug("Annotations have been loaded");
     }
+    /**
+     * Handles the shutdown event by gracefully closing all MCP server sessions
+     */
     async onShutdown() {
         logger_1.LOGGER.debug("Gracefully shutting down MCP server");
-        for (const session of this.sessions.values()) {
+        for (const session of this.sessionManager.getSessions().values()) {
+            await session.transport.close();
             await session.server.close();
         }
         logger_1.LOGGER.debug("MCP server sessions has been shutdown");
     }
+    /**
+     * Sets up HTTP endpoints for MCP communication and health checks
+     * Registers /mcp and /mcp/health routes with appropriate handlers
+     */
     async registerApiEndpoints() {
+        if (!this.expressApp) {
+            logger_1.LOGGER.warn("Cannot register MCP server as there is no available express layer");
+            return;
+        }
         logger_1.LOGGER.debug("Registering health endpoint for MCP");
         this.expressApp?.get("/mcp/health", (_, res) => {
             res.json({
                 status: "UP",
             });
         });
+        logger_1.LOGGER.debug("TESTING - Annotations", this.annotations);
+        this.registerMcpSessionRoute();
+        this.expressApp?.get("/mcp", (req, res) => (0, utils_1.handleMcpSessionRequest)(req, res, this.sessionManager.getSessions()));
+        this.expressApp?.delete("/mcp", (req, res) => (0, utils_1.handleMcpSessionRequest)(req, res, this.sessionManager.getSessions()));
+    }
+    /**
+     * Registers the main MCP POST endpoint for session creation and request handling
+     * Handles session initialization and routes requests to appropriate sessions
+     */
+    registerMcpSessionRoute() {
         logger_1.LOGGER.debug("Registering MCP entry point");
         this.expressApp?.post("/mcp", async (req, res) => {
             const sessionIdHeader = req.headers[constants_1.MCP_SESSION_HEADER];
-            let sessionEntry = undefined;
-            if (sessionIdHeader && this.sessions.has(sessionIdHeader)) {
-                logger_1.LOGGER.debug("Request received - Session ID", sessionIdHeader);
-                sessionEntry = this.sessions.get(sessionIdHeader);
-            }
-            else if (!sessionIdHeader && (0, types_js_1.isInitializeRequest)(req.body)) {
-                logger_1.LOGGER.debug("Initialize session request received");
-                const server = (0, factory_1.createMcpServer)(this.config, this.annotations);
-                const transport = new streamableHttp_js_1.StreamableHTTPServerTransport({
-                    sessionIdGenerator: () => (0, crypto_1.randomUUID)(),
-                    onsessioninitialized: (sid) => {
-                        this.sessions.set(sid, {
-                            server: server,
-                            transport: transport,
-                        });
-                    },
-                });
-                transport.onclose = () => {
-                    if (!transport.sessionId || !this.sessions.has(transport.sessionId))
-                        return;
-                    this.sessions.delete(transport.sessionId);
-                };
-                await server.connect(transport);
-                sessionEntry = {
-                    server: server,
-                    transport: transport,
-                };
-            }
-            else {
+            logger_1.LOGGER.debug("MCP request received", {
+                hasSessionId: !!sessionIdHeader,
+                isInitialize: (0, types_js_1.isInitializeRequest)(req.body),
+                contentType: req.headers["content-type"],
+            });
+            const session = !sessionIdHeader && (0, types_js_1.isInitializeRequest)(req.body)
+                ? await this.sessionManager.createSession(this.config, this.annotations)
+                : this.sessionManager.getSession(sessionIdHeader);
+            if (!session) {
+                logger_1.LOGGER.error("Invalid session ID", sessionIdHeader);
                 res.status(400).json({
                     jsonrpc: "2.0",
                     error: {
@@ -94,11 +107,26 @@ class McpPlugin {
                         id: null,
                     },
                 });
+                return;
+            }
+            try {
+                await session.transport.handleRequest(req, res, req.body);
+                return;
+            }
+            catch (e) {
+                if (res.headersSent)
+                    return;
+                res.status(500).json({
+                    jsonrpc: "2.0",
+                    error: {
+                        code: -32603,
+                        message: "Internal Error: Transport failed",
+                        id: null,
+                    },
+                });
+                return;
             }
-            await sessionEntry?.transport.handleRequest(req, res, req.body);
         });
-        this.expressApp?.get("/mcp", (req, res) => (0, utils_1.handleMcpSessionRequest)(req, res, this.sessions));
-        this.expressApp?.delete("/mcp", (req, res) => (0, utils_1.handleMcpSessionRequest)(req, res, this.sessions));
     }
 }
 exports.default = McpPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gavdi/cap-mcp",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "MCP Pluging for CAP",
   "keywords": [
     "MCP",
@@ -22,9 +22,15 @@
   "repository": "github:gavdilabs/cap-mcp-plugin",
   "scripts": {
     "mock": "npm run start --workspace=test/demo",
-    "test": "jest",
+    "test": "NODE_ENV=test jest --silent",
+    "test:unit": "NODE_ENV=test jest --silent test/unit",
+    "test:integration": "NODE_ENV=test jest --silent test/integration",
     "build": "tsc",
-    "inspect": "npx @modelcontextprotocol/inspector"
+    "inspect": "npx @modelcontextprotocol/inspector",
+    "prepare": "husky",
+    "lint": "eslint",
+    "lint-staged": "lint-staged",
+    "format": "prettier --check ./src"
   },
   "peerDependencies": {
     "@sap/cds": "^9",
@@ -36,16 +42,22 @@
     "zod-to-json-schema": "^3.24.5"
   },
   "devDependencies": {
-    "@cap-js/cds-types": "^0.11.0",
+    "@cap-js/cds-types": "^0.12.0",
     "@types/express": "^5.0.3",
+    "@types/jest": "^30.0.0",
     "@types/node": "^24.0.3",
+    "@types/sinon": "^17.0.4",
+    "@types/supertest": "^6.0.2",
     "eslint": "^9.29.0",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
     "lint-staged": "^16.1.2",
     "prettier": "^3.5.3",
     "release-it": "^19.0.3",
+    "sinon": "^21.0.0",
+    "supertest": "^7.0.0",
     "ts-jest": "^29.4.0",
+    "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },
   "lint-staged": {
@@ -54,11 +66,11 @@
     ],
     "*.ts": [
       "eslint",
-      "prettier --check ./src"
+      "prettier ./src --check"
     ],
     "*.js": [
       "eslint",
-      "prettier --check ./src"
+      "prettier ./src --check"
     ]
   },
   "workspaces": [