@sassoftware/viya-serverjs 0.5.4 → 0.6.1-0

package/lib/plugins/setDefaultRoutes.js

@@ -2,7 +2,7 @@
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _handlers = require("../handlers");
-var _setContext = _interopRequireDefault(require("./setContext"));
+var _setContext = _interopRequireDefault(require("./setContext.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -45,7 +45,8 @@ module.exports = function setDefaultRoutes(server, options) {
       strategy: "sas"
     };
   }
-  var getAppb = _handlers.getApp.bind(null, process.env.USETOKEN != null && process.env.USETOKEN.toUpperCase() === "TRUE" ? options : null);
+  var getAppb = _handlers.getApp.bind(null, options // process.env.USETOKEN === "YES" ? options : null
+  );
   console.log("Default strategy", authDefault);
   console.log("Logon strategy", authLogon);
   options.authDefault = authDefault;
@@ -56,7 +57,7 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName, "/logon"),
     options: {
-      auth: /*authLogon*/options.authFlow === "server" ? {
+      auth: options.authFlow === "server" ? {
         mode: "try",
         strategy: "sas"
       } : null,
@@ -72,9 +73,10 @@ module.exports = function setDefaultRoutes(server, options) {
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
-                console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>in logon');
+                debug('logonhandler', req.auth.credentials);
+                console.log('In logon handler', options.authFlow);
                 _context.n = 1;
-                return (0, _handlers.logon)(req, h);
+                return (0, _handlers.logon)(req, h, options);
               case 1:
                 return _context.a(2, _context.v);
             }
@@ -90,23 +92,8 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName),
     options: {
-      auth: process.env.USELOGON.toUpperCase() === 'TRUE' ? null : options.serverMode === "app" ? authLogon : authDefault,
-      //  auth: null,
-      handler: function () {
-        var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
-          return _regenerator().w(function (_context2) {
-            while (1) switch (_context2.n) {
-              case 0:
-                console.log(">>>>>>>>>>>>>>>>>>>>>>>in ".concat(appName));
-                return _context2.a(2, getAppb(req, h));
-            }
-          }, _callee2);
-        }));
-        function handler(_x3, _x4) {
-          return _handler2.apply(this, arguments);
-        }
-        return handler;
-      }()
+      auth: process.env.USELOGON === 'YES' ? null : options.serverMode === "app" ? authLogon : authDefault,
+      handler: getAppb
     }
   }, {
     method: ["GET"],
@@ -114,16 +101,16 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: authDefault,
       handler: function () {
-        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
-          return _regenerator().w(function (_context3) {
-            while (1) switch (_context3.n) {
+        var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
+          return _regenerator().w(function (_context2) {
+            while (1) switch (_context2.n) {
               case 0:
-                return _context3.a(2, h.redirect("".concat(appName, "/documentation")));
+                return _context2.a(2, h.redirect("".concat(appName, "/documentation")));
             }
-          }, _callee3);
+          }, _callee2);
         }));
-        function handler(_x5, _x6) {
-          return _handler3.apply(this, arguments);
+        function handler(_x3, _x4) {
+          return _handler2.apply(this, arguments);
         }
         return handler;
       }()
