@cadenza.io/core 1.7.0 → 1.7.1

package/dist/index.d.mts

@@ -155,7 +155,9 @@ declare abstract class GraphLayer extends ExecutionChain implements Graph {
     protected nodes: GraphNode[];
     private executionTime;
     private executionStart;
+    protected debug: boolean;
     constructor(index: number);
+    setDebug(value: boolean): void;
     abstract execute(context?: GraphContext): unknown;
     get hasPreceding(): boolean;
     getNumberOfNodes(): number;
@@ -199,7 +201,9 @@ declare class GraphNode extends SignalEmitter implements Graph {
     private failed;
     private errored;
     destroyed: boolean;
-    constructor(task: Task, context: GraphContext, routineExecId: string, prevNodes?: GraphNode[]);
+    protected debug: boolean;
+    constructor(task: Task, context: GraphContext, routineExecId: string, prevNodes?: GraphNode[], debug?: boolean);
+    setDebug(value: boolean): void;
     isUnique(): boolean;
     isMeta(): boolean;
     isProcessed(): boolean;
@@ -491,6 +495,8 @@ declare abstract class GraphBuilder {
     graph: GraphLayer | undefined;
     topLayerIndex: number;
     layers: GraphLayer[];
+    debug: boolean;
+    setDebug(value: boolean): void;
     getResult(): GraphLayer;
     compose(): void;
     addNode(node: GraphNode): void;
@@ -644,7 +650,6 @@ declare class SignalBroker {
      * @param context The payload.
      * @edge Fire-and-forget; guards against loops per execId (from context.__graphExecId).
      * @edge For distribution, SignalTask can prefix and proxy remote.
-     * @throws Error on detected loop.
      */
     emit(signal: string, context?: AnyObject): void;
     execute(signal: string, context: AnyObject): boolean;
@@ -687,17 +692,22 @@ declare class GraphRegistry {
 interface DebounceOptions {
     leading?: boolean;
     trailing?: boolean;
+    maxWait?: number;
 }
 declare class DebounceTask extends Task {
     private readonly debounceTime;
     private leading;
     private trailing;
+    private maxWait;
     private timer;
+    private maxTimer;
+    private hasLaterCall;
     private lastResolve;
     private lastReject;
     private lastContext;
     private lastTimeout;
-    constructor(name: string, task: TaskFunction, description?: string, debounceTime?: number, leading?: boolean, trailing?: boolean, concurrency?: number, timeout?: number, register?: boolean, isUnique?: boolean, isMeta?: boolean, inputSchema?: SchemaDefinition | undefined, validateInputSchema?: boolean, outputSchema?: SchemaDefinition | undefined, validateOutputSchema?: boolean);
+    private lastProgressCallback;
+    constructor(name: string, task: TaskFunction, description?: string, debounceTime?: number, leading?: boolean, trailing?: boolean, maxWait?: number, concurrency?: number, timeout?: number, register?: boolean, isUnique?: boolean, isMeta?: boolean, inputSchema?: SchemaDefinition | undefined, validateInputSchema?: boolean, outputSchema?: SchemaDefinition | undefined, validateOutputSchema?: boolean);
     private executeFunction;
     private debouncedTrigger;
     execute(context: GraphContext, progressCallback: (progress: number) => void): TaskResult;

package/dist/index.d.ts

@@ -155,7 +155,9 @@ declare abstract class GraphLayer extends ExecutionChain implements Graph {
     protected nodes: GraphNode[];
     private executionTime;
     private executionStart;
+    protected debug: boolean;
     constructor(index: number);
+    setDebug(value: boolean): void;
     abstract execute(context?: GraphContext): unknown;
     get hasPreceding(): boolean;
     getNumberOfNodes(): number;
@@ -199,7 +201,9 @@ declare class GraphNode extends SignalEmitter implements Graph {
     private failed;
     private errored;
     destroyed: boolean;
-    constructor(task: Task, context: GraphContext, routineExecId: string, prevNodes?: GraphNode[]);
+    protected debug: boolean;
+    constructor(task: Task, context: GraphContext, routineExecId: string, prevNodes?: GraphNode[], debug?: boolean);
+    setDebug(value: boolean): void;
     isUnique(): boolean;
     isMeta(): boolean;
     isProcessed(): boolean;
@@ -491,6 +495,8 @@ declare abstract class GraphBuilder {
     graph: GraphLayer | undefined;
     topLayerIndex: number;
     layers: GraphLayer[];
+    debug: boolean;
+    setDebug(value: boolean): void;
     getResult(): GraphLayer;
     compose(): void;
     addNode(node: GraphNode): void;
@@ -644,7 +650,6 @@ declare class SignalBroker {
      * @param context The payload.
      * @edge Fire-and-forget; guards against loops per execId (from context.__graphExecId).
      * @edge For distribution, SignalTask can prefix and proxy remote.
-     * @throws Error on detected loop.
      */
     emit(signal: string, context?: AnyObject): void;
     execute(signal: string, context: AnyObject): boolean;
@@ -687,17 +692,22 @@ declare class GraphRegistry {
 interface DebounceOptions {
     leading?: boolean;
     trailing?: boolean;
+    maxWait?: number;
 }
 declare class DebounceTask extends Task {
     private readonly debounceTime;
     private leading;
     private trailing;
+    private maxWait;
     private timer;
+    private maxTimer;
+    private hasLaterCall;
     private lastResolve;
     private lastReject;
     private lastContext;
     private lastTimeout;
-    constructor(name: string, task: TaskFunction, description?: string, debounceTime?: number, leading?: boolean, trailing?: boolean, concurrency?: number, timeout?: number, register?: boolean, isUnique?: boolean, isMeta?: boolean, inputSchema?: SchemaDefinition | undefined, validateInputSchema?: boolean, outputSchema?: SchemaDefinition | undefined, validateOutputSchema?: boolean);
+    private lastProgressCallback;
+    constructor(name: string, task: TaskFunction, description?: string, debounceTime?: number, leading?: boolean, trailing?: boolean, maxWait?: number, concurrency?: number, timeout?: number, register?: boolean, isUnique?: boolean, isMeta?: boolean, inputSchema?: SchemaDefinition | undefined, validateInputSchema?: boolean, outputSchema?: SchemaDefinition | undefined, validateOutputSchema?: boolean);
     private executeFunction;
     private debouncedTrigger;
     execute(context: GraphContext, progressCallback: (progress: number) => void): TaskResult;

package/dist/index.js

@@ -63,9 +63,6 @@ var SignalBroker = class _SignalBroker {
     if (signalName.includes(" ")) {
       throw new Error("Signal name must not contain spaces");
     }
-    if (signalName.includes("/")) {
-      throw new Error("Signal name must not contain slashes");
-    }
     if (signalName.includes("\\")) {
       throw new Error("Signal name must not contain backslashes");
     }
@@ -85,7 +82,7 @@ var SignalBroker = class _SignalBroker {
     this.metaRunner = metaRunner;
   }
   init() {
-    Cadenza.createMetaTask(
+    Cadenza.createDebounceMetaTask(
       "Execute and clear queued signals",
       () => {
         for (const [id, signals] of this.emitStacks.entries()) {
@@ -97,8 +94,10 @@ var SignalBroker = class _SignalBroker {
         }
         return true;
       },
-      "Executes queued signals and clears the stack"
-    ).doOn("meta.clear_signal_queue_requested");
+      "Executes queued signals and clears the stack",
+      500,
+      { maxWait: 1e4 }
+    ).doOn("meta.process_signal_queue_requested");
     this.getSignalsTask = Cadenza.createMetaTask("Get signals", (ctx) => {
       return {
         __signals: Array.from(this.signalObservers.keys()),
@@ -137,7 +136,6 @@ var SignalBroker = class _SignalBroker {
    * @param context The payload.
    * @edge Fire-and-forget; guards against loops per execId (from context.__graphExecId).
    * @edge For distribution, SignalTask can prefix and proxy remote.
-   * @throws Error on detected loop.
    */
   emit(signal, context = {}) {
     const execId = context.__routineExecId || "global";
@@ -149,6 +147,7 @@ var SignalBroker = class _SignalBroker {
       executed = this.execute(signal, context);
     } finally {
       if (executed) stack.delete(signal);
+      if (stack.size === 0) this.emitStacks.delete(execId);
     }
   }
   execute(signal, context) {
@@ -159,6 +158,12 @@ var SignalBroker = class _SignalBroker {
       const parent = parts.slice(0, i).join(".");
       executed = executed || this.executeListener(parent + ".*", context);
     }
+    if (this.debug) {
+      console.log(
+        `Emitted signal ${signal} with context ${JSON.stringify(context)}`,
+        executed ? "\u2705" : "\u274C"
+      );
+    }
     return executed;
   }
   executeListener(signal, context) {
@@ -166,11 +171,6 @@ var SignalBroker = class _SignalBroker {
     const runner = signal.startsWith("meta") ? this.metaRunner : this.runner;
     if (obs && obs.tasks.size && runner) {
       obs.fn(runner, Array.from(obs.tasks), context);
-      if (this.debug) {
-        console.log(
-          `Emitted signal ${signal} with context ${JSON.stringify(context)}`
-        );
-      }
       return true;
     }
     return false;
@@ -185,6 +185,7 @@ var SignalBroker = class _SignalBroker {
       this.emit("meta.signal_broker.added", { __signalName: signal });
     }
   }
+  // TODO schedule signals
   /**
    * Lists all observed signals.
    * @returns Array of signals.
@@ -638,7 +639,7 @@ var SignalEmitter = class {
 
 // src/graph/execution/GraphNode.ts
 var GraphNode = class _GraphNode extends SignalEmitter {
-  constructor(task, context, routineExecId, prevNodes = []) {
+  constructor(task, context, routineExecId, prevNodes = [], debug = false) {
     super(task.isMeta);
     this.divided = false;
     this.splitGroupId = "";
@@ -652,12 +653,17 @@ var GraphNode = class _GraphNode extends SignalEmitter {
     this.failed = false;
     this.errored = false;
     this.destroyed = false;
+    this.debug = false;
     this.task = task;
     this.context = context;
     this.previousNodes = prevNodes;
     this.id = (0, import_uuid3.v4)();
     this.routineExecId = routineExecId;
     this.splitGroupId = routineExecId;
+    this.debug = debug;
+  }
+  setDebug(value) {
+    this.debug = value;
   }
   isUnique() {
     return this.task.isUnique;
@@ -729,6 +735,9 @@ var GraphNode = class _GraphNode extends SignalEmitter {
     if (this.previousNodes.length === 0) {
       this.emit("meta.node.started_routine_execution", memento);
     }
+    if (this.debug) {
+      this.log();
+    }
     this.emit("meta.node.started", memento);
     return this.executionStart;
   }
@@ -754,7 +763,6 @@ var GraphNode = class _GraphNode extends SignalEmitter {
   }
   execute() {
     if (!this.divided && !this.processing) {
-      this.start();
       this.processing = true;
       const inputValidation = this.task.validateInput(
         this.context.getContext()
@@ -925,7 +933,13 @@ var GraphNode = class _GraphNode extends SignalEmitter {
     return this;
   }
   clone() {
-    return new _GraphNode(this.task, this.context, this.routineExecId, [this]);
+    return new _GraphNode(
+      this.task,
+      this.context,
+      this.routineExecId,
+      [this],
+      this.debug
+    );
   }
   consume(node) {
     this.context = this.context.combine(node.context);
@@ -1021,7 +1035,7 @@ var GraphNode = class _GraphNode extends SignalEmitter {
     };
   }
   log() {
-    console.log(this.task.name, this.context.getContext(), this.executionTime);
+    console.log(this.task.name, this.context.getContext(), this.routineExecId);
   }
 };
 
@@ -1892,13 +1906,10 @@ var GraphRunner = class extends SignalEmitter {
       __scheduled: Date.now()
     };
     this.emit("meta.runner.added_tasks", data);
-    if (this.debug) {
-      console.log(
-        `Running routine ${routineName} with context ${JSON.stringify(ctx.getContext())}`
-      );
-    }
     allTasks.forEach(
-      (task) => this.currentRun.addNode(new GraphNode(task, ctx, routineExecId))
+      (task) => this.currentRun.addNode(
+        new GraphNode(task, ctx, routineExecId, [], this.debug)
+      )
     );
   }
   /**
@@ -1929,9 +1940,6 @@ var GraphRunner = class extends SignalEmitter {
     return this.reset();
   }
   reset() {
-    if (this.debug) {
-      this.currentRun.log();
-    }
     this.isRunning = false;
     const lastRun = this.currentRun;
     if (!this.debug) {
@@ -1968,7 +1976,7 @@ var GraphRunner = class extends SignalEmitter {
 
 // src/graph/definition/DebounceTask.ts
 var DebounceTask = class extends Task {
-  constructor(name, task, description = "", debounceTime = 1e3, leading = false, trailing = true, concurrency = 0, timeout = 0, register = true, isUnique = false, isMeta = false, inputSchema = void 0, validateInputSchema = false, outputSchema = void 0, validateOutputSchema = false) {
+  constructor(name, task, description = "", debounceTime = 1e3, leading = false, trailing = true, maxWait = 0, concurrency = 0, timeout = 0, register = true, isUnique = false, isMeta = false, inputSchema = void 0, validateInputSchema = false, outputSchema = void 0, validateOutputSchema = false) {
     super(
       name,
       task,
@@ -1985,15 +1993,19 @@ var DebounceTask = class extends Task {
       validateOutputSchema
     );
     this.timer = null;
+    this.maxTimer = null;
+    this.hasLaterCall = false;
     this.lastResolve = null;
     this.lastReject = null;
     this.lastContext = null;
     this.lastTimeout = null;
+    this.lastProgressCallback = null;
     this.debounceTime = debounceTime;
     this.leading = leading;
     this.trailing = trailing;
+    this.maxWait = maxWait;
   }
-  executeFunction(progressCallback) {
+  executeFunction() {
     if (this.lastTimeout) {
       clearTimeout(this.lastTimeout);
     }
@@ -2001,7 +2013,7 @@ var DebounceTask = class extends Task {
     try {
       result = this.taskFunction(
         this.lastContext.getClonedContext(),
-        progressCallback
+        this.lastProgressCallback
       );
     } catch (error) {
       if (this.lastResolve) {
@@ -2019,21 +2031,46 @@ var DebounceTask = class extends Task {
   }
   debouncedTrigger(resolve, reject, context, timeout, progressCallback) {
     const callNow = this.leading && this.timer === null;
+    const isNewBurst = this.timer === null;
     if (this.timer !== null) {
       clearTimeout(this.timer);
+      this.timer = null;
     }
     this.lastResolve = resolve;
     this.lastReject = reject;
     this.lastContext = context;
     this.lastTimeout = timeout;
+    this.lastProgressCallback = progressCallback;
+    if (!callNow) {
+      this.hasLaterCall = true;
+    }
     this.timer = setTimeout(() => {
       this.timer = null;
-      if (this.trailing) {
-        this.executeFunction(progressCallback);
+      if (this.trailing && this.hasLaterCall) {
+        this.executeFunction();
+        this.hasLaterCall = false;
+      }
+      if (this.maxTimer) {
+        clearTimeout(this.maxTimer);
+        this.maxTimer = null;
       }
     }, this.debounceTime);
     if (callNow) {
-      this.executeFunction(progressCallback);
+      this.executeFunction();
+      this.hasLaterCall = false;
+    }
+    if (this.maxWait > 0 && isNewBurst) {
+      this.maxTimer = setTimeout(() => {
+        this.maxTimer = null;
+        if (this.trailing && this.hasLaterCall) {
+          if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+          }
+          this.executeFunction();
+          this.hasLaterCall = false;
+        }
+      }, this.maxWait);
     }
   }
   execute(context, progressCallback) {
@@ -2167,8 +2204,15 @@ var GraphLayer = class _GraphLayer extends ExecutionChain {
     this.nodes = [];
     this.executionTime = 0;
     this.executionStart = 0;
+    this.debug = false;
     this.index = index;
   }
+  setDebug(value) {
+    this.debug = value;
+    for (const node of this.nodes) {
+      node.setDebug(value);
+    }
+  }
   get hasPreceding() {
     return !!this.previous && this.previous instanceof _GraphLayer;
   }
@@ -2298,6 +2342,10 @@ var GraphBuilder = class {
   constructor() {
     this.topLayerIndex = 0;
     this.layers = [];
+    this.debug = false;
+  }
+  setDebug(value) {
+    this.debug = value;
   }
   getResult() {
     return this.graph;
@@ -2343,7 +2391,9 @@ var GraphBuilder = class {
     }
   }
   createLayer(index) {
-    return new SyncGraphLayer(index);
+    const layer = new SyncGraphLayer(index);
+    layer.setDebug(this.debug);
+    return layer;
   }
   getLayer(layerIndex) {
     return this.layers[layerIndex - this.topLayerIndex];
@@ -2555,7 +2605,9 @@ var GraphAsyncQueueBuilder = class extends GraphBuilder {
     }
   }
   createLayer(index) {
-    return new AsyncGraphLayer(index);
+    const layer = new AsyncGraphLayer(index);
+    layer.setDebug(this.debug);
+    return layer;
   }
 };
 
@@ -2599,6 +2651,10 @@ var Cadenza = class {
     this.runner = new GraphRunner();
     this.metaRunner = new GraphRunner(true);
     this.broker.bootstrap(this.runner, this.metaRunner);
+    if (this.mode === "debug" || this.mode === "dev") {
+      this.broker.setDebug(true);
+      this.runner.setDebug(true);
+    }
     this.registry = GraphRegistry.instance;
     this.broker.init();
     this.runner.init();
@@ -2612,8 +2668,10 @@ var Cadenza = class {
   }
   static setMode(mode) {
     this.mode = mode;
+    this.bootstrap();
     if (mode === "debug" || mode === "dev") {
       this.broker.setDebug(true);
+      this.runner.setDebug(true);
     }
   }
   /**
@@ -2807,6 +2865,7 @@ var Cadenza = class {
     register: true,
     leading: false,
     trailing: true,
+    maxWait: 0,
     isUnique: false,
     isMeta: false,
     inputSchema: void 0,
@@ -2823,6 +2882,7 @@ var Cadenza = class {
       debounceTime,
       options.leading,
       options.trailing,
+      options.maxWait,
       options.concurrency,
       options.timeout,
       options.register,
@@ -2849,6 +2909,7 @@ var Cadenza = class {
     register: true,
     leading: false,
     trailing: true,
+    maxWait: 0,
     isUnique: false,
     isMeta: false,
     inputSchema: void 0,