power-queues 2.0.8 → 2.0.10

package/dist/index.cjs

@@ -270,7 +270,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     this.removeOnExecuted = false;
     this.executeBatchAtOnce = false;
     this.executeJobStatus = false;
-    this.executeJobStatusTtlSec = 300;
+    this.executeJobStatusTtlMs = 300;
     this.consumerHost = "host";
     this.stream = "stream";
     this.group = "group";
@@ -305,13 +305,13 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     while (!signal?.aborted) {
       try {
         const tasks = await this.select();
-        if (!Array.isArray(tasks) || !(tasks.length > 0)) {
+        if (!(0, import_full_utils.isArrFilled)(tasks)) {
           await (0, import_full_utils.wait)(600);
           continue;
         }
         const tasksP = await this.onSelected(tasks);
-        const ids = await this.execute(Array.isArray(tasksP) && tasksP.length > 0 ? tasksP : tasks);
-        if (Array.isArray(ids) && ids.length > 0) {
+        const ids = await this.execute((0, import_full_utils.isArrFilled)(tasksP) ? tasksP : tasks);
+        if ((0, import_full_utils.isArrFilled)(tasks)) {
           await this.approve(ids);
         }
       } catch (err) {
@@ -321,10 +321,10 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     }
   }
   async addTasks(queueName, data, opts = {}) {
-    if (!Array.isArray(data) || !(data.length > 0)) {
+    if (!(0, import_full_utils.isArrFilled)(data)) {
       throw new Error("Tasks is not filled.");
     }
-    if (typeof queueName !== "string" || !(queueName.length > 0)) {
+    if (!(0, import_full_utils.isStrFilled)(queueName)) {
       throw new Error("Queue name is required.");
     }
     const job = (0, import_uuid.v4)();
@@ -353,13 +353,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     });
     if (opts.status) {
       await this.redis.set(`${queueName}:${job}:total`, data.length);
-      await this.redis.set(`${queueName}:${job}:ready`, 0);
-      await this.redis.set(`${queueName}:${job}:err`, 0);
-      await this.redis.set(`${queueName}:${job}:ok`, 0);
-      await this.redis.pexpire(`${queueName}:${job}:total`, opts.statusTimeoutMs || 864e5);
-      await this.redis.pexpire(`${queueName}:${job}:ready`, opts.statusTimeoutMs || 864e5);
-      await this.redis.pexpire(`${queueName}:${job}:err`, opts.statusTimeoutMs || 864e5);
-      await this.redis.pexpire(`${queueName}:${job}:ok`, opts.statusTimeoutMs || 864e5);
+      await this.redis.pexpire(`${queueName}:${job}:total`, opts.statusTimeoutMs || 3e5);
     }
     await Promise.all(runners);
     return result;
@@ -394,7 +388,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     throw new Error("Load lua script failed.");
   }
   saveScript(name, codeBody) {
-    if (typeof codeBody !== "string" || !(codeBody.length > 0)) {
+    if (!(0, import_full_utils.isStrFilled)(codeBody)) {
       throw new Error("Script body is empty.");
     }
     this.scripts[name] = { codeBody };
@@ -402,7 +396,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   }
   async runScript(name, keys, args, defaultCode) {
     if (!this.scripts[name]) {
-      if (typeof defaultCode !== "string" || !(defaultCode.length > 0)) {
+      if (!(0, import_full_utils.isStrFilled)(defaultCode)) {
         throw new Error(`Undefined script "${name}". Save it before executing.`);
       }
       this.saveScript(name, defaultCode);
@@ -445,12 +439,12 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
       const entry = item;
       const id = entry.id ?? "*";
       let flat;
-      if ("flat" in entry && Array.isArray(entry.flat) && entry.flat.length > 0) {
+      if ("flat" in entry && (0, import_full_utils.isArrFilled)(entry.flat)) {
         flat = entry.flat;
         if (flat.length % 2 !== 0) {
           throw new Error('Property "flat" must contain an even number of realKeysLength (field/value pairs).');
         }
-      } else if ("payload" in entry && typeof entry.payload === "object" && Object.keys(entry.payload || {}).length > 0) {
+      } else if ("payload" in entry && (0, import_full_utils.isObjFilled)(entry.payload)) {
         flat = [];
         for (const [k, v] of Object.entries(entry.payload)) {
           flat.push(k, v);
@@ -459,13 +453,13 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
         throw new Error('Task must have "payload" or "flat".');
       }
       const pairs = flat.length / 2;
-      if (pairs <= 0) {
+      if ((0, import_full_utils.isNumNZ)(pairs)) {
         throw new Error('Task must have "payload" or "flat".');
       }
       argv.push(String(id));
       argv.push(String(pairs));
       for (const token of flat) {
-        argv.push(!token ? "" : typeof token === "string" && token.length > 0 ? token : String(token));
+        argv.push(!token ? "" : (0, import_full_utils.isStrFilled)(token) ? token : String(token));
       }
     }
     return argv;
@@ -476,7 +470,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     for (let task of tasks) {
       const createdAt = task?.createdAt || Date.now();
       let entry = task;
-      if (typeof entry.payload === "object") {
+      if ((0, import_full_utils.isObj)(entry.payload)) {
         entry = {
           ...entry,
           payload: {
@@ -545,8 +539,8 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   async success(id, payload, createdAt, job, key) {
     if (this.executeJobStatus) {
       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.incr(`${prefix}ok`, this.executeJobStatusTtlMs);
+      await this.incr(`${prefix}ready`, this.executeJobStatusTtlMs);
     }
     await this.onSuccess(id, payload, createdAt, job, key);
   }
@@ -556,8 +550,8 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   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.incr(`${prefix}err`, this.executeJobStatusTtlMs);
+      await this.incr(`${prefix}ready`, this.executeJobStatusTtlMs);
     }
     await this.onError(err, id, payload, createdAt, job, key);
   }
@@ -591,7 +585,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
         await Promise.all(promises);
       }
       await this.onExecuted(tasks);
-      if ((!Array.isArray(result) || !(result.length > 0)) && contended > tasks.length >> 1) {
+      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)));
       }
     } catch (err) {
@@ -735,7 +729,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   }
   async select() {
     let entries = await this.selectStuck();
-    if (!entries?.length) {
+    if (!(0, import_full_utils.isArrFilled)(entries)) {
       entries = await this.selectFresh();
     }
     return this.normalizeEntries(entries);
@@ -743,7 +737,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   async selectStuck() {
     try {
       const res = await this.runScript("SelectStuck", [this.stream], [this.group, this.consumer(), String(this.recoveryStuckTasksTimeoutMs), String(this.workerBatchTasksCount), String(this.workerSelectionTimeoutMs)], SelectStuck);
-      return Array.isArray(res) ? res : [];
+      return (0, import_full_utils.isArr)(res) ? res : [];
     } catch (err) {
       if (String(err?.message || "").includes("NOGROUP")) {
         await this.createGroup();
@@ -766,11 +760,8 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
         this.stream,
         ">"
       );
-      if (!res?.[0]?.[1]?.length) {
-        return [];
-      }
       entries = res?.[0]?.[1] ?? [];
-      if (!entries?.length) {
+      if (!(0, import_full_utils.isArrFilled)(entries)) {
         return [];
       }
     } catch (err) {
@@ -847,9 +838,9 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
     return Array.from(raw || []).map((e) => {
       const id = Buffer.isBuffer(e?.[0]) ? e[0].toString() : e?.[0];
       const kvRaw = e?.[1] ?? [];
-      const kv = Array.isArray(kvRaw) ? kvRaw.map((x) => Buffer.isBuffer(x) ? x.toString() : x) : [];
+      const kv = (0, import_full_utils.isArr)(kvRaw) ? kvRaw.map((x) => Buffer.isBuffer(x) ? x.toString() : x) : [];
       return [id, kv];
-    }).filter(([id, kv]) => typeof id === "string" && id.length > 0 && Array.isArray(kv) && (kv.length & 1) === 0).map(([id, kv]) => {
+    }).filter(([id, kv]) => (0, import_full_utils.isStrFilled)(id) && (0, import_full_utils.isArr)(kv) && (kv.length & 1) === 0).map(([id, kv]) => {
       const { idemKey = "", job, createdAt, payload } = this.values(kv);
       return [id, this.payload(payload), createdAt, job, idemKey];
     });
@@ -863,7 +854,7 @@ var PowerQueues = class extends import_power_redis.PowerRedis {
   }
   payload(data) {
     try {
-      return JSON.parse(data?.payload);
+      return (0, import_full_utils.jsonDecode)(data);
     } catch (err) {
     }
     return data;

package/dist/index.d.cts

@@ -44,7 +44,7 @@ declare class PowerQueues extends PowerRedis {
     readonly removeOnExecuted: boolean;
     readonly executeBatchAtOnce: boolean;
     readonly executeJobStatus: boolean;
-    readonly executeJobStatusTtlSec: number;
+    readonly executeJobStatusTtlMs: number;
     readonly consumerHost: string;
     readonly stream: string;
     readonly group: string;

package/dist/index.d.ts

@@ -44,7 +44,7 @@ declare class PowerQueues extends PowerRedis {
     readonly removeOnExecuted: boolean;
     readonly executeBatchAtOnce: boolean;
     readonly executeJobStatus: boolean;
-    readonly executeJobStatusTtlSec: number;
+    readonly executeJobStatusTtlMs: number;
     readonly consumerHost: string;
     readonly stream: string;
     readonly group: string;

package/dist/index.js

@@ -1,6 +1,15 @@
 // src/PowerQueues.ts
 import { PowerRedis } from "power-redis";
-import { wait } from "full-utils";
+import {
+  isObjFilled,
+  isObj,
+  isArrFilled,
+  isArr,
+  isStrFilled,
+  isNumNZ,
+  jsonDecode,
+  wait
+} from "full-utils";
 import { v4 as uuid } from "uuid";
 
 // src/scripts.ts
@@ -244,7 +253,7 @@ var PowerQueues = class extends PowerRedis {
     this.removeOnExecuted = false;
     this.executeBatchAtOnce = false;
     this.executeJobStatus = false;
-    this.executeJobStatusTtlSec = 300;
+    this.executeJobStatusTtlMs = 300;
     this.consumerHost = "host";
     this.stream = "stream";
     this.group = "group";
@@ -279,13 +288,13 @@ var PowerQueues = class extends PowerRedis {
     while (!signal?.aborted) {
       try {
         const tasks = await this.select();
-        if (!Array.isArray(tasks) || !(tasks.length > 0)) {
+        if (!isArrFilled(tasks)) {
           await wait(600);
           continue;
         }
         const tasksP = await this.onSelected(tasks);
-        const ids = await this.execute(Array.isArray(tasksP) && tasksP.length > 0 ? tasksP : tasks);
-        if (Array.isArray(ids) && ids.length > 0) {
+        const ids = await this.execute(isArrFilled(tasksP) ? tasksP : tasks);
+        if (isArrFilled(tasks)) {
           await this.approve(ids);
         }
       } catch (err) {
@@ -295,10 +304,10 @@ var PowerQueues = class extends PowerRedis {
     }
   }
   async addTasks(queueName, data, opts = {}) {
-    if (!Array.isArray(data) || !(data.length > 0)) {
+    if (!isArrFilled(data)) {
       throw new Error("Tasks is not filled.");
     }
-    if (typeof queueName !== "string" || !(queueName.length > 0)) {
+    if (!isStrFilled(queueName)) {
       throw new Error("Queue name is required.");
     }
     const job = uuid();
@@ -327,13 +336,7 @@ var PowerQueues = class extends PowerRedis {
     });
     if (opts.status) {
       await this.redis.set(`${queueName}:${job}:total`, data.length);
-      await this.redis.set(`${queueName}:${job}:ready`, 0);
-      await this.redis.set(`${queueName}:${job}:err`, 0);
-      await this.redis.set(`${queueName}:${job}:ok`, 0);
-      await this.redis.pexpire(`${queueName}:${job}:total`, opts.statusTimeoutMs || 864e5);
-      await this.redis.pexpire(`${queueName}:${job}:ready`, opts.statusTimeoutMs || 864e5);
-      await this.redis.pexpire(`${queueName}:${job}:err`, opts.statusTimeoutMs || 864e5);
-      await this.redis.pexpire(`${queueName}:${job}:ok`, opts.statusTimeoutMs || 864e5);
+      await this.redis.pexpire(`${queueName}:${job}:total`, opts.statusTimeoutMs || 3e5);
     }
     await Promise.all(runners);
     return result;
@@ -368,7 +371,7 @@ var PowerQueues = class extends PowerRedis {
     throw new Error("Load lua script failed.");
   }
   saveScript(name, codeBody) {
-    if (typeof codeBody !== "string" || !(codeBody.length > 0)) {
+    if (!isStrFilled(codeBody)) {
       throw new Error("Script body is empty.");
     }
     this.scripts[name] = { codeBody };
@@ -376,7 +379,7 @@ var PowerQueues = class extends PowerRedis {
   }
   async runScript(name, keys, args, defaultCode) {
     if (!this.scripts[name]) {
-      if (typeof defaultCode !== "string" || !(defaultCode.length > 0)) {
+      if (!isStrFilled(defaultCode)) {
         throw new Error(`Undefined script "${name}". Save it before executing.`);
       }
       this.saveScript(name, defaultCode);
@@ -419,12 +422,12 @@ var PowerQueues = class extends PowerRedis {
       const entry = item;
       const id = entry.id ?? "*";
       let flat;
-      if ("flat" in entry && Array.isArray(entry.flat) && entry.flat.length > 0) {
+      if ("flat" in entry && isArrFilled(entry.flat)) {
         flat = entry.flat;
         if (flat.length % 2 !== 0) {
           throw new Error('Property "flat" must contain an even number of realKeysLength (field/value pairs).');
         }
-      } else if ("payload" in entry && typeof entry.payload === "object" && Object.keys(entry.payload || {}).length > 0) {
+      } else if ("payload" in entry && isObjFilled(entry.payload)) {
         flat = [];
         for (const [k, v] of Object.entries(entry.payload)) {
           flat.push(k, v);
@@ -433,13 +436,13 @@ var PowerQueues = class extends PowerRedis {
         throw new Error('Task must have "payload" or "flat".');
       }
       const pairs = flat.length / 2;
-      if (pairs <= 0) {
+      if (isNumNZ(pairs)) {
         throw new Error('Task must have "payload" or "flat".');
       }
       argv.push(String(id));
       argv.push(String(pairs));
       for (const token of flat) {
-        argv.push(!token ? "" : typeof token === "string" && token.length > 0 ? token : String(token));
+        argv.push(!token ? "" : isStrFilled(token) ? token : String(token));
       }
     }
     return argv;
@@ -450,7 +453,7 @@ var PowerQueues = class extends PowerRedis {
     for (let task of tasks) {
       const createdAt = task?.createdAt || Date.now();
       let entry = task;
-      if (typeof entry.payload === "object") {
+      if (isObj(entry.payload)) {
         entry = {
           ...entry,
           payload: {
@@ -519,8 +522,8 @@ var PowerQueues = class extends PowerRedis {
   async success(id, payload, createdAt, job, key) {
     if (this.executeJobStatus) {
       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.incr(`${prefix}ok`, this.executeJobStatusTtlMs);
+      await this.incr(`${prefix}ready`, this.executeJobStatusTtlMs);
     }
     await this.onSuccess(id, payload, createdAt, job, key);
   }
@@ -530,8 +533,8 @@ var PowerQueues = class extends PowerRedis {
   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.incr(`${prefix}err`, this.executeJobStatusTtlMs);
+      await this.incr(`${prefix}ready`, this.executeJobStatusTtlMs);
     }
     await this.onError(err, id, payload, createdAt, job, key);
   }
@@ -565,7 +568,7 @@ var PowerQueues = class extends PowerRedis {
         await Promise.all(promises);
       }
       await this.onExecuted(tasks);
-      if ((!Array.isArray(result) || !(result.length > 0)) && contended > tasks.length >> 1) {
+      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)));
       }
     } catch (err) {
@@ -709,7 +712,7 @@ var PowerQueues = class extends PowerRedis {
   }
   async select() {
     let entries = await this.selectStuck();
-    if (!entries?.length) {
+    if (!isArrFilled(entries)) {
       entries = await this.selectFresh();
     }
     return this.normalizeEntries(entries);
@@ -717,7 +720,7 @@ var PowerQueues = class extends PowerRedis {
   async selectStuck() {
     try {
       const res = await this.runScript("SelectStuck", [this.stream], [this.group, this.consumer(), String(this.recoveryStuckTasksTimeoutMs), String(this.workerBatchTasksCount), String(this.workerSelectionTimeoutMs)], SelectStuck);
-      return Array.isArray(res) ? res : [];
+      return isArr(res) ? res : [];
     } catch (err) {
       if (String(err?.message || "").includes("NOGROUP")) {
         await this.createGroup();
@@ -740,11 +743,8 @@ var PowerQueues = class extends PowerRedis {
         this.stream,
         ">"
       );
-      if (!res?.[0]?.[1]?.length) {
-        return [];
-      }
       entries = res?.[0]?.[1] ?? [];
-      if (!entries?.length) {
+      if (!isArrFilled(entries)) {
         return [];
       }
     } catch (err) {
@@ -821,9 +821,9 @@ var PowerQueues = class extends PowerRedis {
     return Array.from(raw || []).map((e) => {
       const id = Buffer.isBuffer(e?.[0]) ? e[0].toString() : e?.[0];
       const kvRaw = e?.[1] ?? [];
-      const kv = Array.isArray(kvRaw) ? kvRaw.map((x) => Buffer.isBuffer(x) ? x.toString() : x) : [];
+      const kv = isArr(kvRaw) ? kvRaw.map((x) => Buffer.isBuffer(x) ? x.toString() : x) : [];
       return [id, kv];
-    }).filter(([id, kv]) => typeof id === "string" && id.length > 0 && Array.isArray(kv) && (kv.length & 1) === 0).map(([id, kv]) => {
+    }).filter(([id, kv]) => isStrFilled(id) && isArr(kv) && (kv.length & 1) === 0).map(([id, kv]) => {
       const { idemKey = "", job, createdAt, payload } = this.values(kv);
       return [id, this.payload(payload), createdAt, job, idemKey];
     });
@@ -837,7 +837,7 @@ var PowerQueues = class extends PowerRedis {
   }
   payload(data) {
     try {
-      return JSON.parse(data?.payload);
+      return jsonDecode(data);
     } catch (err) {
     }
     return data;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "power-queues",
-	"version": "2.0.8",
+	"version": "2.0.10",
 	"description": "Base classes for implementing custom queues in redis under high load conditions based on nestjs.",
 	"author": "ihor-bielchenko",
 	"license": "MIT",
@@ -85,7 +85,7 @@
 		"@nestjs/common": "^11.1.8",
 		"full-utils": "^2.0.3",
 		"ioredis": "^5.8.2",
-		"power-redis": "^2.0.5",
+		"power-redis": "^2.0.6",
 		"uuid": "^13.0.0"
 	}
 }