@5minds/node-red-contrib-processcube 0.13.0-feature-f7cd16-lyfhy1jh → 0.13.0

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

@@ -1,3 +1,3 @@
 {
-    "$": "4d3947a7155e180f5e1361182578e6ca2miDlL35ToUWYsN6HIEZN1KBk9Ec3/4="
+    "$": "161b525bcc3a85ed486f778fadca44e0c0RvyjjTCLddR3fu+V4rGaC/L1NxysY="
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.13.0-feature-f7cd16-lyfhy1jh",
+    "version": "0.13.0",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "authors": [
@@ -44,8 +44,7 @@
             "UserTaskNewListener": "usertask-new-listener.js",
             "UserTaskFinishedListener": "usertask-finished-listener.js",
             "UserTaskInput": "usertask-input.js",
-            "UserTaskOutput": "usertask-output.js",
-            "WaitForUsertask": "wait-for-usertask.js"
+            "UserTaskOutput": "usertask-output.js"
         }
     },
     "dependencies": {

package/processcube-engine-config.js

@@ -7,6 +7,7 @@ const DELAY_FACTOR = 0.85;
 module.exports = function(RED) {
     function ProcessCubeEngineNode(n) {
         RED.nodes.createNode(this, n);
+        const node = this;
         const identityChangedCallbacks = [];
         this.url = n.url;
         this.identity = null;
@@ -25,7 +26,13 @@ module.exports = function(RED) {
             const engineClient = new engine_client.EngineClient(this.url);
 
             engineClient.applicationInfo.getAuthorityAddress().then(authorityUrl => {
-                startRefreshingIdentityCycle(this.credentials.clientId, this.credentials.clientSecret, authorityUrl, this);
+                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);
             });
         }
     }

package/usertask-new-listener.js

@@ -53,7 +53,7 @@ module.exports = function(RED) {
         if (node.server) {
             register();
         }
+
     }
-    
     RED.nodes.registerType("usertask-new-listener", UserTaskNewListener);
 }

package/wait-for-usertask.html

@@ -1,76 +0,0 @@
-<script type="text/javascript">
-    RED.nodes.registerType('wait-for-usertask',{
-        category: 'ProcessCube',
-        color: '#02AFD6',
-        defaults: {
-            name: {value: ""},
-            engine: {value: "", type: "processcube-engine-config"},
-            query: {value: "payload"},
-            query_type: {value: "msg"},
-            only_for_new: {value: false}
-        },
-        inputs: 1,
-        outputs: 1,
-        icon: "font-awesome/fa-envelope-open",
-        label: function() {
-            return this.name || "wait-for-usertask";
-        },
-        oneditprepare: function() {
-            $("#node-input-query").typedInput({
-                default: 'msg',
-                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')
-
-        }
-    });
-</script>
-
-<script type="text/html" data-template-name="wait-for-usertask">
-    <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">
-    </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">
-    </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">
-    </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">
-Waiting for Usertasks of the connected ProcessCube Engine.
-
-### Inputs
-
-: payload (json)            :  the query to filter the usertasks.
-
-## Outputs
-
-: payload.userTask (string) : The filtered UserTask
-
-### Details
-
-- `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
-
- - [The ProcessCube Developer Network](https://processcube.io) - All documentation for the ProcessCube&copy; Plattform
-</script>

package/wait-for-usertask.js

@@ -1,88 +0,0 @@
-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');
-        }
-
-
-        let currentIdentity = null;
-        let subscription = null;
-
-        node.on('input', async function (msg) {
-            currentIdentity = node.server.identity;
-
-            const query = RED.util.evaluateNodeProperty(config.query, config.query_type, node, msg);
-
-            subscription = await client.userTasks.onUserTaskWaiting(async (userTaskWaitingNotification) => {
-
-                const newQuery = {
-                    'flowNodeInstanceId': userTaskWaitingNotification.flowNodeInstanceId,
-                    ...query
-                };
-
-                const matchingFlowNodes = await client.userTasks.query(newQuery, { identity: currentIdentity });
-
-                if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length == 1) {
-                    const userTask = matchingFlowNodes.userTasks[0];
-
-                    msg.payload = { userTask: userTask };
-                    node.send(msg);
-                } else {
-                    // nothing todo - wait for next notification
-                }
-
-                // remove subscription
-                client.userTasks.removeSubscription(subscription, currentIdentity);
-            }, { identity: currentIdentity });
-
-            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, { identity: currentIdentity });
-
-                if (matchingFlowNodes.userTasks && matchingFlowNodes.userTasks.length >= 1) {
-                    const userTask = matchingFlowNodes.userTasks[0];
-
-                    msg.payload = { userTask: userTask };
-                    node.send(msg);
-
-                    // remove subscription
-                    client.userTasks.removeSubscription(subscription, currentIdentity);
-                } else {
-                    // let the *currentIdentity* be active
-                }
-            }
-        });
-
-        node.on("close", async () => {
-            if (client != null) {
-                client.userTasks.removeSubscription(subscription, currentIdentity);                
-                client.dispose();
-                client = null;
-            }
-        });
-    }
-    RED.nodes.registerType("wait-for-usertask", WaitForUsertask);
-}