[#5315]: Status development tools: HTTP debugging, updated react-native-http-bridge

Signed-off-by: Aleksandr Pantiukhov <alwxndr@gmail.com>

Makefile

@@ -128,20 +128,11 @@ geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545
 	build/bin/geth attach http://localhost:8545
 
-android-ports-avd: ##@other Add reverse proxy to Android Device/Simulator
+android-ports: ##@other Add proxies to Android Device/Simulator
 	adb -e reverse tcp:8081 tcp:8081
 	adb -e reverse tcp:3449 tcp:3449
 	adb -e reverse tcp:4567 tcp:4567
-
+	adb -e forward tcp:5561 tcp:5561
-android-ports-genymotion: ##@other Add reverse proxy to Android Device/Simulator
-	adb -e reverse tcp:8081 tcp:8081
-	adb -e reverse tcp:3449 tcp:3449
-	adb -e reverse tcp:4567 tcp:4567
-
-android-ports-real: ##@other Add reverse proxy to Android Device/Simulator
-	adb -d reverse tcp:8081 tcp:8081
-	adb -d reverse tcp:3449 tcp:3449
-	adb -d reverse tcp:4567 tcp:4567
 
 
 startdev-%:

mobile_files/package.json

@@ -41,7 +41,7 @@
     "react-native-fetch-polyfill": "1.1.2",
     "react-native-firebase": "4.2.0",
     "react-native-fs": "2.8.1",
-    "react-native-http-bridge": "https://github.com/status-im/react-native-http-bridge.git",
+    "react-native-http-bridge": "0.5.2",
     "react-native-i18n": "2.0.9",
     "react-native-image-crop-picker": "0.18.1",
     "react-native-image-resizer": "1.0.0",

src/status_im/dev_server/core.cljs

@@ -0,0 +1,35 @@
+(ns status-im.dev-server.core
+  (:require [status-im.ui.components.react :as react]
+            [status-im.utils.platform :as platform]
+            [status-im.utils.types :as types]
+            [taoensso.timbre :as log]
+            [re-frame.core :as re-frame]))
+
+(defonce port 5561)
+(defonce server-name (if platform/ios?
+                       "Status iOS"
+                       "Status Android"))
+
+(defn respond! [status-code data]
+  (.respond react/http-bridge
+            status-code
+            "application/json"
+            (types/clj->json data)))
+
+(defn start! []
+  (.start react/http-bridge
+          port
+          server-name
+          (fn [req]
+            (try
+              (let [{:keys [url type postData]} (js->clj req :keywordize-keys true)
+                    data (if (string? postData)
+                           (-> (.parse js/JSON postData)
+                               (js->clj :keywordize-keys true))
+                           postData)]
+                (re-frame/dispatch [:process-http-request url type data]))
+              (catch js/Error e
+                (log/debug "Error: " e))))))
+
+(defn stop! []
+  (.stop react/http-bridge))

src/status_im/dev_server/events.cljs

@@ -0,0 +1,37 @@
+(ns status-im.dev-server.events
+  (:require [clojure.string :as string]
+            [re-frame.core :as re-frame]
+            [status-im.dev-server.core :as dev-server.core]
+            [status-im.models.dev-server :as models.dev-server]
+            [status-im.utils.handlers :as handlers]))
+
+;; FX
+
+(re-frame/reg-fx
+ :dev-server/start
+ (fn []
+   (dev-server.core/start!)))
+
+(re-frame/reg-fx
+ :dev-server/stop
+ (fn []
+   (dev-server.core/stop!)))
+
+(re-frame/reg-fx
+ :dev-server/respond
+ (fn [[status-code data]]
+   (dev-server.core/respond! status-code data)))
+
+;; Handlers
+
+(handlers/register-handler-fx
+ :process-http-request
+ [re-frame/trim-v (re-frame/inject-cofx :random-id)]
+ (fn [cofx [url type data]]
+   (try
+     (models.dev-server/process-request! {:cofx cofx
+                                          :url  (rest (string/split url "/"))
+                                          :type (keyword type)
+                                          :data data})
+     (catch js/Error e
+       {:dev-server/respond [400 {:message (str "Unsupported operation: " e)}]}))))

src/status_im/init/core.cljs

@@ -7,6 +7,7 @@
             [status-im.models.browser :as browser]
             [status-im.models.chat :as chat]
             [status-im.models.contacts :as models.contacts]
+            [status-im.models.dev-server :as models.dev-server]
             [status-im.models.protocol :as models.protocol]
             [status-im.models.transactions :as transactions]
             [status-im.models.wallet :as models.wallet]
@@ -167,6 +168,7 @@
                            (initialize-account-db address)
                            (models.protocol/initialize-protocol address)
                            (models.contacts/load-contacts)
+                           (models.dev-server/start-if-needed)
                            (chat/initialize-chats)
                            (chat/process-pending-messages)
                            (browser/initialize-browsers)

src/status_im/models/dev_server.cljs

@@ -0,0 +1,62 @@
+(ns status-im.models.dev-server
+  (:require [status-im.models.network :as models.network]
+            [clojure.string :as string]))
+
+(defn start-if-needed
+  [{{:account/keys [account]} :db}]
+  (let [{:keys [dev-mode?]} account]
+    (when dev-mode?
+      {:dev-server/start nil})))
+
+;; Specific server operations
+
+(defmulti process-request! (fn [{:keys [url type]}] [type (first url) (second url)]))
+
+(defmethod process-request! [:POST "ping" nil]
+  [_]
+  {:dev-server/respond [200 {:message "Pong!"}]})
+
+(defmethod process-request! [:POST "dapp" "open"]
+  [{{:keys [url]} :data}]
+  {:dispatch           [:open-url-in-browser url]
+   :dev-server/respond [200 {:message "URL has been opened."}]})
+
+(defmethod process-request! [:POST "network" nil]
+  [{:keys [cofx data]}]
+  (let [data (->> data
+                  (map (fn [[k v]] [k {:value v}]))
+                  (into {}))]
+    (models.network/save
+     cofx
+     {:data       data
+      :on-success (fn [network _]
+                    {:dev-server/respond [200 {:message    "Network has been added."
+                                               :network-id network}]})
+      :on-failure (fn [_ _]
+                    {:dev-server/respond [400 {:message "Please, check the validity of network information."}]})})))
+
+(defmethod process-request! [:POST "network" "connect"]
+  [{:keys [cofx data]}]
+  (models.network/connect
+   cofx
+   {:network    (:id data)
+    :on-success (fn [network _]
+                  {:dev-server/respond [200 {:message    "Network has been connected."
+                                             :network-id network}]})
+    :on-failure (fn [_ _]
+                  {:dev-server/respond [400 {:message "The network id you provided doesn't exist."}]})}))
+
+(defmethod process-request! [:DELETE "network" nil]
+  [{:keys [cofx data]}]
+  (models.network/delete
+   cofx
+   {:network    (:id data)
+    :on-success (fn [network _]
+                  {:dev-server/respond [200 {:message    "Network has been deleted."
+                                             :network-id network}]})
+    :on-failure (fn [_ _]
+                  {:dev-server/respond [400 {:message "Cannot delete the provided network."}]})}))
+
+(defmethod process-request! :default
+  [{:keys [type url]}]
+  {:dev-server/respond [404 {:message (str "Not found (" (name type) " " (string/join "/" url) ")")}]})

src/status_im/models/network.cljs

@@ -1,8 +1,10 @@
 (ns status-im.models.network
-  (:require [clojure.string :as string]
+  (:require [re-frame.core :as re-frame]
-            [status-im.ui.screens.accounts.utils :as accounts.utils]
+            [clojure.string :as string]
+            [status-im.i18n :as i18n]
             [status-im.utils.ethereum.core :as ethereum]
-            [status-im.utils.handlers-macro :as handlers-macro]))
+            [status-im.utils.handlers-macro :as handlers-macro]
+            [status-im.ui.screens.accounts.utils :as accounts.utils]))
 
 (def url-regex
   #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -35,7 +37,7 @@
        (map :error)
        (not-any? identity)))
 
