@5minds/node-red-contrib-processcube 1.5.10-feature-495a3f-m4mrvan4 → 1.5.10-feature-1657ec-m4r2pgad

package/endevent-finished-listener.js

@@ -6,6 +6,17 @@ module.exports = function (RED) {
 
         let subscription = null;
 
+        const eventEmitter = node.engine.eventEmitter;
+
+        eventEmitter.on('engine-client-dispose', () => {
+            node.engine.engineClient.events.removeSubscription(subscription, node.engine.identity);
+        });
+
+        eventEmitter.on('engine-client-changed', () => {
+            node.log('new engineClient received');
+            register();
+        });
+
         const register = async () => {
             const client = node.engine.engineClient;
 
@@ -14,19 +25,39 @@ module.exports = function (RED) {
                 return;
             }
 
+            let currentIdentity = node.engine.identity;
+
             try {
-                subscription = await client.events.onEndEventFinished((endEventFinished) => {
-                    node.send({
-                        payload: endEventFinished,
-                    });
+                subscription = await client.events.onEndEventFinished(
+                    (endEventFinished) => {
+                        node.send({
+                            payload: endEventFinished,
+                        });
+                    },
+                    { identity: currentIdentity }
+                );
+
+                node.engine.registerOnIdentityChanged(async (identity) => {
+                    client.events.removeSubscription(subscription, currentIdentity);
+
+                    currentIdentity = identity;
+
+                    subscription = await client.events.onEndEventFinished(
+                        (endEventFinished) => {
+                            node.send({
+                                payload: endEventFinished,
+                            });
+                        },
+                        { identity: currentIdentity }
+                    );
                 });
             } catch (error) {
-                node.error(error);
+                node.error(JSON.stringify(error));
             }
 
             node.on('close', async () => {
                 if (node.engine && node.engine.engineClient && client) {
-                    client.events.removeSubscription(subscription);
+                    client.events.removeSubscription(subscription, currentIdentity);
                 }
             });
         };

package/externaltask-event-listener.js

@@ -6,7 +6,20 @@ module.exports = function (RED) {
 
         let subscription;
 
+        const eventEmitter = node.engine.eventEmitter;
+
+        eventEmitter.on('engine-client-dispose', () => {
+            node.engine.engineClient.notification.removeSubscription(subscription, node.engine.identity);
+        });
+
+        eventEmitter.on('engine-client-changed', () => {
+            node.log('new engineClient received');
+            register();
+        });
+
         const register = async () => {
+            let currentIdentity = node.engine.identity;
+
             const client = node.engine.engineClient;
 
             if (!client) {
@@ -31,21 +44,38 @@ module.exports = function (RED) {
             async function subscribe() {
                 switch (config.eventtype) {
                     case 'created':
-                        return await client.notification.onExternalTaskCreated(externalTaskCallback());
+                        return await client.notification.onExternalTaskCreated(externalTaskCallback(), {
+                            identity: currentIdentity,
+                        });
                     case 'locked':
-                        return await client.notification.onExternalTaskLocked(externalTaskCallback());
+                        return await client.notification.onExternalTaskLocked(externalTaskCallback(), {
+                            identity: currentIdentity,
+                        });
                     case 'unlocked':
-                        return await client.notification.onExternalTaskUnlocked(externalTaskCallback());
+                        return await client.notification.onExternalTaskUnlocked(externalTaskCallback(), {
+                            identity: currentIdentity,
+                        });
                     default:
                         console.error('no such event: ' + config.eventtype);
                 }
             }
 
-            subscription = subscribe();
+            if (node.engine.isIdentityReady()) {
+                subscription = subscribe();
+            }
+
+            node.engine.registerOnIdentityChanged(async (identity) => {
+                if (subscription) {
+                    client.notification.removeSubscription(subscription, currentIdentity);
+                }
+                currentIdentity = identity;
+
+                subscription = subscribe();
+            });
 
             node.on('close', async () => {
                 if (node.engine && node.engine.engineClient && client) {
-                    client.notification.removeSubscription(subscription);
+                    client.notification.removeSubscription(subscription, currentIdentity);
                 }
             });
         };

package/externaltask-input.js

@@ -16,7 +16,7 @@ module.exports = function (RED) {
         var node = this;
         var flowContext = node.context().flow;
 
-        node.engine = RED.nodes.getNode(config.engine);
+        const engine = RED.nodes.getNode(config.engine);
 
         var eventEmitter = flowContext.get('emitter');
 
@@ -25,6 +25,13 @@ module.exports = function (RED) {
             eventEmitter = flowContext.get('emitter');
         }
 
+        const engineEventEmitter = engine.eventEmitter;
+
+        engineEventEmitter.on('engine-client-changed', () => {
+            node.log('new engineClient received');
+            register();
+        });
+
         const register = async () => {
             if (node.etw) {
                 try {
@@ -34,7 +41,7 @@ module.exports = function (RED) {
                     node.log(`cant close etw: ${JSON.stringify(node.etw)}`);
                 }
             }
-            const client = node.engine.engineClient;
+            const client = engine.engineClient;
 
             if (!client) {
                 node.error('No engine configured.');
@@ -126,6 +133,11 @@ module.exports = function (RED) {
 
                     node.etw = externalTaskWorker;
 
+                    externalTaskWorker.identity = engine.identity;
+                    engine.registerOnIdentityChanged((identity) => {
+                        externalTaskWorker.identity = identity;
+                    });
+
                     // export type WorkerErrorHandler = (errorType: 'fetchAndLock' | 'extendLock' | 'processExternalTask' | 'finishExternalTask', error: Error, externalTask?: ExternalTask<any>) => void;
                     externalTaskWorker.onWorkerError((errorType, error, externalTask) => {
                         switch (errorType) {
@@ -173,7 +185,7 @@ module.exports = function (RED) {
                 });
         };
 
-        if (node.engine) {
+        if (engine) {
             register();
         }
     }

package/message-event-trigger.js

@@ -4,18 +4,20 @@ module.exports = function (RED) {
         var node = this;
 
         node.on('input', function (msg) {
-            node.engine = RED.nodes.getNode(config.engine);
-            const client = node.engine.engineClient;
+
+            const engine = RED.nodes.getNode(config.engine);
+            const client = engine.engineClient;
 
             if (!client) {
                 node.error('No engine configured.');
                 return;
             }
 
-            node.engine.engineClient.events
+            engine.engineClient.events
                 .triggerMessageEvent(config.messagename, {
                     processInstanceId: msg.processinstanceid,
                     payload: msg.payload,
+                    identity: engine.identity,
                 })
                 .then((result) => {
                     msg.payload = result;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.10-feature-495a3f-m4mrvan4",
+    "version": "1.5.10-feature-1657ec-m4r2pgad",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {
@@ -57,7 +57,7 @@
         "examples": "examples"
     },
     "dependencies": {
-        "@5minds/processcube_engine_client": "5.1.1",
+        "@5minds/processcube_engine_client": "5.1.0-hotfix-a73235-m346kg1n",
         "jwt-decode": "^4.0.0",
         "openid-client": "^5.5.0"
     },