@holo-js/queue-redis 0.3.27 → 0.4.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Holo-JS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/.holo-build-fingerprint

@@ -0,0 +1 @@
+daae375d958d2b145cce1230cbb95158b7edb1913d9273e96512972fc44c2320

package/dist/index.d.ts

@@ -31,6 +31,7 @@ declare class RedisQueueDriver implements QueueAsyncDriver {
     readonly name: string;
     readonly driver: "redis";
     readonly mode: "async";
+    readonly acceptsJobId = true;
     private readonly connection;
     private readonly bullConnection;
     private readonly managedRedisConnection?;
@@ -42,6 +43,9 @@ declare class RedisQueueDriver implements QueueAsyncDriver {
     constructor(connection: NormalizedQueueRedisConnectionConfig, context: QueueDriverFactoryContext);
     private getQueuePrefix;
     private getQueue;
+    private getLockDuration;
+    private reportFailure;
+    private renewReservation;
     private createWorkerKey;
     private normalizeReserveBlockFor;
     private resolveWorkerDrainDelay;
@@ -60,6 +64,9 @@ declare class RedisQueueDriver implements QueueAsyncDriver {
     acknowledge(job: QueueReservedJob): Promise<void>;
     release(job: QueueReservedJob, options?: QueueReleaseOptions): Promise<void>;
     delete(job: QueueReservedJob): Promise<void>;
+    abandon(job: QueueReservedJob): void;
+    private countLegacyPausedJobs;
+    private countQueuedJobs;
     clear(input?: {
         readonly queueNames?: readonly string[];
     }): Promise<number>;
@@ -78,4 +85,5 @@ declare const redisQueueDriverInternals: {
     wrapRedisError: typeof wrapRedisError;
 };
 
-export { type QueueDriverFactory, RedisQueueDriver, RedisQueueDriverError, redisQueueDriverFactory, redisQueueDriverInternals };
+export { RedisQueueDriver, RedisQueueDriverError, redisQueueDriverFactory, redisQueueDriverInternals };
+export type { QueueDriverFactory };

package/dist/index.mjs

@@ -1,7 +1,9 @@
 // src/index.ts
+import { reportError } from "@holo-js/kernel/error-reporting";
 import { randomUUID } from "crypto";
 import {
   Queue as BullQueue,
+  UnrecoverableError,
   Worker as BullWorker
 } from "bullmq";
 import Redis from "ioredis";
@@ -38,7 +40,7 @@ function parseClusterNodeUrl(url, label) {
       ...parsed.protocol === "rediss:" ? { tls: {} } : {}
     };
   } catch (error) {
-    throw new Error(`[Holo Queue] ${label} is invalid: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(`[Holo Queue] ${label} is invalid: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
   }
 }
 function resolveClusterStartupNodes(connection) {
@@ -132,9 +134,11 @@ var RedisQueueDriver = class {
     this.bullConnection = bullConnection;
     this.managedRedisConnection = bullConnection instanceof Redis || bullConnection instanceof Redis.Cluster ? bullConnection : void 0;
   }
+  context;
   name;
   driver = "redis";
   mode = "async";
+  acceptsJobId = true;
   connection;
   bullConnection;
   managedRedisConnection;
@@ -162,6 +166,26 @@ var RedisQueueDriver = class {
     this.queues.set(queueName, queue);
     return queue;
   }
+  getLockDuration() {
+    return this.connection.retryAfter * 1e3;
+  }
+  reportFailure(action, operation, error) {
+    reportError(wrapRedisError(this.name, action, error), { capability: "queue", operation });
+  }
+  renewReservation(job, token) {
+    const lockDuration = this.getLockDuration();
+    const renewal = setInterval(() => {
+      job.extendLock(token, lockDuration).then((extended) => {
+        if (extended === 0) {
+          clearInterval(renewal);
+        }
+      }, (error) => {
+        this.reportFailure("renew job reservation", "redis.renewReservation", error);
+      });
+    }, lockDuration / 2);
+    renewal.unref();
+    return renewal;
+  }
   createWorkerKey(queueName, blockFor) {
     return `${queueName}:${blockFor}`;
   }
@@ -196,7 +220,9 @@ var RedisQueueDriver = class {
         connection: this.bullConnection,
         prefix: this.getQueuePrefix(queueName),
         drainDelay: this.resolveWorkerDrainDelay(blockFor),
-        lockDuration: this.connection.retryAfter * 1e3,
+        lockDuration: this.getLockDuration(),
+        stalledInterval: this.getLockDuration(),
+        maxStalledCount: Number.MAX_SAFE_INTEGER,
         removeOnComplete: { count: 0 },
         removeOnFail: { count: 0 }
       }
@@ -205,7 +231,13 @@ var RedisQueueDriver = class {
       queueName,
       worker
     };
-    const ready = worker.waitUntilReady().then(() => workerRecord).catch(async (error) => {
+    worker.on("error", (error) => {
+      this.reportFailure("recover abandoned reservations", "redis.recoverAbandonedReservations", error);
+    });
+    const ready = worker.waitUntilReady().then(async () => {
+      await worker.startStalledCheckTimer();
+      return workerRecord;
+    }).catch(async (error) => {
       if (this.workers.get(workerKey) === workerRecord) {
         this.workers.delete(workerKey);
       }
@@ -265,7 +297,8 @@ var RedisQueueDriver = class {
     });
     this.reservations.set(token, {
       job,
-      token
+      token,
+      renewal: this.renewReservation(job, token)
     });
     return {
       reservationId: token,
@@ -282,6 +315,7 @@ var RedisQueueDriver = class {
   }
   async settleReservation(reserved, action, callback) {
     const reservation = this.getReservation(reserved);
+    clearInterval(reservation.renewal);
     try {
       await callback(reservation);
     } catch (error) {
@@ -353,18 +387,40 @@ var RedisQueueDriver = class {
   }
   async delete(job) {
     await this.settleReservation(job, "delete job", async (reservation) => {
-      reservation.job.discard();
-      await reservation.job.moveToFailed(new Error("[Holo Queue] Job deleted."), reservation.token, false);
+      await reservation.job.moveToFailed(new UnrecoverableError("[Holo Queue] Job deleted."), reservation.token, false);
     });
   }
+  abandon(job) {
+    const reservation = this.reservations.get(job.reservationId);
+    if (!reservation) {
+      return;
+    }
+    clearInterval(reservation.renewal);
+    this.reservations.delete(job.reservationId);
+  }
+  async countLegacyPausedJobs(queueName) {
+    const client = await this.getQueue(queueName).getBackend().client;
+    const pausedKey = `${this.getQueuePrefix(queueName)}:${queueName}:paused`;
+    const count = await client.llen(pausedKey);
+    if (count === 0) {
+      return 0;
+    }
+    const [last] = await client.lrange(pausedKey, -1, -1);
+    return last?.startsWith("0:") ? count - 1 : count;
+  }
+  async countQueuedJobs(queueName) {
+    const counted = await this.getQueue(queueName).getJobCountByTypes("wait", "prioritized", "delayed");
+    return counted + await this.countLegacyPausedJobs(queueName);
+  }
   async clear(input) {
     try {
       const queueNames = this.normalizeQueueNames(input?.queueNames);
       let cleared = 0;
       for (const queueName of queueNames) {
-        const queue = this.getQueue(queueName);
-        cleared += await queue.getJobCountByTypes("wait", "paused", "prioritized", "delayed");
-        await queue.drain(true);
+        const before = await this.countQueuedJobs(queueName);
+        await this.getQueue(queueName).drain(true);
+        const after = await this.countQueuedJobs(queueName);
+        cleared += Math.max(0, before - after);
       }
       return cleared;
     } catch (error) {
@@ -377,6 +433,9 @@ var RedisQueueDriver = class {
       ...this.queues.values()
     ];
     const workerReadyPromises = [...this.workerReadyPromises.values()];
+    for (const reservation of this.reservations.values()) {
+      clearInterval(reservation.renewal);
+    }
     this.reservations.clear();
     this.workerReadyPromises.clear();
     this.workers.clear();

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@holo-js/queue-redis",
-  "version": "0.3.27",
+  "version": "0.4.0",
   "description": "Holo-JS Framework - Redis queue driver",
   "type": "module",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cobraprojects/holo-js.git",
+    "directory": "packages/queue-redis"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -14,7 +19,8 @@
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "LICENSE"
   ],
   "scripts": {
     "build": "tsup",
@@ -23,21 +29,22 @@
     "test": "vitest --run"
   },
   "peerDependencies": {
-    "@holo-js/queue": "^0.3.27"
+    "@holo-js/queue": "^0.4.0"
   },
   "dependencies": {
-    "bullmq": "^5.71.0",
-    "ioredis": "^5.4.2",
+    "@holo-js/kernel": "^0.4.0",
+    "bullmq": "^6.4.0",
+    "ioredis": "^6.0.0",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@holo-js/queue": "^0.3.27",
-    "@types/node": "^22.10.2",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "vitest": "^4.1.5"
+    "@holo-js/queue": "^0.4.0",
+    "@types/node": "^22.20.5",
+    "tsup": "^9.0.0",
+    "typescript": "^6.0.3",
+    "vitest": "^5.0.5"
   },
   "engines": {
-    "node": "^22.12.0 || ^24.0.0 || ^26.0.0"
+    "node": "^22.18.0 || ^24.0.0 || ^26.0.0"
   }
 }