@versori/run 0.1.0-alpha.8 → 0.2.0-alpha.1

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

@@ -1,34 +1,10 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformAPIClient = void 0;
-const dntShim = __importStar(require("../../../../_dnt.shims.js"));
 const constants_js_1 = require("./constants.js");
 const internalauth_js_1 = require("./internalauth.js");
 class PlatformAPIClient {
-    constructor(baseUrl, orgId, envId, cache = {}) {
+    constructor(baseUrl, orgId, envId) {
         Object.defineProperty(this, "baseUrl", {
             enumerable: true,
             configurable: true,
@@ -53,31 +29,21 @@ class PlatformAPIClient {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "cache", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.baseUrl = baseUrl;
         this.orgId = orgId;
-        this.cache = cache;
         this.envId = envId;
         this.internalAuth = new internalauth_js_1.InternalAuth();
     }
     static fromEnv() {
-        const baseUrl = dntShim.Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
-        const orgId = dntShim.Deno.env.get(constants_js_1.envVarOrgId);
-        const envId = dntShim.Deno.env.get(constants_js_1.envVarEnvId);
+        const baseUrl = Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
+        const orgId = Deno.env.get(constants_js_1.envVarOrgId);
+        const envId = Deno.env.get(constants_js_1.envVarEnvId);
         if (!baseUrl || !orgId || !envId) {
             throw new Error('Missing required environment variables');
         }
         return new PlatformAPIClient(baseUrl, orgId, envId);
     }
     async getStaticConnection(cnxId) {
-        if (this.cache[cnxId]) {
-            return this.cache[cnxId];
-        }
         const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/connections/${cnxId}`, {
             headers: {
                 'x-versori-internal-token': await this.internalAuth.getToken(),
@@ -87,11 +53,34 @@ class PlatformAPIClient {
             return undefined;
         }
         const result = (await resp.json());
-        this.cache[cnxId] = result;
         return result;
     }
-    async getEndUserConnection(templateId, userId) {
-        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environment-systems/${templateId}/users/${userId}`, {
+    async getUserActivations(userId) {
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environment/${this.envId}/users/${userId}/activations`, {
+            headers: {
+                'x-versori-internal-token': await this.internalAuth.getToken(),
+            },
+        });
+        if (!resp.ok) {
+            return [];
+        }
+        const result = (await resp.json());
+        return result;
+    }
+    async getActivation(activationId) {
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environments/${this.envId}/activations/${activationId}`, {
+            headers: {
+                'x-versori-internal-token': await this.internalAuth.getToken(),
+            },
+        });
+        if (!resp.ok) {
+            return undefined;
+        }
+        const result = (await resp.json());
+        return result;
+    }
+    async getActivationConnection(templateId, activationId) {
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environment-systems/${templateId}/activations/${activationId}`, {
             headers: {
                 'x-versori-internal-token': await this.internalAuth.getToken(),
             },

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

@@ -20,14 +20,13 @@ export declare class VersoriRoundTripperFactory implements RoundTripperFactory {
     private platformAPIClient;
     private versoriCfg;
     private log;
-    private readonly defaultStatic;
     private readonly defaultDynamic;
     constructor(credsClient: VersoriCredentialClient, platformAPIClient: PlatformAPIClient, logger: Logger);
     static fromEnv(logger?: Logger): VersoriRoundTripperFactory;
     private changeRequestInit;
     private changeBaseUrl;
-    create(connName: string, fn?: typeof fetch): Promise<typeof fetch>;
-    createDynamic(templateName: string, fn?: typeof fetch): Promise<DynamicFetcher>;
+    create(connName: string, fn?: typeof fetch): Promise<typeof fetch | undefined>;
+    createDynamic(templateName: string, fn?: typeof fetch): Promise<DynamicFetcher | undefined>;
     private getConnectionID;
     private getTemplateID;
     private apiKeyFetcher;

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

@@ -1 +1 @@
-{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAoB,MAAM,aAAa,CAAC;AAEhG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AASlE,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAK5B;IAEF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAM7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA0B3D,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,aAAa;IAmBf,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAE,OAAO,KAAwB,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;IAyBpF,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,CAAC;IA0D1B,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,aAAa;YAYP,aAAa;YAoDb,gBAAgB;YA0BhB,kBAAkB;YAiClB,aAAa;CAkD9B"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AASlE,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA0B3D,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,aAAa;IAsBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IA4B9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA4CtC,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,aAAa;YAUP,aAAa;YAoDb,gBAAgB;YAmChB,kBAAkB;YAiClB,aAAa;CAkD9B"}

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

@@ -1,33 +1,8 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersoriRoundTripperFactory = void 0;
-const dntShim = __importStar(require("../../../../_dnt.shims.js"));
 const configloader_js_1 = require("./configloader.js");
 const mod_js_1 = require("./credentials/mod.js");
-const lru_cache_1 = require("lru-cache");
 const platformapi_js_1 = require("./platformapi.js");
 const mod_js_2 = require("../../../observability/mod.js");
 const constants_js_1 = require("./constants.js");
@@ -69,24 +44,12 @@ class VersoriRoundTripperFactory {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "defaultStatic", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (msg, values) => {
-                return (input, init) => {
-                    this.log.error(msg, values);
-                    return globalThis.fetch(input, init);
-                };
-            }
-        });
         Object.defineProperty(this, "defaultDynamic", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: (msg, values) => {
-                return (userId, input, init) => {
-                    values['userId'] = userId;
+                return (_, input, init) => {
                     this.log.error(msg, values);
                     return globalThis.fetch(input, init);
                 };
@@ -98,10 +61,10 @@ class VersoriRoundTripperFactory {
         this.log = logger;
     }
     static fromEnv(logger) {
-        const credsBaseURL = dntShim.Deno.env.get(constants_js_1.envVarCredsBaseURL);
-        const platformApiBaseURL = dntShim.Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
-        const orgId = dntShim.Deno.env.get(constants_js_1.envVarOrgId);
-        const envId = dntShim.Deno.env.get(constants_js_1.envVarEnvId);
+        const credsBaseURL = Deno.env.get(constants_js_1.envVarCredsBaseURL);
+        const platformApiBaseURL = Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
+        const orgId = Deno.env.get(constants_js_1.envVarOrgId);
+        const envId = Deno.env.get(constants_js_1.envVarEnvId);
         if (!orgId || !envId || !platformApiBaseURL || !credsBaseURL) {
             const missingVars = [];
             if (!orgId)
@@ -114,7 +77,7 @@ class VersoriRoundTripperFactory {
                 missingVars.push(constants_js_1.envVarCredsBaseURL);
             throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
         }
-        const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId, {});
+        const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId);
         const tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
         const log = logger || new mod_js_2.ConsoleLogger('debug');
         return new VersoriRoundTripperFactory(tokenClient, pAPIClient, log);
@@ -122,10 +85,12 @@ class VersoriRoundTripperFactory {
     // takes the info and modifies the url using changeBaseUrl if necessary
     changeRequestInit(info, conn) {
         if (typeof info === 'string') {
+            // should be this most of the time assuming we're using pathnames
             return this.changeBaseUrl(info, conn);
         }
         else if (info instanceof URL) {
-            return this.changeBaseUrl(info.toString(), conn);
+            const newUrl = new URL(this.changeBaseUrl(info.toString(), conn));
+            return newUrl;
         }
         else if (info instanceof Request) {
             const url = this.changeBaseUrl(info.url, conn);
@@ -133,68 +98,61 @@ class VersoriRoundTripperFactory {
         }
         return info;
     }
-    changeBaseUrl(url, conn) {
-        const baseUrl = conn.baseUrl;
-        if (!baseUrl) {
-            return url;
+    changeBaseUrl(pathname, conn) {
+        const connBaseURL = conn.baseUrl;
+        // if the connection has no baseUrl set, but the pathname is a valid URL, return it as is
+        if (!connBaseURL && isValidURL(pathname)) {
+            return pathname;
         }
-        const urlObj = new URL(url);
-        const baseUrlObj = new URL(baseUrl);
-        urlObj.hostname = baseUrlObj.hostname;
-        this.log.debug('Changing base URL', {
-            originalUrl: url,
-            newUrl: urlObj.toString(),
-        });
-        return url.toString();
+        const connBaseURLObj = new URL(connBaseURL);
+        let _pathname = pathname;
+        if (isValidURL(pathname)) {
+            const pathnameObj = new URL(pathname);
+            _pathname = pathnameObj.pathname;
+        }
+        const newURL = new URL(_pathname, connBaseURLObj.origin);
+        return newURL.toString();
     }
+    // TODO: Currently if the connection is edited, then the fetcher will not be updated.
     async create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
         const conn = await this.platformAPIClient.getStaticConnection(cnxId);
         if (!conn) {
-            return this.defaultStatic('Connection not found for static, using default fetch', {
-                connName: connName,
-            });
+            return undefined;
         }
+        const _fn = (input, init) => {
+            const _input = this.changeRequestInit(input, conn);
+            return fn(_input, init);
+        };
         switch (conn.credentials[0].authSchemeConfig.type) {
             case 'api-key':
-                return this.apiKeyFetcher(conn, fn);
+                return this.apiKeyFetcher(conn, _fn);
             case 'basic-auth':
-                return this.basicAuthFetcher(conn, fn);
+                return this.basicAuthFetcher(conn, _fn);
             case 'jwt-bearer':
-                return this.bearerTokenFetcher(conn, fn);
+                return this.bearerTokenFetcher(conn, _fn);
             case 'oauth2':
-                return this.oauth2Fetcher(conn, fn);
+                return this.oauth2Fetcher(conn, _fn);
             default:
                 return fn;
         }
     }
     async createDynamic(templateName, fn = globalThis.fetch) {
-        const lruCacheOptions = {
-            max: 100,
-        };
-        const cache = new lru_cache_1.LRUCache(lruCacheOptions);
         const template = this.getTemplateID(templateName);
         if (!template) {
-            return this.defaultDynamic('Template not found for dynamic, using default fetch', {
+            this.log.info('Template not found in config, could be a static connection', {
                 templateName: templateName,
             });
+            return undefined;
         }
-        const _fn = async (userId, input, init) => {
-            let conn = undefined;
-            if (cache.has(userId)) {
-                conn = cache.get(userId);
-            }
-            else {
-                conn = await this.platformAPIClient.getEndUserConnection(template, userId);
-                if (conn) {
-                    cache.set(userId, conn);
-                }
-            }
+        const _fn = async (activation, input, init) => {
+            const conn = await this.platformAPIClient.getActivationConnection(template, activation.id);
             if (!conn) {
                 return this.defaultDynamic('Connection not found for user, using default fetch', {
                     templateName: templateName,
-                    userId: userId,
-                })(userId, input, init);
+                    userId: activation.user.id,
+                    activationId: activation.id,
+                })(activation, input, init);
             }
             const _input = this.changeRequestInit(input, conn);
             switch (conn.credentials[0].authSchemeConfig.type) {
@@ -213,17 +171,14 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     getConnectionID(connName) {
-        // Note that this is till very up in the air whether we are going to store the connection ID in the config
-        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name === connName);
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name.toLowerCase() === connName.toLowerCase());
         if (!conn || !conn.connId) {
             return '';
         }
         return conn.connId;
     }
     getTemplateID(templateName) {
-        // see above, also I'm assuming for now that the template id is simply the same as the connection id
-        // but there is another flag that denotes it as dynamic??
-        const template = this.versoriCfg.mappings.find((c) => c.dynamic && c.name === templateName);
+        const template = this.versoriCfg.mappings.find((c) => c.dynamic && c.name.toLowerCase() === templateName.toLowerCase());
         if (!template || !template.templateId) {
             return '';
         }
@@ -290,7 +245,18 @@ class VersoriRoundTripperFactory {
             if (!init.headers) {
                 init.headers = new Headers();
             }
-            init.headers.set('Authorization', `Basic ${token}`);
+            if (init.headers instanceof Headers) {
+                init.headers.set('Authorization', `Basic ${token}`);
+            }
+            else if (init.headers instanceof Array) {
+                init.headers.push(['Authorization', `Basic ${token}`]);
+            }
+            else {
+                init.headers = {
+                    ...init.headers,
+                    ['Authorization']: `Basic ${token}`,
+                };
+            }
             return fn(input, init);
         };
         return _fn;
@@ -370,3 +336,12 @@ class VersoriRoundTripperFactory {
     }
 }
 exports.VersoriRoundTripperFactory = VersoriRoundTripperFactory;
+function isValidURL(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (_) {
+        return false;
+    }
+}

package/script/src/dsl/tasks/HttpTask.d.ts

@@ -1,6 +1,5 @@
-import { Context } from '../../context/Context.js';
-import { Logger } from '../../mod.js';
-import { Activation, DynamicFetcher } from '../http/types.js';
+import { Context, ContextImpl } from '../../context/Context.js';
+import { DynamicFetcher } from '../http/types.js';
 import { ArrayTask, Task, Taskable, TaskType } from '../Task.js';
 export interface HttpContext<Data, PageParams = undefined> extends Context<Data> {
     fetch: typeof fetch;
@@ -29,17 +28,12 @@ export declare class HttpTaskImpl<In, Out, PageParams> implements Task<In, Out>
     unpack<NextOut>(mapper: (data: Out) => NextOut[]): ArrayTask<In, NextOut>;
     clone(): Task<In, Out>;
 }
-export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, PageParams> {
-    log: Logger;
-    startTime: Date;
-    executionId: string;
-    activation?: Activation;
-    data: D;
+export declare class HttpContextImpl<D, PageParams> extends ContextImpl<D> implements HttpContext<D, PageParams> {
     connectionVariables: Record<string, any>;
     pageParams?: PageParams;
     private dynamicFetcher?;
-    private staticFetcher;
-    constructor(ctx: Context<D>, connectionVars: Record<string, any>, staticFetcher: typeof fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
+    private staticFetcher?;
+    constructor(ctx: ContextImpl<D, any>, connectionVars: Record<string, any>, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
     get fetch(): typeof globalThis.fetch;
     nextPage(nextParams: PageParams): Promise<void>;
 }

package/script/src/dsl/tasks/HttpTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"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"}

package/script/src/dsl/tasks/HttpTask.js

@@ -3,6 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpContextImpl = exports.HttpTaskImpl = void 0;
 exports.http = http;
+const Context_js_1 = require("../../context/Context.js");
 const ensureTask_js_1 = require("../ensureTask.js");
 const types_js_1 = require("../http/types.js");
 const Task_js_1 = require("../Task.js");
@@ -61,38 +62,11 @@ class HttpTaskImpl {
 }
 exports.HttpTaskImpl = HttpTaskImpl;
 _a = Task_js_1.TaskType;
-class HttpContextImpl {
+class HttpContextImpl extends Context_js_1.ContextImpl {
     constructor(ctx, connectionVars, staticFetcher, dynamicFetcher, pageParams) {
-        Object.defineProperty(this, "log", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "startTime", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "executionId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "activation", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        // We need to cast ctx to InternalContext to access kvp
+        const internalCtx = ctx;
+        super(ctx.log, internalCtx.kvp, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,
@@ -104,7 +78,8 @@ class HttpContextImpl {
             configurable: true,
             writable: true,
             value: void 0
-        }); // TODO: Implement page params
+        });
+        // ideally only one of these should be set to a value
         Object.defineProperty(this, "dynamicFetcher", {
             enumerable: true,
             configurable: true,
@@ -117,26 +92,14 @@ class HttpContextImpl {
             writable: true,
             value: void 0
         });
-        this.log = ctx.log;
-        this.executionId = ctx.executionId;
-        this.startTime = ctx.startTime;
-        this.activation = ctx.activation;
-        this.data = ctx.data;
         this.pageParams = pageParams;
         this.connectionVariables = connectionVars;
         this.dynamicFetcher = dynamicFetcher;
         this.staticFetcher = staticFetcher;
     }
     get fetch() {
-        // TODO: this will need some work to make dynamic and static connections work in tandem.
-        let fetch;
-        if (this.dynamicFetcher && this.activation) {
-            fetch = (0, types_js_1.wrapDynamicFetcher)(this.dynamicFetcher, this.activation.id);
-        }
-        else {
-            fetch = this.staticFetcher;
-        }
-        return fetch;
+        // This is maybe hard to read.
+        return this.dynamicFetcher && this.activation ? (0, types_js_1.wrapDynamicFetcher)(this.dynamicFetcher, this.activation) : this.staticFetcher ?? globalThis.fetch;
     }
     async nextPage(nextParams) {
         throw new Error("Method not implemented.");

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

@@ -1,13 +1,55 @@
+import { Context } from '../../context/Context.js';
 import { Taskable } from '../Task.js';
 import { Trigger, TriggerType } from '../Trigger.js';
 import { Workflow } from '../Workflow.js';
 export type WebhookData = Record<string, never>;
+export type WebhookCorsOptions = boolean | {
+    origin: string;
+    methods: string[];
+    allowedHeaders: string[];
+    exposedHeaders: string[];
+    credentials: boolean;
+};
+export type WebhookResponseOptions = {
+    /**
+     * Mode determines how the response is sent to the client. The response can be customized by
+     * the `onSuccess` and `onError` functions, which have sensible defaults for each mode.
+     *
+     * - `sync`: The response is sent at the end of the workflow.
+     * - `async`: The response is sent immediately after the trigger is activated.
+     *
+     * @default 'sync'
+     */
+    mode?: 'sync' | 'async';
+    /**
+     * Function that returns a response for a successful trigger activation.
+     *
+     * Defaults to a 202 Accepted response for 'async' mode, and a 200 OK response for 'sync' mode.
+     *
+     * @param ctx The current context of the workflow, containing data from the final step.
+     * @returns A response to send to the client.
+     */
+    onSuccess?: <T>(ctx: Context<T>) => Response;
+    /**
+     * Function that returns a response for a failed trigger activation.
+     *
+     * Defaults to a 500 Internal Server Error response for both modes.
+     *
+     * @param ctx The current context of the workflow, containing data from the final step.
+     * @returns A response to send to the client.
+     */
+    onError?: <T>(ctx: Context<T>) => Response;
+};
+export type WebhookOptions = {
+    cors?: WebhookCorsOptions;
+    response?: WebhookResponseOptions;
+};
 export declare class WebhookTrigger implements Trigger<WebhookData> {
     id: string;
+    options: WebhookOptions;
     [TriggerType]: string;
-    constructor(id: string);
+    constructor(id: string, options?: WebhookOptions);
     then<OO>(task: Taskable<WebhookData, OO>): Workflow<OO>;
-    catch<OO>(error: any): Workflow<OO>;
 }
-export declare function webhook(id: string): Workflow<WebhookData>;
+export declare function webhook(id: string, options?: WebhookOptions): Trigger<WebhookData>;
 //# sourceMappingURL=WebhookTrigger.d.ts.map

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":"AACA,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,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IAEX,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAGtB,EAAE,EAAE,MAAM;IAItB,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;IAIvD,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC;CAGtC;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,CAEzD"}
+{"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,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACxB,CAAA;AAED,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,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACrC,CAAA;AAED,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,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAElF"}

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

@@ -7,13 +7,19 @@ const ensureTask_js_1 = require("../ensureTask.js");
 const Trigger_js_1 = require("../Trigger.js");
 const Workflow_js_1 = require("../Workflow.js");
 class WebhookTrigger {
-    constructor(id) {
+    constructor(id, options = {}) {
         Object.defineProperty(this, "id", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "options", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, _a, {
             enumerable: true,
             configurable: true,
@@ -21,16 +27,14 @@ class WebhookTrigger {
             value: 'webhook'
         });
         this.id = id;
+        this.options = options;
     }
     then(task) {
         return new Workflow_js_1.WorkflowImpl(this, (0, ensureTask_js_1.ensureTask)(task));
     }
-    catch(error) {
-        return this;
-    }
 }
 exports.WebhookTrigger = WebhookTrigger;
 _a = Trigger_js_1.TriggerType;
-function webhook(id) {
-    return new WebhookTrigger(id);
+function webhook(id, options) {
+    return new WebhookTrigger(id, options);
 }