-(defn- new-network [{:keys [random-id]} network-name upstream-url type network-id]
+(defn new-network [random-id network-name upstream-url type network-id]
   (let [data-dir (str "/ethereum/" (name type) "_rpc")
         config   {:NetworkId      (or (when network-id (int network-id))
                                       (ethereum/chain-keyword->chain-id type))
@@ -55,17 +57,61 @@
            (update-in [:networks/manage input-key] assoc :value value)
            (update-in [:networks/manage] validate-manage))})
 
-(defn save [{{:networks/keys [manage] :account/keys [account] :as db} :db :as cofx}]
+(defn- action-handler
-  (when (valid-manage? manage)
+  ([handler]
-    (let [{:keys [name url chain network-id]} manage
+   (handler nil nil))
-          network                  (new-network cofx (:value name) (:value url) (:value chain) (:value network-id))
+  ([handler data cofx]
-          new-networks             (merge {(:id network) network} (:networks account))]
+   (when handler
-      (handlers-macro/merge-fx cofx
+     (handler data cofx))))
-                               {:db       (dissoc db :networks/manage)
+
-                                :dispatch [:navigate-back]}
+(defn save
-                               (accounts.utils/account-update {:networks new-networks})))))
+  ([cofx]
+   (save cofx nil))
+  ([{{:network/keys [manage]
+      :account/keys [account] :as db} :db :as cofx}
+    {:keys [data on-success on-failure]}]
+   (let [data            (or data manage)]
+     (if (valid-manage? data)
+       (let [{:keys [name url chain network-id]} data
+             network      (new-network (:random-id cofx) (:value name) (:value url) (:value chain) (:value network-id))
+             new-networks (merge {(:id network) network} (:networks account))]
+         (handlers-macro/merge-fx cofx
+                                  {:db (dissoc db :networks/manage)}
+                                  (action-handler on-success (:id network))
+                                  (accounts.utils/account-update {:networks new-networks})))
+       (action-handler on-failure)))))
 
 ;; No edit functionality actually implemented
 (defn edit [{db :db}]
   {:db       (assoc db :networks/manage (validate-manage default-manage))
    :dispatch [:navigate-to :edit-network]})
+
+(defn connect [{:keys [db now] :as cofx} {:keys [network on-success on-failure]}]
+  (if (get-in db [:account/account :networks network])
+    (let [current-network (get-in db [:account/account :networks (:network db)])]
+      (if (ethereum/network-with-upstream-rpc? current-network)
+        (handlers-macro/merge-fx cofx
+                                 (action-handler on-success network)
+                                 (accounts.utils/account-update {:network      network
+                                                                 :last-updated now}
+                                                                [:logout]))
+        (handlers-macro/merge-fx {:show-confirmation {:title               (i18n/label :t/close-app-title)
+                                                      :content             (i18n/label :t/close-app-content)
+                                                      :confirm-button-text (i18n/label :t/close-app-button)
+                                                      :on-accept           #(re-frame/dispatch [::save-network network])
+                                                      :on-cancel           nil}}
+                                 (action-handler on-success network))))
+    (action-handler on-failure)))
+
+(defn delete [{{:account/keys [account]} :db} {:keys [network on-success on-failure]}]
+  (let [current-network? (= (:network account) network)]
+    (if (or current-network?
+            (not (get-in account [:networks network])))
+      (handlers-macro/merge-fx {:show-error (i18n/label :t/delete-network-error)}
+                               (action-handler on-failure network))
+      (handlers-macro/merge-fx {:show-confirmation {:title               (i18n/label :t/delete-network-title)
+                                                    :content             (i18n/label :t/delete-network-confirmation)
+                                                    :confirm-button-text (i18n/label :t/delete)
+                                                    :on-accept           #(re-frame/dispatch [::remove-network network])
+                                                    :on-cancel           nil}}
+                               (action-handler on-success network)))))

src/status_im/ui/screens/accounts/events.cljs

@@ -63,8 +63,11 @@
 
 (handlers/register-handler-fx
  :switch-dev-mode
- (fn [cofx [_ dev-mode]]
+ (fn [cofx [_ dev-mode?]]
-   (accounts.utils/account-update {:dev-mode? dev-mode} cofx)))
+   (merge (accounts.utils/account-update {:dev-mode? dev-mode?} cofx)
+          (if dev-mode?
+            {:dev-server/start nil}
+            {:dev-server/stop nil}))))
 
 (handlers/register-handler-fx
  :wallet-set-up-passed

src/status_im/ui/screens/events.cljs

@@ -1,13 +1,9 @@
 (ns status-im.ui.screens.events
   (:require status-im.chat.events
+            status-im.dev-server.events
             status-im.network.events
-            [status-im.transport.handlers :as transport.handlers]
             status-im.protocol.handlers
-            [status-im.models.protocol :as models.protocol]
-            [status-im.models.account :as models.account]
-            [status-im.ui.screens.accounts.models :as accounts.models]
             status-im.ui.screens.accounts.login.events
-            [status-im.ui.screens.accounts.login.models :as login]
             status-im.ui.screens.accounts.recover.events
             [status-im.models.contacts :as models.contacts]
             status-im.ui.screens.add-new.events
@@ -29,7 +25,6 @@
             status-im.ui.screens.qr-scanner.events
             status-im.ui.screens.extensions.events
             status-im.ui.screens.wallet.events
-            [status-im.models.wallet :as models.wallet]
             status-im.ui.screens.wallet.collectibles.events
             status-im.ui.screens.wallet.send.events
             status-im.ui.screens.wallet.request.events
@@ -57,8 +52,7 @@
             [status-im.utils.handlers :as handlers]
             [status-im.utils.handlers-macro :as handlers-macro]
             [status-im.utils.http :as http]
-            [status-im.utils.utils :as utils]
+            [status-im.utils.utils :as utils]))
-            [taoensso.timbre :as log]))
 
 ;;;; COFX
 
