@5minds/node-red-contrib-processcube 0.14.0-feature-7cec87-lyytfjz9 → 0.14.0-fix-error-in-process-instance-query-433395-lyzh0xul

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20 AS builder
+FROM node:20 as builder
 
 COPY ./ /src/node-red-contrib-processcube
 

package/docker-compose.yml

@@ -5,17 +5,12 @@ services:
       context: .
     ports:
       - "1880:1880"
-      - "9229:9229"
     environment:
       - TZ=Europe/Berlin
       - ENGINE_URL=http://engine:8000
       - FLOWS=/nodered/node-red-contrib-processcube-flows.json
     volumes:
       - ./nodered/:/nodered/
-      - ./examples/:/examples/
-    depends_on:
-      - engine
-      - authority
   
   engine:
     image: 5minds/processcube_engine:2024-1
@@ -24,16 +19,9 @@ services:
     volumes:
       - ./processes:/processes:ro
     environment:
-      application__name: Engine for Node-RED contrib
       iam__baseUrl: http://authority:11560
       iam__allowAnonymousRootAccess: true
     command: --seed-dir=/processes --port 8000
-    depends_on:
-      - authority
-    healthcheck:
-      test: bash -c "[ -f /tmp/healthy ]"
-      timeout: 1s
-      retries: 20      
 
   authority:
     image: 5minds/processcube_authority:3.0.4

package/externaltask-error.html

@@ -26,20 +26,6 @@
     </div>
 </script>
 
