Add promise support to del, reset, and ttl

dabroek · Dec 15, 2017 · 809fec2 · 809fec2
1 parent dd7f916
commit 809fec2
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 15 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -53,14 +53,30 @@ var redisStore = function redisStore() {
       });
     },
     del: function del(key, options, cb) {
-      if (typeof options === 'function') {
-        cb = options;
-      }
+      return new Promise(function (resolve, reject) {
+        if (typeof options === 'function') {
+          cb = options;
+        }
+
+        if (!cb) {
+          cb = function cb(err, result) {
+            return err ? reject(err) : resolve(result);
+          };
+        }
 
-      redisCache.del(key, handleResponse(cb));
+        redisCache.del(key, handleResponse(cb));
+      });
     },
     reset: function reset(cb) {
-      return redisCache.flushdb(handleResponse(cb));
+      return new Promise(function (resolve, reject) {
+        if (!cb) {
+          cb = function cb(err, result) {
+            return err ? reject(err) : resolve(result);
+          };
+        }
+
+        redisCache.flushdb(handleResponse(cb));
+      });
     },
     keys: function keys(pattern, cb) {
       return new Promise(function (resolve, reject) {
@@ -79,7 +95,15 @@ var redisStore = function redisStore() {
       });
     },
     ttl: function ttl(key, cb) {
-      return redisCache.ttl(key, handleResponse(cb));
+      return new Promise(function (resolve, reject) {
+        if (!cb) {
+          cb = function cb(err, result) {
+            return err ? reject(err) : resolve(result);
+          };
+        }
+
+        redisCache.ttl(key, handleResponse(cb));
+      });
     },
     isCacheableValue: storeArgs.is_cacheable_value || function (value) {
       return value !== undefined && value !== null;

diff --git a/index.js b/index.js
@@ -42,14 +42,28 @@ const redisStore = (...args) => {
         redisCache.get(key, handleResponse(cb, { parse: true }));
       })
     ),
-    del: (key, options, cb) => {
-      if (typeof options === 'function') {
-        cb = options;
-      }
+    del: (key, options, cb) => (
+      new Promise((resolve, reject) => {
+        if (typeof options === 'function') {
+          cb = options;
+        }
 
-      redisCache.del(key, handleResponse(cb));
-    },
-    reset: cb => redisCache.flushdb(handleResponse(cb)),
+        if (!cb) {
+          cb = (err, result) => (err ? reject(err) : resolve(result));
+        }
+
+        redisCache.del(key, handleResponse(cb));
+      })
+    ),
+    reset: cb => (
+      new Promise((resolve, reject) => {
+        if (!cb) {
+          cb = (err, result) => (err ? reject(err) : resolve(result));
+        }
+
+        redisCache.flushdb(handleResponse(cb));
+      })
+    ),
     keys: (pattern, cb) => (
       new Promise((resolve, reject) => {
         if (typeof pattern === 'function') {
@@ -64,7 +78,15 @@ const redisStore = (...args) => {
         redisCache.keys(pattern, handleResponse(cb));
       })
     ),
-    ttl: (key, cb) => redisCache.ttl(key, handleResponse(cb)),
+    ttl: (key, cb) => (
+      new Promise((resolve, reject) => {
+        if (!cb) {
+          cb = (err, result) => (err ? reject(err) : resolve(result));
+        }
+
+        redisCache.ttl(key, handleResponse(cb));
+      })
+    ),
     isCacheableValue: storeArgs.is_cacheable_value || (value => value !== undefined && value !== null),
   };
 };

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cache-manager-redis-store",
   "author": "Matthijs Dabroek <[email protected]>",
   "description": "Redis store for node-cache-manager",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "MIT",
   "main": "dist/index.js",
   "repository": {

diff --git a/test/index.test.js b/test/index.test.js
@@ -243,6 +243,11 @@ describe('get', () => {
 });
 
 describe('del', () => {
+  it('should return a promise', (done) => {
+    expect(redisCache.del('foo')).toBeInstanceOf(Promise);
+    done();
+  });
+
   it('should delete a value for a given key', (done) => {
     redisCache.set('foo', 'bar', () => {
       redisCache.del('foo', (err) => {
@@ -269,6 +274,11 @@ describe('del', () => {
 });
 
 describe('reset', () => {
+  it('should return a promise', (done) => {
+    expect(redisCache.reset()).toBeInstanceOf(Promise);
+    done();
+  });
+
   it('should flush underlying db', (done) => {
     redisCache.reset((err) => {
       expect(err).toEqual(null);
@@ -291,6 +301,11 @@ describe('reset', () => {
 });
 
 describe('ttl', () => {
+  it('should return a promise', (done) => {
+    expect(redisCache.ttl('foo')).toBeInstanceOf(Promise);
+    done();
+  });
+
   it('should retrieve ttl for a given key', (done) => {
     redisCache.set('foo', 'bar', () => {
       redisCache.ttl('foo', (err, ttl) => {