@versori/run 0.4.10 → 0.4.12

package/{script/deps/jsr.io/@std/fs/1.0.19 → esm/deps/jsr.io/@std/fs/1.0.20}/exists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exists.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/fs/1.0.19/exists.ts"],"names":[],"mappings":"AAEA,iEAAiE;AACjE,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+FG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAqCT"}
+{"version":3,"file":"exists.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/fs/1.0.20/exists.ts"],"names":[],"mappings":"AAEA,iEAAiE;AACjE,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+FG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAqCT"}

package/esm/deps/jsr.io/@std/log/0.224.14/rotating_file_handler.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _RotatingFileHandler_maxBytes, _RotatingFileHandler_maxBackupCount, _RotatingFileHandler_currentFileSize;
-import { existsSync } from "../../fs/1.0.19/exists.js";
+import { existsSync } from "../../fs/1.0.20/exists.js";
 import { FileHandler } from "./file_handler.js";
 import { encoderSymbol, filenameSymbol, fileSymbol, modeSymbol, openOptionsSymbol, } from "./_file_handler_symbols.js";
 /**

package/esm/src/connection/internal/CredentialHolder.d.ts

@@ -6,6 +6,6 @@ export declare class CredentialHolder<T> {
     #private;
     constructor(initialValue: T, isValid: (t: T) => boolean, refresh: (force?: boolean) => Promise<T | undefined>);
     get(refresh?: boolean): Promise<T>;
-    refresh(_force?: boolean): void;
+    refresh(force?: boolean): void;
 }
 //# sourceMappingURL=CredentialHolder.d.ts.map

package/esm/src/connection/internal/CredentialHolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CredentialHolder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/CredentialHolder.ts"],"names":[],"mappings":"AAcA,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;;gBAQvB,YAAY,EAAE,CAAC,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAOlD,GAAG,CAAC,OAAO,GAAE,OAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IA0B/C,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;CAiClC"}
+{"version":3,"file":"CredentialHolder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/CredentialHolder.ts"],"names":[],"mappings":"AAcA,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;;gBAQvB,YAAY,EAAE,CAAC,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAOlD,GAAG,CAAC,OAAO,GAAE,OAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IA0B/C,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI;CAiCjC"}

package/esm/src/connection/internal/CredentialHolder.js

@@ -60,7 +60,7 @@ export class CredentialHolder {
         // the value with a new promise.
         return __classPrivateFieldGet(this, _CredentialHolder_value, "f");
     }
-    refresh(_force) {
+    refresh(force) {
         if (__classPrivateFieldGet(this, _CredentialHolder_isRefreshing, "f")) {
             return;
         }
@@ -68,7 +68,7 @@ export class CredentialHolder {
         // refresh works by replacing the existing #value promise with a new one which is pending
         // on a new promise which is refreshing the credential.
         // multiple calls to refresh() will be ignored until the first refresh is complete.
-        __classPrivateFieldSet(this, _CredentialHolder_value, new Promise((resolve, reject) => __classPrivateFieldGet(this, _CredentialHolder_refresh, "f").call(this).then((refreshed) => {
+        __classPrivateFieldSet(this, _CredentialHolder_value, new Promise((resolve, reject) => __classPrivateFieldGet(this, _CredentialHolder_refresh, "f").call(this, force).then((refreshed) => {
             if (!refreshed) {
                 reject(new Error('Refreshed credential is undefined'));
                 return;

package/esm/src/dsl/http/versori/webhookmiddleware.d.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@versori/run/observability';
+import { PlatformApi } from '@versori/run/services/platform';
 import { NextFunction, Request, Response } from 'express';
 import { ConnectionFactory } from '../../../connection/types.js';
-import { Logger } from '../../../observability/mod.js';
-import { PlatformApi } from '../../../services/platform/mod.js';
 import { ConfigReader } from '../types.js';
 export type CreateWebhookMiddleWareOpts = {
     id: string;

package/esm/src/dsl/http/versori/webhookmiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhookmiddleware.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/webhookmiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAc,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAiD,YAAY,EAAE,MAAM,aAAa,CAAC;AAU1F,MAAM,MAAM,2BAA2B,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAmCF,wBAAgB,6BAA6B,CACzC,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA2EpE;AAED,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA6DpE;AAED,wBAAgB,oCAAoC,CAChD,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAqFpE"}
+{"version":3,"file":"webhookmiddleware.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/webhookmiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAc,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,MAAM,MAAM,2BAA2B,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,wBAAgB,6BAA6B,CACzC,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA4GpE;AAED,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAkGpE;AAED,wBAAgB,oCAAoC,CAChD,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAoFpE"}

package/esm/src/dsl/http/versori/webhookmiddleware.js

@@ -10,42 +10,45 @@
  * As of the Change Date, in accordance with the Business Source License,
  * use of this software will be governed by the Apache License, Version 2.0.
  */
