@5minds/node-red-contrib-processcube 1.5.1-feature-6ba46c-m2lk79r9 → 1.5.2-feature-4db23e-m33j5ixt

package/externaltask-input.js

@@ -98,7 +98,7 @@ module.exports = function (RED) {
                     task: RED.util.encodeObject(externalTask),
                     payload: payload,
                     flowNodeInstanceId: externalTask.flowNodeInstanceId,
-                    processInstanceId: externalTask.processInstanceId,
+                    processInstanceId: externalTask.processInstanceId
                 };
 
                 node.log(
@@ -110,11 +110,7 @@ module.exports = function (RED) {
         };
 
         client.externalTasks
-            .subscribeToExternalTaskTopic(
-                config.topic,
-                etwCallback,
-                RED.util.evaluateNodeProperty(config.workerConfig, 'json', node)
-            )
+            .subscribeToExternalTaskTopic(config.topic, etwCallback, RED.util.evaluateNodeProperty(config.workerConfig, 'json', node))
             .then(async (externalTaskWorker) => {
                 node.status({ fill: 'blue', shape: 'ring', text: 'subcribed' });
 
@@ -139,9 +135,6 @@ module.exports = function (RED) {
 
                             showStatus(node, Object.keys(started_external_tasks).length);
                             break;
-                        case 'fetchAndLock':
-                            node.status({});
-                            node.error(`Worker error ${errorType}: ${error.message}`);
                         default:
                             node.error(`Worker error ${errorType}: ${error.message}`);
                             break;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.1-feature-6ba46c-m2lk79r9",
+    "version": "1.5.2-feature-4db23e-m33j5ixt",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/processcube-engine-config.js

@@ -12,8 +12,52 @@ module.exports = function (RED) {
         this.url = RED.util.evaluateNodeProperty(n.url, n.urlType, node);
         this.identity = null;
 
-        this.credentials.clientId = RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node);
-        this.credentials.clientSecret = RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node);
+        async function startUpdatingCredentialsCycle() {
+            let retries = 5;
+            const UPDATE_INTERVAL = 10000;
+            let previousClientId, previousClientSecret;
+
+            const updateCredentials = async () => {
+                try {
+                    const newClientId = RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node);
+                    const newClientSecret = RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node);
+
+                    if (newClientId !== previousClientId || newClientSecret !== previousClientSecret) {
+                        if (this.engineClient) this.engineClient.dispose();
+
+                        this.credentials.clientId = newClientId;
+                        this.credentials.clientSecret = newClientSecret;
+
+                        this.engineClient = new engine_client.EngineClient(this.url);
+
+                        if (this.credentials.clientId && this.credentials.clientSecret) {
+                            const authorityUrl = await this.engineClient.applicationInfo.getAuthorityAddress();
+                            startRefreshingIdentityCycle(
+                                this.credentials.clientId,
+                                this.credentials.clientSecret,
+                                authorityUrl,
+                                node
+                            ).catch(console.error);
+                        }
+
+                        previousClientId = newClientId;
+                        previousClientSecret = newClientSecret;
+                    }
+
+                    retries = 5;
+                    setTimeout(updateCredentials, UPDATE_INTERVAL);
+                } catch (error) {
+                    if (retries === 0) return console.error('Credential update failed permanently:', error);
+                    console.error('Credential update error, retrying:', { error, retries });
+                    retries--;
+                    setTimeout(updateCredentials, 2000);
+                }
+            };
+
+            await updateCredentials();
+        }
+
+        console.log('luis888', this.credentials.clientId);
 
         this.registerOnIdentityChanged = function (callback) {
             identityChangedCallbacks.push(callback);
@@ -43,29 +87,32 @@ module.exports = function (RED) {
             }
         });
 
