@sassoftware/sas-score-mcp-serverjs 0.3.19 → 0.3.29-0

package/src/toolHelpers/refreshToken.js

@@ -1,49 +1,51 @@
- /*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
- import { Agent, fetch } from 'undici';
- import getOpts from './getOpts.js';
- async function refreshToken(_appContext,params) {
-  let {host, token} = params;
-    const url = `${host}/SASLogon/oauth/token`;
-    console.error('[Info] Refresh token...', token);
-    let opts = getOpts(_appContext);
-    console.error('opts: ', opts);
-    const agent = new Agent({
-      connect: opts
-    });
-    console.error('[Info] Refreshing token...', token);
-    const body = new URLSearchParams({
-      grant_type: 'refresh_token',
-      refresh_token: token,
-      client_id: 'sas.cli'
+/*
+* Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+import { Agent, fetch } from 'undici';
+
+async function refreshToken(_appContext, params) {
+  let { host, token } = params;
+  let url = `${host}/SASLogon/oauth/token`;
+
+  let aconnect = {
+    ca: _appContext.contexts.viyaCert.ca,     // trust this CA
+    rejectUnauthorized: false  // or false, if you really want to bypass checks
+  }
+
+  const agent = new Agent(aconnect);
+
+  console.error('[Info] Refreshing token...', token);
+  const ibody = {
+    grant_type: 'refresh_token',
+    refresh_token: token,
+    client_id: 'sas.cli'
+  };
+
+  let body = new URLSearchParams(ibody);
+  try {
+    const response = await fetch(url, {
+      method: 'POST',
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/x-www-form-urlencoded',
+        dispatcher: agent
+      },
+      body: body.toString()
     });
-    
-    try {
-      const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/x-www-form-urlencoded',
-          dispatcher: agent
-        },
-        body: body.toString()
-      });
-
-      if (!response.ok) {
-        const error = await response.text();
-        console.error('[Error] Failed to refresh token: ', error);
-        throw new Error(error);
-      }
-
-      const data = await response.json();
-      console.error('[Info] Token refreshed successfully: ', data.access_token);
-      return data.access_token;
-    } catch (err) {
-      console.error('[Error] Failed to refresh token: ', err);
-      throw err;
+
+    if (!response.ok) {
+      const error = await response.text();
+      console.error('[Error] Failed to refresh token: ', error);
+      throw new Error(error);
     }
+
+    const data = await response.json();
+    return data.access_token;
+  } catch (err) {
+    console.error('[Error] Failed to refresh token: ', err);
+    throw err;
   }
-  
-  export default refreshToken;
+}
+
+export default refreshToken;

package/src/toolHelpers/refreshTokenOauth.js

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
  import { Agent, fetch } from 'undici';
- import getOpts from './getOpts.js';
+ //import getOpts from './getOpts.js';
  async function refreshTokenOauth(_appContext, oauthInfo ){
  
     const url = `${process.env.VIYA_SERVER}/SASLogon/oauth/token`;
-    let opts = getOpts(_appContext);
+    let opts = _appContext.contexts.appCert;
 
     const agent = new Agent({
       connect: opts

package/src/toolHelpers/tlogon.js

@@ -0,0 +1,9 @@
+import getLogonPayload from "./getLogonPayload.js";
+
+async function tlogon(_appContext) {
+    console.error('[Info] Starting tlogon...');
+    let r = await getLogonPayload(_appContext);
+    console.error('[Info] tlogon completed');
+    return r;
+}
+export default tlogon;

package/src/toolSet/devaScore.js

@@ -38,7 +38,7 @@ Disambiguation & Clarification
 Examples (→ mapped params)
 - "Calculate deva score for 5 and 10" → { a: 5, b: 10 } returns 630
 - "Score 1 and 2" → { a: 1, b: 2 } returns 126
-- For multiple numbers, chain calls: deva(1,2)→126, then deva(126,3)→5418
+- For multiple numbers, chain calls: devaScore(1,2)→126, then devaScore(126,3)→5418
 
 Negative Examples (should NOT call deva-score)
 - "Score this customer with the credit model" (use model-score instead)
@@ -58,12 +58,17 @@ For sequences of numbers, use a left-to-right fold: call devaScore(first, second
             a: z.number(),
             b: z.number()
         },
-        handler: async ({ a, b,_appContext }) => {
+        handler: async ({ a, b }) => {
             console.error( a, b);
-            return { content: [{ type: 'text', 
-                text: String((a + b) * 42) }] }
+            let r = {score: (a + b) * 42};
+            console.error('deva score result', r);
+            return {
+                content: [{type: 'text', text: 'deva score result: ' + JSON.stringify(r)}],
+                structuredContent: r
+             };
+            }
         }
-    }
+        
     return spec;
 }
 export default devaScore;

package/src/toolHelpers/getOpts.js

@@ -1,51 +0,0 @@
-/**
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * Helper function to get TLS options(for the app server) from specified directory
- * signed certificates 
- * for testing you can use mkcert
- * if this function return a null, coreehttp will create unsigned certs
- * @param {Object} _appContext - Application context containing SSLCERT property
- */
-
-import readCerts from './readCerts.js';
-function getOpts(_appContext) {
-
-    if (_appContext.tlsOpts != null) {
-        return _appContext.tlsOpts;
-    }
-    let r = readCerts(_appContext.SSLCERT);
-    _appContext.tlsOpts = r;
-    return r;
-
-
-    /*
-    let tlsdir = _appContext.SSLCERT;
-    if (tlsdir == null || tlsdir === 'NONE') {
-        return null;
-    }
-
-    console.error("[Note] Using TLS dir: " + tlsdir);
-    if (fs.existsSync(tlsdir) === false) {
-        console.error("[Warning] Specified TLS dir does not exist: " + tlsdir);
-        return null;
-    }
-
-    let listOfFiles = fs.readdirSync(tlsdir);
-    console.error("[Note] TLS/SSL files found: " + listOfFiles);
-    let options = {};
-    for(let i=0; i < listOfFiles.length; i++) {
-        let fname = listOfFiles[i];
-        let name = tlsdir + '/' + listOfFiles[i];
-        let key = fname.split('.')[0];
-        options[key] = fs.readFileSync(name, { encoding: 'utf8' });
-    }
-    console.error('TLS FILES', Object.keys(options));
-    _appContext.tlsOpts = options;
-    return options;
-    */
-
-}
-export default getOpts;

