power-queues 2.0.7 → 2.0.9

package/dist/index.cjs

@@ -290,6 +290,12 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   }
   async onSuccess(id, payload, createdAt, job, key) {
   }
+  async onBatchError(err, tasks) {
+  }
+  async onError(err, id, payload, createdAt, job, key) {
+  }
+  async onRetry(err, id, payload, createdAt, job, key, attempts) {
+  }
   async runQueue() {
     await this.createGroup("0-0");
     await this.consumerLoop();
@@ -538,26 +544,25 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   }
   async success(id, payload, createdAt, job, key) {
     if (this.executeJobStatus) {
-      await this.status(id, payload, createdAt, job, key);
+      const prefix = `${this.stream}:${job}:`;
+      const { ready = 0, ok = 0 } = await this.getMany(`${prefix}*`);
+      await this.setMany([{ key: `${prefix}ready`, value: ready + 1 }, { key: `${prefix}ok`, value: ok + 1 }], this.executeJobStatusTtlSec);
     }
     await this.onSuccess(id, payload, createdAt, job, key);
   }
-  async status(id, payload, createdAt, job, key) {
-    const prefix = `s:${this.stream}:`;
-    const { ready = 0, ok = 0 } = await this.getMany(prefix);
-    await this.setMany([{ key: `${prefix}ready`, value: ready + 1 }, { key: `${prefix}ok`, value: ok + 1 }], this.executeJobStatusTtlSec);
-  }
   async batchError(err, tasks) {
+    await this.onBatchError(err, tasks);
   }
