@holo-js/queue-redis 0.3.23 → 0.3.24

package/dist/index.d.ts

@@ -40,6 +40,7 @@ declare class RedisQueueDriver implements QueueAsyncDriver {
     private readonly reservations;
     private queueCursor;
     constructor(connection: NormalizedQueueRedisConnectionConfig, context: QueueDriverFactoryContext);
+    private getQueuePrefix;
     private getQueue;
     private createWorkerKey;
     private normalizeReserveBlockFor;

package/dist/index.mjs

@@ -143,6 +143,9 @@ var RedisQueueDriver = class {
   workerReadyPromises = /* @__PURE__ */ new Map();
   reservations = /* @__PURE__ */ new Map();
   queueCursor = 0;
+  getQueuePrefix(queueName) {
+    return this.bullConnection instanceof Redis.Cluster ? `{${queueName}}` : "bull";
+  }
   getQueue(queueName) {
     const cached = this.queues.get(queueName);
     if (cached) {
@@ -150,6 +153,7 @@ var RedisQueueDriver = class {
     }
     const queue = new BullQueue(queueName, {
       connection: this.bullConnection,
+      prefix: this.getQueuePrefix(queueName),
       defaultJobOptions: {
         removeOnComplete: true,
         removeOnFail: true
@@ -190,6 +194,7 @@ var RedisQueueDriver = class {
         autorun: false,
         concurrency: 1,
         connection: this.bullConnection,
+        prefix: this.getQueuePrefix(queueName),
         drainDelay: this.resolveWorkerDrainDelay(blockFor),
         lockDuration: this.connection.retryAfter * 1e3,
         removeOnComplete: { count: 0 },
@@ -322,7 +327,8 @@ var RedisQueueDriver = class {
       }
       const token = `${workerId}:${randomUUID()}`;
       const worker = await this.getWorker(blockingQueue, blockFor);
-      const job = await worker.getNextJob(token, { block: true });
+      const queued = await worker.getNextJob(token, { block: false });
+      const job = queued ?? await worker.getNextJob(token, { block: true });
       if (!job) {
         return null;
       }
@@ -357,7 +363,7 @@ var RedisQueueDriver = class {
       let cleared = 0;
       for (const queueName of queueNames) {
         const queue = this.getQueue(queueName);
-        cleared += await queue.getJobCountByTypes("wait", "waiting", "paused", "prioritized", "delayed");
+        cleared += await queue.getJobCountByTypes("wait", "paused", "prioritized", "delayed");
         await queue.drain(true);
       }
       return cleared;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/queue-redis",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "Holo-JS Framework - Redis queue driver",
   "type": "module",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "test": "vitest --run"
   },
   "peerDependencies": {
-    "@holo-js/queue": "^0.3.23"
+    "@holo-js/queue": "^0.3.24"
   },
   "dependencies": {
     "bullmq": "^5.71.0",
@@ -31,7 +31,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@holo-js/queue": "^0.3.23",
+    "@holo-js/queue": "^0.3.24",
     "@types/node": "^22.10.2",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",