profoundjs 6.1.0 → 6.2.0

package/setup/lic_client.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+"use strict";
+
+const profound = require("profoundjs");
+
+(async function () {
+  await profound.utils.floatingLicenses.cli();
+})();

package/setup/modules/puiscreens.json

@@ -4,7 +4,7 @@
     {
       "screen": {
         "record format name": "signonscrn",
-        "onload": "if(window.puiMobileClient == null){\n  if(window.device != null){\n    if(window.device.platform != null){\n      if(window.device.platform == \"iOS\"){\n        applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n        applyProperty(\"btnBack\", \"field type\", \"graphics button\");\n        applyProperty(\"SignOnButton\", \"width\", \"340px\");\n        applyProperty(\"SignOnButton\", \"field type\", \"graphics button\");\n      }\n    }  \n  }\n}\npui.confirmOnClose = false;"
+        "onload": "if(window.puiMobileClient == null){\n  if(window.device != null){\n    if(window.device.platform != null){\n      if(window.device.platform == \"iOS\"){\n        applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n        applyProperty(\"btnBack\", \"field type\", \"graphic button\");\n        applyProperty(\"SignOnButton\", \"width\", \"340px\");\n        applyProperty(\"SignOnButton\", \"field type\", \"graphic button\");\n      }\n    }  \n  }\n}\npui.confirmOnClose = false;"
       },
       "items": [
         {
@@ -166,7 +166,7 @@
       "screen": {
         "record format name": "errscrn",
         "disable enter key": "true",
-        "onload": "\nif (pui[\"errorScreen\"] && pui[\"errorScreen\"][\"onload\"]) {\n  pui[\"errorScreen\"][\"onload\"]();\n}\nelse {\n  // Backwards compatibility code for when pui[\"errorScreen\"][\"onload\"]() is not available\n  if ((window[\"puiMobileClient\"] == null && window[\"device\"] != null &&\n    window[\"device\"][\"platform\"] == \"iOS\") ||\n    pui.genie != null) {\n    applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n    applyProperty(\"btnBack\", \"field type\", \"graphics button\");\n  }\n  if (pui.genie != null) {\n    applyProperty(\"NewSessionButton\", \"value\", pui.getLanguageText(\"runtimeText\", \"ok\"));\n    applyProperty(\"NewSessionButton\", \"onclick\", \"pui.click();\");\n  }\n  pui.formatErrorText();\n  pui.confirmOnClose = false;\n  pui.shutdownOnClose = false;\n}\n"
+        "onload": "\nif (pui[\"errorScreen\"] && pui[\"errorScreen\"][\"onload\"]) {\n  pui[\"errorScreen\"][\"onload\"]();\n}\nelse {\n  // Backwards compatibility code for when pui[\"errorScreen\"][\"onload\"]() is not available\n  if ((window[\"puiMobileClient\"] == null && window[\"device\"] != null &&\n    window[\"device\"][\"platform\"] == \"iOS\") ||\n    pui.genie != null) {\n    applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n    applyProperty(\"btnBack\", \"field type\", \"graphic button\");\n  }\n  if (pui.genie != null) {\n    applyProperty(\"NewSessionButton\", \"value\", pui.getLanguageText(\"runtimeText\", \"ok\"));\n    applyProperty(\"NewSessionButton\", \"onclick\", \"pui.click();\");\n  }\n  pui.formatErrorText();\n  pui.confirmOnClose = false;\n  pui.shutdownOnClose = false;\n}\n"
       },
       "items": [
         {
@@ -704,7 +704,7 @@
     {
       "screen": {
         "record format name": "eojscrn",
-        "onload": "if(window.device != null){\n  if(window.device.platform != null){\n   if(window.device.platform == \"iOS\"){\n     applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n     applyProperty(\"btnBack\", \"field type\", \"graphics button\");\n     applyProperty(\"NewSessionButton2\", \"width\", \"335px\");\n     applyProperty(\"NewSessionButton2\", \"field type\", \"graphics button\");\n    }\n  }\n}\n\npui.endOfSession();"
+        "onload": "if(window.device != null){\n  if(window.device.platform != null){\n   if(window.device.platform == \"iOS\"){\n     applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n     applyProperty(\"btnBack\", \"field type\", \"graphic button\");\n     applyProperty(\"NewSessionButton2\", \"width\", \"335px\");\n     applyProperty(\"NewSessionButton2\", \"field type\", \"graphic button\");\n    }\n  }\n}\n\npui.endOfSession();"
       },
       "items": [
         {
@@ -774,7 +774,7 @@
     {
       "screen": {
         "record format name": "timoutscrn",
-        "onload": "if(window.device != null){\n  if(window.device.platform != null){\n    if(window.device.platform == \"iOS\"){\n      applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n      applyProperty(\"btnBack\", \"field type\", \"graphics button\");\n      applyProperty(\"NewSessionButton3\", \"width\", \"335px\");\n      applyProperty(\"NewSessionButton3\", \"field type\", \"graphics button\");\n    }\n  }\n}\n\npui.endOfSession(\"Your session has timed out.\");"
+        "onload": "if(window.device != null){\n  if(window.device.platform != null){\n    if(window.device.platform == \"iOS\"){\n      applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n      applyProperty(\"btnBack\", \"field type\", \"graphic button\");\n      applyProperty(\"NewSessionButton3\", \"width\", \"335px\");\n      applyProperty(\"NewSessionButton3\", \"field type\", \"graphic button\");\n    }\n  }\n}\n\npui.endOfSession(\"Your session has timed out.\");"
       },
       "items": [
         {
@@ -988,7 +988,8 @@
             "rjZeroFill": "false",
             "dataType": "varchar",
             "formatting": "Text",
-            "textTransform": "none"
+            "textTransform": "none",
+            "designValue": "@media screen { #_id_ > .puiresp { display:grid; } }"
           },
           "use viewport": "true",
           "bottom": "0px",

package/setup/setup.js

@@ -28,8 +28,8 @@ const uuidv4 = require("uuid").v4;
 
 const IBMi = iutils.isIBMi();
 
-let RED   = "\x1b[31m";
-let CYAN  = "\x1b[36m";
+let RED = "\x1b[31m";
+let CYAN = "\x1b[36m";
 let RESET = "\x1b[0m";
 
 const logDir = path.join(os.tmpdir(), "profoundjs-" + uuidv4());
@@ -40,7 +40,6 @@ let SILENT_MODE = false;
 
 (async () => {
   try {
-
     // Parse arguments.
     const args = minimist(
       process.argv.slice(2),
@@ -64,7 +63,7 @@ let SILENT_MODE = false;
           "ibmi-instance-node-path",
           "nodegit-version"
         ],
-        unknown: function(arg) {
+        unknown: function (arg) {
           console.error("Unknown argument:", arg);
           process.exit(1);
         }
@@ -73,7 +72,7 @@ let SILENT_MODE = false;
 
     // Show help and quit, if requested.
     if (args["help"]) {
-  const HELP = `Usage: npm run setup -- [OPTION]
+      const HELP = `Usage: npm run setup -- [OPTION]
   -c, --config-file=<file>           Alternate config file.
   -h, --help                         Print this help and exit.
   --nodegit                          Install nodegit.
@@ -316,6 +315,10 @@ let SILENT_MODE = false;
       log("call.js created.");
     }
 
+    // Create lic_client.js
+    copyFile(path.join(__dirname, "lic_client.js"), deployDir, "utf8");
+    log("lic_client.js created.");
+
     // Convert start.js to Promises, if necessary.
     const convertStartJS = require("./convertStartJS.js");
     if (convertStartJS(path.join(deployDir, "start.js"))) {
@@ -326,7 +329,7 @@ let SILENT_MODE = false;
     if (IBMi) {
       log("");
       if (args["ibmi-connector-library"] || args["ibmi-instance"] !== undefined) {
-        let portNumber = config.port || 8081;
+        const portNumber = config.port || 8081;
         let connectorLibrary = "*NONE";
         let connectorIASP;
         if (args["ibmi-connector-library"]) {
@@ -350,7 +353,7 @@ let SILENT_MODE = false;
           }
         }
         // First, try copying the save file
-        var success = runCommand("CPYFRMSTMF FROMSTMF('" + __dirname + "/pjsdist.savf') TOMBR('/QSYS.LIB/QGPL.LIB/PJSDIST.FILE') MBROPT(*REPLACE)");
+        let success = runCommand("CPYFRMSTMF FROMSTMF('" + __dirname + "/pjsdist.savf') TOMBR('/QSYS.LIB/QGPL.LIB/PJSDIST.FILE') MBROPT(*REPLACE)");
         if (!success) {
           logError("Unable to create installer save file.");
           die();
@@ -366,13 +369,15 @@ let SILENT_MODE = false;
           die();
         }
         // Now, try running PJSINSTALL
-        var command = "QGPL/PJSINSTALL CONNLIB(" + connectorLibrary + ")";
-        if (connectorLibrary != "*NONE")
+        let command = "QGPL/PJSINSTALL CONNLIB(" + connectorLibrary + ")";
+        if (connectorLibrary != "*NONE") {
           command += " CONNIASP(" + connectorIASP + ") CONNHOST('localhost') CONNPORT(" + portNumber + ")";
+        }
         command += " SVRNAME(" + svrname + ")";
-        if (svrname != "*NONE")
+        if (svrname != "*NONE") {
           command += " SVRDIR('" + deployDir + "') " +
             "SVRAUTO(" + ((autostart) ? "*YES" : "*NO") + ") CCSID(" + ccsid + ") NODEPATH('" + nodePath + "')";
+        }
         success = runCommand(command, "-Ke");
         // Clean up program and save file
         log("");
@@ -402,7 +407,6 @@ let SILENT_MODE = false;
       }
     }
     log(`\n${CYAN}Profound.js installation complete.${RESET}\n`);
-
   }
   catch (error) {
     logError(error);
@@ -410,26 +414,26 @@ let SILENT_MODE = false;
   }
 })();
 
-function log(...args) {
+function log (...args) {
   console.log(...args);
   logToFile(...args);
 }
 
-function logError(...args) {
+function logError (...args) {
   console.error(...args);
   logToFile(...args);
 }
 
-function logToFile(...args) {
+function logToFile (...args) {
   if (SILENT_MODE) {
     return;
   }
-  let output = `${util.format(...args)}\n`;      // Mimic console.log().
+  let output = `${util.format(...args)}\n`; // Mimic console.log().
   output = output.replace(/\x1b\[[0-9]+m/g, ""); // Strip terminal escape codes for colors.
   fs.writeFileSync(logFile, output, { flag: "a" });
 }
 
-function die() {
+function die () {
   logError(`\n${RED}Profound.js installation failed.${RESET}`);
   if (!SILENT_MODE) {
     console.error(`${RED}See installation log:${RESET} ${logPath}\n`);
@@ -437,12 +441,12 @@ function die() {
   process.exit(1);
 }
 
-function copyDir(dir, destinationDir) {
+function copyDir (dir, destinationDir) {
   const dirName = path.basename(dir);
   fs.mkdirSync(path.join(destinationDir, dirName));
   const files = fs.readdirSync(dir);
-  files.forEach(function(file, index) {
-    if(fs.lstatSync(path.join(dir, file)).isDirectory()) { // recurse
+  files.forEach(function (file, index) {
+    if (fs.lstatSync(path.join(dir, file)).isDirectory()) { // recurse
       copyDir(path.join(dir, file), path.join(destinationDir, dirName));
     }
     else {
@@ -451,20 +455,24 @@ function copyDir(dir, destinationDir) {
   });
 }
 
-function copyFile(file, destination, type) {
+function copyFile (file, destination, type) {
   if (type == null) type = "binary";
-  if (directoryExists(destination))
-    var toFile = path.join(destination, path.basename(file));
-  else
-    var toFile = destination;
-  var content = fs.readFileSync(file, type);
+  let toFile;
+  if (directoryExists(destination)) {
+    toFile = path.join(destination, path.basename(file));
+  }
+  else {
+    toFile = destination;
+  }
+  const content = fs.readFileSync(file, type);
   fs.writeFileSync(toFile, content, type);
 }
 
-function createPuiscreens(deployDir) {
-  function copyFileOldVersionIs(version, compareStr){
+function createPuiscreens (deployDir) {
+  const targetPuiScreensFile = path.join(deployDir, "modules", "puiscreens.json");
+  function copyFileOldVersionIs (version, compareStr) {
     compareStr = compareStr || "=";
-    log("Found Standard puiscreens.json file version "+compareStr+" "+version+", replacing with current version...");
+    log("Found Standard puiscreens.json file version " + compareStr + " " + version + ", replacing with current version...");
     copyFile(path.join(__dirname, "modules", "puiscreens.json"), targetPuiScreensFile, "utf8");
     log("puiscreens.json file was replaced.");
   }
@@ -477,11 +485,15 @@ function createPuiscreens(deployDir) {
   // 3. If it's not an official version, check if we have lower case User & Password. If not, then backup existing version to puiscreens_bak.json and install this official version.
   // 4. Otherwise it's not an official version but should work OK. So leave existing puiscreens.json, and check if we already have a puiscreens_orig.json, and
   //    create it if not.
-  var targetPuiScreensFile = path.join(deployDir, "modules", "puiscreens.json");
   if (fileExists(targetPuiScreensFile)) {
-
-    var data = fs.readFileSync(targetPuiScreensFile);
-    var checksum = crypto.createHash("sha512").update(data).digest("hex");  // sha512 best for 64-bit
+    const data = fs.readFileSync(targetPuiScreensFile);
+    const checksum = crypto.createHash("sha512").update(data).digest("hex"); // sha512 best for 64-bit
+    let format = null;
+    let puiScreens;
+    let goodUser = false;
+    let goodPassword = false;
+    let goodSubmit = false;
+    let goodError = false;
 
     switch (checksum) {
       case "4fb38daa851aacd21cf3aeaa92304df4e0353cae2b6dab3a5fd53c0cf4d42875b5efadbb4bb29642cbff07bfdd8e1c7a9c107f582905f7fc798c3841e888ee61":
@@ -531,39 +543,38 @@ function createPuiscreens(deployDir) {
 
       case "3aaab88d4cf922f01a09bab3424ecf81460c7679a6d51ecb0f187fdce97e627499128e9b8c46d83075098e7e8f7150b73936056b1accedff55a79c69d65cb20b":
         // Note: Betas were considered pre-release versions. 6.0.0 is the release version; so 6.0.0 is newer than 6.0.0-beta.X
-        log("Found Standard puiscreens.json file version >= 6.0.0, no need for update.");
+        copyFileOldVersionIs("6.0.0");
+        break;
+
+      case "41a350ae45c7616fe1824fb236b48ab64ca6d0de1023946e16ef9de4eea804649ff13123fa4ce630bb93308c8312f75e12448bbe58e91802dc8b12cc27bfd051":
+        log("Found Standard puiscreens.json file version > 6.0.0, no need for update.");
         break;
 
       default:
-        var puiScreens = JSON.parse(data);
+        puiScreens = JSON.parse(data);
         log("Found Customized puiscreens.json file, analyzing contents...");
 
         // We need to check the signon screen and make sure we have lower case bound fields
-        var goodUser = false, goodPassword = false, goodSubmit = false, goodError = false;
-
-        formats:
-        for (var i in puiScreens.formats) {
-          var format = puiScreens.formats[i];
-
-          if (format.screen["record format name"].toLowerCase() === "signonscrn") {
-            for (var j in format.items) {
-              var itemValue = format.items[j].value;
-              if (itemValue && typeof itemValue === "object") {
-                if (itemValue.fieldName === "ssuser") goodUser = true;
-                else if (itemValue.fieldName === "sspassword") goodPassword = true;
-              }
-              var itemResponse = format.items[j].response;
-              if (itemResponse && typeof itemResponse === "object") {
-                if (itemResponse.fieldName === "sssubmit") goodSubmit = true;
-              }
-              var itemHtml = format.items[j].html;
-              if (itemHtml && typeof itemHtml === "object") {
-                if (itemHtml.fieldName === "sserror") goodError = true;
-              }
-
-              if (goodUser && goodPassword && goodSubmit && goodError) break formats;
+        if (Array.isArray(puiScreens.formats)) {
+          format = puiScreens.formats.find(format => typeof format.screen["record format name"] === "string" && format.screen["record format name"].toLowerCase() === "signonscrn");
+        }
+        if (format) {
+          for (const j in format.items) {
+            const itemValue = format.items[j].value;
+            if (itemValue && typeof itemValue === "object") {
+              if (itemValue.fieldName === "ssuser") goodUser = true;
+              else if (itemValue.fieldName === "sspassword") goodPassword = true;
+            }
+            const itemResponse = format.items[j].response;
+            if (itemResponse && typeof itemResponse === "object") {
+              if (itemResponse.fieldName === "sssubmit") goodSubmit = true;
+            }
+            const itemHtml = format.items[j].html;
+            if (itemHtml && typeof itemHtml === "object") {
+              if (itemHtml.fieldName === "sserror") goodError = true;
             }
-            break;
+
+            if (goodUser && goodPassword && goodSubmit && goodError) break;
           }
         }
 
@@ -587,10 +598,10 @@ function createPuiscreens(deployDir) {
   }
 }
 
-function directoryExists(dir) {
-  var exists = false;
+function directoryExists (dir) {
+  let exists = false;
   try {
-    var stat = fs.statSync(dir);
+    const stat = fs.statSync(dir);
     if (stat && stat.isDirectory()) exists = true;
   }
   catch (err) {
@@ -599,10 +610,10 @@ function directoryExists(dir) {
   return exists;
 }
 
-function fileExists(file) {
-  var exists = false;
+function fileExists (file) {
+  let exists = false;
   try {
-    var stat = fs.statSync(file);
+    const stat = fs.statSync(file);
     if (stat && stat.isFile()) exists = true;
   }
   catch (err) {
@@ -611,10 +622,9 @@ function fileExists(file) {
   return exists;
 }
 
-function runCommand(command, switches) {
-
+function runCommand (command, switches) {
   log("Executing IBM i command: " + command);
-  var args = [command];
+  const args = [command];
   if (typeof switches == "string") {
     args.unshift(switches);
   }
@@ -632,7 +642,8 @@ function runCommand(command, switches) {
     env: {
       QIBM_USE_DESCRIPTOR_STDIO: "Y",
       QIBM_MULTI_THREADED: "N" // Many IBM commands cannot run in multi-threaded mode...
-  }};
+    }
+  };
 
   const results = child_process.spawnSync("system", args, options);
 
@@ -648,8 +659,7 @@ function runCommand(command, switches) {
   }
   else {
     logError("Process ended due to signal %s", signal);
-    logError(results);  // show full results including detailed error
+    logError(results); // show full results including detailed error
   }
   return false;
-
 }

package/views/cloud.css

@@ -258,10 +258,23 @@
   letter-spacing: .25px;
 }
 
-#_cloud_signin_button {
+#_cloud_signin_button, #_cloud_signin_button_right {
   margin-top: 15px;
-  width: 100%;
-  display:block;
+}
+
+@media (max-width: 575px) {
+  #_cloud_signin_button, #_cloud_signin_button_right {
+    width: 100%;
+    display:block;
+  }
+}
+@media (min-width: 576px) {
+  #_cloud_signin_button, #_cloud_signin_button_right {
+    width: 47%;
+  }
+  #_cloud_signin_button_right {
+    float: right;
+  }
 }
 
 /*--- select template ---*/
@@ -602,9 +615,9 @@ span.pui-fa-brands-icons.fa-google {
 }
 
 ._cloud_signin_col {
-  float: left;
-  width: 50%;
-  margin: auto;
+  /* float: left; */
+  /* width: 50%; */
+  /* margin: auto; */
   padding: 0 40px;
   margin-top: 6px;
   box-sizing: border-box;

package/views/key.ejs

@@ -107,6 +107,21 @@
     color: white;
   }
   
+  .pjs-key-page .floating-lic-info {
+    color: white;
+    font-size: 15px;
+    width: 100%;
+    padding: 10px 30px 10px 60px;
+  }
+
+  .pjs-key-page .floating-lic-info div.pl-uuid span {
+    letter-spacing: 1.0px;
+  }
+
+  .pjs-key-page .floating-lic-info div.fl-lic-verif span.fl-lic-verif-dta.warning {
+    color: #FF3F00;
+  }
+
   .pjs-key-page .system-info {
     padding-left: 30px;
     padding-right: 30px;
@@ -353,6 +368,21 @@
         </div>
         <h1>License Key Management</h1>
       </div>
+      <% if (typeof floating !== "undefined"){ %>
+      <div class="floating-lic-info">
+        <div class="pl-uuid"><span>Floating License UUID: </span><%= floating.uuid %></div>
+        <div class="fl-lic-verif"><span class="fl-lic-verif-lbl">Verified: </span>
+          <% if (floating.verified) { %>
+          <span class="fl-lic-verif-dta">yes</span>
+          <% } else { %>
+          <span class="fl-lic-verif-dta warning">no - <%= floating.verified_msg %></span>
+          <% } %>
+        </div>
+        <div class="pulse-ts-exp">
+          <span>Machine heartbeat pulse required by (UTC): </span><%= floating.pulse_exp %>
+        </div>
+      </div>
+      <% } %>
       <div class="system-info">
         <div>
           <div class="machine-id"><span class="machine-id-label">Machine ID: </span>
@@ -408,7 +438,7 @@
             <form method="post" action="/key">
               <input type="hidden" name="apply" value="1" />
               <div class="paste-key">
-                <textarea placeholder="Paste License Key Here" id="keyData" name="keyData" required></textarea>
+                <textarea placeholder="Paste License Key or Floating License Authorization Code Here" id="keyData" name="keyData" required></textarea>
               </div>
               <div class="apply-key">
                 <input type="submit" value="Apply Key" />
@@ -422,7 +452,7 @@
 			  <label for="keyFile" />Or <span class="key-file-search">
                   <div class="key-file-search-div">Browse</div>
                   <input type="file" id="keyFile" name="keyFile" required onchange="displayKeyFileName(this);" />
-				</span> to select a <a href="https://docs.profoundlogic.com/x/_wLrAw">Key File</a></label>
+				</span> to select a <a href="https://docs.profoundlogic.com/x/_wLrAw">Key or Floating License Authorization Code File</a></label>
               </div>
               <div class="key-file">
                 <input class="key-file-to-upload" id="keyFileName" placeholder="Nothing to upload yet..." disabled="disabled" />