profoundjs 5.8.2 → 6.0.0-beta.2

package/setup/modules/puiscreens.json

@@ -166,7 +166,7 @@
       "screen": {
         "record format name": "errscrn",
         "disable enter key": "true",
-        "onload": "if ((window.puiMobileClient == null && window.device != null &&\n  window.device.platform == \"iOS\") ||\n  pui.genie != null) {\n\n  applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n  applyProperty(\"btnBack\", \"field type\", \"graphics button\");\n\n}\nif (pui.genie != null) {\n\n  applyProperty(\"NewSessionButton\", \"value\", pui.getLanguageText(\"runtimeText\", \"ok\"));\n  applyProperty(\"NewSessionButton\", \"onclick\", \"pui.click();\");\n\n}\npui.formatErrorText(); \npui.confirmOnClose = false; \npui.shutdownOnClose = false;\n\n// Activate download button if we have Job info\nif (get('ESAPPJOB') !== \"\") {\n  applyProperty(\"appDwnld_icon\", \"visibility\", \"visible\");\n}\n"
+        "onload": "if ((window.puiMobileClient == null && window.device != null &&\n  window.device.platform == \"iOS\") ||\n  pui.genie != null) {\n\n  applyProperty(\"btnBack\", \"visibility\", \"hidden\");\n  applyProperty(\"btnBack\", \"field type\", \"graphics button\");\n\n}\nif (pui.genie != null) {\n\n  applyProperty(\"NewSessionButton\", \"value\", pui.getLanguageText(\"runtimeText\", \"ok\"));\n  applyProperty(\"NewSessionButton\", \"onclick\", \"pui.click();\");\n\n}\npui.formatErrorText(); \npui.confirmOnClose = false; \npui.shutdownOnClose = false;\n\n// Activate download button if we have Job info\nif (pui[\"appJob\"] && typeof pui[\"appJob\"][\"appjoblogkey\"] === \"string\") {\n  applyProperty(\"JobLogDownload\", \"visibility\", \"visible\");\n}\n"
       },
       "items": [
         {
@@ -491,20 +491,6 @@
           "layout": "ErrorPanel",
           "container": "1"
         },
-        {
-          "id": "appDwnld_icon",
-          "field type": "icon",
-          "icon": "material:file_download",
-          "left": "765px",
-          "top": "60px",
-          "cursor": "pointer",
-          "tool tip": "Script: pui.getLanguageText(\"runtimeText\",\"joblog download\")",
-          "visibility": "hidden",
-          "onclick": "\n// Get Application job and download the joblog\nvar appJob = get('ESAPPJOB').split('/');\nvar body = {name:appJob[2],user:appJob[1],number:appJob[0]};\n\nvar jobLogServer = get('ESPJSSRVR') + '/joblog';\n\nvar request = new XMLHttpRequest();\n\nrequest.onreadystatechange = function() {\n\n  if (this.readyState == XMLHttpRequest.DONE && this.status == 200) {\n\n    var response = JSON.parse(this.responseText);\n\n    if (response[\"success\"] === true) {\n\n      var job = {};\n\n      job.data = response[\"jobLog\"][\"data\"];\n\n      // Format the filename for download. You can override  \n      // this name if required.\n      job.fileName = pui.getLanguageText(\"runtimeText\",\"app job\").replace(\" \", \"_\")\n                    + \"_\" + response[\"version\"] + \"_\" \n                    + response[\"jobLog\"][\"id\"] + \".txt\";\n\n      pui.downloadJobLog(job);\n\n      applyProperty(\"appDwnld_icon\", \"disabled\", \"true\");\n      applyProperty(\"appDwnld_icon\", \"tool tip\", pui.getLanguageText(\"runtimeText\",\"upload finished text\"));\n    }\n    else {\n      applyProperty(\"appDwnld_icon\", \"tool tip\", response[\"msg\"]);\n    }\n  }\n};\n\nrequest.open(\"POST\", jobLogServer, true);\nrequest.setRequestHeader(\"Content-type\", \"application/json;charset=UTF-8\");\n\nrequest.send(JSON.stringify(body));\n",
-          "color": "#659ABB",
-          "layout": "ErrorPanel",
-          "container": "1"
-        },
         {
           "id": "appJobLabel",
           "field type": "output field",
@@ -546,7 +532,7 @@
           "font weight": "bold",
           "text align": "right",
           "left": "320px",
-          "top": "95px",
+          "top": "125px",
           "width": "160px",
           "layout": "ErrorPanel",
           "container": "1"
@@ -555,7 +541,7 @@
           "id": "ESCURRUSER",
           "field type": "output field",
           "left": "490px",
-          "top": "95px",
+          "top": "125px",
           "height": "15px",
           "width": "130px",
           "value": {
@@ -573,74 +559,6 @@
           "layout": "ErrorPanel",
           "container": "1"
         },
-        {
-          "id": "remoteIpLabel",
-          "field type": "output field",
-          "value": "Script: pui.getLanguageText(\"runtimeText\",\"remote ip\") + ':'",
-          "font weight": "bold",
-          "text align": "right",
-          "left": "320px",
-          "top": "125px",
-          "width": "160px",
-          "layout": "ErrorPanel",
-          "container": "1"
-        },
-        {
-          "id": "ESRMTIP",
-          "field type": "output field",
-          "left": "490px",
-          "top": "125px",
-          "height": "15px",
-          "width": "130px",
-          "value": {
-            "fieldName": "esrmtip",
-            "dataLength": "10",
-            "trimLeading": "false",
-            "trimTrailing": "true",
-            "blankFill": "false",
-            "rjZeroFill": "false",
-            "dataType": "char",
-            "formatting": "Text",
-            "textTransform": "none",
-            "designValue": "[esrmtip]"
-          },
-          "layout": "ErrorPanel",
-          "container": "1"
-        },
-        {
-          "id": "remotePortLabel",
-          "field type": "output field",
-          "value": "Script: pui.getLanguageText(\"runtimeText\",\"remote port\") + ':'",
-          "font weight": "bold",
-          "text align": "right",
-          "left": "320px",
-          "top": "155px",
-          "width": "160px",
-          "layout": "ErrorPanel",
-          "container": "1"
-        },
-        {
-          "id": "ESRMTPORT",
-          "field type": "output field",
-          "left": "490px",
-          "top": "155px",
-          "height": "15px",
-          "width": "130px",
-          "value": {
-            "fieldName": "esrmtport",
-            "dataLength": "10",
-            "trimLeading": "false",
-            "trimTrailing": "true",
-            "blankFill": "false",
-            "rjZeroFill": "false",
-            "dataType": "char",
-            "formatting": "Text",
-            "textTransform": "none",
-            "designValue": "[esrmtport]"
-          },
-          "layout": "ErrorPanel",
-          "container": "1"
-        },
         {
           "id": "NewSessionButton",
           "field type": "graphic button",
@@ -714,13 +632,28 @@
             "designValue": "[espjssrvr]"
           },
           "text align": "right",
-          "left": "515px",
-          "top": "545px",
+          "left": "15px",
+          "top": "525px",
           "height": "15px",
-          "width": "270px",
+          "width": "70px",
           "visibility": "hidden",
           "layout": "ErrorPanel",
           "container": "1"
+        },
+        {
+          "id": "JobLogDownload",
+          "field type": "html container",
+          "html": "Script: \"<span class=\\\"pui-material-icons\\\">file_download</span><span id=\\\"JobLogDownload_fb\\\">\" + pui.getLanguageText(\"runtimeText\",\"joblog download\") + \"</span>\"",
+          "left": "490px",
+          "top": "85px",
+          "height": "15px",
+          "width": "255px",
+          "visibility": "hidden",
+          "onclick": "var filename = pui.getLanguageText(\"runtimeText\",\"app job\");\nfilename.replace(\" \", \"_\");\nif (pui[\"appJob\"]){\n  if (typeof pui[\"appJob\"][\"id\"] === \"string\"){\n    var jobParts = pui[\"appJob\"][\"id\"].split(\"/\");\n    if (jobParts.length == 3){\n      filename += \"_\" + jobParts[0]+\"_\"+jobParts[1]+\"_\"+jobParts[2];\n    }\n  }\n  else {\n    filename += \"_\" + (pui[\"appJob\"][\"number\"] ? pui[\"appJob\"][\"number\"] : \"\");\n    filename += \"_\" + (pui[\"appJob\"][\"user\"] ? pui[\"appJob\"][\"user\"] : \"\");\n    filename += \"_\" + (pui[\"appJob\"][\"name\"] ? pui[\"appJob\"][\"name\"] : \"\");\n  }\n}\nfilename += \".txt\";\n\ntry {\n  // 1. Job; 2. The server with the job logs; 3. filename prefx; 4. element to get feedback text. (output)\n  pui.downloadJobLog(\n    pui[\"appJob\"][\"appjoblogkey\"],\n    null,\n    filename,\n    getObj(\"JobLogDownload_fb\") );\n}\ncatch(exc){\n  console.log(exc);\n}",
+          "tool tip": "Script: pui.getLanguageText(\"runtimeText\",\"joblog download\")",
+          "css class": "joblogDL",
+          "layout": "ErrorPanel",
+          "container": "1"
         }
       ]
     },

