@trigger.dev/redis-worker 4.5.11 → 4.5.12

package/dist/index.d.cts

@@ -717,6 +717,8 @@ interface FairQueueOptions<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
   heartbeatIntervalMs?: number;
   /** Interval for reclaiming timed-out messages (default: 5000) */
   reclaimIntervalMs?: number;
+  /** Interval for sweeping orphaned concurrency slots; 0 disables the sweep (default: 60000) */
+  reconcileIntervalMs?: number;
   /** Number of consumer loops to run (default: 1) */
   consumerCount?: number;
   /** Interval between consumer iterations in milliseconds (default: 100) */
@@ -915,6 +917,10 @@ interface ConcurrencyManagerOptions {
   redis: RedisOptions;
   keys: FairQueueKeyProducer;
   groups: ConcurrencyGroupConfig[];
+  logger?: {
+    debug: (message: string, context?: Record<string, unknown>) => void;
+    error: (message: string, context?: Record<string, unknown>) => void;
+  };
 }
 /**
  * ConcurrencyManager handles multi-level concurrency tracking and limiting.
@@ -931,6 +937,7 @@ declare class ConcurrencyManager {
   private keys;
   private groups;
   private groupsByName;
+  private logger;
   constructor(options: ConcurrencyManagerOptions);
   /**
    * Check if a message can be processed given all concurrency constraints.
@@ -956,6 +963,24 @@ declare class ConcurrencyManager {
     queue: QueueDescriptor;
     messageId: string;
   }>): Promise<void>;
+  /**
+   * Remove concurrency set members that no longer correspond to an in-flight message,
+   * healing slots leaked by failed releases. Scans every set of every group and, per
+   * member, atomically removes it unless the message id appears in one of the given
+   * in-flight data hashes. Sound because a message is registered in-flight before its
+   * slot is reserved, so at the moment of the atomic check a member with no in-flight
+   * record can only be a leak; if the message is about to be re-claimed, reserve simply
+   * re-adds the member.
+   *
+   * @param inflightDataKeys - The in-flight data hash keys for every shard. The sweep
+   *   refuses to run when this is empty, since with nowhere to look for running messages
+   *   every member would look orphaned and all concurrency accounting would be erased.
+   * @returns The message ids that were removed, and how many sets were checked
+   */
+  sweepOrphanedSlots(inflightDataKeys: string[]): Promise<{
+    scannedSets: number;
+    removed: string[];
+  }>;
   /**
    * Get current concurrency for a specific group.
    */
