@trigger.dev/redis-worker 4.0.0-v4-beta.6 → 4.0.0-v4-beta.7

package/dist/index.cjs

@@ -9431,11 +9431,13 @@ var SimpleQueue = class {
   }) {
     try {
       const score = availableAt ? availableAt.getTime() : Date.now();
+      const deduplicationKey = nanoid();
       const serializedItem = JSON.stringify({
         job,
         item,
         visibilityTimeoutMs,
-        attempt
+        attempt,
+        deduplicationKey
       });
       const result = await this.redis.enqueueItem(
         `queue`,
@@ -9504,7 +9506,8 @@ var SimpleQueue = class {
           item: validatedItem.data,
           visibilityTimeoutMs,
           attempt: parsedItem.attempt ?? 0,
-          timestamp
+          timestamp,
+          deduplicationKey: parsedItem.deduplicationKey
         });
       }
       return dequeuedItems;
@@ -9517,14 +9520,26 @@ var SimpleQueue = class {
       throw e;
     }
   }
-  async ack(id) {
+  async ack(id, deduplicationKey) {
     try {
-      await this.redis.ackItem(`queue`, `items`, id);
+      const result = await this.redis.ackItem(`queue`, `items`, id, deduplicationKey ?? "");
+      if (result !== 1) {
+        this.logger.debug(
+          `SimpleQueue ${this.name}.ack(): ack operation returned ${result}. This means it was not removed from the queue.`,
+          {
+            queue: this.name,
+            id,
+            deduplicationKey,
+            result
+          }
+        );
+      }
     } catch (e) {
       this.logger.error(`SimpleQueue ${this.name}.ack(): error acknowledging item`, {
         queue: this.name,
         error: e,
-        id
+        id,
+        deduplicationKey
       });
       throw e;
     }
@@ -9671,15 +9686,32 @@ var SimpleQueue = class {
     this.redis.defineCommand("ackItem", {
       numberOfKeys: 2,
       lua: `
-        local queue = KEYS[1]
-        local items = KEYS[2]
+        local queueKey = KEYS[1]
+        local itemsKey = KEYS[2]
         local id = ARGV[1]
+        local deduplicationKey = ARGV[2]
 
-        redis.call('ZREM', queue, id)
-        redis.call('HDEL', items, id)
+        -- Get the item from the hash
+        local item = redis.call('HGET', itemsKey, id)
+        if not item then
+          return -1
+        end
 
+        -- Only check deduplicationKey if a non-empty one was passed in
+        if deduplicationKey and deduplicationKey ~= "" then
+          local success, parsed = pcall(cjson.decode, item)
+          if success then
+            if parsed.deduplicationKey and parsed.deduplicationKey ~= deduplicationKey then
+              return 0
+            end
+          end
+        end
+
+        -- Remove from sorted set and hash
+        redis.call('ZREM', queueKey, id)
+        redis.call('HDEL', itemsKey, id)
         return 1
-        `
+      `
     });
     this.redis.defineCommand("moveToDeadLetterQueue", {
       numberOfKeys: 4,
@@ -10894,7 +10926,7 @@ var Worker = class _Worker {
   /**
    * Processes a single item.
    */
-  async processItem({ id, job, item, visibilityTimeoutMs, attempt, timestamp }, batchSize, workerId) {
+  async processItem({ id, job, item, visibilityTimeoutMs, attempt, timestamp, deduplicationKey }, batchSize, workerId) {
     const catalogItem = this.options.catalog[job];
     const handler = this.jobs[job];
     if (!handler) {
@@ -10907,7 +10939,7 @@ var Worker = class _Worker {
       async () => {
         await this.withHistogram(
           this.metrics.jobDuration,
-          handler({ id, payload: item, visibilityTimeoutMs, attempt }),
+          handler({ id, payload: item, visibilityTimeoutMs, attempt, deduplicationKey }),
           {
             worker_id: workerId,
             batch_size: batchSize,
@@ -10915,7 +10947,7 @@ var Worker = class _Worker {
             attempt
           }
         );
-        await this.queue.ack(id);
+        await this.queue.ack(id, deduplicationKey);
       },
       {
         kind: SpanKind.CONSUMER,