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

package/script/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/script/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"}

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

@@ -1,33 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryInterpreter = void 0;
-const dntShim = __importStar(require("../../../_dnt.shims.js"));
 const express_1 = __importDefault(require("express"));
 const rxjs_1 = require("rxjs");
 const ContextProvider_js_1 = require("../../context/ContextProvider.js");
@@ -39,8 +15,9 @@ const MemoryKeyValueProvider_js_1 = require("../../kv/memory/MemoryKeyValueProvi
 const NatsKeyValueProvider_js_1 = require("../../kv/nats/NatsKeyValueProvider.js");
 const ConsoleLogger_js_1 = require("../../observability/logging/ConsoleLogger.js");
 const ObservableCompiler_js_1 = require("./ObservableCompiler.js");
+const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
 class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, roundTripperFactory, router, connectionProvider) {
+    constructor(log, compiler, contextProvider, roundTripperFactory, router, cronRegistry, connectionProvider, cronProvider) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -71,18 +48,53 @@ class MemoryInterpreter {
             writable: true,
             value: router
         });
+        Object.defineProperty(this, "cronRegistry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: cronRegistry
+        });
         Object.defineProperty(this, "connectionProvider", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: connectionProvider
         });
+        Object.defineProperty(this, "cronProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: cronProvider
+        });
         Object.defineProperty(this, "registeredWorkflows", {
             enumerable: true,
             configurable: true,
             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
+        });
+        if (typeof this.log === 'undefined') {
+            // this captures the old way of instantiating the MemoryInterpreter and provides an 
+            // error message back to the user to let them know they should use the new way.
+            throw new Error('MemoryInterpreter should not be instantiated directly. Use MemoryInterpreter.newInstance() instead.');
+        }
     }
     static async newInstance(options = {}) {
         const log = options.logger || new ConsoleLogger_js_1.ConsoleLogger('debug');
@@ -93,12 +105,12 @@ class MemoryInterpreter {
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
-            return new MemoryInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express_1.default.Router(), platformapi_js_1.PlatformAPIClient.fromEnv());
+            return new MemoryInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
         }
         const kvp = await (options.skipVersoriCredentials
             ? new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider()
             : NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv());
