power-queues 2.1.0 → 2.1.2

package/dist/index.cjs

@@ -285,7 +285,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     this.logStatus = false;
     this.logStatusTimeout = 3e5;
     this.approveCount = 2e3;
-    this.removeOnExecuted = false;
+    this.removeOnExecuted = true;
   }
   signal() {
     return this.abort.signal;
@@ -360,15 +360,15 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
       throw new Error(`Batch error. ${err2.message}`);
     }
   }
-  async approve(queueName, ids) {
-    if (!(0, import_full_utils.isArrFilled)(ids)) {
+  async approve(queueName, tasks) {
+    if (!(0, import_full_utils.isArrFilled)(tasks)) {
       return 0;
     }
     const approveCount = Math.max(500, Math.min(4e3, this.approveCount));
     let total = 0, i = 0;
-    while (i < ids.length) {
-      const room = Math.min(approveCount, ids.length - i);
-      const part = ids.slice(i, i + room);
+    while (i < tasks.length) {
+      const room = Math.min(approveCount, tasks.length - i);
+      const part = tasks.slice(i, i + room).map((item) => String(item.id || ""));
       const approved = await this.runScript("Approve", [queueName], [this.group, this.removeOnExecuted ? "1" : "0", ...part], Approve);
       total += Number(approved || 0);
       i += room;
@@ -455,7 +455,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
         promises.push((async () => {
           const r = await this.executeProcess(queueName, { id, payload, createdAt, job, idemKey, attempt });
           if (r.id) {
-            result.push(id);
+            result.push(r);
           } else if (r.contended) {
             contended++;
           }
@@ -463,7 +463,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
       } else {
         const r = await this.executeProcess(queueName, { id, payload, createdAt, job, idemKey, attempt });
         if (r.id) {
-          result.push(id);
+          result.push(r);
         } else if (r.contended) {
           contended++;
         }
@@ -472,7 +472,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     if (!this.executeSync && promises.length > 0) {
       await Promise.all(promises);
     }
-    await this.onBatchSuccess(queueName, tasks);
+    await this.onBatchSuccess(queueName, result);
     if (!(0, import_full_utils.isArrFilled)(result) && contended > tasks.length >> 1) {
       await this.waitAbortable(15 + Math.floor(Math.random() * 35) + Math.min(250, 15 * contended + Math.floor(Math.random() * 40)));
     }
@@ -498,17 +498,16 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     const heartbeat = this.heartbeat(keys) || (() => {
     });
     try {
-      await this.onExecute(queueName, task);
+      const processed = await this.onExecute(queueName, task);
       await this.idempotencyDone(keys);
-      await this.success(queueName, task);
-      return { id: task.id };
+      return await this.success(queueName, processed);
     } catch (err) {
       try {
         task.attempt = task.attempt + 1;
         await this.error(err, queueName, task);
         if (task.attempt >= this.retryCount) {
           await this.idempotencyFree(keys);
-          return { id: task.id };
+          return task;
         }
         await this.idempotencyFree(keys);
       } catch (err2) {
@@ -552,7 +551,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
       await this.incr(statusKey + "ok", this.logStatusTimeout);
       await this.incr(statusKey + "ready", this.logStatusTimeout);
     }
-    await this.onSuccess(queueName, task);
+    return await this.onSuccess(queueName, task);
   }
   async error(err, queueName, task) {
     const dlqKey = queueName + ":dlq";
@@ -724,6 +723,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     if (!(0, import_full_utils.isStrFilled)(queueName)) {
       throw new Error("Queue name is required.");
     }
+    opts.job = opts.job ?? (0, import_uuid.v4)();
     const batches = this.buildBatches(data, opts);
     const result = new Array(data.length);
     const promises = [];
@@ -750,7 +750,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     });
     if (opts.status) {
       await this.redis.set(`${queueName}:${opts.job}:total`, data.length);
-      await this.redis.pexpire(`${queueName}:${opts.job}:total`, opts.statusTimeoutMs || 3e5);
+      await this.redis.pexpire(`${queueName}:${opts.job}:total`, this.logStatusTimeout);
     }
     await Promise.all(runners);
     return result;
@@ -835,10 +835,12 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     return tasks;
   }
   async onExecute(queueName, task) {
+    return task;
   }
   async onBatchSuccess(queueName, tasks) {
   }
   async onSuccess(queueName, task) {
+    return task;
   }
   async onError(err, queueName, task) {
   }

package/dist/index.d.cts

@@ -82,9 +82,9 @@ declare class PowerQueues extends PowerRedis {
     private keysLength;
     private payloadBatch;
     beforeExecute(queueName: string, tasks: Array<[string, any[], number, string, string, number]>): Promise<[string, any[], number, string, string, number][]>;
-    onExecute(queueName: string, task: Task): Promise<void>;
-    onBatchSuccess(queueName: string, tasks: Array<[string, any[], number, string, string, number]>): Promise<void>;
-    onSuccess(queueName: string, task: Task): Promise<void>;
+    onExecute(queueName: string, task: Task): Promise<Task>;
+    onBatchSuccess(queueName: string, tasks: Array<Task>): Promise<void>;
+    onSuccess(queueName: string, task: Task): Promise<Task>;
     onError(err: any, queueName: string, task: Task): Promise<void>;
     onBatchError(err: any, queueName: string, tasks: Array<[string, any[], number, string, string, number]>): Promise<void>;
     onRetry(err: any, queueName: string, task: Task): Promise<void>;

package/dist/index.d.ts

@@ -82,9 +82,9 @@ declare class PowerQueues extends PowerRedis {
     private keysLength;
     private payloadBatch;
     beforeExecute(queueName: string, tasks: Array<[string, any[], number, string, string, number]>): Promise<[string, any[], number, string, string, number][]>;
-    onExecute(queueName: string, task: Task): Promise<void>;
-    onBatchSuccess(queueName: string, tasks: Array<[string, any[], number, string, string, number]>): Promise<void>;
-    onSuccess(queueName: string, task: Task): Promise<void>;
+    onExecute(queueName: string, task: Task): Promise<Task>;
+    onBatchSuccess(queueName: string, tasks: Array<Task>): Promise<void>;
+    onSuccess(queueName: string, task: Task): Promise<Task>;
     onError(err: any, queueName: string, task: Task): Promise<void>;
     onBatchError(err: any, queueName: string, tasks: Array<[string, any[], number, string, string, number]>): Promise<void>;
     onRetry(err: any, queueName: string, task: Task): Promise<void>;

package/dist/index.js

@@ -268,7 +268,7 @@ var PowerQueues = class extends PowerRedis {
     this.logStatus = false;
     this.logStatusTimeout = 3e5;
     this.approveCount = 2e3;
-    this.removeOnExecuted = false;
+    this.removeOnExecuted = true;
   }
   signal() {
     return this.abort.signal;
@@ -343,15 +343,15 @@ var PowerQueues = class extends PowerRedis {
       throw new Error(`Batch error. ${err2.message}`);
     }
   }
-  async approve(queueName, ids) {
-    if (!isArrFilled(ids)) {
+  async approve(queueName, tasks) {
+    if (!isArrFilled(tasks)) {
       return 0;
     }
     const approveCount = Math.max(500, Math.min(4e3, this.approveCount));
     let total = 0, i = 0;
-    while (i < ids.length) {
-      const room = Math.min(approveCount, ids.length - i);
-      const part = ids.slice(i, i + room);
+    while (i < tasks.length) {
+      const room = Math.min(approveCount, tasks.length - i);
+      const part = tasks.slice(i, i + room).map((item) => String(item.id || ""));
       const approved = await this.runScript("Approve", [queueName], [this.group, this.removeOnExecuted ? "1" : "0", ...part], Approve);
       total += Number(approved || 0);
       i += room;
@@ -438,7 +438,7 @@ var PowerQueues = class extends PowerRedis {
         promises.push((async () => {
           const r = await this.executeProcess(queueName, { id, payload, createdAt, job, idemKey, attempt });
           if (r.id) {
-            result.push(id);
+            result.push(r);
           } else if (r.contended) {
             contended++;
           }
@@ -446,7 +446,7 @@ var PowerQueues = class extends PowerRedis {
       } else {
         const r = await this.executeProcess(queueName, { id, payload, createdAt, job, idemKey, attempt });
         if (r.id) {
-          result.push(id);
+          result.push(r);
         } else if (r.contended) {
           contended++;
         }
@@ -455,7 +455,7 @@ var PowerQueues = class extends PowerRedis {
     if (!this.executeSync && promises.length > 0) {
       await Promise.all(promises);
     }
-    await this.onBatchSuccess(queueName, tasks);
+    await this.onBatchSuccess(queueName, result);
     if (!isArrFilled(result) && contended > tasks.length >> 1) {
       await this.waitAbortable(15 + Math.floor(Math.random() * 35) + Math.min(250, 15 * contended + Math.floor(Math.random() * 40)));
     }
@@ -481,17 +481,16 @@ var PowerQueues = class extends PowerRedis {
     const heartbeat = this.heartbeat(keys) || (() => {
     });
     try {
-      await this.onExecute(queueName, task);
+      const processed = await this.onExecute(queueName, task);
       await this.idempotencyDone(keys);
-      await this.success(queueName, task);
-      return { id: task.id };
+      return await this.success(queueName, processed);
     } catch (err) {
       try {
         task.attempt = task.attempt + 1;
         await this.error(err, queueName, task);
         if (task.attempt >= this.retryCount) {
           await this.idempotencyFree(keys);
-          return { id: task.id };
+          return task;
         }
         await this.idempotencyFree(keys);
       } catch (err2) {
@@ -535,7 +534,7 @@ var PowerQueues = class extends PowerRedis {
       await this.incr(statusKey + "ok", this.logStatusTimeout);
       await this.incr(statusKey + "ready", this.logStatusTimeout);
     }
-    await this.onSuccess(queueName, task);
+    return await this.onSuccess(queueName, task);
   }
   async error(err, queueName, task) {
     const dlqKey = queueName + ":dlq";
@@ -707,6 +706,7 @@ var PowerQueues = class extends PowerRedis {
     if (!isStrFilled(queueName)) {
       throw new Error("Queue name is required.");
     }
+    opts.job = opts.job ?? uuid();
     const batches = this.buildBatches(data, opts);
     const result = new Array(data.length);
     const promises = [];
@@ -733,7 +733,7 @@ var PowerQueues = class extends PowerRedis {
     });
     if (opts.status) {
       await this.redis.set(`${queueName}:${opts.job}:total`, data.length);
-      await this.redis.pexpire(`${queueName}:${opts.job}:total`, opts.statusTimeoutMs || 3e5);
+      await this.redis.pexpire(`${queueName}:${opts.job}:total`, this.logStatusTimeout);
     }
     await Promise.all(runners);
     return result;
@@ -818,10 +818,12 @@ var PowerQueues = class extends PowerRedis {
     return tasks;
   }
   async onExecute(queueName, task) {
+    return task;
   }
   async onBatchSuccess(queueName, tasks) {
   }
   async onSuccess(queueName, task) {
+    return task;
   }
   async onError(err, queueName, task) {
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "power-queues",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"description": "High-performance Redis Streams queue for Node.js with Lua-powered bulk XADD, idempotent workers, heartbeat locks, stuck-task recovery, retries, DLQ, and distributed processing.",
 	"author": "ihor-bielchenko",
 	"license": "MIT",
@@ -81,7 +81,7 @@
 		"power-redis"
 	],
 	"dependencies": {
-		"full-utils": "^3.0.8",
+		"full-utils": "^3.0.9",
 		"power-redis": "^2.0.23",
 		"uuid": "^13.0.0"
 	}