@versori/run 0.2.7 → 0.2.9

package/script/src/interpreter/memory/MemoryInterpreter.js

@@ -23,6 +23,7 @@ const NatsKeyValueProvider_js_1 = require("../../kv/nats/NatsKeyValueProvider.js
 const ConsoleLogger_js_1 = require("../../observability/logging/ConsoleLogger.js");
 const ObservableCompiler_js_1 = require("./ObservableCompiler.js");
 const proxyroundtripper_js_1 = require("../../dsl/http/versori/proxyroundtripper.js");
+const configloader_js_1 = require("../../dsl/http/versori/configloader.js");
 function getKVProvider(runLocal) {
     if (runLocal) {
         return Promise.resolve(new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider());
@@ -41,7 +42,7 @@ function getRoundTripperFactory(log, tracer, opts) {
     return new default_js_1.DefaultRoundTripperFactory();
 }
 class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, roundTripperFactory, router, cronRegistry, connectionProvider, cronProvider, tracer, otelSDK) {
+    constructor(log, compiler, contextProvider, roundTripperFactory, webhookRouter, cronRouter, cronRegistry, connectionProvider, cronProvider, tracer, cfgReader, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -66,11 +67,17 @@ class MemoryInterpreter {
             writable: true,
             value: roundTripperFactory
         });
-        Object.defineProperty(this, "router", {
+        Object.defineProperty(this, "webhookRouter", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: router
+            value: webhookRouter
+        });
+        Object.defineProperty(this, "cronRouter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: cronRouter
         });
         Object.defineProperty(this, "cronRegistry", {
             enumerable: true,
@@ -96,6 +103,12 @@ class MemoryInterpreter {
             writable: true,
             value: tracer
         });
+        Object.defineProperty(this, "cfgReader", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: cfgReader
+        });
         Object.defineProperty(this, "otelSDK", {
             enumerable: true,
             configurable: true,
@@ -108,7 +121,13 @@ class MemoryInterpreter {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "server", {
+        Object.defineProperty(this, "webhookServer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cronServer", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -143,6 +162,7 @@ class MemoryInterpreter {
         const orgSlug = Deno.env.get(constants_js_1.envVarOrgSlug) || 'development';
         const otelTracesURL = Deno.env.get(constants_js_1.envVarOtelTracesURL);
         let otelSDK;
+        const configReader = configloader_js_1.VersoriConfigReader.fromEnv(log);
         const runLocal = Deno.env.get(constants_js_1.envVarLocalRun) === 'true';
         await waitForReady(log);
         // Do NOT change those attributes, they are used by the API to filter on
@@ -173,10 +193,10 @@ class MemoryInterpreter {
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
-            return new MemoryInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, otelSDK);
+            return new MemoryInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express_1.default.Router(), express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, configReader, otelSDK);
         }
         const kvp = await getKVProvider(runLocal);
-        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials()), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, otelSDK);
+        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials()), roundTripperFactory, express_1.default.Router(), express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, configReader, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -193,9 +213,11 @@ class MemoryInterpreter {
             tracer: this.tracer,
             contextProvider: this.contextProvider,
             roundTripperFactory: this.roundTripperFactory,
-            router: this.router,
+            webhookRouter: this.webhookRouter,
+            cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
             connectionProvider: this.connectionProvider,
+            configReader: this.cfgReader,
         };
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);
@@ -213,21 +235,28 @@ class MemoryInterpreter {
     }
     async start() {
         const port = Deno.env.get('PORT') || 3000;
-        const app = (0, express_1.default)();
-        app.use(express_1.default.json()); // Add JSON body parser middleware
+        const cronPort = Deno.env.get('CRON_PORT') || 3001;
+        const webhookApp = (0, express_1.default)();
+        webhookApp.use(express_1.default.json()); // Add JSON body parser middleware
+        const cronApp = (0, express_1.default)();
+        cronApp.use(express_1.default.json());
         const xml2jsDefaults = {
             explicitArray: false,
             normalize: false,
             normalizeTags: false,
             trim: true,
         };
-        app.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
+        webhookApp.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         // Add health check route
-        this.router.get('/health', (_req, res) => {
+        this.webhookRouter.get('/health', (_req, res) => {
+            res.json({ status: 'healthy' });
+        });
+        this.cronRouter.get('/health', (_req, res) => {
             res.json({ status: 'healthy' });
         });
-        // Add router to the application
-        app.use(this.router);
+        // Add router to the webhookApplication
+        webhookApp.use(this.webhookRouter);
+        cronApp.use(this.cronRouter);
         // Start all registered workflows
         for (const registration of this.registeredWorkflows) {
             Deno.addSignalListener('SIGINT', registration.sigintListener);
@@ -293,9 +322,12 @@ class MemoryInterpreter {
             });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
-        this.server = app.listen(port, () => {
+        this.webhookServer = webhookApp.listen(port, () => {
             this.log.info(`Express server listening on http://localhost:${port}`);
         });
+        this.cronServer = cronApp.listen(cronPort, () => {
+            this.log.info(`Cron server listening on http://localhost:${cronPort}`);
+        });
         this.shutdownServer = () => {
             if (this.isShuttingDown) {
                 return;
@@ -303,8 +335,11 @@ class MemoryInterpreter {
             this.isShuttingDown = true;
             this.log.info('Shutting down server');
             // Close the server
-            if (this.server) {
-                this.server.close();
+            if (this.webhookServer) {
+                this.webhookServer.close();
+            }
+            if (this.cronServer) {
+                this.cronServer.close();
             }
             // Remove all signal listeners
             for (const registration of this.registeredWorkflows) {
@@ -323,13 +358,28 @@ class MemoryInterpreter {
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
         return new Promise((resolve) => {
-            if (this.server) {
-                this.server.on('close', () => {
-                    this.log.info('Server closed');
+            let serversClosed = 0;
+            const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;
+            const checkResolve = () => {
+                serversClosed++;
+                if (serversClosed === totalServers) {
+                    this.log.info('All servers closed');
                     resolve();
+                }
+            };
+            if (this.webhookServer) {
+                this.webhookServer.on('close', () => {
+                    this.log.info('Webhook server closed');
+                    checkResolve();
+                });
+            }
+            if (this.cronServer) {
+                this.cronServer.on('close', () => {
+                    this.log.info('Cron server closed');
+                    checkResolve();
                 });
             }
-            else {
+            if (!this.webhookServer && !this.cronServer) {
                 resolve();
             }
         });
@@ -355,7 +405,7 @@ async function waitForReady(log) {
             const response = await fetch(readyCheckUrl);
             if (response.ok) {
                 log.info('MemoryInterpreter.waitForReady: network is ready');
-                break;
+                return Promise.resolve();
             }
         }
         catch (err) {

package/script/src/interpreter/memory/ObservableCompiler.d.ts

@@ -5,7 +5,7 @@ import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compil
 import { Trigger } from '../../dsl/Trigger.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ContextImpl } from '../../context/Context.js';
-import { ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
+import { ConfigReader, ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
 import { Router } from 'express';
 import { Tracer } from '@opentelemetry/api';
 export type CompilerContext = {
@@ -15,7 +15,9 @@ export type CompilerContext = {
     contextProvider: ContextProvider;
     roundTripperFactory: RoundTripperFactory;
     connectionProvider: ConnectionProvider;
-    router: Router;
+    webhookRouter: Router;
+    cronRouter: Router;
+    configReader: ConfigReader;
     cronRegistry: Map<string, string>;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;

package/script/src/interpreter/memory/ObservableCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}
+{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}

package/script/src/interpreter/memory/compilers/schedule.js

@@ -7,7 +7,7 @@ const ScheduleTrigger_js_1 = require("../../../dsl/triggers/ScheduleTrigger.js")
 function compileSchedule(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
         // Add HTTP endpoint for manual triggering
-        if (!ctx.router) {
+        if (!ctx.cronRouter) {
             throw new Error('Router not available in compiler context');
         }
         const projectId = Deno.env.get(constants_js_1.envVarProjectId) || 'example-service';
@@ -68,7 +68,7 @@ function compileSchedule(ctx, trigger, signal) {
                 res.status(500).json({ error: 'Failed to trigger schedule' });
             }
         }
-        ctx.router.post(`/cron/${trigger.id}`, async (req, res) => {
+        ctx.cronRouter.post(`/cron/${trigger.id}`, async (req, res) => {
             await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
                 span.setAttribute('task.id', trigger.id);
                 span.setAttribute('task.type', 'schedule');

package/script/src/interpreter/memory/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA+PxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAkD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAuRxE,CAAC"}

package/script/src/interpreter/memory/compilers/webhook.js

@@ -8,6 +8,7 @@ const cors_1 = __importDefault(require("cors"));
 const promises_1 = require("node:stream/promises");
 const rxjs_1 = require("rxjs");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
+const webhookmiddleware_js_1 = require("../../../dsl/http/versori/webhookmiddleware.js");
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,
     headers: {
@@ -72,28 +73,35 @@ exports.webhookCompiler = {
             },
         });
         return new rxjs_1.Observable((subscriber) => {
-            if (!ctx.router) {
+            if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
             }
             // add the webhook endpoint to the router
             ctx.log.info('webhook endpoint added:', { trigger });
             if (corsOptions) {
                 if (typeof corsOptions === 'boolean') {
-                    ctx.router.use((0, cors_1.default)());
+                    ctx.webhookRouter.use((0, cors_1.default)());
                 }
                 else {
-                    ctx.router.use((0, cors_1.default)(corsOptions));
+                    ctx.webhookRouter.use((0, cors_1.default)(corsOptions));
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.router.post(`/${trigger.id}`, async (req, res) => {
+            ctx.webhookRouter.post(`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
+                id: trigger.id,
+                connName: trigger.options.connection,
+                credentials: ctx.roundTripperFactory.credentials(),
+                cnxProvider: ctx.connectionProvider,
+                cfgReader: ctx.configReader,
+                log: ctx.log,
+            }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
-                    const activation = await ctx.connectionProvider.getStaticActivation();
-                    if (activation) {
-                        executionCtx = executionCtx.withActivation(activation);
+                    const staticActivation = res.locals.activation;
+                    if (staticActivation) {
+                        executionCtx = executionCtx.withActivation(staticActivation);
                     }
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
@@ -116,13 +124,24 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.router.post(`/${trigger.id}/users/:userId`, async (req, res) => {
+            ctx.webhookRouter.post(`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
+                id: trigger.id,
+                connName: trigger.options.connection,
+                credentials: ctx.roundTripperFactory.credentials(),
+                cnxProvider: ctx.connectionProvider,
+                cfgReader: ctx.configReader,
+                log: ctx.log,
+            }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.userId;
-                    const activations = await ctx.connectionProvider.getUserActivations(userId);
+                    const activation = res.locals.activation;
+                    const activations = [activation];
+                    // Right now we only support a user having one activation
+                    // so this will need changing when we support multiple activations per user
+                    // as will the middleware
                     if (!activations || activations.length === 0) {
                         res.status(404).json({
                             status: 'error',
@@ -163,13 +182,20 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.router.post(`/${trigger.id}/activations/:activationId`, async (req, res) => {
+            ctx.webhookRouter.post(`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
+                id: trigger.id,
+                connName: trigger.options.connection,
+                credentials: ctx.roundTripperFactory.credentials(),
+                cnxProvider: ctx.connectionProvider,
+                cfgReader: ctx.configReader,
+                log: ctx.log,
+            }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
-                    const activationId = req.params.activationId;
-                    const activation = await ctx.connectionProvider.getActivation(activationId);
+                    const activation = res.locals.activation;
+                    const activationId = activation.id || req.params.activationId;
                     if (!activation) {
                         // TODO report back actual errors
                         res.status(404).json({

package/script/src/observability/logging/ConsoleLogger.d.ts

@@ -9,6 +9,7 @@ export declare class ConsoleLogger implements Logger {
     fields: Record<string, unknown>;
     constructor(level: LogLevel, fields?: Record<string, unknown>);
     debug(message: string, fields?: Record<string, unknown>): void;
+    warn(message: string, fields?: Record<string, unknown>): void;
     info(message: string, fields?: Record<string, unknown>): void;
     error(message: string, err?: Error, fields?: Record<string, unknown>): void;
     error(message: string, fields?: Record<string, unknown>): void;

package/script/src/observability/logging/ConsoleLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAoM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}
+{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAqM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}

package/script/src/observability/logging/ConsoleLogger.js

@@ -181,6 +181,7 @@ log.setup({
 });
 const levelMap = {
     debug: log.getLevelByName('DEBUG'),
+    warn: log.getLevelByName('WARN'),
     info: log.getLevelByName('INFO'),
     error: log.getLevelByName('ERROR'),
 };
@@ -218,6 +219,12 @@ class ConsoleLogger {
             ...fields,
         });
     }
+    warn(message, fields) {
+        this.log.warn(message, {
+            ...this.fields,
+            ...fields,
+        });
+    }
     info(message, fields) {
         this.log.info(message, {
             ...this.fields,

package/script/src/observability/logging/Logger.d.ts

@@ -1,7 +1,8 @@
-export type LogLevel = 'debug' | 'info' | 'error';
+export type LogLevel = 'debug' | 'warn' | 'info' | 'error';
 export interface Logger {
     level: LogLevel;
     debug(message: string, fields?: Record<string, unknown>): void;
+    warn(message: string, fields?: Record<string, unknown>): void;
     info(message: string, fields?: Record<string, unknown>): void;
     error(message: string, fields?: Record<string, unknown>): void;
     child(fields: {

package/script/src/observability/logging/Logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/Logger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;AAElD,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,QAAQ,CAAC;IAEhB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IAEjD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;CACnC"}
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/Logger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE3D,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,QAAQ,CAAC;IAEhB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IAEjD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;CACnC"}