Discard invalid tasks (#387)

enviodev · Dec 17, 2024 · 4133be6 · 4133be6
1 parent 5605da1
commit 4133be6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/codegenerator/cli/templates/static/codegen/src/globalState/GlobalState.res b/codegenerator/cli/templates/static/codegen/src/globalState/GlobalState.res
@@ -784,6 +784,7 @@ let invalidatedActionReducer = (state: t, action: action) =>
   | ({rollbackState: RollingBack(_)}, EventBatchProcessed(_)) =>
     Logging.warn("Finished processing batch before rollback, actioning rollback")
     ({...state, currentlyProcessingBatch: false}, [Rollback])
+  | (_, ErrorExit(_)) => actionReducer(state, action)
   | _ =>
     Logging.warn("Invalidated action discarded")
     (state, [])

diff --git a/codegenerator/cli/templates/static/codegen/src/globalState/GlobalStateManager.res b/codegenerator/cli/templates/static/codegen/src/globalState/GlobalStateManager.res
@@ -40,9 +40,13 @@ module MakeManager = (S: State) => {
   and dispatchTask = (self, task: S.task) => {
     let stateId = self.state->S.getId
     Js.Global.setTimeout(() => {
-      S.taskReducer(self.state, task, ~dispatchAction=action =>
-        dispatchAction(~stateId, self, action)
-      )->ignore
+      if stateId !== self.state->S.getId {
+        Logging.warn("Invalidated task discarded")
+      } else {
+        S.taskReducer(self.state, task, ~dispatchAction=action =>
+          dispatchAction(~stateId, self, action)
+        )->ignore
+      }
     }, 0)->ignore
   }