@@ -1003,6 +1028,7 @@ declare class ConcurrencyManager {
 declare module "@internal/redis" {
   interface RedisCommander<Context> {
     reserveConcurrency(numKeys: number, keys: string[], messageId: string, ...limits: string[]): Promise<number>;
+    removeOrphanedConcurrencySlots(numKeys: number, keys: string[], ...messageIds: string[]): Promise<string[]>;
   }
 }
 //#endregion
@@ -1811,7 +1837,10 @@ declare class VisibilityManager {
    *
    * @param shardId - The shard to check
    * @param getQueueKeys - Function to get queue keys for a queue ID
-   * @returns Array of reclaimed message info for concurrency release
+   * @param onBeforeRequeue - Hook invoked with the batch before any message is requeued,
+   *   used to free concurrency slots. A throw aborts the whole batch, leaving the
+   *   messages in-flight for the next reclaim tick.
+   * @returns Array of reclaimed message info
    */
   reclaimTimedOut(shardId: number, getQueueKeys: (queueId: string) => {
     queueKey: string;
@@ -1819,7 +1848,7 @@ declare class VisibilityManager {
     tenantQueueIndexKey: string;
     dispatchKey: string;
     tenantId: string;
-  }): Promise<ReclaimedMessageInfo[]>;
+  }, onBeforeRequeue?: (messages: ReclaimedMessageInfo[]) => Promise<void>): Promise<ReclaimedMessageInfo[]>;
   /**
    * Get all in-flight messages for a shard.
    */
@@ -1994,6 +2023,7 @@ declare class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
   private visibilityTimeoutMs;
   private heartbeatIntervalMs;
   private reclaimIntervalMs;
+  private reconcileIntervalMs;
   private workerQueueResolver;
   private batchClaimSize;
   private cooloffEnabled;
@@ -2010,6 +2040,7 @@ declare class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
   private abortController;
   private masterQueueConsumerLoops;
   private reclaimLoop?;
+  private reconcileLoop?;
   private queueDescriptorCache;
   private tenantDispatch;
   constructor(options: FairQueueOptions<TPayloadSchema>);

package/dist/index.d.ts

@@ -717,6 +717,8 @@ interface FairQueueOptions<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
   heartbeatIntervalMs?: number;
   /** Interval for reclaiming timed-out messages (default: 5000) */
   reclaimIntervalMs?: number;
+  /** Interval for sweeping orphaned concurrency slots; 0 disables the sweep (default: 60000) */
+  reconcileIntervalMs?: number;
   /** Number of consumer loops to run (default: 1) */
   consumerCount?: number;
   /** Interval between consumer iterations in milliseconds (default: 100) */
@@ -915,6 +917,10 @@ interface ConcurrencyManagerOptions {
   redis: RedisOptions;
   keys: FairQueueKeyProducer;
   groups: ConcurrencyGroupConfig[];
+  logger?: {
+    debug: (message: string, context?: Record<string, unknown>) => void;
+    error: (message: string, context?: Record<string, unknown>) => void;
+  };
 }
 /**
  * ConcurrencyManager handles multi-level concurrency tracking and limiting.
@@ -931,6 +937,7 @@ declare class ConcurrencyManager {
   private keys;
   private groups;
   private groupsByName;
+  private logger;
   constructor(options: ConcurrencyManagerOptions);
   /**
    * Check if a message can be processed given all concurrency constraints.
@@ -956,6 +963,24 @@ declare class ConcurrencyManager {
     queue: QueueDescriptor;
     messageId: string;
   }>): Promise<void>;
+  /**
+   * Remove concurrency set members that no longer correspond to an in-flight message,
+   * healing slots leaked by failed releases. Scans every set of every group and, per
+   * member, atomically removes it unless the message id appears in one of the given
+   * in-flight data hashes. Sound because a message is registered in-flight before its
+   * slot is reserved, so at the moment of the atomic check a member with no in-flight
+   * record can only be a leak; if the message is about to be re-claimed, reserve simply
+   * re-adds the member.
+   *
+   * @param inflightDataKeys - The in-flight data hash keys for every shard. The sweep
+   *   refuses to run when this is empty, since with nowhere to look for running messages
+   *   every member would look orphaned and all concurrency accounting would be erased.
+   * @returns The message ids that were removed, and how many sets were checked
+   */
+  sweepOrphanedSlots(inflightDataKeys: string[]): Promise<{
+    scannedSets: number;
+    removed: string[];
+  }>;
   /**
    * Get current concurrency for a specific group.
    */
@@ -1003,6 +1028,7 @@ declare class ConcurrencyManager {
 declare module "@internal/redis" {
   interface RedisCommander<Context> {
     reserveConcurrency(numKeys: number, keys: string[], messageId: string, ...limits: string[]): Promise<number>;
+    removeOrphanedConcurrencySlots(numKeys: number, keys: string[], ...messageIds: string[]): Promise<string[]>;
   }
 }
 //#endregion
@@ -1811,7 +1837,10 @@ declare class VisibilityManager {
    *
    * @param shardId - The shard to check
    * @param getQueueKeys - Function to get queue keys for a queue ID
-   * @returns Array of reclaimed message info for concurrency release
+   * @param onBeforeRequeue - Hook invoked with the batch before any message is requeued,
+   *   used to free concurrency slots. A throw aborts the whole batch, leaving the
+   *   messages in-flight for the next reclaim tick.
+   * @returns Array of reclaimed message info
    */
   reclaimTimedOut(shardId: number, getQueueKeys: (queueId: string) => {
     queueKey: string;
@@ -1819,7 +1848,7 @@ declare class VisibilityManager {
     tenantQueueIndexKey: string;
     dispatchKey: string;
     tenantId: string;
-  }): Promise<ReclaimedMessageInfo[]>;
+  }, onBeforeRequeue?: (messages: ReclaimedMessageInfo[]) => Promise<void>): Promise<ReclaimedMessageInfo[]>;
   /**
    * Get all in-flight messages for a shard.
    */
@@ -1994,6 +2023,7 @@ declare class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
   private visibilityTimeoutMs;
   private heartbeatIntervalMs;
   private reclaimIntervalMs;
+  private reconcileIntervalMs;
   private workerQueueResolver;
   private batchClaimSize;
   private cooloffEnabled;
@@ -2010,6 +2040,7 @@ declare class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
   private abortController;
   private masterQueueConsumerLoops;
   private reclaimLoop?;
+  private reconcileLoop?;
   private queueDescriptorCache;
   private tenantDispatch;
   constructor(options: FairQueueOptions<TPayloadSchema>);