profoundjs 6.2.0 → 6.4.0

package/setup/call.js

@@ -26,4 +26,4 @@ async function call() {
   // Call module
   profoundjs.commandLineCall(moduleName, parms, login);
 }
-call();
+call();

package/setup/completeInstall.js

@@ -22,7 +22,7 @@ const readline = require("readline");
 const iutils = require("./install_utils.js");
 /*
   NOTE: install_info.json
-  
+
   This file contains instructions for completing the installation.
   It tells the process what questions to ask and what commands to run.
   This file is shared with the GUI installer.
@@ -34,9 +34,8 @@ const semver = require("semver");
 
 const IBMi = iutils.isIBMi();
 
-(async () => {
+(async() => {
   try {
-
     const argDefs = {
       alias: {
         "h": "help",
@@ -58,7 +57,7 @@ const IBMi = iutils.isIBMi();
 
     // Show help and quit, if requested.
     if (args["help"]) {
-const HELP = `Usage: node complete_install.js [OPTION]
+      const HELP = `Usage: node complete_install.js [OPTION]
 -h, --help        Print this help and exit.
 -c, --configure   Update config.js, if present.
 -s, --silent      No interactive prompts.
@@ -94,7 +93,7 @@ Valid arguments for --silent mode:
     argDefs.unknown = function(arg) {
       console.error("complete_install.js: Unknown argument:", arg);
       process.exit(1);
-    }
+    };
     args = minimist(process.argv.slice(2), argDefs);
 
     // Validate arguments.
@@ -113,7 +112,7 @@ Valid arguments for --silent mode:
       }
     }
 
-    const RED   = args.silent === true ? "" : "\x1b[31m";
+    const RED = args.silent === true ? "" : "\x1b[31m";
     const RESET = args.silent === true ? "" : "\x1b[0m";
 
     // Silent/validation mode.
@@ -154,7 +153,6 @@ Valid arguments for --silent mode:
 
     // If config.js doesn't exist, or if --configure is passed, prompt and create/update config.js.
     if (!fileExists(configPath) || args["configure"] === true) {
-
       const warnings = getWarnings();
       for (const warning of warnings) {
         console.log("");
@@ -217,15 +215,14 @@ Valid arguments for --silent mode:
         return args.silent === true ? true : answer;
       });
       if (IBMi) {
-        svrname   = answers.strtcpsvr_svrname;
+        svrname = answers.strtcpsvr_svrname;
         autostart = answers.strtcpsvr_autostart;
-        ccsid     = answers.strtcpsvr_ccsid;
-        nodePath  = answers.strtcpsvr_nodePath;
+        ccsid = answers.strtcpsvr_ccsid;
+        nodePath = answers.strtcpsvr_nodePath;
       }
-      
+
       // Create/update configuration file.
       if (fileExists(configPath)) {
-
         config.port = answers.port;
         if (answers.gitSupport === false) {
           config.gitSupport = false;
@@ -263,10 +260,8 @@ Valid arguments for --silent mode:
         console.log("");
         console.log("config.js updated.");
         console.log("");
-
       }
       else {
-
         let content = fs.readFileSync(path.join(iutils.getSetupDir(), "config.js"), "utf8");
         eval("config = " + content.substr(content.indexOf("{")));
         config.port = answers.port;
@@ -288,7 +283,7 @@ Valid arguments for --silent mode:
         }
         // Check if this is a workspace (if so, default to mysql)
         if (!IBMi && fileExists(path.join(deployDir, "modules", "app", ".noderun", "settings.json"))) {
-          if (config.databaseConnections) delete config.databaseConnections;  // remove property so that it's appended at the end when we set it
+          if (config.databaseConnections) delete config.databaseConnections; // remove property so that it's appended at the end when we set it
           config.databaseConnections = [{
             name: "default",
             default: true,
@@ -308,9 +303,7 @@ Valid arguments for --silent mode:
         console.log("");
         console.log("config.js created.");
         console.log("");
-
       }
-
     }
 
     // Complete installation.
@@ -323,7 +316,7 @@ Valid arguments for --silent mode:
       if (config.connectorLibrary !== undefined) {
         setupArgs.push("--ibmi-connector-library");
       }
-      if (svrname) {
+      if (svrname) {		
         setupArgs.push("--ibmi-instance=" + svrname);
         if (autostart) {
           setupArgs.push("--ibmi-instance-autostart");
@@ -360,7 +353,6 @@ Valid arguments for --silent mode:
     catch {
       process.exit(1);
     }
-
   }
   catch (error) {
     process.stdin.destroy();
@@ -370,7 +362,6 @@ Valid arguments for --silent mode:
 })();
 
 async function ask(questionParm, configs, recursive) {
-
   let question = questionParm.prompt;
   let defaultAnswer = getDefault(questionParm, configs);
   if (questionParm.type === "boolean") {
@@ -379,10 +370,10 @@ async function ask(questionParm, configs, recursive) {
 
   if (defaultAnswer == null) defaultAnswer = "";
   if (typeof defaultAnswer !== "string") defaultAnswer = String(defaultAnswer);
-    
+
   if (defaultAnswer !== "") {
     let lastChar = question.substr(question.length - 1, 1);
-    if (lastChar === ":" || lastChar === "?") {    
+    if (lastChar === ":" || lastChar === "?") {
       question = question.substr(0, question.length - 1) + " (" + defaultAnswer + ")" + lastChar;
     }
     else {
@@ -414,7 +405,6 @@ async function ask(questionParm, configs, recursive) {
     answer = formatAnswer(questionParm, answer);
   }
   return answer;
-
 }
 
 function fileExists(file) {
@@ -430,23 +420,38 @@ function fileExists(file) {
 }
 
 function validateName(name) {
-
   const error = iutils.validateIBMiName(name);
   if (error) {
     return error;
   }
   return true;
+}
+
+function validateLibrary(name) {
+  const err = validateName(name);
+  if (err === true) {
+	if (iutils.libraryExists(name)) return "Library " + name.toUpperCase() + " already exists. Please use a different name.";
+  }
+  else return err;
+  return true;
+}
 
+function validateServer(name) {
+  const err = validateName(name);
+  if (err === true) {
+	  const exists = iutils.getIBMiInstances().some(el => el.name === name.toUpperCase());
+	  if (exists) return "Server Instance " + name.toUpperCase() + " already exists. Please use a different name.";
+  }
+  else return err;
+  return true;
 }
 
 function validateIASP(name) {
-
   const error = iutils.validateIBMiIASP(name);
   if (error) {
     return error;
   }
   return true;
-
 }
 
 function validatePort(port) {
@@ -457,22 +462,18 @@ function validatePort(port) {
 }
 
 function isValidNodePath(nodePath) {
-
   if (!fileExists(nodePath)) {
     return "Path " + nodePath + " does not exist. A valid path name must be entered.";
   }
   return true;
-
 }
 
 function isValidCcsid(ccsid) {
-
   const error = iutils.validateIBMiCCSID(parseInt(ccsid, 10));
   if (error) {
     return error;
   }
   return true;
-
 }
 
 function validateYesNo(answer) {
@@ -483,34 +484,31 @@ function validateYesNo(answer) {
 }
 
 function stringifyConfig(config) {
-
   // JavaScript functions (like connectorIPFilter) will be lost when doing JSON.stringify,
   // so we need to do some magic to preserve them.
-  
+
   let funkz = [];
   let configString = "\nmodule.exports = ";
 
   configString += JSON.stringify(config, (key, val) => {
-      if (typeof val === 'function') {
-        let n = funkz.length;
-        funkz.push(val.toString());
-        return `___function${n}___`;
-      }
-      return val;
+    if (typeof val === "function") {
+      let n = funkz.length;
+      funkz.push(val.toString());
+      return `___function${n}___`;
+    }
+    return val;
   }, "  ");
-  
+
   configString += "\n";
 
-  for (var i=0; i<funkz.length; i++) {
+  for (var i = 0; i < funkz.length; i++) {
     configString = configString.replace(`"___function${i}___"`, funkz[i]);
   }
 
   return configString;
-
 }
 
 function validatePUIInstance(name) {
-
   name = name.toUpperCase();
   const result = validateName(name);
   if (result !== true) {
@@ -522,12 +520,10 @@ function validatePUIInstance(name) {
     return data.error;
   }
   return true;
-
 }
 
 function getPUIInstanceData(name) {
-
-    // Read the instance DB record to determine the server root and config file paths.
+  // Read the instance DB record to determine the server root and config file paths.
   const instanceMember = `/QSYS.LIB/QUSRSYS.LIB/QATMHINSTC.FILE/${name}.MBR`;
   try {
     fs.accessSync(instanceMember, fs.constants.R_OK);
@@ -565,8 +561,8 @@ function getPUIInstanceData(name) {
     }
   ).toString();
   const lines = conf.split("\n")
-  .map(line => line.replace(/\r$/, ""))
-  .filter(line => !line.includes("#"));
+    .map(line => line.replace(/\r$/, ""))
+    .filter(line => !line.includes("#"));
 
   // Determine PUI library.
   // First check for: Define PUI_LIBRARY
@@ -618,7 +614,6 @@ function getPUIInstanceData(name) {
 
   // Gets a PUI variable define
   function getPUIDefine(name) {
-
     const re = new RegExp(`${name}\\s+(.+)`);
     for (const line of lines) {
       let match = line.match(/^\s*Define\s+(.+)/i);
@@ -631,7 +626,6 @@ function getPUIInstanceData(name) {
         }
       }
     }
-
   }
 
   // Gets library name from ScriptAlias directive matching alias path name.
@@ -663,7 +657,6 @@ function getPUIInstanceData(name) {
       }
     }
   }
-
 }
 
 function argDefined(argDefs, args, name) {
@@ -680,7 +673,6 @@ function argDefined(argDefs, args, name) {
 }
 
 async function buildArgHelp() {
-
   const nameHeading = "Argument";
   const labelHeading = "Description";
   const dftHeading = "Default Value";
@@ -690,10 +682,10 @@ async function buildArgHelp() {
   const pad = 3;
   await forEachQuestion(question => {
     if (question.id) {
-      const name = "--" + question.id
+      const name = "--" + question.id;
       const label = question.label;
       opts[name] = {
-        label: label,
+        label,
         default: question.required ? getDefault(question) : "** NONE **"
       };
       if (name.length > nameLen) {
@@ -716,7 +708,6 @@ async function buildArgHelp() {
     argHelp += opts[name].default;
   }
   return argHelp;
-
 }
 
 function checkItem(item) {
@@ -806,7 +797,6 @@ function getWarnings() {
 }
 
 async function forEachQuestion(fn) {
-
   await iter(install_info.questions);
 
   async function iter(questions) {
@@ -820,7 +810,6 @@ async function forEachQuestion(fn) {
       }
     }
   }
-
 }
 
 function validate(question, answer) {
@@ -834,9 +823,15 @@ function validate(question, answer) {
   else if (question.id === "puiInstance") {
     validator = validatePUIInstance;
   }
+  else if (question.id === "connectorLibrary") {
+	validator = validateLibrary;
+  }
   else if (question.id === "connectorIASP") {
     validator = validateIASP;
   }
+  else if (question.id === "strtcpsvr_svrname") {
+	validator = validateServer;
+  }
   else if (question.type === "boolean") {
     validator = validateYesNo;
   }

package/setup/convertStartJS.js

@@ -8,7 +8,6 @@ const moment = require("moment");
 const profound = require("profoundjs");
 
 module.exports = function(file) {
-
   let content = fs.readFileSync(file, "utf8");
   const ast = acorn.parse(content, {
     ecmaVersion: "latest",
@@ -42,21 +41,24 @@ module.exports = function(file) {
       if (node.type === "Program" || isFunction(node) || (node.type === "BlockStatement" && !isFunction(parent))) {
         // Set up new scope.
         const scope = {
-          node: node,
+          node,
           objects: new Map(),
           scopes: new Map()
         };
         // Keep track of contained scopes.
         const containingScope = scopeMap.get(scopeStack[scopeStack.length - 1]);
-        if (containingScope)
+        if (containingScope) {
           containingScope.scopes.set(node, scope);
+        }
         // Add function parameter names to scope.
         if (isFunction(node)) {
           node.params.forEach(param => {
-            if (param.type === "AssignmentPattern")
+            if (param.type === "AssignmentPattern") {
               param = param.left;
-            if (param.type === "Identifier")
-              scope.objects.set(param.name, { scope: scope });
+            }
+            if (param.type === "Identifier") {
+              scope.objects.set(param.name, { scope });
+            }
           });
         }
         scopeMap.set(node, scope);
@@ -75,8 +77,9 @@ module.exports = function(file) {
             }
             else {
               useStrict = containingFnInfo.useStrict;
-              if (node.body.type === "BlockStatement" && node.body.body.length > 0 && node.body.body[0].directive === "use strict")
+              if (node.body.type === "BlockStatement" && node.body.body.length > 0 && node.body.body[0].directive === "use strict") {
                 useStrict = true;
+              }
             }
           }
           fnMap.set(node, {
@@ -95,7 +98,7 @@ module.exports = function(file) {
         node.declarations.forEach(variableDeclarator => {
           if (variableDeclarator.id.type === "Identifier") {
             const scope = node.kind === "var" ? scopeMap.get(fn) : scopeMap.get(scopeStack[scopeStack.length - 1]);
-            scope.objects.set(variableDeclarator.id.name, { scope: scope });
+            scope.objects.set(variableDeclarator.id.name, { scope });
           }
         });
       }
@@ -113,8 +116,9 @@ module.exports = function(file) {
               else if (parent.type === "AssignmentExpression" && parent.right === node) {
                 name = getQualifiedName(parent.left);
               }
-              if (name)
+              if (name) {
                 pjsPrefix = name;
+              }
             }
           }
         }
@@ -156,8 +160,9 @@ module.exports = function(file) {
         const containingScope = scopeMap.get(scopeStack[scopeStack.length - 2]);
         const containingFn = fnStack[fnStack.length - 2];
         if (node.type === "FunctionDeclaration") {
-          if (node.id.name)
+          if (node.id.name) {
             fnInfo.name = node.id.name;
+          }
           const containingFnInfo = fnMap.get(containingFn);
           fnInfo.scope = (containingFnInfo.useStrict && containingScope.node.type === "BlockStatement") ? containingScope.node : containingFn;
         }
@@ -183,7 +188,7 @@ module.exports = function(file) {
       else if (node.type === "CallExpression") {
         callMap.set(node, {
           containingFn: fn,
-          parent: parent
+          parent
         });
         const callee = node.callee;
         let calleeName = getQualifiedName(callee);
@@ -194,7 +199,7 @@ module.exports = function(file) {
             eval("fn = " + internalName);
           }
           catch (error) {}
-          if (fn && typeof(fn) === "function" && fn.constructor.name === "AsyncFunction") {
+          if (fn && typeof (fn) === "function" && fn.constructor.name === "AsyncFunction") {
             needsAwait.set(node, true);
           }
         }
@@ -238,8 +243,9 @@ module.exports = function(file) {
     else if (!fn.async) {
       const fnInfo = fnMap.get(fn);
       const parent = fnInfo.parent;
-      if (parent && parent.type === "MethodDefinition" && (parent.kind !== "method" || !parent.key))
+      if (parent && parent.type === "MethodDefinition" && (parent.kind !== "method" || !parent.key)) {
         return;
+      }
       const start = parent.type === "MethodDefinition" ? parent.key.start : fn.start;
       insertions.push({
         pos: start,
@@ -248,11 +254,11 @@ module.exports = function(file) {
     }
   });
 
-  insertions.sort(function (a, b) {
+  insertions.sort(function(a, b) {
     if (a.pos === b.pos) return (a.atEnd || 0) - (b.atEnd || 0);
     return a.pos - b.pos;
   });
-  
+
   const newCode = [];
   if (insertions.length) {
     // For performance -- Instead of string concat use an array to hold the parts and pieces -- then join them together
@@ -275,10 +281,12 @@ module.exports = function(file) {
     if (match) {
       const lfs = match.filter(el => el === "\n").length;
       const crlfs = match.length - lfs;
-      if (lfs > crlfs)
+      if (lfs > crlfs) {
         EOL = "\n";
-      else if (crlfs > lfs)
+      }
+      else if (crlfs > lfs) {
         EOL = "\r\n";
+      }
     }
     const lines = content.split(EOL);
     let index = 0;
@@ -303,10 +311,12 @@ module.exports = function(file) {
   return changed;
 
   function getCallName(name) {
-    if (callAPIs.includes(name))
+    if (callAPIs.includes(name)) {
       return name;
-    else
+    }
+    else {
       return name.replace(/\.(call|apply)$/, "");
+    }
   }
 
   // Given a list of CallExpressions needing await (needsAwait):
@@ -314,7 +324,6 @@ module.exports = function(file) {
   //  Functions that contain await calls need to be made async, and any caller of the containing function needs to await the result.
   //  So then the caller of the containing function needs to be made aysnc, and so on...
   function findAsyncCalls(needsAwait, needsAsync, callMap, fnMap) {
-
     find(new Map(needsAwait));
 
     function find(calls) {
@@ -322,8 +331,9 @@ module.exports = function(file) {
         const callInfo = callMap.get(callExpression);
         const containingFn = callInfo.containingFn;
         needsAsync.set(containingFn, true);
-        if (containingFn.type === "Program")
+        if (containingFn.type === "Program") {
           return;
+        }
         const containingFnInfo = fnMap.get(containingFn);
         if (containingFnInfo.scope && containingFnInfo.name && containingFnInfo.name !== "startPJS") {
           const newCalls = new Map();
@@ -345,21 +355,20 @@ module.exports = function(file) {
         }
       });
     }
-
   }
-
-}
+};
 
 // Given an Identifier or MemberExpression, tries to return a fully qualified name.
 // Returns undefined if the name can't be determined due to dynamic parts.
 function getQualifiedName(node) {
-
-  if (node.type !== "Identifier" && node.type !== "MemberExpression")
+  if (node.type !== "Identifier" && node.type !== "MemberExpression") {
     return;
+  }
 
   const parts = process(node);
-  if (parts.indexOf(undefined) === -1)
+  if (parts.indexOf(undefined) === -1) {
     return parts.join(".");
+  }
 
   function process(node) {
     const parts = [];
@@ -371,17 +380,18 @@ function getQualifiedName(node) {
     }
     else if (node.type === "MemberExpression") {
       parts.push(...process(node.object));
-      if (node.computed === true && node.property.type !== "Literal")
+      if (node.computed === true && node.property.type !== "Literal") {
         parts.push("__COMPUTED__");
-      else
+      }
+      else {
         parts.push(...process(node.property));
+      }
     }
     else {
       parts.push(undefined);
     }
     return parts;
   }
-
 }
 
 function copyScopeObjects(scope, objects) {

package/setup/encrypt_client_file.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+var profoundjs = require("profoundjs");
+profoundjs.encryptClientFile();

package/setup/install.js

@@ -23,7 +23,7 @@ const iutils = require("./install_utils.js");
 const path = require("path");
 /*
   NOTE: install_info.json
-  
+
   This file contains instructions for completing the installation.
   It tells the process what questions to ask and what commands to run.
   This file is shared with the GUI installer.