@prsm/queue 3.0.2 → 3.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prsm/queue",
-  "version": "3.0.2",
+  "version": "3.0.6",
   "description": "Redis-backed distributed task queue with grouped concurrency, retries, and rate limiting",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
   "scripts": {
     "test": "vitest --reporter=verbose --run",
     "test:watch": "vitest",
-    "prepublishOnly": "npx tsc --declaration --allowJs --emitDeclarationOnly --skipLibCheck --target es2020 --module nodenext --moduleResolution nodenext --strict false --esModuleInterop true --outDir ./types src/index.js"
+    "prepublishOnly": "npx tsc -p tsconfig.json"
   },
   "keywords": [
     "queue",
@@ -32,6 +32,7 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@prsm/lock": "^1.0.0",
     "@prsm/ms": "^1.0.1",
     "redis": "^5.1.1"
   },

package/src/queue.js

@@ -2,6 +2,7 @@ import { createClient } from "redis"
 import { EventEmitter } from "events"
 import { randomUUID } from "crypto"
 import ms from "@prsm/ms"
+import { semaphore as createSemaphore } from "@prsm/lock"
 
 /**
  * @typedef {Object} QueueOptions
@@ -31,36 +32,6 @@ import ms from "@prsm/ms"
  * @returns {Promise<any>|any}
  */
 
-const ACQUIRE_SCRIPT = `
-local key = KEYS[1]
-local max = tonumber(ARGV[1])
-local id = ARGV[2]
-local ttl = tonumber(ARGV[3])
-local time = redis.call('TIME')
-local now = tonumber(time[1]) * 1000 + math.floor(tonumber(time[2]) / 1000)
-redis.call('ZREMRANGEBYSCORE', key, '-inf', now - ttl)
-if redis.call('ZCARD', key) < max then
-  redis.call('ZADD', key, now, id)
-  return 1
-end
-return 0
-`
-
-const RELEASE_SCRIPT = `
-redis.call('ZREM', KEYS[1], ARGV[1])
-return 1
-`
-
-const RENEW_SCRIPT = `
-local time = redis.call('TIME')
-local now = tonumber(time[1]) * 1000 + math.floor(tonumber(time[2]) / 1000)
-if redis.call('ZSCORE', KEYS[1], ARGV[1]) then
-  redis.call('ZADD', KEYS[1], now, ARGV[1])
-  return 1
-end
-return 0
-`
-
 const LEASE_TTL = 60000
 const HEARTBEAT_INTERVAL = 15000
 const CLOSE_TIMEOUT = 5000
@@ -131,9 +102,16 @@ export default class Queue extends EventEmitter {
 
     this._redis = createClient(this._options.redisOptions)
     this._redis.on("error", () => {})
+    this._semaphore = this._options.globalConcurrency > 0
+      ? createSemaphore({
+          max: this._options.globalConcurrency,
+          ttl: LEASE_TTL,
+          redis: this._options.redisOptions,
+          prefix: "",
+        })
+      : null
     this._subClient = null
     this._groupNotifyClient = null
-    this._pendingWaits = new Map()
     this._readyPromise = this._initialize()
   }
 
@@ -257,7 +235,6 @@ export default class Queue extends EventEmitter {
         if (timer) clearTimeout(timer)
         this.off("complete", onComplete)
         this.off("failed", onFailed)
-        this._pendingWaits.delete(uuid)
         this._subClient?.unsubscribe(channel).catch(() => {})
       }
 
