@versori/run 0.2.29 → 0.3.0-veta.1

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

@@ -15,15 +15,14 @@ const default_js_1 = require("../../dsl/http/default.js");
 const configloader_js_1 = require("../../dsl/http/versori/configloader.js");
 const constants_js_1 = require("../../dsl/http/versori/constants.js");
 const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
-const platformapi_js_1 = require("../../dsl/http/versori/platformapi.js");
-const proxyroundtripper_js_1 = require("../../dsl/http/versori/proxyroundtripper.js");
-const roundtripper_js_1 = require("../../dsl/http/versori/roundtripper.js");
 const Workflow_js_1 = require("../../dsl/Workflow.js");
 const Issues_js_1 = require("../../issues/Issues.js");
 const MemoryKeyValueProvider_js_1 = require("../../kv/memory/MemoryKeyValueProvider.js");
 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 PlatformApi_js_1 = require("../../services/platform/PlatformApi.js");
+const DirectConnectionFactory_js_1 = require("../../connection/DirectConnectionFactory.js");
 function getKVProvider(runLocal) {
     if (runLocal) {
         return Promise.resolve(new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider());
@@ -31,18 +30,11 @@ function getKVProvider(runLocal) {
     return NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv();
 }
 function getRoundTripperFactory(log, tracer, opts) {
-    if (opts && opts.runLocal) {
-        log.info('Running in local mode, using ProxyRoundTripperFactory');
-        return proxyroundtripper_js_1.ProxyRoundTripper.fromEnv(log);
-    }
-    if (!opts || !opts.skipVersoriCredentials) {
-        return roundtripper_js_1.VersoriCredentialsFactory.fromEnv(log, tracer);
-    }
     log.info('Running with default round tripper factory');
     return new default_js_1.DefaultRoundTripperFactory();
 }
 class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, roundTripperFactory, webhookRouter, cronRouter, cronRegistry, connectionProvider, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
+    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -61,12 +53,6 @@ class MemoryInterpreter {
             writable: true,
             value: contextProvider
         });
-        Object.defineProperty(this, "roundTripperFactory", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: roundTripperFactory
-        });
         Object.defineProperty(this, "webhookRouter", {
             enumerable: true,
             configurable: true,
@@ -85,11 +71,11 @@ class MemoryInterpreter {
             writable: true,
             value: cronRegistry
         });
-        Object.defineProperty(this, "connectionProvider", {
+        Object.defineProperty(this, "cnxFactory", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: connectionProvider
+            value: cnxFactory
         });
         Object.defineProperty(this, "cronProvider", {
             enumerable: true,
@@ -200,10 +186,14 @@ 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(), express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+            return new MemoryInterpreter(log, compiler, options.contextProvider, express_1.default.Router(), express_1.default.Router(), new Map(), DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log), cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
         }
         const kvp = await getKVProvider(runLocal);
-        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials(), issuesProvider), roundTripperFactory, express_1.default.Router(), express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+        const platformApi = PlatformApi_js_1.PlatformApiImpl.fromEnv();
+        const organisationId = Deno.env.get(constants_js_1.envVarOrgId) || 'development';
+        const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
+        const ctxProvider = new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials(), platformApi, organisationId, environmentId, issuesProvider);
+        return new MemoryInterpreter(log, compiler, ctxProvider, express_1.default.Router(), express_1.default.Router(), new Map(), DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log), cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -219,13 +209,14 @@ class MemoryInterpreter {
             log: this.log,
             tracer: this.tracer,
             contextProvider: this.contextProvider,
-            roundTripperFactory: this.roundTripperFactory,
+            cnxFactory: this.cnxFactory,
+            platformApi: PlatformApi_js_1.PlatformApiImpl.fromEnv(),
             webhookRouter: this.webhookRouter,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
-            connectionProvider: this.connectionProvider,
             configReader: this.cfgReader,
             issueProvider: this.issuesProvider,
+            organisationId: Deno.env.get(constants_js_1.envVarOrgId) || 'development',
         };
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);

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

@@ -1,26 +1,29 @@
 import { Tracer } from '@opentelemetry/api';
 import { Router } from 'express';
 import { Observable, OperatorFunction } from 'rxjs';
