@azteam/redis-async 1.0.45 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/redis-async",
-    "version": "1.0.45",
+    "version": "1.0.48",
     "description": "",
     "main": "src/index.js",
     "repository": {
@@ -24,7 +24,7 @@
     },
     "homepage": "https://github.com/toda93/redis-async#readme",
     "dependencies": {
-        "@azteam/util": "1.0.6",
+        "@azteam/util": "1.0.7",
         "redis": "4.0.6"
     }
 }

package/src/RedisAsync.js

@@ -1,6 +1,5 @@
-import redis from 'redis';
-import { promisify } from 'util';
-import { timeout } from '@azteam/util';
+import {createClient} from 'redis';
+import {timeout} from '@azteam/util';
 
 
 class RedisAsync {
@@ -34,7 +33,7 @@ class RedisAsync {
     connect() {
         this._alert('connecting', 'Redis connecting...');
 
-        this.client = redis.createClient({
+        this.client = createClient({
             host: this.host,
             port: this.port,
 
@@ -44,6 +43,9 @@ class RedisAsync {
                 this.client.quit();
             }
         });
+
+        this.client.connect();
+
         this.client.on('connect', () => {
             this.connected = true;
             this._alert('connect', 'Redis connected');
@@ -66,14 +68,13 @@ class RedisAsync {
 
             console.log(`Redis GET ${prefixKey}`);
 
-            const getAsync = promisify(this.client.get).bind(this.client);
-            const data = await getAsync(prefixKey);
+            const data = await this.client.get(prefixKey);
             if (data) {
                 return JSON.parse(data);
             }
         } else {
             this.connect();
-            return this.get(key);
+            return null;
         }
 
         return defaultValue;
@@ -83,38 +84,42 @@ class RedisAsync {
     async ttl(key) {
         const prefixKey = this.parsePrefix(key);
 
-        const ttlAsync = promisify(this.client.ttl).bind(this.client);
-        return await ttlAsync(prefixKey);
+        return await this.client.ttl(prefixKey);
     }
 
     async expire(key, timeSecond = 86400) {
         const prefixKey = this.parsePrefix(key);
-
         this.client.expire(prefixKey, timeSecond);
     }
 
-    async set(key, data, timeSecond = 86400) {
+    async set(key, data, timeSecond = 86400, count = 0) {
         const prefixKey = this.parsePrefix(key);
 
         if (this.connected) {
             console.log(`Redis SET ${prefixKey}`);
-            return await this.client.set(prefixKey, JSON.stringify(data), 'EX', timeSecond);
+            await this.client.set(prefixKey, JSON.stringify(data));
+            await this.expire(prefixKey, timeSecond);
+            return true;
         } else {
             this.connect();
-            return this.set(key, data, timeSecond);
+
+            if (count < 5) {
+                return this.set(key, data, timeSecond, count + 1);
+            }
+            return false;
+
         }
     }
 
-    async scan(pattern, cursor = 0, count = 1000) {
-        const scanAsync = promisify(this.client.scan).bind(this.client);
-        return await scanAsync(cursor, 'MATCH', pattern, 'COUNT', count);
-    }
+    // async scan(pattern, cursor = 0, count = 1000) {
+    //     const scanAsync = promisify(this.client.scan).bind(this.client);
+    //     return await scanAsync(cursor, 'MATCH', pattern, 'COUNT', count);
+    // }
 
-    async remove(key, exact = true) {
+    async remove(key, exact = true, count = 0) {
         const prefixKey = this.parsePrefix(key);
 
         if (this.connected) {
-
             if (exact) {
                 console.log(`Redis REMOVE ${prefixKey}`);
 
@@ -122,8 +127,7 @@ class RedisAsync {
             } else {
                 const regexKey = '*' + prefixKey + '*';
 
-                const getAsync = promisify(this.client.keys).bind(this.client);
-                const keys = await getAsync(regexKey);
+                const keys = await this.client.keys(regexKey)
 
                 if (keys.length > 0) {
                     console.log(`Redis REMOVE keys`, keys);
@@ -133,7 +137,10 @@ class RedisAsync {
 
         } else {
             this.connect();
-            return this.remove(key, exact);
+            if (count < 5) {
+                return this.remove(key, exact, count + 1);
+            }
+            return false;
         }
     }
 
@@ -151,4 +158,4 @@ class RedisAsync {
     }
 }
 
-export default RedisAsync;
+export default RedisAsync;