@trigger.dev/redis-worker 0.0.0-prerelease-20251211173228 → 0.0.0-prerelease-20251218163312

package/dist/index.cjs

@@ -12510,8 +12510,12 @@ var VisibilityManager = class {
     const inflightKey = this.keys.inflightKey(shardId);
     const member = this.#makeMember(messageId, queueId);
     const newDeadline = Date.now() + extendMs;
-    const result = await this.redis.zadd(inflightKey, "XX", newDeadline, member);
-    const success = result !== 0;
+    const result = await this.redis.heartbeatMessage(
+      inflightKey,
+      member,
+      newDeadline.toString()
+    );
+    const success = result === 1;
     if (success) {
       this.logger.debug("Heartbeat successful", {
         messageId,
@@ -12768,6 +12772,24 @@ redis.call('HDEL', inflightDataKey, messageId)
 redis.call('ZADD', queueKey, score, messageId)
 redis.call('HSET', queueItemsKey, messageId, payload)
 
+return 1
+      `
+    });
+    this.redis.defineCommand("heartbeatMessage", {
+      numberOfKeys: 1,
+      lua: `
+local inflightKey = KEYS[1]
+local member = ARGV[1]
+local newDeadline = tonumber(ARGV[2])
+
+-- Check if member exists in the in-flight set
+local score = redis.call('ZSCORE', inflightKey, member)
+if not score then
+  return 0
+end
+
+-- Update the deadline
+redis.call('ZADD', inflightKey, 'XX', newDeadline, member)
 return 1
       `
     });
@@ -13533,7 +13555,10 @@ var WeightedScheduler = class extends BaseScheduler {
       return { tenantId, avgAge };
     });
     const maxAge = Math.max(...tenantAges.map((t) => t.avgAge));
-    const weightedTenants = tenantAges.map((t) => ({
+    const weightedTenants = maxAge === 0 ? tenantAges.map((t) => ({
+      tenantId: t.tenantId,
+      weight: 1 / tenantAges.length
+    })) : tenantAges.map((t) => ({
       tenantId: t.tenantId,
       weight: t.avgAge / maxAge
     }));
@@ -13576,11 +13601,11 @@ var WeightedScheduler = class extends BaseScheduler {
       const tenant = snapshot.tenants.get(tenantId);
       let weight = 1;
       if (concurrencyLimitBias > 0) {
-        const normalizedLimit = tenant.concurrency.limit / maxLimit;
+        const normalizedLimit = maxLimit > 0 ? tenant.concurrency.limit / maxLimit : 0;
         weight *= 1 + Math.pow(normalizedLimit * concurrencyLimitBias, 2);
       }
       if (availableCapacityBias > 0) {
-        const usedPercentage = tenant.concurrency.current / tenant.concurrency.limit;
+        const usedPercentage = tenant.concurrency.limit > 0 ? tenant.concurrency.current / tenant.concurrency.limit : 1;
         const availableBonus = 1 - usedPercentage;
         weight *= 1 + Math.pow(availableBonus * availableCapacityBias, 2);
       }
@@ -13599,9 +13624,10 @@ var WeightedScheduler = class extends BaseScheduler {
       return queues.sort((a, b) => b.age - a.age).map((q) => q.queueId);
     }
     const maxAge = Math.max(...queues.map((q) => q.age));
+    const ageDenom = maxAge === 0 ? 1 : maxAge;
     const weightedQueues = queues.map((q) => ({
       queue: q,
-      weight: 1 + q.age / maxAge * queueAgeRandomization
+      weight: 1 + q.age / ageDenom * queueAgeRandomization
     }));
     const result = [];
     let remaining = [...weightedQueues];
@@ -14678,6 +14704,17 @@ var FairQueue = class {
           error: result.error.message
         });
         await this.#moveToDeadLetterQueue(storedMessage, "Payload validation failed");
+        if (this.concurrencyManager) {
+          try {
+            await this.concurrencyManager.release(descriptor, storedMessage.id);
+          } catch (releaseError) {
+            this.logger.error("Failed to release concurrency slot after payload validation failure", {
+              messageId: storedMessage.id,
+              queueId,
+              error: releaseError instanceof Error ? releaseError.message : String(releaseError)
+            });
+          }
+        }
         return;
       }
       payload = result.data;
@@ -14854,7 +14891,6 @@ var FairQueue = class {
   }
   async #moveToDeadLetterQueue(storedMessage, errorMessage) {
     if (!this.deadLetterQueueEnabled) {
-      this.masterQueue.getShardForQueue(storedMessage.queueId);
       await this.visibilityManager.complete(storedMessage.id, storedMessage.queueId);
       return;
     }