@versori/run 0.0.1-alpha.6 → 0.1.0-alpha.8

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

@@ -1,8 +1,8 @@
-import { ConnectAPIClient } from './connectapi.js';
-import { DynamicFetcher, RoundTripperFactory } from "../types.js";
+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';
-export declare function CreateFromEnv(): VersoriRoundTripperFactory;
 /**
  * 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.
@@ -16,13 +16,20 @@ export declare function CreateFromEnv(): VersoriRoundTripperFactory;
  * ```
  */
 export declare class VersoriRoundTripperFactory implements RoundTripperFactory {
-    private cAPIClient;
     private tokenClient;
+    private platformAPIClient;
     private versoriCfg;
-    constructor(cAPIClient: ConnectAPIClient, credsClient: VersoriCredentialClient);
+    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>;
+    createDynamic(templateName: string, fn?: typeof fetch): Promise<DynamicFetcher>;
     private getConnectionID;
+    private getTemplateID;
     private apiKeyFetcher;
     private basicAuthFetcher;
     private bearerTokenFetcher;

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,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAoB,MAAM,aAAa,CAAC;AAEhG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjE,wBAAgB,aAAa,IAAI,0BAA0B,CAuB1D;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,UAAU,CAAmB;gBAEzB,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,uBAAuB;IAMxE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAE,OAAO,KAAa,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;IAsBzE,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpF,OAAO,CAAC,eAAe;YAWT,aAAa;YA+Cb,gBAAgB;YA0BhB,kBAAkB;YAkClB,aAAa;CAgD9B"}
+{"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"}

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

@@ -1,28 +1,10 @@
 import * as dntShim from "../../../../_dnt.shims.js";
-import { ConnectAPIClient } from './connectapi.js';
-import { LoadConfigFromJSON } from './configloader.js';
+import { LoadConfigFromFile } from './configloader.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
-export function CreateFromEnv() {
-    const connAPIBaseURL = dntShim.Deno.env.get('RUN_CONNECT_API_INTERNAL_URL');
-    const credsBaseURL = dntShim.Deno.env.get('RUN_CREDENTIALS_SERVICE_INTERNAL_URL');
-    const orgId = dntShim.Deno.env.get('RUN_ORGANISATION_ID');
-    const serviceConnId = dntShim.Deno.env.get('RUN_CONNECTOR_ID');
-    if (!orgId || !serviceConnId || !connAPIBaseURL || !credsBaseURL) {
-        const missingVars = [];
-        if (!orgId)
-            missingVars.push('RUN_ORGANISATION_ID');
-        if (!serviceConnId)
-            missingVars.push('RUN_CONNECTOR_ID');
-        if (!connAPIBaseURL)
-            missingVars.push('RUN_CONNECT_API_INTERNAL_URL');
-        if (!credsBaseURL)
-            missingVars.push('RUN_CREDENTIALS_SERVICE_INTERNAL_URL');
-        throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
-    }
-    const cAPIClient = new ConnectAPIClient(connAPIBaseURL, orgId, serviceConnId, {});
-    const tokenClient = new VersoriCredentialClient(credsBaseURL);
-    return new VersoriRoundTripperFactory(cAPIClient, tokenClient);
-}
+import { LRUCache } from 'lru-cache';
+import { PlatformAPIClient } from './platformapi.js';
+import { ConsoleLogger } from '../../../observability/mod.js';
+import { envVarCredsBaseURL, envVarEnvId, envVarOrgId, envVarPlatformApiBaseURL, } from './constants.js';
 /**
  * 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.
@@ -36,14 +18,14 @@ export function CreateFromEnv() {
  * ```
  */
 export class VersoriRoundTripperFactory {
-    constructor(cAPIClient, credsClient) {
-        Object.defineProperty(this, "cAPIClient", {
+    constructor(credsClient, platformAPIClient, logger) {
+        Object.defineProperty(this, "tokenClient", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "tokenClient", {
+        Object.defineProperty(this, "platformAPIClient", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -55,17 +37,99 @@ export class VersoriRoundTripperFactory {
             writable: true,
             value: void 0
         });
-        this.cAPIClient = cAPIClient;
+        Object.defineProperty(this, "log", {
+            enumerable: true,
+            configurable: true,
+            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;
+                    this.log.error(msg, values);
+                    return globalThis.fetch(input, init);
+                };
+            }
+        });
         this.tokenClient = credsClient;
-        this.versoriCfg = LoadConfigFromJSON(); // for now?
+        this.platformAPIClient = platformAPIClient;
+        this.versoriCfg = LoadConfigFromFile();
+        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);
+        if (!orgId || !envId || !platformApiBaseURL || !credsBaseURL) {
+            const missingVars = [];
+            if (!orgId)
+                missingVars.push(envVarOrgId);
+            if (!envId)
+                missingVars.push(envVarEnvId);
+            if (!platformApiBaseURL)
+                missingVars.push(envVarPlatformApiBaseURL);
+            if (!credsBaseURL)
+                missingVars.push(envVarCredsBaseURL);
+            throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
+        }
+        const pAPIClient = new PlatformAPIClient(platformApiBaseURL, orgId, envId, {});
+        const tokenClient = new VersoriCredentialClient(credsBaseURL);
+        const log = logger || new ConsoleLogger('debug');
+        return new VersoriRoundTripperFactory(tokenClient, pAPIClient, log);
+    }
+    // takes the info and modifies the url using changeBaseUrl if necessary
+    changeRequestInit(info, conn) {
+        if (typeof info === 'string') {
+            return this.changeBaseUrl(info, conn);
+        }
+        else if (info instanceof URL) {
+            return this.changeBaseUrl(info.toString(), conn);
+        }
+        else if (info instanceof Request) {
+            const url = this.changeBaseUrl(info.url, conn);
+            return new Request(url, info);
+        }
+        return info;
     }
-    async create(connName, fn = fetch) {
+    changeBaseUrl(url, conn) {
+        const baseUrl = conn.baseUrl;
+        if (!baseUrl) {
+            return url;
+        }
+        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();
+    }
+    async create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
-        const conn = await this.cAPIClient.getConnection(cnxId);
+        const conn = await this.platformAPIClient.getStaticConnection(cnxId);
         if (!conn) {
-            throw new Error(`Connection ${connName} not found`);
+            return this.defaultStatic('Connection not found for static, using default fetch', {
+                connName: connName,
+            });
         }
-        switch (conn.credentials.action[0].authSchemeConfig.schemeType) {
+        switch (conn.credentials[0].authSchemeConfig.type) {
             case 'api-key':
                 return this.apiKeyFetcher(conn, fn);
             case 'basic-auth':
@@ -78,54 +142,108 @@ export class VersoriRoundTripperFactory {
                 return fn;
         }
     }
-    async createDynamic(templateName, fn) {
-        throw new Error('Method not implemented.');
+    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', {
+                templateName: templateName,
+            });
+        }
+        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);
+                }
+            }
+            if (!conn) {
+                return this.defaultDynamic('Connection not found for user, using default fetch', {
+                    templateName: templateName,
+                    userId: userId,
+                })(userId, input, init);
+            }
+            const _input = this.changeRequestInit(input, conn);
+            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);
+            }
+        };
+        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.connections.find(c => c.name === connName);
-        if (!conn) {
-            throw new Error(`Connection ${connName} not found`);
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) && c.name === connName);
+        if (!conn || !conn.connId) {
+            return '';
         }
