@versori/run 0.2.0-alpha.7 → 0.2.0-alpha.9

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

@@ -15,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,
@@ -47,12 +48,24 @@ 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,
@@ -92,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();
@@ -114,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);
@@ -192,6 +206,13 @@ class MemoryInterpreter {
                 registration.subscription = undefined;
             });
         }
+        try {
+            this.cronProvider.updateCrons(this.cronRegistry);
+        }
+        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}`);
         });

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,6 +34,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;
                 }
                 activations.forEach((activation) => {
@@ -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');
         };
     });
 }