@vbarbarosh/node-helpers 2.3.0 → 2.4.0

package/package.json

@@ -2,7 +2,7 @@
     "author": "Vladimir Barbarosh <vladimir.barbarosh@gmail.com>",
     "license": "MIT",
     "name": "@vbarbarosh/node-helpers",
-    "version": "2.3.0",
+    "version": "2.4.0",
     "description": "A set of helpers for JavaScript/Node.js",
     "files": [
         "src"

package/src/redis_connect.js

@@ -1,21 +1,29 @@
-const Redis = require('redis');
+const redis = require('redis');
 
-/**
- * tls://11.11.11.11:6378?ip-google=11.11.11.11&ip-external=22.22.22.22&password=xx-xx-xx&ssl[verify_peer]=0&ssl[verify_peer_name]=0
- *
- * @param url
- * @returns {*}
- */
-function redis_connect(url)
+// tcp://127.0.0.1:6379
+// tls://11.11.11.11:6378?password=xxx
+// tls://11.11.11.11:6378?password=xx-xx-xx&ssl[verify_peer]=0&ssl[verify_peer_name]=0
+async function redis_connect(url)
 {
+    const tmp = new URL(url);
+    const password = tmp.password || tmp.searchParams.get('password');
+
     if (url.match(/^tls:/)) {
-        return Redis.createClient(url.replace(/^tls:/, 'rediss:'), {
-            tls: {
-                rejectUnauthorized: false,
-            },
+        const out = redis.createClient({
+            url: url.replace(/^tls:/, 'rediss:'),
+            password,
+            tls: {rejectUnauthorized: false},
+            socket: {tls: true, rejectUnauthorized: false},
         });
+        await out.connect();
+        return out;
     }
-    return Redis.createClient(url.replace(/^tcp:/, 'redis:'));
+    const out = await redis.createClient({
+        url: url.replace(/^tcp:/, 'redis:'),
+        password,
+    });
+    await out.connect();
+    return out;
 }
 
 module.exports = redis_connect;