From 9b0bf2727c9dc9e2cc174bd5c449ce2053152df8 Mon Sep 17 00:00:00 2001
From: Dreamacro <305009791@qq.com>
Date: Fri, 21 Dec 2018 23:36:35 +0800
Subject: [PATCH] Chore: read API info from jsBridge

---
 src/containers/Settings/index.tsx | 12 ++++++------
 src/lib/jsBridge.ts               |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/containers/Settings/index.tsx b/src/containers/Settings/index.tsx
index 8909390..348bad9 100644
--- a/src/containers/Settings/index.tsx
+++ b/src/containers/Settings/index.tsx
@@ -82,24 +82,24 @@ class Settings extends React.Component<I18nProps, {}> {
             await rootStores.store.fetchAndParseConfig()
             const startAtLogin = await jsBridge.getStartAtLogin()
             const setAsSystemProxy = await jsBridge.isSystemProxySet()
+            const apiInfo = await jsBridge.getAPIInfo()
             this.setState({
                 startAtLogin,
                 setAsSystemProxy,
-                isClashX: true
+                isClashX: true,
+                externalControllerHost: apiInfo.host,
+                externalControllerPort: apiInfo.port,
+                externalControllerSecret: apiInfo.secret
             })
         }
         await rootStores.store.fetchData()
 
-        const config = rootStores.store.config.general
         const general = rootStores.store.data.general
         this.setState({
             allowConnectFromLan: general.allowLan,
             proxyMode: general.mode,
             socks5ProxyPort: general.socksPort,
-            httpProxyPort: general.port,
-            externalControllerHost: config.externalControllerAddr,
-            externalControllerPort: config.externalControllerPort,
-            externalControllerSecret: config.secret
+            httpProxyPort: general.port
         })
     }
 
diff --git a/src/lib/jsBridge.ts b/src/lib/jsBridge.ts
index 976d9ae..28c6d90 100644
--- a/src/lib/jsBridge.ts
+++ b/src/lib/jsBridge.ts
@@ -137,6 +137,10 @@ export class JsBridge {
         return this.callHandler<string>('getPasteboard')
     }
 
+    public getAPIInfo () {
+        return this.callHandler<{ host: string, port: string, secret: string }>('apiInfo')
+    }
+
     public setPasteboard (data: string) {
         return this.callHandler('setPasteboard', data)
     }