feat: plan re-runs

Wroud · Nov 27, 2024 · 827afd9 · 827afd9
1 parent 61dd5ad
commit 827afd9
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/packages/@wroud/flow-middleware/src/MiddlewareRequest.ts b/packages/@wroud/flow-middleware/src/MiddlewareRequest.ts
@@ -24,6 +24,8 @@ export class MiddlewareRequest<Data = Record<string, any>>
 {
   private middlewareStates: MiddlewareStates<Data>;
   private isDisposed: boolean;
+  private scheduledReRun: boolean;
+  private isRunning: boolean;
 
   constructor(
     private readonly middlewares: IMiddleware<Data>[],
@@ -34,6 +36,8 @@ export class MiddlewareRequest<Data = Record<string, any>>
     this.middlewares = middlewares;
     this.middlewareStates = new Map();
     this.isDisposed = false;
+    this.scheduledReRun = false;
+    this.isRunning = false;
   }
 
   public use(...middleware: IMiddleware<Data>[]): this {
@@ -54,6 +58,7 @@ export class MiddlewareRequest<Data = Record<string, any>>
     const executedMiddlewares: ExecutedMiddlewares<Data> = new Set();
 
     try {
+      this.isRunning = true;
       if (error !== undefined) {
         throw error;
       }
@@ -62,6 +67,12 @@ export class MiddlewareRequest<Data = Record<string, any>>
       await this.handleNextError(executedMiddlewares, 0, error as Error);
     } finally {
       await this.cleanupSubscriptions(executedMiddlewares);
+      this.isRunning = false;
+
+      if (this.scheduledReRun) {
+        this.scheduledReRun = false;
+        await this.execute();
+      }
     }
   }
 
@@ -95,7 +106,11 @@ export class MiddlewareRequest<Data = Record<string, any>>
 
   private async triggerReRun(error?: any): Promise<void> {
     this.logger?.info("Re-run triggered.");
-    await this.execute(error);
+    if (this.isRunning) {
+      this.scheduledReRun = true;
+    } else {
+      await this.execute(error);
+    }
   }
 
   private async handleNextError(
@@ -167,7 +182,7 @@ export class MiddlewareRequest<Data = Record<string, any>>
     this.logger?.info(
       `Disposing subscriptions for middleware: ${middleware.name || "anonymous"}`,
     );
-    for (const [key, { unsubscribe }] of state.entries()) {
+    for (const [key, { unsubscribe }] of state) {
       try {
         unsubscribe();
         this.logger?.info(`Unsubscribed from ${key}.`);
@@ -186,7 +201,7 @@ export class MiddlewareRequest<Data = Record<string, any>>
     this.isDisposed = true;
     this.logger?.info("Disposing all subscriptions and request.");
 
-    for (const [middleware, state] of this.middlewareStates.entries()) {
+    for (const [middleware, state] of this.middlewareStates) {
       this.disposeMiddlewareSubscriptions(middleware, state);
     }