-<script type="text/markdown" data-help-name="externaltask-error">
-Used for reporting errors in the processing of external tasks. The error 
-code `Error` in the configuration is forwarded to the ProcessCube engine for 
-handling within *Error-Boundary-Events*.
-
-## Inputs
-
-: msg (Object)        : Passed as `ErrorDetails` to the engine
-: Error (string)      : From the configuration
-: Message (string)    : The caught exception message
-: StackTrace (string) : The stack trace of the exception
-
-### References
-
-- [The ProcessCube Developer Network](https://processcube.io) - All documentation for the ProcessCube&copy; platform
-- [Node-RED Integration in ProcessCube&copy;](https://processcube.io/docs/node-red) - Node-RED integration in ProcessCube&copy;
+<script type="text/html" data-help-name="externaltask-error">
+    <p>A node which error response to an External Task of https://processcube.io</p>
 </script>

package/externaltask-error.js

@@ -8,22 +8,24 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
 
-            const flowNodeInstanceId = msg.flowNodeInstanceId;
+            const externalTaskId = msg.externalTaskId;
 
-            let msgError = msg.error;
+            let error = msg.error;
 
-            if (msgError === undefined) {
-                msgError.message = "An error occurred";
+            if (error === undefined) {
+                error.message = "An error occurred";
+                error.source = msg.payload;
             }
 
-            const error = new Error(msgError.message);
-            error.errorCode = config.error;
-            error.errorDetails = RED.util.encodeObject(msg);
+            msg.payload = {
+                "error": {
+                    errorCode: config.error,
+                    errorMessage: error.message,
+                    errorDetails: error.source
+                }
+            };
 
-            msg.errorCode = config.error;
-            msg.errorMessage = msgError.message;
-
-            eventEmitter.emit(`handle-${flowNodeInstanceId}`, error, true);
+            eventEmitter.emit(`error-${externalTaskId}`, msg.payload);
             
             node.send(msg);
         });     

package/externaltask-input.html

@@ -31,23 +31,6 @@
     </div>
 </script>
 
-<script type="text/markdown" data-help-name="externaltask-input">
-Waiting for external tasks that correspond to the `Topic` configured in 
-the connected ProcessCube Engine for processing.
-
-## Outputs
-
-: payload (string)   : Defines the input of the external task token
-: task (object)      : The external task object
-: flowNodeInstanceId : The Id of the external task, which is needed to complete the task
-
-### Details
-
-- To finish the external task the `externaltask-output` node is required.
-- For handling a error while executing a flow as external task the `externaltask-error` node is required.
-
-### References
-
-- [The ProcessCube Developer Network](https://processcube.io) - All documentation for the ProcessCube&copy; Plattform
-- [Node-RED Integration in ProcessCube&copy;](https://processcube.io/docs/node-red) - Node-RED Integration in ProcessCube&copy;
+<script type="text/html" data-help-name="externaltask-input">
+    <p>A node which subscribes to an External Task Topic of https://processcube.io</p>
 </script>

package/externaltask-input.js

@@ -1,24 +1,44 @@
+const process = require('process');
 const EventEmitter = require('node:events');
 
+const engine_client = require('@5minds/processcube_engine_client');
+
 function showStatus(node, msgCounter) {
     if (msgCounter >= 1) {
-        node.status({fill: "blue", shape: "dot", text: `handling tasks ${msgCounter}.`});
+        node.status({fill: "blue", shape: "dot", text: `handling tasks ${msgCounter}`});
     } else {
-        node.status({fill: "blue", shape: "ring", text: `subcribed.`});
+        node.status({fill: "blue", shape: "ring", text: `subcribed ${msgCounter}`});
     }
 }
 
-const started_external_tasks = {};
+function decrCounter(msgCounter) {
+    msgCounter--;
+
+    if (msgCounter < 0) {
+        msgCounter = 0;
+    }
+
+    return msgCounter;
+}
 
 module.exports = function(RED) {
     function ExternalTaskInput(config) {
         RED.nodes.createNode(this,config);
         var node = this;
+        var msgCounter = 0;
         var flowContext = node.context().flow;
-      
+        var nodeContext = node.context();
+
         this.engine = this.server = RED.nodes.getNode(config.engine);
 
-        const client = this.engine.getEngineClient();
+        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');
+        }   
 
         var eventEmitter = flowContext.get('emitter');
 
@@ -30,75 +50,30 @@ module.exports = function(RED) {
         client.externalTasks.subscribeToExternalTaskTopic(
             config.topic,
             async (payload, externalTask) => {
+                msgCounter++;
 
-                const saveHandleCallback = (data, callback) => {
-                    try {
-                        callback(data);
-                    } catch (error) {
-                        node.error(`Error in callback 'saveHandleCallback': ${error.message}`);
-                    }
-                };
-                
                 return await new Promise((resolve, reject) => {
+                    
+                    // TODO: once ist 2x gebunden
+                    eventEmitter.once(`finish-${externalTask.flowNodeInstanceId}`, (result) => {
+                        msgCounter = decrCounter(msgCounter);
 
-                    const handleFinishTask = (msg) => {
-                        let result = RED.util.encodeObject(msg.payload);
-
-                        node.log(`handle event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* ${externalTask.processInstanceId} with result ${result} on msg._msgid ${msg._msgid}.`);
-
-                        if (externalTask.flowNodeInstanceId) {
-                            delete started_external_tasks[externalTask.flowNodeInstanceId];
-                        }
-
-                        showStatus(node, Object.keys(started_external_tasks).length);
-
-
-                        //resolve(result);
-                        saveHandleCallback(result, resolve)
-                    };
-
-                    const handleErrorTask = (msg) => {
-
-                        node.log(`handle error event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' on *msg._msgid* '${msg._msgid}'.`);
-
-                        if (externalTask.flowNodeInstanceId) {
-                            delete started_external_tasks[externalTask.flowNodeInstanceId];
-                        }
-
-                        showStatus(node, Object.keys(started_external_tasks).length);
-
+                        showStatus(node, msgCounter);
+                        resolve(result);
+                    });
 
-                        // TODO: with reject, the default error handling is proceed 
-                        // SEE: https://github.com/5minds/ProcessCube.Engine.Client.ts/blob/develop/src/ExternalTaskWorker.ts#L180
-                        // reject(result);
-                        //resolve(msg);
-                        saveHandleCallback(msg, resolve);
-                    };
+                    eventEmitter.once(`error-${externalTask.flowNodeInstanceId}`, (msg) => {
+                        msgCounter = decrCounter(msgCounter);
+                        showStatus(node, msgCounter);
 
-                    eventEmitter.once(`handle-${externalTask.flowNodeInstanceId}`, (msg, isError = false) => {
-                        node.log(`handle event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}' and *isError* '${isError}'`);
+                        var result = msg.payload ? msg.payload : msg;
 
-                        if (isError) {
-                            handleErrorTask(msg);
-                        } else {
-                            handleFinishTask(msg);
-                        }
+                        reject(result);
                     });
 
-                    started_external_tasks[externalTask.flowNodeInstanceId] = externalTask;
-
-                    showStatus(node, Object.keys(started_external_tasks).length);
-
-                    let msg = {
-                        _msgid: RED.util.generateId(),
-                        task: RED.util.encodeObject(externalTask),
-                        payload: payload,
-                        flowNodeInstanceId: externalTask.flowNodeInstanceId
-                    };
+                    showStatus(node, msgCounter);
                     
-                    node.log(`Received *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}'`);
-                    
-                    node.send(msg);
+                    node.send({topic: externalTask.topic, payload: payload, externalTaskId: externalTask.flowNodeInstanceId});
                 });
             },
             ).then(async externalTaskWorker => {
@@ -108,45 +83,17 @@ module.exports = function(RED) {
                 node.server.registerOnIdentityChanged((identity) => {
                     externalTaskWorker.identity = identity;
                 }); 
+                await externalTaskWorker.start();
 
-                // export type WorkerErrorHandler = (errorType: 'fetchAndLock' | 'extendLock' | 'processExternalTask' | 'finishExternalTask', error: Error, externalTask?: ExternalTask<any>) => void;
-                externalTaskWorker.onWorkerError((errorType, error, externalTask) => {
-                    switch (errorType) {
-                        case 'extendLock':
-                        case 'finishExternalTask':
-                        case 'processExternalTask':
-                            node.error(`Worker error ${errorType} for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}': ${error.message}`);
-                    
-                            if (externalTask) {
-                                delete started_external_tasks[externalTask.flowNodeInstanceId];
-                            }
-
-                            showStatus(node, Object.keys(started_external_tasks).length);
-                            break;
-                        default:
-                            node.error(`Worker error ${errorType}: ${error.message}`);
-                            break;
-                    }
-                });
-
-                try {
-                    externalTaskWorker.start();
-                } catch (error) {
-                    node.error(`Worker start 'externalTaskWorker.start' failed: ${error.message}`);
-                }
-
-                node.on("close", () => {
+                node.on("close", async () => {
                     try {
                         externalTaskWorker.stop();
                     } catch {
-                        node.error('Client close failed');
+                        console.warn('Client close failed');
                     }
                 });
             }
-        ).catch((error) => {
-            node.error(`Error in subscribeToExternalTaskTopic: ${error.message}`);
-        });
+        );
     }
-
     RED.nodes.registerType("externaltask-input", ExternalTaskInput);
 }

package/externaltask-output.html

@@ -21,16 +21,6 @@
     </div>
 </script>
 
-<script type="text/markdown" data-help-name="externaltask-output">
-Used to complete the external task. The `msg.payload` is returned to the ProcessCube 
-engine as the result of the external task.
-
-## Inputs
-
-: payload (Object) : Returned to the ProcessCube engine as the result of the external task
-
-### References
-
-- [The ProcessCube Developer Network](https://processcube.io) - All documentation for the ProcessCube&copy; platform
-- [Node-RED Integration in ProcessCube&copy;](https://processcube.io/docs/node-red) - Node-RED integration in ProcessCube&copy;
+<script type="text/html" data-help-name="externaltask-output">
+    <p>A node which response to an External Task of https://processcube.io</p>
 </script>

package/externaltask-output.js

@@ -8,13 +8,13 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
             
-            const flowNodeInstanceId = msg.flowNodeInstanceId;
+            const externalTaskId = msg.externalTaskId;
 
-            if (!flowNodeInstanceId) {
+            if (!externalTaskId) {
                node.error('Error: The message did not contain the required external task id.', msg);
             }  
 
-            eventEmitter.emit(`handle-${flowNodeInstanceId}`, msg, false);
+            eventEmitter.emit(`finish-${externalTaskId}`, msg.payload);
         });     
     }
     RED.nodes.registerType("externaltask-output", ExternalTaskOutput);