-// TODO: this gets called for every request for all endpoints, can we cache this?
-async function getStaticActivation(opts) {
-    const { data: activations } = await opts.platformApi.listActivations({
-        path: {
-            organisation_id: opts.organisationId,
-            environment_id: opts.environmentId,
-        },
-        query: {
-            static: true,
-        },
-        throwOnError: true,
-    });
-    let activation;
-    if (activations && activations.length > 0) {
-        if (activations.length > 1) {
-            opts.log.warn('Multiple static activations found, using the first one', {
-                activationsCount: activations.length,
-            });
-        }
-        activation = activations[0];
-    }
-    else {
-        opts.log.error('No static activation found', { webhookId: opts.id });
-    }
-    return activation;
-}
-// TODO: Refactor this so we don't have like three different middlewares for static and dynamic webhooks
+import { LRUCache } from 'lru-cache';
 export function createStaticWebhookMiddleware(opts) {
+    // create lru cache for activation
+    const activationCache = new LRUCache({ max: 100, ttl: 5 * 60 * 1000 }); // 5 minute ttl
+    const staticActivationID = "static";
+    const getStaticActivation = (forceFetch = false) => {
+        const cachedActivation = activationCache.get(staticActivationID);
+        if (cachedActivation && !forceFetch) {
+            return cachedActivation;
+        }
+        else {
+            const fetchActivation = async () => {
+                const { data: activations } = await opts.platformApi.listActivations({
+                    path: {
+                        organisation_id: opts.organisationId,
+                        environment_id: opts.environmentId,
+                    },
+                    query: {
+                        static: true,
+                    },
+                    throwOnError: true,
+                });
+                if (activations.length === 0) {
+                    throw new Error('No static activation found');
+                }
+                return activations[0];
+            };
+            const activationPromise = fetchActivation();
+            activationCache.set(staticActivationID, activationPromise);
+            return activationPromise;
+        }
+    };
     if (opts.connName === undefined) {
         opts.log.warn(`No connection ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (_req, res, next) => {
-            res.locals.activation = await getStaticActivation(opts);
+            res.locals.activation = await getStaticActivation();
             next();
         };
     }
-    // TODO(@teo): move db access to outside of the middleware??? (genuine question - not instruction)
     return async (req, res, next) => {
         if (!opts.connName) {
             // This is mainly for type safety, but we should never reach this point
@@ -59,14 +62,13 @@ export function createStaticWebhookMiddleware(opts) {
             res.status(500).json({ error: 'Missing connection for webhook' });
             return;
         }
-        const activation = await getStaticActivation(opts);
-        if (!activation) {
-            opts.log.error('No activation found for static webhook', {
-                webhookId: opts.id,
-                connName: opts.connName,
-            });
-            res.status(500).json({ error: 'No activation found for static webhook' });
-            return;
+        let activation;
+        try {
+            activation = await getStaticActivation();
+        }
+        catch (err) {
+            opts.log.error('Failed to get static activation', { error: err });
+            activation = await getStaticActivation(true);
         }
         res.locals.activation = activation;
         const { data: cnx } = await opts.platformApi.getConnection({
@@ -89,18 +91,44 @@ export function createStaticWebhookMiddleware(opts) {
     };
 }
 export function createActIdDynamicWebhookMiddleware(opts) {
+    // create lru cache for activation
+    const activationCache = new LRUCache({ max: 100, ttl: 5 * 60 * 1000 }); // 5 minute ttl
+    const getActivation = (activationId, forceFetch = false) => {
+        const cachedActivation = activationCache.get(activationId);
+        if (cachedActivation && !forceFetch) {
+            return cachedActivation;
+        }
+        else {
+            const fetchActivation = async () => {
+                const activation = await opts.platformApi.getActivation({
+                    path: {
+                        organisation_id: opts.organisationId,
+                        environment_id: opts.environmentId,
+                        activation_id: activationId,
+                    },
+                    throwOnError: true,
+                });
+                return activation.data;
+            };
+            const activationPromise = fetchActivation();
+            activationCache.set(activationId, activationPromise);
+            return activationPromise;
+        }
+    };
     if (!opts.connName) {
         opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (req, res, next) => {
             const activationId = req.params.activationId;
-            const activation = await opts.platformApi.getActivation({
-                path: {
-                    organisation_id: opts.organisationId,
-                    environment_id: opts.environmentId,
-                    activation_id: activationId,
-                },
-                throwOnError: true,
-            });
+            let activation;
+            try {
+                activation = await await getActivation(activationId);
+                ;
+            }
+            catch (err) {
+                opts.log.error('Failed to get static activation', { error: err });
+                activation = await await getActivation(activationId, true);
+                ;
+            }
             res.locals.activation = activation;
             next();
         };
@@ -114,14 +142,16 @@ export function createActIdDynamicWebhookMiddleware(opts) {
         }
         const templateId = opts.cfgReader.getTemplateID(opts.connName);
         const activationId = req.params.activationId;
-        const activation = await opts.platformApi.getActivation({
-            path: {
-                organisation_id: opts.organisationId,
-                environment_id: opts.environmentId,
-                activation_id: activationId,
-            },
-            throwOnError: true,
-        });
+        let activation;
+        try {
+            activation = await await getActivation(activationId);
+            ;
+        }
+        catch (err) {
+            opts.log.error('Failed to get static activation', { error: err });
+            activation = await await getActivation(activationId, true);
+            ;
+        }
         const conn = await opts.platformApi.getActivationConnection({
             path: {
                 organisation_id: opts.organisationId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versori/run",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Versori Run",
   "homepage": "https://github.com/versori/versori-run#readme",
   "repository": {

package/{esm/deps/jsr.io/@std/fs/1.0.19 → script/deps/jsr.io/@std/fs/1.0.20}/exists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exists.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/fs/1.0.19/exists.ts"],"names":[],"mappings":"AAEA,iEAAiE;AACjE,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+FG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAqCT"}
+{"version":3,"file":"exists.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/fs/1.0.20/exists.ts"],"names":[],"mappings":"AAEA,iEAAiE;AACjE,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGG;AACH,wBAAsB,MAAM,CAC1B,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+FG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,GAAG,GAAG,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAqCT"}

package/script/deps/jsr.io/@std/log/0.224.14/rotating_file_handler.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _RotatingFileHandler_maxBytes, _RotatingFileHandler_maxBackupCount, _RotatingFileHandler_currentFileSize;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RotatingFileHandler = void 0;
-const exists_js_1 = require("../../fs/1.0.19/exists.js");
+const exists_js_1 = require("../../fs/1.0.20/exists.js");
 const file_handler_js_1 = require("./file_handler.js");
 const _file_handler_symbols_js_1 = require("./_file_handler_symbols.js");
 /**

package/script/src/connection/internal/CredentialHolder.d.ts

@@ -6,6 +6,6 @@ export declare class CredentialHolder<T> {
     #private;
     constructor(initialValue: T, isValid: (t: T) => boolean, refresh: (force?: boolean) => Promise<T | undefined>);
     get(refresh?: boolean): Promise<T>;
-    refresh(_force?: boolean): void;
+    refresh(force?: boolean): void;
 }
 //# sourceMappingURL=CredentialHolder.d.ts.map

package/script/src/connection/internal/CredentialHolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CredentialHolder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/CredentialHolder.ts"],"names":[],"mappings":"AAcA,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;;gBAQvB,YAAY,EAAE,CAAC,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAOlD,GAAG,CAAC,OAAO,GAAE,OAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IA0B/C,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;CAiClC"}
+{"version":3,"file":"CredentialHolder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/CredentialHolder.ts"],"names":[],"mappings":"AAcA,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;;gBAQvB,YAAY,EAAE,CAAC,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAOlD,GAAG,CAAC,OAAO,GAAE,OAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IA0B/C,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI;CAiCjC"}

package/script/src/connection/internal/CredentialHolder.js

@@ -64,7 +64,7 @@ class CredentialHolder {
         // the value with a new promise.
         return __classPrivateFieldGet(this, _CredentialHolder_value, "f");
     }
-    refresh(_force) {
+    refresh(force) {
         if (__classPrivateFieldGet(this, _CredentialHolder_isRefreshing, "f")) {
             return;
         }
@@ -72,7 +72,7 @@ class CredentialHolder {
         // refresh works by replacing the existing #value promise with a new one which is pending
         // on a new promise which is refreshing the credential.
         // multiple calls to refresh() will be ignored until the first refresh is complete.
-        __classPrivateFieldSet(this, _CredentialHolder_value, new Promise((resolve, reject) => __classPrivateFieldGet(this, _CredentialHolder_refresh, "f").call(this).then((refreshed) => {
+        __classPrivateFieldSet(this, _CredentialHolder_value, new Promise((resolve, reject) => __classPrivateFieldGet(this, _CredentialHolder_refresh, "f").call(this, force).then((refreshed) => {
             if (!refreshed) {
                 reject(new Error('Refreshed credential is undefined'));
                 return;

package/script/src/dsl/http/versori/webhookmiddleware.d.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@versori/run/observability';
+import { PlatformApi } from '@versori/run/services/platform';
 import { NextFunction, Request, Response } from 'express';
 import { ConnectionFactory } from '../../../connection/types.js';
-import { Logger } from '../../../observability/mod.js';
-import { PlatformApi } from '../../../services/platform/mod.js';
 import { ConfigReader } from '../types.js';
 export type CreateWebhookMiddleWareOpts = {
     id: string;

package/script/src/dsl/http/versori/webhookmiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhookmiddleware.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/webhookmiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAc,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAiD,YAAY,EAAE,MAAM,aAAa,CAAC;AAU1F,MAAM,MAAM,2BAA2B,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAmCF,wBAAgB,6BAA6B,CACzC,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA2EpE;AAED,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA6DpE;AAED,wBAAgB,oCAAoC,CAChD,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAqFpE"}
+{"version":3,"file":"webhookmiddleware.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/webhookmiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAc,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,MAAM,MAAM,2BAA2B,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,wBAAgB,6BAA6B,CACzC,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA4GpE;AAED,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAkGpE;AAED,wBAAgB,oCAAoC,CAChD,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAoFpE"}

package/script/src/dsl/http/versori/webhookmiddleware.js

@@ -15,42 +15,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStaticWebhookMiddleware = createStaticWebhookMiddleware;
 exports.createActIdDynamicWebhookMiddleware = createActIdDynamicWebhookMiddleware;
 exports.createUserIdDynamicWebhookMiddleware = createUserIdDynamicWebhookMiddleware;
-// TODO: this gets called for every request for all endpoints, can we cache this?
-async function getStaticActivation(opts) {
-    const { data: activations } = await opts.platformApi.listActivations({
-        path: {
-            organisation_id: opts.organisationId,
-            environment_id: opts.environmentId,
-        },
-        query: {
-            static: true,
-        },
-        throwOnError: true,
-    });
-    let activation;
-    if (activations && activations.length > 0) {
-        if (activations.length > 1) {
-            opts.log.warn('Multiple static activations found, using the first one', {
-                activationsCount: activations.length,
-            });
-        }
-        activation = activations[0];
-    }
-    else {
-        opts.log.error('No static activation found', { webhookId: opts.id });
-    }
-    return activation;
-}
-// TODO: Refactor this so we don't have like three different middlewares for static and dynamic webhooks
+const lru_cache_1 = require("lru-cache");
 function createStaticWebhookMiddleware(opts) {
+    // create lru cache for activation
+    const activationCache = new lru_cache_1.LRUCache({ max: 100, ttl: 5 * 60 * 1000 }); // 5 minute ttl
+    const staticActivationID = "static";
+    const getStaticActivation = (forceFetch = false) => {
+        const cachedActivation = activationCache.get(staticActivationID);
+        if (cachedActivation && !forceFetch) {
+            return cachedActivation;
+        }
+        else {
+            const fetchActivation = async () => {
+                const { data: activations } = await opts.platformApi.listActivations({
+                    path: {
+                        organisation_id: opts.organisationId,
+                        environment_id: opts.environmentId,
+                    },
+                    query: {
+                        static: true,
+                    },
+                    throwOnError: true,
+                });
+                if (activations.length === 0) {
+                    throw new Error('No static activation found');
+                }
+                return activations[0];
+            };
+            const activationPromise = fetchActivation();
+            activationCache.set(staticActivationID, activationPromise);
+            return activationPromise;
+        }
+    };
     if (opts.connName === undefined) {
         opts.log.warn(`No connection ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (_req, res, next) => {
-            res.locals.activation = await getStaticActivation(opts);
+            res.locals.activation = await getStaticActivation();
             next();
         };
     }
-    // TODO(@teo): move db access to outside of the middleware??? (genuine question - not instruction)
     return async (req, res, next) => {
         if (!opts.connName) {
             // This is mainly for type safety, but we should never reach this point
@@ -64,14 +67,13 @@ function createStaticWebhookMiddleware(opts) {
             res.status(500).json({ error: 'Missing connection for webhook' });
             return;
         }
-        const activation = await getStaticActivation(opts);
-        if (!activation) {
-            opts.log.error('No activation found for static webhook', {
-                webhookId: opts.id,
-                connName: opts.connName,
-            });
-            res.status(500).json({ error: 'No activation found for static webhook' });
-            return;
+        let activation;
+        try {
+            activation = await getStaticActivation();
+        }
+        catch (err) {
+            opts.log.error('Failed to get static activation', { error: err });
+            activation = await getStaticActivation(true);
         }
         res.locals.activation = activation;
         const { data: cnx } = await opts.platformApi.getConnection({
@@ -94,18 +96,44 @@ function createStaticWebhookMiddleware(opts) {
     };
 }
 function createActIdDynamicWebhookMiddleware(opts) {
+    // create lru cache for activation
+    const activationCache = new lru_cache_1.LRUCache({ max: 100, ttl: 5 * 60 * 1000 }); // 5 minute ttl
+    const getActivation = (activationId, forceFetch = false) => {
+        const cachedActivation = activationCache.get(activationId);
+        if (cachedActivation && !forceFetch) {
+            return cachedActivation;
+        }
+        else {
+            const fetchActivation = async () => {
+                const activation = await opts.platformApi.getActivation({
+                    path: {
+                        organisation_id: opts.organisationId,
+                        environment_id: opts.environmentId,
+                        activation_id: activationId,
+                    },
+                    throwOnError: true,
+                });
+                return activation.data;
+            };
+            const activationPromise = fetchActivation();
+            activationCache.set(activationId, activationPromise);
+            return activationPromise;
+        }
+    };
     if (!opts.connName) {
         opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (req, res, next) => {
             const activationId = req.params.activationId;
-            const activation = await opts.platformApi.getActivation({
-                path: {
-                    organisation_id: opts.organisationId,
-                    environment_id: opts.environmentId,
-                    activation_id: activationId,
-                },
-                throwOnError: true,
-            });
+            let activation;
+            try {
+                activation = await await getActivation(activationId);
+                ;
+            }
+            catch (err) {
+                opts.log.error('Failed to get static activation', { error: err });
+                activation = await await getActivation(activationId, true);
+                ;
+            }
             res.locals.activation = activation;
             next();
         };
@@ -119,14 +147,16 @@ function createActIdDynamicWebhookMiddleware(opts) {
         }
         const templateId = opts.cfgReader.getTemplateID(opts.connName);
         const activationId = req.params.activationId;
-        const activation = await opts.platformApi.getActivation({
-            path: {
-                organisation_id: opts.organisationId,
-                environment_id: opts.environmentId,
-                activation_id: activationId,
-            },
-            throwOnError: true,
-        });
+        let activation;
+        try {
+            activation = await await getActivation(activationId);
+            ;
+        }
+        catch (err) {
+            opts.log.error('Failed to get static activation', { error: err });
+            activation = await await getActivation(activationId, true);
+            ;
+        }
         const conn = await opts.platformApi.getActivationConnection({
             path: {
                 organisation_id: opts.organisationId,