@5minds/node-red-contrib-processcube 1.5.5-develop-9244da-m3hs2wpp → 1.5.5-develop-a8e9c4-m3iqz7yx

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.5-develop-9244da-m3hs2wpp",
+    "version": "1.5.5-develop-a8e9c4-m3iqz7yx",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {
@@ -57,7 +57,7 @@
         "examples": "examples"
     },
     "dependencies": {
-        "@5minds/processcube_engine_client": "^5.1.0",
+        "@5minds/processcube_engine_client": "5.1.0-hotfix-a73235-m346kg1n",
         "jwt-decode": "^4.0.0",
         "openid-client": "^5.5.0"
     },

package/processcube-engine-config.js

@@ -2,19 +2,20 @@ const engine_client = require('@5minds/processcube_engine_client');
 const jwt = require('jwt-decode');
 const oidc = require('openid-client');
 
-const DELAY_FACTOR = 0.85;
-
 module.exports = function (RED) {
     function ProcessCubeEngineNode(n) {
         RED.nodes.createNode(this, n);
         const node = this;
         const identityChangedCallbacks = [];
-        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);
 
+        // known issue: kann bei falschem timing zu laufzeitfehlern führen (absprache MM)
+        // set the engine url
+        const stopRefreshing = periodicallyRefreshEngineClient(this, n, 10000);
+
         this.registerOnIdentityChanged = function (callback) {
             identityChangedCallbacks.push(callback);
         };
@@ -36,123 +37,95 @@ module.exports = function (RED) {
             }
         };
 
-        node.on('close', async () => {
-            if (this.engineClient) {
-                this.engineClient.dispose();
-                this.engineClient = null;
+        function periodicallyRefreshEngineClient(node, n, intervalMs) {
+            function refreshUrl() {
+                const newUrl = RED.util.evaluateNodeProperty(n.url, n.urlType, node);
+
+                if (node.url == newUrl) {
+                    return;
+                }
+
+                node.url = newUrl;
+                if (node.credentials.clientId && node.credentials.clientSecret) {
+                    if (this.engineClient) {
+                        this.engineClient.dispose();
+                    }
+                    node.engineClient = new engine_client.EngineClient(node.url, () =>
+                        getFreshIdentity(node.url, node)
+                    );
+                } else {
+                    if (this.engineClient) {
+                        this.engineClient.dispose();
+                    }
+                    node.engineClient = new engine_client.EngineClient(node.url);
+                }
             }
-        });
 
-        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);
+            refreshUrl();
+            const intervalId = setInterval(refreshUrl, intervalMs);
+
+            return () => clearInterval(intervalId);
         }
-    }
-    RED.nodes.registerType('processcube-engine-config', ProcessCubeEngineNode, {
-        credentials: {
-            clientId: { type: 'text' },
-            clientSecret: { type: 'password' },
-        },
-    });
-};
 
-async function getFreshTokenSet(clientId, clientSecret, authorityUrl) {
-    const issuer = await oidc.Issuer.discover(authorityUrl);
+        async function getFreshIdentity(url, node) {
+            try {
+                if (
+                    !RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node) ||
+                    !RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node)
+                ) {
+                    return null;
+                }
+
+                const res = await fetch(url + '/atlas_engine/api/v1/authority', {
+                    method: 'GET',
+                    headers: {
+                        Authorization: `Bearer ZHVtbXlfdG9rZW4=`,
+                        'Content-Type': 'application/json',
+                    },
+                });
 
-    const client = new issuer.Client({
-        client_id: clientId,
-        client_secret: clientSecret,
-    });
+                const body = await res.json();
 
-    const tokenSet = await client.grant({
-        grant_type: 'client_credentials',
-        scope: 'engine_etw engine_read engine_write',
-    });
+                const issuer = await oidc.Issuer.discover(body);
 
-    return tokenSet;
-}
+                const client = new issuer.Client({
+                    client_id: RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node),
+                    client_secret: RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node),
+                });
 
-function getIdentityForExternalTaskWorkers(tokenSet) {
-    const accessToken = tokenSet.access_token;
-    const decodedToken = jwt.jwtDecode(accessToken);
+                const tokenSet = await client.grant({
+                    grant_type: 'client_credentials',
+                    scope: 'engine_etw engine_read engine_write',
+                });
 
-    return {
-        token: tokenSet.access_token,
-        userId: decodedToken.sub,
-    };
-}
+                const accessToken = tokenSet.access_token;
+                const decodedToken = jwt.jwtDecode(accessToken);
 
-async function getExpiresInForExternalTaskWorkers(tokenSet) {
-    let expiresIn = tokenSet.expires_in;
+                const freshIdentity = {
+                    token: tokenSet.access_token,
+                    userId: decodedToken.sub,
+                };
 
-    if (!expiresIn && tokenSet.expires_at) {
-        expiresIn = Math.floor(tokenSet.expires_at - Date.now() / 1000);
-    }
-
-    if (expiresIn === undefined) {
-        throw new Error('Could not determine the time until the access token for external task workers expires');
-    }
+                node.setIdentity(freshIdentity);
 
-    return expiresIn;
-}
-
-/**
- * Start refreshing the identity in regular intervals.
- * @param {TokenSet | null} tokenSet The token set to refresh the identity for
- * @returns {Promise<void>} A promise that resolves when the timer for refreshing the identity is initialized
- * */
-async function startRefreshingIdentityCycle(clientId, clientSecret, authorityUrl, configNode) {
-    let retries = 5;
-
-    const refresh = async () => {
-        try {
-            const newTokenSet = await getFreshTokenSet(clientId, clientSecret, authorityUrl);
-            const expiresIn = await getExpiresInForExternalTaskWorkers(newTokenSet);
-            const delay = expiresIn * DELAY_FACTOR * 1000;
-
-            freshIdentity = getIdentityForExternalTaskWorkers(newTokenSet);
-
-            configNode.setIdentity(freshIdentity);
-
-            retries = 5;
-            setTimeout(refresh, delay);
-        } catch (error) {
-            if (retries === 0) {
-                console.error(
-                    'Could not refresh identity for external task worker processes. Stopping all external task workers.',
-                    { error }
-                );
-                return;
+                return freshIdentity;
+            } catch (e) {
+                node.error(`Could not get fresh identity: ${e}`);
             }
-            console.error('Could not refresh identity for external task worker processes.', {
-                error,
-                retryCount: retries,
-            });
-            retries--;
-
-            const delay = 2 * 1000;
-            setTimeout(refresh, delay);
         }
-    };
 
-    await refresh();
-}
+        node.on('close', async () => {
+            if (this.engineClient) {
+                stopRefreshing();
+                this.engineClient.dispose();
+                this.engineClient = null;
+            }
+        });
+    }
+    RED.nodes.registerType('processcube-engine-config', ProcessCubeEngineNode, {
+        credentials: {
+            clientId: { type: 'text' },
+            clientSecret: { type: 'password' },
+        },
+    });
+};

package/processdefinition-query.js

@@ -17,7 +17,7 @@ module.exports = function (RED) {
             
             query = {
                 ...query,
-                identity: undefined,
+                identity: engine.identity,
             };
 
             node.log(`Querying process definitions with query: ${JSON.stringify(query)}`);