From 1db86be435ca345773356ab8b99d5a60b86abaeb Mon Sep 17 00:00:00 2001
From: rcmerci <rcmerci@gmail.com>
Date: Sun, 5 May 2024 20:54:33 +0800
Subject: [PATCH] refactor(rtc): remake rtc-request-download-graph

---
 src/main/frontend/db_worker.cljs                   |  6 +-----
 src/main/frontend/worker/rtc/core2.cljs            |  7 +++++++
 .../worker/rtc/full_upload_download_graph.cljs     | 14 ++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/frontend/db_worker.cljs b/src/main/frontend/db_worker.cljs
index 8dbf24dd8..416f82196 100644
--- a/src/main/frontend/db_worker.cljs
+++ b/src/main/frontend/db_worker.cljs
@@ -611,11 +611,7 @@
   ;; ================================================================
   (rtc-request-download-graph
    [this token graph-uuid]
-   (async-util/c->p
-    (async/go
-      (let [state (or @rtc-core/*state
-                      (<! (rtc-core/<init-state token false)))]
-        (<? (rtc-updown/<request-download-graph state graph-uuid))))))
+   (js/Promise. (rtc-core2/new-task--request-download-graph token graph-uuid)))
 
   (rtc-wait-download-graph-info-ready
    [this repo token download-info-uuid graph-uuid timeout-ms]
diff --git a/src/main/frontend/worker/rtc/core2.cljs b/src/main/frontend/worker/rtc/core2.cljs
index adeaed736..d36cd0018 100644
--- a/src/main/frontend/worker/rtc/core2.cljs
+++ b/src/main/frontend/worker/rtc/core2.cljs
@@ -308,6 +308,13 @@
       (r.ex/->map (ex-info "Not found db-conn" {:type :rtc.exception/not-found-db-conn
                                                 :repo repo})))))
 
+(defn new-task--request-download-graph
+  [token graph-uuid]
+  (let [{:keys [get-ws-create-task]} (new-task--get-ws-create--memoized (get-ws-url token))]
+    (r.upload-download/new-task--request-download-graph get-ws-create-task graph-uuid)))
+
+;;; ================ API (ends) ================
+
 ;;; subscribe debug state ;;;
 
 (defonce ^:private *last-subscribe-canceler (atom nil))
diff --git a/src/main/frontend/worker/rtc/full_upload_download_graph.cljs b/src/main/frontend/worker/rtc/full_upload_download_graph.cljs
index 078eba861..95bb9eece 100644
--- a/src/main/frontend/worker/rtc/full_upload_download_graph.cljs
+++ b/src/main/frontend/worker/rtc/full_upload_download_graph.cljs
@@ -71,7 +71,7 @@
           (throw (ex-info "upload-graph failed" {:upload-resp upload-resp})))))))
 
 
-(def block-type-kw->str
+(def ^:private block-type-kw->str
   {:block-type/property     "property"
    :block-type/class        "class"
    :block-type/whiteboard   "whiteboard"
@@ -177,13 +177,11 @@
 ;; async download-graph ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn <request-download-graph
-  [state graph-uuid]
-  (go-try
-   (let [{:keys [download-info-uuid]}
-         (<? (ws/<send&receive state {:action "download-graph"
-                                      :graph-uuid graph-uuid}))]
-     download-info-uuid)))
+(defn new-task--request-download-graph
+  [get-ws-create-task graph-uuid]
+  (m/join :download-info-uuid
+          (r.client/send&recv get-ws-create-task {:action "download-graph"
+                                                  :graph-uuid graph-uuid})))
 
 (defn <wait-download-info-ready
   [state download-info-uuid graph-uuid timeout-ms]