@5minds/node-red-contrib-processcube 0.14.0-fix-error-in-process-instance-query-9aeac9-lyzi0gix → 0.14.0

package/nodered/settings.js

@@ -21,14 +21,15 @@
  **/
 
 module.exports = {
-    /*******************************************************************************
-     * Flow File and User Directory Settings
-     *  - flowFile
-     *  - credentialSecret
-     *  - flowFilePretty
-     *  - userDir
-     *  - nodesDir
-     ******************************************************************************/
+
+/*******************************************************************************
+ * Flow File and User Directory Settings
+ *  - flowFile
+ *  - credentialSecret
+ *  - flowFilePretty
+ *  - userDir
+ *  - nodesDir
+ ******************************************************************************/
 
     /** The file containing the flows. If not set, defaults to flows_<hostname>.json **/
     flowFile: 'flows.json',
@@ -40,7 +41,7 @@ module.exports = {
      * node-red from being able to decrypt your existing credentials and they will be
      * lost.
      */
-    credentialSecret: 'a-secret-key',
+    credentialSecret: "a-secret-key",
 
     /** By default, the flow JSON will be formatted over multiple lines making
      * it easier to compare changes when using version control.
@@ -59,15 +60,15 @@ module.exports = {
      */
     //nodesDir: '/home/nol/.node-red/nodes',
 
-    /*******************************************************************************
-     * Security
-     *  - adminAuth
-     *  - https
-     *  - httpsRefreshInterval
-     *  - requireHttps
-     *  - httpNodeAuth
-     *  - httpStaticAuth
-     ******************************************************************************/
+/*******************************************************************************
+ * Security
+ *  - adminAuth
+ *  - https
+ *  - httpsRefreshInterval
+ *  - requireHttps
+ *  - httpNodeAuth
+ *  - httpStaticAuth
+ ******************************************************************************/
 
     /** To password protect the Node-RED editor and admin API, the following
      * property can be used. See https://nodered.org/docs/security.html for details.
@@ -124,20 +125,20 @@ module.exports = {
     //httpNodeAuth: {user:"user",pass:"$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN."},
     //httpStaticAuth: {user:"user",pass:"$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN."},
 
-    /*******************************************************************************
-     * Server Settings
-     *  - uiPort
-     *  - uiHost
-     *  - apiMaxLength
-     *  - httpServerOptions
-     *  - httpAdminRoot
-     *  - httpAdminMiddleware
-     *  - httpNodeRoot
-     *  - httpNodeCors
-     *  - httpNodeMiddleware
-     *  - httpStatic
-     *  - httpStaticRoot
-     ******************************************************************************/
+/*******************************************************************************
+ * Server Settings
+ *  - uiPort
+ *  - uiHost
+ *  - apiMaxLength
+ *  - httpServerOptions
+ *  - httpAdminRoot
+ *  - httpAdminMiddleware
+ *  - httpNodeRoot
+ *  - httpNodeCors
+ *  - httpNodeMiddleware
+ *  - httpStatic
+ *  - httpStaticRoot
+ ******************************************************************************/
 
     /** the tcp port that the Node-RED web server is listening on */
     uiPort: process.env.PORT || 1880,
@@ -177,6 +178,7 @@ module.exports = {
     //    next();
     // },
 
+
     /** Some nodes, such as HTTP In, can be used to listen for incoming http requests.
      * By default, these are served relative to '/'. The following property
      * can be used to specify a different root path. If set to false, this is
@@ -242,16 +244,16 @@ module.exports = {
      */
     //httpStaticRoot: '/static/',
 
-    /*******************************************************************************
-     * Runtime Settings
-     *  - lang
-     *  - runtimeState
-     *  - diagnostics
-     *  - logging
-     *  - contextStorage
-     *  - exportGlobalContextKeys
-     *  - externalModules
-     ******************************************************************************/
+/*******************************************************************************
+ * Runtime Settings
+ *  - lang
+ *  - runtimeState
+ *  - diagnostics
+ *  - logging
+ *  - contextStorage
+ *  - exportGlobalContextKeys
+ *  - externalModules
+ ******************************************************************************/
 
     /** Uncomment the following to run node-red in your preferred language.
      * Available languages include: en-US (default), ja, de, zh-CN, zh-TW, ru, ko
@@ -264,7 +266,7 @@ module.exports = {
      *   be available at http://localhost:1880/diagnostics
      * - ui: When `ui` is `true` (or unset), the action `show-system-info` will
      *   be available to logged in users of node-red editor
-     */
+    */
     diagnostics: {
         /** enable or disable diagnostics endpoint. Must be set to `false` to disable */
         enabled: true,
@@ -297,12 +299,12 @@ module.exports = {
              * trace - record very detailed logging + debug + info + warn + error + fatal errors
              * off - turn off all logging (doesn't affect metrics or audit)
              */
-            level: 'info',
+            level: "info",
             /** Whether or not to include metric events in the log output */
             metrics: false,
             /** Whether or not to include audit events in the log output */
-            audit: false,
-        },
+            audit: false
+        }
     },
 
     /** Context Storage
@@ -353,11 +355,12 @@ module.exports = {
         // }
     },
 
-    /*******************************************************************************
-     * Editor Settings
-     *  - disableEditor
-     *  - editorTheme
-     ******************************************************************************/
+
+/*******************************************************************************
+ * Editor Settings
+ *  - disableEditor
+ *  - editorTheme
+ ******************************************************************************/
 
     /** The following property can be used to disable the editor. The admin API
      * is not affected by this option. To disable both the editor and the admin
@@ -382,8 +385,9 @@ module.exports = {
         //tours: false,
 
         header: {
-            title: 'Node-RED powered by ProcessCube &copy;',
-            url: 'https://processcube.io', // optional url to make the header text/image a link to this url
+            title: "Node-RED powered by ProcessCube&copy;",
+            url: "https://processcube.io" // optional url to make the header text/image a link to this url
+
         },
         palette: {
             /** The following property can be used to order the categories in the editor
@@ -392,7 +396,12 @@ module.exports = {
              * If not set, the following default order is used:
              */
             //categories: ['subflows', 'common', 'function', 'network', 'sequence', 'parser', 'storage'],
-            categories: ['ProcessCube', 'ProcessCube Events', 'ProcessCube UI', 'dashboard 2'],
+            categories: [
+                "ProcessCube",
+                "ProcessCube Events",
+                "ProcessCube UI",
+                "dashboard 2"
+            ]
         },
 
         projects: {
@@ -405,15 +414,15 @@ module.exports = {
                  * This can be overridden per-user from the 'Git config'
                  * section of 'User Settings' within the editor
                  */
-                mode: 'manual',
-            },
+                mode: "manual"
+            }
         },
 
         codeEditor: {
             /** Select the text editor component used by the editor.
              * As of Node-RED V3, this defaults to "monaco", but can be set to "ace" if desired
              */
-            lib: 'monaco',
+            lib: "monaco",
             options: {
                 /** The follow options only apply if the editor is set to "monaco"
                  *
@@ -428,39 +437,40 @@ module.exports = {
                 //fontSize: 14,
                 //fontFamily: "Cascadia Code, Fira Code, Consolas, 'Courier New', monospace",
                 //fontLigatures: true,
-            },
+            }
         },
 
         markdownEditor: {
             mermaid: {
                 /** enable or disable mermaid diagram in markdown document
                  */
-                enabled: true,
-            },
+                enabled: true
+            }
         },