-  async error(err, id, payload, createdAt, job, key) {
+  async error(err, id, payload, createdAt, job, key, attempt) {
+    if (this.executeJobStatus && attempt >= this.workerMaxRetries) {
+      const prefix = `${this.stream}:${job}:`;
+      const { ready = 0, err: err2 = 0 } = await this.getMany(`${prefix}*`);
+      await this.setMany([{ key: `${prefix}ready`, value: ready + 1 }, { key: `${prefix}err`, value: err2 + 1 }], this.executeJobStatusTtlSec);
+    }
     await this.onError(err, id, payload, createdAt, job, key);
   }
-  async onError(err, id, payload, createdAt, job, key) {
-  }
-  async attempt(err, id, payload, createdAt, job, key, attempts) {
-    await this.onRetry(err, id, payload, createdAt, job, key, attempts);
-  }
-  async onRetry(err, id, payload, createdAt, job, key, attempts) {
+  async attempt(err, id, payload, createdAt, job, key, attempt) {
+    await this.onRetry(err, id, payload, createdAt, job, key, attempt);
   }
   async execute(tasks) {
     const result = [];
@@ -603,10 +608,10 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
         await this.success(id, payload, createdAt, job, key);
         return { id };
       } catch (err) {
-        const attempts = await this.incrAttempts(id);
-        await this.attempt(err, id, payload, createdAt, job, key, attempts);
-        await this.error(err, id, payload, createdAt, job, key);
-        if (attempts >= this.workerMaxRetries) {
+        const attempt = await this.incrAttempts(id);
+        await this.attempt(err, id, payload, createdAt, job, key, attempt);
+        await this.error(err, id, payload, createdAt, job, key, attempt);
+        if (attempt >= this.workerMaxRetries) {
           await this.addTasks(`${this.stream}:dlq`, [{
             payload: {
               ...payload,
@@ -614,7 +619,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
               createdAt,
               job,
               id,
-              attempts
+              attempt
             }
           }]);
           await this.clearAttempts(id);
@@ -664,11 +669,11 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
       await this.success(id, payload, createdAt, job, key);
       return { id };
     } catch (err) {
-      const attempts = await this.incrAttempts(id);
+      const attempt = await this.incrAttempts(id);
       try {
-        await this.attempt(err, id, payload, createdAt, job, key, attempts);
-        await this.error(err, id, payload, createdAt, job, key);
-        if (attempts >= this.workerMaxRetries) {
+        await this.attempt(err, id, payload, createdAt, job, key, attempt);
+        await this.error(err, id, payload, createdAt, job, key, attempt);
+        if (attempt >= this.workerMaxRetries) {
           await this.addTasks(`${this.stream}:dlq`, [{
             payload: {
               ...payload,

package/dist/index.d.cts

@@ -58,6 +58,9 @@ declare class PowerQueues extends PowerRedis {
     onExecute(id: string, payload: any, createdAt: number, job: string, key: string, attempt: number): Promise<void>;
     onExecuted(data: Array<[string, any[], number, string, string]>): Promise<void>;
     onSuccess(id: string, payload: any, createdAt: number, job: string, key: string): Promise<void>;
+    onBatchError(err: any, tasks?: Array<[string, any[], number, string, string]>): Promise<void>;
+    onError(err: any, id: string, payload: any, createdAt: number, job: string, key: string): Promise<void>;
+    onRetry(err: any, id: string, payload: any, createdAt: number, job: string, key: string, attempts: number): Promise<void>;
     runQueue(): Promise<void>;
     consumerLoop(): Promise<void>;
     addTasks(queueName: string, data: any[], opts?: AddTasksOptions): Promise<string[]>;
@@ -74,12 +77,9 @@ declare class PowerQueues extends PowerRedis {
     private getAttempts;
     private clearAttempts;
     private success;
-    private status;
     private batchError;
     private error;
-    onError(err: any, id: string, payload: any, createdAt: number, job: string, key: string): Promise<void>;
     private attempt;
-    onRetry(err: any, id: string, payload: any, createdAt: number, job: string, key: string, attempts: number): Promise<void>;
     private execute;
     private executeProcess;
     private approve;

package/dist/index.d.ts

@@ -58,6 +58,9 @@ declare class PowerQueues extends PowerRedis {
     onExecute(id: string, payload: any, createdAt: number, job: string, key: string, attempt: number): Promise<void>;
     onExecuted(data: Array<[string, any[], number, string, string]>): Promise<void>;
     onSuccess(id: string, payload: any, createdAt: number, job: string, key: string): Promise<void>;
+    onBatchError(err: any, tasks?: Array<[string, any[], number, string, string]>): Promise<void>;
+    onError(err: any, id: string, payload: any, createdAt: number, job: string, key: string): Promise<void>;
+    onRetry(err: any, id: string, payload: any, createdAt: number, job: string, key: string, attempts: number): Promise<void>;
     runQueue(): Promise<void>;
     consumerLoop(): Promise<void>;
     addTasks(queueName: string, data: any[], opts?: AddTasksOptions): Promise<string[]>;
@@ -74,12 +77,9 @@ declare class PowerQueues extends PowerRedis {
     private getAttempts;
     private clearAttempts;
     private success;
-    private status;
     private batchError;
     private error;
-    onError(err: any, id: string, payload: any, createdAt: number, job: string, key: string): Promise<void>;
     private attempt;
-    onRetry(err: any, id: string, payload: any, createdAt: number, job: string, key: string, attempts: number): Promise<void>;
     private execute;
     private executeProcess;
     private approve;

package/dist/index.js

@@ -264,6 +264,12 @@ var PowerQueues = class extends PowerRedis {
   }
   async onSuccess(id, payload, createdAt, job, key) {
   }
+  async onBatchError(err, tasks) {
+  }
+  async onError(err, id, payload, createdAt, job, key) {
+  }
+  async onRetry(err, id, payload, createdAt, job, key, attempts) {
+  }
   async runQueue() {
     await this.createGroup("0-0");
     await this.consumerLoop();
@@ -512,26 +518,25 @@ var PowerQueues = class extends PowerRedis {
   }
   async success(id, payload, createdAt, job, key) {
     if (this.executeJobStatus) {
-      await this.status(id, payload, createdAt, job, key);
+      const prefix = `${this.stream}:${job}:`;
+      const { ready = 0, ok = 0 } = await this.getMany(`${prefix}*`);
+      await this.setMany([{ key: `${prefix}ready`, value: ready + 1 }, { key: `${prefix}ok`, value: ok + 1 }], this.executeJobStatusTtlSec);
     }
     await this.onSuccess(id, payload, createdAt, job, key);
   }
-  async status(id, payload, createdAt, job, key) {
-    const prefix = `s:${this.stream}:`;
-    const { ready = 0, ok = 0 } = await this.getMany(prefix);
-    await this.setMany([{ key: `${prefix}ready`, value: ready + 1 }, { key: `${prefix}ok`, value: ok + 1 }], this.executeJobStatusTtlSec);
-  }
   async batchError(err, tasks) {
+    await this.onBatchError(err, tasks);
   }
-  async error(err, id, payload, createdAt, job, key) {
+  async error(err, id, payload, createdAt, job, key, attempt) {
+    if (this.executeJobStatus && attempt >= this.workerMaxRetries) {
+      const prefix = `${this.stream}:${job}:`;
+      const { ready = 0, err: err2 = 0 } = await this.getMany(`${prefix}*`);
+      await this.setMany([{ key: `${prefix}ready`, value: ready + 1 }, { key: `${prefix}err`, value: err2 + 1 }], this.executeJobStatusTtlSec);
+    }
     await this.onError(err, id, payload, createdAt, job, key);
   }
-  async onError(err, id, payload, createdAt, job, key) {
-  }
-  async attempt(err, id, payload, createdAt, job, key, attempts) {
-    await this.onRetry(err, id, payload, createdAt, job, key, attempts);
-  }
-  async onRetry(err, id, payload, createdAt, job, key, attempts) {
+  async attempt(err, id, payload, createdAt, job, key, attempt) {
+    await this.onRetry(err, id, payload, createdAt, job, key, attempt);
   }
   async execute(tasks) {
     const result = [];
@@ -577,10 +582,10 @@ var PowerQueues = class extends PowerRedis {
         await this.success(id, payload, createdAt, job, key);
         return { id };
       } catch (err) {
-        const attempts = await this.incrAttempts(id);
-        await this.attempt(err, id, payload, createdAt, job, key, attempts);
-        await this.error(err, id, payload, createdAt, job, key);
-        if (attempts >= this.workerMaxRetries) {
+        const attempt = await this.incrAttempts(id);
+        await this.attempt(err, id, payload, createdAt, job, key, attempt);
+        await this.error(err, id, payload, createdAt, job, key, attempt);
+        if (attempt >= this.workerMaxRetries) {
           await this.addTasks(`${this.stream}:dlq`, [{
             payload: {
               ...payload,
@@ -588,7 +593,7 @@ var PowerQueues = class extends PowerRedis {
               createdAt,
               job,
               id,
-              attempts
+              attempt
             }
           }]);
           await this.clearAttempts(id);
@@ -638,11 +643,11 @@ var PowerQueues = class extends PowerRedis {
       await this.success(id, payload, createdAt, job, key);
       return { id };
     } catch (err) {
-      const attempts = await this.incrAttempts(id);
+      const attempt = await this.incrAttempts(id);
       try {
-        await this.attempt(err, id, payload, createdAt, job, key, attempts);
-        await this.error(err, id, payload, createdAt, job, key);
-        if (attempts >= this.workerMaxRetries) {
+        await this.attempt(err, id, payload, createdAt, job, key, attempt);
+        await this.error(err, id, payload, createdAt, job, key, attempt);
+        if (attempt >= this.workerMaxRetries) {
           await this.addTasks(`${this.stream}:dlq`, [{
             payload: {
               ...payload,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "power-queues",
-	"version": "2.0.7",
+	"version": "2.0.9",
 	"description": "Base classes for implementing custom queues in redis under high load conditions based on nestjs.",
 	"author": "ihor-bielchenko",
 	"license": "MIT",