profoundjs 6.0.0-beta.6 → 6.0.0-beta.8

package/setup/setup.js

@@ -6,16 +6,17 @@
   This is NPM script: npm run setup
 
   * Performs additional installation.
-  * Kicked off automatically after NPM install if 'config.js' is present in deployment directory.
-  * Otherwise kicked off from 'complete_install.js' which is manually run by user.
+  * Kicked off from 'complete_install.js' which is manually run by user.
   * Can also be run directly for advanced/automated installation.
 
-  NOTE: Output from this script will be suppressed by NPM 7+ when invoked via 'npm install', unless process ends with non-zero exit code.
-
 */
 
 const htdocs_download_url = "http://resources.profoundjs.com/profoundui_htdocs.zip";
 
+// Platform-specific dependency versions.
+const idb_connector_version = "1.2.16";
+const node_pty_version = "^2";
+
 const child_process = require("child_process");
 const compareVersions = require("compare-versions");
 const crypto = require("crypto");
@@ -28,7 +29,7 @@ const path = require("path");
 const util = require("util");
 const uuidv4 = require("uuid").v4;
 
-const IBMi = os.type() === "OS400";
+const IBMi = iutils.isIBMi();
 
 const RED   = "\x1b[31m";
 const CYAN  = "\x1b[36m";
@@ -62,7 +63,11 @@ let logFile;
           "ibmi-instance-ccsid",
           "ibmi-instance-node-path",
           "nodegit-version"
-        ]
+        ],
+        unknown: function(arg) {
+          console.error("Unknown argument:", arg);
+          process.exit(1);
+        }
       }
     );
 
@@ -93,10 +98,10 @@ let logFile;
   IBM i instance-related values are ignored unless --ibmi-instance is specified.
 
   --ibmi-connector-library installs to library specified in config file.
-  --ibmi-instance creates STRTCPSVR config, if not already present.
-  --ibmi-instance-autostart sets/updates "autostart" in STRTCPSVR config.
-  --ibmi-instance-ccsid sets/updates "ccsid" in STRTCPSVR config.
-  --ibmi-instance-node-path sets/updates "nodePath" in STRTCPSVR config.
+  --ibmi-instance creates or replaces STRTCPSVR config.
+  --ibmi-instance-autostart sets "autostart=1" in STRTCPSVR config.
+  --ibmi-instance-ccsid sets "ccsid" in STRTCPSVR config.
+  --ibmi-instance-node-path sets "nodePath" in STRTCPSVR config.
   `;
       console.log(HELP);
       process.exit(0);
@@ -194,6 +199,28 @@ let logFile;
       }
     }
 
+    // Install platform-specific dependencies.
+    if (IBMi) {
+      log(`Installing idb-connector...`);
+      child_process.execSync(
+        `npm install --no-package-lock idb-connector@"${idb_connector_version}"`,
+        {
+          cwd: iutils.getPackageDir(),
+          stdio: ["ignore", logFile, logFile]
+        }
+      );
+    }
+    else {
+      log(`Installing profoundjs-node-pty...`);
+      child_process.execSync(
+        `npm install --save-optional --no-package-lock profoundjs-node-pty@"${node_pty_version}"`,
+        {
+          cwd: iutils.getPackageDir(),
+          stdio: ["ignore", logFile, logFile]
+        }
+      );
+    }
+
     // Install nodegit, if necessary.
     if (args["nodegit"]) {
       let version;
@@ -344,28 +371,6 @@ let logFile;
         let nodePath = process.argv[0];
         if (args["ibmi-instance"] !== undefined) {
           svrname = args["ibmi-instance"].toUpperCase();
-          const instances = iutils.getIBMiInstances().filter(instance => instance.name === svrname);
-          if (instances.length > 0) {
-            const instance = instances[0];
-            let opt = getOpt("autostart");
-            if (opt) {
-              autostart = (opt.value === "1");
-            }
-            else {
-              autostart = false;
-            }
-            opt = getOpt("ccsid");
-            if (opt) {
-              ccsid = opt.value;
-            }
-            opt = getOpt("nodePath");
-            if (opt) {
-              nodePath = opt.value;
-            }
-            function getOpt(name) {
-              return instance.options.find(opt => opt.name === name);
-            }
-          }
           if (process.argv.find(arg => arg.includes("ibmi-instance-autostart"))) { // minimist sets booleans to false if not passed.
             autostart = args["ibmi-instance-autostart"];
           }
@@ -414,6 +419,19 @@ let logFile;
           die();
         }
       }
+      if (args["ibmi-instance"] === undefined) {
+        // Instance is restarted by PJSINSTALL command only when config is created/replaced.
+        const instances = iutils.getIBMiInstances(deployDir);
+        if (instances.length > 0) {
+          const instance = instances[0];
+          log("");
+          runCommand(`ENDTCPSVR SERVER(*PJS) INSTANCE(${instance.name})`);
+          log("Waiting for instance to end...");
+          // This should generally work as shutdown is relatively fast.
+          await new Promise(resolve => setTimeout(resolve, 10000));
+          runCommand(`STRTCPSVR SERVER(*PJS) INSTANCE(${instance.name})`);
+        }
+      }
     }
     log(`\n${CYAN}Profound.js installation complete.${RESET}\n`);