+
     },
 
-    /*******************************************************************************
-     * Node Settings
-     *  - fileWorkingDirectory
-     *  - functionGlobalContext
-     *  - functionExternalModules
-     *  - functionTimeout
-     *  - nodeMessageBufferMaxLength
-     *  - ui (for use with Node-RED Dashboard)
-     *  - debugUseColors
-     *  - debugMaxLength
-     *  - execMaxBufferSize
-     *  - httpRequestTimeout
-     *  - mqttReconnectTime
-     *  - serialReconnectTime
-     *  - socketReconnectTime
-     *  - socketTimeout
-     *  - tcpMsgQueueSize
-     *  - inboundWebSocketTimeout
-     *  - tlsConfigDisableLocalFiles
-     *  - webSocketNodeVerifyClient
-     ******************************************************************************/
+/*******************************************************************************
+ * Node Settings
+ *  - fileWorkingDirectory
+ *  - functionGlobalContext
+ *  - functionExternalModules
+ *  - functionTimeout
+ *  - nodeMessageBufferMaxLength
+ *  - ui (for use with Node-RED Dashboard)
+ *  - debugUseColors
+ *  - debugMaxLength
+ *  - execMaxBufferSize
+ *  - httpRequestTimeout
+ *  - mqttReconnectTime
+ *  - serialReconnectTime
+ *  - socketReconnectTime
+ *  - socketTimeout
+ *  - tcpMsgQueueSize
+ *  - inboundWebSocketTimeout
+ *  - tlsConfigDisableLocalFiles
+ *  - webSocketNodeVerifyClient
+ ******************************************************************************/
 
     /** The working directory to handle relative file paths from within the File nodes
      * defaults to the working directory of the Node-RED process.
@@ -558,4 +568,4 @@ module.exports = {
     //    *   - reason: if result is false, the HTTP reason string to return
     //    */
     //},
