namirasoft-node-redis 1.4.24 → 1.4.26

package/dist/RedisScopeHashCounter.d.ts

@@ -6,7 +6,10 @@ export declare abstract class RedisScopeHashCounter<KeyParameters, FieldParamete
     valid(key_parameter: KeyParameters, field_parameter: FieldParameters, threshold: number, step: number): Promise<boolean>;
     increase(key_parameter: KeyParameters, field_parameter: FieldParameters, step: number): Promise<number>;
     hget(key_parameter: KeyParameters, field_parameter: FieldParameters): Promise<number>;
-    listKeys(count?: number): Promise<string[]>;
+    listKeys(count?: number, cursor?: string | number): Promise<{
+        cursor: string | number;
+        keys: string[];
+    }>;
     listFields(key_parameter: KeyParameters): Promise<Record<string, string>>;
     del(key_parameter: KeyParameters): Promise<void>;
 }

package/dist/RedisScopeHashCounter.js

@@ -42,10 +42,11 @@ class RedisScopeHashCounter extends RedisScope_1.RedisScope {
         });
     }
     listKeys() {
-        return __awaiter(this, arguments, void 0, function* (count = 1) {
-            let cursor = "0";
-            const [_, foundKeys] = yield this.instance.client.scan(cursor, "MATCH", this.key(null), "COUNT", count);
-            return foundKeys;
+        return __awaiter(this, arguments, void 0, function* (count = 1, cursor) {
+            if (cursor == null)
+                cursor = "0";
+            let [next, keys] = yield this.instance.client.scan(cursor, "MATCH", this.key(null), "COUNT", count);
+            return { keys, cursor: next };
         });
     }
     listFields(key_parameter) {

package/dist/RedisScopeHashCounter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisScopeHashCounter.js","sourceRoot":"","sources":["../src/RedisScopeHashCounter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA0C;AAE1C,MAAsB,qBAAsD,SAAQ,uBAAsC;IAEtH,YAAY,QAAuB;QAE/B,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAEK,KAAK,CAAC,aAA4B,EAAE,eAAgC,EAAE,SAAiB,EAAE,IAAY;;YAEvG,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAC5D,OAAO,KAAK,GAAG,IAAI,IAAI,SAAS,CAAC;QACrC,CAAC;KAAA;IACK,QAAQ,CAAC,aAA4B,EAAE,eAAgC,EAAE,IAAY;;YAEvF,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAChE,CAAC;KAAA;IACK,IAAI,CAAC,aAA4B,EAAE,eAAgC;;;YAErE,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC,IAAI,GAAG,GAAG,MAAA,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,mCAAI,GAAG,CAAC;YAC7D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;KAAA;IACK,QAAQ;6DAAC,QAAgB,CAAC;YAE5B,IAAI,MAAM,GAAG,GAAG,CAAC;YACjB,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACxG,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IACK,UAAU,CAAC,aAA4B;;YAEzC,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnD,CAAC;KAAA;IACK,GAAG,CAAC,aAA4B;;YAElC,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;KAAA;CACJ;AA7CD,sDA6CC;AAAA,CAAC"}
+{"version":3,"file":"RedisScopeHashCounter.js","sourceRoot":"","sources":["../src/RedisScopeHashCounter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA0C;AAE1C,MAAsB,qBAAsD,SAAQ,uBAAsC;IAEtH,YAAY,QAAuB;QAE/B,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAEK,KAAK,CAAC,aAA4B,EAAE,eAAgC,EAAE,SAAiB,EAAE,IAAY;;YAEvG,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAC5D,OAAO,KAAK,GAAG,IAAI,IAAI,SAAS,CAAC;QACrC,CAAC;KAAA;IACK,QAAQ,CAAC,aAA4B,EAAE,eAAgC,EAAE,IAAY;;YAEvF,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAChE,CAAC;KAAA;IACK,IAAI,CAAC,aAA4B,EAAE,eAAgC;;;YAErE,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC,IAAI,GAAG,GAAG,MAAA,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,mCAAI,GAAG,CAAC;YAC7D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;KAAA;IACK,QAAQ;6DAAC,QAAgB,CAAC,EAAE,MAAwB;YAEtD,IAAI,MAAM,IAAI,IAAI;gBACd,MAAM,GAAG,GAAG,CAAC;YACjB,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAE,CAAC;YACrG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAClC,CAAC;KAAA;IACK,UAAU,CAAC,aAA4B;;YAEzC,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnD,CAAC;KAAA;IACK,GAAG,CAAC,aAA4B;;YAElC,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;KAAA;CACJ;AA9CD,sDA8CC;AAAA,CAAC"}

package/dist/RedisScopeTotalCount.d.ts

@@ -6,7 +6,7 @@ export declare class RedisScopeTotalCount<KeyParameters, FieldParameters> extend
     count: RedisScopeHashCounter<KeyParameters, FieldParameters>;
     constructor(instance: RedisInstance, total: RedisScopeHashCounter<KeyParameters, FieldParameters>, count: RedisScopeHashCounter<KeyParameters, FieldParameters>);
     key(): string;
-    increase(key_parameter: KeyParameters, field_parameter: FieldParameters, threshold: number, step: number): Promise<{
+    increase(key_parameter: KeyParameters, field_parameter: FieldParameters, step: number, threshold: number | null): Promise<{
         success: boolean;
         total: number;
         count: number;

package/dist/RedisScopeTotalCount.js

@@ -21,7 +21,7 @@ class RedisScopeTotalCount extends RedisScope_1.RedisScope {
     key() {
         return "";
     }
-    increase(key_parameter, field_parameter, threshold, step) {
+    increase(key_parameter, field_parameter, step, threshold) {
         return __awaiter(this, void 0, void 0, function* () {
             let total_key = this.total.key(key_parameter);
             let total_field = this.total.field(field_parameter);
@@ -30,11 +30,13 @@ class RedisScopeTotalCount extends RedisScope_1.RedisScope {
             const script = `
             local total = tonumber(redis.call("HGET", KEYS[1], ARGV[1]) or "0")
             local count = tonumber(redis.call("HGET", KEYS[2], ARGV[2]) or "0")
-            local threshold = tonumber(ARGV[3])
-            local step = tonumber(ARGV[4])
+            local step = tonumber(ARGV[3])
+            local threshold = tonumber(ARGV[4])
 
-            if total + step > threshold then
-                return {0, total, count}
+            if threshold >= 0 then
+                if total + step > threshold then
+                    return {0, total, count}
+                end
             end
 
             total = redis.call("HINCRBY", KEYS[1], ARGV[1], step)
@@ -42,7 +44,7 @@ class RedisScopeTotalCount extends RedisScope_1.RedisScope {
 
             return {1, total, count}
         `;
-            let res = yield this.instance.client.eval(script, 2, total_key, count_key, total_field, count_field, threshold, step);
+            let res = yield this.instance.client.eval(script, 2, total_key, count_key, total_field, count_field, step, threshold !== null && threshold !== void 0 ? threshold : -1);
             let [success, total, count] = res;
             return { success: success == 1, total, count };
         });

package/dist/RedisScopeTotalCount.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisScopeTotalCount.js","sourceRoot":"","sources":["../src/RedisScopeTotalCount.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA0C;AAG1C,MAAa,oBAAqD,SAAQ,uBAAsB;IAE5F,YAAY,QAAuB,EACxB,KAA4D,EAC5D,KAA4D;QAEnE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHT,UAAK,GAAL,KAAK,CAAuD;QAC5D,UAAK,GAAL,KAAK,CAAuD;QAGnE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IACQ,GAAG;QAER,OAAO,EAAE,CAAC;IACd,CAAC;IACK,QAAQ,CAAC,aAA4B,EAAE,eAAgC,EAAE,SAAiB,EAAE,IAAY;;YAE1G,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC9C,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACpD,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC9C,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAEpD,MAAM,MAAM,GAAG;;;;;;;;;;;;;;SAcd,CAAC;YACF,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YACtH,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,GAAe,CAAC;YAC9C,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACnD,CAAC;KAAA;CACJ;AAvCD,oDAuCC;AAAA,CAAC"}
+{"version":3,"file":"RedisScopeTotalCount.js","sourceRoot":"","sources":["../src/RedisScopeTotalCount.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA0C;AAG1C,MAAa,oBAAqD,SAAQ,uBAAsB;IAE5F,YAAY,QAAuB,EACxB,KAA4D,EAC5D,KAA4D;QAEnE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAHT,UAAK,GAAL,KAAK,CAAuD;QAC5D,UAAK,GAAL,KAAK,CAAuD;QAGnE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IACQ,GAAG;QAER,OAAO,EAAE,CAAC;IACd,CAAC;IACK,QAAQ,CAAC,aAA4B,EAAE,eAAgC,EAAE,IAAY,EAAE,SAAwB;;YAEjH,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC9C,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACpD,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC9C,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAEpD,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;SAgBd,CAAC;YACF,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,CAAC,CAAC,CAAC;YAC5H,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,GAAe,CAAC;YAC9C,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACnD,CAAC;KAAA;CACJ;AAzCD,oDAyCC;AAAA,CAAC"}

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.4.24",
+    "version": "1.4.26",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/index.js",

package/src/RedisScopeHashCounter.ts

@@ -30,11 +30,12 @@ export abstract class RedisScopeHashCounter<KeyParameters, FieldParameters> exte
         let res = await this.instance.client.hget(key, field) ?? "0";
         return parseInt(res);
     }
-    async listKeys(count: number = 1)
+    async listKeys(count: number = 1, cursor?: string | number): Promise<{ cursor: string | number, keys: string[] }>
     {
-        let cursor = "0";
-        const [_, foundKeys] = await this.instance.client.scan(cursor, "MATCH", this.key(null), "COUNT", count);
-        return foundKeys;
+        if (cursor == null)
+            cursor = "0";
+        let [next, keys] = await this.instance.client.scan(cursor, "MATCH", this.key(null), "COUNT", count,);
+        return { keys, cursor: next };
     }
     async listFields(key_parameter: KeyParameters)
     {

package/src/RedisScopeTotalCount.ts

@@ -15,7 +15,7 @@ export class RedisScopeTotalCount<KeyParameters, FieldParameters> extends RedisS
     {
         return "";
     }
-    async increase(key_parameter: KeyParameters, field_parameter: FieldParameters, threshold: number, step: number): Promise<{ success: boolean, total: number, count: number }>
+    async increase(key_parameter: KeyParameters, field_parameter: FieldParameters, step: number, threshold: number | null): Promise<{ success: boolean, total: number, count: number }>
     {
         let total_key = this.total.key(key_parameter);
         let total_field = this.total.field(field_parameter);
@@ -25,11 +25,13 @@ export class RedisScopeTotalCount<KeyParameters, FieldParameters> extends RedisS
         const script = `
             local total = tonumber(redis.call("HGET", KEYS[1], ARGV[1]) or "0")
             local count = tonumber(redis.call("HGET", KEYS[2], ARGV[2]) or "0")
-            local threshold = tonumber(ARGV[3])
-            local step = tonumber(ARGV[4])
+            local step = tonumber(ARGV[3])
+            local threshold = tonumber(ARGV[4])
 
-            if total + step > threshold then
-                return {0, total, count}
+            if threshold >= 0 then
+                if total + step > threshold then
+                    return {0, total, count}
+                end
             end
 
             total = redis.call("HINCRBY", KEYS[1], ARGV[1], step)
@@ -37,7 +39,7 @@ export class RedisScopeTotalCount<KeyParameters, FieldParameters> extends RedisS
 
             return {1, total, count}
         `;
-        let res = await this.instance.client.eval(script, 2, total_key, count_key, total_field, count_field, threshold, step);
+        let res = await this.instance.client.eval(script, 2, total_key, count_key, total_field, count_field, step, threshold ?? -1);
         let [success, total, count] = res as number[];
         return { success: success == 1, total, count };
     }