package/src/toolHelpers/getOptsViya.js

@@ -1,44 +0,0 @@
-/**
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import readCerts from './readCerts.js';
-function getOptsViya(_appContext) {
-
-    if (_appContext.contexts.viyaCert != null) {
-        console.error('[Note] Using cached viyaOpts');
-        return _appContext.contexts.viyaCert;
-    }
-    let r = readCerts(_appContext.VIYACERT);
-    _appContext.contexts.viyaCert = r;
-    return r;
-
-    /*
-    let tlsdir = _appContext.VIYACERT;
-    if (tlsdir == null || tlsdir === 'NONE') {
-        return {};
-    }
-
-    console.error(`[Note] Using VIYACERT dir: ` + tlsdir);
-    if (fs.existsSync(tlsdir) === false) {
-        console.error("[Warning] Specified VIYACERT dir does not exist: " + tlsdir);
-        return {};
-    }
-
-    let listOfFiles = fs.readdirSync(tlsdir);
-    console.error("[Note] TLS/SSL files found: " + listOfFiles);
-    let options = {};
-    for(let i=0; i < listOfFiles.length; i++) {
-        let fname = listOfFiles[i];
-        let name = tlsdir + '/' + listOfFiles[i];
-        let key = fname.split('.')[0];
-        console.error('Reading TLS file: ' + name + ' as key: ' + key);
-        options[key] = fs.readFileSync(name, { encoding: 'utf8' });
-    }
-    console.error('VIYACERT FILES', Object.keys(options));
-    _appContext.contexts.viyaCert = options;
-    return options;
-    */
-
-}
-export default getOptsViya;