profoundjs 6.3.0 → 6.5.0

package/setup/completeInstall.js

@@ -316,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");
@@ -427,6 +427,25 @@ function validateName(name) {
   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) {
@@ -804,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/install_utils.js

@@ -5,6 +5,7 @@
   Utilities for PJS install/setup process.
 */
 
+const child_process = require("child_process");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
@@ -24,6 +25,7 @@ exports.getConfigPath = function() {
 
 exports.getDeployDir = function() {
   const dirParts = __dirname.split(path.sep);
+  // eslint-disable-next-line no-empty
   while (dirParts.length > 0 && dirParts.pop() !== "node_modules") {};
   if (dirParts.length > 0) {
     return dirParts.join(path.sep);
@@ -121,6 +123,33 @@ exports.isIBMi = function() {
   return (os.platform() === "os400" || (os.platform() === "aix" && os.type() === "OS400"));
 };
 
+exports.libraryExists = function(name) {
+  if (typeof name !== "string" || name.trim() === "") {
+    throw new Error("Library name is required.");
+  }
+  if (!exports.isIBMi()) {
+    throw new Error("This function is not valid on this platform.");
+  }
+  let exists;
+  try {
+    child_process.execSync(
+      `/usr/bin/system 'qsys/chkobj obj(${name.trim()}) objtype(*lib) aut(*none)'`,
+      {
+        shell: "/QOpenSys/usr/bin/qsh",
+        stdio: ["ignore", "pipe", "pipe"]
+      }
+    );
+    exists = true;
+  }
+  catch (error) {
+    if (!Buffer.isBuffer(error.stderr) || !error.stderr.toString().startsWith("CPF9801")) {
+      throw error;
+    }
+    exists = false;
+  }
+  return exists;
+};
+
 if (exports.getDeployDir()) {
   require("dotenv").config(
     {

package/setup/plugins/mathoperation.js

@@ -0,0 +1,84 @@
+
+module.exports = {
+	
+    name: "Math-Operation",
+    
+	// The title that is displayed for this sample plugin on the plugin selection
+	text: "Math Operation",
+    
+	// The plugin category that the sample plugin will be placed into.
+	// A category will be created if the category name does not currently exist
+	category: "Sample User Plugins",
+    
+	// The help text that is displayed when the help icon is clicked on this plugin's menu
+	help: `This plugin does a math operation set by the user for 2 different numbers from 2 widget sources`,
+    
+	// Specifies if the plugin is a client-side or server-side step. A plugin is server-side by default.
+	clientSide: true,
+    
+	context: "rdf",
+    
+	// An array used to generate the plugin questions and assign values set by the user.
+	questions: [
+
+        {
+            id: "firstNumber",
+            text: "ID of Widget containing the first number",
+            required: true,
+			insertDynamic: true,
+            dynamicSource: "widgets"
+        },
+
+        {
+            id: "secondNumber",
+            text: "ID of Widget containing the second number",
+            required: true,
+            insertDynamic: true,
+            dynamicSource: "widgets"
+        },
+		
+		{
+			id: "operation",
+			text: "Math operation",
+			required: true,
+			type: "dropdown",
+			source: ["+","-","*","/"],
+			required: true
+		},
+		
+		{
+			id: "result",
+			text: "ID of Widget where result will be stored",
+			required: true,
+			insertDynamic: true,
+			dynamicSource: "widgets"
+		}
+    ],
+    
+	// This is where code is generated for the plugin once the questions are answered.
+	// You can also see this code via the "convert to code" plugin icon.
+	generator: function(answers) {
+		
+		let result = 0;
+		let code = "";
+		
+		switch (answers["operation"]) {
+        
+			case "+":
+				code = 'pui.set( "' + answers.result + '", parseInt( pui.get("' + answers.firstNumber + '") ) + parseInt( pui.get("' + answers.secondNumber + '") ) );';
+				break;
+			case "-":
+				code = 'pui.set( "' + answers.result + '", parseInt( pui.get("' + answers.firstNumber + '") ) - parseInt( pui.get("' + answers.secondNumber + '") ) );';
+				break;
+			case "*":
+				code = 'pui.set( "' + answers.result + '", parseInt( pui.get("' + answers.firstNumber + '") ) * parseInt( pui.get("' + answers.secondNumber + '") ) );';
+				break;	
+			case "/":
+				code = 'pui.set( "' + answers.result + '", parseInt( pui.get("' + answers.firstNumber + '") ) / parseInt( pui.get("' + answers.secondNumber + '") ) );';
+				break;	
+				
+		}
+		
+        return code;
+    }
+}

package/setup/setup.js

@@ -253,6 +253,15 @@ let SILENT_MODE = false;
       log("Creating modules directory.");
       fs.mkdirSync(path.join(deployDir, "modules"));
     }
+	
+	// Create plugins directory. 
+    if (directoryExists(path.join(deployDir, "plugins"))) {
+      log("plugins directory exists.");
+    }
+    else {
+      log("Creating plugins directory.");
+      fs.mkdirSync(path.join(deployDir, "plugins"));
+    }
 
     // Grant PROFOUNDJS user all permissions to modules directory tree.
     if (IBMi) {
@@ -280,6 +289,15 @@ let SILENT_MODE = false;
       log("Creating puidnlexit.js.");
       copyFile(path.join(__dirname, "modules", "puidnlexit.js"), path.join(deployDir, "modules"), "utf8");
     }
+	
+	// Create mathoperation.js.
+    if (fileExists(path.join(deployDir, "plugins", "mathoperation.js"))) {
+      log("mathoperation.js file exists.");
+    }
+    else {
+      log("Creating mathoperation.js.");
+      copyFile(path.join(__dirname, "plugins", "mathoperation.js"), path.join(deployDir, "plugins"), "utf8");
+    }
 
     // Create samples directory.
     if (directoryExists(path.join(deployDir, "modules", "pjssamples"))) {