@supergrowthai/tq 1.0.12 → 1.0.13

package/dist/index.cjs

@@ -1122,7 +1122,6 @@ class TaskHandler {
   }
   async addTasks(tasks) {
     tasks = tasks.map((t) => this.validateLogContext(t));
-    const enrichedTasks = [];
     const diffedItems = tasks.reduce(
       (acc, { force_store, ...task }) => {
         const currentTime = /* @__PURE__ */ new Date();
@@ -1157,8 +1156,16 @@ class TaskHandler {
         const partitionKey = executor?.getPartitionKey?.(task);
         return { ...id, ...task, ...partitionKey ? { partition_key: partitionKey } : {} };
       });
+      if (this.entityProjectionProvider) {
+        try {
+          const includePayload = this.config.entityProjectionConfig?.includePayload;
+          const entityProjections = queueTasks.filter((t) => t.entity).map((t) => core_async_AsyncActions.buildProjection(t, "scheduled", { includePayload })).filter((p) => p !== null);
+          await core_async_AsyncActions.syncProjections(entityProjections, this.entityProjectionProvider, this.logger);
+        } catch (err) {
+          this.logger.error(`[TQ] Entity projection failed (non-fatal): ${err}`);
+        }
+      }
       await this.messageQueue.addMessages(queue, queueTasks);
-      enrichedTasks.push(...queueTasks);
       if (this.lifecycleProvider?.onTaskScheduled) {
         for (const task of queueTasks) {
           this.emitLifecycleEvent(
@@ -1176,6 +1183,15 @@ class TaskHandler {
         return { ...id, ...task, status: "processing", processing_started_at: /* @__PURE__ */ new Date() };
       });
       await this.taskStore.addTasksToScheduled(queueTasks);
+      if (this.entityProjectionProvider) {
+        try {
+          const includePayload = this.config.entityProjectionConfig?.includePayload;
+          const entityProjections = queueTasks.filter((t) => t.entity).map((t) => core_async_AsyncActions.buildProjection(t, "scheduled", { includePayload })).filter((p) => p !== null);
+          await core_async_AsyncActions.syncProjections(entityProjections, this.entityProjectionProvider, this.logger);
+        } catch (err) {
+          this.logger.error(`[TQ] Entity projection failed (non-fatal): ${err}`);
+        }
+      }
       const mqTasks = queueTasks.map((t) => ({ ...t, status: "scheduled" }));
       try {
         await this.messageQueue.addMessages(queue, mqTasks);
@@ -1191,7 +1207,6 @@ class TaskHandler {
         }
         throw mqError;
       }
-      enrichedTasks.push(...queueTasks);
       if (this.lifecycleProvider?.onTaskScheduled) {
         for (const task of queueTasks) {
           this.emitLifecycleEvent(
@@ -1211,7 +1226,15 @@ class TaskHandler {
         return { ...id, ...task };
       });
       await this.taskStore.addTasksToScheduled(queueTasks);
-      enrichedTasks.push(...queueTasks);
+      if (this.entityProjectionProvider) {
+        try {
+          const includePayload = this.config.entityProjectionConfig?.includePayload;
+          const entityProjections = queueTasks.filter((t) => t.entity).map((t) => core_async_AsyncActions.buildProjection(t, "scheduled", { includePayload })).filter((p) => p !== null);
+          await core_async_AsyncActions.syncProjections(entityProjections, this.entityProjectionProvider, this.logger);
+        } catch (err) {
+          this.logger.error(`[TQ] Entity projection failed (non-fatal): ${err}`);
+        }
+      }
       if (this.lifecycleProvider?.onTaskScheduled) {
         for (const task of queueTasks) {
           this.emitLifecycleEvent(
@@ -1221,15 +1244,6 @@ class TaskHandler {
         }
       }
     }
-    if (this.entityProjectionProvider) {
-      try {
-        const includePayload = this.config.entityProjectionConfig?.includePayload;
-        const entityProjections = enrichedTasks.filter((t) => t.entity).map((t) => core_async_AsyncActions.buildProjection(t, "scheduled", { includePayload })).filter((p) => p !== null);
-        await core_async_AsyncActions.syncProjections(entityProjections, this.entityProjectionProvider, this.logger);
-      } catch (err) {
-        this.logger.error(`[TQ] Entity projection failed (non-fatal): ${err}`);
-      }
-    }
   }
   // TODO(P2): Wrap retry upsert → new tasks → mark failed → mark success in a
   //   transaction. If an intermediate step fails, tasks can be lost or re-executed
@@ -1312,7 +1326,25 @@ class TaskHandler {
       await this.trackDiscardedTasks(discardedTasks.length);
     }
     if (tasksToRetry.length > 0) {
-      await this.taskStore.updateTasksForRetry(tasksToRetry);
+      const dbRetryTasks = tasksToRetry.map((t) => ({
+        ...t,
+        status: "processing",
+        processing_started_at: /* @__PURE__ */ new Date()
+      }));
+      await this.taskStore.updateTasksForRetry(dbRetryTasks);
+      const retryByQueue = /* @__PURE__ */ new Map();
+      for (const task of tasksToRetry) {
+        const queue = task.queue_id;
+        if (!retryByQueue.has(queue)) retryByQueue.set(queue, []);
+        retryByQueue.get(queue).push(task);
+      }
+      for (const [queue, retryQueueTasks] of retryByQueue) {
+        try {
+          await this.messageQueue.addMessages(queue, retryQueueTasks);
+        } catch (mqErr) {
+          this.logger.error(`[TQ] Failed to re-enqueue retry tasks to MQ (stale recovery will handle): ${mqErr}`);
+        }
+      }
     }
     if (finalFailedTasks.length > 0) {
       await this.taskStore.markTasksAsFailed(finalFailedTasks);