Merge pull request #67 from quick123official/feature/command_line_prompt

Feature/command line prompt

Author: quick123official

package.json

@@ -1,6 +1,6 @@
 {
     "name": "QuickRedis",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "private": true,
     "description": "QuickRedis",
     "author": "https://quick123.net/",
@@ -17,7 +17,7 @@
         "react-monaco-editor": "^0.36.0",
         "redis-splitargs": "^1.0.1",
         "socksv5-fixed": "0.0.6",
-        "ssh2": "^1.4.0"
+        "ssh2": "^1.5.0"
     },
     "scripts": {
         "start1": "react-app-rewired start",
@@ -85,7 +85,7 @@
         "babel-plugin-import": "^1.13.0",
         "customize-cra": "^1.0.0",
         "devtron": "^1.4.0",
-        "electron": "^9.1.0",
+        "electron": "11.5.0",
         "electron-builder": "^22.6.1",
         "electron-devtools-installer": "^3.1.1",
         "global": "^4.4.0",

src/__test_/lodash.test.js

@@ -0,0 +1,20 @@
+test("lodash", () => {
+    let dbIndexMap = new Map();
+    dbIndexMap.set(1, {
+        key: "" + 1,
+        dbIndex: 1,
+        title: 1,
+        total: 0,
+    });
+    dbIndexMap.set(20, {
+        key: "" + 1,
+        dbIndex: 20,
+        title: 1,
+        total: 0,
+    });
+    for ([key, value] of dbIndexMap) {
+        if (value.dbIndex >= 16) {
+            console.info("", key, value);
+        }
+    }
+});

src/pages/HostContent/index.js

@@ -73,6 +73,16 @@ class HostContent extends Component {
      */
     updateDBCount() {
         let redis = this.props.node.redis;
+        // get databases. default 16
+        let maxIndex = 16;
+        redis
+            .config("get", "databases")
+            .then((data) => {
+                maxIndex = parseInt(data[1]);
+            })
+            .catch((err) => {
+                Log.error("[cmd=config] get databases error", err);
+            });
         redis.info("Keyspace", (err, res) => {
             if (err) {
                 message.error("", err);
@@ -105,19 +115,23 @@ class HostContent extends Component {
                 Log.error("[cmd=info] Keyspace split error", error);
             }
             let dbTabs = [];
-            if (dbTabs.length === 0) {
-                for (let i = 0; i < 16; i++) {
-                    let dbIndexObj = dbIndexMap.get(i);
-                    if (dbIndexObj === undefined || dbIndexObj === null) {
-                        dbIndexObj = {
-                            key: "" + i,
-                            dbIndex: i,
-                            title: "db" + i,
-                            total: 0,
-                        };
-                    }
-                    dbTabs.push(dbIndexObj);
+            // get databases 失败，则尝试在 Keyspace 获取最大值
+            for (let [key, value] of dbIndexMap) {
+                if (value.dbIndex > maxIndex) {
+                    maxIndex = value.dbIndex;
+                }
+            }
+            for (let i = 0; i < maxIndex; i++) {
+                let dbIndexObj = dbIndexMap.get(i);
+                if (dbIndexObj === undefined || dbIndexObj === null) {
+                    dbIndexObj = {
+                        key: "" + i,
+                        dbIndex: i,
+                        title: "db" + i,
+                        total: 0,
+                    };
                 }
+                dbTabs.push(dbIndexObj);
             }
             this.setState({ dbTabs: dbTabs });
         });

src/services/RedisService.js

@@ -8,7 +8,7 @@ import intl from "react-intl-universal";
 
 let Redis = window.require("ioredis");
 const net = window.require("net");
-const Client = window.require("ssh2");
+const { Client } = window.require("ssh2");
 const { readFileSync } = window.require("fs");
 
 /**
@@ -304,9 +304,8 @@ export default class RedisService {
                                 let currentMaster =
                                     masters[hostinfo.masterName];
                                 if (currentMaster != null) {
-                                    let address = currentMaster.address.split(
-                                        ":"
-                                    );
+                                    let address =
+                                        currentMaster.address.split(":");
                                     let masterHost = address[0];
                                     let masterPort = address[1];
                                     const masterServer = net

yarn.lock

@@ -4923,10 +4923,10 @@ electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.867:
   resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.3.870.tgz#c15c921e66a46985181b261f8093b91c2abb6604"
   integrity sha1-wVySHmakaYUYGyYfgJO5HCq7ZgQ=
 
-electron@^9.1.0:
-  version "9.4.4"
-  resolved "https://registry.npmmirror.com/electron/download/electron-9.4.4.tgz#2a74a0655a74bd326216672c5ae6ed3a44451446"
-  integrity sha1-KnSgZVp0vTJiFmcsWubtOkRFFEY=
+electron@11.5.0:
+  version "11.5.0"
+  resolved "https://registry.npmmirror.com/electron/download/electron-11.5.0.tgz?cache=0&sync_timestamp=1637029455356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Felectron%2Fdownload%2Felectron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f"
+  integrity sha1-8WUFQ7nY8gR9OAd1W9sSAVPtIQ8=
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -12084,7 +12084,7 @@ [email protected]:
   resolved "https://registry.nlark.com/sprintf/download/sprintf-0.1.5.tgz#8f83e39a9317c1a502cb7db8050e51c679f6edcf"
   integrity sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=
 
-ssh2@^1.4.0:
+ssh2@^1.5.0:
   version "1.5.0"
   resolved "https://registry.npmmirror.com/ssh2/download/ssh2-1.5.0.tgz#4dc559ba98a1cbb420e8d42998dfe35d0eda92bc"
   integrity sha1-TcVZupihy7Qg6NQpmN/jXQ7akrw=