@sassoftware/viya-serverjs 0.6.2 → 0.6.3-1

package/.env

@@ -12,7 +12,9 @@ REDIRECT=
 # USELOGON=FALSE
 # USETOKEN=FALSE
 HTTPS=true
-
-VIYACERT=c:\Users\kumar\viyaCert\xf1
+# SSLCERT=
+# VIYACERT=c:\Users\kumar\viyaCert\xf1
 NODE_TLS_REJECT_UNAUTHORIZED=0
+AUTOSTART=TRUE
 
+CUSTOMTEXT="<h1> sas-score-mcp-server</h>"

package/autoStart.js

@@ -0,0 +1,6 @@
+import open from 'open';
+async function autoStart(url) {
+await open(url, {wait:true});
+  console.error(`[Note]URL: ${url} closed by user`);
+} 
+export default autoStart;

package/cli.js

@@ -4,7 +4,25 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-let core = require('./lib/index.js');
+import api from './lib/index.js';
+import autoStart from './autoStart.js';
+
 console.log('Starting the cli for @sassoftware/viya-serverjs');
 let userCache = {};
-core(null, true, 'app', null, userCache);
+
+api.asyncCore(null, true, 'app', null, userCache)
+.then ((r) => {
+    console.log('core returned', r);
+    if (process.env.AUTOSTART && process.env.AUTOSTART.toUpperCase() ==='TRUE'){
+        console.log('Auto-starting the server as per AUTOSTART env variable');
+        autoStart(r).catch((err) => {
+            console.log('Error in autoStart', err);
+        });
+    }
+    return r;
+})
+.catch((err) => {
+    console.log('Error in core', err);
+});
+
+

package/lib/iService.js

@@ -47,279 +47,333 @@ var Vision = require('@hapi/vision');
 var inert = require('@hapi/inert');
 var selfsigned = require('selfsigned');
 var os = require('os');
