@trigger.dev/redis-worker 4.5.0-rc.4 → 4.5.0-rc.6

package/dist/index.d.cts

@@ -2192,6 +2192,10 @@ declare function deserialiseSnapshot<T = unknown>(serialised: string): T;
 type MollifierBufferOptions = {
     redisOptions: RedisOptions;
     logger?: Logger;
+    ackGraceTtlSeconds?: number;
+    maxRetriesPerRequest?: number;
+    reconnectStepMs?: number;
+    reconnectMaxMs?: number;
 };
 type SnapshotPatch = {
     type: "append_tags";
@@ -2248,6 +2252,7 @@ declare class MollifierBuffer {
     #private;
     private readonly redis;
     private readonly logger;
+    private readonly ackGraceTtlSeconds;
     constructor(options: MollifierBufferOptions);
     accept(input: {
         runId: string;
@@ -2292,6 +2297,8 @@ declare class MollifierBuffer {
         code: string;
         message: string;
     }): Promise<boolean>;
+    getDrainingCount(): Promise<number>;
+    listStaleDraining(olderThanMs: number, limit: number): Promise<string[]>;
     getEntryTtlSeconds(runId: string): Promise<number>;
     evaluateTrip(envId: string, options: {
         windowMs: number;
@@ -2306,16 +2313,16 @@ declare class MollifierBuffer {
 declare module "@internal/redis" {
     interface RedisCommander<Context> {
         acceptMollifierEntry(entryKey: string, queueKey: string, orgsKey: string, runId: string, envId: string, orgId: string, payload: string, createdAt: string, createdAtMicros: string, orgEnvsPrefix: string, idempotencyLookupKey: string, entryPrefix: string, callback?: Callback<number | string>): Result<number | string, Context>;
-        popAndMarkDraining(queueKey: string, orgsKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
-        requeueMollifierEntry(entryKey: string, orgsKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
+        popAndMarkDraining(queueKey: string, orgsKey: string, drainingSetKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
+        requeueMollifierEntry(entryKey: string, orgsKey: string, drainingSetKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
         mutateMollifierSnapshot(entryKey: string, patchJson: string, callback?: Callback<string>): Result<string, Context>;
         casSetMollifierMetadata(entryKey: string, expectedVersion: string, newMetadata: string, newMetadataType: string, callback?: Callback<string>): Result<string, Context>;
         resetMollifierIdempotency(lookupKey: string, entryPrefix: string, claimKey: string, callback?: Callback<string>): Result<string, Context>;
         claimMollifierIdempotency(claimKey: string, pendingMarker: string, pendingPrefix: string, ttlSeconds: string, callback?: Callback<string>): Result<string, Context>;
         publishMollifierClaim(claimKey: string, ownerMarker: string, runId: string, ttlSeconds: string, callback?: Callback<number>): Result<number, Context>;
         releaseMollifierClaim(claimKey: string, ownerMarker: string, callback?: Callback<number>): Result<number, Context>;
-        ackMollifierEntry(entryKey: string, graceTtlSeconds: string, callback?: Callback<number>): Result<number, Context>;
-        failMollifierEntry(entryKey: string, errorPayload: string, callback?: Callback<number>): Result<number, Context>;
+        ackMollifierEntry(entryKey: string, drainingSetKey: string, graceTtlSeconds: string, runId: string, callback?: Callback<number>): Result<number, Context>;
+        failMollifierEntry(entryKey: string, drainingSetKey: string, errorPayload: string, runId: string, callback?: Callback<number>): Result<number, Context>;
         delMollifierKeyIfEquals(key: string, expected: string, callback?: Callback<number>): Result<number, Context>;
         mollifierEvaluateTrip(rateKey: string, trippedKey: string, windowMs: string, threshold: string, holdMs: string, callback?: Callback<[number, number]>): Result<[number, number], Context>;
     }
@@ -2352,6 +2359,9 @@ type MollifierDrainerOptions<TPayload> = {
     isRetryable: (err: unknown) => boolean;
     pollIntervalMs?: number;
     maxOrgsPerTick?: number;
+    drainBatchSize?: number;
+    maxBackoffMs?: number;
+    backoffFloorMs?: number;
     logger?: Logger;
 };
 type DrainResult = {
@@ -2366,8 +2376,11 @@ declare class MollifierDrainer<TPayload = unknown> {
     private readonly isRetryable;
     private readonly pollIntervalMs;
     private readonly maxOrgsPerTick;
+    private readonly drainBatchSize;
+    private readonly concurrency;
+    private readonly maxBackoffMs;
+    private readonly backoffFloorMs;
     private readonly logger;
-    private readonly limit;
     private orgCursor;
     private perOrgEnvCursors;
     private isRunning;
@@ -2384,7 +2397,6 @@ declare class MollifierDrainer<TPayload = unknown> {
     private delay;
     private takeOrgSlice;
     private pickEnvForOrg;
-    private processOneFromEnv;
     private processEntry;
 }
 

package/dist/index.d.ts

@@ -2192,6 +2192,10 @@ declare function deserialiseSnapshot<T = unknown>(serialised: string): T;
 type MollifierBufferOptions = {
     redisOptions: RedisOptions;
     logger?: Logger;
+    ackGraceTtlSeconds?: number;
+    maxRetriesPerRequest?: number;
+    reconnectStepMs?: number;
+    reconnectMaxMs?: number;
 };
 type SnapshotPatch = {
     type: "append_tags";
@@ -2248,6 +2252,7 @@ declare class MollifierBuffer {
     #private;
     private readonly redis;
     private readonly logger;
+    private readonly ackGraceTtlSeconds;
     constructor(options: MollifierBufferOptions);
     accept(input: {
         runId: string;
@@ -2292,6 +2297,8 @@ declare class MollifierBuffer {
         code: string;
         message: string;
     }): Promise<boolean>;
+    getDrainingCount(): Promise<number>;
+    listStaleDraining(olderThanMs: number, limit: number): Promise<string[]>;
     getEntryTtlSeconds(runId: string): Promise<number>;
     evaluateTrip(envId: string, options: {
         windowMs: number;
@@ -2306,16 +2313,16 @@ declare class MollifierBuffer {
 declare module "@internal/redis" {
     interface RedisCommander<Context> {
         acceptMollifierEntry(entryKey: string, queueKey: string, orgsKey: string, runId: string, envId: string, orgId: string, payload: string, createdAt: string, createdAtMicros: string, orgEnvsPrefix: string, idempotencyLookupKey: string, entryPrefix: string, callback?: Callback<number | string>): Result<number | string, Context>;
-        popAndMarkDraining(queueKey: string, orgsKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
-        requeueMollifierEntry(entryKey: string, orgsKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
+        popAndMarkDraining(queueKey: string, orgsKey: string, drainingSetKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
+        requeueMollifierEntry(entryKey: string, orgsKey: string, drainingSetKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
         mutateMollifierSnapshot(entryKey: string, patchJson: string, callback?: Callback<string>): Result<string, Context>;
         casSetMollifierMetadata(entryKey: string, expectedVersion: string, newMetadata: string, newMetadataType: string, callback?: Callback<string>): Result<string, Context>;
         resetMollifierIdempotency(lookupKey: string, entryPrefix: string, claimKey: string, callback?: Callback<string>): Result<string, Context>;
         claimMollifierIdempotency(claimKey: string, pendingMarker: string, pendingPrefix: string, ttlSeconds: string, callback?: Callback<string>): Result<string, Context>;
         publishMollifierClaim(claimKey: string, ownerMarker: string, runId: string, ttlSeconds: string, callback?: Callback<number>): Result<number, Context>;
         releaseMollifierClaim(claimKey: string, ownerMarker: string, callback?: Callback<number>): Result<number, Context>;
-        ackMollifierEntry(entryKey: string, graceTtlSeconds: string, callback?: Callback<number>): Result<number, Context>;
-        failMollifierEntry(entryKey: string, errorPayload: string, callback?: Callback<number>): Result<number, Context>;
+        ackMollifierEntry(entryKey: string, drainingSetKey: string, graceTtlSeconds: string, runId: string, callback?: Callback<number>): Result<number, Context>;
+        failMollifierEntry(entryKey: string, drainingSetKey: string, errorPayload: string, runId: string, callback?: Callback<number>): Result<number, Context>;
         delMollifierKeyIfEquals(key: string, expected: string, callback?: Callback<number>): Result<number, Context>;
         mollifierEvaluateTrip(rateKey: string, trippedKey: string, windowMs: string, threshold: string, holdMs: string, callback?: Callback<[number, number]>): Result<[number, number], Context>;
     }
@@ -2352,6 +2359,9 @@ type MollifierDrainerOptions<TPayload> = {
     isRetryable: (err: unknown) => boolean;
     pollIntervalMs?: number;
     maxOrgsPerTick?: number;
+    drainBatchSize?: number;
+    maxBackoffMs?: number;
+    backoffFloorMs?: number;
     logger?: Logger;
 };
 type DrainResult = {
@@ -2366,8 +2376,11 @@ declare class MollifierDrainer<TPayload = unknown> {
     private readonly isRetryable;
     private readonly pollIntervalMs;
     private readonly maxOrgsPerTick;
+    private readonly drainBatchSize;
+    private readonly concurrency;
+    private readonly maxBackoffMs;
+    private readonly backoffFloorMs;
     private readonly logger;
-    private readonly limit;
     private orgCursor;
     private perOrgEnvCursors;
     private isRunning;
@@ -2384,7 +2397,6 @@ declare class MollifierDrainer<TPayload = unknown> {
     private delay;
     private takeOrgSlice;
     private pickEnvForOrg;
-    private processOneFromEnv;
     private processEntry;
 }