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

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

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

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

@@ -33,7 +33,7 @@ export declare class HttpContextImpl<D, PageParams> extends ContextImpl<D> imple
     pageParams?: PageParams;
     private dynamicFetcher?;
     private staticFetcher?;
-    constructor(ctx: Context<D>, connectionVars: Record<string, any>, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
+    constructor(ctx: ContextImpl<D, any>, connectionVars: Record<string, any>, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
     get fetch(): typeof globalThis.fetch;
     nextPage(nextParams: PageParams): Promise<void>;
 }

package/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

@@ -61,7 +61,7 @@ export class HttpContextImpl extends ContextImpl {
     constructor(ctx, connectionVars, staticFetcher, dynamicFetcher, pageParams) {
         // We need to cast ctx to InternalContext to access kvp
         const internalCtx = ctx;
-        super(ctx.log, internalCtx.kvp, ctx.executionId, ctx.startTime, ctx.data, ctx.activation);
+        super(ctx.log, internalCtx.kvp, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,

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

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

package/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":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IAEX,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAGtB,EAAE,EAAE,MAAM;IAItB,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;IAIvD,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC;CAGtC;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,CAEzD"}
+{"version":3,"file":"WebhookTrigger.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/triggers/WebhookTrigger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACxB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;IAE7C;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;CAC9C,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACrC,CAAA;AAED,qBAAa,cAAe,YAAW,OAAO,CAAC,WAAW,CAAC;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,cAAc,CAAC;IAExB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAa;gBAEtB,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB;IAKpD,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;CAG1D;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAElF"}

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

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

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

@@ -1,7 +1,7 @@
 import { Router } from 'express';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { ContextProvider } from '../../context/ContextProvider.js';
-import { ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
+import { ConnectionProvider, CronProvider, RoundTripperFactory } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
@@ -18,6 +18,7 @@ type Registration = {
     task$: ContextOperatorFunction<any, any, any>;
     localAbortController: AbortController;
     sigintListener: () => void;
+    subscription?: Subscription;
 };
 export declare class MemoryInterpreter {
     private readonly log;
@@ -25,12 +26,18 @@ export declare class MemoryInterpreter {
     private readonly contextProvider;
     private readonly roundTripperFactory;
     private readonly router;
+    private cronRegistry;
     private readonly connectionProvider;
+    private readonly cronProvider;
     private registeredWorkflows;
-    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, roundTripperFactory: RoundTripperFactory, router: Router, connectionProvider: ConnectionProvider);
+    private server?;
+    private shutdownServer?;
+    private isShuttingDown;
+    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, roundTripperFactory: RoundTripperFactory, router: Router, cronRegistry: Map<string, string>, connectionProvider: ConnectionProvider, cronProvider: CronProvider);
     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":"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"}
+{"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,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGhG,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,YAAY;IACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAbjC,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,EACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY;WASlC,WAAW,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwC5F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;IA8C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}