Merge pull request #24 from share/bump-redis-version

💥 Bump redis version to 5.0.0

Author: dawidreedsy

.github/workflows/test.yml

@@ -10,14 +10,17 @@ on:
 
 jobs:
   test:
-    name: Node.js ${{ matrix.node }}
+    name: Node.js ${{ matrix.node }} - Redis ${{ matrix.redis }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node:
         - 16
         - 18
         - 20
+        redis:
+        - 4
+        - 5
     services:
       redis:
         image: redis
@@ -31,6 +34,8 @@ jobs:
         node-version: ${{ matrix.node }}
     - name: Install
       run: npm install
+    - name: Install correct redis version
+      run: npm install redis@${{ matrix.redis }}
     - name: Lint
       run: npm run lint
     - name: Test

index.js

@@ -42,10 +42,19 @@ RedisPubSub.prototype.close = function(callback) {
 };
 
 RedisPubSub.prototype._close = function() {
-  return this._closing = this._closing || this._connect().then(Promise.all([
-    this.client.quit(),
-    this.observer.quit()
-  ]));
+  var pubsub = this;
+
+  if (!this._closing) {
+    this._closing = this._connect()
+      .then(function() {
+        return Promise.all([
+          close(pubsub.client),
+          close(pubsub.observer)
+        ]);
+      });
+  }
+
+  return this._closing;
 };
 
 RedisPubSub.prototype._subscribe = function(channel, callback) {
@@ -90,5 +99,15 @@ function connect(client) {
 
 var PUBLISH_SCRIPT =
   'for i = 2, #ARGV do ' +
-    'redis.call("publish", ARGV[i], ARGV[1]) ' +
+  'redis.call("publish", ARGV[i], ARGV[1]) ' +
   'end';
+
+function close(client) {
+  if (client.close) {
+    return client.close();
+  }
+
+  // The quit is deprecated for node redis >= 5.0.0
+  // This call should be removed after we stop supporting redis < 5.0.0
+  return client.quit();
+}

package.json

@@ -1,10 +1,10 @@
 {
   "name": "sharedb-redis-pubsub",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "Redis pub/sub adapter adapter for ShareDB",
   "main": "index.js",
   "dependencies": {
-    "redis": "^4.0.0",
+    "redis": "^4.0.0 || ^5.0.0",
     "sharedb": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
   },
   "devDependencies": {