@azteam/redis-async 1.0.117 → 1.0.118

package/lib/RedisAsync.js

@@ -4,9 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _redis = require("redis");
+var _ioredis = _interopRequireDefault(require("ioredis"));
 var _util = require("@azteam/util");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return r; }; var t, r = {}, e = Object.prototype, n = e.hasOwnProperty, o = "function" == typeof Symbol ? Symbol : {}, i = o.iterator || "@@iterator", a = o.asyncIterator || "@@asyncIterator", u = o.toStringTag || "@@toStringTag"; function c(t, r, e, n) { Object.defineProperty(t, r, { value: e, enumerable: !n, configurable: !n, writable: !n }); } try { c({}, ""); } catch (t) { c = function c(t, r, e) { return t[r] = e; }; } function h(r, e, n, o) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype); return c(a, "_invoke", function (r, e, n) { var o = 1; return function (i, a) { if (3 === o) throw Error("Generator is already running"); if (4 === o) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var u = n.delegate; if (u) { var c = d(u, n); if (c) { if (c === f) continue; return c; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (1 === o) throw o = 4, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = 3; var h = s(r, e, n); if ("normal" === h.type) { if (o = n.done ? 4 : 2, h.arg === f) continue; return { value: h.arg, done: n.done }; } "throw" === h.type && (o = 4, n.method = "throw", n.arg = h.arg); } }; }(r, n, new Context(o || [])), !0), a; } function s(t, r, e) { try { return { type: "normal", arg: t.call(r, e) }; } catch (t) { return { type: "throw", arg: t }; } } r.wrap = h; var f = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var l = {}; c(l, i, function () { return this; }); var p = Object.getPrototypeOf, y = p && p(p(x([]))); y && y !== e && n.call(y, i) && (l = y); var v = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(l); function g(t) { ["next", "throw", "return"].forEach(function (r) { c(t, r, function (t) { return this._invoke(r, t); }); }); } function AsyncIterator(t, r) { function e(o, i, a, u) { var c = s(t[o], t, i); if ("throw" !== c.type) { var h = c.arg, f = h.value; return f && "object" == _typeof(f) && n.call(f, "__await") ? r.resolve(f.__await).then(function (t) { e("next", t, a, u); }, function (t) { e("throw", t, a, u); }) : r.resolve(f).then(function (t) { h.value = t, a(h); }, function (t) { return e("throw", t, a, u); }); } u(c.arg); } var o; c(this, "_invoke", function (t, n) { function i() { return new r(function (r, o) { e(t, n, r, o); }); } return o = o ? o.then(i, i) : i(); }, !0); } function d(r, e) { var n = e.method, o = r.i[n]; if (o === t) return e.delegate = null, "throw" === n && r.i["return"] && (e.method = "return", e.arg = t, d(r, e), "throw" === e.method) || "return" !== n && (e.method = "throw", e.arg = new TypeError("The iterator does not provide a '" + n + "' method")), f; var i = s(o, r.i, e.arg); if ("throw" === i.type) return e.method = "throw", e.arg = i.arg, e.delegate = null, f; var a = i.arg; return a ? a.done ? (e[r.r] = a.value, e.next = r.n, "return" !== e.method && (e.method = "next", e.arg = t), e.delegate = null, f) : a : (e.method = "throw", e.arg = new TypeError("iterator result is not an object"), e.delegate = null, f); } function w(t) { this.tryEntries.push(t); } function m(r) { var e = r[4] || {}; e.type = "normal", e.arg = t, r[4] = e; } function Context(t) { this.tryEntries = [[-1]], t.forEach(w, this), this.reset(!0); } function x(r) { if (null != r) { var e = r[i]; if (e) return e.call(r); if ("function" == typeof r.next) return r; if (!isNaN(r.length)) { var o = -1, a = function e() { for (; ++o < r.length;) if (n.call(r, o)) return e.value = r[o], e.done = !1, e; return e.value = t, e.done = !0, e; }; return a.next = a; } } throw new TypeError(_typeof(r) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, c(v, "constructor", GeneratorFunctionPrototype), c(GeneratorFunctionPrototype, "constructor", GeneratorFunction), c(GeneratorFunctionPrototype, u, GeneratorFunction.displayName = "GeneratorFunction"), r.isGeneratorFunction = function (t) { var r = "function" == typeof t && t.constructor; return !!r && (r === GeneratorFunction || "GeneratorFunction" === (r.displayName || r.name)); }, r.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, c(t, u, "GeneratorFunction")), t.prototype = Object.create(v), t; }, r.awrap = function (t) { return { __await: t }; }, g(AsyncIterator.prototype), c(AsyncIterator.prototype, a, function () { return this; }), r.AsyncIterator = AsyncIterator, r.async = function (t, e, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(h(t, e, n, o), i); return r.isGeneratorFunction(e) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, g(v), c(v, u, "Generator"), c(v, i, function () { return this; }), c(v, "toString", function () { return "[object Generator]"; }), r.keys = function (t) { var r = Object(t), e = []; for (var n in r) e.unshift(n); return function t() { for (; e.length;) if ((n = e.pop()) in r) return t.value = n, t.done = !1, t; return t.done = !0, t; }; }, r.values = x, Context.prototype = { constructor: Context, reset: function reset(r) { if (this.prev = this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(m), !r) for (var e in this) "t" === e.charAt(0) && n.call(this, e) && !isNaN(+e.slice(1)) && (this[e] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0][4]; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(r) { if (this.done) throw r; var e = this; function n(t) { a.type = "throw", a.arg = r, e.next = t; } for (var o = e.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i[4], u = this.prev, c = i[1], h = i[2]; if (-1 === i[0]) return n("end"), !1; if (!c && !h) throw Error("try statement without catch or finally"); if (null != i[0] && i[0] <= u) { if (u < c) return this.method = "next", this.arg = t, n(c), !0; if (u < h) return n(h), !1; } } }, abrupt: function abrupt(t, r) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var n = this.tryEntries[e]; if (n[0] > -1 && n[0] <= this.prev && this.prev < n[2]) { var o = n; break; } } o && ("break" === t || "continue" === t) && o[0] <= r && r <= o[2] && (o = null); var i = o ? o[4] : {}; return i.type = t, i.arg = r, o ? (this.method = "next", this.next = o[2], f) : this.complete(i); }, complete: function complete(t, r) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && r && (this.next = r), f; }, finish: function finish(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[2] === t) return this.complete(e[4], e[3]), m(e), f; } }, "catch": function _catch(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[0] === t) { var n = e[4]; if ("throw" === n.type) { var o = n.arg; m(e); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(r, e, n) { return this.delegate = { i: x(r), r: e, n: n }, "next" === this.method && (this.arg = t), f; } }, r; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -22,6 +29,7 @@ var RedisAsync = /*#__PURE__*/function () {
     this.host = config.host;
     this.port = config.port;
     this.prefix = config.prefix;
+    this.subscriptions = {};
     this.connect();
   }
   return _createClass(RedisAsync, [{
@@ -77,21 +85,25 @@ var RedisAsync = /*#__PURE__*/function () {
     value: function connect() {
       var _this = this;
       this._alert('connecting', 'Redis connecting...');
-      this.client = (0, _redis.createClient)({
+      this.client = new _ioredis["default"]({
         host: this.host,
         port: this.port,
-        retry_strategy: function retry_strategy() {
+        lazyConnect: true,
+        retryStrategy: function retryStrategy() {
           _this.connected = false;
           _this._alert('connect', 'Redis disconnected');
-          _this.client.quit();
+          return null;
         }
       });
-      this.client.connect();
+      this.client.connect()["catch"](function (err) {
+        _this._alert('error', "Redis Connection Error: ".concat(err));
+      });
       this.client.on('connect', function () {
         _this.connected = true;
         _this._alert('connect', 'Redis connected');
       });
-      this.client.on('end', function () {
+      this.client.on('close', function () {
+        _this.connected = false;
         _this._alert('end', 'Redis end');
       });
       this.client.on('error', function (err) {
@@ -245,6 +257,7 @@ var RedisAsync = /*#__PURE__*/function () {
           prefixKey,
           regexKey,
           keys,
+          _this$client,
           _args6 = arguments;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -275,7 +288,7 @@ var RedisAsync = /*#__PURE__*/function () {
                 _context6.next = 15;
                 break;
               }
-              return _context6.abrupt("return", this.client.del(keys));
+              return _context6.abrupt("return", (_this$client = this.client).del.apply(_this$client, _toConsumableArray(keys)));
             case 15:
               _context6.next = 21;
               break;
@@ -301,6 +314,136 @@ var RedisAsync = /*#__PURE__*/function () {
       }
       return remove;
     }()
+  }, {
+    key: "publish",
+    value: function () {
+      var _publish = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(channel, data) {
+        var count,
+          prefixChannel,
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              count = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : 0;
+              prefixChannel = this.parsePrefix(channel);
+              if (!this.connected) {
+                _context7.next = 4;
+                break;
+              }
+              return _context7.abrupt("return", this.client.publish(prefixChannel, JSON.stringify(data)));
+            case 4:
+              this.connect();
+              if (!(count < 5)) {
+                _context7.next = 7;
+                break;
+              }
+              return _context7.abrupt("return", this.publish(channel, data, count + 1));
+            case 7:
+              return _context7.abrupt("return", false);
+            case 8:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
+      function publish(_x7, _x8) {
+        return _publish.apply(this, arguments);
+      }
+      return publish;
+    }()
+  }, {
+    key: "subscribe",
+    value: function () {
+      var _subscribe = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(channel, callback) {
+        var _this2 = this;
+        var prefixChannel;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              prefixChannel = this.parsePrefix(channel);
+              if (!this.subscriberClient) {
+                this.subscriberClient = this.client.duplicate();
+                this.subscriberClient.connect()["catch"](function (err) {
+                  _this2._alert('error', "Redis Subscriber Error: ".concat(err));
+                });
+                this.subscriberClient.on('message', function (chan, message) {
+                  var parsedMsg = message;
+                  try {
+                    parsedMsg = JSON.parse(message);
+                  } catch (e) {
+                    // ignore if not JSON
+                  }
+                  if (_this2.subscriptions[chan]) {
+                    _this2.subscriptions[chan].forEach(function (cb) {
+                      return cb(parsedMsg);
+                    });
+                  }
+                });
+              }
+              if (this.subscriptions[prefixChannel]) {
+                _context8.next = 6;
+                break;
+              }
+              this.subscriptions[prefixChannel] = [];
+              _context8.next = 6;
+              return this.subscriberClient.subscribe(prefixChannel);
+            case 6:
+              this.subscriptions[prefixChannel].push(callback);
+            case 7:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8, this);
+      }));
+      function subscribe(_x9, _x0) {
+        return _subscribe.apply(this, arguments);
+      }
+      return subscribe;
+    }()
+  }, {
+    key: "unsubscribe",
+    value: function () {
+      var _unsubscribe = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(channel, callback) {
+        var prefixChannel;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              prefixChannel = this.parsePrefix(channel);
+              if (this.subscriptions[prefixChannel]) {
+                _context9.next = 3;
+                break;
+              }
+              return _context9.abrupt("return");
+            case 3:
+              if (callback) {
+                this.subscriptions[prefixChannel] = this.subscriptions[prefixChannel].filter(function (cb) {
+                  return cb !== callback;
+                });
+              } else {
+                this.subscriptions[prefixChannel] = [];
+              }
+              if (!(this.subscriptions[prefixChannel].length === 0)) {
+                _context9.next = 9;
+                break;
+              }
+              delete this.subscriptions[prefixChannel];
+              if (!this.subscriberClient) {
+                _context9.next = 9;
+                break;
+              }
+              _context9.next = 9;
+              return this.subscriberClient.unsubscribe(prefixChannel);
+            case 9:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function unsubscribe(_x1, _x10) {
+        return _unsubscribe.apply(this, arguments);
+      }
+      return unsubscribe;
+    }()
   }, {
     key: "setAlertCallback",
     value: function setAlertCallback(callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/redis-async",
-    "version": "1.0.117",
+    "version": "1.0.118",
     "description": "N/A",
     "keywords": [
         "toda",
@@ -17,6 +17,6 @@
     },
     "dependencies": {
         "@azteam/util": "1.0.65",
-        "redis": "4.0.6"
+        "ioredis": "^5.10.1"
     }
 }

package/src/RedisAsync.js

@@ -1,4 +1,4 @@
-import {createClient} from 'redis';
+import Redis from 'ioredis';
 
 import {timeout} from '@azteam/util';
 
@@ -8,6 +8,7 @@ class RedisAsync {
         this.host = config.host;
         this.port = config.port;
         this.prefix = config.prefix;
+        this.subscriptions = {};
         this.connect();
     }
 
@@ -30,25 +31,28 @@ class RedisAsync {
     connect() {
         this._alert('connecting', 'Redis connecting...');
 
-        this.client = createClient({
+        this.client = new Redis({
             host: this.host,
             port: this.port,
-
-            retry_strategy: () => {
+            lazyConnect: true,
+            retryStrategy: () => {
                 this.connected = false;
                 this._alert('connect', 'Redis disconnected');
-                this.client.quit();
+                return null;
             },
         });
 
-        this.client.connect();
+        this.client.connect().catch((err) => {
+            this._alert('error', `Redis Connection Error: ${err}`);
+        });
 
         this.client.on('connect', () => {
             this.connected = true;
             this._alert('connect', 'Redis connected');
         });
 
-        this.client.on('end', () => {
+        this.client.on('close', () => {
+            this.connected = false;
             this._alert('end', 'Redis end');
         });
 
@@ -115,7 +119,7 @@ class RedisAsync {
                     keys = await this.client.keys(regexKey);
 
                 if (keys.length > 0) {
-                    return this.client.del(keys);
+                    return this.client.del(...keys);
                 }
             }
         } else {
@@ -128,6 +132,75 @@ class RedisAsync {
         return false;
     }
 
+    async publish(channel, data, count = 0) {
+        const prefixChannel = this.parsePrefix(channel);
+
+        if (this.connected) {
+            return this.client.publish(prefixChannel, JSON.stringify(data));
+        }
+
+        this.connect();
+        if (count < 5) {
+            return this.publish(channel, data, count + 1);
+        }
+        return false;
+    }
+
+    async subscribe(channel, callback) {
+        const prefixChannel = this.parsePrefix(channel);
+
+        if (!this.subscriberClient) {
+            this.subscriberClient = this.client.duplicate();
+
+            this.subscriberClient.connect().catch((err) => {
+                this._alert('error', `Redis Subscriber Error: ${err}`);
+            });
+
+            this.subscriberClient.on('message', (chan, message) => {
+                let parsedMsg = message;
+                try {
+                    parsedMsg = JSON.parse(message);
+                } catch (e) {
+                    // ignore if not JSON
+                }
+
+                if (this.subscriptions[chan]) {
+                    this.subscriptions[chan].forEach((cb) => cb(parsedMsg));
+                }
+            });
+        }
+
+        if (!this.subscriptions[prefixChannel]) {
+            this.subscriptions[prefixChannel] = [];
+            await this.subscriberClient.subscribe(prefixChannel);
+        }
+
+        this.subscriptions[prefixChannel].push(callback);
+    }
+
+    async unsubscribe(channel, callback) {
+        const prefixChannel = this.parsePrefix(channel);
+
+        if (!this.subscriptions[prefixChannel]) {
+            return;
+        }
+
+        if (callback) {
+            this.subscriptions[prefixChannel] = this.subscriptions[prefixChannel].filter(
+                (cb) => cb !== callback
+            );
+        } else {
+            this.subscriptions[prefixChannel] = [];
+        }
+
+        if (this.subscriptions[prefixChannel].length === 0) {
+            delete this.subscriptions[prefixChannel];
+            if (this.subscriberClient) {
+                await this.subscriberClient.unsubscribe(prefixChannel);
+            }
+        }
+    }
+
     setAlertCallback(callback) {
         this.alertCallback = callback;
     }