@5minds/node-red-contrib-processcube 0.11.0-feature-1a3680-lyc1y00u → 0.11.0-feature-34fec2-lydislpd

package/nodered/node-red-contrib-processcube-flows.json

@@ -2785,6 +2785,7 @@
         "engine": "d042a4c68f51d6ab",
         "query": "{\"flowNodeId\":\"PlaceAnOrderUserTask\"}",
         "query_type": "json",
+        "only_for_new": true,
         "x": 350,
         "y": 160,
         "wires": [
@@ -2845,8 +2846,8 @@
         "z": "0825fee24edbf04b",
         "name": "",
         "pauseType": "delay",
-        "timeout": "1",
-        "timeoutUnits": "milliseconds",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
         "rateUnits": "second",
@@ -2856,7 +2857,7 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 350,
+        "x": 340,
         "y": 240,
         "wires": [
             [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.11.0-feature-1a3680-lyc1y00u",
+    "version": "0.11.0-feature-34fec2-lydislpd",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "authors": [
@@ -45,7 +45,7 @@
             "UserTaskFinishedListener": "usertask-finished-listener.js",
             "UserTaskInput": "usertask-input.js",
             "UserTaskOutput": "usertask-output.js",
-            "WaitForUsertask": "wait_for_usertask.js"
+            "WaitForUsertask": "wait-for-usertask.js"
         }
     },
     "dependencies": {

package/{wait_for_usertask.html → wait-for-usertask.html}

@@ -6,7 +6,8 @@
             name: {value: ""},
             engine: {value: "", type: "processcube-engine-config"},
             query: {value: "payload"},
-            query_type: {value: "msg"}
+            query_type: {value: "msg"},
+            only_for_new: {value: false}
         },
         inputs: 1,
         outputs: 1,
@@ -44,6 +45,13 @@
         <label for="node-input-query"><i class="fa fa-tag"></i> Query</label>
         <input type="text" id="node-input-query">
     </div>
+    <div class="form-row" style="display:flex; margin-bottom: 3px;">
+        <label for="node-input-only_for_new" style="vertical-align:top"><i class="fa fa-list-alt"></i> Only for new</label>
+        <div>
+            <input type="checkbox" checked id="node-input-only_for_new" style="display: inline-block; width: auto; margin: 0px 0px 0px 4px;">
+            <label style="width:auto" for="node-input-multisend">Trigger only for new user task or *checked* also for old ones?</label>
+        </div>
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="wait-for-usertask">
@@ -59,7 +67,8 @@ Waiting for Usertasks of the connected ProcessCube Engine.
 
 ### Details
 
-`msg.payload` or a constant json to filter the UserTasks for Waiting for
+- `msg.payload` or a constant json to filter the UserTasks for Waiting for
+- `Only for new` will trigger only for new UserTasks if checked and also for old ones if not checked.
 
 ### References
 

package/wait-for-usertask.js

@@ -0,0 +1,82 @@
+const process = require('process');
+
+const engine_client = require('@5minds/processcube_engine_client');
+const { userInfo } = require('os');
+
+module.exports = function (RED) {
+    function WaitForUsertask(config) {
+        RED.nodes.createNode(this, config);
+        var node = this;
+        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';
+
+        var client = nodeContext.get('client');
+
+        if (!client) {
+            nodeContext.set('client', new engine_client.EngineClient(engineUrl));
+            client = nodeContext.get('client');
+        }
+
+        node.on("close", async () => {
+            if (client != null) {
+                client.dispose();
+                client = null;
+            }
+        });
+
+        node.on('input', async function (msg) {
+
+            const query = RED.util.evaluateNodeProperty(config.query, config.query_type, node, msg)
+
+            const sub = await client.userTasks.onUserTaskWaiting(async (userTaskWaitingNotification) => {
+
+                const newQuery = {
+                    'flowNodeInstanceId': userTaskWaitingNotification.flowNodeInstanceId,
+                    ...query
+                };
+
+                const matchingFlowNodes = await client.userTasks.query(newQuery);
+
+                if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length == 1) {
+                    const userTask = matchingFlowNodes.userTasks[0];
+
+                    msg.payload = { userTask: userTask };
+                    node.send(msg);
+                } else {
+                }
+
+                // remove subscription
+                client.userTasks.removeSubscription(sub);
+            });
+
+            console.debug('Handling old userTasks config.only_for_new', config.only_for_new);
+
+            if (config.only_for_new === false) {
+                // only check suspended user tasks
+                const suspendedQuery = {
+                    'state': 'suspended',
+                    ...query
+                };
+
+                const matchingFlowNodes = await client.userTasks.query(suspendedQuery);
+
+                if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length >= 1) {
+                    const userTask = matchingFlowNodes.userTasks[0];
+
+                    msg.payload = { userTask: userTask };
+                    node.send(msg);
+
+                    // remove subscription
+                    client.userTasks.removeSubscription(sub);
+                } else {
+                    // let the *sub* be active
+
+                }
+            }
+        });
+    }
+    RED.nodes.registerType("wait-for-usertask", WaitForUsertask);
+}

package/wait_for_usertask.js

@@ -1,52 +0,0 @@
-const process = require('process');
-
-const engine_client = require('@5minds/processcube_engine_client');
-
-module.exports = function (RED) {
-    function WaitForUsertask(config) {
-        RED.nodes.createNode(this, config);
-        var node = this;
-        let client = null;
-        
-        this.engine = this.server = RED.nodes.getNode(config.engine);
-
-        const engineUrl = this.engine?.url || process.env.ENGINE_URL || 'http://engine:8000';
-
-        node.on("close", async () => {
-            if (client != null) {
-                client.dispose();
-                client = null;    
-            }
-        });
-
-        node.on('input', function (msg) {
-            
-            const query = RED.util.evaluateNodeProperty(config.query, config.query_type, node, msg)
-
-            client = new engine_client.EngineClient(engineUrl);
-            client.userTasks.onUserTaskWaiting((userTaskWaitingNotification) => {
-
-                query['flowNodeInstanceId'] = userTaskWaitingNotification.flowNodeInstanceId;
-
-                client.userTasks.query(query).then((matchingFlowNodes) => {
-
-                    if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length == 1) {
-                        userTask = matchingFlowNodes.userTasks[0];
-
-                        msg.payload = { userTask: userTask };
-                        node.send(msg);
-                    } else {
-                        // do nothing, cause we are waiting for a specific user task
-                    }
-
-                    // dispose the client
-                    if (client != null) {
-                        client.dispose();
-                        client = null;    
-                    }
-                });
-            });
-        });
-    }
-    RED.nodes.registerType("wait-for-usertask", WaitForUsertask);
-}