@prsm/queue 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prsm/queue",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Redis-backed distributed task queue with grouped concurrency, retries, and rate limiting",
   "type": "module",
   "exports": {

package/src/queue.js

@@ -156,8 +156,13 @@ export default class Queue extends EventEmitter {
   async push(payload) {
     if (this._closed) throw new Error("Queue is closed")
     const task = { uuid: randomUUID(), payload, createdAt: Date.now(), attempts: 0 }
-    await this._redis.lPush("queue:tasks", JSON.stringify(task))
     this._pushed++
+    try {
+      await this._redis.lPush("queue:tasks", JSON.stringify(task))
+    } catch (err) {
+      this._pushed--
+      throw err
+    }
     this.emit("new", { task })
     return task.uuid
   }
@@ -170,12 +175,15 @@ export default class Queue extends EventEmitter {
   pushAndWait(payload, timeout = 0) {
     if (this._closed) return Promise.reject(new Error("Queue is closed"))
     const task = { uuid: randomUUID(), payload, createdAt: Date.now(), attempts: 0 }
+    this._pushed++
     const result = this._awaitTask(task.uuid, timeout)
     result.catch(() => {})
     return this._redis.lPush("queue:tasks", JSON.stringify(task)).then(() => {
-      this._pushed++
       this.emit("new", { task })
       return result
+    }, (err) => {
+      this._pushed--
+      throw err
     })
   }
 
@@ -191,24 +199,28 @@ export default class Queue extends EventEmitter {
 
     const commit = (task) => {
       return this._redis.lPush(`queue:groups:${key}`, JSON.stringify(task)).then(async () => {
-        this._pushed++
         this.emit("new", { task })
         if (!this._groupWorkers.has(key)) {
           this._groupWorkers.set(key, new Map())
           this._groupInFlight.set(key, 0)
           await this._startGroupWorkers(key)
         }
+      }, (err) => {
+        this._pushed--
+        throw err
       })
     }
 
     return {
       push: async (payload) => {
         const task = makeTask(payload)
+        this._pushed++
         await commit(task)
         return task.uuid
       },
       pushAndWait: (payload, timeout = 0) => {
         const task = makeTask(payload)
+        this._pushed++
         const result = this._awaitTask(task.uuid, timeout)
         result.catch(() => {})
         return commit(task).then(() => result)
@@ -259,6 +271,7 @@ export default class Queue extends EventEmitter {
     await this._readyPromise.catch(() => {})
 
     if (this._cleanupTimer) clearInterval(this._cleanupTimer)
+    clearTimeout(this._drainTimer)
 
     this._workers.clear()
     for (const groupWorkers of this._groupWorkers.values()) groupWorkers.clear()
@@ -502,7 +515,10 @@ export default class Queue extends EventEmitter {
   }
 
   _emitDrain() {
-    if (this._inFlight === 0 && this._totalSettled >= this._pushed) this.emit("drain")
+    clearTimeout(this._drainTimer)
+    this._drainTimer = setTimeout(() => {
+      if (this._inFlight === 0 && this._totalSettled >= this._pushed) this.emit("drain")
+    }, 0)
   }
 
   async _periodicCleanup() {

package/types/queue.d.ts

@@ -4704,6 +4704,7 @@ export default class Queue extends EventEmitter<[never]> {
     _processTask(task: any, opts: any): Promise<void>;
     _settle(): void;
     _emitDrain(): void;
+    _drainTimer: NodeJS.Timeout;
     _periodicCleanup(): Promise<void>;
 }
 export type QueueOptions = {