-function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, userCache) {
-  // process.env.APPHOST_ADDR = process.env.APPHOST;
-  var init = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var defaultMaxBytes, maxBytes, isSameSite, isSecure, https, _process$env$SAMESITE, _process$env$SAMESITE2, s1, s2, sConfig, hapiServer, nodeCacheOptions, storeCache, visionOptions, options, allRoutes, hh, msg;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
-          case 0:
-            if (process.env.APPHOST === '*') {
-              process.env.APPHOST = os.hostname();
-            }
-            defaultMaxBytes = 10485760;
-            if (isNaN(process.env.PAYLOADMAXBYTES)) {
-              maxBytes = defaultMaxBytes;
-            } else {
-              maxBytes = Number(process.env.PAYLOADMAXBYTES);
-            }
-            isSameSite = 'Lax';
-            isSecure = false;
-            https = process.env.HTTPS || 'TRUE';
-            https = https.toUpperCase();
-            if (process.env.SAMESITE != null) {
-              _process$env$SAMESITE = process.env.SAMESITE.split(','), _process$env$SAMESITE2 = _slicedToArray(_process$env$SAMESITE, 2), s1 = _process$env$SAMESITE2[0], s2 = _process$env$SAMESITE2[1];
-              isSameSite = s1;
-              isSecure = s2 === 'secure' ? true : false;
-              if (https !== 'TRUE') {
-                isSecure = false;
-              }
-            }
-            sConfig = {
-              port: process.env.APPPORT,
-              host: process.env.APPHOST,
-              state: {
-                isSameSite: isSameSite,
-                isSecure: isSecure
-              },
-              routes: {
-                payload: {
-                  maxBytes: maxBytes
-                },
-                cors: {
-                  origin: ['*'],
-                  credentials: true,
-                  "headers": ["Accept", "Authorization", "Content-Type", "If-None-Match", "Accept-language"]
-                  /*
-                  'Access-Control-Allow-Methods': ['GET', 'POST', 'OPTIONS'],
-                  additionalHeaders             : ['multipart/form-data', 'content-disposition'],
-                  additionalExposedHeaders      : ['location'],
-                  */
-                }
-              }
-            };
-            if (process.env.HAPIDEBUG === 'YES') {
-              sConfig.debug = {
-                request: '*'
-              };
-            }
-            debug(JSON.stringify(sConfig, null, 4));
-            if (https === 'TRUE') {
-              sConfig.tls = getCertificates();
-              debug('Setup of SSL certificates completed');
-            } else {
-              debug('Running with no SSL certificates');
-            }
-            if (asset !== null) {
-              sConfig.routes.files = {
-                relativeTo: asset
-              };
-            }
-            debug2("Application information: \n\t\tAPPLOC  : ".concat(process.env.APPLOC, "\n\t\tAPPENTRY: ").concat(process.env.APPENTRY, "\n"));
-            hapiServer = Hapi.server(sConfig);
-            /*
-            const cache = hapiServer.cache({ segment: 'sid', expiresIn: 3 * 24 * 60 * 60 * 1000 });
-            hapiServer.app.cache = cache;
-            */
-            nodeCacheOptions = {
-              stdTTL: 24 * 60 * 60 * 1000,
-              checkPeriod: 3600,
-              errorOnMissing: true,
-              useClones: false,
-              deleteOnExpire: true
-            };
-            storeCache = new NodeCache(nodeCacheOptions);
-            hapiServer.app.cache = storeCache;
+function iService(_x, _x2, _x3, _x4, _x5, _x6) {
+  return _iService.apply(this, arguments);
+}
+function _iService() {
+  _iService = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(userRouteTable, useDefault, asset, allAppEnv, serverMode, userCache) {
+    var init, r, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
+        case 0:
+          // process.env.APPHOST_ADDR = process.env.APPHOST;
+          init = /*#__PURE__*/function () {
+            var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              var defaultMaxBytes, maxBytes, isSameSite, isSecure, https, _process$env$SAMESITE, _process$env$SAMESITE2, s1, s2, sConfig, hapiServer, nodeCacheOptions, storeCache, visionOptions, options, allRoutes, hh, msg;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    if (process.env.APPHOST === '*') {
+                      process.env.APPHOST = os.hostname();
+                    }
+                    defaultMaxBytes = 10485760;
+                    if (isNaN(process.env.PAYLOADMAXBYTES)) {
+                      maxBytes = defaultMaxBytes;
+                    } else {
+                      maxBytes = Number(process.env.PAYLOADMAXBYTES);
+                    }
+                    isSameSite = 'Lax';
+                    isSecure = false;
+                    https = process.env.HTTPS || 'TRUE';
+                    https = https.toUpperCase();
+                    if (process.env.SAMESITE != null) {
+                      _process$env$SAMESITE = process.env.SAMESITE.split(','), _process$env$SAMESITE2 = _slicedToArray(_process$env$SAMESITE, 2), s1 = _process$env$SAMESITE2[0], s2 = _process$env$SAMESITE2[1];
+                      isSameSite = s1;
+                      isSecure = s2 === 'secure' ? true : false;
+                      if (https !== 'TRUE') {
+                        isSecure = false;
+                      }
+                    }
+                    sConfig = {
+                      port: process.env.APPPORT,
+                      host: process.env.APPHOST,
+                      state: {
+                        isSameSite: isSameSite,
+                        isSecure: isSecure
+                      },
+                      routes: {
+                        payload: {
+                          maxBytes: maxBytes
+                        },
+                        cors: {
+                          origin: ['*'],
+                          credentials: true,
+                          "headers": ["Accept", "Authorization", "Content-Type", "If-None-Match", "Accept-language"]
+                          /*
+                          'Access-Control-Allow-Methods': ['GET', 'POST', 'OPTIONS'],
+                          additionalHeaders             : ['multipart/form-data', 'content-disposition'],
+                          additionalExposedHeaders      : ['location'],
+                          */
+                        }
+                      }
+                    };
+                    if (process.env.HAPIDEBUG === 'YES') {
+                      sConfig.debug = {
+                        request: '*'
+                      };
+                    }
+                    debug(JSON.stringify(sConfig, null, 4));
+                    if (!(https === 'TRUE')) {
+                      _context.n = 2;
+                      break;
+                    }
+                    _context.n = 1;
+                    return getCertificates();
+                  case 1:
+                    sConfig.tls = _context.v;
+                    debug('Setup of SSL certificates completed');
+                    _context.n = 3;
+                    break;
+                  case 2:
+                    debug('Running with no SSL certificates');
+                  case 3:
+                    if (asset !== null) {
+                      sConfig.routes.files = {
+                        relativeTo: asset
+                      };
+                    }
+                    debug2("Application information: \n\t\tAPPLOC  : ".concat(process.env.APPLOC, "\n\t\tAPPENTRY: ").concat(process.env.APPENTRY, "\n"));
+                    hapiServer = Hapi.server(sConfig);
+                    /*
+                    const cache = hapiServer.cache({ segment: 'sid', expiresIn: 3 * 24 * 60 * 60 * 1000 });
+                    hapiServer.app.cache = cache;
+                    */
+                    nodeCacheOptions = {
+                      stdTTL: 24 * 60 * 60 * 1000,
+                      checkPeriod: 3600,
+                      errorOnMissing: true,
+                      useClones: false,
+                      deleteOnExpire: true
+                    };
+                    storeCache = new NodeCache(nodeCacheOptions);
+                    hapiServer.app.cache = storeCache;
 
-            // common plugins
-            visionOptions = {
-              engines: {
-                html: require('handlebars')
-              },
-              relativeTo: __dirname,
-              path: '.'
-            };
-            _context.n = 1;
-            return hapiServer.register(Vision);
-          case 1:
-            hapiServer.views(visionOptions);
-            _context.n = 2;
-            return hapiServer.register(inert);
-          case 2:
-            if (!(https === 'TRUE')) {
-              _context.n = 3;
-              break;
-            }
-            _context.n = 3;
-            return hapiServer.register({
-              plugin: require('hapi-require-https'),
-              options: {}
-            });
-          case 3:
-            _context.n = 4;
-            return hapiServer.register(H202);
-          case 4:
-            // setup authentication related plugins
-            options = {
-              serverMode: serverMode,
-              authFlow: process.env.AUTHFLOW,
-              host: process.env.VIYA_SERVER,
-              isSameSite: isSameSite,
-              isSecure: isSecure,
-              ns: allAppEnv.LOGONPAYLOAD != null ? allAppEnv.LOGONPAYLOAD.ns : null,
-              nsHost: allAppEnv.LOGONPAYLOAD != null ? allAppEnv.LOGONPAYLOAD.nsHost : null,
-              redirect: process.env.REDIRECT,
-              clientId: process.env.CLIENTID,
-              clientSecret: process.env.CLIENTSECRET,
-              redirectTo: "/".concat(process.env.APPNAME, "/logon"),
-              allAppEnv: allAppEnv,
-              useHapiCookie: true,
-              appName: process.env.APPNAME,
-              appHost: process.env.APPHOST,
-              appPort: process.env.APPPORT,
-              userRouteTable: userRouteTable,
-              useDefault: useDefault,
-              /* not used - left here for potential reuse */
-              userCache: userCache || {},
-              https: https,
-              authDefault: false,
-              /* set later in setDefaultRoutes */
-              authLogon: false /* set later in setDefaultRoutes */
-            };
-            debug2('Options', options);
-            if (!(process.env.AUTHFLOW != null)) {
-              _context.n = 6;
-              break;
-            }
-            _context.n = 5;
-            return (0, _setupAuth["default"])(hapiServer, options);
-          case 5:
-            if (process.env.PREAUTH === 'YES') {
-              console.log('Preauth enabled');
-              hapiServer.ext('onPreAuth', function (request, h) {
-                debugger;
-                if (!request.auth.isAuthenticated && !request.path.startsWith("/login")) {
-                  var redirectTo = "".concat(request.path, "?").concat(new URLSearchParams(request.query).toString());
-                  console.log('Redirect to login', {
-                    redirectTo: redirectTo
-                  });
-                  debugger;
-                  return h.redirect("/login").takeover();
+                    // common plugins
+                    visionOptions = {
+                      engines: {
+                        html: require('handlebars')
+                      },
+                      relativeTo: __dirname,
+                      path: '.'
+                    };
+                    _context.n = 4;
+                    return hapiServer.register(Vision);
+                  case 4:
+                    hapiServer.views(visionOptions);
+                    _context.n = 5;
+                    return hapiServer.register(inert);
+                  case 5:
+                    if (!(https === 'TRUE')) {
+                      _context.n = 6;
+                      break;
+                    }
+                    _context.n = 6;
+                    return hapiServer.register({
+                      plugin: require('hapi-require-https'),
+                      options: {}
+                    });
+                  case 6:
+                    _context.n = 7;
+                    return hapiServer.register(H202);
+                  case 7:
+                    // setup authentication related plugins
+                    options = {
+                      serverMode: serverMode,
+                      authFlow: process.env.AUTHFLOW,
+                      host: process.env.VIYA_SERVER,
+                      isSameSite: isSameSite,
+                      isSecure: isSecure,
+                      ns: allAppEnv.LOGONPAYLOAD != null ? allAppEnv.LOGONPAYLOAD.ns : null,
+                      nsHost: allAppEnv.LOGONPAYLOAD != null ? allAppEnv.LOGONPAYLOAD.nsHost : null,
+                      redirect: process.env.REDIRECT,
+                      clientId: process.env.CLIENTID,
+                      clientSecret: process.env.CLIENTSECRET,
+                      redirectTo: "/".concat(process.env.APPNAME, "/logon"),
+                      allAppEnv: allAppEnv,
+                      useHapiCookie: true,
+                      appName: process.env.APPNAME,
+                      appHost: process.env.APPHOST,
+                      appPort: process.env.APPPORT,
+                      userRouteTable: userRouteTable,
+                      useDefault: useDefault,
+                      /* not used - left here for potential reuse */
+                      userCache: userCache || {},
+                      https: https,
+                      authDefault: false,
+                      /* set later in setDefaultRoutes */
+                      authLogon: false /* set later in setDefaultRoutes */
+                    };
+                    debug2('Options', options);
+                    if (!(process.env.AUTHFLOW != null)) {
+                      _context.n = 9;
+                      break;
+                    }
+                    _context.n = 8;
+                    return (0, _setupAuth["default"])(hapiServer, options);
+                  case 8:
+                    if (process.env.PREAUTH === 'YES') {
+                      console.log('Preauth enabled');
+                      hapiServer.ext('onPreAuth', function (request, h) {
+                        debugger;
+                        if (!request.auth.isAuthenticated && !request.path.startsWith("/login")) {
+                          var redirectTo = "".concat(request.path, "?").concat(new URLSearchParams(request.query).toString());
+                          console.log('Redirect to login', {
+                            redirectTo: redirectTo
+                          });
+                          debugger;
+                          return h.redirect("/login").takeover();
+                        }
+                        return h["continue"];
+                      });
+                    }
+                  case 9:
+                    //
+                    // Start server
+                    //
+                    // eslint-disable-next-line no-unused-vars
+                    allRoutes = hapiServer.table();
+                    _context.n = 10;
+                    return hapiServer.start();
+                  case 10:
+                    hh = hapiServer.info.uri;
+                    hh = hh.replace(/0.0.0.0/, 'localhost');
+                    console.log('====================================================================================');
+                    console.log('Server Start Time: ', Date());
+                    msg = options.serverMode === 'app' ? "Visit ".concat(hh, "/").concat(process.env.APPNAME, " to access application") : "Visit ".concat(hh, "/").concat(process.env.APPNAME, "/api to access swagger");
+                    console.log('\x1b[1m%s\x1b[0m', msg);
+                    console.log('NOTE: If running in container use the exported port');
+                    process.env.APPSERVER = "".concat(hh, "/").concat(process.env.APPNAME);
+                    process.env.HEALTH = 'true';
+                    console.log('====================================================================================');
+                    return _context.a(2, "".concat(hh, "/").concat(process.env.APPNAME));
                 }
-                return h["continue"];
-              });
-            }
-          case 6:
-            //
-            // Start server
-            //
-            // eslint-disable-next-line no-unused-vars
-            allRoutes = hapiServer.table();
-            _context.n = 7;
-            return hapiServer.start();
-          case 7:
-            hh = hapiServer.info.uri;
-            hh = hh.replace(/0.0.0.0/, 'localhost');
-            console.log('====================================================================================');
-            console.log('Server Start Time: ', Date());
-            msg = options.serverMode === 'app' ? "Visit ".concat(hh, "/").concat(process.env.APPNAME, " to access application") : "Visit ".concat(hh, "/").concat(process.env.APPNAME, "/api to access swagger");
-            console.log('\x1b[1m%s\x1b[0m', msg);
-            console.log('NOTE: If running in container use the exported port');
-            process.env.APPSERVER = "".concat(hh, "/").concat(process.env.APPNAME);
-            process.env.HEALTH = 'true';
-            console.log('====================================================================================');
-          case 8:
-            return _context.a(2);
-        }
-      }, _callee);
-    }));
-    return function init() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  process.on('unhandledRejection', function (err) {
-    console.log(err);
-    process.exit(1);
-  });
-  init();
+              }, _callee);
+            }));
+            return function init() {
+              return _ref.apply(this, arguments);
+            };
+          }();
+          process.on('unhandledRejection', function (err) {
+            console.log(err);
+            process.exit(1);
+          });
+          _context2.p = 1;
+          _context2.n = 2;
+          return init();
+        case 2:
+          r = _context2.v;
+          return _context2.a(2, r);
+        case 3:
+          _context2.p = 3;
+          _t = _context2.v;
+          console.log('Error starting server', _t);
+          return _context2.a(2, false);
+        case 4:
+          return _context2.a(2);
+      }
+    }, _callee2, null, [[1, 3]]);
+  }));
+  return _iService.apply(this, arguments);
 }
 function getCertificates() {
-  var tlsdir = process.env.SSLCERT;
-  var options = (0, _readCerts["default"])(tlsdir);
-  if (options === null) {
-    console.log('No SSL certificates found, generating self-signed certificates');
-    options = getTls();
-    options.rejectUnauthorized = false;
-  }
-  return options;
+  return _getCertificates.apply(this, arguments);
+}
+function _getCertificates() {
+  _getCertificates = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+    var tlsdir, options;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
+        case 0:
+          tlsdir = process.env.SSLCERT;
+          options = (0, _readCerts["default"])(tlsdir);
+          if (!(options === null)) {
+            _context3.n = 2;
+            break;
+          }
+          console.log('No SSL certificates found, generating self-signed certificates');
+          _context3.n = 1;
+          return getTls();
+        case 1:
+          options = _context3.v;
+          options.rejectUnauthorized = false;
+        case 2:
+          return _context3.a(2, options);
+      }
+    }, _callee3);
+  }));
+  return _getCertificates.apply(this, arguments);
 }
 function getTls() {
-  var options = {
-    keySize: 2048,
-    days: 360,
-    algorithm: "sha256",
-    clientCertificate: true,
-    extensions: {}
-  };
-  var subjt = process.env.TLS_CREATE.replaceAll('"', '').trim();
-  var subj = subjt.split(',');
-  var d = {};
-  subj.map(function (c) {
-    var r = c.split(':');
-    d[r[0]] = r[1];
-    return {
-      value: r[1]
-    };
-  });
+  return _getTls.apply(this, arguments);
+}
+function _getTls() {
+  _getTls = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
+    var options, subjt, subj, d, attr, pems, tls;
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.n) {
+        case 0:
+          options = {
+            keySize: 2048,
+            days: 360,
+            algorithm: "sha256",
+            clientCertificate: true,
+            extensions: {}
+          };
+          subjt = process.env.TLS_CREATE.replaceAll('"', '').trim();
+          subj = subjt.split(',');
+          d = {};
+          subj.map(function (c) {
+            var r = c.split(':');
+            d[r[0]] = r[1];
+            return {
+              value: r[1]
+            };
+          });
 
-  //  TLS_CREATE=C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost,ALT:na.sas.com
-  var attr = [{
-    name: 'commonName',
-    value: d.CN /*process.env.APPHOST*/
-  }, {
-    name: 'countryName',
-    value: d.C
-  }, {
-    shortName: 'ST',
-    value: d.ST
-  }, {
-    name: 'localityName',
-    value: d.L
-  }, {
-    name: 'organizationName',
-    value: d.O
-  }, {
-    shortName: 'OU',
-    value: d.OU
-  }];
-  options.extensions.altNames = [
-  //	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
-  {
-    type: 6,
-    value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME)
-  }, {
-    type: 6,
-    value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME, "/api")
-  }, {
-    type: 6,
-    value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME, "/logon")
-  }, {
-    type: 6,
-    value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME)
-  }, {
-    type: 6,
-    value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME, "/api")
-  }, {
-    type: 6,
-    value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME, "/logon")
-  }];
-  debug('tls options ', JSON.stringify(options, null, 4));
-  var pems = selfsigned.generate(attr, options);
-  var tls = {
-    cert: pems.cert,
-    key: pems["private"]
-  };
-  return tls;
+          //  TLS_CREATE=C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost,ALT:na.sas.com
+          attr = [{
+            name: 'commonName',
+            value: d.CN /*process.env.APPHOST*/
+          }, {
+            name: 'countryName',
+            value: d.C
+          }, {
+            shortName: 'ST',
+            value: d.ST
+          }, {
+            name: 'localityName',
+            value: d.L
+          }, {
+            name: 'organizationName',
+            value: d.O
+          }, {
+            shortName: 'OU',
+            value: d.OU
+          }];
+          /*
+          options.extensions.altNames = [
+          	//	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
+          	{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
+          	{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}/api` },
+          	{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}/logon` },
+          	{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}` },
+          	{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/api` },
+          	{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/logon` },
+          ];
+          */
+          debug('tls options ', JSON.stringify(options, null, 4));
+          _context4.n = 1;
+          return selfsigned.generate(attr);
+        case 1:
+          pems = _context4.v;
+          tls = {
+            cert: pems.cert,
+            key: pems["private"]
+          };
+          return _context4.a(2, tls);
+      }
+    }, _callee4);
+  }));
+  return _getTls.apply(this, arguments);
 }
 var _default = exports["default"] = iService;

