@5minds/node-red-contrib-processcube 1.5.11 → 1.5.12-develop-c71c09-m4sa8e6d

package/endevent-finished-listener.js

@@ -6,17 +6,6 @@ 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;
 
@@ -25,31 +14,11 @@ module.exports = function (RED) {
                 return;
             }
 
-            let currentIdentity = node.engine.identity;
-
             try {
-                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 }
-                    );
+                subscription = await client.events.onEndEventFinished((endEventFinished) => {
+                    node.send({
+                        payload: endEventFinished,
+                    });
                 });
             } catch (error) {
                 node.error(JSON.stringify(error));
@@ -57,7 +26,7 @@ module.exports = function (RED) {
 
             node.on('close', async () => {
                 if (node.engine && node.engine.engineClient && client) {
-                    client.events.removeSubscription(subscription, currentIdentity);
+                    client.events.removeSubscription(subscription);
                 }
             });
         };

package/externaltask-event-listener.js

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

package/externaltask-input.js

@@ -16,7 +16,7 @@ module.exports = function (RED) {
         var node = this;
         var flowContext = node.context().flow;
 
-        const engine = RED.nodes.getNode(config.engine);
+        node.engine = RED.nodes.getNode(config.engine);
 
         var eventEmitter = flowContext.get('emitter');
 
@@ -25,13 +25,6 @@ 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 {
@@ -41,7 +34,7 @@ module.exports = function (RED) {
                     node.log(`cant close etw: ${JSON.stringify(node.etw)}`);
                 }
             }
-            const client = engine.engineClient;
+            const client = node.engine.engineClient;
 
             if (!client) {
                 node.error('No engine configured.');
@@ -133,11 +126,6 @@ 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) {
@@ -185,7 +173,7 @@ module.exports = function (RED) {
                 });
         };
 
-        if (engine) {
+        if (node.engine) {
             register();
         }
     }

package/message-event-trigger.js

@@ -4,20 +4,18 @@ module.exports = function (RED) {
         var node = this;
 
         node.on('input', function (msg) {
-
-            const engine = RED.nodes.getNode(config.engine);
-            const client = engine.engineClient;
+            node.engine = RED.nodes.getNode(config.engine);
+            const client = node.engine.engineClient;
 
             if (!client) {
                 node.error('No engine configured.');
                 return;
             }
 
-            engine.engineClient.events
+            node.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.11",
+    "version": "1.5.12-develop-c71c09-m4sa8e6d",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {
@@ -57,7 +57,7 @@
         "examples": "examples"
     },
     "dependencies": {
-        "@5minds/processcube_engine_client": "5.1.0-hotfix-a73235-m346kg1n",
+        "@5minds/processcube_engine_client": "5.1.2",
         "jwt-decode": "^4.0.0",
         "openid-client": "^5.5.0"
     },