-        if (this.credentials.clientId && this.credentials.clientSecret) {
-            this.engineClient = new engine_client.EngineClient(this.url);
-
-            this.engineClient.applicationInfo
-                .getAuthorityAddress()
-                .then((authorityUrl) => {
-                    startRefreshingIdentityCycle(
-                        this.credentials.clientId,
-                        this.credentials.clientSecret,
-                        authorityUrl,
-                        node
-                    ).catch((reason) => {
-                        console.error(reason);
-                        node.error(reason);
-                    });
-                })
-                .catch((reason) => {
-                    console.error(reason);
-                    node.error(reason);
-                });
-        } else {
-            this.engineClient = new engine_client.EngineClient(this.url);
-        }
+        startUpdatingCredentialsCycle();
+
+        // if (this.credentials.clientId && this.credentials.clientSecret) {
+        //     console.log('luis999', this.credentials.clientId);
+        //     this.engineClient = new engine_client.EngineClient(this.url);
+
+        //     this.engineClient.applicationInfo
+        //         .getAuthorityAddress()
+        //         .then((authorityUrl) => {
+        //             startRefreshingIdentityCycle(
+        //                 this.credentials.clientId,
+        //                 this.credentials.clientSecret,
+        //                 authorityUrl,
+        //                 node
+        //             ).catch((reason) => {
+        //                 console.error(reason);
+        //                 node.error(reason);
+        //             });
+        //         })
+        //         .catch((reason) => {
+        //             console.error(reason);
+        //             node.error(reason);
+        //         });
+        // } else {
+        //     this.engineClient = new engine_client.EngineClient(this.url);
+        // }
     }
     RED.nodes.registerType('processcube-engine-config', ProcessCubeEngineNode, {
         credentials: {

package/processinstance-delete.html

@@ -5,6 +5,7 @@
         defaults: {
             name: { value: '' },
             engine: { value: '', type: 'processcube-engine-config' },
+            modelid: { value: '' },
             time: { value: '', type: 'number' },
             time_type: { value: 'hours' },
         },
@@ -27,11 +28,15 @@
         <input type="text" id="node-input-engine" placeholder="Engine-URL" />
     </div>
     <div class="form-row">
-        <label for="node-input-time"><i class="fa fa-tag"></i> Time</label>
+        <label for="node-input-modelid"><i class="fa fa-tag"></i> Model-ID</label>
+        <input type="text" id="node-input-modelid" />
+    </div>
+    <div class="form-row">
+        <label for="node-input-time"><i class="fa fa-tag"></i> Duration</label>
         <input type="text" id="node-input-time" />
     </div>
     <div class="form-row">
-        <label for="node-input-time_type"><i class="fa fa-sliders"></i> Period</label>
+        <label for="node-input-time_type"><i class="fa fa-sliders"></i> Time Unit</label>
         <select id="node-input-time_type" style="width: 70%;">
             <option value="hours">Hours</option>
             <option value="days">Days</option>
@@ -40,19 +45,19 @@
 </script>
 
 <script type="text/markdown" data-help-name="processinstance-delete">
-Delete old instances of a process model in the ProcessCube.
+    Delete old instances of a process model in the ProcessCube.
 
-## Inputs
+    ## Inputs
 
-: payload.time (number): The number of given time periods.
-: payload.time_type ('hours' | 'days'): The type of time period to use.
+    : payload.time (number): The number of given time periods.
+    : payload.time_type ('hours' | 'days'): The type of time period to use.
 
-## Outputs
+    ## Outputs
 
-: payload (string[]): The ids of the processinstances that were deleted.
+    : payload (string[]): The ids of the processinstances that were deleted.
 
-### References
+    ### 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;
+    -   [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>

package/processinstance-delete.js

@@ -19,18 +19,21 @@ module.exports = function (RED) {
             }
 
             const timeToUse = msg.payload.time ? msg.payload.time : config.time;
+            const modelId = msg.payload.processModelId
+                ? msg.payload.processModelId != ''
+                    ? msg.payload.processModelId
+                    : undefined
+                : config.modelid != ''
+                ? config.modelid
+                : undefined;
 
             try {
-                const fetchInstancesByState = async (state) => {
-                    const result = await client.processInstances.query({ state });
-                    return result.processInstances;
-                };
-
-                const finishedInstances = await fetchInstancesByState('finished');
-                const terminatedInstances = await fetchInstancesByState('terminated');
-                const errorInstances = await fetchInstancesByState('error');
+                const result = await client.processInstances.query({
+                    processModelId: modelId,
+                    identity: engine.identity,
+                });
 
-                let allInstances = [...finishedInstances, ...terminatedInstances, ...errorInstances];
+                let allInstances = result.processInstances.filter((instance) => instance.state != 'suspended');
 
                 const today = new Date();