@versori/run 0.0.1-alpha.9 → 0.1.0-alpha.11

package/esm/src/dsl/http/types.js

@@ -1,6 +1,6 @@
 // this function might be better being a method on DynamicFetcher or something like that
-export function wrapDynamicFetcher(fetcher, userId) {
+export function wrapDynamicFetcher(fetcher, activation) {
     return (input, init) => {
-        return fetcher(userId, input, init);
+        return fetcher(activation, input, init);
     };
 }

package/esm/src/dsl/http/versori/configloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configloader.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/configloader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/C;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,CAUrD"}
+{"version":3,"file":"configloader.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/configloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/C;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,CAUrD"}

package/esm/src/dsl/http/versori/configloader.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../_dnt.shims.js";
 import { envVarConfigFile } from './constants.js';
 /**
  * Loads the Versori SDK configuration from a JSON file.
@@ -11,10 +10,10 @@ import { envVarConfigFile } from './constants.js';
  */
 export function LoadConfigFromFile() {
     // Get the config file name from the environment variable
-    const configFileName = dntShim.Deno.env.get(envVarConfigFile);
+    const configFileName = Deno.env.get(envVarConfigFile);
     if (!configFileName) {
         throw new Error(`Environment variable ${envVarConfigFile} is not set`);
     }
-    const cfg = JSON.parse(dntShim.Deno.readTextFileSync(configFileName));
+    const cfg = JSON.parse(Deno.readTextFileSync(configFileName));
     return cfg;
 }

package/esm/src/dsl/http/versori/internalauth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internalauth.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/internalauth.ts"],"names":[],"mappings":"AAGA,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IA2BpB,QAAQ;CAsBjB"}
+{"version":3,"file":"internalauth.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/internalauth.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IA2BpB,QAAQ;CAsBjB"}

package/esm/src/dsl/http/versori/internalauth.js

@@ -1,4 +1,3 @@
-import * as dntShim from "../../../../_dnt.shims.js";
 import { envVarClientId, envVarClientSecret, envVarInternalToken, envVarTokenEndpoint } from './constants.js';
 export class InternalAuth {
     constructor() {
@@ -32,13 +31,13 @@ export class InternalAuth {
             writable: true,
             value: void 0
         });
-        this.clientId = dntShim.Deno.env.get(envVarClientId) || '';
-        this.clientSecret = dntShim.Deno.env.get(envVarClientSecret) || '';
-        this.tokenEndpoint = dntShim.Deno.env.get(envVarTokenEndpoint) || '';
+        this.clientId = Deno.env.get(envVarClientId) || '';
+        this.clientSecret = Deno.env.get(envVarClientSecret) || '';
+        this.tokenEndpoint = Deno.env.get(envVarTokenEndpoint) || '';
         this.accessToken = '';
         this.expiresAt = 0;
-        if (dntShim.Deno.env.get(envVarInternalToken)) {
-            this.accessToken = dntShim.Deno.env.get(envVarInternalToken) || '';
+        if (Deno.env.get(envVarInternalToken)) {
+            this.accessToken = Deno.env.get(envVarInternalToken) || '';
             this.expiresAt = Date.now() + 365 * 24 * 60 * 60 * 1000; // expires in 1 year
             console.log(`Using static token provided by ${envVarInternalToken}`);
             return;

package/esm/src/dsl/http/versori/platformapi.d.ts

@@ -4,11 +4,12 @@ export declare class PlatformAPIClient implements ConnectionProvider {
     private orgId;
     private envId;
     private internalAuth;
-    private cache;
-    constructor(baseUrl: string, orgId: string, envId: string, cache?: Record<string, Connection>);
+    constructor(baseUrl: string, orgId: string, envId: string);
     static fromEnv(): PlatformAPIClient;
     getStaticConnection(cnxId: string): Promise<Connection | undefined>;
-    getEndUserConnection(templateId: string, userId: string): Promise<Connection | undefined>;
+    getUserActivations(userId: string): Promise<Activation[]>;
+    getActivation(activationId: string): Promise<Activation | undefined>;
+    getActivationConnection(templateId: string, activationId: string): Promise<Connection | undefined>;
     listActivations(): Promise<Activation[]>;
 }
 //# sourceMappingURL=platformapi.d.ts.map

package/esm/src/dsl/http/versori/platformapi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platformapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/platformapi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIzE,qBAAa,iBAAkB,YAAW,kBAAkB;IACxD,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,KAAK,CAA6B;gBAGtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAM;IAS1C,MAAM,CAAC,OAAO,IAAI,iBAAiB;IAY7B,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA2BnE,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAmBzF,eAAe,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAkBjD"}
+{"version":3,"file":"platformapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/platformapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIzE,qBAAa,iBAAkB,YAAW,kBAAkB;IACxD,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,YAAY,CAAe;gBAG/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAQjB,MAAM,CAAC,OAAO,IAAI,iBAAiB;IAY7B,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAiBnE,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAmBzD,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAmBpE,uBAAuB,CACzB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACrB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAmB5B,eAAe,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAkBjD"}

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

@@ -1,8 +1,7 @@
-import * as dntShim from "../../../../_dnt.shims.js";
 import { envVarEnvId, envVarOrgId, envVarPlatformApiBaseURL } from './constants.js';
 import { InternalAuth } from './internalauth.js';
 export class PlatformAPIClient {
-    constructor(baseUrl, orgId, envId, cache = {}) {
+    constructor(baseUrl, orgId, envId) {
         Object.defineProperty(this, "baseUrl", {
             enumerable: true,
             configurable: true,
@@ -27,31 +26,21 @@ export 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();
     }
     static fromEnv() {
-        const baseUrl = dntShim.Deno.env.get(envVarPlatformApiBaseURL);
-        const orgId = dntShim.Deno.env.get(envVarOrgId);
-        const envId = dntShim.Deno.env.get(envVarEnvId);
+        const baseUrl = Deno.env.get(envVarPlatformApiBaseURL);
+        const orgId = Deno.env.get(envVarOrgId);
+        const envId = Deno.env.get(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(),
@@ -61,11 +50,34 @@ export 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/esm/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/esm/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;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;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/esm/src/dsl/http/versori/roundtripper.js

@@ -1,7 +1,5 @@
-import * as dntShim from "../../../../_dnt.shims.js";
 import { LoadConfigFromFile } from './configloader.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
-import { LRUCache } from 'lru-cache';
 import { PlatformAPIClient } from './platformapi.js';
 import { ConsoleLogger } from '../../../observability/mod.js';
 import { envVarCredsBaseURL, envVarEnvId, envVarOrgId, envVarPlatformApiBaseURL, } from './constants.js';
@@ -43,24 +41,12 @@ export 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);
                 };
@@ -72,10 +58,10 @@ export class VersoriRoundTripperFactory {
         this.log = logger;
     }
     static fromEnv(logger) {
-        const credsBaseURL = dntShim.Deno.env.get(envVarCredsBaseURL);
-        const platformApiBaseURL = dntShim.Deno.env.get(envVarPlatformApiBaseURL);
-        const orgId = dntShim.Deno.env.get(envVarOrgId);
-        const envId = dntShim.Deno.env.get(envVarEnvId);
+        const credsBaseURL = Deno.env.get(envVarCredsBaseURL);
+        const platformApiBaseURL = Deno.env.get(envVarPlatformApiBaseURL);
+        const orgId = Deno.env.get(envVarOrgId);
+        const envId = Deno.env.get(envVarEnvId);
         if (!orgId || !envId || !platformApiBaseURL || !credsBaseURL) {
             const missingVars = [];
             if (!orgId)
@@ -96,10 +82,12 @@ export 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);
@@ -107,68 +95,61 @@ export 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 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) {
@@ -187,17 +168,14 @@ export 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 '';
         }
@@ -354,3 +332,12 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
 }
+function isValidURL(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (_) {
+        return false;
+    }
+}

package/esm/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: Context<D>, connectionVars: Record<string, any>, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
     get fetch(): typeof globalThis.fetch;
     nextPage(nextParams: PageParams): Promise<void>;
 }

package/esm/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/esm/src/dsl/tasks/HttpTask.js

@@ -1,4 +1,5 @@
 var _a;
+import { ContextImpl } from '../../context/Context.js';
 import { ensureTask } from '../ensureTask.js';
 import { wrapDynamicFetcher } from '../http/types.js';
 import { TaskType } from '../Task.js';
@@ -56,38 +57,11 @@ export class HttpTaskImpl {
     }
 }
 _a = TaskType;
-export class HttpContextImpl {
+export class HttpContextImpl extends 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.activation);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,
@@ -99,7 +73,8 @@ export 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,
@@ -112,26 +87,14 @@ export 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 = wrapDynamicFetcher(this.dynamicFetcher, this.activation.id);
-        }
-        else {
-            fetch = this.staticFetcher;
-        }
-        return fetch;
+        // This is maybe hard to read.
+        return this.dynamicFetcher && this.activation ? wrapDynamicFetcher(this.dynamicFetcher, this.activation) : this.staticFetcher ?? globalThis.fetch;
     }
     async nextPage(nextParams) {
         throw new Error("Method not implemented.");

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts

@@ -1,7 +1,11 @@
+import { Router } from 'express';
+import { Observable } from 'rxjs';
 import { ContextProvider } from '../../context/ContextProvider.js';
+import { ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
+import { ContextImpl, ContextOperatorFunction } from '../../mod.js';
 export type MemoryInterpreterOptions = {
     logger?: Logger;
     compiler?: ObservableCompiler;
@@ -9,21 +13,24 @@ export type MemoryInterpreterOptions = {
     signal?: AbortSignal;
     skipVersoriCredentials?: boolean;
 };
+type Registration = {
+    trigger$: Observable<ContextImpl<any, void>>;
+    task$: ContextOperatorFunction<any, any, any>;
+    localAbortController: AbortController;
+    sigintListener: () => void;
+};
 export declare class MemoryInterpreter {
-    private log;
-    private compiler;
-    private contextProvider;
-    private roundTripperFactory;
-    private router;
-    private connectionProvider;
+    private readonly log;
+    private readonly compiler;
+    private readonly contextProvider;
+    private readonly roundTripperFactory;
+    private readonly router;
+    private readonly connectionProvider;
     private registeredWorkflows;
-    constructor(options?: MemoryInterpreterOptions);
-    register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): {
-        trigger$: any;
-        task$: any;
-        localAbortController: AbortController;
-        sigintListener: () => void;
-    };
+    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, roundTripperFactory: RoundTripperFactory, router: Router, connectionProvider: ConnectionProvider);
+    static newInstance(options?: MemoryInterpreterOptions): Promise<MemoryInterpreter>;
+    register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): Registration;
     start(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=MemoryInterpreter.d.ts.map

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAQ9E,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,mBAAmB,CAKnB;gBAEI,OAAO,GAAE,wBAA6B;IASlD,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;kBAE3C,GAAG;eACN,GAAG;;;;IAuCpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAwD/B"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAA+B,UAAU,EAAW,MAAM,MAAM,CAAC;AACxE,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGlF,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEpE,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,KAAK,EAAE,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,oBAAoB,EAAE,eAAe,CAAC;IACtC,cAAc,EAAE,MAAM,IAAI,CAAC;CAC9B,CAAA;AAED,qBAAa,iBAAiB;IAItB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IARvC,OAAO,CAAC,mBAAmB,CAA2B;gBAGjC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,kBAAkB;WAI9C,WAAW,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAoC5F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAiD/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA0D/B"}