@versori/run 0.5.0-alpha.5 → 0.7.0-alpha.3

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

@@ -0,0 +1,41 @@
+"use strict";
+/*
+ * Copyright (c) 2025 Versori Group Inc
+ *
+ * Use of this software is governed by the Business Source License 1.1
+ * included in the LICENSE file at the root of this repository.
+ *
+ * Change Date: 2029-01-01
+ * Change License: Apache License, Version 2.0
+ *
+ * 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cronPort = exports.envVarLocalRun = exports.envVarJwt = exports.envVarInternalToken = exports.envVarTokenEndpoint = exports.envVarClientSecret = exports.envVarClientId = exports.envVarConfigFile = exports.envVarVersion = exports.envVarOtelTracesURL = exports.envVarCredsBaseURL = exports.envVarSelfRefURL = exports.envVarSDKApiBaseURL = exports.envVarCronApiBaseURL = exports.envVarPlatformApiBaseURL = exports.envVarOrgSlug = exports.envVarProjectId = exports.envVarEnvironmentName = exports.envVarEnvId = exports.envVarOrgId = void 0;
+//TODO(@teo): remove this file, it is implemented in the src/internal/constants.ts directory now.
+// This file contains constants used in the Versori DSL HTTP client.
+exports.envVarOrgId = 'RUN_ORGANISATION_ID';
+exports.envVarEnvId = 'RUN_ENVIRONMENT_ID';
+exports.envVarEnvironmentName = 'RUN_ENVIRONMENT';
+exports.envVarProjectId = 'RUN_SERVICE_ID';
+exports.envVarOrgSlug = 'RUN_ORGANISATION_SLUG';
+exports.envVarPlatformApiBaseURL = 'RUN_PLATFORM_API_INTERNAL_URL';
+exports.envVarCronApiBaseURL = 'RUN_CRON_API_INTERNAL_URL';
+exports.envVarSDKApiBaseURL = 'RUN_SDK_API_URL';
+exports.envVarSelfRefURL = 'RUN_SELF_REF_URL';
+exports.envVarCredsBaseURL = 'RUN_CREDENTIALS_SERVICE_INTERNAL_URL';
+exports.envVarOtelTracesURL = 'RUN_OTEL_TRACES_URL';
+exports.envVarVersion = 'RUN_SERVICE_VERSION';
+// The following environment variables are used for the config file
+exports.envVarConfigFile = 'RUN_CONFIG_FILE';
+// The following environment variables are used for internal authentication
+exports.envVarClientId = 'RUN_CLIENT_ID';
+exports.envVarClientSecret = 'RUN_CLIENT_SECRET';
+exports.envVarTokenEndpoint = 'RUN_TOKEN_ENDPOINT';
+exports.envVarInternalToken = 'RUN_INTERNAL_TOKEN';
+exports.envVarJwt = 'RUN_VERSORI_JWT';
+// The following are for running locally
+exports.envVarLocalRun = 'RUN_LOCAL';
+// please no changerino
+exports.cronPort = 3001; // The port on which the cron API communicates with the service

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

@@ -5,10 +5,11 @@ type Cron = {
     url: string;
 };
 export declare class CronAPIClient implements CronProvider {
-    private baseUrl?;
+    private baseUrl;
     private envId;
     private integrationUrl;
-    constructor(envId: string, integrationUrl: string, baseUrl?: string);
+    private runLocal;
+    constructor(baseUrl: string, envId: string, integrationUrl: string);
     static fromEnv(): CronAPIClient;
     static addDefaultCronPort(url: string): string;
     makeCronPath(name: string): string;

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

@@ -1 +1 @@
-{"version":3,"file":"cronapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/cronapi.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,KAAK,IAAI,GAAG;IACR,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAC9C,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,cAAc,CAAS;gBAEnB,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAMnE,MAAM,CAAC,OAAO,IAAI,aAAa;IAkB/B,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAU9C,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM5B,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC5D,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE;CAsB3B"}
+{"version":3,"file":"cronapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/cronapi.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAY3C,KAAK,IAAI,GAAG;IACR,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAC9C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAOlE,MAAM,CAAC,OAAO,IAAI,aAAa;IAmB/B,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAU9C,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM5B,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5D,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE;CAsB3B"}

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

@@ -13,10 +13,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CronAPIClient = void 0;
-const constants_js_1 = require("../../../internal/constants.js");
-const supervisor_js_1 = require("../../../internal/supervisor.js");
+const constants_js_1 = require("./constants.js");
 class CronAPIClient {
-    constructor(envId, integrationUrl, baseUrl) {
+    constructor(baseUrl, envId, integrationUrl) {
         Object.defineProperty(this, "baseUrl", {
             enumerable: true,
             configurable: true,
@@ -35,22 +34,30 @@ class CronAPIClient {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "runLocal", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.baseUrl = baseUrl;
         this.envId = envId;
         this.integrationUrl = integrationUrl;
+        this.runLocal = Deno.env.get(constants_js_1.envVarLocalRun) === 'true';
     }
     static fromEnv() {
-        const baseUrl = Deno.env.get(constants_js_1.envVarCronApiBaseURL);
+        const baseUrl = Deno.env.get(constants_js_1.envVarCronApiBaseURL) ||
+            'http://cron-api.platform.svc.cluster.local';
         const envId = Deno.env.get(constants_js_1.envVarEnvId);
         const projectId = Deno.env.get(constants_js_1.envVarProjectId);
         const orgSlug = Deno.env.get(constants_js_1.envVarOrgSlug);
         const envName = Deno.env.get(constants_js_1.envVarEnvironmentName);
-        if (!envId || !projectId || !orgSlug || !envName) {
+        if (!baseUrl || !envId || !projectId || !orgSlug || !envName) {
             throw new Error('Missing required environment variables');
         }
         const integrationUrl = Deno.env.get(constants_js_1.envVarSelfRefURL) ||
             `http://svc-${projectId.toLowerCase()}-${envName.toLowerCase()}.sb-${orgSlug.toLowerCase()}.svc.cluster.local:${constants_js_1.cronPort}`;
-        return new CronAPIClient(envId, this.addDefaultCronPort(integrationUrl), baseUrl);
+        return new CronAPIClient(baseUrl, envId, this.addDefaultCronPort(integrationUrl));
     }
     // Check if the URL has a port, if not, add the default cron port.
     static addDefaultCronPort(url) {
@@ -71,13 +78,7 @@ class CronAPIClient {
             schedule,
             url: this.makeCronPath(name),
         }));
-        if (supervisor_js_1.enabled) {
-            // if we are in supervised mode we don't want to do run crons automatically
-            return;
-        }
-        if (!this.baseUrl) {
-            // we are no in supervised mode and there is no base URL
-            // run for local dev
+        if (this.runLocal) {
             this.runLocalFn(cronsArray);
             return;
         }
@@ -96,7 +97,7 @@ class CronAPIClient {
         if (crons.length === 0) {
             return;
         }
-        const cronPort = Deno.env.get(constants_js_1.envCronPort) || '3001';
+        const cronPort = Deno.env.get('CRON_PORT') || '3001';
         console.log('----------------------------------------');
         console.log('Running in local mode, your scheduler workflows will not trigger automatically.');
         console.log('Instead you can trigger them by sending a request to the following URLs:');

package/script/src/dsl/http/versori/kvapi/core/OpenAPI.js

@@ -16,7 +16,7 @@ exports.OpenAPI = void 0;
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-const constants_js_1 = require("../../../../../internal/constants.js");
+const constants_js_1 = require("../../constants.js");
 exports.OpenAPI = {
     BASE: Deno.env.get(constants_js_1.envVarSDKApiBaseURL) || 'http://localhost:8902',
     VERSION: '1.0.0',

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

@@ -1,7 +1,7 @@
+import { PlatformApi } from '../../../services/platform/mod.js';
 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 { Logger } from '../../../observability/logging/Logger.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":"AAcA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAc,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,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,CAqGpE;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,CAyEpE;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,CA2FpE"}
+{"version":3,"file":"webhookmiddleware.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/webhookmiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAc,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,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,CAqFpE"}

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

@@ -15,68 +15,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStaticWebhookMiddleware = createStaticWebhookMiddleware;
 exports.createActIdDynamicWebhookMiddleware = createActIdDynamicWebhookMiddleware;
 exports.createUserIdDynamicWebhookMiddleware = createUserIdDynamicWebhookMiddleware;
-const mod_js_1 = require("../../../../deps/jsr.io/@std/ulid/1.0.0/mod.js");
-const supervisor_js_1 = require("../../../internal/supervisor.js");
-// 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) {
-    const staticMiddleware = async (_req, res, next) => {
-        try {
-            res.locals.activation = await getStaticActivation(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;
         }
-        catch (err) {
-            // when working in mocks users might not be connected so there might not be an activation
-            if (supervisor_js_1.enabled) {
-                res.locals.activation = {
-                    id: (0, mod_js_1.ulid)(), // random ulid used for testing
-                    user: {
-                        externalId: '__ai_mock_testing__',
-                    }
-                };
-                next();
-                return;
-            }
-            opts.log.error('Failed to get static activation', { error: err });
-            res.status(500).json({ error: 'Failed to get static activation' });
-            return;
-        }
-        next();
     };
     if (opts.connName === undefined) {
-        opts.log.warn(`No connection ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
-        return staticMiddleware;
+        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();
+            next();
+        };
     }
-    // TODO(@teo): move db access to outside of the middleware??? (genuine question - not instruction)
     return async (req, res, next) => {
-        if (supervisor_js_1.enabled) {
-            opts.log.warn("Disabling webhook auth in test mode.");
-            return staticMiddleware(req, res, next);
-        }
         if (!opts.connName) {
             // This is mainly for type safety, but we should never reach this point
             opts.log.error('Connection name is not defined for webhook middleware');
@@ -89,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({
@@ -119,31 +96,49 @@ function createStaticWebhookMiddleware(opts) {
     };
 }
 function createActIdDynamicWebhookMiddleware(opts) {
-    const staticMiddleware = async (_req, res, next) => {
-        try {
-            res.locals.activation = await getStaticActivation(opts);
-        }
-        catch (err) {
-            if (supervisor_js_1.enabled) {
-                res.locals.activation = {};
-                next();
-                return;
-            }
-            opts.log.error('Failed to get static activation', { error: err });
-            res.status(500).json({ error: 'Failed to get static activation' });
-            return;
+    // 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;
         }
-        next();
     };
     if (!opts.connName) {
-        opts.log.warn(`No template ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
-        return staticMiddleware;
+        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;
+            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();
+        };
     }
     return async (req, res, next) => {
-        if (supervisor_js_1.enabled) {
-            opts.log.warn("Disabling webhook out in test mode.");
-            return staticMiddleware(req, res, next);
-        }
         if (!opts.connName) {
             // This is mainly for type safety, but we should never reach this point
             opts.log.error('Connection name is not defined for webhook middleware');
@@ -152,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,
@@ -174,40 +171,36 @@ function createActIdDynamicWebhookMiddleware(opts) {
             return;
         }
         const handler = await opts.cnxFactory.handler(conn.data);
+        res.locals.activation = activation;
         handler(req, res, next);
     };
 }
 function createUserIdDynamicWebhookMiddleware(opts) {
-    const staticMiddleware = async (req, res, next) => {
-        const userId = req.params.userId;
-        const { data: activations } = await opts.platformApi.listUserActivations({
-            path: {
-                organisation_id: opts.organisationId,
-                environment_id: opts.environmentId,
-                external_user_id: userId,
-            },
-            throwOnError: true,
-        });
-        if (activations.length === 0) {
-            opts.log.error(`No activations found for user: ${userId}`);
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        if (activations.length > 1) {
-            opts.log.warn(`Multiple activations found for user: ${userId}, using the first one: ${activations[0].id}`);
-        }
-        res.locals.activation = activations[0];
-        next();
-    };
     if (!opts.connName) {
-        opts.log.warn(`No template ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
-        return staticMiddleware;
+        opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        return async (req, res, next) => {
+            const userId = req.params.userId;
+            const { data: activations } = await opts.platformApi.listUserActivations({
+                path: {
+                    organisation_id: opts.organisationId,
+                    environment_id: opts.environmentId,
+                    external_user_id: userId,
+                },
+                throwOnError: true,
+            });
+            if (activations.length === 0) {
+                opts.log.error(`No activations found for user: ${userId}`);
+                res.status(401).json({ error: 'Unauthorised' });
+                return;
+            }
+            if (activations.length > 1) {
+                opts.log.warn(`Multiple activations found for user: ${userId}, using the first one: ${activations[0].id}`);
+            }
+            res.locals.activation = activations[0];
+            next();
+        };
     }
     return async (req, res, next) => {
-        if (supervisor_js_1.enabled) {
-            opts.log.warn("Disabling webhook auth in test mode.");
-            return staticMiddleware(req, res, next);
-        }
         if (!opts.connName) {
             // This is mainly for type safety, but we should never reach this point
             opts.log.error('Connection name is not defined for webhook middleware');
@@ -244,6 +237,7 @@ function createUserIdDynamicWebhookMiddleware(opts) {
             return;
         }
         const handler = await opts.cnxFactory.handler(conn.data);
+        res.locals.activation = activation;
         handler(req, res, next);
     };
 }

package/script/src/dsl/triggers/WebhookTrigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebhookTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/WebhookTrigger.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IACvC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACjC;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;IAE7C;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IAElF;;OAEG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACnC,CAAC;AAEF,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IAExB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAEtB,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB;IAOpD,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;CAK1D;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAElF"}
+{"version":3,"file":"WebhookTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/WebhookTrigger.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IACvC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAChC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACjC;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;IAE7C;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IAElF;;OAEG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACnC,CAAC;AAEF,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IAExB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAEtB,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB;IAKpD,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;CAG1D;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAElF"}

package/script/src/dsl/triggers/WebhookTrigger.js

@@ -40,11 +40,9 @@ class WebhookTrigger {
         });
         this.id = id;
         this.options = options;
-        this.then = this.then.bind(this);
     }
     then(task) {
-        const actualTask = (0, ensureTask_js_1.ensureTask)(task);
-        return new Workflow_js_1.WorkflowImpl(this, actualTask);
+        return new Workflow_js_1.WorkflowImpl(this, (0, ensureTask_js_1.ensureTask)(task));
     }
 }
 exports.WebhookTrigger = WebhookTrigger;

package/script/src/internal/InternalAuth.d.ts

@@ -5,7 +5,9 @@ export declare class InternalAuth {
     private clientId;
     private clientSecret;
     private tokenEndpoint;
+    private runLocal;
     private accessToken;
+    private jwt;
     private expiresAt;
     constructor();
     getAuthHeader(): Promise<internalAuthHeader>;

package/script/src/internal/InternalAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AAoBA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IAyBpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAsBrD"}
+{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AAuBA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAAS;;IA6CpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CA8BrD"}

package/script/src/internal/InternalAuth.js

@@ -13,6 +13,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalAuth = void 0;
+const cli_js_1 = require("./cli.js");
 const constants_js_1 = require("./constants.js");
 class InternalAuth {
     constructor() {
@@ -34,12 +35,24 @@ class InternalAuth {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "runLocal", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "accessToken", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "jwt", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "expiresAt", {
             enumerable: true,
             configurable: true,
@@ -49,11 +62,25 @@ class InternalAuth {
         this.clientId = Deno.env.get(constants_js_1.envVarClientId) || '';
         this.clientSecret = Deno.env.get(constants_js_1.envVarClientSecret) || '';
         this.tokenEndpoint = Deno.env.get(constants_js_1.envVarTokenEndpoint) || '';
+        this.jwt = '';
         this.accessToken = '';
         this.expiresAt = 0;
+        this.runLocal = Deno.env.get(constants_js_1.envVarLocalRun) === 'true';
         if (Deno.env.get(constants_js_1.envVarInternalToken)) {
             this.accessToken = Deno.env.get(constants_js_1.envVarInternalToken) || '';
             this.expiresAt = Date.now() + 365 * 24 * 60 * 60 * 1000; // expires in 1 year
+            console.log(`Using static token provided by ${constants_js_1.envVarInternalToken}`);
+            return;
+        }
+        if (Deno.env.get(constants_js_1.envVarJwt)) {
+            this.jwt = Deno.env.get(constants_js_1.envVarJwt) || '';
+            this.expiresAt = Date.now() + 365 * 24 * 60 * 60 * 1000; // expires in 1 year
+            console.log(`Using static JWT provided by ${constants_js_1.envVarJwt}`);
+            return;
+        }
+        if (this.runLocal) {
+            console.info('Running in local mode using cookie for authentication');
+            this.accessToken = (0, cli_js_1.getVersoriCookie)();
             return;
         }
         if (!this.clientId || !this.clientSecret || !this.tokenEndpoint) {
@@ -68,9 +95,15 @@ class InternalAuth {
         }
     }
     async getAuthHeader() {
+        if (this.runLocal) {
+            return { 'Cookie': this.accessToken };
+        }
         if (this.accessToken && this.expiresAt > Date.now()) {
             return { 'X-Versori-Internal-Token': this.accessToken };
         }
+        if (this.jwt) {
+            return { 'Authorization': `JWT ${this.jwt}` };
+        }
         const encoded = btoa(`${this.clientId}:${this.clientSecret}`);
         const response = await fetch(this.tokenEndpoint, {
             method: 'POST',

package/script/src/internal/cli.d.ts

@@ -0,0 +1,2 @@
+export declare function getVersoriCookie(): string;
+//# sourceMappingURL=cli.d.ts.map

package/script/src/internal/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/src/internal/cli.ts"],"names":[],"mappings":"AA8BA,wBAAgB,gBAAgB,IAAI,MAAM,CAmBzC"}

package/script/src/internal/cli.js

@@ -0,0 +1,35 @@
+"use strict";
+/*
+ * Copyright (c) 2025 Versori Group Inc
+ *
+ * Use of this software is governed by the Business Source License 1.1
+ * included in the LICENSE file at the root of this repository.
+ *
+ * Change Date: 2029-01-01
+ * Change License: Apache License, Version 2.0
+ *
+ * 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersoriCookie = getVersoriCookie;
+// This file contains functions that can read stuff generated by the Versori CLI. This is used when running locally.
+const node_os_1 = require("node:os");
+const cookiesFileName = 'cookies.json';
+const versoriCookieName = 'versori_sess';
+function getVersoriCookie() {
+    const cookiesFilePath = `${(0, node_os_1.homedir)()}/.config/versori/${cookiesFileName}`;
+    let cookiesFile;
+    try {
+        cookiesFile = JSON.parse(Deno.readTextFileSync(cookiesFilePath));
+    }
+    catch (e) {
+        console.error('Error reading file, have you run the Versori CLI to log in?');
+        throw new Error(`Failed to read or parse cookies file at ${cookiesFilePath}: ${e}`);
+    }
+    const versoriCookie = cookiesFile.cookies.find((cookie) => cookie.Name === versoriCookieName);
+    if (!versoriCookie) {
+        throw new Error(`Cookie 'versori_sess' not found in ${cookiesFilePath}`);
+    }
+    return `${versoriCookieName}=${versoriCookie.Value}`;
+}

package/script/src/internal/constants.d.ts

@@ -10,13 +10,12 @@ export declare const envVarSelfRefURL = "RUN_SELF_REF_URL";
 export declare const envVarCredsBaseURL = "RUN_CREDENTIALS_SERVICE_INTERNAL_URL";
 export declare const envVarOtelTracesURL = "RUN_OTEL_TRACES_URL";
 export declare const envVarVersion = "RUN_SERVICE_VERSION";
-export declare const envReadyCheckURL = "READY_CHECK_URL";
-export declare const envPort = "PORT";
-export declare const envCronPort = "CRON_PORT";
 export declare const envVarConfigFile = "RUN_CONFIG_FILE";
 export declare const envVarClientId = "RUN_CLIENT_ID";
 export declare const envVarClientSecret = "RUN_CLIENT_SECRET";
 export declare const envVarTokenEndpoint = "RUN_TOKEN_ENDPOINT";
 export declare const envVarInternalToken = "RUN_INTERNAL_TOKEN";
+export declare const envVarJwt = "RUN_VERSORI_JWT";
+export declare const envVarLocalRun = "RUN_LOCAL";
 export declare const cronPort = 3001;
 //# sourceMappingURL=constants.d.ts.map

package/script/src/internal/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/src/internal/constants.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAChD,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AACvD,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AACrD,eAAO,MAAM,wBAAwB,kCAAkC,CAAC;AACxE,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAChE,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AACrD,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,kBAAkB,yCAAyC,CAAC;AACzE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,gBAAgB,oBAAoB,CAAA;AACjD,eAAO,MAAM,OAAO,SAAS,CAAC;AAC9B,eAAO,MAAM,WAAW,cAAc,CAAC;AAGvC,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAGlD,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AACtD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AAMxD,eAAO,MAAM,QAAQ,OAAO,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/src/internal/constants.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAChD,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AACvD,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AACrD,eAAO,MAAM,wBAAwB,kCAAkC,CAAC;AACxE,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAChE,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AACrD,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,kBAAkB,yCAAyC,CAAC;AACzE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAGlD,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AACtD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,SAAS,oBAAoB,CAAC;AAG3C,eAAO,MAAM,cAAc,cAAc,CAAC;AAG1C,eAAO,MAAM,QAAQ,OAAO,CAAC"}