package/lib/index.js

@@ -9,7 +9,10 @@ var _readCerts = _interopRequireDefault(require("./readCerts"));
 var _yargs = _interopRequireDefault(require("yargs"));
 var _helpers = require("yargs/helpers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-/*
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; } /*
  *  ------------------------------------------------------------------------------------
  *  * Copyright (c) SAS Institute Inc.
  *  *  Licensed under the Apache License, Version 2.0 (the 'License');
@@ -26,43 +29,106 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
  * ----------------------------------------------------------------------------------------
  *
  */
-
 var debug = require("debug")("startup");
-module.exports = function core(uTable, useDefault, serverMode, customize, userCache) {
-  var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).argv;
-  var env = argv.env == null ? null : argv.env;
-  var appenv = argv.appenv == null ? null : argv.appenv;
-  var docker = argv.docker == null ? null : argv.docker;
-  //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
-
-  if (useDefault == null) {
-    useDefault = true;
-  }
-  console.log("Initialization started ============================================================");
-  console.log("version: 2, Build Date: ", Date());
-  console.log("\nCommand Line Configuration:\n          Dockerfile: ".concat(docker, "\n          env file  : ").concat(env, "\n          appenv    : ").concat(appenv, "\n          customize : ").concat(customize != null, "\n          "));
-  iapp(null, env, docker, uTable, useDefault, serverMode, customize, userCache);
+exports.core = function () {
+  icore().then(function (r) {
+    console.log('icore returned', r);
+    return r;
+  })["catch"](function (err) {
+    console.log('Error in icore', err);
+    return null;
+  });
 };
