@zintrust/queue-redis 2.4.2 → 2.4.4

package/dist/BullMQRedisQueue.js

@@ -7,6 +7,7 @@ import { createLockProvider, getLockProvider, registerLockProvider, resolveDedup
 import { createRedisConnection, getBullMQSafeQueueName } from '@zintrust/core/redis';
 import { generateUuid, ZintrustLang } from '@zintrust/core/utils';
 import { RedisRpcQueueDriver, shouldUseRedisRpcQueueDriver } from './RedisRpcQueueDriver.js';
+import { resolveRetentionSetting } from './retentionUtils.js';
 // Lazy BullMQ loader keyed on a variable specifier so bundlers (esbuild/wrangler)
 // do not inline bullmq/ioredis into the Workers bundle. Every public method routes
 // through RedisRpcQueueDriver first when shouldUseRedisRpcQueueDriver() is true
@@ -191,7 +192,7 @@ export const BullMQRedisQueue = (() => {
         }
     };
     const getQueue = async (queueName) => {
-        const QueueCtor = await ensureBullmqLoaded();
+        const QueueConstructor = await ensureBullmqLoaded();
         // Check if queue exists in cache
         if (queues.has(queueName)) {
             const existingQueue = queues.get(queueName);
@@ -217,13 +218,13 @@ export const BullMQRedisQueue = (() => {
         }
         const connection = getSharedConnection();
         // Customizable BullMQ settings from environment
-        const removeOnComplete = Env.getInt('BULLMQ_REMOVE_ON_COMPLETE', 100);
-        const removeOnFail = Env.getInt('BULLMQ_REMOVE_ON_FAIL', 50);
+        const removeOnComplete = resolveRetentionSetting('BULLMQ_REMOVE_ON_COMPLETE', 100);
+        const removeOnFail = resolveRetentionSetting('BULLMQ_REMOVE_ON_FAIL', 50);
         const attempts = Env.getInt('BULLMQ_DEFAULT_ATTEMPTS', 3);
         const backoffDelay = Env.getInt('BULLMQ_BACKOFF_DELAY', 2000);
         const backoffType = Env.get('BULLMQ_BACKOFF_TYPE', 'exponential');
         const prefix = getBullMQSafeQueueName();
-        const queue = new QueueCtor(queueName, {
+        const queue = new QueueConstructor(queueName, {
             connection: connection,
             prefix,
             defaultJobOptions: {
@@ -267,8 +268,8 @@ export const BullMQRedisQueue = (() => {
             // MEDIUM: Job prioritization
             priority: payloadData.priority,
             // CLEANUP: Job retention
-            removeOnComplete: payloadData.removeOnComplete || 100,
-            removeOnFail: payloadData.removeOnFail || 50,
+            removeOnComplete: payloadData.removeOnComplete ?? resolveRetentionSetting('BULLMQ_REMOVE_ON_COMPLETE', 100),
+            removeOnFail: payloadData.removeOnFail ?? resolveRetentionSetting('BULLMQ_REMOVE_ON_FAIL', 50),
             // RETRY: Backoff strategy
             backoff: payloadData.backoff || {
                 type: 'exponential',

package/dist/RedisRpcQueueDriver.js

@@ -2,7 +2,7 @@ import { Env } from '@zintrust/core/config';
 import { ErrorFactory } from '@zintrust/core/errors';
 import { JobStateTracker, TimeoutManager } from '@zintrust/core/queue';
 import { generateUuid } from '@zintrust/core/utils';
-const REDIS_RPC_PACKAGE = '@zintrust/redis-rpc';
+import { resolveRetentionSetting } from './retentionUtils.js';
 export const shouldUseRedisRpcQueueDriver = () => {
     return Env.USE_REDIS_PROXY === true && Env.get('REDIS_RPC_URL', '').trim() !== '';
 };
@@ -16,8 +16,8 @@ const resolveRpcBaseUrl = () => {
 };
 const createRpcClient = async () => {
     try {
-        const mod = (await import(REDIS_RPC_PACKAGE));
-        return mod.createRedisRpcClient({
+        const { createRedisRpcClient } = await import('@zintrust/redis-rpc/client');
+        return createRedisRpcClient({
             baseUrl: resolveRpcBaseUrl(),
             secret: Env.get('REDIS_RPC_SECRET', Env.get('REDIS_PROXY_SECRET', Env.APP_KEY)),
         });
@@ -35,13 +35,13 @@ const resolveRequestedJobId = (payloadData) => {
 const createJobOptions = (payloadData) => ({
     jobId: resolveRequestedJobId(payloadData),
     delay: payloadData.delay,
-    attempts: payloadData.attempts,
+    attempts: payloadData.attempts ?? Env.getInt('BULLMQ_DEFAULT_ATTEMPTS', 3),
     priority: payloadData.priority,
-    removeOnComplete: payloadData.removeOnComplete || 100,
-    removeOnFail: payloadData.removeOnFail || 50,
+    removeOnComplete: payloadData.removeOnComplete ?? resolveRetentionSetting('BULLMQ_REMOVE_ON_COMPLETE', 100),
+    removeOnFail: payloadData.removeOnFail ?? resolveRetentionSetting('BULLMQ_REMOVE_ON_FAIL', 50),
     backoff: payloadData.backoff || {
-        type: 'exponential',
-        delay: 2000,
+        type: Env.get('BULLMQ_BACKOFF_TYPE', 'exponential'),
+        delay: Env.getInt('BULLMQ_BACKOFF_DELAY', 2000),
     },
     repeat: payloadData.repeat,
     lifo: payloadData.lifo ?? false,

package/dist/retentionUtils.d.ts

@@ -0,0 +1,14 @@
+export type RetentionSetting = number | boolean | {
+    age: number;
+    count?: number;
+};
+/**
+ * Resolves a BullMQ retention setting from env.
+ *
+ * Resolution order:
+ *  1. If <key>_AGE_SECONDS is set and <key> is also set → { age, count }
+ *  2. If <key>_AGE_SECONDS is set alone              → { age }
+ *  3. If <key> is set alone                          → integer count
+ *  4. Otherwise                                      → fallbackCount
+ */
+export declare const resolveRetentionSetting: (key: string, fallbackCount: number) => RetentionSetting;

package/dist/retentionUtils.js

@@ -0,0 +1,21 @@
+import { Env } from '@zintrust/core/config';
+/**
+ * Resolves a BullMQ retention setting from env.
+ *
+ * Resolution order:
+ *  1. If <key>_AGE_SECONDS is set and <key> is also set → { age, count }
+ *  2. If <key>_AGE_SECONDS is set alone              → { age }
+ *  3. If <key> is set alone                          → integer count
+ *  4. Otherwise                                      → fallbackCount
+ */
+export const resolveRetentionSetting = (key, fallbackCount) => {
+    const ageSeconds = Env.getInt(`${key}_AGE_SECONDS`, 0);
+    const countRaw = Env.get(key, '').trim();
+    if (ageSeconds > 0) {
+        if (countRaw.length > 0) {
+            return { age: ageSeconds, count: Env.getInt(key, fallbackCount) };
+        }
+        return { age: ageSeconds };
+    }
+    return countRaw.length > 0 ? Env.getInt(key, fallbackCount) : fallbackCount;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/queue-redis",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "Redis queue driver for ZinTrust.",
   "private": false,
   "type": "module",