@sassoftware/sas-score-mcp-serverjs 0.3.16 → 0.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/sas-score-mcp-serverjs",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "A mcp server for SAS Viya",
   "author": "Deva Kumar <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "debug": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0  node --inspect-brk cli.js",
     "getViyatls": "bash ./scripts/getViyaca.sh",
     "deploy": "bash ./deploy.sh",
-    "push2acr": "bash ./push2acr.sh",
+    "push2acr": "cd docker && bash ./push2acr.sh",
     "bump": "npm version prerelease",
     "pub": "npm publish --tag dev --access public"
   },

package/src/expressMcpServer.js

@@ -26,6 +26,7 @@ async function expressMcpServer(mcpServer, cache, baseAppEnvContext) {
   cache.set("headerCache", {});
 
   const app = express();
+  let appStatus = false;
 
   app.use(express.json({ limit: "50mb" }));
   app.use(
@@ -49,6 +50,9 @@ async function expressMcpServer(mcpServer, cache, baseAppEnvContext) {
   // setup routes
   app.get("/health", (req, res) => {
     console.error("Received request for health endpoint");
+    if (appStatus === false) {
+      return res.status(500).json({ status: "not healthy" });
+    }
     let health = {
       name: "@sassoftware/mcp-server",
       version: baseAppEnvContext.version,
@@ -132,14 +136,46 @@ const handleRequest = async (req, res) => {
   try {
 
     let sessionId = req.headers["mcp-session-id"];
+    console.error("========================================================");
+    console.error("post /mcp called with session ID:", sessionId);
+    let body = (req.body == null) ? 'no body' : JSON.stringify(req.body);
+    console.error('[Note] Payload is ', body);
+    if (/*!sessionId &&*/ isInitializeRequest(req.body)) {
+      // create transport
+      console.error("[Note] Initializing new transport for MCP session...");
+      
+      transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: () => randomUUID(),
+        enableJsonResponse: true,
+        enableDnsRebindingProtection: true,
+        onsessioninitialized: (sessionId) => {
+          // Store the transport by session ID
+          console.error('Session initialized');
+          console.error("[Note] Transport initialized with ID:", sessionId);
+          transports[sessionId] = transport;
+        },
+      });
+      // Clean up transport when closed
+      transport.onclose = () => {
+        if (transport.sessionId) {
+          delete transports[transport.sessionId];
+        }
+      };
+      console.error("[Note] Connecting mcpServer to new transport...");
+      await mcpServer.connect(transport);
 
-    // we have session id, get existing transport
-    console.error('>>>>>>>>>>>>>> Received request for MCP endpoint with session ID:', req.method, sessionId);
-    if (sessionId != null) {
-      console.error("Looking for transport with session ID:", sessionId);
+      // Save transport data and app context for use in tools
+      console.error('connected mcpServer');
+      cache.set("transports", transports);
+      return await transport.handleRequest(req, res, req.body);
+      // cache transport
+  
+    } else if (sessionId != null) {
+      console.error('[Note] Incoming session ID:', sessionId);
       transport = transports[sessionId];
-      console.error("Found transport:", transport != null);
+      console.error("[Note] Found transport:", transport != null);
       if (transport == null) {
+        // this can happen if client is holding on to old session id 
         console.error("[Error] No transport found for session ID:", sessionId, "Returning a 400 error with instructions for the user");
         res.status(400).send(`Invalid or missing session ID ${sessionId}. Please ensure your MCP client is configured to use the correct session ID returned in the 'mcp-session-id' header of the response from the /mcp endpoint.`);
         return;
@@ -166,38 +202,7 @@ const handleRequest = async (req, res) => {
     }
 
     // initialize request
-    else if (!sessionId && isInitializeRequest(req.body)) {
-      // create transport
-      console.error("[Note] Initializing new transport for MCP session...");
-      console.error({body: JSON.stringify(req.body)});
-      transport = new StreamableHTTPServerTransport({
-        sessionIdGenerator: () => randomUUID(),
-        enableJsonResponse: true,
-        enableDnsRebindingProtection: true,
-        onsessioninitialized: (sessionId) => {
-          // Store the transport by session ID
-          console.error("++++++++++++++++++++++++++++++ Transport initialized with ID:", sessionId);
-          transports[sessionId] = transport;
-        },
-      });
-      // Clean up transport when closed
-      transport.onclose = () => {
-        if (transport.sessionId) {
-          delete transports[transport.sessionId];
-        }
-      };
-      console.error("[Note] Connecting mcpServer to new transport...");
-      console.error('connecting mcp Server with session ID:', transport.sessionId);
-      console.error('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> connecting mcp Server with session ID:', transport.sessionId);
-      await mcpServer.connect(transport);
-
-      // Save transport data and app context for use in tools
-      console.error('connected mcpServer');
-      cache.set("transports", transports);
-      return await transport.handleRequest(req, res, req.body);
-      // cache transport
-  
-    }
+    
   }
   catch (error) {
     console.error("Error handling MCP request:", error);
@@ -237,18 +242,28 @@ app.post("/mcp", requireBearer, handleRequest);
 app.get("/mcp", handleGetDelete);
 app.delete("/mcp", handleGetDelete);
 app.get("/startup", (_req, res) => {
-  if (appServer == null) {
+  console.error("Received request for startup endpoint");
+  if (appStatus === false) {
     return res.status(500).json({ status: "starting" });
   }
   return res.status(200).json({ status: "started" });
 });
-app.get("/ready", (_req, res) => {
-  if (appServer == null) {
+
+app.get("/status", (_req, res) => {
+  console.error("Received request for status endpoint. Current app status:", appStatus);
+  if (appStatus === false) {
      return res.status(500).json({ status: "not ready" });
   }
   return res.status(200).json({ status: "ready" });
 });
 
+app.get("/ready", (_req, res) => {
+  console.error("Received request for ready endpoint. Current app status:", appStatus);
+  if (appStatus === false) {
+     return res.status(500).json({ status: "not ready" });
+  }
+  return res.status(200).json({ status: "ready" });
+});
 // Start the server
 let appEnvBase = cache.get("appEnvBase");
 
@@ -279,7 +294,10 @@ if (appEnvBase.HTTPS === 'TRUE') {
   console.error("[Note] Press Ctrl+C to stop the server");
 
   appServer = https.createServer(appEnvBase.tlsOpts, app);
-  appServer.listen(PORT, "0.0.0.0", () => { });
+  appServer.listen(PORT, "0.0.0.0", () => { 
+     console.error( `[Note] Express server successfully bound to 0.0.0.0:${PORT}` );
+     appStatus= true;
+  });
 } else {
   console.error(`[Note] MCP Server listening on port ${PORT}`);
   console.error("[Note] Visit http://localhost:8080/health for health check");
@@ -289,6 +307,7 @@ if (appEnvBase.HTTPS === 'TRUE') {
   console.error("[Note] Press Ctrl+C to stop the server");
   try {
     appServer = app.listen(PORT, "0.0.0.0", () => {
+      appStatus = true;
       console.error(
         `[Note] Express server successfully bound to 0.0.0.0:${PORT}`
       );