@vedmalex/statemachine 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/index.js

@@ -8,7 +8,9 @@ var TimerScheduler = class {
   intervalId = null;
   pollingInterval = 100;
   // ms
-  constructor() {
+  clock;
+  constructor(clock = Date.now) {
+    this.clock = clock;
   }
   /**
    * Настройка режима опроса
@@ -32,7 +34,7 @@ var TimerScheduler = class {
    */
   start() {
     if (this.intervalId) return;
-    this.intervalId = setInterval(() => this.process(), this.pollingInterval);
+    this.intervalId = setInterval(() => this.process(this.clock()), this.pollingInterval);
   }
   /**
    * Остановка единого таймера
@@ -51,7 +53,7 @@ var TimerScheduler = class {
    */
   schedule(delay, callback) {
     const token = {};
-    const executeAt = Date.now() + delay;
+    const executeAt = this.clock() + delay;
     const task = { token, executeAt, callback };
     this.activeTokens.add(token);
     this.insert(task);
@@ -67,7 +69,7 @@ var TimerScheduler = class {
   /**
    * Обработать очередь (вызывается таймером или вручную)
    */
-  process(now = Date.now()) {
+  process(now = this.clock()) {
     while (this.heap.length > 0) {
       const task = this.heap[0];
       if (task === void 0) break;
@@ -158,6 +160,23 @@ var TimerScheduler = class {
 function createDefaultScheduler() {
   return new TimerScheduler();
 }
+function createVirtualScheduler(clock) {
+  const inner = new TimerScheduler(clock);
+  return {
+    isActive() {
+      return true;
+    },
+    schedule(delay, callback) {
+      return inner.schedule(delay, callback);
+    },
+    cancel(token) {
+      inner.cancel(token);
+    },
+    process(now) {
+      inner.process(now ?? clock());
+    }
+  };
+}
 
 // src/logger.ts
 var LogLevel = {
@@ -1704,6 +1723,8 @@ var StateMachine = class _StateMachine {
   monitor;
   scheduler;
   errorHandler;
+  clock;
+  schedulerProvided;
   // Свойства
   states;
   events;
@@ -1754,7 +1775,9 @@ var StateMachine = class _StateMachine {
     this.initialState = config.initialState;
     this.logger = options?.logger ?? ConsoleLogger;
     this.monitor = options?.monitor ?? createDefaultMonitor();
+    this.schedulerProvided = options?.scheduler !== void 0;
     this.scheduler = options?.scheduler ?? createDefaultScheduler();
+    this.clock = options?.clock ?? Date.now;
     this.errorHandler = options?.errorHandler ?? createDefaultErrorHandler();
     if (adaptee) {
       if (!isAdapter(adaptee)) {
@@ -1828,7 +1851,7 @@ var StateMachine = class _StateMachine {
           args,
           resolve,
           reject,
-          timestamp: Date.now(),
+          timestamp: this.clock(),
           type: "external"
         });
         this.scheduleProcessing();
@@ -1839,7 +1862,7 @@ var StateMachine = class _StateMachine {
       eventName,
       obj,
       args,
-      timestamp: Date.now(),
+      timestamp: this.clock(),
       type: "internal"
     });
     return Promise.resolve(true);
@@ -1850,7 +1873,7 @@ var StateMachine = class _StateMachine {
       eventName,
       obj,
       args,
-      timestamp: Date.now(),
+      timestamp: this.clock(),
       type: "internal"
     });
   }
@@ -2011,7 +2034,7 @@ var StateMachine = class _StateMachine {
     };
   }
   getQueuedEvents() {
-    const now = Date.now();
+    const now = this.clock();
     const mapEvent = (evt) => ({
       id: evt.id,
       event: evt.eventName,
@@ -2130,53 +2153,51 @@ var StateMachine = class _StateMachine {
     return currentParts.every((part, index) => part === expectedParts[index]);
   }
   attachToObject(object, eventMap) {
-    for (const objectEventName in eventMap) {
-      if (eventMap.hasOwnProperty(objectEventName)) {
-        const stateMachineEventName = eventMap[objectEventName];
-        if (stateMachineEventName === void 0) continue;
-        if (typeof object.addEventListener === "function") {
-          object.addEventListener(objectEventName, (...args) => {
-            this.fireEvent(stateMachineEventName, object, ...args).catch(
-              (e) => this.logger.error(
-                "Error firing event",
-                {
-                  objectEventName,
-                  stateMachineEventName
-                },
-                /* c8 ignore next */
-                e instanceof Error ? e : new Error(String(e))
-              )
-            );
-          });
-        } else if (typeof object.on === "function") {
-          object.on(objectEventName, (...args) => {
-            this.fireEvent(stateMachineEventName, object, ...args).catch(
-              (e) => this.logger.error(
-                "Error firing event",
-                {
-                  objectEventName,
-                  stateMachineEventName
-                },
-                /* c8 ignore next */
-                e instanceof Error ? e : new Error(String(e))
-              )
-            );
-          });
-        } else {
-          object[`on${objectEventName}`] = async (...args) => {
-            return this.fireEvent(stateMachineEventName, object, ...args).catch(
-              (e) => this.logger.error(
-                "Error firing event",
-                {
-                  objectEventName,
-                  stateMachineEventName
-                },
-                /* c8 ignore next */
-                e instanceof Error ? e : new Error(String(e))
-              )
-            );
-          };
-        }
+    for (const objectEventName of Object.keys(eventMap)) {
+      const stateMachineEventName = eventMap[objectEventName];
+      if (stateMachineEventName === void 0) continue;
+      if (typeof object.addEventListener === "function") {
+        object.addEventListener(objectEventName, (...args) => {
+          this.fireEvent(stateMachineEventName, object, ...args).catch(
+            (e) => this.logger.error(
+              "Error firing event",
+              {
+                objectEventName,
+                stateMachineEventName
+              },
+              /* c8 ignore next */
+              e instanceof Error ? e : new Error(String(e))
+            )
+          );
+        });
+      } else if (typeof object.on === "function") {
+        object.on(objectEventName, (...args) => {
+          this.fireEvent(stateMachineEventName, object, ...args).catch(
+            (e) => this.logger.error(
+              "Error firing event",
+              {
+                objectEventName,
+                stateMachineEventName
+              },
+              /* c8 ignore next */
+              e instanceof Error ? e : new Error(String(e))
+            )
+          );
+        });
+      } else {
+        object[`on${objectEventName}`] = async (...args) => {
+          return this.fireEvent(stateMachineEventName, object, ...args).catch(
+            (e) => this.logger.error(
+              "Error firing event",
+              {
+                objectEventName,
+                stateMachineEventName
+              },
+              /* c8 ignore next */
+              e instanceof Error ? e : new Error(String(e))
+            )
+          );
+        };
       }
     }
   }
@@ -2966,19 +2987,22 @@ var StateMachine = class _StateMachine {
       }
     };
     if (this.transitionTimeout && this.transitionTimeout > 0) {
-      return Promise.race([
-        executeAction(),
-        new Promise(
-          (_, reject) => setTimeout(
-            () => reject(new StateMachineError("Transition timeout", {
-              /* c8 ignore next */
-              action: typeof actionName === "string" ? actionName : "anonymous",
-              phase: "action"
-            })),
-            this.transitionTimeout
-          )
-        )
-      ]);
+      const timeoutMs = this.transitionTimeout;
+      let timeoutHandle;
+      const timeoutPromise = new Promise((_, reject) => {
+        const fire = () => reject(new StateMachineError("Transition timeout", {
+          /* c8 ignore next */
+          action: typeof actionName === "string" ? actionName : "anonymous",
+          phase: "action"
+        }));
+        timeoutHandle = this.setTimer(fire, timeoutMs);
+      });
+      if (this.schedulerProvided) {
+        return Promise.race([executeAction(), timeoutPromise]).finally(() => {
+          this.clearTimer(timeoutHandle);
+        });
+      }
+      return Promise.race([executeAction(), timeoutPromise]);
     }
     return executeAction();
   }
@@ -3195,7 +3219,7 @@ var StateMachine = class _StateMachine {
     }
     if (toState.invoke && toState.invoke.length > 0) {
       if (!this.stateEntryTimes.has(toStateName)) {
-        this.stateEntryTimes.set(toStateName, Date.now());
+        this.stateEntryTimes.set(toStateName, this.clock());
       }
       const timers = [];
       for (const invocation of toState.invoke) {
@@ -3241,6 +3265,9 @@ var StateMachine = class _StateMachine {
    */
   setTimer(callback, delay) {
     const scheduler = this.scheduler;
+    if (this.schedulerProvided) {
+      return scheduler.schedule(delay, callback);
+    }
     if (scheduler.isActive()) {
       return scheduler.schedule(delay, callback);
     }
@@ -3251,6 +3278,10 @@ var StateMachine = class _StateMachine {
    */
   clearTimer(timerId) {
     const scheduler = this.scheduler;
+    if (this.schedulerProvided) {
+      if (timerId !== void 0) scheduler.cancel(timerId);
+      return;
+    }
     if (scheduler.isActive() && typeof timerId === "object" && timerId !== null && !("ref" in timerId)) {
       scheduler.cancel(timerId);
     } else {
@@ -3408,13 +3439,13 @@ var StateMachine = class _StateMachine {
         this.stateEntryTimes.delete(stateName);
       }
     }
-    const now = Date.now();
+    const now = this.clock();
     for (const stateName of activeStates) {
       const state = this.states.get(stateName);
       if (!state || !state.invoke || state.invoke.length === 0) continue;
       const entryTime = this.stateEntryTimes.get(stateName);
-      const startTime = entryTime || now;
-      if (!entryTime) {
+      const startTime = entryTime ?? now;
+      if (entryTime === void 0) {
         this.stateEntryTimes.set(stateName, startTime);
       }
       const elapsed = now - startTime;
@@ -4350,6 +4381,7 @@ export {
   StateMachineError,
   createEnhancedError,
   createMachine,
+  createVirtualScheduler,
   isAdapter,
   isRecoverableError,
   isValidConfig,