@versori/run 0.1.0-alpha.9 → 0.2.0-alpha.10

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

@@ -1,34 +1,12 @@
 "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");
+const mod_js_1 = require("../../../mod.js");
+const activation_js_1 = require("./activation.js");
 class PlatformAPIClient {
-    constructor(baseUrl, orgId, envId) {
+    constructor(baseUrl, orgId, envId, log) {
         Object.defineProperty(this, "baseUrl", {
             enumerable: true,
             configurable: true,
@@ -53,19 +31,27 @@ class PlatformAPIClient {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "log", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.baseUrl = baseUrl;
         this.orgId = orgId;
         this.envId = envId;
         this.internalAuth = new internalauth_js_1.InternalAuth();
+        this.log = log;
     }
     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);
+        const log = new mod_js_1.ConsoleLogger('debug');
         if (!baseUrl || !orgId || !envId) {
             throw new Error('Missing required environment variables');
         }
-        return new PlatformAPIClient(baseUrl, orgId, envId);
+        return new PlatformAPIClient(baseUrl, orgId, envId, log);
     }
     async getStaticConnection(cnxId) {
         const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/connections/${cnxId}`, {
@@ -88,7 +74,10 @@ class PlatformAPIClient {
         if (!resp.ok) {
             return [];
         }
-        const result = (await resp.json());
+        const activations = (await resp.json());
+        const result = activations.map((act) => {
+            return new activation_js_1.ActivationImpl(act.id, act.user, this, this.log, act.dynamicVariables);
+        });
         return result;
     }
     async getActivation(activationId) {
@@ -100,8 +89,8 @@ class PlatformAPIClient {
         if (!resp.ok) {
             return undefined;
         }
-        const result = (await resp.json());
-        return result;
+        const act = (await resp.json());
+        return new activation_js_1.ActivationImpl(act.id, act.user, this, this.log, act.dynamicVariables);
     }
     async getActivationConnection(templateId, activationId) {
         const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environment-systems/${templateId}/activations/${activationId}`, {
@@ -124,8 +113,27 @@ class PlatformAPIClient {
         if (!resp.ok) {
             return [];
         }
-        const result = (await resp.json());
+        const activations = (await resp.json());
+        const result = activations.map((act) => {
+            return new activation_js_1.ActivationImpl(act.id, act.user, this, this.log, act.dynamicVariables);
+        });
         return result;
     }
+    async updateDynamicVariable(activationId, name, value) {
+        this.log.debug(`value is ${JSON.stringify(value)}`);
+        const resp = await fetch(`${this.baseUrl}/o/${this.orgId}/environments/${this.envId}/activations/${activationId}/variables/${name}`, {
+            method: 'PUT',
+            headers: {
+                'x-versori-internal-token': await this.internalAuth.getToken(),
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                value,
+            }),
+        });
+        if (!resp.ok) {
+            throw new Error(`Failed to update dynamic variable ${name}`);
+        }
+    }
 }
 exports.PlatformAPIClient = PlatformAPIClient;

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

@@ -2,7 +2,6 @@ import { DynamicFetcher, RoundTripperFactory } from '../types.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
 import { Logger } from '../../../observability/logging/Logger.js';
-export type RunningEnvironment = 'local' | 'versori' | 'staging';
 /**
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
  * This is the intended implementation for when projects/services are hosted on Versori infrastructure.
@@ -17,11 +16,12 @@ export type RunningEnvironment = 'local' | 'versori' | 'staging';
  */
 export declare class VersoriRoundTripperFactory implements RoundTripperFactory {
     private tokenClient;
+    private credsBaseURL;
     private platformAPIClient;
     private versoriCfg;
     private log;
     private readonly defaultDynamic;
-    constructor(credsClient: VersoriCredentialClient, platformAPIClient: PlatformAPIClient, logger: Logger);
+    constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger);
     static fromEnv(logger?: Logger): VersoriRoundTripperFactory;
     private changeRequestInit;
     private changeBaseUrl;
@@ -33,5 +33,6 @@ export declare class VersoriRoundTripperFactory implements RoundTripperFactory {
     private basicAuthFetcher;
     private bearerTokenFetcher;
     private oauth2Fetcher;
+    private getToken;
 }
 //# sourceMappingURL=roundtripper.d.ts.map

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,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"}
+{"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;AAYlE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,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,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IASlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA6B3D,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CACF,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAqCpC,aAAa,CACT,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA+CtC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,aAAa;IAyDrB,OAAO,CAAC,gBAAgB;IAqCxB,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,aAAa;YAwEP,QAAQ;CAuBzB"}

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

@@ -1,35 +1,12 @@
 "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 platformapi_js_1 = require("./platformapi.js");
 const mod_js_2 = require("../../../observability/mod.js");
 const constants_js_1 = require("./constants.js");
+const connect_1 = require("@connectrpc/connect");
 /**
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
  * This is the intended implementation for when projects/services are hosted on Versori infrastructure.
@@ -43,13 +20,19 @@ const constants_js_1 = require("./constants.js");
  * ```
  */
 class VersoriRoundTripperFactory {
-    constructor(credsClient, platformAPIClient, logger) {
+    constructor(credsClient, credsBaseURL, platformAPIClient, logger) {
         Object.defineProperty(this, "tokenClient", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "credsBaseURL", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "platformAPIClient", {
             enumerable: true,
             configurable: true,
@@ -80,15 +63,16 @@ class VersoriRoundTripperFactory {
             }
         });
         this.tokenClient = credsClient;
+        this.credsBaseURL = credsBaseURL;
         this.platformAPIClient = platformAPIClient;
         this.versoriCfg = (0, configloader_js_1.LoadConfigFromFile)();
         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)
@@ -101,20 +85,23 @@ 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 tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
         const log = logger || new mod_js_2.ConsoleLogger('debug');
-        return new VersoriRoundTripperFactory(tokenClient, pAPIClient, log);
+        const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId, log);
+        const tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
+        return new VersoriRoundTripperFactory(tokenClient, credsBaseURL, pAPIClient, log);
     }
     // takes the info and modifies the url using changeBaseUrl if necessary
+    // if a full valid URL is passed as a string, it will be returned as is
+    // if a valid URL object is passed, it will be returned as is
     changeRequestInit(info, conn) {
         if (typeof info === 'string') {
-            // should be this most of the time assuming we're using pathnames
+            if (isValidURL(info)) {
+                return info;
+            }
             return this.changeBaseUrl(info, conn);
         }
         else if (info instanceof URL) {
-            const newUrl = new URL(this.changeBaseUrl(info.toString(), conn));
-            return newUrl;
+            return info;
         }
         else if (info instanceof Request) {
             const url = this.changeBaseUrl(info.url, conn);
@@ -126,6 +113,7 @@ class VersoriRoundTripperFactory {
         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)) {
+            this.log.debug('Using given URL as is', { url: pathname });
             return pathname;
         }
         const connBaseURLObj = new URL(connBaseURL);
@@ -135,36 +123,45 @@ class VersoriRoundTripperFactory {
             _pathname = pathnameObj.pathname;
         }
         const newURL = new URL(_pathname, connBaseURLObj.origin);
+        this.log.debug('Using baseURL from connection', { url: newURL.toString() });
         return newURL.toString();
     }
-    // TODO: Currently if the connection is edited, then the fetcher will not be updated.
-    async create(connName, fn = globalThis.fetch) {
+    create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
-        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
-        if (!conn) {
+        if (!cnxId) {
+            this.log.debug('Connection not found in config, could be a dynamic connection', {
+                connectionName: connName,
+            });
             return undefined;
         }
-        const _fn = (input, init) => {
+        const _fn = async (input, init) => {
+            const conn = await this.platformAPIClient.getStaticConnection(cnxId);
+            if (!conn) {
+                this.log.error('Connection not found for user, using default fetch', {
+                    connectionName: connName,
+                });
+                return globalThis.fetch(input, init);
+            }
             const _input = this.changeRequestInit(input, conn);
-            return fn(_input, init);
+            switch (conn.credentials[0].authSchemeConfig.type) {
+                case 'api-key':
+                    return (await this.apiKeyFetcher(conn, fn))(_input, init);
+                case 'basic-auth':
+                    return (await this.basicAuthFetcher(conn, fn))(_input, init);
+                case 'jwt-bearer':
+                    return (await this.bearerTokenFetcher(conn, fn))(_input, init);
+                case 'oauth2':
+                    return (await this.oauth2Fetcher(conn, fn))(_input, init);
+                default:
+                    return fn(_input, init);
+            }
         };
-        switch (conn.credentials[0].authSchemeConfig.type) {
-            case 'api-key':
-                return this.apiKeyFetcher(conn, _fn);
-            case 'basic-auth':
-                return this.basicAuthFetcher(conn, _fn);
-            case 'jwt-bearer':
-                return this.bearerTokenFetcher(conn, _fn);
-            case 'oauth2':
-                return this.oauth2Fetcher(conn, _fn);
-            default:
-                return fn;
-        }
+        return _fn;
     }
-    async createDynamic(templateName, fn = globalThis.fetch) {
+    createDynamic(templateName, fn = globalThis.fetch) {
         const template = this.getTemplateID(templateName);
         if (!template) {
-            this.log.info('Template not found in config, could be a static connection', {
+            this.log.debug('Template not found in config, could be a static connection', {
                 templateName: templateName,
             });
             return undefined;
@@ -195,7 +192,8 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     getConnectionID(connName) {
-        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name.toLowerCase() === connName.toLowerCase());
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
+            c.name.toLowerCase() === connName.toLowerCase());
         if (!conn || !conn.connId) {
             return '';
         }
@@ -208,17 +206,17 @@ class VersoriRoundTripperFactory {
         }
         return template.templateId;
     }
-    async apiKeyFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        const asc = conn.credentials[0].authSchemeConfig.apiKey;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        if (!asc) {
-            throw new Error('API Key configuration not found');
-        }
-        const _fn = (input, init) => {
+    apiKeyFetcher(conn, fn) {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            const asc = conn.credentials[0].authSchemeConfig.apiKey;
+            if (!token) {
+                throw new Error('Token not found');
+            }
+            if (!asc) {
+                throw new Error('API Key configuration not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -256,13 +254,13 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
-    async basicAuthFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _fn = (input, init) => {
+    basicAuthFetcher(conn, fn) {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            if (!token) {
+                throw new Error('Token not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -286,13 +284,13 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
-    async bearerTokenFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _fn = (input, init) => {
+    bearerTokenFetcher(conn, fn) {
+        const _fn = async (input, init) => {
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const token = tokenResponse.token?.accessToken;
+            if (!token) {
+                throw new Error('Token not found');
+            }
             if (!init) {
                 init = {};
             }
@@ -315,27 +313,27 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
-    async oauth2Fetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials[0].credential.id);
-        const token = tokenResponse.token?.accessToken;
-        const tokenType = tokenResponse.token?.tokenType;
-        if (!token) {
-            throw new Error('Token not found');
-        }
-        const _tokenType = () => {
-            const _tt = tokenType?.toLowerCase();
-            switch (_tt) {
-                case 'bearer':
-                    return 'Bearer';
-                case 'mac':
-                    return 'MAC';
-                case 'basic':
-                    return 'Basic';
-                default:
-                    return 'Bearer';
+    oauth2Fetcher(conn, fn) {
+        const refreshFn = async (input, init, forceRefresh = false) => {
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id, forceRefresh);
+            const token = tokenResponse.token?.accessToken;
+            const tokenType = tokenResponse.token?.tokenType;
+            if (!token) {
+                throw new Error('Token not found');
             }
-        };
-        const _fn = (input, init) => {
+            const _tokenType = () => {
+                const _tt = tokenType?.toLowerCase();
+                switch (_tt) {
+                    case 'bearer':
+                        return 'Bearer';
+                    case 'mac':
+                        return 'MAC';
+                    case 'basic':
+                        return 'Basic';
+                    default:
+                        return 'Bearer';
+                }
+            };
             if (!init) {
                 init = {};
             }
@@ -356,8 +354,37 @@ class VersoriRoundTripperFactory {
             }
             return fn(input, init);
         };
+        const _fn = async (input, init) => {
+            const resp = await refreshFn(input, init, false);
+            if (resp.status === 401) {
+                this.log.debug('Received 401 Unauthorized response, attempting refresh', {
+                    url: input,
+                    status: resp.status,
+                });
+                // TODO: attempt refresh until precondition failed??
+                return refreshFn(input, init, true);
+            }
+            return Promise.resolve(resp);
+        };
         return _fn;
     }
+    async getToken(id) {
+        try {
+            return await this.tokenClient.getToken(id);
+        }
+        catch (error) {
+            this.log.error('unable to get credential', { error });
+            if (error instanceof connect_1.ConnectError) {
+                if (error.rawMessage.includes("connection error received: not a result of an error") && error.code === connect_1.Code.Internal) {
+                    this.log.info('Connection error received, attempting to reconnect');
+                    this.tokenClient = new mod_js_1.VersoriCredentialClient(this.credsBaseURL);
+                    return await this.tokenClient.getToken(id);
+                }
+                throw error;
+            }
+            throw error;
+        }
+    }
 }
 exports.VersoriRoundTripperFactory = VersoriRoundTripperFactory;
 function isValidURL(url) {

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

@@ -33,7 +33,7 @@ export declare class HttpContextImpl<D, PageParams> extends ContextImpl<D> imple
     pageParams?: PageParams;
     private dynamicFetcher?;
     private staticFetcher?;
-    constructor(ctx: Context<D>, connectionVars: Record<string, any>, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
+    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

@@ -66,7 +66,7 @@ class HttpContextImpl extends Context_js_1.ContextImpl {
     constructor(ctx, connectionVars, staticFetcher, dynamicFetcher, pageParams) {
         // 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.activation);
+        super(ctx.log, internalCtx.kvp, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,

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);
 }