greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enhance: use c.m/<? to simplify http calls

pull/11433/head
rcmerci 2024-07-17 11:55:46 +08:00
parent 32260d13d6
commit 3757370118
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/frontend/worker/rtc/asset.cljs
View File

@ -63,12 +63,12 @@
(doseq [[asset-uuid put-url] asset-uuid->url]
(assert (uuid? asset-uuid) asset-uuid)
(let [{:keys [status] :as r}
(m/? (c.m/<! (http/put put-url {:headers {"x-amz-meta-checksum" "TEST-CHECKSUM"}
:body (js/JSON.stringify
(clj->js {:TEST-ASSET true
:asset-uuid (str asset-uuid)
:graph-uuid (str graph-uuid)}))
:with-credentials? false})))]
(c.m/<? (http/put put-url {:headers {"x-amz-meta-checksum" "TEST-CHECKSUM"}
:body (js/JSON.stringify
(clj->js {:TEST-ASSET true
:asset-uuid (str asset-uuid)
:graph-uuid (str graph-uuid)}))
:with-credentials? false}))]
(if (not= 200 status)
(prn :debug-failed-upload-asset {:resp r :asset-uuid asset-uuid :graph-uuid graph-uuid})
@ -88,7 +88,7 @@
:asset-uuid->url)]
(doseq [[asset-uuid get-url] asset-uuid->url]
(assert (uuid? asset-uuid) asset-uuid)
(let [{:keys [status _body] :as r} (m/? (c.m/<! (http/get get-url {:with-credentials? false})))]
(let [{:keys [status _body] :as r} (c.m/<? (http/get get-url {:with-credentials? false}))]
(if (not= 200 status)
(prn :debug-failed-download-asset {:resp r :asset-uuid asset-uuid :graph-uuid graph-uuid})
(when (d/entity @conn [:block/uuid asset-uuid])

4
src/main/frontend/worker/rtc/full_upload_download_graph.cljs
View File

@ -121,7 +121,7 @@
(ldb/write-transit-str all-blocks)))))]
(rtc-log-and-state/rtc-log :rtc.log/upload {:sub-type :upload-data
:message "uploading data"})
(m/? (c.m/<! (http/put url {:body all-blocks-str :with-credentials? false})))
(c.m/<? (http/put url {:body all-blocks-str :with-credentials? false}))
(rtc-log-and-state/rtc-log :rtc.log/upload {:sub-type :request-upload-graph
:message "requesting upload-graph"})
(let [upload-resp
@ -314,7 +314,7 @@
:message "downloading graph data"
:graph-uuid graph-uuid})
(let [^js worker-obj (:worker/object @worker-state/*state)
{:keys [status body] :as r} (m/? (c.m/<! (http/get s3-url {:with-credentials? false})))
{:keys [status body] :as r} (c.m/<? (http/get s3-url {:with-credentials? false}))
repo (str sqlite-util/db-version-prefix graph-name)]
(if (not= 200 status)
(throw (ex-info "download-graph from s3 failed" {:resp r}))

2
src/main/frontend/worker/rtc/ws.cljs
View File

@ -177,7 +177,7 @@
message (assoc message :req-id req-id)
resp (m/? (send&recv* mws message :timeout-ms timeout-ms))]
(if-let [s3-presign-url (:s3-presign-url resp)]
(let [{:keys [status body]} (m/? (c.m/<! (http/get s3-presign-url {:with-credentials? false})))]
(let [{:keys [status body]} (c.m/<? (http/get s3-presign-url {:with-credentials? false}))]
(if (http/unexceptional-status? status)
(rtc-const/data-from-ws-coercer (js->clj (js/JSON.parse body) :keywordize-keys true))
{:req-id req-id