-        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp), roundTripperFactory, express_1.default.Router(), platformapi_js_1.PlatformAPIClient.fromEnv());
+        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -115,6 +127,7 @@ class MemoryInterpreter {
             contextProvider: this.contextProvider,
             roundTripperFactory: this.roundTripperFactory,
             router: this.router,
+            cronRegistry: this.cronRegistry,
             connectionProvider: this.connectionProvider
         };
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
@@ -132,7 +145,7 @@ class MemoryInterpreter {
         return registration;
     }
     async start() {
-        const port = dntShim.Deno.env.get('PORT') || 3000;
+        const port = Deno.env.get('PORT') || 3000;
         const app = (0, express_1.default)();
         app.use(express_1.default.json()); // Add JSON body parser middleware
         // Add health check route
@@ -143,12 +156,22 @@ class MemoryInterpreter {
         app.use(this.router);
         // Start all registered workflows
         for (const registration of this.registeredWorkflows) {
-            dntShim.Deno.addSignalListener('SIGINT', registration.sigintListener);
-            registration.trigger$
+            Deno.addSignalListener('SIGINT', registration.sigintListener);
+            registration.subscription = registration.trigger$
                 .pipe((0, rxjs_1.tap)((ctx) => {
                 ctx.log.info('MemoryInterpreter.executionStarted', { data: ctx.data });
-            }), (0, rxjs_1.mergeMap)((ctx) => (0, rxjs_1.of)(ctx).pipe(registration.task$, (0, rxjs_1.catchError)((error) => {
-                ctx.log.error('MemoryInterpreter.executionError', { error });
+            }), (0, rxjs_1.mergeMap)((ctx) => (0, rxjs_1.of)(ctx).pipe(registration.task$, (0, rxjs_1.catchError)((err) => {
+                ctx.log.error('MemoryInterpreter.executionError', { error: err instanceof Error ? err.toString() : err });
+                try {
+                    ctx.options.onError?.(ctx.withData(err));
+                }
+                catch (err) {
+                    ctx.log.error('MemoryInterpreter.onErrorError: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
+                    ctx.options.onError?.(ctx.withData({
+                        message: 'Internal server error',
+                        error: err instanceof Error ? err.toString() : err,
+                    }));
+                }
                 return rxjs_1.EMPTY;
             }))))
                 .subscribe({
@@ -158,21 +181,83 @@ class MemoryInterpreter {
                         durationMs,
                         data: ctx.data,
                     });
+                    try {
+                        ctx.options.onSuccess?.(ctx);
+                    }
+                    catch (err) {
+                        ctx.log.error('MemoryInterpreter.onSuccessError: failed to call onSuccess handler', { error: err instanceof Error ? err.toString() : err });
+                        ctx.options.onSuccess?.(ctx.withData({
+                            message: 'Internal server error',
+                            error: err instanceof Error ? err.toString() : err,
+                        }));
+                    }
                     this.contextProvider.destroy(ctx);
                 },
                 error: (err) => {
-                    this.log.error('MemoryInterpreter.error', { error: err });
-                    dntShim.Deno.removeSignalListener('SIGINT', registration.sigintListener);
+                    this.log.error('MemoryInterpreter.error', { error: err instanceof Error ? err.toString() : err });
+                    Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
                     this.log.info('MemoryInterpreter.workflowCompleted');
-                    dntShim.Deno.removeSignalListener('SIGINT', registration.sigintListener);
+                    Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
             });
+            registration.subscription.add(() => {
+                registration.subscription = undefined;
+            });
+        }
+        try {
+            this.cronProvider.updateCrons(this.cronRegistry);
         }
-        app.listen(port, () => {
+        catch (err) {
+            this.log.error('MemoryInterpreter.updateCronsError', { error: err instanceof Error ? err.toString() : err });
+            throw new Error('Unable to register scheduler tasks with central cron provider');
+        }
+        this.server = 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();
+        }
     }
 }
 exports.MemoryInterpreter = MemoryInterpreter;

package/script/src/interpreter/memory/ObservableCompiler.d.ts

@@ -14,6 +14,7 @@ export type CompilerContext = {
     roundTripperFactory: RoundTripperFactory;
     connectionProvider: ConnectionProvider;
     router: Router;
+    cronRegistry: Map<string, string>;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;
 export declare class ObservableCompiler {

package/script/src/interpreter/memory/ObservableCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}
+{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}

package/script/src/interpreter/memory/compilers/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA6F7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuF7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

package/script/src/interpreter/memory/compilers/schedule.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleCompiler = void 0;
-const cron_1 = require("cron");
 const rxjs_1 = require("rxjs");
 const ScheduleTrigger_js_1 = require("../../../dsl/triggers/ScheduleTrigger.js");
 function compileSchedule(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
+        // Add HTTP endpoint for manual triggering
+        if (!ctx.router) {
+            throw new Error('Router not available in compiler context');
+        }
         const client = ctx.connectionProvider;
-        const job = cron_1.CronJob.from({
-            cronTime: trigger.schedule,
-            onTick: async () => {
+        ctx.cronRegistry.set(trigger.id, trigger.schedule);
+        ctx.router.post(`/cron/${trigger.id}`, async (req, res) => {
+            try {
                 if (trigger.activationPredicate === undefined) {
                     const executionCtx = ctx.contextProvider.create({}, undefined);
                     try {
@@ -18,6 +21,7 @@ function compileSchedule(ctx, trigger, signal) {
                     catch (error) {
                         executionCtx.log.error('execution error inside schedule', { error });
                     }
+                    res.status(200).json({ status: 'triggered', executionId: executionCtx.executionId });
                     return;
                 }
                 const activations = await client.listActivations();
@@ -30,10 +34,11 @@ function compileSchedule(ctx, trigger, signal) {
                     catch (error) {
                         executionCtx.log.error('execution error inside schedule', { error });
                     }
+                    res.status(200).json({ status: 'triggered', executionId: executionCtx.executionId });
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create({}, activation);
+                    const executionCtx = ctx.contextProvider.create({}, { activation });
                     executionCtx.log.info('no activations found, continuing');
                     try {
                         subscriber.next(executionCtx);
@@ -42,31 +47,21 @@ function compileSchedule(ctx, trigger, signal) {
                         executionCtx.log.error('execution error inside schedule', { error });
                     }
                 });
-            },
-            onComplete: () => {
-                if (subscriber.closed) {
-                    return;
-                }
-                ctx.log.debug('schedule execution completed');
-                subscriber.complete();
-            },
-            errorHandler: (error) => {
-                ctx.log.error('schedule execution error', { error });
-                subscriber.error(error);
-            },
-            start: true,
+                res.status(200).json({ status: 'triggered' });
+            }
+            catch (error) {
+                executionCtx.log.error('execution error inside schedule', { error });
+                res.status(500).json({ error: 'Failed to trigger schedule' });
+            }
         });
         function cleanup() {
-            ctx.log.debug('schedule execution stopped');
-            job.stop();
+            ctx.log.debug('scheduler trigger stopped');
+            subscriber.complete();
         }
         signal.addEventListener('abort', cleanup, { once: true });
         return () => {
             signal.removeEventListener('abort', cleanup);
-            ctx.log.debug('schedule execution unsubscribed');
-            // call job.stop() directly rather than using cleanup since cleanup is called when the
-            // signal is aborted and we don't want duplicate logs when the unsubscription happens.
-            job.stop();
+            ctx.log.debug('scheduler execution unsubscribed');
         };
     });
 }

package/script/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":"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"}
+{"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;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA+LxE,CAAC"}

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

@@ -1,74 +1,175 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookCompiler = void 0;
 // In src/interpreter/memory/compilers/webhook.ts
+const cors_1 = __importDefault(require("cors"));
 const rxjs_1 = require("rxjs");
+const promises_1 = require("node:stream/promises");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
+const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
+    status: 200,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
+const DEFAULT_SYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({ message: 'Internal server error', error: ctx.data }), {
+    status: 500,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
+const DEFAULT_ASYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify({
+    status: 'accepted',
+    executionId: ctx.executionId,
+}), {
+    status: 202,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
+const DEFAULT_ASYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({
+    message: 'Internal server error',
+    executionId: ctx.executionId,
+}), {
+    status: 500,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
 exports.webhookCompiler = {
     ctor: WebhookTrigger_js_1.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 rxjs_1.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((0, cors_1.default)());
+                }
+                else {
+                    ctx.router.use((0, cors_1.default)(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, undefined);
+                const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
                 try {
                     subscriber.next(executionCtx);
-                    res.status(200).json({ status: 'accepted' });
+                    if (isAsync) {
+                        sendResponse(res, onSuccess(executionCtx));
+                    }
                 }
                 catch (error) {
-                    const message = error instanceof Error ? error.message : 'Unknown error';
-                    executionCtx.log.error('webhook execution error', { error });
-                    res.status(500).json({ status: 'error', message });
+                    executionCtx.log.error('webhook execution error', {
+                        error: JSON.stringify(error),
+                    });
+                    if (isAsync) {
+                        sendResponse(res, onError(executionCtx.withData(error)));
+                    }
                 }
             });
             // 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 || undefined;
-                if (!userId) {
-                    res.status(400).json({ status: 'error', message: 'User ID is required' });
-                    return;
-                }
+                const userId = req.params.userId;
                 const activations = await ctx.connectionProvider.getUserActivations(userId);
                 if (!activations || activations.length === 0) {
-                    res.status(404).json({ status: 'error', message: `No activations found for user: ${userId}` });
+                    res.status(404).json({
+                        status: 'error',
+                        message: `No activations found for user: ${userId}`,
+                    });
                     return;
                 }
+                const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                const errors = [];
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(req.body, activation);
+                    const activationCtx = executionCtx.withActivation(activation);
                     try {
-                        subscriber.next(executionCtx);
+                        subscriber.next(activationCtx);
                     }
                     catch (error) {
-                        const message = error instanceof Error ? error.message : 'Unknown error';
-                        executionCtx.log.error('webhook execution error', { error });
-                        res.status(500).json({ status: 'error', message });
+                        activationCtx.log.error('webhook execution error', {
+                            error: JSON.stringify(error),
+                        });
+                        errors.push({
+                            activationId: activation.id,
+                            error,
+                        });
                     }
                 });
-                res.status(200).json({ status: 'accepted' });
+                if (isAsync) {
+                    if (errors.length === 0) {
+                        sendResponse(res, onSuccess(executionCtx));
+                    }
+                    else {
+                        sendResponse(res, onError(executionCtx.withData(errors)));
+                    }
+                }
             });
             // 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 || undefined;
+                const activationId = req.params.activationId;
                 const activation = await ctx.connectionProvider.getActivation(activationId);
                 if (!activation) {
                     // TODO report back actual errors
-                    res.status(404).json({ status: 'error', message: `No activation found for ID: ${activationId}` });
+                    res.status(404).json({
+                        status: 'error',
+                        message: `No activation found for ID: ${activationId}`,
+                    });
                     return;
                 }
-                const executionCtx = ctx.contextProvider.create(req.body, activation);
+                const activationCtx = ctx.contextProvider.create(req.body, {
+                    ...ctxOptionsFn(res),
+                    activation,
+                });
                 try {
-                    subscriber.next(executionCtx);
-                    res.status(200).json({ status: 'accepted' });
+                    subscriber.next(activationCtx);
+                    if (isAsync) {
+                        sendResponse(res, onSuccess(activationCtx));
+                    }
                 }
                 catch (error) {
-                    const message = error instanceof Error ? error.message : 'Unknown error';
-                    executionCtx.log.error('webhook execution error', { error });
-                    res.status(500).json({ status: 'error', message });
+                    activationCtx.log.error('webhook execution error', {
+                        error: JSON.stringify(error),
+                    });
+                    if (isAsync) {
+                        sendResponse(res, onError(activationCtx.withData(error)));
+                    }
                 }
             });
             function cleanup() {
@@ -83,3 +184,12 @@ exports.webhookCompiler = {
         });
     },
 };
+function sendResponse(res, response) {
+    res.status(response.status);
+    response.headers.forEach((value, key) => {
+        res.setHeader(key, value);
+    });
+    if (response.body) {
+        (0, promises_1.pipeline)(response.body, res);
+    }
+}

package/script/src/kv/nats/NatsKeyValueProvider.d.ts

@@ -19,7 +19,6 @@ export declare class NatsKeyValueProvider implements KeyValueProvider, AsyncDisp
     private constructor();
     static newInstance(opts?: Partial<NatsKeyValueProviderOptions>): Promise<NatsKeyValueProvider>;
     static fromEnv(): Promise<NatsKeyValueProvider>;
-    [Symbol.asyncDispose](): PromiseLike<void>;
     kv(options: KVOptions): KeyValue;
     destroy(options: DestroyOptions): Promise<void>;
     private subjectPrefix;

package/script/src/kv/nats/NatsKeyValueProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EACH,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACZ,MAAM,gBAAgB,CAAC;AA4CxB,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAI/C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,OAAO,CAAC,aAAa;CAYxB"}
+{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EACH,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACZ,MAAM,gBAAgB,CAAC;AA4CxB,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAQ/C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,OAAO,CAAC,aAAa;CAYxB"}