redis-smq-common 1.0.0-rc.9 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 1.0.0 (20220-06-18)
+
+* Rename logger/test00018 (f20fdf9)
+* Test PowerManager (8d6f5e6)
+* Complete async tests to reach 9x% code coverage (ea57f8f)
+* Test async.waterfall() (ae4a283)
+* Increase code coverage (c5e3f2b)
+
+## 1.0.0-rc.11 (2022-05-31)
+
+* Update RedisClient and IRedisClientMulti interfaces (8732c97)
+
+## 1.0.0-rc.10 (2022-05-31)
+
+* Fix broken promisify(All) because of ICallback typing (4250e32)
+
 ## 1.0.0-rc.9 (2022-05-31)
 
 * Improve RedisClient typings (27219a6)

package/dist/src/redis-client/clients/ioredis-client-multi.d.ts

@@ -10,12 +10,14 @@ export declare class IoredisClientMulti implements IRedisClientMulti {
     rpop(key: string): this;
     rpush(key: string, element: string): this;
     zadd(key: string, score: number, element: string): this;
-    zrem(key: string, element: string): this;
+    zrem(key: string, element: string | string[]): this;
     sadd(key: string, element: string): this;
     srem(key: string, element: string | string[]): this;
     hset(key: string, field: string, value: string): this;
-    hdel(key: string, field: string): this;
+    hdel(key: string, field: string | string[]): this;
+    hincrby(key: string, field: string, by: number): this;
     pexpire(key: string, millis: number): this;
+    expire(key: string, secs: number): this;
     rpoplpush(source: string, destination: string): this;
     del(key: string | string[]): this;
     exec(cb: ICallback<unknown[]>): void;

package/dist/src/redis-client/clients/ioredis-client-multi.js

@@ -36,7 +36,7 @@ class IoredisClientMulti {
         return this;
     }
     zrem(key, element) {
-        this.multi.zrem(key, element);
+        this.multi.zrem(key, ...(typeof element === 'string' ? [element] : element));
         return this;
     }
     sadd(key, element) {
@@ -52,13 +52,21 @@ class IoredisClientMulti {
         return this;
     }
     hdel(key, field) {
-        this.multi.hdel(key, field);
+        this.multi.hdel(key, ...(typeof field === 'string' ? [field] : field));
+        return this;
+    }
+    hincrby(key, field, by) {
+        this.multi.hincrby(key, field, by);
         return this;
     }
     pexpire(key, millis) {
         this.multi.pexpire(key, millis);
         return this;
     }
+    expire(key, secs) {
+        this.multi.expire(key, secs);
+        return this;
+    }
     rpoplpush(source, destination) {
         this.multi.rpoplpush(source, destination);
         return this;

package/dist/src/redis-client/clients/ioredis-client.d.ts

@@ -21,6 +21,8 @@ export declare class IoredisClient extends RedisClient {
     zrange(key: string, min: number, max: number, cb: ICallback<string[]>): void;
     psubscribe(pattern: string): void;
     punsubscribe(channel: string): void;
+    subscribe(channel: string): void;
+    unsubscribe(channel: string): void;
     zrangebyscore(key: string, min: number | string, max: number | string, cb: ICallback<string[]>): void;
     smembers(key: string, cb: ICallback<string[]>): void;
     sadd(key: string, member: string, cb: ICallback<number>): void;

package/dist/src/redis-client/clients/ioredis-client.js

@@ -59,6 +59,12 @@ class IoredisClient extends redis_client_1.RedisClient {
     punsubscribe(channel) {
         this.client.punsubscribe(channel);
     }
+    subscribe(channel) {
+        this.client.subscribe(channel);
+    }
+    unsubscribe(channel) {
+        this.client.unsubscribe(channel);
+    }
     zrangebyscore(key, min, max, cb) {
         this.client.zrangebyscore(key, min, max, cb);
     }

package/dist/src/redis-client/clients/node-redis-v3-client-multi.d.ts

@@ -10,12 +10,14 @@ export declare class NodeRedisV3ClientMulti implements IRedisClientMulti {
     rpop(key: string): this;
     rpush(key: string, element: string): this;
     zadd(key: string, score: number, element: string): this;
-    zrem(key: string, element: string): this;
+    zrem(key: string, element: string | string[]): this;
     sadd(key: string, element: string): this;
     srem(key: string, element: string | string[]): this;
     hset(key: string, field: string, value: string): this;
-    hdel(key: string, field: string): this;
+    hdel(key: string, field: string | string[]): this;
+    hincrby(key: string, field: string, by: number): this;
     pexpire(key: string, millis: number): this;
+    expire(key: string, secs: number): this;
     rpoplpush(source: string, destination: string): this;
     del(key: string | string[]): this;
     exec(cb: ICallback<unknown[]>): void;

package/dist/src/redis-client/clients/node-redis-v3-client-multi.js

@@ -54,10 +54,18 @@ class NodeRedisV3ClientMulti {
         this.multi.hdel(key, field);
         return this;
     }
+    hincrby(key, field, by) {
+        this.multi.hincrby(key, field, by);
+        return this;
+    }
     pexpire(key, millis) {
         this.multi.pexpire(key, millis);
         return this;
     }
+    expire(key, secs) {
+        this.multi.expire(key, secs);
+        return this;
+    }
     rpoplpush(source, destination) {
         this.multi.rpoplpush(source, destination);
         return this;

package/dist/src/redis-client/clients/node-redis-v3-client.d.ts

@@ -21,6 +21,8 @@ export declare class NodeRedisV3Client extends RedisClient {
     zrange(key: string, min: number, max: number, cb: ICallback<string[]>): void;
     psubscribe(pattern: string): void;
     punsubscribe(channel: string): void;
+    subscribe(channel: string): void;
+    unsubscribe(channel: string): void;
     zrangebyscore(key: string, min: number | string, max: number | string, cb: ICallback<string[]>): void;
     smembers(key: string, cb: ICallback<string[]>): void;
     sadd(key: string, member: string, cb: ICallback<number>): void;

package/dist/src/redis-client/clients/node-redis-v3-client.js

@@ -86,6 +86,12 @@ class NodeRedisV3Client extends redis_client_1.RedisClient {
     punsubscribe(channel) {
         this.client.punsubscribe(channel);
     }
+    subscribe(channel) {
+        this.client.subscribe(channel);
+    }
+    unsubscribe(channel) {
+        this.client.unsubscribe(channel);
+    }
     zrangebyscore(key, min, max, cb) {
         this.client.zrangebyscore(key, min, max, cb);
     }

package/dist/src/redis-client/clients/node-redis-v4-client-multi.d.ts

@@ -9,12 +9,14 @@ export declare class NodeRedisV4ClientMulti implements IRedisClientMulti {
     rpop(key: string): this;
     rpush(key: string, element: string): this;
     zadd(key: string, score: number, element: string): this;
-    zrem(key: string, element: string): this;
+    zrem(key: string, element: string | string[]): this;
     sadd(key: string, element: string): this;
     srem(key: string, element: string | string[]): this;
     hset(key: string, field: string, value: string): this;
-    hdel(key: string, field: string): this;
+    hdel(key: string, field: string | string[]): this;
+    hincrby(key: string, field: string, by: number): this;
     pexpire(key: string, millis: number): this;
+    expire(key: string, secs: number): this;
     rpoplpush(source: string, destination: string): this;
     del(key: string | string[]): this;
     exec(cb: ICallback<unknown[]>): void;

package/dist/src/redis-client/clients/node-redis-v4-client-multi.js

@@ -55,10 +55,18 @@ class NodeRedisV4ClientMulti {
         this.multi.hDel(key, field);
         return this;
     }
+    hincrby(key, field, by) {
+        this.multi.hIncrBy(key, field, by);
+        return this;
+    }
     pexpire(key, millis) {
         this.multi.pExpire(key, millis);
         return this;
     }
+    expire(key, secs) {
+        this.multi.expire(key, secs);
+        return this;
+    }
     rpoplpush(source, destination) {
         this.multi.rPopLPush(source, destination);
         return this;

package/dist/src/redis-client/clients/node-redis-v4-client.d.ts

@@ -21,6 +21,8 @@ export declare class NodeRedisV4Client extends RedisClient {
     zrange(key: string, min: number, max: number, cb: ICallback<string[]>): void;
     psubscribe(pattern: string): void;
     punsubscribe(channel: string): void;
+    subscribe(channel: string): void;
+    unsubscribe(channel: string): void;
     zrangebyscore(key: string, min: number | string, max: number | string, cb: ICallback<string[]>): void;
     smembers(key: string, cb: ICallback<string[]>): void;
     sadd(key: string, member: string, cb: ICallback<number>): void;

package/dist/src/redis-client/clients/node-redis-v4-client.js

@@ -74,6 +74,14 @@ class NodeRedisV4Client extends redis_client_1.RedisClient {
     punsubscribe(channel) {
         this.client.pUnsubscribe(channel).catch(() => void 0);
     }
+    subscribe(channel) {
+        this.client.subscribe(channel, (message, channel) => {
+            this.client.emit('message', channel, message);
+        });
+    }
+    unsubscribe(channel) {
+        this.client.unsubscribe(channel).catch(() => void 0);
+    }
     zrangebyscore(key, min, max, cb) {
         this.client
             .zRangeByScore(key, min, max)
@@ -179,7 +187,7 @@ class NodeRedisV4Client extends redis_client_1.RedisClient {
     flushall(cb) {
         this.client
             .flushAll()
-            .then(() => cb())
+            .then((reply) => cb(null, reply))
             .catch(cb);
     }
     loadScript(script, cb) {

package/dist/src/redis-client/redis-client.d.ts

@@ -29,6 +29,8 @@ export declare abstract class RedisClient extends EventEmitter {
     abstract zrange(key: string, min: number, max: number, cb: ICallback<string[]>): void;
     abstract psubscribe(pattern: string): void;
     abstract punsubscribe(channel: string): void;
+    abstract subscribe(channel: string): void;
+    abstract unsubscribe(channel: string): void;
     abstract zrangebyscore(key: string, min: number | string, max: number | string, cb: ICallback<string[]>): void;
     abstract smembers(key: string, cb: ICallback<string[]>): void;
     abstract sadd(key: string, member: string, cb: ICallback<number>): void;
@@ -41,8 +43,8 @@ export declare abstract class RedisClient extends EventEmitter {
     abstract hlen(key: string, cb: ICallback<number>): void;
     abstract brpoplpush(source: string, destination: string, timeout: number, cb: ICallback<string | null>): void;
     abstract rpoplpush(source: string, destination: string, cb: ICallback<string | null>): void;
-    zpophgetrpush(source: string, sourceHash: string, destination: string, cb: ICallback<string>): void;
-    lpoprpushextra(source: string, destination: string, listSize: number, expire: number, cb: ICallback<string>): void;
+    zpophgetrpush(source: string, sourceHash: string, destination: string, cb: ICallback<string | null>): void;
+    lpoprpushextra(source: string, destination: string, listSize: number, expire: number, cb: ICallback<string | null>): void;
     lpoprpush(source: string, destination: string, cb: ICallback<string | null>): void;
     abstract zrangebyscorewithscores(source: string, min: number, max: number, cb: ICallback<Record<string, string>>): void;
     abstract rpop(key: string, cb: ICallback<string | null>): void;

package/dist/src/redis-client/redis-client.js

@@ -29,20 +29,16 @@ class RedisClient extends events_1.EventEmitter {
         this.runScript(ELuaScriptName.ZPOPHGETRPUSH, [source, sourceHash, destination], [], (err, res) => {
             if (err)
                 cb(err);
-            else if (typeof res !== 'string')
-                cb();
             else
-                cb(null, res);
+                cb(null, typeof res === 'string' ? res : null);
         });
     }
     lpoprpushextra(source, destination, listSize, expire, cb) {
         this.runScript(ELuaScriptName.LPOPRPUSHEXTRA, [source, destination], [listSize, expire], (err, res) => {
             if (err)
                 cb(err);
-            else if (typeof res !== 'string')
-                cb();
             else
-                cb(null, res);
+                cb(null, typeof res === 'string' ? res : null);
         });
     }
     lpoprpush(source, destination, cb) {
@@ -53,10 +49,8 @@ class RedisClient extends events_1.EventEmitter {
             this.runScript(ELuaScriptName.LPOPRPUSH, [source, destination], [], (err, res) => {
                 if (err)
                     cb(err);
-                else if (typeof res !== 'string')
-                    cb();
                 else
-                    cb(null, res);
+                    cb(null, typeof res === 'string' ? res : null);
             });
         }
     }

package/dist/types/index.d.ts

@@ -29,14 +29,16 @@ export interface IRedisClientMulti {
     rpush(key: string, element: string): this;
     rpop(key: string): this;
     lpush(key: string, element: string): this;
-    hdel(key: string, field: string): this;
+    hdel(key: string, field: string | string[]): this;
+    hincrby(key: string, field: string, by: number): this;
     del(key: string | string[]): this;
     srem(key: string, element: string | string[]): this;
     sadd(key: string, element: string): this;
-    zrem(key: string, element: string): this;
+    zrem(key: string, element: string | string[]): this;
     zadd(key: string, score: number, element: string): this;
     hset(key: string, field: string, value: string): this;
     pexpire(key: string, millis: number): this;
+    expire(key: string, secs: number): this;
     ltrim(key: string, start: number, stop: number): this;
     rpoplpush(source: string, destination: string): this;
     exec(cb: ICallback<unknown[]>): void;
@@ -57,6 +59,7 @@ declare module 'ioredis' {
 }
 export interface ICallback<T> {
     (err?: Error | null, reply?: T): void;
+    (err: undefined | null, reply: T): void;
 }
 export declare type TFunction<TReturn = void, TArgs = any> = (...args: TArgs[]) => TReturn;
 export declare type TUnaryFunction<T, E = void> = (reply: T) => E;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq-common",
-  "version": "1.0.0-rc.9",
+  "version": "1.0.0",
   "description": "RedisSMQ shared components that may be used by integrated applications and extensions.",
   "author": "Weyoss <weyoss@protonmail.com>",
   "license": "MIT",