libpetri 1.4.0 → 1.5.0

package/dist/index.d.ts

@@ -150,7 +150,9 @@ interface PetriNetExecutor {
     run(timeoutMs?: number): Promise<Marking>;
     /** Inject an external token. Returns true if accepted. */
     inject<T>(place: EnvironmentPlace<T>, token: Token<T>): Promise<boolean>;
-    /** Shut down the executor. */
+    /** Graceful shutdown: reject new inject() calls, process queued events, terminate at quiescence. */
+    drain(): void;
+    /** Immediate shutdown: discard queued events, wait for in-flight, terminate. */
     close(): void;
 }
 
@@ -181,7 +183,6 @@ interface PetriNetExecutor {
 interface BitmapNetExecutorOptions {
     eventStore?: EventStore;
     environmentPlaces?: Set<EnvironmentPlace<any>>;
-    longRunning?: boolean;
     /** Provides execution context data for each transition firing. */
     executionContextProvider?: (transitionName: string, consumed: Token<any>[]) => Map<string, unknown>;
 }
@@ -208,7 +209,7 @@ declare class BitmapNetExecutor implements PetriNetExecutor {
     private readonly marking;
     private readonly eventStore;
     private readonly environmentPlaces;
-    private readonly longRunning;
+    private readonly hasEnvironmentPlaces;
     private readonly executionContextProvider?;
     private readonly startMs;
     private readonly hasAnyDeadlines;
@@ -236,6 +237,7 @@ declare class BitmapNetExecutor implements PetriNetExecutor {
     private readonly pendingResetPlaces;
     private readonly transitionInputPlaceNames;
     private running;
+    private draining;
     private closed;
     constructor(net: PetriNet, initialTokens: Map<Place<any>, Token<any>[]>, options?: BitmapNetExecutorOptions);
     run(timeoutMs?: number): Promise<Marking>;
@@ -300,6 +302,7 @@ declare class BitmapNetExecutor implements PetriNetExecutor {
     private snapshotMarking;
     isQuiescent(): boolean;
     executionId(): string;
+    drain(): void;
     close(): void;
     private emitEvent;
 }
@@ -412,7 +415,6 @@ declare class PrecompiledNet {
 interface PrecompiledNetExecutorOptions {
     eventStore?: EventStore;
     environmentPlaces?: Set<EnvironmentPlace<any>>;
-    longRunning?: boolean;
     executionContextProvider?: (transitionName: string, consumed: Token<any>[]) => Map<string, unknown>;
     /** Skip output spec validation for trusted actions (CONC-026). */
     skipOutputValidation?: boolean;
@@ -429,7 +431,7 @@ declare class PrecompiledNetExecutor implements PetriNetExecutor {
     private readonly program;
     private readonly eventStore;
     private readonly environmentPlaces;
-    private readonly longRunning;
+    private readonly hasEnvironmentPlaces;
     private readonly executionContextProvider?;
     private readonly skipOutputValidation;
     private readonly startMs;
@@ -462,6 +464,7 @@ declare class PrecompiledNetExecutor implements PetriNetExecutor {
     private readonly racePromises;
     private readonly readyBuffer;
     private running;
+    private draining;
     private closed;
     private marking;
     constructor(net: PetriNet, initialTokens: Map<Place<any>, Token<any>[]>, options?: PrecompiledNetExecutorOptions);
@@ -504,6 +507,7 @@ declare class PrecompiledNetExecutor implements PetriNetExecutor {
     private snapshotMarking;
     isQuiescent(): boolean;
     executionId(): string;
+    drain(): void;
     close(): void;
     private emitEvent;
 }

package/dist/index.js

@@ -1178,7 +1178,7 @@ var BitmapNetExecutor = class {
   marking;
   eventStore;
   environmentPlaces;
-  longRunning;
+  hasEnvironmentPlaces;
   executionContextProvider;
   startMs;
   hasAnyDeadlines;
@@ -1213,6 +1213,7 @@ var BitmapNetExecutor = class {
   pendingResetPlaces = /* @__PURE__ */ new Set();
   transitionInputPlaceNames;
   running = false;
+  draining = false;
   closed = false;
   constructor(net, initialTokens, options = {}) {
     this.compiled = CompiledNet.compile(net);
@@ -1221,7 +1222,7 @@ var BitmapNetExecutor = class {
     this.environmentPlaces = new Set(
       [...options.environmentPlaces ?? []].map((ep) => ep.place.name)
     );
-    this.longRunning = options.longRunning ?? false;
+    this.hasEnvironmentPlaces = this.environmentPlaces.size > 0;
     this.executionContextProvider = options.executionContextProvider;
     this.startMs = performance.now();
     const wordCount = this.compiled.wordCount;
@@ -1290,7 +1291,7 @@ var BitmapNetExecutor = class {
       timestamp: Date.now(),
       marking: this.snapshotMarking()
     });
-    while (this.running && !this.closed) {
+    while (this.running) {
       this.processCompletedTransitions();
       this.processExternalEvents();
       this.updateDirtyTransitions();
@@ -1322,7 +1323,7 @@ var BitmapNetExecutor = class {
     if (!this.environmentPlaces.has(envPlace.place.name)) {
       throw new Error(`Place ${envPlace.place.name} is not registered as an environment place`);
     }
-    if (this.closed) return false;
+    if (this.closed || this.draining) return false;
     return new Promise((resolve, reject) => {
       this.externalQueue.push({
         place: envPlace.place,
@@ -1358,7 +1359,12 @@ var BitmapNetExecutor = class {
     }
   }
   shouldTerminate() {
-    if (this.longRunning) return this.closed;
+    if (this.closed) {
+      return this.inFlight.size === 0 && this.completionQueue.length === 0;
+    }
+    if (this.hasEnvironmentPlaces) {
+      return this.draining && this.enabledTransitionCount === 0 && this.inFlight.size === 0 && this.completionQueue.length === 0;
+    }
     return this.enabledTransitionCount === 0 && this.inFlight.size === 0 && this.completionQueue.length === 0;
   }
   // ======================== Dirty Set Transitions ========================
@@ -1751,6 +1757,7 @@ var BitmapNetExecutor = class {
   // ======================== External Events ========================
   processExternalEvents() {
     if (this.externalQueue.length === 0) return;
+    if (this.closed) return;
     const len = this.externalQueue.length;
     for (let i = 0; i < len; i++) {
       const event = this.externalQueue[i];
@@ -1790,9 +1797,10 @@ var BitmapNetExecutor = class {
    * After the yield, re-checks queues and `this.closed` for close-during-yield safety.
    */
   async awaitWork() {
-    if (this.completionQueue.length > 0 || this.externalQueue.length > 0) return;
+    if (this.completionQueue.length > 0 || !this.closed && this.externalQueue.length > 0) return;
     await Promise.resolve();
-    if (this.completionQueue.length > 0 || this.externalQueue.length > 0 || this.closed) return;
+    if (this.completionQueue.length > 0 || !this.closed && this.externalQueue.length > 0) return;
+    if (this.closed && this.inFlight.size === 0) return;
     const promises = this.awaitPromises;
     promises.length = 0;
     if (this.inFlight.size > 0) {
@@ -1801,12 +1809,14 @@ var BitmapNetExecutor = class {
       for (const f of this.inFlight.values()) arr.push(f.promise);
       promises.push(Promise.race(arr));
     }
-    promises.push(new Promise((resolve) => {
-      this.wakeUpResolve = resolve;
-    }));
-    const timerMs = this.millisUntilNextTimedTransition();
-    if (timerMs > 0 && timerMs < Infinity) {
-      promises.push(new Promise((r) => setTimeout(r, timerMs)));
+    if (!this.closed) {
+      promises.push(new Promise((resolve) => {
+        this.wakeUpResolve = resolve;
+      }));
+      const timerMs = this.millisUntilNextTimedTransition();
+      if (timerMs > 0 && timerMs < Infinity) {
+        promises.push(new Promise((r) => setTimeout(r, timerMs)));
+      }
     }
     if (promises.length > 0) {
       await Promise.race(promises);
@@ -1876,8 +1886,12 @@ var BitmapNetExecutor = class {
   executionId() {
     return this.startMs.toString(16);
   }
+  drain() {
+    this.draining = true;
+    this.wakeUp();
+  }
   close() {
-    this.running = false;
+    this.draining = true;
     this.closed = true;
     this.wakeUp();
   }
@@ -2235,7 +2249,7 @@ var PrecompiledNetExecutor = class {
   program;
   eventStore;
   environmentPlaces;
-  longRunning;
+  hasEnvironmentPlaces;
   executionContextProvider;
   skipOutputValidation;
   startMs;
@@ -2278,6 +2292,7 @@ var PrecompiledNetExecutor = class {
   readyBuffer = [];
   // ==================== Lifecycle ====================
   running = false;
+  draining = false;
   closed = false;
   // ==================== Lazy Marking ====================
   marking = null;
@@ -2287,7 +2302,7 @@ var PrecompiledNetExecutor = class {
     this.environmentPlaces = new Set(
       [...options.environmentPlaces ?? []].map((ep) => ep.place.name)
     );
-    this.longRunning = options.longRunning ?? false;
+    this.hasEnvironmentPlaces = this.environmentPlaces.size > 0;
     this.executionContextProvider = options.executionContextProvider;
     this.skipOutputValidation = options.skipOutputValidation ?? false;
     this.startMs = performance.now();
@@ -2372,7 +2387,7 @@ var PrecompiledNetExecutor = class {
       timestamp: Date.now(),
       marking: this.snapshotMarking()
     });
-    while (this.running && !this.closed) {
+    while (this.running) {
       this.processCompletedTransitions();
       this.processExternalEvents();
       this.updateDirtyTransitions();
@@ -2404,7 +2419,7 @@ var PrecompiledNetExecutor = class {
     if (!this.environmentPlaces.has(envPlace.place.name)) {
       throw new Error(`Place ${envPlace.place.name} is not registered as an environment place`);
     }
-    if (this.closed) return false;
+    if (this.closed || this.draining) return false;
     return new Promise((resolve, reject) => {
       this.externalQueue.push({
         place: envPlace.place,
@@ -2438,7 +2453,12 @@ var PrecompiledNetExecutor = class {
     }
   }
   shouldTerminate() {
-    if (this.longRunning) return this.closed;
+    if (this.closed) {
+      return this.inFlightCount === 0 && this.completionQueue.length === 0;
+    }
+    if (this.hasEnvironmentPlaces) {
+      return this.draining && this.enabledTransitionCount === 0 && this.inFlightCount === 0 && this.completionQueue.length === 0;
+    }
     return this.enabledTransitionCount === 0 && this.inFlightCount === 0 && this.completionQueue.length === 0;
   }
   // ======================== Dirty Set Processing ========================
@@ -2960,6 +2980,7 @@ var PrecompiledNetExecutor = class {
   // ======================== External Events ========================
   processExternalEvents() {
     if (this.externalQueue.length === 0) return;
+    if (this.closed) return;
     const prog = this.program;
     const len = this.externalQueue.length;
     for (let i = 0; i < len; i++) {
@@ -2989,9 +3010,10 @@ var PrecompiledNetExecutor = class {
   }
   // ======================== Await Work ========================
   async awaitWork() {
-    if (this.completionQueue.length > 0 || this.externalQueue.length > 0) return;
+    if (this.completionQueue.length > 0 || !this.closed && this.externalQueue.length > 0) return;
     await Promise.resolve();
-    if (this.completionQueue.length > 0 || this.externalQueue.length > 0 || this.closed) return;
+    if (this.completionQueue.length > 0 || !this.closed && this.externalQueue.length > 0) return;
+    if (this.closed && this.inFlightCount === 0) return;
     const promises = this.awaitPromises;
     promises.length = 0;
     if (this.inFlightCount > 0) {
@@ -3006,12 +3028,14 @@ var PrecompiledNetExecutor = class {
         promises.push(Promise.race(arr));
       }
     }
-    promises.push(new Promise((resolve) => {
-      this.wakeUpResolve = resolve;
-    }));
-    const timerMs = this.millisUntilNextTimedTransition();
-    if (timerMs > 0 && timerMs < Infinity) {
-      promises.push(new Promise((r) => setTimeout(r, timerMs)));
+    if (!this.closed) {
+      promises.push(new Promise((resolve) => {
+        this.wakeUpResolve = resolve;
+      }));
+      const timerMs = this.millisUntilNextTimedTransition();
+      if (timerMs > 0 && timerMs < Infinity) {
+        promises.push(new Promise((r) => setTimeout(r, timerMs)));
+      }
     }
     if (promises.length > 0) {
       await Promise.race(promises);
@@ -3085,8 +3109,12 @@ var PrecompiledNetExecutor = class {
   executionId() {
     return this.startMs.toString(16);
   }
+  drain() {
+    this.draining = true;
+    this.wakeUp();
+  }
   close() {
-    this.running = false;
+    this.draining = true;
     this.closed = true;
     this.wakeUp();
   }