redis-smq-common 1.0.0-rc.5 → 1.0.0-rc.8

package/CHANGELOG.md

@@ -1,8 +1,20 @@
 # CHANGELOG
 
+## 1.0.0-rc.8 (2022-05-30)
+
+* Add WatchedKeysChangedError class (1e42e80)
+
+## 1.0.0-rc.7 (2022-05-30)
+
+* Fix various redis errors (9349261)
+
+## 1.0.0-rc.6 (2022-05-30)
+
+* Fix missing RedisClient from package exports (88f90f0)
+
 ## 1.0.0-rc.5 (2022-05-30)
 
-Update IRedisClientMulti interface (be1c534)
+* Update IRedisClientMulti interface (be1c534)
 
 ## 1.0.0-rc.4 (2022-05-30)
 

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { LockManager } from './src/lock-manager/lock-manager';
 export { logger } from './src/logger/logger';
 export { PowerManager } from './src/power-manager/power-manager';
 export { createClientInstance } from './src/redis-client/create-client-instance';
+export { RedisClient } from './src/redis-client/redis-client';
 export { Ticker } from './src/ticker/ticker';
 export { Worker } from './src/worker/worker';
 export { WorkerRunner } from './src/worker/worker-runner/worker-runner';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.events = exports.WorkerPool = exports.WorkerRunner = exports.Worker = exports.Ticker = exports.createClientInstance = exports.PowerManager = exports.logger = exports.LockManager = exports.errors = exports.async = void 0;
+exports.events = exports.WorkerPool = exports.WorkerRunner = exports.Worker = exports.Ticker = exports.RedisClient = exports.createClientInstance = exports.PowerManager = exports.logger = exports.LockManager = exports.errors = exports.async = void 0;
 var async_1 = require("./src/async/async");
 Object.defineProperty(exports, "async", { enumerable: true, get: function () { return async_1.async; } });
 var errors_1 = require("./src/errors");
@@ -13,6 +13,8 @@ var power_manager_1 = require("./src/power-manager/power-manager");
 Object.defineProperty(exports, "PowerManager", { enumerable: true, get: function () { return power_manager_1.PowerManager; } });
 var create_client_instance_1 = require("./src/redis-client/create-client-instance");
 Object.defineProperty(exports, "createClientInstance", { enumerable: true, get: function () { return create_client_instance_1.createClientInstance; } });
+var redis_client_1 = require("./src/redis-client/redis-client");
+Object.defineProperty(exports, "RedisClient", { enumerable: true, get: function () { return redis_client_1.RedisClient; } });
 var ticker_1 = require("./src/ticker/ticker");
 Object.defineProperty(exports, "Ticker", { enumerable: true, get: function () { return ticker_1.Ticker; } });
 var worker_1 = require("./src/worker/worker");

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IoredisClientMulti = void 0;
 const redis_client_error_1 = require("../errors/redis-client.error");
+const watched_keys_changed_error_1 = require("../errors/watched-keys-changed.error");
 class IoredisClientMulti {
     constructor(client) {
         this.multi = client.multi();
@@ -43,7 +44,7 @@ class IoredisClientMulti {
         return this;
     }
     srem(key, element) {
-        this.multi.srem(key, ...element);
+        this.multi.srem(key, ...(typeof element === 'string' ? [element] : element));
         return this;
     }
     hset(key, field, value) {
@@ -63,7 +64,7 @@ class IoredisClientMulti {
         return this;
     }
     del(key) {
-        this.multi.del(...key);
+        this.multi.del(...(typeof key === 'string' ? [key] : key));
         return this;
     }
     exec(cb) {
@@ -71,7 +72,7 @@ class IoredisClientMulti {
             if (err)
                 cb(err);
             else if (!reply)
-                cb(new redis_client_error_1.RedisClientError(`Redis transaction has been abandoned. Try again.`));
+                cb(new watched_keys_changed_error_1.WatchedKeysChangedError());
             else {
                 const lengths = [];
                 let err = null;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeRedisV3ClientMulti = void 0;
-const redis_client_error_1 = require("../errors/redis-client.error");
+const watched_keys_changed_error_1 = require("../errors/watched-keys-changed.error");
 class NodeRedisV3ClientMulti {
     constructor(client) {
         this.multi = client.multi();
@@ -71,7 +71,7 @@ class NodeRedisV3ClientMulti {
             if (err)
                 cb(err);
             else if (!reply)
-                cb(new redis_client_error_1.RedisClientError(`Redis transaction has been abandoned. Try again.`));
+                cb(new watched_keys_changed_error_1.WatchedKeysChangedError());
             else
                 cb(null, reply);
         });

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

@@ -110,7 +110,7 @@ class NodeRedisV3Client extends redis_client_1.RedisClient {
         this.client.hset(key, field, value, cb);
     }
     hdel(key, fields, cb) {
-        this.client.hdel(key, fields, cb);
+        this.client.hdel(key, ...(typeof fields === 'string' ? [fields] : fields), cb);
     }
     lrange(key, start, stop, cb) {
         this.client.lrange(key, start, stop, cb);
@@ -166,7 +166,7 @@ class NodeRedisV3Client extends redis_client_1.RedisClient {
         this.client.get(key, cb);
     }
     del(key, cb) {
-        this.client.del(key, cb);
+        this.client.del(...(typeof key === 'string' ? [key] : key), cb);
     }
     llen(key, cb) {
         this.client.llen(key, cb);

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeRedisV4ClientMulti = void 0;
+const client_1 = require("@redis/client");
+const watched_keys_changed_error_1 = require("../errors/watched-keys-changed.error");
 class NodeRedisV4ClientMulti {
     constructor(client) {
         this.multi = client.multi();
@@ -69,7 +71,12 @@ class NodeRedisV4ClientMulti {
         this.multi
             .exec()
             .then((reply) => cb(null, reply))
-            .catch(cb);
+            .catch((err) => {
+            if (err instanceof client_1.WatchError)
+                cb(new watched_keys_changed_error_1.WatchedKeysChangedError());
+            else
+                cb(err);
+        });
     }
 }
 exports.NodeRedisV4ClientMulti = NodeRedisV4ClientMulti;

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

@@ -215,8 +215,8 @@ class NodeRedisV4Client extends redis_client_1.RedisClient {
     }
     del(key, cb) {
         this.client
-            .sendCommand(['del', ...(Array.isArray(key) ? key : [key])])
-            .then((reply) => cb(null, Number(reply)))
+            .del(key)
+            .then((reply) => cb(null, reply))
             .catch(cb);
     }
     llen(key, cb) {

package/dist/src/redis-client/errors/watched-keys-changed.error.d.ts

@@ -0,0 +1,4 @@
+import { RedisClientError } from './redis-client.error';
+export declare class WatchedKeysChangedError extends RedisClientError {
+    constructor(msg?: string);
+}

package/dist/src/redis-client/errors/watched-keys-changed.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WatchedKeysChangedError = void 0;
+const redis_client_error_1 = require("./redis-client.error");
+class WatchedKeysChangedError extends redis_client_error_1.RedisClientError {
+    constructor(msg = 'One (or more) of the watched keys has been changed') {
+        super(msg);
+    }
+}
+exports.WatchedKeysChangedError = WatchedKeysChangedError;
+//# sourceMappingURL=watched-keys-changed.error.js.map

package/package.json

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