@sassoftware/sas-score-mcp-serverjs 0.4.0 → 0.4.1

package/cli.js

@@ -22,7 +22,6 @@ import readCerts from './src/toolHelpers/readCerts.js';
 
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
-import { parseArgs } from "node:util";
 
 import NodeCache from 'node-cache';
 //import getOpts from './src/toolHelpers/getOpts.js';
@@ -31,97 +30,16 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 
 let pkg = fs.readFileSync(__dirname + '/package.json', 'utf8');
 
-// Parse command line arguments
-const args = parseArgs({
-  options: {
-    port: {
-      type: 'string',
-      short: 'p',
-      description: 'Port to run the server on'
-    },
-    mcptype: {
-      type: 'string',
-      short: 'm',
-      description: 'MCP server type (http or stdio)'
-    },
-    viya: {
-      type: 'string',
-      short: 'v',
-      description: 'Viya server URL'
-    },
-    authflow: {
-      type: 'string',
-      short: 'a',
-      description: 'Authentication flow (sascli, code, token)'
-    },
-    profile: {
-      type: 'string',
-      description: 'SAS CLI profile name'
-    },
-    config: {
-      type: 'string',
-      description: 'SAS CLI config directory'
-    },
-    envfile: {
-      type: 'string',
-      short: 'e',
-      description: 'Environment file path'
-    },
-    help: {
-      type: 'boolean',
-      short: 'h',
-      description: 'Show help message'
-    },
-    version: {
-      type: 'boolean',
-      short: 'v',
-      description: 'Show version'
-    }
-  },
-  strict: false,
-  allowPositionals: false
-});
-
-// Handle help flag
-if (args.values.help) {
-  console.log(`
-Usage: sas-score-mcp-serverjs [options]
-
-Options:
-  -p, --port <port>           Port to run the server on (default: 8080)
-  -m, --mcptype <type>        MCP server type: http or stdio (default: http)
-  -v, --viya <url>            Viya server URL
-  -a, --authflow <flow>       Authentication flow: sascli, code, or token
-  --profile <name>            SAS CLI profile name
-  --config <path>             SAS CLI config directory
-  -e, --envfile <path>        Environment file path
-  -h, --help                  Show this help message
-  --version                   Show version
-
-Environment Variables:
-  Use .env file or set environment variables for configuration.
-  See README.md for more information.
-  `);
-  process.exit(0);
-}
-
-// Handle version flag
-if (args.values.version) {
-  let pkgJson = JSON.parse(pkg);
-  console.log(pkgJson.version);
-  process.exit(0);
-}
-
 if (process.env.ENVFILE === 'FALSE') {
   //use this when using remote mcp server and no .env file is desired
   console.error('[Note]: Skipping .env file as ENVFILE is set to FALSE...');
 } else {
   console.error('Working Directory', process.cwd());
-  let envf = process.env.ENVFILE || (process.cwd() + '\\.env');
+  let envf = process.cwd() + '\\.env'; 
   //__dirname + '\\.env';
   console.error('Env file:', envf); 
   if (fs.existsSync(envf)) {
-    console.error(`Loading environment variables from ${envf}...`);
+    console.error(`Loading environment variables rom ${envf}...`);
     let e = iconfig(envf); // avoid dotenv since it writes to console.log
     console.error('[Note]: Environment variables loaded from .env file...');
     console.error('Loaded env variables:', e);
@@ -133,37 +51,6 @@ if (process.env.ENVFILE === 'FALSE') {
   }
 }
 
-// Apply command line arguments to override environment variables
-if (args.values.port) {
-  process.env.PORT = args.values.port;
-  console.error(`[Note] PORT set from command line: ${args.values.port}`);
-}
-
-if (args.values.mcptype) {
-  process.env.MCPTYPE = args.values.mcptype;
-  console.error(`[Note] MCPTYPE set from command line: ${args.values.mcptype}`);
-}
-
-if (args.values.viya) {
-  process.env.VIYA_SERVER = args.values.viya;
-  console.error(`[Note] VIYA_SERVER set from command line: ${args.values.viya}`);
-}
-
-if (args.values.authflow) {
-  process.env.AUTHFLOW = args.values.authflow;
-  console.error(`[Note] AUTHFLOW set from command line: ${args.values.authflow}`);
-}
-
-if (args.values.profile) {
-  process.env.SAS_CLI_PROFILE = args.values.profile;
-  console.error(`[Note] SAS_CLI_PROFILE set from command line: ${args.values.profile}`);
-}
-
-if (args.values.config) {
-  process.env.SAS_CLI_CONFIG = args.values.config;
-  console.error(`[Note] SAS_CLI_CONFIG set from command line: ${args.values.config}`);
-}
-
 if (process.env.APPHOST == null) {
   process.env.APPHOST = 'localhost';
 } 
@@ -184,7 +71,7 @@ console.error(
 // and storage provided by cloud providers
 console.error(process.env.COMPUTECONTEXT);
 debugger;
-let sessionCache = new NodeCache({ stdTTL: 24 *60*60, checkperiod: 2 * 60, useClones: false });
+let sessionCache = new NodeCache({ stdTTL: 60*60, checkperiod: 2 * 60, useClones: false });
 
 //
 // Load environment variables from .env file if present
@@ -249,8 +136,6 @@ const appEnvBase = {
     process.env.TOOLSETS != null
       ? process.env.TOOLSETS.split(',')
       : ['default'],
-  // command line arguments
-  cliArgs: args.values,
   // user defined tools
   //runtime variables
   tokenRefresh: process.env.TOKENREFRESH === 'FALSE' ? false : true,
@@ -342,20 +227,17 @@ let appEnvTemplate = Object.assign({}, appEnvBase);
 
 sessionCache.set('appEnvTemplate', appEnvTemplate);
 
-let transports = {
-  "dummy": null
-};
+let transports = {'dummy': null};
 sessionCache.set('transports', transports);
 
 // set this for stdio transport use
 // dummy sessionId for use in the tools  
-let useHapi = process.env.AUTHFLOW === 'code' ? true : false;
+let useHapi = (process.env.USEHAPI === 'TRUE') ? true : false;
 console.error('[Note] appEnvBase is', JSON.stringify(appEnvBase, null,2));
-// creat a dummy sessionId for stdio since there is only one session and transport in that case, and tools need a sessionId to access the appEnvBase and contexts
-let sessionId = randomUUID();
-sessionCache.set(sessionId, appEnvBase);
-useHapi = false; // for now disable hapi for authflow code since it is not working well, and code flow is not commonly used in server side applications, and http transport works better for code flow since it requires multiple back and forth calls to complete the auth process which is not ideal for stdio transport, this will be revisited in the future to either fix the issues with hapi or implement the code flow in a way that works better with stdio transport
 if (mcpType === 'stdio') {
+  let sessionId = randomUUID();
+  sessionCache.set('currentId', sessionId);
+  sessionCache.set(sessionId, appEnvBase);
   console.error('[Note] Setting up stdio transport with sessionId:', sessionId);
   console.error('[Note] Used in setting up tools and some persistence(not all).');
   await coreSSE(mcpServer);
@@ -363,7 +245,7 @@ if (mcpType === 'stdio') {
 } else {
   console.error('[Note] Starting HTTP MCP server...');
   if (useHapi === true) {
-    process.env.AUTHTYPE = null;
+    process.env.AUTHFLOW = null;;
     await hapiMcpServer(mcpServer, sessionCache, appEnvBase);
     console.error('[Note] Using HAPI HTTP server...')
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/sas-score-mcp-serverjs",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A mcp server for SAS Viya",
   "author": "Deva Kumar <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -39,8 +39,7 @@
     "src",
     "cli.js",
     "openApi.json",
-    "openApi.yaml",
-    "skills"
+    "openApi.yaml"
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.25.1",

package/src/createMcpServer.js

@@ -77,7 +77,6 @@ async function createMcpServer(cache, _appContext) {
     let toolHandler = wrapf(cache, tool.handler);
 
     mcpServer.tool(toolName, tool.description, tool.schema, toolHandler);
-    
     toolNames.push(toolName);
   });
   console.error(`[Note] Registered ${toolSet.length} tools: ${toolNames}`);

package/src/expressMcpServer.js

@@ -95,9 +95,10 @@ app.get("/openapi.json", (req, res) => {
 
 // handle processing of information in header.
 function requireBearer(req, res, next) {
+
+
   // process any new header information
-  console.error("=======================================================");
-  console.error("Processing headers for incoming request to /mcp endpoint");
+
   // Allow different VIYA server per sessionid(user)
   let headerCache = {};
   if (req.header("X-VIYA-SERVER") != null) {
@@ -112,10 +113,6 @@ function requireBearer(req, res, next) {
     headerCache.bearerToken = hdr.slice(7);
     headerCache.AUTHFLOW = "bearer";
     console.error("[Note] Using user supplied bearer token for authorization");
-    console.error("[Debug] Bearer token starts with:", headerCache.bearerToken);
-  } else {
-    console.error("[Note] No bearer token supplied in Authorization header");
-    headerCache.bearerToken = null;
   }
 
   // faking out api key since Viya does not support 
@@ -128,27 +125,22 @@ function requireBearer(req, res, next) {
   }
   cache.set("headerCache", headerCache);
   next();
-  console.error("Finished processing headers for /mcp request");
-  console.log("=======================================================");
 }
 
 // process mcp endpoint requests
 const handleRequest = async (req, res) => {
-  let transport = null;
+  let transport;
   let transports = cache.get("transports");
-  console.error("=========================================================");
-  console.error("Processing POST /mcp request");
   if (transports == null) {
-    console.error("[Error] ***** transports cache is null. This is an error");
-    transports = {};
-    cache.set("transports", transports);
+    console.error("[Error] No transports found in cache. Initializing empty transports object.");
+    transports = {'dummy': null };
   }
-
   console.error("current transports in cache:", Object.keys(transports)); 
   try {
 
     let sessionId = req.headers["mcp-session-id"];
-    console.error("[Note]Incoming session ID:", sessionId);
+    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)) {
@@ -168,7 +160,7 @@ const handleRequest = async (req, res) => {
       });
       // Clean up transport when closed
       transport.onclose = () => {
-        if (transport.sessionId && transports[transport.sessionId]) {
+        if (transport.sessionId) {
           delete transports[transport.sessionId];
         }
       };
@@ -176,11 +168,9 @@ const handleRequest = async (req, res) => {
       await mcpServer.connect(transport);
 
       // Save transport data and app context for use in tools
-      console.error('[Note] Connected to mcpServer');
+      console.error('connected mcpServer');
       cache.set("transports", transports);
-      console.error("=======================================================");
       return await transport.handleRequest(req, res, req.body);
-    
       // cache transport
   
     } else if (sessionId != null) {
@@ -189,8 +179,8 @@ const handleRequest = async (req, res) => {
       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 404 error with instructions for the user");
-        res.status(404).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.`);
+        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;
       }
 
@@ -207,15 +197,9 @@ const handleRequest = async (req, res) => {
         let headerCache = cache.get("headerCache");
         _appContext = Object.assign({}, appEnvTemplate, headerCache);
         cache.set(sessionId, _appContext);
-      } else {
-        let headerCache = cache.get("headerCache");
-        console.error('compare tokens', headerCache.bearerToken === _appContext.bearerToken);
-        _appContext = Object.assign(_appContext, headerCache);
-        console.error('New bearerToken:', _appContext.bearerToken);
-        cache.set(sessionId, _appContext);
       }
       console.error("[Note] Using existing transport for session ID:", sessionId);
-      console.error("==========================================================");
+
       await transport.handleRequest(req, res, req.body);
       return;
     }
@@ -239,27 +223,23 @@ const handleRequest = async (req, res) => {
   }
 };
 const handleGetDelete = async (req, res) => {
-  console.error("=========================================================");
-  console.error(`[Note] ${req.method} /mcp called`);
-  const sessionId = req.headers["mcp-session-id"];
-  console.error("[Note] SessionId:", sessionId);
+  console.error(req.method, "/mcp called");
 
+  const sessionId = req.headers["mcp-session-id"];
+  console.error("Headers:", sessionId);
+  console.error("Handling GET/DELETE for session ID:", sessionId);
   let transports = cache.get("transports");
   let transport = (sessionId == null) ? null : transports[sessionId];
-  console.error("[Note] Transport found:", transport != null);
+  console.error("Found transport:", transport != null);
   if (!sessionId || transport == null) {
-    res.status(404).send(`[Error] In ${req.method}: Invalid or missing session ID ${sessionId}`);
+    res.status(200).send(`[Error] In ${req.method}: Invalid or missing session ID ${sessionId}`);
     return;
   }
-  if (req.method === "GET") { 
-     await transport.handleRequest(req, res);
-     return;
-  }
+  await transport.handleRequest(req, res);
   if (req.method === "DELETE" && sessionId != null) {
-    console.error("[Note] Deleting transport and cache for session ID:", sessionId);
+    console.error("Deleting transport and cache for session ID:", sessionId);
     delete transports[sessionId];
     cache.del(sessionId);
-    res.status(201).send(`[Info] Deleted session ${sessionId}`);
   }
 }
 
@@ -267,40 +247,34 @@ app.options("/mcp", (_, res) => res.sendStatus(204));
 app.post("/mcp", requireBearer, handleRequest);
 app.get("/mcp", handleGetDelete);
 app.delete("/mcp", handleGetDelete);
-app.get("/StartUp", (_req, res) => {
-  console.error("===================================================================")
-  console.error("Received request for Startup  endpoint. Current app status:", appStatus);
-  console.error("===================================================================");
+app.get("/startup", (_req, res) => {
+  console.error("Received request for startup endpoint");
   if (appStatus === false) {
-    return res.status(503).json({ status: "starting" });
+    return res.status(500).json({ status: "starting" });
   }
   return res.status(200).json({ status: "started" });
 });
 app.get("/tlogon", async (_req, res) => {
   console.error(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Testing logon");
   if (appStatus === false) {
-     return res.status(503).json({ status: "not ready" });
+     return res.status(500).json({ status: "not ready" });
   }
   let r = await tlogon(baseAppEnvContext);
   console.error(r);
   return res.status(200).json(r);
 });
 app.get("/status", (_req, res) => {
-  console.error("===================================================================")
   console.error("Received request for status endpoint. Current app status:", appStatus);
-  console.error("===================================================================");
   if (appStatus === false) {
-     return res.status(503).json({ status: "not ready" });
+     return res.status(500).json({ status: "not ready" });
   }
   return res.status(200).json({ status: "ready" });
 });
 
 app.get("/ready", (_req, res) => {
-  console.error("===================================================================")
   console.error("Received request for ready endpoint. Current app status:", appStatus);
-  console.error("===================================================================")
   if (appStatus === false) {
-     return res.status(503).json({ status: "not ready" });
+     return res.status(500).json({ status: "not ready" });
   }
   return res.status(200).json({ status: "ready" });
 });

package/src/handleGetDelete.js

@@ -5,25 +5,22 @@
 
 async function handleGetDelete(mcpServer, cache, req, h) {
     const sessionId = req.headers["mcp-session-id"];
-    console.error("=======================================================");
-    console.error(`[Note] Handling ${req.method} for session ID:`, sessionId);
+    console.error(`Handling ${req.method} for session ID:`, sessionId);
     let transports = cache.get("transports");
     let transport = transports[sessionId];
     if (!sessionId || transport == null) {
         console.error('[Note] Looks like a fresh start - no session id or transport found');
-        return h.abandon;
+        h.abandon;
     }
 
      if (req.method === "GET") {
         // You can customize the response as needed
-        console.error("[Note] Payload:", req.payload);
-        console.log("======================================================");
         await transport.handleRequest(req.raw.req, req.raw.res, req.payload);
         return h.abandon;
      }
 
     if (req.method === "DELETE") {
-        console.error("[Note] Deleting transport and cache for session ID:", sessionId);
+        console.error("Deleting transport and cache for session ID:", sessionId);
         delete transports[sessionId];
         cache.del(sessionId);
         return h.response(`[Info] In DELETE: Session ID ${sessionId} deleted`).code(201);

package/src/hapiMcpServer.js

@@ -128,30 +128,38 @@ async function hapiMcpServer(mcpServer, cache, baseAppEnvContext) {
       },
       {
         method: ["GET"],
-        path: "/ready",
+        path: "/startz",
         options: {
           handler: async (req, h) => {
-            let status = {status: 1};
-            console.error("Ready check requested, returning:", status);
-            return h.response(status).code(200).type('application/json');
+            let status = { status: (process.env.HEALTH === 'true') ? 'ready' : 'starting' };
+            console.error("startz check requested, returning:", status);
+            if (process.env.HEALTH !== 'true') {
+                return h.response(status).code(200).type('application/json');
+            } else {
+                return h.response(status).code(503).type('application/json');
+            }
           },
           auth: false,
-          description: "probe readiness of the server",
+          description: "Help",
           notes: "Help",
           tags: ["mcp"],
         }
       },
       {
         method: ["GET"],
-        path: "/StartUp",
+        path: "/readyz",
         options: {
           handler: async (req, h) => {
-            let status = { status: 1 };
-            console.error("Startup check requested, returning:", status);
-            return h.response(status).code(200).type('application/json');
+            let status = { status: (process.env.HEALTH === 'true') ? 'ready' : 'starting' };
+            console.error("readyz check requested, returning:", status);
+            if (process.env.HEALTH !== 'true') {
+              return h.response(status).code(200).type('application/json');
+            } else {
+              return h.response(status).code(503).type('application/json');
+            }
           },
           auth: false,
-          description: "probe startup of the server",
+          description: "Help",
           notes: "Help",
           tags: ["mcp"],
         }

package/src/toolHelpers/_jobSubmit.js

@@ -12,8 +12,6 @@ async function _jobSubmit(params) {
   // setup
   if (name === 'program') {
     let src = `
-      cas mycas;
-      caslib _all_ assign;
      proc sql;
      create table work.query_results as
      ${scenario.sql};

package/src/toolHelpers/_listLibrary.js

@@ -6,70 +6,53 @@
 import restafedit from '@sassoftware/restafedit';
 import deleteSession from './deleteSession.js';
 
-async function _listLibrary(params) {
+async function _listLibrary(params ){
 
   let { server, limit, start, name, _appContext } = params;
- 
-  const _ilistLibrary = async (params) => {
-    let { server, limit, start, name, _appContext } = params;
-    console.error(_appContext);
-    let config = {
-      casServerName: _appContext.cas,
-      computeContext: _appContext.sas,
-      source: (server === 'sas') ? 'compute' : server,
-      table: null
+  
+  let config = {
+    casServerName: _appContext.cas,
+    computeContext: _appContext.sas,
+    source: (server === 'sas') ? 'compute' : server,
+    table: null
+  };
+  let appControl;
+  try {
+    // setup request control
+    appControl = await restafedit.setup(
+      _appContext.logonPayload,
+      config
+      ,null,{},'user',{}, {}, _appContext.storeConfig
+    );
+    
+    // query parameters
+    let payload = {
+      qs: {
+        limit: (limit != null) ? limit : 10,
+        start: start - 1
+      }
     };
-    let appControl;
-    try {
-      // setup request control
-      appControl = await restafedit.setup(
-        _appContext.logonPayload,
-        config
-        , null, {}, 'user', {}, {}, _appContext.storeConfig
-      );
-
-      // query parameters
-      let payload = {
-        qs: {
-          limit: (limit != null) ? limit : 10,
-          start: start - 1
-        }
-      };
 
-      if (name != null) {
-        payload.qs = {
-          filter: `eq(name, '${name}')`
-        }
+    if (name != null) {
+      payload.qs = {
+        filter: `eq(name, '${name}')`
       }
-
-      let items = await restafedit.getLibraryList(appControl, payload);
-      let response = { libraries: items };
+    }
+   
+    let items = await restafedit.getLibraryList(appControl, payload);
+    let response = {libraries: items};
+    await deleteSession(appControl);
+    
+    return { content: [{ type: 'text', text: JSON.stringify(response) }],
+      structuredContent: response
+    };
+  } catch (err) {
+    console.error(JSON.stringify(err));
+    if (appControl != null) {
       await deleteSession(appControl);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(response) }],
-        structuredContent: response
-      };
-    } catch (err) {
-      console.error(JSON.stringify(err));
-      if (appControl != null) {
-        await deleteSession(appControl);
-      }
-      return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] };
     }
+    return { isError: true, content: [{ type: 'text', text: JSON.stringify(err) }] };
   }
-
-  let source = (server === 'all') ? ['sas', 'cas'] : [server];
-  let response = {};
-
-  for (let i = 0; i < source.length; i++) {
-    let liblist = await _ilistLibrary({ server: source[i], limit, start, name, _appContext });
-    response[source[i]] = liblist.structuredContent;
-  }
-  return {
-    content: [{ type: 'text', text: JSON.stringify(response) }],
-    structuredContent: response
-  };
 }
 
 export default _listLibrary;

package/src/toolHelpers/getLogonPayload.js

@@ -16,11 +16,10 @@ async function igetLogonPayload(_appContext) {
   console.error('[Info] Getting logon payload...',_appContext.AUTHFLOW);
   // Use cached logonPayload if available
   // This will cause timeouts if the token expires
-  /*if (_appContext.contexts.logonPayload != null && _appContext.tokenRefresh !== true) {
+  if (_appContext.contexts.logonPayload != null && _appContext.tokenRefresh !== true) {
     console.error("[Note] Using cached logonPayload information");
     return _appContext.contexts.logonPayload;
   }
-    */
 
   if (_appContext.AUTHFLOW === 'code') {
     let oauthInfo = _appContext.contexts.oauthInfo;
@@ -53,7 +52,6 @@ async function igetLogonPayload(_appContext) {
       token: _appContext.bearerToken,
       tokenType: "Bearer",
     };
-    console.error("[Note] Bearer token in logonPayload ", _appContext.bearerToken);
     return logonPayload;
   }