浏览代码

ws-addr doesn't need to be an atom

Tienson Qin 1 年之前
父节点
当前提交
06da20f3b5

+ 1 - 1
src/main/frontend/worker/rtc/core.cljs

@@ -831,7 +831,7 @@
    :*graph-uuid (atom nil)
    :*repo (atom nil)
    :*db-conn (atom nil)
-   :*ws-addr (atom ws-addr)
+   :ws-addr ws-addr
    :*token (atom token)
    :*date-formatter (atom nil)
    :data-from-ws-chan data-from-ws-chan

+ 3 - 1
src/main/frontend/worker/rtc/full_upload_download_graph.cljs

@@ -10,8 +10,10 @@
             [frontend.worker.async-util :include-macros true :refer [<? go-try]]
             [frontend.worker.rtc.op-mem-layer :as op-mem-layer]
             [frontend.worker.rtc.ws :refer [<send!]]
-            [frontend.persist-db :as persist-db]
             [logseq.db.frontend.schema :as db-schema]
+
+            ;; TODO:
+            [frontend.persist-db :as persist-db]
             [frontend.state :as state]))
 
 (def transit-r (transit/reader :json))

+ 1 - 4
src/main/frontend/worker/rtc/ws.cljs

@@ -5,7 +5,6 @@
   (:require [cljs-http.client :as http]
             [cljs.core.async :as async :refer [<! chan offer!]]
             [frontend.worker.async-util :include-macros true :refer [<? go-try]]
-            [frontend.config :as config]
             [frontend.worker.rtc.const :as rtc-const]
             [goog.string :as gstring]))
 
@@ -13,8 +12,6 @@
                      1
                      js/WebSocket.OPEN))
 
-(def ws-addr config/RTC-WS-URL)
-
 (defn ws-listen
   [ws-addr token data-from-ws-chan ws-opened-ch]
   (let [ws (js/WebSocket. (gstring/format ws-addr token))]
@@ -42,7 +39,7 @@
      (when (or (nil? ws)
                (> (.-readyState ws) WebSocketOPEN))
        (let [ws-opened-ch (chan)
-             ws* (ws-listen ws-addr @(:*token state) (:data-from-ws-chan state) ws-opened-ch)]
+             ws* (ws-listen (:ws-addr state) @(:*token state) (:data-from-ws-chan state) ws-opened-ch)]
          (<! ws-opened-ch)
          (reset! (:*ws state) ws*)
          (when-let [graph-uuid @(:*graph-uuid state)]