check generation number before logging or marking other failures

Author: ianmacartney

src/component/pool.ts

@@ -86,13 +86,12 @@ export const onComplete = internalMutation({
     assert(journalEntry, `Journal entry not found: ${stepId}`);
     const workflowId = journalEntry.workflowId;
 
-    const error = !validate(onCompleteContext, args.context)
-      ? `Invalid onComplete context for workId ${args.workId}` +
-        JSON.stringify(args.context)
-      : !journalEntry.step.inProgress
-        ? `Journal entry not in progress: ${stepId}`
-        : undefined;
-    if (error) {
+    if (
+      !validate(onCompleteContext, args.context, { allowUnknownFields: true })
+    ) {
+      const error =
+        `Invalid onComplete context for workId ${args.workId}` +
+        JSON.stringify(args.context);
       await ctx.db.patch(workflowId, {
         runResult: {
           kind: "failed",
@@ -101,7 +100,20 @@ export const onComplete = internalMutation({
       });
       return;
     }
+    const { generationNumber } = args.context;
     const workflow = await getWorkflow(ctx, workflowId, null);
+    if (workflow.generationNumber !== generationNumber) {
+      console.error(
+        `Workflow: ${workflowId} already has generation number ${workflow.generationNumber} when completing ${stepId}`,
+      );
+      return;
+    }
+    if (!journalEntry.step.inProgress) {
+      console.error(
+        `Step finished but journal entry not in progress: ${stepId} status: ${journalEntry.step.runResult?.kind ?? "pending"}`,
+      );
+      return;
+    }
     if (
       journalEntry.step.functionType === "pause" &&
       args.result.kind === "success"
@@ -154,13 +166,6 @@ export const onComplete = internalMutation({
       }
       return;
     }
-    const { generationNumber } = args.context;
-    if (workflow.generationNumber !== generationNumber) {
-      console.error(
-        `Workflow: ${workflowId} already has generation number ${workflow.generationNumber} when completing ${stepId}`,
-      );
-      return;
-    }
     const workpool = await getWorkpool(ctx, args.context.workpoolOptions);
     await workpool.enqueueMutation(
       ctx,