@@ -154,8 +148,9 @@
   [{:keys [db] :as cofx}]
   (let [{:transport/keys [chats]} db]
     (handlers-macro/merge-fx cofx
-                             {:dispatch [:init/initialize-keychain]
+                             {:dispatch            [:init/initialize-keychain]
-                              :clear-user-password (get-in db [:account/account :address])}
+                              :clear-user-password (get-in db [:account/account :address])
+                              :dev-server/stop     nil}
                              (navigation/navigate-to-clean nil)
                              (transport/stop-whisper))))
 

src/status_im/ui/screens/network_settings/edit_network/events.cljs

@@ -6,8 +6,11 @@
 (handlers/register-handler-fx
  :save-new-network
  [(re-frame/inject-cofx :random-id)]
- (fn [cofx _]
+ (fn [cofx]
-   (models.network/save cofx)))
+   (models.network/save cofx
+                        {:data       (get-in cofx [:db :network/manage])
+                         :on-success (fn []
+                                       {:dispatch [:navigate-back]})})))
 
 (handlers/register-handler-fx
  :network-set-input
@@ -16,5 +19,5 @@
 
 (handlers/register-handler-fx
  :edit-network
- (fn [cofx _]
+ (fn [cofx]
    (models.network/edit cofx)))

src/status_im/ui/screens/network_settings/events.cljs

@@ -1,15 +1,12 @@
 (ns status-im.ui.screens.network-settings.events
-  (:require [re-frame.core :refer [dispatch dispatch-sync after] :as re-frame]
+  (:require [re-frame.core :as re-frame]
-            [status-im.utils.handlers :refer [register-handler] :as handlers]
-            status-im.ui.screens.network-settings.edit-network.events
-            [status-im.utils.handlers-macro :as handlers-macro]
-            [status-im.ui.screens.accounts.utils :as accounts.utils]
             [status-im.i18n :as i18n]
-            [status-im.utils.ethereum.core :as utils]
+            [status-im.models.network :as models.network]
-            [status-im.transport.core :as transport]
+            status-im.ui.screens.network-settings.edit-network.events
-            [status-im.utils.ethereum.core :as ethereum]
+            [status-im.ui.screens.accounts.utils :as accounts.utils]
-            [status-im.utils.types :as types]
+            [status-im.utils.handlers :as handlers]
-            [clojure.string :as string]))
+            [status-im.utils.handlers-macro :as handlers-macro]
+            [status-im.utils.ethereum.core :as utils]))
 
 ;; handlers
 
@@ -37,28 +34,10 @@
 
 (handlers/register-handler-fx
  :connect-network
- (fn [{:keys [db now] :as cofx} [_ network]]
+ (fn [cofx [_ network]]
-   (let [current-network (get-in db [:account/account :networks (:network db)])
+   (models.network/connect cofx {:network network})))
-         chats           (:transport/chats db)]
-     (if (utils/network-with-upstream-rpc? current-network)
-       (handlers-macro/merge-fx cofx
-                                (accounts.utils/account-update {:network      network
-                                                                :last-updated now}
-                                                               [:logout]))
-       {:show-confirmation {:title               (i18n/label :t/close-app-title)
-                            :content             (i18n/label :t/close-app-content)
-                            :confirm-button-text (i18n/label :t/close-app-button)
-                            :on-accept           #(dispatch [::save-network network])
-                            :on-cancel           nil}}))))
 
 (handlers/register-handler-fx
  :delete-network
- (fn [{{:account/keys [account] :as db} :db :as cofx} [_ network]]
+ (fn [cofx [_ network]]
-   (let [current-network? (= (:network account) network)]
+   (models.network/delete cofx {:network network})))
-     (if current-network?
-       {:show-error (i18n/label :t/delete-network-error)}
-       {:show-confirmation {:title               (i18n/label :t/delete-network-title)
-                            :content             (i18n/label :t/delete-network-confirmation)
-                            :confirm-button-text (i18n/label :t/delete)
-                            :on-accept           #(dispatch [::remove-network network])
-                            :on-cancel           nil}}))))

test/cljs/status_im/test/models/network.cljs

@@ -31,7 +31,7 @@
     (is (model/valid-rpc-url? "https://valid.something.else:65323"))))
 
 (deftest new-network-test
-  (let [actual (model/new-network {:random-id "random-id"}
+  (let [actual (model/new-network "random-id"
                                   "network-name"
                                   "upstream-url"
                                   :mainnet
@@ -45,7 +45,7 @@
            actual))))
 
 (deftest new-network-id-test
-  (let [actual (model/new-network {:random-id "random-id"}
+  (let [actual (model/new-network "random-id"
                                   "network-name"
                                   "upstream-url"
                                   :mainnet