profoundjs 6.0.0-beta.7 → 6.0.0-beta.9

package/setup/completeInstall.js

@@ -21,7 +21,10 @@ const path = require("path");
 const readline = require("readline");
 const iutils = require("./install_utils.js");
 
-const IBMi = os.type() === "OS400";
+const IBMi = iutils.isIBMi();
+
+const RED   = "\x1b[31m";
+const RESET = "\x1b[0m";
 
 (async () => {
   try {
@@ -71,15 +74,26 @@ If config.js is already present, installation proceeds silently by default.
       console.error("Can't find deployment directory.");
       process.exit(1);
     }
+
+    const nodeMajorVersion = Number(process.versions.node.split(".")[0]);
+    const gitSupported = ["win32", "darwin", "linux"].includes(os.platform());
+
     const configPath = iutils.getConfigPath();
     let config = fileExists(configPath) ? require(configPath) : {};
 
     let downloadStaticFiles;
     let svrname, autostart, ccsid, nodePath;
 
+
     // If config.js doesn't exist, or if --configure is passed, prompt and create/update config.js.
     if (!fileExists(configPath) || args["configure"] === true) {
 
+      if (gitSupported && nodeMajorVersion >= 18) {
+        console.log("");
+        console.log(`${RED}WARNING: Git integration not supported on Node.js ${nodeMajorVersion}${RESET}`);
+        console.log("");
+      }
+
       let staticFilesDirectory, port, gitSupport;
       let profounduiLibrary, connectorLibrary, connectorIASP;
 
@@ -109,7 +123,7 @@ If config.js is already present, installation proceeds silently by default.
       port = Number(await ask("Specify port number for Profound.js server", config.port || 8081, validatePort));
       
 
-      if (["win32", "darwin", "linux"].includes(os.platform())) {
+      if (gitSupported && nodeMajorVersion < 18) {
         let answer = (await ask("Install with Git integration?", config.gitSupport === false ? "n" : "y" , validateYesNo)).toUpperCase();
         gitSupport = (answer === "Y");
       }
@@ -266,7 +280,7 @@ If config.js is already present, installation proceeds silently by default.
     if (downloadStaticFiles) {
       setupArgs.push("--static-files");
     }
-    if (["win32", "darwin", "linux"].includes(os.platform()) && config.gitSupport !== false) {
+    if (gitSupported && config.gitSupport !== false && nodeMajorVersion < 18) {
       setupArgs.push("--nodegit");
     }
     if (setupArgs.length === 0) {

package/setup/config.js

@@ -15,7 +15,10 @@ module.exports = {
     {
       "name": "default",
       "default": true,
-      "driver": "IBMi"
+      "driver": "IBMi",
+      "driverOptions": {
+        "SQL_ATTR_COMMIT": "SQL_TXN_NO_COMMIT"
+      }
     }
   ],
   "timeout": 3600,

package/setup/install_utils.js

@@ -6,6 +6,7 @@
 */
 
 const fs = require("fs");
+const os = require("os");
 const path = require("path");
 
 exports.getConfigPath = function() {
@@ -121,3 +122,8 @@ exports.validateIBMiName = function(name) {
   }
 
 }
+
+exports.isIBMi = function() {
+  // Node.js versions < 18 report os.platform() === "aix" on IBM i.
+  return (os.platform() === "os400" || (os.platform() === "aix" && os.type() === "OS400")); 
+}

package/setup/package.json

@@ -12,10 +12,10 @@
     "profoundui"
   ],
   "engines": {
-    "node": "^14 || ^16"
+    "node": "^14 || ^16 || ^18"
   },
   "dependencies": {
-    "profoundjs": "^6.0.0-beta.7"
+    "profoundjs": "^6.0.0-beta.9"
   },
   "scripts": {
     "start": "node start.js"

package/setup/setup.js

@@ -29,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";

package/setup/start.js

@@ -14,11 +14,9 @@ async function startPJS() {
     process.exit(1);
   }
   profoundjs.applyConfig(config);
-  var isWorker = await profoundjs.server.listen();
-  if (isWorker) {
-    var express = profoundjs.server.express;
-    var app = profoundjs.server.app;
-    app.use(express.json());
-  }
+  await profoundjs.server.listen();
+  var express = profoundjs.server.express;
+  var app = profoundjs.server.app;
+  app.use(express.json());
 }
 startPJS();