redis-smq-common 1.0.5 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.0.0
+
+* feat(redis-client): support offset and count for zrangebyscore() (2ec00e0)
+
+## 1.0.6 (2023-02-15)
+
+*  fix: use path.resolve() to fix 'no such file or directory' error (2d33599)
+
 ## 1.0.5 (2023-01-06)
 
 * chore: update license (9b817d2)

package/dist/src/lock-manager/lock-manager.js

@@ -10,6 +10,7 @@ const fs = require("fs");
 const lock_manager_method_not_allowed_error_1 = require("./errors/lock-manager-method-not-allowed.error");
 const lock_manager_not_acquired_error_1 = require("./errors/lock-manager-not-acquired.error");
 const lock_manager_not_released_error_1 = require("./errors/lock-manager-not-released.error");
+const path_1 = require("path");
 var ELockStatus;
 (function (ELockStatus) {
     ELockStatus[ELockStatus["unlocked"] = 0] = "unlocked";
@@ -24,8 +25,12 @@ var ELuaScript;
     ELuaScript["RELEASE_LOCK"] = "RELEASE_LOCK";
     ELuaScript["EXTEND_LOCK"] = "EXTEND_LOCK";
 })(ELuaScript = exports.ELuaScript || (exports.ELuaScript = {}));
-redis_client_1.RedisClient.addScript(ELuaScript.RELEASE_LOCK, fs.readFileSync(`${__dirname}/redis-client/lua/release-lock.lua`).toString());
-redis_client_1.RedisClient.addScript(ELuaScript.EXTEND_LOCK, fs.readFileSync(`${__dirname}/redis-client/lua/extend-lock.lua`).toString());
+redis_client_1.RedisClient.addScript(ELuaScript.RELEASE_LOCK, fs
+    .readFileSync((0, path_1.resolve)(__dirname, './redis-client/lua/release-lock.lua'))
+    .toString());
+redis_client_1.RedisClient.addScript(ELuaScript.EXTEND_LOCK, fs
+    .readFileSync((0, path_1.resolve)(__dirname, './redis-client/lua/extend-lock.lua'))
+    .toString());
 class LockManager {
     constructor(redisClient, lockKey, ttl, retryOnFail = false, autoExtend = false, throwExceptions = true) {
         this.status = ELockStatus.unlocked;

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

@@ -27,7 +27,7 @@ export declare class IoredisClient extends RedisClient {
     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;
+    zrangebyscore(key: string, min: number | string, max: number | string, offset: number, count: number, cb: ICallback<string[]>): void;
     smembers(key: string, cb: ICallback<string[]>): void;
     sadd(key: string, member: string, cb: ICallback<number>): void;
     srem(key: string, member: string, cb: ICallback<number>): void;

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

@@ -87,8 +87,8 @@ class IoredisClient extends redis_client_1.RedisClient {
     unsubscribe(channel) {
         this.client.unsubscribe(channel);
     }
-    zrangebyscore(key, min, max, cb) {
-        this.client.zrangebyscore(key, min, max, cb);
+    zrangebyscore(key, min, max, offset, count, cb) {
+        this.client.zrangebyscore(key, min, max, 'LIMIT', offset, count, cb);
     }
     smembers(key, cb) {
         this.client.smembers(key, cb);

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

@@ -27,7 +27,7 @@ export declare class NodeRedisV3Client extends RedisClient {
     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;
+    zrangebyscore(key: string, min: number | string, max: number | string, offset: number, count: number, cb: ICallback<string[]>): void;
     smembers(key: string, cb: ICallback<string[]>): void;
     sadd(key: string, member: string, cb: ICallback<number>): void;
     srem(key: string, member: string, cb: ICallback<number>): void;

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

@@ -114,8 +114,8 @@ class NodeRedisV3Client extends redis_client_1.RedisClient {
     unsubscribe(channel) {
         this.client.unsubscribe(channel);
     }
-    zrangebyscore(key, min, max, cb) {
-        this.client.zrangebyscore(key, min, max, cb);
+    zrangebyscore(key, min, max, offset, count, cb) {
+        this.client.zrangebyscore(key, min, max, 'LIMIT', offset, count, cb);
     }
     smembers(key, cb) {
         this.client.smembers(key, cb);

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

@@ -23,7 +23,7 @@ export declare class NodeRedisV4Client extends RedisClient {
     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;
+    zrangebyscore(key: string, min: number | string, max: number | string, offset: number, count: number, cb: ICallback<string[]>): void;
     smembers(key: string, cb: ICallback<string[]>): void;
     sscan(key: string, options: {
         MATCH?: string;

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

@@ -82,9 +82,14 @@ class NodeRedisV4Client extends redis_client_1.RedisClient {
     unsubscribe(channel) {
         this.client.unsubscribe(channel).catch(() => void 0);
     }
-    zrangebyscore(key, min, max, cb) {
+    zrangebyscore(key, min, max, offset, count, cb) {
         this.client
-            .zRangeByScore(key, min, max)
+            .zRangeByScore(key, min, max, {
+            LIMIT: {
+                offset,
+                count,
+            },
+        })
             .then((reply) => cb(null, reply))
             .catch(cb);
     }

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

@@ -31,7 +31,7 @@ export declare abstract class RedisClient extends EventEmitter {
     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 zrangebyscore(key: string, min: number | string, max: number | string, offset: number, count: number, cb: ICallback<string[]>): void;
     abstract smembers(key: string, cb: ICallback<string[]>): void;
     abstract sscan(key: string, options: {
         MATCH?: string;

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

@@ -6,6 +6,7 @@ const lua_scripts_1 = require("./lua-scripts");
 const redis_client_error_1 = require("./errors/redis-client.error");
 const empty_callback_reply_error_1 = require("../errors/empty-callback-reply.error");
 const fs = require("fs");
+const path_1 = require("path");
 var ELuaScriptName;
 (function (ELuaScriptName) {
     ELuaScriptName["LPOPRPUSH"] = "LPOPRPUSH";
@@ -103,7 +104,7 @@ exports.RedisClient = RedisClient;
 RedisClient.redisServerVersion = null;
 RedisClient.scriptsLoaded = false;
 RedisClient.luaScripts = new lua_scripts_1.LuaScripts();
-RedisClient.addScript(ELuaScriptName.ZPOPHGETRPUSH, fs.readFileSync(`${__dirname}/lua/zpophgetrpush.lua`).toString());
-RedisClient.addScript(ELuaScriptName.LPOPRPUSH, fs.readFileSync(`${__dirname}/lua/lpoprpush.lua`).toString());
-RedisClient.addScript(ELuaScriptName.LPOPRPUSHEXTRA, fs.readFileSync(`${__dirname}/lua/lpoprpushextra.lua`).toString());
+RedisClient.addScript(ELuaScriptName.ZPOPHGETRPUSH, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/zpophgetrpush.lua')).toString());
+RedisClient.addScript(ELuaScriptName.LPOPRPUSH, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/lpoprpush.lua')).toString());
+RedisClient.addScript(ELuaScriptName.LPOPRPUSHEXTRA, fs.readFileSync((0, path_1.resolve)(__dirname, './lua/lpoprpushextra.lua')).toString());
 //# sourceMappingURL=redis-client.js.map

package/package.json

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