@5minds/node-red-contrib-processcube 1.5.2-feature-95789a-m3625uau → 1.5.2-feature-4b06ce-m3644zlp

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.2-feature-95789a-m3625uau",
+    "version": "1.5.2-feature-4b06ce-m3644zlp",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/processcube-engine-config.js

@@ -2,8 +2,6 @@ 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);
@@ -36,13 +34,15 @@ module.exports = function (RED) {
             }
         };
 
-        async function getFreshIdentity(url) {
+        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: {
@@ -51,7 +51,9 @@ module.exports = function (RED) {
                     },
                 });
 
-                const issuer = await oidc.Issuer.discover(await res.json());
+                const body = await res.json();
+
+                const issuer = await oidc.Issuer.discover(body);
 
                 const client = new issuer.Client({
                     client_id: RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node),
@@ -71,9 +73,7 @@ module.exports = function (RED) {
                     userId: decodedToken.sub,
                 };
 
-                console.log('luis777', freshIdentity);
-
-                configNode.setIdentity(freshIdentity);
+                node.setIdentity(freshIdentity);
 
                 return freshIdentity;
             } catch (e) {
@@ -91,25 +91,7 @@ module.exports = function (RED) {
         });
 
         if (this.credentials.clientId && this.credentials.clientSecret) {
-            this.engineClient = new engine_client.EngineClient(this.url, () => getFreshIdentity(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);
-            //     });
+            this.engineClient = new engine_client.EngineClient(this.url, () => getFreshIdentity(this.url, node));
         } else {
             this.engineClient = new engine_client.EngineClient(this.url);
         }
@@ -121,85 +103,3 @@ module.exports = function (RED) {
         },
     });
 };
-
-// async function getFreshTokenSet(clientId, clientSecret, authorityUrl) {
-//     const issuer = await oidc.Issuer.discover(authorityUrl);
-
-//     const client = new issuer.Client({
-//         client_id: clientId,
-//         client_secret: clientSecret,
-//     });
-
-//     const tokenSet = await client.grant({
-//         grant_type: 'client_credentials',
-//         scope: 'engine_etw engine_read engine_write',
-//     });
-
-//     return tokenSet;
-// }
-
-// function getIdentityForExternalTaskWorkers(tokenSet) {
-//     const accessToken = tokenSet.access_token;
-//     const decodedToken = jwt.jwtDecode(accessToken);
-
-//     return {
-//         token: tokenSet.access_token,
-//         userId: decodedToken.sub,
-//     };
-// }
-
-// async function getExpiresInForExternalTaskWorkers(tokenSet) {
-//     let expiresIn = tokenSet.expires_in;
-
-//     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');
-//     }
-
-//     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;
-//             }
-//             console.error('Could not refresh identity for external task worker processes.', {
-//                 error,
-//                 retryCount: retries,
-//             });
-//             retries--;
-
-//             const delay = 2 * 1000;
-//             setTimeout(refresh, delay);
-//         }
-//     };
-
-//     await refresh();
-// }