-};
+}

package/package.json

@@ -1,11 +1,8 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.14.0-fix-error-in-process-instance-query-9aeac9-lyzi0gix",
+    "version": "0.14.0",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
-    "scripts": {
-        "lint": "prettier --write --config ./.prettierrc.json \"**/*.{html,js}\""
-    },
     "authors": [
         {
             "name": "Martin Moellenbeck",
@@ -51,7 +48,7 @@
         }
     },
     "dependencies": {
-        "@5minds/processcube_engine_client": "^5.0.0",
+        "@5minds/processcube_engine_client": "^5.0.1",
         "jwt-decode": "^4.0.0",
         "openid-client": "^5.5.0"
     },
@@ -61,8 +58,5 @@
         "workflow",
         "bpmn",
         "low-code"
-    ],
-    "devDependencies": {
-        "prettier": "^3.3.3"
-    }
+    ]
 }

package/process-start.html

@@ -3,50 +3,54 @@
         category: 'ProcessCube',
         color: '#02AFD6',
         defaults: {
-            name: { value: '' },
-            engine: { value: '', type: 'processcube-engine-config' },
-            processmodel: { value: '', required: false },
-            startevent: { value: '', required: false },
+            name: {value: ""},
+            engine: {value: "", type: "processcube-engine-config"},
+            processmodel: {value: "", required: false},
+            startevent: {value: "", required: false}
         },
         inputs: 1,
         outputs: 1,
-        icon: 'font-awesome/fa-sign-in',
-        label: function () {
-            return this.name || 'process-start';
-        },
+        icon: "font-awesome/fa-sign-in",
+        label: function() {
+            return this.name||"process-start";
+        }
     });
 </script>
 
 <script type="text/html" data-template-name="process-start">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name" />
+        <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
         <label for="node-input-engine"><i class="fa fa-tag"></i> Engine-URL</label>
-        <input type="text" id="node-input-engine" placeholder="Engine-URL" />
+        <input type="text" id="node-input-engine" placeholder="Engine-URL">
     </div>
     <div class="form-row">
         <label for="node-input-processmodel"><i class="fa fa-tag"></i> Processmodel</label>
-        <input type="text" id="node-input-processmodel" placeholder="ID of Processmodel" />
+        <input type="text" id="node-input-processmodel" placeholder="ID of Processmodel">
     </div>
     <div class="form-row">
         <label for="node-input-startevent"><i class="fa fa-tag"></i> Startevent</label>
-        <input type="text" id="node-input-startevent" placeholder="ID of Startevent" />
+        <input type="text" id="node-input-startevent" placeholder="ID of Startevent">
     </div>
 </script>
 
 <script type="text/html" data-help-name="process-start">
     <h2>Start a Processmodel in the ProcessCube</h2>
-    <p>If the <code>msg.payload</code> is set, it will be used as the input for the process.</p>
     <p>
-        If a <code>msg.processModelId</code> is set, it will be used as the process model and override the configured
-        <b>Processmodel</b>.
+        If the <code>msg.payload</code> is set, it will be used as the input for the process.
+    </p>
+    <p>
+        If a <code>msg.processModelId</code> is set, it will be used as the process model and 
+        override the configured <b>Processmodel</b>.
     </p>
     <p>
-        If a <code>msg.startEventId</code> is set, it will be used as the start event and override the configured
-        <b>Startevent</b>.
+        If a <code>msg.startEventId</code> is set, it will be used as the start event and
+        override the configured <b>Startevent</b>.
     </p>
     <h3>More documentation</h3>
-    <p>The Dokumenation can be found on <a href="https://processcube.io">ProcessCube Developer Network</a>.</p>
-</script>
+    <p>
+        The Dokumenation can be found on <a href="https://processcube.io">ProcessCube Developer Network</a>.
+    </p>
+</script>

package/process-start.js