+import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextImpl } from '../../context/Context.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
-import { ConfigReader, ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
+import { ConfigReader } from '../../dsl/http/types.js';
 import { Task } from '../../dsl/Task.js';
 import { Trigger } from '../../dsl/Trigger.js';
 import { IssueAPI } from '../../issues/Issues.js';
 import { Logger } from '../../observability/logging/Logger.js';
+import { PlatformApi } from '../../services/platform/PlatformApi.js';
 import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
 export type CompilerContext = {
     compiler: ObservableCompiler;
     log: Logger;
     tracer: Tracer;
     contextProvider: ContextProvider;
-    roundTripperFactory: RoundTripperFactory;
-    connectionProvider: ConnectionProvider;
+    cnxFactory: DirectConnectionFactory;
+    platformApi: PlatformApi;
     webhookRouter: Router;
     cronRouter: Router;
     issueProvider: IssueAPI;
     configReader: ConfigReader;
     cronRegistry: Map<string, string>;
+    organisationId: string;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;
 export declare class ObservableCompiler {

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,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAS/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAI9F,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,aAAa,EAAE,QAAQ,CAAC;IACxB,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"}
+{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AASrE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAI9F,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,UAAU,EAAE,uBAAuB,CAAC;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,QAAQ,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;CAC1B,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/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA2DnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAOA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAiFnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}

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

@@ -3,29 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const DynamicFetchFactory_js_1 = require("../../../connection/DynamicFetchFactory.js");
+const StaticFetchFactory_js_1 = require("../../../connection/StaticFetchFactory.js");
 const HttpTask_js_1 = require("../../../dsl/tasks/HttpTask.js");
 function compileHttp(compilerCtx, task) {
-    const roundtripper = compilerCtx.roundTripperFactory.create(task.opts.connection);
-    const dynamicFetcher = compilerCtx.roundTripperFactory.createDynamic(task.opts.connection);
-    const baseUrlFetcher = compilerCtx.roundTripperFactory.baseUrlFetcher(task.opts.connection);
+    const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
+    let fetchFactory;
+    if (!cnxMap) {
+        compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
+        fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
+    }
+    else if (cnxMap.dynamic) {
+        fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
+    }
+    else {
+        fetchFactory = compilerCtx.platformApi.getConnection({
+            path: {
+                organisation_id: compilerCtx.organisationId,
+                connection_id: cnxMap.connId,
+            },
+            throwOnError: true,
+        })
+            .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
+            .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
+    }
     async function http(ctx) {
-        const _fetch = await roundtripper;
-        const _dynamicFetcher = await dynamicFetcher;
-        const httpContext = new HttpTask_js_1.HttpContextImpl(ctx, {}, baseUrlFetcher, _fetch, _dynamicFetcher);
+        const [fetch, baseUrl] = await fetchFactory.then(ff => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
+        const httpContext = new HttpTask_js_1.HttpContextImpl(ctx, {}, fetch, baseUrl);
         const result = await task.fn(httpContext);
         return ctx.withData(result);
     }
     return (src) => src.pipe((0, operators_1.tap)({
         complete: () => compilerCtx.log.debug('http.complete'),
-    }), (0, rxjs_1.mergeMap)(async (ctx) => {
+    }), (0, rxjs_1.mergeMap)((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('task.type', 'http');
             span.setAttribute('execution.id', ctx.executionId);
             span.setAttribute('connection.name', task.opts.connection);
             try {
-                let result = await http(ctx);
-                return result;
+                return await http(ctx);
             }
             catch (error) {
                 if (error instanceof Error) {

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

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA0H7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwI7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

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

@@ -14,13 +14,29 @@ function compileSchedule(ctx, trigger, signal) {
         const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'example-environment';
         const environmentName = Deno.env.get(constants_js_1.envVarEnvironmentName) || 'example-environment';
         const orgId = Deno.env.get(constants_js_1.envVarOrgId) || 'example-org';
-        const client = ctx.connectionProvider;
+        const client = ctx.platformApi;
         ctx.cronRegistry.set(trigger.id, trigger.schedule);
-        async function handleSchedule(req, res, span) {
+        async function handleSchedule(_req, res, span) {
             try {
                 if (trigger.activationPredicate === undefined) {
-                    const activation = await client.getStaticActivation();
-                    const executionCtx = ctx.contextProvider.create({}, { activation });
+                    const { data: activation } = await client.listActivations({
+                        path: {
+                            organisation_id: ctx.organisationId,
+                            environment_id: environmentId,
+                        },
+                        query: {
+                            static: true,
+                        },
+                        throwOnError: false,
+                    });
+                    if (!activation || activation.length === 0) {
+                        res.status(412).json({
+                            status: 'error',
+                            message: 'No activation found',
+                        });
+                        return;
+                    }
+                    const executionCtx = ctx.contextProvider.create(activation[0], {});
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -34,25 +50,25 @@ function compileSchedule(ctx, trigger, signal) {
                     });
                     return;
                 }
-                const activations = await client.listActivations();
+                const { data: activations } = await client.listActivations({
+                    path: {
+                        organisation_id: ctx.organisationId,
+                        environment_id: environmentId,
+                    },
+                    query: {
+                        static: false,
+                    },
+                    throwOnError: false,
+                });
                 if (!activations || activations.length === 0) {
-                    const executionCtx = ctx.contextProvider.create({}, undefined);
-                    span.setAttribute('execution.id', executionCtx.executionId);
-                    executionCtx.log.info('no activations found, continuing');
-                    try {
-                        subscriber.next(executionCtx);
-                    }
-                    catch (error) {
-                        executionCtx.log.error('execution error inside schedule', { error });
-                    }
-                    res.status(200).json({
-                        status: 'triggered',
-                        executionId: executionCtx.executionId,
+                    ctx.log.info('no activations found, continuing');
+                    res.status(204).json({
+                        status: 'no-activations',
                     });
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create({}, { activation });
+                    const executionCtx = ctx.contextProvider.create(activation, {});
                     try {
                         subscriber.next(executionCtx);
                     }

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":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2SxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAwSxE,CAAC"}

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

@@ -10,6 +10,7 @@ const promises_1 = require("node:stream/promises");
 const rxjs_1 = require("rxjs");
 const webhookmiddleware_js_1 = require("../../../dsl/http/versori/webhookmiddleware.js");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
+const constants_js_1 = require("../../../internal/constants.js");
 const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
 const xml2jsDefaults = {
     explicitArray: false,
@@ -113,20 +114,19 @@ exports.webhookCompiler = {
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
             ctx.webhookRouter[method](`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
                 id: trigger.id,
+                organisationId: ctx.organisationId,
+                environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',
                 connName: trigger.options.connection,
-                credentials: ctx.roundTripperFactory.credentials(),
-                cnxProvider: ctx.connectionProvider,
+                platformApi: ctx.platformApi,
+                cnxFactory: ctx.cnxFactory,
                 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(req, res));
                     const staticActivation = res.locals.activation;
-                    if (staticActivation) {
-                        executionCtx = executionCtx.withActivation(staticActivation);
-                    }
+                    const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -151,8 +151,10 @@ exports.webhookCompiler = {
             ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
-                credentials: ctx.roundTripperFactory.credentials(),
-                cnxProvider: ctx.connectionProvider,
+                organisationId: ctx.organisationId,
+                environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',
+                platformApi: ctx.platformApi,
+                cnxFactory: ctx.cnxFactory,
                 cfgReader: ctx.configReader,
                 log: ctx.log,
             }), async (req, res) => {
@@ -161,12 +163,11 @@ exports.webhookCompiler = {
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.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) {
+                    const activation = res.locals.activation;
+                    if (!activation) {
                         res.status(404).json({
                             status: 'error',
                             message: `No activations found for user: ${userId}`,
@@ -176,24 +177,21 @@ exports.webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
+                    const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
-                    activations.forEach((activation) => {
-                        const activationCtx = executionCtx.withActivation(activation);
-                        try {
-                            subscriber.next(activationCtx);
-                        }
-                        catch (error) {
-                            activationCtx.log.error('webhook execution error', {
-                                error: JSON.stringify(error),
-                            });
-                            errors.push({
-                                activationId: activation.id,
-                                error,
-                            });
-                        }
-                    });
+                    try {
+                        subscriber.next(executionCtx);
+                    }
+                    catch (error) {
+                        executionCtx.log.error('webhook execution error', {
+                            error: JSON.stringify(error),
+                        });
+                        errors.push({
+                            activationId: activation.id,
+                            error,
+                        });
+                    }
                     if (isAsync) {
                         if (errors.length === 0) {
                             sendResponse(res, onSuccess(executionCtx));
@@ -208,9 +206,11 @@ exports.webhookCompiler = {
             // this endpoint will trigger the workflow only for the activation given by its ID
             ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
                 id: trigger.id,
+                organisationId: ctx.organisationId,
+                environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',
                 connName: trigger.options.connection,
-                credentials: ctx.roundTripperFactory.credentials(),
-                cnxProvider: ctx.connectionProvider,
+                platformApi: ctx.platformApi,
+                cnxFactory: ctx.cnxFactory,
                 cfgReader: ctx.configReader,
                 log: ctx.log,
             }), async (req, res) => {
@@ -219,7 +219,7 @@ exports.webhookCompiler = {
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
                     const activation = res.locals.activation;
-                    const activationId = activation.id || req.params.activationId;
+                    const activationId = activation?.id ?? req.params.activationId;
                     if (!activation) {
                         // TODO report back actual errors
                         res.status(404).json({
@@ -231,10 +231,7 @@ exports.webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const activationCtx = ctx.contextProvider.create(req.body, {
-                        ...ctxOptionsFn(req, res),
-                        activation,
-                    });
+                    const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', activationCtx.executionId);
                     try {
                         subscriber.next(activationCtx);

package/script/src/services/credentials/credential-v1alpha1.d.ts

@@ -0,0 +1,4 @@
+export * from './generated/versori/credential/v1alpha1/common_pb.js';
+export * from './generated/versori/credential/v1alpha1/credential_pb.js';
+export * from './generated/versori/credential/v1alpha1/credential_service_pb.js';
+//# sourceMappingURL=credential-v1alpha1.d.ts.map

package/script/src/services/credentials/credential-v1alpha1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"credential-v1alpha1.d.ts","sourceRoot":"","sources":["../../../../src/src/services/credentials/credential-v1alpha1.ts"],"names":[],"mappings":"AAAA,cAAc,sDAAsD,CAAC;AACrE,cAAc,0DAA0D,CAAC;AACzE,cAAc,kEAAkE,CAAC"}

package/script/src/services/credentials/credential-v1alpha1.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./generated/versori/credential/v1alpha1/common_pb.js"), exports);
+__exportStar(require("./generated/versori/credential/v1alpha1/credential_pb.js"), exports);
+__exportStar(require("./generated/versori/credential/v1alpha1/credential_service_pb.js"), exports);

package/script/src/services/credentials/generated/versori/credential/oauth1/v1/authorization_metadata_pb.d.ts

@@ -0,0 +1,119 @@
+import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import type { Message } from "@bufbuild/protobuf";
+/**
+ * Describes the file versori/credential/oauth1/v1/authorization_metadata.proto.
+ */
+export declare const file_versori_credential_oauth1_v1_authorization_metadata: GenFile;
+/**
+ * AuthorizationMetadata provides the necessary information to build an authenticated request to a
+ * service using OAuth 1.0.
+ *
+ * @generated from message versori.credential.oauth1.v1.AuthorizationMetadata
+ */
+export type AuthorizationMetadata = Message<"versori.credential.oauth1.v1.AuthorizationMetadata"> & {
+    /**
+     * AuthorizationParams is a URL-encoded string of parameters to be included in a request in order
+     * to authenticate with the service.
+     *
+     * This string should be decoded and combined with other parameters for the request as per
+     * [RFC-5849 §3.4.1.3](https://datatracker.ietf.org/doc/html/rfc5849#section-3.4.1.3), and signed
+     * as per [RFC-5849 §3.4](https://datatracker.ietf.org/doc/html/rfc5849#section-3.4).
+     *
+     * @generated from field: string authorization_params = 1;
+     */
+    authorizationParams: string;
+    /**
+     * ParameterTransmission defines how the authorization parameters should be transmitted to the
+     * server.
+     *
+     * @generated from field: versori.credential.oauth1.v1.AuthorizationMetadata.ParameterTransmission parameter_transmission = 3;
+     */
+    parameterTransmission: AuthorizationMetadata_ParameterTransmission;
+    /**
+     * ConsumerKey is the identifier for the OAuth1 client.
+     *
+     * @generated from field: string consumer_key = 4;
+     */
+    consumerKey: string;
+    /**
+     * ConsumerSecret is the credential for the OAuth1 client.
+     *
+     * @generated from field: string consumer_secret = 5;
+     */
+    consumerSecret: string;
+    /**
+     * OAuthToken is the token used to authenticate requests.
+     *
+     * @generated from field: string oauth_token = 6;
+     */
+    oauthToken: string;
+    /**
+     * OAuthTokenSecret is the secret used to sign requests.
+     *
+     * @generated from field: string oauth_token_secret = 7;
+     */
+    oauthTokenSecret: string;
+    /**
+     * SignatureMethod is the method used to sign authenticated requests.
+     *
+     * @generated from field: versori.credential.oauth1.v1.AuthorizationMetadata.SignatureMethod signature_method = 8;
+     */
+    signatureMethod: AuthorizationMetadata_SignatureMethod;
+};
+/**
+ * Describes the message versori.credential.oauth1.v1.AuthorizationMetadata.
+ * Use `create(AuthorizationMetadataSchema)` to create a new message.
+ */
+export declare const AuthorizationMetadataSchema: GenMessage<AuthorizationMetadata>;
+/**
+ * @generated from enum versori.credential.oauth1.v1.AuthorizationMetadata.SignatureMethod
+ */
+export declare enum AuthorizationMetadata_SignatureMethod {
+    /**
+     * @generated from enum value: SIGNATURE_METHOD_UNKNOWN = 0;
+     */
+    UNKNOWN = 0,
+    /**
+     * @generated from enum value: SIGNATURE_METHOD_PLAINTEXT = 1;
+     */
+    PLAINTEXT = 1,
+    /**
+     * @generated from enum value: SIGNATURE_METHOD_HMAC_SHA1 = 2;
+     */
+    HMAC_SHA1 = 2,
+    /**
+     * @generated from enum value: SIGNATURE_METHOD_HMAC_SHA256 = 3;
+     */
+    HMAC_SHA256 = 3
+}
+/**
+ * Describes the enum versori.credential.oauth1.v1.AuthorizationMetadata.SignatureMethod.
+ */
+export declare const AuthorizationMetadata_SignatureMethodSchema: GenEnum<AuthorizationMetadata_SignatureMethod>;
+/**
+ * ParameterTransmission defines the possible values for how to transmit the authorization
+ * parameters to the server. See
+ * [RFC-5849 §3.5](https://datatracker.ietf.org/doc/html/rfc5849#section-3.5) for more
+ * information.
+ *
+ * @generated from enum versori.credential.oauth1.v1.AuthorizationMetadata.ParameterTransmission
+ */
+export declare enum AuthorizationMetadata_ParameterTransmission {
+    /**
+     * @generated from enum value: AUTH_STYLE_AUTHORIZATION_HEADER = 0;
+     */
+    AUTH_STYLE_AUTHORIZATION_HEADER = 0,
+    /**
+     * @generated from enum value: AUTH_STYLE_FORM = 1;
+     */
+    AUTH_STYLE_FORM = 1,
+    /**
+     * @generated from enum value: AUTH_STYLE_QUERY = 2;
+     */
+    AUTH_STYLE_QUERY = 2
+}
+/**
+ * Describes the enum versori.credential.oauth1.v1.AuthorizationMetadata.ParameterTransmission.
+ */
+export declare const AuthorizationMetadata_ParameterTransmissionSchema: GenEnum<AuthorizationMetadata_ParameterTransmission>;
+//# sourceMappingURL=authorization_metadata_pb.d.ts.map

package/script/src/services/credentials/generated/versori/credential/oauth1/v1/authorization_metadata_pb.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorization_metadata_pb.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/src/services/credentials/generated/versori/credential/oauth1/v1/authorization_metadata_pb.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAGjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,eAAO,MAAM,wDAAwD,EAAE,OACmuC,CAAC;AAE3yC;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,oDAAoD,CAAC,GAAG;IAClG;;;;;;;;;OASG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;;OAKG;IACH,qBAAqB,EAAE,2CAA2C,CAAC;IAEnE;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,eAAe,EAAE,qCAAqC,CAAC;CACxD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,EAAE,UAAU,CAAC,qBAAqB,CACA,CAAC;AAE3E;;GAEG;AACH,oBAAY,qCAAqC;IAC/C;;OAEG;IACH,OAAO,IAAI;IAEX;;OAEG;IACH,SAAS,IAAI;IAEb;;OAEG;IACH,SAAS,IAAI;IAEb;;OAEG;IACH,WAAW,IAAI;CAChB;AAED;;GAEG;AACH,eAAO,MAAM,2CAA2C,EAAE,OAAO,CAAC,qCAAqC,CAC7B,CAAC;AAE3E;;;;;;;GAOG;AACH,oBAAY,2CAA2C;IACrD;;OAEG;IACH,+BAA+B,IAAI;IAEnC;;OAEG;IACH,eAAe,IAAI;IAEnB;;OAEG;IACH,gBAAgB,IAAI;CACrB;AAED;;GAEG;AACH,eAAO,MAAM,iDAAiD,EAAE,OAAO,CAAC,2CAA2C,CACzC,CAAC"}