-function iapp(appSrc, rafEnv, dockerFile, uTable, useDefault, serverMode, customize, userCache) {
-  var asset = setup(rafEnv, dockerFile);
-  if (appSrc == null) {
-    appSrc = process.env.APPENV == null ? null : process.env.APPENV;
-  }
-  if (appSrc != null) {
-    console.log("appSrc", "+".concat(appSrc, "+"));
-    createPayload(appSrc, function (err, r) {
-      if (err) {
-        console.log(err);
-        console.log("createPayload failed");
-        process.exit(1);
-      } else {
-        (0, _iService["default"])(uTable, useDefault, asset, r, serverMode, customize, userCache);
+exports.asyncCore = icore;
+function icore(_x, _x2, _x3, _x4, _x5) {
+  return _icore.apply(this, arguments);
+}
+function _icore() {
+  _icore = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(uTable, useDefault, serverMode, customize, userCache) {
+    var argv, env, appenv, docker;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).argv;
+          env = argv.env == null ? null : argv.env;
+          appenv = argv.appenv == null ? null : argv.appenv;
+          docker = argv.docker == null ? null : argv.docker; //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
+          if (useDefault == null) {
+            useDefault = true;
+          }
+          console.log("Initialization started ============================================================");
+          console.log("version: 2, Build Date: ", Date());
+          console.log("\nCommand Line Configuration:\n          Dockerfile: ".concat(docker, "\n          env file  : ").concat(env, "\n          appenv    : ").concat(appenv, "\n          customize : ").concat(customize != null, "\n          "));
+          _context.n = 1;
+          return iapp(null, env, docker, uTable, useDefault, serverMode, customize, userCache);
+        case 1:
+          return _context.a(2, _context.v);
       }
-    });
-  } else {
-    var appEnv = getAllEnv({});
-    (0, _iService["default"])(uTable, useDefault, asset, appEnv, serverMode, customize, userCache);
-  }
+    }, _callee);
+  }));
+  return _icore.apply(this, arguments);
+}
+;
+function iapp(_x6, _x7, _x8, _x9, _x0, _x1, _x10, _x11) {
+  return _iapp.apply(this, arguments);
+}
+function _iapp() {
+  _iapp = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(appSrc, rafEnv, dockerFile, uTable, useDefault, serverMode, customize, userCache) {
+    var asset, appEnv;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
+        case 0:
+          asset = setup(rafEnv, dockerFile);
+          if (appSrc == null) {
+            appSrc = process.env.APPENV == null ? null : process.env.APPENV;
+          }
+          if (!(appSrc != null)) {
+            _context3.n = 1;
+            break;
+          }
+          console.log("appSrc", "+".concat(appSrc, "+"));
+          createPayload(appSrc, /*#__PURE__*/function () {
+            var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(err, r) {
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.n) {
+                  case 0:
+                    if (!err) {
+                      _context2.n = 1;
+                      break;
+                    }
+                    console.log(err);
+                    console.log("createPayload failed");
+                    process.exit(1);
+                    _context2.n = 3;
+                    break;
+                  case 1:
+                    _context2.n = 2;
+                    return (0, _iService["default"])(uTable, useDefault, asset, r, serverMode, customize, userCache);
+                  case 2:
+                    return _context2.a(2, _context2.v);
+                  case 3:
+                    return _context2.a(2);
+                }
+              }, _callee2);
+            }));
+            return function (_x12, _x13) {
+              return _ref.apply(this, arguments);
+            };
+          }());
+          _context3.n = 3;
+          break;
+        case 1:
+          appEnv = getAllEnv({});
+          _context3.n = 2;
+          return (0, _iService["default"])(uTable, useDefault, asset, appEnv, serverMode, customize, userCache);
+        case 2:
+          return _context3.a(2, _context3.v);
+        case 3:
+          return _context3.a(2);
+      }
+    }, _callee3);
+  }));
+  return _iapp.apply(this, arguments);
 }
 function setup(rafEnv, dockerFile) {
   (0, _config["default"])(rafEnv, dockerFile);
@@ -205,8 +271,4 @@ function trimit(e) {
   }
   a = a.trim();
   return a.length === 0 ? null : a;
-}
-function readVIYACERT() {
-  var certs = null;
-  var certfile = process.env.VIYACERT;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.6.2",
+  "version": "0.6.3-1",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",

package/server.js

@@ -2,10 +2,10 @@
  * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-let core = require('./lib/index.js');
+let api = require('./lib/index.js');
 debugger;
 let userCache = {};
-core(getCustomHandler, true, 'app', null, userCache);
+api.core(getCustomHandler, true, 'app', null, userCache);
 console.log('Finished cli setup', userCache);
 
 function getCustomHandler() {

package/src/iService.js

@@ -32,7 +32,7 @@ import readCerts from './readCerts';
 
 let os = require('os');
 
-function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, userCache) {
+async function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, userCache) {
 	// process.env.APPHOST_ADDR = process.env.APPHOST;
 	const init = async () => {
 	
@@ -95,7 +95,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		}
 		debug(JSON.stringify(sConfig, null,4));
 		if (https === 'TRUE') {
-			sConfig.tls = getCertificates();
+			sConfig.tls = await getCertificates();
 			debug('Setup of SSL certificates completed');
 		} else {
 			debug('Running with no SSL certificates');
@@ -211,28 +211,36 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		process.env.APPSERVER = `${hh}/${process.env.APPNAME}`;
 		process.env.HEALTH = 'true';
 		console.log('====================================================================================');
-	
+		return `${hh}/${process.env.APPNAME}`
 	};
 
 	process.on('unhandledRejection', (err) => {
 		console.log(err);
 		process.exit(1);
 	});
-	init();
+	try {
+      let r = await init();
+	  return r;
+	}
+	catch(err){
+
+		console.log('Error starting server', err);
+		return false;
+	};
 }
 
-function getCertificates () {
+async function getCertificates () {
 	let tlsdir = process.env.SSLCERT;
     let options = readCerts(tlsdir);
 	if (options === null){
 		console.log('No SSL certificates found, generating self-signed certificates');
-		options = getTls();
+		options = await getTls();
 		options.rejectUnauthorized= false;
 	}
 	return options;
 }
 
-function getTls () {
+async function getTls () {
 	let options = {
 		keySize          : 2048,
 		days             : 360,
@@ -275,6 +283,7 @@ function getTls () {
 		}
 	];
 
+	/*
 	options.extensions.altNames = [
 		//	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
 		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
@@ -284,8 +293,9 @@ function getTls () {
 		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/api` },
 		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/logon` },
 	];
+	*/
 	debug('tls options ', JSON.stringify(options, null,4));
-	let pems = selfsigned.generate(attr, options);
+	let pems = await selfsigned.generate(attr);
 	let tls = {
 		cert: pems.cert,
 		key : pems.private

package/src/index.js

@@ -26,7 +26,21 @@ import yargs from "yargs";
 import { hideBin } from 'yargs/helpers';
 let debug = require("debug")("startup");
 
-module.exports = function core(
+exports.core = function () {
+  icore()
+  .then ((r) => {
+    console.log('icore returned', r);
+    return r;
+  })
+  .catch((err) => {
+    console.log('Error in icore', err);
+    return null;
+  });
+
+}
+exports.asyncCore = icore;
+
+ async function icore (
   uTable,
   useDefault,
   serverMode,
@@ -56,10 +70,10 @@ module.exports = function core(
           `
   );
 
-  iapp(null, env, docker, uTable, useDefault, serverMode, customize,userCache);
+  return await iapp(null, env, docker, uTable, useDefault, serverMode, customize,userCache);
 };
 
-function iapp(
+async function iapp(
   appSrc,
   rafEnv,
   dockerFile,
@@ -75,18 +89,18 @@ function iapp(
   }
   if (appSrc != null) {
     console.log("appSrc", `+${appSrc}+`);
-    createPayload(appSrc, (err, r) => {
+    createPayload(appSrc, async (err, r) => {
       if (err) {
         console.log(err);
         console.log("createPayload failed");
         process.exit(1);
       } else {
-        iService(uTable, useDefault, asset, r, serverMode, customize, userCache);
+        return await iService(uTable, useDefault, asset, r, serverMode, customize, userCache);
       }
     });
   } else {
     let appEnv = getAllEnv({});
-    iService(uTable, useDefault, asset, appEnv, serverMode, customize, userCache);
+    return await iService(uTable, useDefault, asset, appEnv, serverMode, customize, userCache);
   }
 }
 
@@ -253,8 +267,3 @@ function trimit(e) {
   return a.length === 0 ? null : a;
 }
 
-function readVIYACERT(){
-  let certs = null;
-  let certfile = process.env.VIYACERT;
-
-}