move transport (#18062)

status-im · Dec 5, 2023 · fe20fa4 · fe20fa4
1 parent 5c30fd8
commit fe20fa4
Show file tree

Hide file tree

Showing 20 changed files with 217 additions and 320 deletions.
diff --git a/.carve_ignore b/.carve_ignore
@@ -95,7 +95,6 @@ react-native.fs/unlink
 react-native.fs/file-exists?
 status-im.ui.components.colors/white
 status-im.ui.components.colors/black
-status-im.transport.core-test/messages
 status-im.ui.components.core/animated-header
 status-im.ui.components.core/safe-area-provider
 status-im.ui.components.core/safe-area-consumer

diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs
@@ -5,11 +5,11 @@
     [goog.object :as object]
     [re-frame.core :as re-frame]
     [status-im.chat.models.mentions :as mentions]
-    [status-im.chat.models.message :as chat.message]
     [status-im.chat.models.message-content :as message-content]
     [status-im.data-store.messages :as data-store-messages]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.composer.link-preview.events :as link-preview]
+    [status-im2.contexts.chat.messages.transport.events :as messages.transport]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
@@ -205,7 +205,7 @@
       (rf/merge cofx
                 (clean-input (:current-chat-id db))
                 (link-preview/reset-unfurled)
-                (chat.message/send-messages messages)))))
+                (messages.transport/send-chat-messages messages)))))
 
 (rf/defn send-audio-message
   [{:keys [db] :as cofx} audio-path duration current-chat-id]
@@ -214,25 +214,26 @@
     (when-not (string/blank? audio-path)
       (rf/merge
        {:db (assoc-in db [:chat/inputs current-chat-id :metadata :responding-to-message] nil)}
-       (chat.message/send-message
-        (merge
-         {:chat-id           current-chat-id
-          :content-type      constants/content-type-audio
-          :audio-path        audio-path
-          :audio-duration-ms duration
-          :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})}
-         (when message-id
-           {:response-to message-id})))))))
+       (messages.transport/send-chat-messages
+        [(merge
+          {:chat-id           current-chat-id
+           :content-type      constants/content-type-audio
+           :audio-path        audio-path
+           :audio-duration-ms duration
+           :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})}
+          (when message-id
+            {:response-to message-id}))])))))
 
 (rf/defn send-sticker-message
   [cofx {:keys [hash packID pack]} current-chat-id]
   (when-not (or (string/blank? hash) (and (string/blank? packID) (string/blank? pack)))
-    (chat.message/send-message cofx
-                               {:chat-id      current-chat-id
-                                :content-type constants/content-type-sticker
-                                :sticker      {:hash hash
-                                               :pack (int (if (string/blank? packID) pack packID))}
-                                :text         (i18n/label :t/update-to-see-sticker {"locale" "en"})})))
+    (messages.transport/send-chat-messages
+     cofx
+     [{:chat-id      current-chat-id
+       :content-type constants/content-type-sticker
+       :sticker      {:hash hash
+                      :pack (int (if (string/blank? packID) pack packID))}
+       :text         (i18n/label :t/update-to-see-sticker {"locale" "en"})}])))
 
 (rf/defn send-edited-message
   [{:keys [db]

diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs
@@ -5,7 +5,6 @@
     [react-native.platform :as platform]
     [status-im.chat.models.loading :as chat.loading]
     [status-im.data-store.messages :as data-store.messages]
-    [status-im.transport.message.protocol :as protocol]
     [status-im.utils.deprecated-types :as types]
     [status-im2.contexts.chat.messages.delete-message.events :as delete-message]
     [status-im2.contexts.chat.messages.list.events :as message-list]
@@ -21,12 +20,6 @@
   [db chat-id clock-value]
   (>= (get-in db [:chats chat-id :deleted-at-clock-value]) clock-value))
 
-(defn add-timeline-message
-  [acc chat-id message-id message]
-  (-> acc
-      (update-in [:db :messages chat-id] assoc message-id message)
-      (update-in [:db :message-lists chat-id] message-list/add message)))
-
 (defn hide-message
   "Hide chat message, rebuild message-list"
   [{:keys [db]} chat-id message-id]
@@ -145,14 +138,6 @@
                               :on-error   #(log/error "failed to re-send message" %)}]}
             (update-message-status chat-id message-id :sending)))
 
-(rf/defn send-message
-  [cofx message]
-  (protocol/send-chat-messages cofx [message]))
-
-(rf/defn send-messages
-  [cofx messages]
-  (protocol/send-chat-messages cofx messages))
-
 (rf/defn handle-removed-messages
   {:events [::handle-removed-messages]}
   [{:keys [db] :as cofx} removed-messages]

diff --git a/src/status_im/chat/models/reactions.cljs b/src/status_im/chat/models/reactions.cljs
@@ -2,7 +2,6 @@
   (:require
     [re-frame.core :as re-frame]
     [status-im.data-store.reactions :as data-store.reactions]
-    [status-im.transport.message.protocol :as message.protocol]
     [status-im2.constants :as constants]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]
@@ -63,23 +62,6 @@
     (let [reactions-w-chat-id (map #(assoc % :chat-id chat-id) reactions)]
       {:db (update db :reactions (process-reactions (:chats db)) reactions-w-chat-id)})))
 
-
-;; Send reactions
-
-
-(rf/defn send-emoji-reaction
-  {:events [:models.reactions/send-emoji-reaction]}
-  [{{:keys [current-chat-id]} :db :as cofx} reaction]
-  (message.protocol/send-reaction cofx
-                                  (update reaction :chat-id #(or % current-chat-id))))
-
-(rf/defn send-retract-emoji-reaction
-  {:events [:models.reactions/send-emoji-reaction-retraction]}
-  [{{:keys [current-chat-id]} :db :as cofx} reaction]
-  (message.protocol/send-retract-reaction cofx
-                                          (update reaction :chat-id #(or % current-chat-id))))
-
-
 (defn message-reactions
   [current-public-key reactions]
   (reduce

diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs
@@ -32,9 +32,7 @@
     status-im.pairing.core
     status-im.profile.core
     status-im.search.core
-    status-im.signals.core
     status-im.stickers.core
-    status-im.transport.core
     status-im.ui.components.invite.events
     [status-im.ui.components.react :as react]
     status-im.ui.screens.notifications-settings.events

diff --git a/src/status_im/mailserver/core.cljs b/src/status_im/mailserver/core.cljs
@@ -412,3 +412,17 @@
   (rf/merge cofx
             {:db (dissoc db :mailserver.edit/mailserver)}
             (navigation/navigate-to :edit-mailserver nil)))
+
+(defn add-mailservers
+  [db mailservers]
+  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
+            (let [updated-mailserver
+                  (-> mailserver
+                      (update :id keyword)
+                      (assoc :name (if (seq name) name id))
+                      (dissoc :fleet))]
+              (assoc-in db
+               [:mailserver/mailservers (keyword fleet) (keyword id)]
+               updated-mailserver)))
+          db
+          mailservers))
diff --git a/src/status_im/transport/core.cljs b/src/status_im/transport/core.cljs
@@ -1,58 +0,0 @@
-(ns ^{:doc "API to init and stop whisper messaging"} status-im.transport.core
-  (:require
-    [re-frame.core :as re-frame]
-    [status-im.pairing.core :as pairing]
-    [status-im.stickers.core :as stickers]
-    status-im.transport.shh
-    [status-im2.common.universal-links :as universal-links]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
-
-(rf/defn set-node-info
-  {:events [:transport.callback/node-info-fetched]}
-  [{:keys [db]} node-info]
-  {:db (assoc db :node-info node-info)})
-
-(rf/defn fetch-node-info-fx
-  [_]
-  {:json-rpc/call [{:method     "admin_nodeInfo"
-                    :on-success #(re-frame/dispatch [:transport.callback/node-info-fetched %])
-                    :on-error   #(log/error "node-info: failed error" %)}]})
-
-(defn add-mailservers
-  [db mailservers]
-  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
-            (let [updated-mailserver
-                  (-> mailserver
-                      (update :id keyword)
-                      (assoc :name (if (seq name) name id))
-                      (dissoc :fleet))]
-              (assoc-in db
-               [:mailserver/mailservers (keyword fleet) (keyword id)]
-               updated-mailserver)))
-          db
-          mailservers))
-
-(rf/defn start-messenger
-  "We should only start receiving messages/processing topics once all the
-  initializiation is completed, otherwise we might receive messages/topics
-  when the state has not been properly initialized."
-  [_]
-  {:json-rpc/call [{:method     "wakuext_startMessenger"
-                    :on-success #(re-frame/dispatch [::messenger-started %])
-                    :on-error   #(log/error "failed to start messenger")}]})
-
-(rf/defn messenger-started
-  {:events [::messenger-started]}
-  [{:keys [db] :as cofx} {:keys [mailservers] :as response}]
-  (log/info "Messenger started")
-  (let [new-account? (get db :onboarding/new-account?)]
-    (rf/merge cofx
-              {:db (-> db
-                       (assoc :messenger/started? true)
-                       (add-mailservers mailservers))}
-              (fetch-node-info-fx)
-              (pairing/init)
-              (stickers/load-packs)
-              (when-not new-account?
-                (universal-links/process-stored-event)))))

diff --git a/src/status_im/transport/message/protocol.cljs b/src/status_im/transport/message/protocol.cljs
diff --git a/src/status_im/transport/shh.cljs b/src/status_im/transport/shh.cljs
diff --git a/src/status_im/transport/utils.cljs b/src/status_im/transport/utils.cljs
diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs
@@ -7,7 +7,6 @@
     [react-native.mail :as react-native-mail]
     [react-native.platform :as platform]
     [status-im.bottom-sheet.events :as bottom-sheet]
-    [status-im.transport.utils :as transport.utils]
     [status-im.ui.components.react :as react]
     [status-im.utils.build :as build]
     [status-im.utils.deprecated-types :as types]
@@ -38,6 +37,11 @@
   {:json-rpc/call [{:method     "web3_clientVersion"
                     :on-success #(re-frame/dispatch [:logging/store-web3-client-version %])}]})
 
+(defn extract-url-components
+  [address]
+  (when address
+    (rest (re-matches #"enode://(.*?)@(.*):(.*)" address))))
+
 (defn email-body
   "logs attached"
   [{:keys [:web3-node-version :mailserver/current-id
@@ -46,7 +50,7 @@
         build-version (str build/version " (" build-number ")")
         separator (string/join (take 40 (repeat "-")))
         [enode-id ip-address port]
-        (transport.utils/extract-url-components (:enode node-info))]
+        (extract-url-components (:enode node-info))]
     (string/join
      "\n"
      (concat [(i18n/label :t/report-bug-email-template
@@ -68,7 +72,7 @@
              (mapcat
               (fn [{:keys [enode]}]
                 (let [[enode-id ip-address port]
-                      (transport.utils/extract-url-components enode)]
+                      (extract-url-components enode)]
                   [(str "id: " enode-id)
                    (str "ip: " ip-address)
                    (str "port: " port)