@@ -163,10 +150,10 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: /*authDefault*/false,
       handler: function () {
-        var _handler4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(req, h) {
+        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
           var allAppEnv, uappenv, s;
-          return _regenerator().w(function (_context4) {
-            while (1) switch (_context4.n) {
+          return _regenerator().w(function (_context3) {
+            while (1) switch (_context3.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
                 if (options.userInfo != null) {
@@ -181,12 +168,12 @@ module.exports = function setDefaultRoutes(server, options) {
                   console.log(s);
                 }
                 debug(s);
-                return _context4.a(2, s);
+                return _context3.a(2, s);
             }
-          }, _callee4);
+          }, _callee3);
         }));
-        function handler(_x7, _x8) {
-          return _handler4.apply(this, arguments);
+        function handler(_x5, _x6) {
+          return _handler3.apply(this, arguments);
         }
         return handler;
       }()
@@ -197,10 +184,10 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: /*authDefault*/false,
       handler: function () {
-        var _handler5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(req, h) {
+        var _handler4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(req, h) {
           var allAppEnv, uappenv, s;
-          return _regenerator().w(function (_context5) {
-            while (1) switch (_context5.n) {
+          return _regenerator().w(function (_context4) {
+            while (1) switch (_context4.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
                 if (options.userInfo != null) {
@@ -215,12 +202,12 @@ module.exports = function setDefaultRoutes(server, options) {
                   debug(options.allAppEnv);
                 }
                 debug(s);
-                return _context5.a(2, s);
+                return _context4.a(2, s);
             }
-          }, _callee5);
+          }, _callee4);
         }));
-        function handler(_x9, _x0) {
-          return _handler5.apply(this, arguments);
+        function handler(_x7, _x8) {
+          return _handler4.apply(this, arguments);
         }
         return handler;
       }()
@@ -242,21 +229,7 @@ module.exports = function setDefaultRoutes(server, options) {
     path: "/{param*}",
     options: {
       auth: authDefault,
-      handler: function () {
-        var _handler6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(req, h) {
-          return _regenerator().w(function (_context6) {
-            while (1) switch (_context6.n) {
-              case 0:
-                console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in param');
-                return _context6.a(2, (0, _handlers.getApp2)(req, h));
-            }
-          }, _callee6);
-        }));
-        function handler(_x1, _x10) {
-          return _handler6.apply(this, arguments);
-        }
-        return handler;
-      }()
+      handler: _handlers.getApp2
     }
   }, {
     method: ["GET"],
@@ -288,14 +261,13 @@ module.exports = function setDefaultRoutes(server, options) {
   };
   debug(pr);
   defaultTable.push(pr);
-  // now set pre for all default routes
-  defaultTable.forEach(function (r) {
+  var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  routeTables.forEach(function (r) {
     r.options.pre = [{
       method: _setContext["default"],
       assign: 'context'
     }];
     console.log, 'Setting pre for route', r.path, r.options.pre;
   });
-  var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
   server.route(routeTables);
 };

package/lib/plugins/setupUserRoutes.js

@@ -6,7 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _setContext = _interopRequireDefault(require("./setContext"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-/*
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
  * ------------------------------------------------------------------------------------
  *   Copyright (c) SAS Institute Inc.
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +28,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
  * ---------------------------------------------------------------------------------------
  *
  */
-
 function setupUserRoutes(u, options) {
   if (u == null) {
     return [];
@@ -31,7 +35,11 @@ function setupUserRoutes(u, options) {
   var ux = typeof u === 'function' ? u() : u;
   var routes = ux.map(function (rx) {
     //let rx = {...r};
-
+    /* change it to options */
+    if (rx.config != null) {
+      rx.options = _objectSpread({}, rx.config);
+      delete rx.config;
+    }
     if (rx.options.pre == null) {
       rx.options.pre = [{
         method: _setContext["default"],
@@ -43,13 +51,11 @@ function setupUserRoutes(u, options) {
         assign: 'context'
       }]);
     }
-    console.log(rx.options.pre);
     if (rx.options.auth === true) {
       rx.options.auth = options.authDefault;
     } else if (rx.options.auth === 'logon') {
       rx.options.auth = options.authLogon;
     }
-    console.log('route auth', rx.options.auth);
     return rx;
   });
   return routes;

package/lib/readCerts.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+/**
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+function getCerts(tlsdir) {
+  if (tlsdir == null || tlsdir === 'NONE') {
+    return null;
+  }
+  console.log("[Note] Reading certs from directory: " + tlsdir);
+  if (_fs["default"].existsSync(tlsdir) === false) {
+    console.error("[Warning] Specified cert dir does not exist: " + tlsdir);
+    return null;
+  }
+  var listOfFiles = _fs["default"].readdirSync(tlsdir);
+  console.log("[Note] TLS/SSL files found: " + listOfFiles);
+  var options = {};
+  for (var i = 0; i < listOfFiles.length; i++) {
+    var fname = listOfFiles[i];
+    var name = tlsdir + '/' + listOfFiles[i];
+    var key = fname.split('.')[0];
+    console.log('Reading TLS file: ' + name + ' as key: ' + key);
+    options[key] = _fs["default"].readFileSync(name, {
+      encoding: 'utf8'
+    });
+  }
+  console.log('cert files', Object.keys(options));
+  return options;
+}
+var _default = exports["default"] = getCerts;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.5.4",
+  "version": "0.6.1-0",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "bin": {
-    "@sassoftware/viya-serverjs": "cli.js"
+    "@sassoftware/viya-appserverjs": "cli.js"
   },
   "keywords": [
     "restaf",
@@ -29,12 +29,11 @@
   "unpkg": "./lib/index.js",
   "scripts": {
     "build": "rimraf lib && babel src --out-dir lib",
-    "test": "node cli --env=./.env --docker=./Dockerfile",
-    "testbg": "cross-env APPENTRY=auth.html node cli --env=./.env --docker=./Dockerfile",
-    "testmcp": "node server.js --env=./.env --docker=./Dockerfile",
-    "debug": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0  node --inspect-brk server.js --env=./.env.server --docker=./Dockerfile",
+    "test": "cross-env  node cli --env=./.env --docker=./Dockerfile",
+    "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env.proxy --docker=./Dockerfile",
     "proxy": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env.proxy --docker=./Dockerfile",
-    "pub": "npm publish --tag alpha --access public",
+    "pub": "npm publish --tag dev --access public",
+    "bump": "npm version prerelease",
     "lint": "npx eslint --fix src/*.js"
   },
   "dependencies": {
@@ -46,7 +45,7 @@
     "@hapi/inert": "^7.1.0",
     "@hapi/vision": "^7.0.3",
     "axios": "^1.13.2",
-    "core-js": "^3.47.0",
+    "core-js": "^3.48.0",
     "cross-spawn": "^7.0.6",
     "debug": "^4.4.3",
     "docker-file-parser": "^1.0.7",
@@ -57,29 +56,25 @@
     "jwt-decode": "^4.0.0",
     "node-cache-promise": "^1.0.2",
     "only": "0.0.2",
-    "qs": "^6.14.0",
+    "qs": "^6.14.1",
     "regenerator-runtime": "^0.14.1",
     "request-debug": "^0.2.0",
-    "selfsigned": "^5.4.0",
+    "selfsigned": "^5.5.0",
     "uuid": "^13.0.0",
     "yargs": "18.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.28.3",
-    "@babel/core": "^7.28.5",
-    "@babel/eslint-parser": "7.28.5",
-    "@babel/preset-env": "^7.28.5",
+    "@babel/cli": "^7.28.6",
+    "@babel/core": "^7.28.6",
+    "@babel/eslint-parser": "7.28.6",
+    "@babel/preset-env": "^7.28.6",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.2",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
     "rimraf": "^6.1.2",
     "shx": "^0.4.0"
   },
   "resolutions": {
     "@babel/traverse": "7.26.10"
-  },
-  "overrides": {
-    "gopd": "1.2.0",
-    "get-intrinsic": "1.2.7"
   }
 }

package/public/help.html

@@ -1 +1 @@
-<h1> MCP Server is ready</h1>
+<h1> Hellp</h1>