@zintrust/queue-redis 0.4.70 → 0.4.75

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/build-manifest.json

@@ -1,14 +1,14 @@
 {
   "name": "@zintrust/queue-redis",
-  "version": "0.4.70",
-  "buildDate": "2026-04-06T16:10:45.630Z",
+  "version": "0.4.75",
+  "buildDate": "2026-04-07T17:14:28.165Z",
   "buildEnvironment": {
     "node": "v20.20.2",
     "platform": "linux",
     "arch": "x64"
   },
   "git": {
-    "commit": "b92b2b05",
+    "commit": "f910e7ec",
     "branch": "master"
   },
   "package": {
@@ -29,8 +29,8 @@
       "sha256": "52fb0f688cd17cc7d8e8128e60df6f5eea4c803282382ac75550e6aacee7cbb0"
     },
     "BullMQRedisQueue.js": {
-      "size": 21327,
-      "sha256": "a35f9d822a3166d57ca48ea1f4894e9fe7996fb842c2f8eeb5cd8be4de866a6a"
+      "size": 21579,
+      "sha256": "042803997f2f9895827ce34359bb62c80b2b889ab4ddc9cbbe191924a376684a"
     },
     "HttpQueueDriver.d.ts": {
       "size": 835,
@@ -62,7 +62,7 @@
     },
     "index.js": {
       "size": 677,
-      "sha256": "6579dfb73bfcc427e23eb91a8c1791b714216e695dec1fd87f654c1ff7033684"
+      "sha256": "0b175d703cca21f8726f87a3ca5b7cd88d9561fe42f48fb14d71a137e63c7f7d"
     },
     "register.d.ts": {
       "size": 170,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/queue-redis",
-  "version": "0.4.70",
+  "version": "0.4.75",
   "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"