clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(rtc): fix assets-sync-loop stopped, fix read-asset err behaviour

Browse Source 
- ensure rtc-loop stops when assets-sync-loop stopped
- ensure read-file/read-file-raw have same behaviour on web and electron
- handle exceptions between ui-thread <-> worker-thread
- ignore upload-asset if not exist at local
- ignore download-asset if not exist at remote
This commit is contained in:
rcmerci
2025-12-05 20:44:39 +08:00
parent f7e154f3ae
commit 285eb612a1
7 changed files with 105 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/frontend/handler/assets.cljs
View File

@@ -8,6 +8,7 @@
[frontend.fs :as fs]
[frontend.state :as state]
[frontend.util :as util]
[lambdaisland.glogi :as log]
[logseq.common.config :as common-config]
[logseq.common.path :as path]
[logseq.common.util :as common-util]
@@ -222,6 +223,7 @@
(constantly nil))))
(defn <read-asset
"Throw if asset not found"
[repo asset-block-id asset-type]
(let [repo-dir (config/get-repo-dir repo)
file-path (path/path-join common-config/local-assets-dir
@@ -271,7 +273,10 @@
[repo aes-key asset-block-uuid-str asset-type checksum put-url]
(assert (and asset-type checksum))
(m/sp
(let [asset-file (c.m/<? (<read-asset repo asset-block-uuid-str asset-type))
(let [asset-file (try (c.m/<? (<read-asset repo asset-block-uuid-str asset-type))
(catch :default e
(log/info :read-asset e)
(throw (ex-info "read-asset failed" {:type :rtc.exception/read-asset-failed} e))))
asset-file* (if (not aes-key)
asset-file
(ldb/write-transit-str
@@ -291,7 +296,8 @@
:succ (constantly nil))
(let [{:keys [status] :as r} (m/? http-task)]
(when-not (http/unexceptional-status? status)
{:ex-data {:type :rtc.exception/upload-asset-failed :data (dissoc r :body)}})))))
(throw (ex-info "upload-asset failed"
{:type :rtc.exception/upload-asset-failed :data (dissoc r :body)})))))))
(defn new-task--rtc-download-asset
[repo aes-key asset-block-uuid-str asset-type get-url]
@@ -311,7 +317,8 @@
(try
(let [{:keys [status body] :as r} (m/? http-task)]
(if-not (http/unexceptional-status? status)
{:ex-data {:type :rtc.exception/download-asset-failed :data (dissoc r :body)}}
(throw (ex-info "download asset failed"
{:type :rtc.exception/download-asset-failed :data (dissoc r :body)}))
(let [asset-file
(if (not aes-key)
body
@@ -327,7 +334,6 @@
(throw e)))))]
(c.m/<? (<write-asset repo asset-block-uuid-str asset-type asset-file))
nil)))
(catch Cancelled e
(progress-canceler)
(throw e))))))