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

fix: persist local txs

Browse Source
This commit is contained in:
Tienson Qin
2026-01-07 16:44:57 +08:00
parent 6f1ec3229c
commit 98be903d53
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deps/worker-sync/src/logseq/worker_sync/worker.cljs vendored
View File

@@ -468,6 +468,7 @@
(handle-ws-message! self server (.-data event))
(catch :default e
(log/error :worker-sync/ws-error {:error e})
(js/console.error e)
(send! server {:type "error" :message "server error"})))))
(set! (.-onclose server)
(fn [_]

30
src/main/frontend/worker/worker_sync.cljs
View File

@@ -313,21 +313,21 @@
(defn enqueue-local-tx!
[repo tx-data tx-meta]
(when-let [client (get @worker-state/*worker-sync-clients repo)]
(let [send-queue (:send-queue client)
conn (worker-state/get-datascript-conn repo)
db (some-> conn deref)]
(when db
(let [normalized (if (:initial-db? tx-meta) tx-data (normalize-tx-data db tx-data))
tx-str (sqlite-util/write-transit-str normalized)]
(persist-local-tx! repo tx-str)
(swap! send-queue
(fn [prev]
(p/then prev
(fn [_]
(when-let [ws (:ws (get @worker-state/*worker-sync-clients repo))]
(when (ws-open? ws)
(flush-pending! repo client))))))))))))
(let [conn (worker-state/get-datascript-conn repo)
db (some-> conn deref)]
(when db
(let [normalized (if (:initial-db? tx-meta) tx-data (normalize-tx-data db tx-data))
tx-str (sqlite-util/write-transit-str normalized)]
(persist-local-tx! repo tx-str)
(when-let [client (get @worker-state/*worker-sync-clients repo)]
(let [send-queue (:send-queue client)]
(swap! send-queue
(fn [prev]
(p/then prev
(fn [_]
(when-let [ws (:ws (get @worker-state/*worker-sync-clients repo))]
(when (ws-open? ws)
(flush-pending! repo client)))))))))))))
(defn handle-local-tx!
[repo tx-data tx-meta]