fix(daemon): implement missing bridge methods

berty · Apr 17, 2019 · b7e5619 · b7e5619
1 parent 5c3b866
commit b7e5619
Show file tree

Hide file tree

Showing 7 changed files with 600 additions and 255 deletions.
diff --git a/client/react-native/common/bridge/service/daemon/daemon.pb.json b/client/react-native/common/bridge/service/daemon/daemon.pb.json
@@ -15,7 +15,7 @@
                 },
                 "GetLocalGrpcInfos": {
                   "requestType": "Void",
-                  "responseType": "Void"
+                  "responseType": "GRPCInfos"
                 },
                 "GetNetworkConfig": {
                   "requestType": "Void",
@@ -29,9 +29,9 @@
                   "requestType": "Config",
                   "responseType": "Void"
                 },
-                "IsBotRunning": {
+                "GetBotState": {
                   "requestType": "Void",
-                  "responseType": "Void"
+                  "responseType": "BotState"
                 },
                 "ListAccounts": {
                   "requestType": "Void",
@@ -69,10 +69,6 @@
                   "requestType": "Void",
                   "responseType": "Void"
                 },
-                "ThrowException": {
-                  "requestType": "Void",
-                  "responseType": "Void"
-                },
                 "UpdateNetworkConfig": {
                   "requestType": "NetworkConfig",
                   "responseType": "Void"
@@ -82,6 +78,14 @@
             "Void": {
               "fields": {}
             },
+            "BotState": {
+              "fields": {
+                "isBotRunning": {
+                  "type": "bool",
+                  "id": 1
+                }
+              }
+            },
             "StartRequest": {
               "fields": {
                 "nickname": {
@@ -90,6 +94,14 @@
                 }
               }
             },
+            "GRPCInfos": {
+              "fields": {
+                "json": {
+                  "type": "string",
+                  "id": 1
+                }
+              }
+            },
             "NetworkConfig": {
               "fields": {
                 "json": {

diff --git a/client/react-native/common/components/Screens/Settings/Devtools/List.js b/client/react-native/common/components/Screens/Settings/Devtools/List.js
@@ -112,10 +112,10 @@ class List extends PureComponent {
     const { bridge } = this.props
 
     try {
-      let running = await bridge.isBotRunning({})
+      const { isBotRunning } = await bridge.getBotState({})
 
       this.setState({
-        botRunning: running,
+        botRunning: isBotRunning,
         botStateLoaded: true,
       })
     } catch (err) {
@@ -227,45 +227,41 @@ class List extends PureComponent {
     return (
       <Menu>
         <Menu.Section>
-          {(Platform.OS !== 'web' || Platform.Desktop) && (
-            <Menu.Item
-              icon='cpu'
-              title='Bot mode'
-              customRight={
-                <Switch
-                  justify='end'
-                  disabled={!this.state.botStateLoaded}
-                  value={this.state.botRunning}
-                  onValueChange={this.toggleBotState}
-                />
-              }
-            />
-          )}
+          <Menu.Item
+            icon='cpu'
+            title='Bot mode'
+            customRight={
+              <Switch
+                justify='end'
+                disabled={!this.state.botStateLoaded}
+                value={this.state.botRunning}
+                onValueChange={this.toggleBotState}
+              />
+            }
+          />
           <Menu.Item
             icon='refresh-ccw'
             title='Restart daemon'
             onPress={this.restartDaemon}
           />
-          {(Platform.OS !== 'web' || Platform.Desktop) && (
-            <Menu.Item
-              icon='server'
-              title={
-                'Local gRPC (' +
-                (this.state.localGRPCAddress === ''
-                  ? 'no private IP'
-                  : this.state.localGRPCAddress) +
-                ')'
-              }
-              customRight={
-                <Switch
-                  justify='end'
-                  disabled={this.state.localGRPCAddress === ''}
-                  value={this.state.localGRPCRunning}
-                  onValueChange={this.toggleLocalGRPCState}
-                />
-              }
-            />
-          )}
+          <Menu.Item
+            icon='server'
+            title={
+              'Local gRPC (' +
+              (this.state.localGRPCAddress === ''
+                ? 'no private IP'
+                : this.state.localGRPCAddress) +
+              ')'
+            }
+            customRight={
+              <Switch
+                justify='end'
+                disabled={this.state.localGRPCAddress === ''}
+                value={this.state.localGRPCRunning}
+                onValueChange={this.toggleLocalGRPCState}
+              />
+            }
+          />
         </Menu.Section>
         <Menu.Section>
           <Menu.Item

diff --git a/client/react-native/desktop/main.go b/client/react-native/desktop/main.go
@@ -108,10 +108,6 @@ func main() {
 		homepageUrl = *homepage
 	}
 
-	startRequest := &daemon.StartRequest{
-		Nickname: "daemon-desktop",
-	}
-
 	d, err := NewDaemonDesktop()
 	if err != nil {
 		panic(err)
@@ -121,10 +117,6 @@ func main() {
 		panic(err)
 	}
 
-	if _, err := d.bridge.Start(context.Background(), startRequest); err != nil {
-		panic(err)
-	}
-
 	zap.L().Debug("Berty desktop client started")
 
 	// Run bootstrap