@zintrust/queue-redis 0.5.8 → 0.7.2

package/dist/BullMQRedisQueue.js

@@ -315,6 +315,12 @@ export const BullMQRedisQueue = (() => {
             },
         };
     };
+    const handleReleaseAfter = (payload, deduplicationId, releaseAfter, uniqueId) => {
+        if (releaseAfter !== undefined && releaseAfter !== null && typeof releaseAfter !== 'number') {
+            return attachWorkerSideReleaseMeta(payload, deduplicationId, releaseAfter, uniqueId);
+        }
+        return payload;
+    };
     const handleDeduplication = async (payloadData, jobOptions, queue) => {
         const deduplicationId = validateDeduplicationId(payloadData.deduplication);
         if (!deduplicationId) {
@@ -330,32 +336,33 @@ export const BullMQRedisQueue = (() => {
             ? deduplication.ttl
             : undefined;
         const replace = deduplication.replace === true;
+        const collisionBehavior = deduplication.collisionBehavior === 'enqueue' ? 'enqueue' : 'suppress';
         const jobId = jobOptions.jobId ?? generateUuid();
         jobOptions.jobId = jobId;
         // Check existing lock
         const hasExistingLock = await checkExistingLock(scopedDeduplicationKey, deduplicationId, provider, replace, queue, jobId);
-        if (hasExistingLock) {
+        if (hasExistingLock && collisionBehavior === 'suppress') {
             return { payloadToSend: payloadData, shouldReturn: true, returnValue: deduplicationId };
         }
-        // Acquire lock
-        const lockAcquired = await acquireDeduplicationLock(scopedDeduplicationKey, deduplicationId, provider, ttl, queue, jobId);
-        if (!lockAcquired) {
-            return { payloadToSend: payloadData, shouldReturn: true, returnValue: deduplicationId };
+        let lockAcquired = false;
+        if (!hasExistingLock) {
+            // Acquire lock
+            lockAcquired = await acquireDeduplicationLock(scopedDeduplicationKey, deduplicationId, provider, ttl, queue, jobId);
+            if (!lockAcquired && collisionBehavior === 'suppress') {
+                return { payloadToSend: payloadData, shouldReturn: true, returnValue: deduplicationId };
+            }
         }
         // Keep jobs for deduplication tracking
         jobOptions.removeOnFail = 0;
         jobOptions.removeOnComplete = 0;
         let payloadToSend = payloadData;
         // Handle releaseAfter numeric
-        if (typeof deduplication.releaseAfter === 'number' && deduplication.releaseAfter > 0) {
+        if (lockAcquired &&
+            typeof deduplication.releaseAfter === 'number' &&
+            deduplication.releaseAfter > 0) {
             scheduleLockRelease(scopedDeduplicationKey, provider, ttl, deduplication.releaseAfter);
         }
-        // Handle releaseAfter non-numeric
-        if (deduplication.releaseAfter !== undefined &&
-            deduplication.releaseAfter !== null &&
-            typeof deduplication.releaseAfter !== 'number') {
-            payloadToSend = attachWorkerSideReleaseMeta(payloadToSend, deduplicationId, deduplication.releaseAfter, payloadData.uniqueId);
-        }
+        payloadToSend = handleReleaseAfter(payloadToSend, deduplicationId, deduplication.releaseAfter, payloadData.uniqueId);
         return { payloadToSend, shouldReturn: false };
     };
     return {

package/dist/HttpQueueDriver.js

@@ -216,9 +216,11 @@ export const HttpQueueDriver = Object.freeze({
         }
         catch (error) {
             Logger.warn('HTTP queue enqueue failed; storing tracker fallback in memory', {
-                queue,
-                fallbackJobId,
-                error: error instanceof Error ? error.message : String(error),
+                ...Logger.withTraceSkipContext({
+                    queue,
+                    fallbackJobId,
+                    error: error instanceof Error ? error.message : String(error),
+                }),
             });
             await markPendingRecoveryFallback({
                 queue,
@@ -227,8 +229,10 @@ export const HttpQueueDriver = Object.freeze({
                 error,
             });
             Logger.warn('Job marked pending recovery in tracker', {
-                queue,
-                jobId: fallbackJobId,
+                ...Logger.withTraceSkipContext({
+                    queue,
+                    jobId: fallbackJobId,
+                }),
             });
             return fallbackJobId;
         }

package/dist/RedisQueue.d.ts

@@ -0,0 +1,10 @@
+import type { QueueMessage } from '@zintrust/core';
+interface IQueueDriver {
+    enqueue<T = unknown>(queue: string, payload: T): Promise<string>;
+    dequeue<T = unknown>(queue: string): Promise<QueueMessage<T> | undefined>;
+    ack(queue: string, id: string): Promise<void>;
+    length(queue: string): Promise<number>;
+    drain(queue: string): Promise<void>;
+}
+export declare const RedisQueue: IQueueDriver;
+export default RedisQueue;

package/dist/RedisQueue.js

@@ -0,0 +1,92 @@
+import { ErrorFactory, generateUuid, getRedisUrl, Logger } from '@zintrust/core';
+export const RedisQueue = (() => {
+    let client = null;
+    let connected = false;
+    const ensureClient = async () => {
+        if (connected && client !== null)
+            return client;
+        const url = getRedisUrl();
+        if (url === null)
+            throw ErrorFactory.createConfigError('Redis queue driver requires REDIS_URL');
+        // Import lazily so package is optional for environments that don't use Redis
+        try {
+            // Prefer the redis package when available
+            try {
+                const mod = (await import('redis'));
+                const createClient = mod.createClient;
+                client = createClient({ url });
+                if (typeof client.connect === 'function') {
+                    try {
+                        await client.connect();
+                        connected = true;
+                    }
+                    catch (connectionError) {
+                        connected = false;
+                        Logger.warn('Redis client connect failed:', String(connectionError));
+                    }
+                }
+                else {
+                    connected = true;
+                }
+            }
+            catch {
+                // Fallback to ioredis when available (used by queue-monitor)
+                const mod = (await import('ioredis'));
+                const redis = mod.default(url);
+                client = {
+                    rPush: (queue, value) => redis.rpush(queue, value),
+                    lPop: (queue) => redis.lpop(queue),
+                    lLen: (queue) => redis.llen(queue),
+                    del: (queue) => redis.del(queue),
+                };
+                connected = true;
+            }
+        }
+        catch (error) {
+            const globalFake = globalThis
+                .__fakeRedisClient;
+            if (globalFake === undefined) {
+                throw ErrorFactory.createConfigError("Redis queue driver requires the 'redis' or 'ioredis' package (run `zin add queue:redis` / `zin plugin install queue:redis`, or `npm install redis` / `npm install ioredis`) or a test fake client set in globalThis.__fakeRedisClient", error);
+            }
+            client = globalFake;
+            connected = true;
+        }
+        if (client === null)
+            throw ErrorFactory.createConfigError('Redis client could not be initialized');
+        return client;
+    };
+    return {
+        async enqueue(queue, payload) {
+            const cli = await ensureClient();
+            const id = generateUuid();
+            const msg = JSON.stringify({ id, payload, attempts: 0 });
+            await cli.rPush(queue, msg);
+            return id;
+        },
+        async dequeue(queue) {
+            const cli = await ensureClient();
+            const raw = await cli.lPop(queue);
+            if (raw === null)
+                return undefined;
+            try {
+                const parsed = JSON.parse(raw);
+                return parsed;
+            }
+            catch (err) {
+                throw ErrorFactory.createTryCatchError('Failed to parse queue message', err);
+            }
+        },
+        async ack(_queue, _id) {
+            return Promise.resolve(); // NOSONAR
+        },
+        async length(queue) {
+            const cli = await ensureClient();
+            return cli.lLen(queue);
+        },
+        async drain(queue) {
+            const cli = await ensureClient();
+            await cli.del(queue);
+        },
+    };
+})();
+export default RedisQueue;

package/dist/build-manifest.json

@@ -1,15 +1,15 @@
 {
   "name": "@zintrust/queue-redis",
-  "version": "0.5.8",
-  "buildDate": "2026-04-14T16:59:38.890Z",
+  "version": "0.7.2",
+  "buildDate": "2026-04-18T19:23:21.152Z",
   "buildEnvironment": {
-    "node": "v20.20.2",
-    "platform": "linux",
-    "arch": "x64"
+    "node": "v22.22.1",
+    "platform": "darwin",
+    "arch": "arm64"
   },
   "git": {
-    "commit": "8d52a13d",
-    "branch": "master"
+    "commit": "126e1196",
+    "branch": "release"
   },
   "package": {
     "engines": {
@@ -29,16 +29,16 @@
       "sha256": "52fb0f688cd17cc7d8e8128e60df6f5eea4c803282382ac75550e6aacee7cbb0"
     },
     "BullMQRedisQueue.js": {
-      "size": 21579,
-      "sha256": "042803997f2f9895827ce34359bb62c80b2b889ab4ddc9cbbe191924a376684a"
+      "size": 21981,
+      "sha256": "b72bda67ed62205f419775dc89373e4c20023fb2f92fa99faa6bfebb853f5635"
     },
     "HttpQueueDriver.d.ts": {
       "size": 835,
       "sha256": "31735e10a83cf905ca48f3bf1c79f40029b9ac7c0ce6c26751ad646fa77bc764"
     },
     "HttpQueueDriver.js": {
-      "size": 8958,
-      "sha256": "5e465fe42ff2cc4c5f0366f3a5588ce5870b63e558b09a320da5fa80878eeada"
+      "size": 9116,
+      "sha256": "28f10537bf9520772d8546c956fdaa7d3c489abd5be38ca78ee4eca41d8c9907"
     },
     "QueueHttpGateway.d.ts": {
       "size": 432,
@@ -56,13 +56,25 @@
       "size": 5464,
       "sha256": "18b785c47b4df689f9969625880d1b559e6cf8c95bb8c3cd3a4112fa75e0d870"
     },
+    "RedisQueue.d.ts": {
+      "size": 438,
+      "sha256": "eefad366ae71d63044b23038265bf3eb60a0277e41ac70f57c5973d79f2af5ce"
+    },
+    "RedisQueue.js": {
+      "size": 3593,
+      "sha256": "dc8b2c28b2e288e048423067f90ffbe0389ac813086246a1c8fafeeeab5c142d"
+    },
+    "build-manifest.json": {
+      "size": 2512,
+      "sha256": "95ec4ea44d0088301c629fce69e4960e0541969592bf5b1eafbbc9fe8424da5f"
+    },
     "index.d.ts": {
       "size": 565,
       "sha256": "7bc063419989a39530b3a4213627e0aea33fbaacac8c307d9e7e654c99bd5b8d"
     },
     "index.js": {
       "size": 676,
-      "sha256": "09e8e60ced500283bea8c494e698bf5436641b7684789bb85c06230a6ebd540b"
+      "sha256": "a46d4365952581f0d5df7eb9e97d6ca54128ca891a18195c761bf49f7f0a06da"
     },
     "register.d.ts": {
       "size": 170,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/queue-redis",
-  "version": "0.5.8",
+  "version": "0.7.2",
   "description": "Redis queue driver for ZinTrust.",
   "private": false,
   "type": "module",
@@ -23,7 +23,7 @@
     "node": ">=20.0.0"
   },
   "peerDependencies": {
-    "@zintrust/core": "^0.5.7"
+    "@zintrust/core": "^0.7.2"
   },
   "publishConfig": {
     "access": "public"