@@ -269,8 +246,6 @@ export default class Queue extends EventEmitter {
       this.on("complete", onComplete)
       this.on("failed", onFailed)
 
-      this._pendingWaits.set(uuid, true)
-
       this._ensureSubClient().then((sub) => {
         if (settled) { resolveReady(); return }
         sub.subscribe(channel, (message) => {
@@ -330,10 +305,12 @@ export default class Queue extends EventEmitter {
     if (this._subClient?.isOpen) await this._subClient.disconnect().catch(() => {})
     this._subClient = null
     if (this._redis.isOpen) await this._redis.quit()
+    if (this._semaphore) await this._semaphore.close().catch(() => {})
   }
 
   async _initialize() {
     await this._redis.connect()
+    if (this._semaphore) await this._semaphore.peek("queue:active").catch(() => {})
     await this._startWorkers()
     if (this._options.concurrency > 0) {
       await this._subscribeToGroupNotifications()
@@ -467,14 +444,11 @@ export default class Queue extends EventEmitter {
   }
 
   async _acquireGlobal(workerId, activeMap) {
-    const leaseId = randomUUID()
     while (activeMap.get(workerId) && !this._closed) {
       if (!this._redis.isOpen) return null
-      const acquired = await this._redis.eval(ACQUIRE_SCRIPT, {
-        keys: ["queue:active"],
-        arguments: [String(this._options.globalConcurrency), leaseId, String(LEASE_TTL)],
-      })
-      if (acquired) {
+      const result = await this._semaphore.acquire("queue:active")
+      if (result.acquired) {
+        const leaseId = result.id
         this._activeLeases.add(leaseId)
         const heartbeat = setInterval(() => this._renewGlobal(leaseId).catch(() => {}), HEARTBEAT_INTERVAL)
         heartbeat.unref()
@@ -493,21 +467,11 @@ export default class Queue extends EventEmitter {
       clearInterval(heartbeat)
       this._heartbeats.delete(leaseId)
     }
-    if (this._redis.isOpen) {
-      await this._redis.eval(RELEASE_SCRIPT, {
-        keys: ["queue:active"],
-        arguments: [leaseId],
-      })
-    }
+    await this._semaphore.release("queue:active", leaseId).catch(() => {})
   }
 
   async _renewGlobal(leaseId) {
-    if (this._redis.isOpen) {
-      await this._redis.eval(RENEW_SCRIPT, {
-        keys: ["queue:active"],
-        arguments: [leaseId],
-      })
-    }
+    await this._semaphore.renew("queue:active", leaseId).catch(() => {})
   }
 
   async _processTask(task, opts) {
@@ -592,6 +556,7 @@ export default class Queue extends EventEmitter {
         }
         this._groupInFlight.delete(groupKey)
       }
+      this._workerClients = this._workerClients.filter((c) => c.isOpen)
     } catch {}
   }
 }

package/types/queue.d.ts

@@ -2348,6 +2348,7 @@ export default class Queue extends EventEmitter<[never]> {
             };
         };
     } & import("redis").RedisModules, import("redis").RedisFunctions, import("redis").RedisScripts, import("redis").RespVersions, import("redis").TypeMapping>;
+    _semaphore: any;
     _subClient: import("@redis/client").RedisClientType<{
         json: {
             ARRAPPEND: {
@@ -6976,7 +6977,6 @@ export default class Queue extends EventEmitter<[never]> {
             };
         };
     } & import("redis").RedisModules, import("redis").RedisFunctions, import("redis").RedisScripts, import("redis").RespVersions, import("redis").TypeMapping>;
-    _pendingWaits: Map<any, any>;
     _readyPromise: Promise<void>;
     /** @returns {Promise<void>} */
     ready(): Promise<void>;
@@ -9333,7 +9333,7 @@ export default class Queue extends EventEmitter<[never]> {
     _startWorker(workerId: any): Promise<void>;
     _startGroupWorker(workerId: any, groupKey: any): Promise<void>;
     _runWorkerLoop(workerId: any, client: any, key: any, activeMap: any, opts: any): Promise<void>;
-    _acquireGlobal(workerId: any, activeMap: any): Promise<`${string}-${string}-${string}-${string}-${string}`>;
+    _acquireGlobal(workerId: any, activeMap: any): Promise<any>;
     _releaseGlobal(leaseId: any): Promise<void>;
     _renewGlobal(leaseId: any): Promise<void>;
     _processTask(task: any, opts: any): Promise<void>;