@versori/run 0.1.0-alpha.13 → 0.1.0-alpha.9

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

@@ -1,7 +1,8 @@
+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,
@@ -26,31 +27,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 = Deno.env.get(envVarPlatformApiBaseURL);
-        const orgId = Deno.env.get(envVarOrgId);
-        const envId = Deno.env.get(envVarEnvId);
+        const baseUrl = dntShim.Deno.env.get(envVarPlatformApiBaseURL);
+        const orgId = dntShim.Deno.env.get(envVarOrgId);
+        const envId = dntShim.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(),
@@ -60,7 +51,6 @@ export class PlatformAPIClient {
             return undefined;
         }
         const result = (await resp.json());
-        this.cache[cnxId] = result;
         return result;
     }
     async getUserActivations(userId) {

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":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,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,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;IAYzB,OAAO,CAAC,aAAa;IAmBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAuB9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA2DtC,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":"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"}

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

@@ -1,6 +1,6 @@
+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';
@@ -59,10 +59,10 @@ export class VersoriRoundTripperFactory {
         this.log = logger;
     }
     static fromEnv(logger) {
-        const credsBaseURL = Deno.env.get(envVarCredsBaseURL);
-        const platformApiBaseURL = Deno.env.get(envVarPlatformApiBaseURL);
-        const orgId = Deno.env.get(envVarOrgId);
-        const envId = Deno.env.get(envVarEnvId);
+        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)
@@ -83,10 +83,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);
@@ -94,44 +96,46 @@ 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 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) {
             this.log.info('Template not found in config, could be a static connection', {
@@ -140,16 +144,7 @@ export class VersoriRoundTripperFactory {
             return undefined;
         }
         const _fn = async (activation, input, init) => {
-            let conn = undefined;
-            if (cache.has(activation.id)) {
-                conn = cache.get(activation.id);
-            }
-            else {
-                conn = await this.platformAPIClient.getActivationConnection(template, activation.id);
-                if (conn) {
-                    cache.set(activation.id, conn);
-                }
-            }
+            const conn = await this.platformAPIClient.getActivationConnection(template, activation.id);
             if (!conn) {
                 return this.defaultDynamic('Connection not found for user, using default fetch', {
                     templateName: templateName,
@@ -338,3 +333,12 @@ export class VersoriRoundTripperFactory {
         return _fn;
     }
 }
+function isValidURL(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (_) {
+        return false;
+    }
+}

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

@@ -1,55 +1,13 @@
-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, options?: WebhookOptions);
+    constructor(id: string);
     then<OO>(task: Taskable<WebhookData, OO>): Workflow<OO>;
+    catch<OO>(error: any): Workflow<OO>;
 }
-export declare function webhook(id: string, options?: WebhookOptions): Trigger<WebhookData>;
+export declare function webhook(id: string): Workflow<WebhookData>;
 //# sourceMappingURL=WebhookTrigger.d.ts.map

package/esm/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":"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"}
+{"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"}

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

@@ -3,19 +3,13 @@ import { ensureTask } from "../ensureTask.js";
 import { TriggerType } from '../Trigger.js';
 import { WorkflowImpl } from '../Workflow.js';
 export class WebhookTrigger {
-    constructor(id, options = {}) {
+    constructor(id) {
         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,
@@ -23,13 +17,15 @@ export class WebhookTrigger {
             value: 'webhook'
         });
         this.id = id;
-        this.options = options;
     }
     then(task) {
         return new WorkflowImpl(this, ensureTask(task));
     }
+    catch(error) {
+        return this;
+    }
 }
 _a = TriggerType;
-export function webhook(id, options) {
-    return new WebhookTrigger(id, options);
+export function webhook(id) {
+    return new WebhookTrigger(id);
 }

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

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { Observable, Subscription } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
@@ -18,7 +18,6 @@ type Registration = {
     task$: ContextOperatorFunction<any, any, any>;
     localAbortController: AbortController;
     sigintListener: () => void;
-    subscription?: Subscription;
 };
 export declare class MemoryInterpreter {
     private readonly log;
@@ -28,14 +27,10 @@ export declare class MemoryInterpreter {
     private readonly router;
     private readonly connectionProvider;
     private registeredWorkflows;
-    private server?;
-    private shutdownServer?;
-    private isShuttingDown;
     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>;
-    stop(): 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":"AAAA,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAA+B,UAAU,EAAW,YAAY,EAAE,MAAM,MAAM,CAAC;AACtF,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;AAIpE,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;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAA;AAED,qBAAa,iBAAiB;IAOtB,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;IAXvC,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,cAAc,CAAS;gBAGV,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;IA6C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiHtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AACA,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;IA6C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA0D/B"}

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

@@ -1,3 +1,4 @@
+import * as dntShim from "../../../_dnt.shims.js";
 import express from 'express';
 import { catchError, EMPTY, mergeMap, of, tap } from 'rxjs';
 import { ContextProviderImpl } from '../../context/ContextProvider.js';
@@ -53,24 +54,6 @@ export class MemoryInterpreter {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "server", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "shutdownServer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "isShuttingDown", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
     }
     static async newInstance(options = {}) {
         const log = options.logger || new ConsoleLogger('debug');
@@ -120,7 +103,7 @@ export class MemoryInterpreter {
         return registration;
     }
     async start() {
-        const port = Deno.env.get('PORT') || 3000;
+        const port = dntShim.Deno.env.get('PORT') || 3000;
         const app = express();
         app.use(express.json()); // Add JSON body parser middleware
         // Add health check route
@@ -131,13 +114,12 @@ export class MemoryInterpreter {
         app.use(this.router);
         // Start all registered workflows
         for (const registration of this.registeredWorkflows) {
-            Deno.addSignalListener('SIGINT', registration.sigintListener);
-            registration.subscription = registration.trigger$
+            dntShim.Deno.addSignalListener('SIGINT', registration.sigintListener);
+            registration.trigger$
                 .pipe(tap((ctx) => {
                 ctx.log.info('MemoryInterpreter.executionStarted', { data: ctx.data });
             }), mergeMap((ctx) => of(ctx).pipe(registration.task$, catchError((error) => {
                 ctx.log.error('MemoryInterpreter.executionError', { error });
-                ctx.options.onError?.(ctx.withData(error));
                 return EMPTY;
             }))))
                 .subscribe({
@@ -147,66 +129,20 @@ export class MemoryInterpreter {
                         durationMs,
                         data: ctx.data,
                     });
-                    ctx.options.onSuccess?.(ctx);
                     this.contextProvider.destroy(ctx);
                 },
                 error: (err) => {
                     this.log.error('MemoryInterpreter.error', { error: err });
-                    Deno.removeSignalListener('SIGINT', registration.sigintListener);
+                    dntShim.Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
                     this.log.info('MemoryInterpreter.workflowCompleted');
-                    Deno.removeSignalListener('SIGINT', registration.sigintListener);
+                    dntShim.Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
             });
-            registration.subscription.add(() => {
-                registration.subscription = undefined;
-            });
         }
-        this.server = app.listen(port, () => {
+        app.listen(port, () => {
             this.log.info(`Express server listening on http://localhost:${port}`);
         });
-        this.shutdownServer = () => {
-            if (this.isShuttingDown) {
-                return;
-            }
-            this.isShuttingDown = true;
-            this.log.info('Shutting down server');
-            // Close the server
-            if (this.server) {
-                this.server.close();
-            }
-            // Remove all signal listeners
-            for (const registration of this.registeredWorkflows) {
-                Deno.removeSignalListener('SIGINT', registration.sigintListener);
-                // Unsubscribe from all observables
-                if (registration.subscription) {
-                    registration.subscription.unsubscribe();
-                }
-                // Abort all controllers
-                registration.localAbortController.abort();
-            }
-            // Remove the server shutdown listener
-            if (this.shutdownServer) {
-                Deno.removeSignalListener('SIGINT', this.shutdownServer);
-            }
-        };
-        Deno.addSignalListener('SIGINT', this.shutdownServer);
-        return new Promise((resolve) => {
-            if (this.server) {
-                this.server.on('close', () => {
-                    this.log.info('Server closed');
-                    resolve();
-                });
-            }
-            else {
-                resolve();
-            }
-        });
-    }
-    async stop() {
-        if (this.shutdownServer) {
-            this.shutdownServer();
-        }
     }
 }

package/esm/src/interpreter/memory/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA8B7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8KxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAK7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAwGxE,CAAC"}

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

@@ -1,136 +1,71 @@
 // In src/interpreter/memory/compilers/webhook.ts
-import cors from 'cors';
 import { Observable } from 'rxjs';
-import { pipeline } from "node:stream/promises";
 import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
-const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), { status: 200 });
-const DEFAULT_SYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({ message: 'Internal server error', error: ctx.data }), {
-    status: 500,
-});
-const DEFAULT_ASYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify({
-    status: 'accepted',
-    executionId: ctx.executionId,
-    startTime: ctx.startTime,
-}), { status: 202 });
-const DEFAULT_ASYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({
-    message: 'Internal server error',
-    executionId: ctx.executionId,
-    startTime: ctx.startTime,
-}), {
-    status: 500,
-});
 export const webhookCompiler = {
     ctor: WebhookTrigger,
     compile: (ctx, trigger, signal) => {
-        const { response: { mode = 'async', } = {}, cors: corsOptions, } = trigger.options;
-        const isSync = mode === 'sync';
-        const isAsync = mode === 'async';
-        if (!isSync && !isAsync) {
-            throw new Error('Invalid response mode, must be either "sync" or "async"');
-        }
-        let onSuccess = isSync ? DEFAULT_SYNC_ON_SUCCESS : DEFAULT_ASYNC_ON_SUCCESS;
-        let onError = isSync ? DEFAULT_SYNC_ON_ERROR : DEFAULT_ASYNC_ON_ERROR;
-        if (trigger.options.response?.onSuccess) {
-            onSuccess = trigger.options.response.onSuccess;
-        }
-        if (trigger.options.response?.onError) {
-            onError = trigger.options.response.onError;
-        }
-        const ctxOptionsFn = (res) => ({
-            onSuccess: (ctx) => {
-                if (isSync) {
-                    sendResponse(res, onSuccess(ctx));
-                }
-            },
-            onError: (ctx) => {
-                if (isSync) {
-                    sendResponse(res, onError(ctx));
-                }
-            },
-        });
         return new Observable((subscriber) => {
             if (!ctx.router) {
                 throw new Error('Router not available in compiler context');
             }
             // add the webhook endpoint to the router
             ctx.log.info('webhook endpoint added:', { trigger });
-            if (corsOptions) {
-                if (typeof corsOptions === 'boolean') {
-                    ctx.router.use(cors());
-                }
-                else {
-                    ctx.router.use(cors(corsOptions));
-                }
-            }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
             ctx.router.post(`/${trigger.id}`, (req, res) => {
-                const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                const executionCtx = ctx.contextProvider.create(req.body, undefined);
                 try {
                     subscriber.next(executionCtx);
-                    if (isAsync) {
-                        sendResponse(res, onSuccess(executionCtx));
-                    }
+                    res.status(200).json({ status: 'accepted' });
                 }
                 catch (error) {
-                    executionCtx.log.error('webhook execution error', {
-                        error: JSON.stringify(error),
-                    });
-                    if (isAsync) {
-                        sendResponse(res, onError(executionCtx.withData(error)));
-                    }
+                    const message = error instanceof Error ? error.message : 'Unknown error';
+                    executionCtx.log.error('webhook execution error', { error });
+                    res.status(500).json({ status: 'error', message });
                 }
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
             ctx.router.post(`/${trigger.id}/users/:userId`, async (req, res) => {
-                const userId = req.params.userId;
+                const userId = req.params.userId || undefined;
+                if (!userId) {
+                    res.status(400).json({ status: 'error', message: 'User ID is required' });
+                    return;
+                }
                 const activations = await ctx.connectionProvider.getUserActivations(userId);
-                const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
-                const errors = [];
+                if (!activations || activations.length === 0) {
+                    res.status(404).json({ status: 'error', message: `No activations found for user: ${userId}` });
+                    return;
+                }
                 activations.forEach((activation) => {
-                    const activationCtx = executionCtx.withActivation(activation);
+                    const executionCtx = ctx.contextProvider.create(req.body, activation);
                     try {
-                        subscriber.next(activationCtx);
+                        subscriber.next(executionCtx);
                     }
                     catch (error) {
-                        activationCtx.log.error('webhook execution error', {
-                            error: JSON.stringify(error),
-                        });
-                        errors.push({
-                            activationId: activation.id,
-                            error,
-                        });
+                        const message = error instanceof Error ? error.message : 'Unknown error';
+                        executionCtx.log.error('webhook execution error', { error });
+                        res.status(500).json({ status: 'error', message });
                     }
                 });
-                if (isAsync) {
-                    if (errors.length === 0) {
-                        sendResponse(res, onSuccess(executionCtx));
-                    }
-                    else {
-                        sendResponse(res, onError(executionCtx.withData(errors)));
-                    }
-                }
+                res.status(200).json({ status: 'accepted' });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
             ctx.router.post(`/${trigger.id}/activations/:activationId`, async (req, res) => {
-                const activationId = req.params.activationId;
+                const activationId = req.params.activationId || undefined;
                 const activation = await ctx.connectionProvider.getActivation(activationId);
-                const activationCtx = ctx.contextProvider.create(req.body, {
-                    ...ctxOptionsFn(res),
-                    activation,
-                });
+                if (!activation) {
+                    // TODO report back actual errors
+                    res.status(404).json({ status: 'error', message: `No activation found for ID: ${activationId}` });
+                    return;
+                }
+                const executionCtx = ctx.contextProvider.create(req.body, activation);
                 try {
-                    subscriber.next(activationCtx);
-                    if (isAsync) {
-                        sendResponse(res, onSuccess(activationCtx));
-                    }
+                    subscriber.next(executionCtx);
+                    res.status(200).json({ status: 'accepted' });
                 }
                 catch (error) {
-                    activationCtx.log.error('webhook execution error', {
-                        error: JSON.stringify(error),
-                    });
-                    if (isAsync) {
-                        sendResponse(res, onError(activationCtx.withData(error)));
-                    }
+                    const message = error instanceof Error ? error.message : 'Unknown error';
+                    executionCtx.log.error('webhook execution error', { error });
+                    res.status(500).json({ status: 'error', message });
                 }
             });
             function cleanup() {
@@ -145,12 +80,3 @@ export const webhookCompiler = {
         });
     },
 };
-function sendResponse(res, response) {
-    res.status(response.status);
-    response.headers.forEach((value, key) => {
-        res.setHeader(key, value);
-    });
-    if (response.body) {
-        pipeline(response.body, res);
-    }
-}