package/setup/package.json

@@ -15,7 +15,7 @@
     "node": "^12 || ^14"
   },
   "dependencies": {
-    "profoundjs": "^5.8.2"
+    "profoundjs": "^6.0.0-beta.2"
   },
   "scripts": {
     "start": "node start.js"

package/setup/setup.js

@@ -174,15 +174,12 @@ function createPackageFile() {
 
 function createStart(callback) {
   if (fileExists(deployDir + dirSep + "start.js")) {
-      console.log("start.js file exists.");
-      const profound = require("profoundjs");
-      if (profound.PROMISES_MODE) {
-        const convertStartJS = require("./convertStartJS.js");
-        const changed = convertStartJS(deployDir + dirSep + "start.js");
-        if (changed) {
-          console.log("start.js file converted to Promises.");
-        }
-      }
+    console.log("start.js file exists.");
+    const convertStartJS = require("./convertStartJS.js");
+    const changed = convertStartJS(deployDir + dirSep + "start.js");
+    if (changed) {
+      console.log("start.js file converted to Promises.");
+    }
     callback();
   } 
   else {
@@ -306,7 +303,11 @@ function createPuiscreens() {
         break;
 
       case "2becc968e9db1acc1ffd6e3885d95c153d678468e69a4fdef0df725c06897b7f6ddcff82d703cb76724774729b18b56307445e728521311dbf256b97e17538d8":
-        console.log("Found Standard puiscreens.json file version >= 5.2.0, no need for update.");
+        copyFileOldVersionIs("5.2.0");
+        break;
+
+      case "af04803ac52709fd25f6fc87ff3ea309ad03ee6a9631f32511a5aa32c5ae50f34fd0e38e0d47dea223ac0c5dfb595199c623a83772af830edd21378055403e5c":
+        console.log("Found Standard puiscreens.json file version >= 6.0.0, no need for update.");
         break;
           
       default:

package/setup/start.js

@@ -1,20 +1,13 @@
 #!/usr/bin/env node
-
-// Load Profound.js
-var profoundjs = require("profoundjs");
-
-// Apply configuration
-var config = require("./config.js");
-profoundjs.applyConfig(config);
-
-// Start Profound.js server
-var isWorker = profoundjs.server.listen();
-if (isWorker) {
-
-  // This is the top-level Express Application.
-  // Custom Express coding can be added here.
-  var express = profoundjs.server.express;
-  var app = profoundjs.server.app;
-  app.use(express.json());  // default to use JSON-encoded post data
-  
+async function startPJS() {
+  var profoundjs = require("profoundjs");
+  var config = require("./config.js");
+  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());
+  }
 }
+startPJS();