@zintrust/queue-redis 0.4.70 → 0.4.74

package/dist/BullMQRedisQueue.js

@@ -1,4 +1,4 @@
-import { Cloudflare, createLockProvider, createRedisConnection, Env, ErrorFactory, generateUuid, getBullMQSafeQueueName, getLockProvider, Logger, queueConfig, registerLockProvider, resolveLockPrefix, ZintrustLang, } from '@zintrust/core';
+import { Cloudflare, createLockProvider, createRedisConnection, Env, ErrorFactory, generateUuid, getBullMQSafeQueueName, getLockProvider, Logger, queueConfig, registerLockProvider, resolveDeduplicationLockKey, resolveLockPrefix, ZintrustLang, } from '@zintrust/core';
 import { Queue } from 'bullmq';
 import { HttpQueueDriver } from './HttpQueueDriver.js';
 export const shouldUseHttpProxyDriver = () => {
@@ -264,8 +264,8 @@ export const BullMQRedisQueue = (() => {
         const deduplicationId = String(deduplication.id).trim();
         return deduplicationId.length > 0 ? deduplicationId : null;
     };
-    const checkExistingLock = async (deduplicationId, provider, replace, queue, jobId) => {
-        const status = await provider.status(deduplicationId);
+    const checkExistingLock = async (scopedDeduplicationKey, deduplicationId, provider, replace, queue, jobId) => {
+        const status = await provider.status(scopedDeduplicationKey);
         if (status.exists && !replace) {
             Logger.info('BullMQ: Job deduplicated', {
                 queue,
@@ -276,9 +276,9 @@ export const BullMQRedisQueue = (() => {
         }
         return false;
     };
-    const acquireDeduplicationLock = async (deduplicationId, provider, ttl, queue, jobId) => {
+    const acquireDeduplicationLock = async (scopedDeduplicationKey, deduplicationId, provider, ttl, queue, jobId) => {
         const lockOptions = ttl ? { ttl } : {};
-        const lock = await provider.acquire(deduplicationId, lockOptions);
+        const lock = await provider.acquire(scopedDeduplicationKey, lockOptions);
         if (!lock.acquired) {
             Logger.info('BullMQ: Job deduplicated (lock collision)', {
                 queue,
@@ -294,10 +294,10 @@ export const BullMQRedisQueue = (() => {
         });
         return true;
     };
-    const scheduleLockRelease = (deduplicationId, provider, ttl, releaseAfter) => {
+    const scheduleLockRelease = (scopedDeduplicationKey, provider, ttl, releaseAfter) => {
         const timeoutId = globalThis.setTimeout(() => {
             provider.release({
-                key: deduplicationId,
+                key: scopedDeduplicationKey,
                 ttl: ttl ?? 0,
                 acquired: true,
                 expires: new Date(Date.now() + (ttl ?? 0)),
@@ -325,6 +325,7 @@ export const BullMQRedisQueue = (() => {
             return { payloadToSend: payloadData, shouldReturn: false };
         }
         const provider = getLockProviderForQueue(payloadData.uniqueVia);
+        const scopedDeduplicationKey = resolveDeduplicationLockKey(queue, deduplicationId);
         const ttl = typeof deduplication.ttl === 'number' && deduplication.ttl > 0
             ? deduplication.ttl
             : undefined;
@@ -332,12 +333,12 @@ export const BullMQRedisQueue = (() => {
         const jobId = jobOptions.jobId ?? generateUuid();
         jobOptions.jobId = jobId;
         // Check existing lock
-        const hasExistingLock = await checkExistingLock(deduplicationId, provider, replace, queue, jobId);
+        const hasExistingLock = await checkExistingLock(scopedDeduplicationKey, deduplicationId, provider, replace, queue, jobId);
         if (hasExistingLock) {
             return { payloadToSend: payloadData, shouldReturn: true, returnValue: deduplicationId };
         }
         // Acquire lock
-        const lockAcquired = await acquireDeduplicationLock(deduplicationId, provider, ttl, queue, jobId);
+        const lockAcquired = await acquireDeduplicationLock(scopedDeduplicationKey, deduplicationId, provider, ttl, queue, jobId);
         if (!lockAcquired) {
             return { payloadToSend: payloadData, shouldReturn: true, returnValue: deduplicationId };
         }
@@ -347,7 +348,7 @@ export const BullMQRedisQueue = (() => {
         let payloadToSend = payloadData;
         // Handle releaseAfter numeric
         if (typeof deduplication.releaseAfter === 'number' && deduplication.releaseAfter > 0) {
-            scheduleLockRelease(deduplicationId, provider, ttl, deduplication.releaseAfter);
+            scheduleLockRelease(scopedDeduplicationKey, provider, ttl, deduplication.releaseAfter);
         }
         // Handle releaseAfter non-numeric
         if (deduplication.releaseAfter !== undefined &&

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.4.70",
-  "buildDate": "2026-04-06T16:10:45.630Z",
+  "version": "0.4.74",
+  "buildDate": "2026-04-07T11:00:15.411Z",
   "buildEnvironment": {
-    "node": "v20.20.2",
-    "platform": "linux",
-    "arch": "x64"
+    "node": "v22.22.1",
+    "platform": "darwin",
+    "arch": "arm64"
   },
   "git": {
-    "commit": "b92b2b05",
-    "branch": "master"
+    "commit": "9bdfc570",
+    "branch": "release"
   },
   "package": {
     "engines": {
@@ -29,8 +29,8 @@
       "sha256": "52fb0f688cd17cc7d8e8128e60df6f5eea4c803282382ac75550e6aacee7cbb0"
     },
     "BullMQRedisQueue.js": {
-      "size": 21327,
-      "sha256": "a35f9d822a3166d57ca48ea1f4894e9fe7996fb842c2f8eeb5cd8be4de866a6a"
+      "size": 21579,
+      "sha256": "042803997f2f9895827ce34359bb62c80b2b889ab4ddc9cbbe191924a376684a"
     },
     "HttpQueueDriver.d.ts": {
       "size": 835,
@@ -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": 2513,
+      "sha256": "640dd3671f0f79dedc8ec4432ccf15cfdd351793c2a379cbda83d6a61bd424e3"
+    },
     "index.d.ts": {
       "size": 565,
       "sha256": "7bc063419989a39530b3a4213627e0aea33fbaacac8c307d9e7e654c99bd5b8d"
     },
     "index.js": {
       "size": 677,
-      "sha256": "6579dfb73bfcc427e23eb91a8c1791b714216e695dec1fd87f654c1ff7033684"
+      "sha256": "62b975ffe5348710c55e4a589ff35a54b992293b68f23479a33360f6f482b310"
     },
     "register.d.ts": {
       "size": 170,

package/package.json

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