-        return conn.id;
+        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);
+        if (!template || !template.templateId) {
+            return '';
+        }
+        return template.templateId;
     }
     async apiKeyFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials.action[0].credential.id);
+        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) => {
             if (!init) {
                 init = {};
             }
-            switch (conn.credentials.action[0].authSchemeConfig.in) {
+            switch (asc.in) {
                 case 'header':
                     if (!init.headers) {
                         init.headers = new Headers();
                     }
                     if (init.headers instanceof Headers) {
-                        init.headers.set('Authorization', token);
+                        init.headers.set(asc.name, token);
                     }
                     else if (init.headers instanceof Array) {
-                        init.headers.push(['Authorization', token]);
+                        init.headers.push([asc.name, token]);
                     }
                     else {
                         init.headers = {
                             ...init.headers,
-                            ['Authorization']: token
+                            [asc.name]: token,
                         };
                     }
                     break;
                 case 'query':
                     if (typeof input === 'string') {
-                        input += `?${'Authorization'}=${token}`;
+                        input += `?${asc.name}=${token}`;
                     }
                     else if (input instanceof Request) {
-                        input = new Request(input.url + `?${'Authorization'}=${token}`, init);
+                        input = new Request(input.url + `?${asc.name}=${token}`, init);
                     }
                     else if (input instanceof URL) {
-                        input.searchParams.append('Authorization', token);
+                        input.searchParams.append(asc.name, token);
                     }
                     break;
             }
@@ -134,7 +252,7 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
     async basicAuthFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials.action[0].credential.id);
+        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
         const token = tokenResponse.token?.accessToken;
         if (!token) {
             throw new Error('Token not found');
@@ -146,14 +264,14 @@ export class VersoriRoundTripperFactory {
             if (!init.headers) {
                 init.headers = new Headers();
             }
-            init.headers.set('Authorization', token);
+            init.headers.set('Authorization', `Basic ${token}`);
             return fn(input, init);
         };
         return _fn;
     }
-    // TODO: need to make the prefix and header name configuratble from authschemeconfig
+    // TODO: need to make the prefix and header name configurable from authschemeconfig
     async bearerTokenFetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getToken(conn.credentials.action[0].credential.id);
+        const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
         const token = tokenResponse.token?.accessToken;
         if (!token) {
             throw new Error('Token not found');
@@ -174,7 +292,7 @@ export class VersoriRoundTripperFactory {
             else {
                 init.headers = {
                     ...init.headers,
-                    ['Authorization']: `Bearer ${token}`
+                    ['Authorization']: `Bearer ${token}`,
                 };
             }
             return fn(input, init);
@@ -182,7 +300,7 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
     async oauth2Fetcher(conn, fn) {
-        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials.action[0].credential.id);
+        const tokenResponse = await this.tokenClient.getOAuth2Token(conn.credentials[0].credential.id);
         const token = tokenResponse.token?.accessToken;
         const tokenType = tokenResponse.token?.tokenType;
         if (!token) {
@@ -217,7 +335,7 @@ export class VersoriRoundTripperFactory {
             else {
                 init.headers = {
                     ...init.headers,
-                    ['Authorization']: `${_tokenType()} ${token}`
+                    ['Authorization']: `${_tokenType()} ${token}`,
                 };
             }
             return fn(input, init);

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

@@ -1,11 +1,13 @@
 import { Context } from '../../context/Context.js';
+import { Logger } from '../../mod.js';
+import { Activation, DynamicFetcher } from '../http/types.js';
 import { ArrayTask, Task, Taskable, TaskType } from '../Task.js';
-export type HttpContext<Data, PageParams> = Context<Data> & {
+export interface HttpContext<Data, PageParams = undefined> extends Context<Data> {
     fetch: typeof fetch;
     connectionVariables: Record<string, any>;
     pageParams?: PageParams;
     nextPage: (nextParams: PageParams) => Promise<void>;
-};
+}
 export type HttpContextFunc<In, Out, PageParams> = (ctx: HttpContext<In, PageParams>) => Promise<Out>;
 export type PaginateOptions<P> = {
     initialParams: P;
@@ -27,5 +29,19 @@ 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;
+    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);
+    get fetch(): typeof globalThis.fetch;
+    nextPage(nextParams: PageParams): Promise<void>;
+}
 export declare function http<In = any, Out = any, PageParams = unknown>(taskId: string, opts: HttpOptions<In, Out, PageParams>, fn: HttpContextFunc<In, Out, PageParams>): Task<In, Out>;
 //# sourceMappingURL=HttpTask.d.ts.map

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":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAMjE,MAAM,MAAM,WAAW,CAAC,IAAI,EAAE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG;IACxD,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI,CAC/C,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,KAC/B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC7B,aAAa,EAAE,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;AAEF,qBAAa,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAE,YAAW,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;IACnE,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAU;IAE5B,EAAE,EAAE,MAAM,CAAC;IAEX,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAEzC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBAGnC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC;IAO5C,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAI9D,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAIjE,UAAU,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;IAI5B,MAAM,CAAC,OAAO,GAAG,GAAG,SAAS,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IACtF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IASzE,KAAK,IAAI,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;CAGzB;AAED,wBAAgB,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,UAAU,GAAG,OAAO,EAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GACzC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAEf"}
+{"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAsB,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAMjE,MAAM,WAAW,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAE,SAAQ,OAAO,CAAC,IAAI,CAAC;IAC5E,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD;AAED,MAAM,MAAM,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI,CAC/C,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,KAC/B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC7B,aAAa,EAAE,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;AAEF,qBAAa,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAE,YAAW,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;IACnE,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAU;IAE5B,EAAE,EAAE,MAAM,CAAC;IAEX,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAEzC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBAGnC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC;IAO5C,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAI9D,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAIjE,UAAU,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;IAI5B,MAAM,CAAC,OAAO,GAAG,GAAG,SAAS,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IACtF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IASzE,KAAK,IAAI,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;CAGzB;AAED,qBAAa,eAAe,CAAC,CAAC,EAAE,UAAU,CAAE,YAAW,WAAW,CAAC,CAAC,EAAE,UAAU,CAAC;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,IAAI,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,EAAE,CAAC,CAAC;IAGR,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC9C,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,aAAa,CAAe;gBAGhC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnC,aAAa,EAAE,OAAO,KAAK,EAC3B,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,CAAC,EAAE,UAAU;IAa3B,IAAI,KAAK,IAAI,OAAO,UAAU,CAAC,KAAK,CAUnC;IAEK,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxD;AAED,wBAAgB,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,UAAU,GAAG,OAAO,EAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GACzC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAEf"}

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

@@ -1,5 +1,6 @@
 var _a;
 import { ensureTask } from '../ensureTask.js';
+import { wrapDynamicFetcher } from '../http/types.js';
 import { TaskType } from '../Task.js';
 import { BackgroundTask } from './BackgroundTask.js';
 import { CatchTask } from './CatchTask.js';
@@ -55,6 +56,87 @@ export class HttpTaskImpl {
     }
 }
 _a = TaskType;
+export class HttpContextImpl {
+    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
+        });
+        Object.defineProperty(this, "connectionVariables", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "pageParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        }); // TODO: Implement page params
+        Object.defineProperty(this, "dynamicFetcher", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "staticFetcher", {
+            enumerable: true,
+            configurable: true,
+            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;
+    }
+    async nextPage(nextParams) {
+        throw new Error("Method not implemented.");
+    }
+}
 export function http(taskId, opts, fn) {
     return new HttpTaskImpl(taskId, opts, fn);
 }

package/esm/src/dsl/triggers/ScheduleTrigger.d.ts

@@ -1,14 +1,18 @@
+import { Activation } from '../http/types.js';
 import { Taskable } from '../Task.js';
 import { Trigger, TriggerType } from '../Trigger.js';
 import { Workflow } from '../Workflow.js';
 export type ScheduleData = Record<string, never>;
+export type PrebuiltPredicate = 'all';
+export type ActivationPredicate = PrebuiltPredicate | ((a?: Activation) => boolean);
 export declare class ScheduleTrigger implements Trigger<ScheduleData> {
     id: string;
     [TriggerType]: string;
     schedule: string;
-    constructor(id: string, schedule: string);
+    activationPredicate?: ActivationPredicate;
+    constructor(id: string, schedule: string, activationPredicate?: ActivationPredicate);
     then<OO>(task: Taskable<ScheduleData, OO>): Workflow<OO>;
     catch<OO>(error: any): Workflow<OO>;
 }
-export declare function schedule(id: string, schedule: string): Workflow<ScheduleData>;
+export declare function schedule(id: string, schedule: string, activationPredicate?: ActivationPredicate): Workflow<ScheduleData>;
 //# sourceMappingURL=ScheduleTrigger.d.ts.map

package/esm/src/dsl/triggers/ScheduleTrigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScheduleTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/ScheduleTrigger.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,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEjD,qBAAa,eAAgB,YAAW,OAAO,CAAC,YAAY,CAAC;IACzD,EAAE,EAAE,MAAM,CAAC;IAEX,CAAC,WAAW,CAAC,EAAE,MAAM,CAAc;IAEnC,QAAQ,EAAE,MAAM,CAAC;gBAEL,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKxC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;IAIxD,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC;CAGtC;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,CAE7E"}
+{"version":3,"file":"ScheduleTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/ScheduleTrigger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,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,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEjD,MAAM,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEtC,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC;AAEpF,qBAAa,eAAgB,YAAW,OAAO,CAAC,YAAY,CAAC;IACzD,EAAE,EAAE,MAAM,CAAC;IAEX,CAAC,WAAW,CAAC,EAAE,MAAM,CAAc;IAEnC,QAAQ,EAAE,MAAM,CAAC;IAEjB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;gBAE9B,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,mBAAmB;IAMnF,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;IAIxD,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC;CAGtC;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,mBAAmB,GAAG,QAAQ,CAAC,YAAY,CAAC,CAExH"}

package/esm/src/dsl/triggers/ScheduleTrigger.js

@@ -3,7 +3,7 @@ import { ensureTask } from "../ensureTask.js";
 import { TriggerType } from '../Trigger.js';
 import { WorkflowImpl } from '../Workflow.js';
 export class ScheduleTrigger {
-    constructor(id, schedule) {
+    constructor(id, schedule, activationPredicate) {
         Object.defineProperty(this, "id", {
             enumerable: true,
             configurable: true,
@@ -22,8 +22,15 @@ export class ScheduleTrigger {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "activationPredicate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.id = id;
         this.schedule = schedule;
+        this.activationPredicate = activationPredicate;
     }
     then(task) {
         return new WorkflowImpl(this, ensureTask(task));
@@ -33,6 +40,6 @@ export class ScheduleTrigger {
     }
 }
 _a = TriggerType;
-export function schedule(id, schedule) {
-    return new ScheduleTrigger(id, schedule);
+export function schedule(id, schedule, activationPredicate) {
+    return new ScheduleTrigger(id, schedule, activationPredicate);
 }

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

@@ -15,6 +15,7 @@ export declare class MemoryInterpreter {
     private contextProvider;
     private roundTripperFactory;
     private router;
+    private connectionProvider;
     private registeredWorkflows;
     constructor(options?: MemoryInterpreterOptions);
     register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): {

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;AAO9E,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;IAEvB,OAAO,CAAC,mBAAmB,CAKnB;gBAEI,OAAO,GAAE,wBAA6B;IAQlD,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;kBAE3C,GAAG;eACN,GAAG;;;;IAsCpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAwD/B"}
+{"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"}

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

@@ -5,8 +5,9 @@ import { WorkflowImpl } from '../../dsl/Workflow.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
 import { ConsoleLogger } from '../../observability/logging/ConsoleLogger.js';
 import { DefaultRoundTripperFactory } from '../../dsl/http/default.js';
-import { CreateFromEnv } from '../../dsl/http/versori/roundtripper.js';
 import express from 'express';
+import { PlatformAPIClient } from '../../dsl/http/versori/platformapi.js';
+import { VersoriRoundTripperFactory } from '../../dsl/http/versori/roundtripper.js';
 export class MemoryInterpreter {
     constructor(options = {}) {
         Object.defineProperty(this, "log", {
@@ -39,6 +40,12 @@ export class MemoryInterpreter {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "connectionProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "registeredWorkflows", {
             enumerable: true,
             configurable: true,
@@ -48,8 +55,9 @@ export class MemoryInterpreter {
         this.log = options.logger || new ConsoleLogger('debug');
         this.compiler = options.compiler || new ObservableCompiler();
         this.contextProvider = options.contextProvider || new ContextProviderImpl(this.log);
-        this.roundTripperFactory = options.skipVersoriCredentials ? new DefaultRoundTripperFactory() : CreateFromEnv();
+        this.roundTripperFactory = options.skipVersoriCredentials ? new DefaultRoundTripperFactory() : VersoriRoundTripperFactory.fromEnv(this.log);
         this.router = express.Router();
+        this.connectionProvider = PlatformAPIClient.fromEnv();
     }
     register(workflow, options) {
         const registration = {
@@ -73,7 +81,8 @@ export class MemoryInterpreter {
             log: this.log,
             contextProvider: this.contextProvider,
             roundTripperFactory: this.roundTripperFactory,
-            router: this.router
+            router: this.router,
+            connectionProvider: this.connectionProvider
         };
         registration.trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         registration.task$ = this.compiler.compileTask(compilerContext, workflow.task);