@@ -1,25 +1,16 @@
-const process = require('process');
-const engine_client = require('@5minds/processcube_engine_client');
+const process = require("process");
+const engine_client = require("@5minds/processcube_engine_client");
 
 module.exports = function (RED) {
     function ProcessStart(config) {
         RED.nodes.createNode(this, config);
         var node = this;
-        var flowContext = node.context().flow;
-        var nodeContext = node.context();
 
         this.engine = this.server = RED.nodes.getNode(config.engine);
 
-        const engineUrl = this.engine?.url || process.env.ENGINE_URL || 'http://engine:8000';
+        const client = this.engine.getEngineClient();
 
-        var client = nodeContext.get('client');
-
-        if (!client) {
-            nodeContext.set('client', new engine_client.EngineClient(engineUrl));
-            client = nodeContext.get('client');
-        }
-
-        node.on('input', function (msg) {
+        node.on("input", function (msg) {
             const startParameters = {
                 processModelId: msg.processModelId || config.processmodel,
                 startEventId: msg.startEventId || config.startevent,
@@ -32,12 +23,16 @@ module.exports = function (RED) {
                     msg.payload = result;
 
                     node.send(msg);
-                    node.status({ fill: 'blue', shape: 'dot', text: `started ${result.processInstanceId}` });
+                    node.status({
+                        fill: "blue",
+                        shape: "dot",
+                        text: `started ${result.processInstanceId}`,
+                    });
                 })
                 .catch((error) => {
                     node.error(error);
                 });
         });
     }
-    RED.nodes.registerType('process-start', ProcessStart);
+    RED.nodes.registerType("process-start", ProcessStart);
 };

package/processcube-engine-config.html

@@ -1,30 +1,30 @@
 <script type="text/javascript">
-    RED.nodes.registerType('processcube-engine-config', {
+    RED.nodes.registerType('processcube-engine-config',{
         category: 'config',
         defaults: {
-            url: { value: 'http://engine:8000', required: true },
+            url: {value:"http://engine:8000",required:true}
         },
-        label: function () {
+        label: function() {
             return this.url;
         },
         credentials: {
-            clientId: { type: 'text' },
-            clientSecret: { type: 'password' },
-        },
+            clientId: { type: "text" },
+            clientSecret: { type: "password" }
+        }
     });
 </script>
 
 <script type="text/html" data-template-name="processcube-engine-config">
     <div class="form-row">
         <label for="node-config-input-url"><i class="fa fa-bookmark"></i> Url</label>
-        <input type="text" id="node-config-input-url" />
+        <input type="text" id="node-config-input-url">
     </div>
     <div class="form-row">
         <label for="node-config-input-clientId"><i class="fa fa-bookmark"></i> Client id</label>
-        <input type="text" id="node-config-input-clientId" />
+        <input type="text" id="node-config-input-clientId">
     </div>
     <div class="form-row">
         <label for="node-config-input-clientSecret"><i class="fa fa-bookmark"></i> Client secret</label>
-        <input type="password" id="node-config-input-clientSecret" />
+        <input type="password" id="node-config-input-clientSecret">
     </div>
-</script>
+</script>

package/processcube-engine-config.js

@@ -4,7 +4,7 @@ const oidc = require('openid-client');
 
 const DELAY_FACTOR = 0.85;
 
-module.exports = function (RED) {
+module.exports = function(RED) {
     function ProcessCubeEngineNode(n) {
         RED.nodes.createNode(this, n);
         const node = this;
@@ -14,7 +14,8 @@ module.exports = function (RED) {
         this.registerOnIdentityChanged = function (callback) {
             identityChangedCallbacks.push(callback);
         };
-        this.setIdentity = (identity) => {
+
+        this.setIdentity = (identity)  => {
             this.identity = identity;
 
             for (const callback of identityChangedCallbacks) {
@@ -22,35 +23,41 @@ module.exports = function (RED) {
             }
         };
 
+        var nodeContext = node.context();
+
+        this.getEngineClient = () => {
+            const engineUrl = this.url || process.env.ENGINE_URL || 'http://engine:8000';
+            let client = nodeContext.get('client');
+
+            if (!client) {
+                nodeContext.set('client', new engine_client.EngineClient(engineUrl));
+                client = nodeContext.get('client');
+            }   
+
+            return client;
+        };
+
         if (this.credentials.clientId && this.credentials.clientSecret) {
             const engineClient = new engine_client.EngineClient(this.url);
 
-            engineClient.applicationInfo
-                .getAuthorityAddress()
-                .then((authorityUrl) => {
-                    startRefreshingIdentityCycle(
-                        this.credentials.clientId,
-                        this.credentials.clientSecret,
-                        authorityUrl,
-                        this,
-                    ).catch((reason) => {
-                        console.error(reason);
-                        node.error(reason);
-                    });
-                })
-                .catch((reason) => {
+            engineClient.applicationInfo.getAuthorityAddress().then(authorityUrl => {
+                startRefreshingIdentityCycle(this.credentials.clientId, this.credentials.clientSecret, authorityUrl, this).catch(reason => {
                     console.error(reason);
                     node.error(reason);
                 });
+            }).catch((reason) => {
+                console.error(reason);
+                node.error(reason);
+            });
         }
     }
-    RED.nodes.registerType('processcube-engine-config', ProcessCubeEngineNode, {
+    RED.nodes.registerType("processcube-engine-config", ProcessCubeEngineNode, {
         credentials: {
-            clientId: { type: 'text' },
-            clientSecret: { type: 'password' },
-        },
+            clientId: { type: "text" },
+            clientSecret: { type: "password" }
+        }
     });
-};
+}
 
 async function getFreshTokenSet(clientId, clientSecret, authorityUrl) {
     const issuer = await oidc.Issuer.discover(authorityUrl);
@@ -69,6 +76,7 @@ async function getFreshTokenSet(clientId, clientSecret, authorityUrl) {
 }
 
 function getIdentityForExternalTaskWorkers(tokenSet) {
+
     const accessToken = tokenSet.access_token;
     const decodedToken = jwt.jwtDecode(accessToken);
 
@@ -132,4 +140,4 @@ async function startRefreshingIdentityCycle(clientId, clientSecret, authorityUrl
     };
 
     await refresh();
-}
+}

package/processdefinition-query.html

@@ -3,58 +3,52 @@
         category: 'ProcessCube',
         color: '#02AFD6',
         defaults: {
-            name: { value: '' },
-            engine: { value: '', type: 'processcube-engine-config' },
-            query: { value: 'payload' },
-            query_type: { value: 'msg' },
-            models_only: { value: false },
+            name: {value: ""},
+            engine: {value: "", type: "processcube-engine-config"},
+            query: {value: "payload"},
+            query_type: {value: "msg"},
+            models_only: {value: false},
         },
         inputs: 1,
         outputs: 1,
-        icon: 'font-awesome/fa-envelope-open',
-        label: function () {
-            return this.name || 'processdefinition-query';
+        icon: "font-awesome/fa-envelope-open",
+        label: function() {
+            return this.name || "processdefinition-query";
         },
-        oneditprepare: function () {
-            $('#node-input-query').typedInput({
+        oneditprepare: function() {
+            $("#node-input-query").typedInput({
                 default: 'msg',
-                types: ['msg', 'json'],
+                types: ['msg', 'json']
             });
 
-            $('#node-input-query').typedInput('value', this.query);
-            $('#node-input-query').typedInput('type', this.query_type);
-        },
-        oneditsave: function () {
-            (this.query = $('#node-input-query').typedInput('value')),
-                (this.query_type = $('#node-input-query').typedInput('type'));
+            $("#node-input-query").typedInput('value', this.query);
+            $("#node-input-query").typedInput('type', this.query_type);
         },
+        oneditsave: function() {
+            this.query = $("#node-input-query").typedInput('value'),
+            this.query_type = $("#node-input-query").typedInput('type')
+
+        }
     });
 </script>
 
 <script type="text/html" data-template-name="processdefinition-query">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name" />
+        <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
         <label for="node-input-engine"><i class="fa fa-tag"></i> Engine-URL</label>
-        <input type="text" id="node-input-engine" placeholder="http://engine:8000" />
+        <input type="text" id="node-input-engine" placeholder="http://engine:8000">
     </div>
     <div class="form-row">
         <label for="node-input-query"><i class="fa fa-tag"></i> Query</label>
-        <input type="text" id="node-input-query" />
+        <input type="text" id="node-input-query">
     </div>
     <div class="form-row" style="display:flex; margin-bottom: 3px;">
-        <label for="node-input-models_only" style="vertical-align:top"
-            ><i class="fa fa-list-alt"></i> Models Only</label
-        >
+        <label for="node-input-models_only" style="vertical-align:top"><i class="fa fa-list-alt"></i> Models Only</label>
         <div>
-            <input
-                type="checkbox"
-                checked
-                id="node-input-models_only"
-                style="display: inline-block; width: auto; margin: 0px 0px 0px 4px;"
-            />
+            <input type="checkbox" checked id="node-input-models_only" style="display: inline-block; width: auto; margin: 0px 0px 0px 4px;">
             <label style="width:auto" for="node-input-models_only">Only send models as result.</label>
         </div>
     </div>