From 3b13f5f19f9389f953191461b30e3e173511b4a6 Mon Sep 17 00:00:00 2001 From: hoellen Date: Thu, 16 Apr 2026 09:02:53 +0200 Subject: [PATCH 1/3] fix: snapshot upload stuck when graph has large blocks --- src/main/frontend/worker/sync/apply_txs.cljs | 2 +- src/main/frontend/worker/sync/upload.cljs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/frontend/worker/sync/apply_txs.cljs b/src/main/frontend/worker/sync/apply_txs.cljs index 8cff5b6546..ebe3675bb9 100644 --- a/src/main/frontend/worker/sync/apply_txs.cljs +++ b/src/main/frontend/worker/sync/apply_txs.cljs @@ -125,7 +125,7 @@ (defn- ws-open? [ws] (sync-transport/ws-open? ws)) -(defn- upload-large-title! [repo graph-id title aes-key] +(defn upload-large-title! [repo graph-id title aes-key] (sync-large-title/upload-large-title! {:repo repo :graph-id graph-id diff --git a/src/main/frontend/worker/sync/upload.cljs b/src/main/frontend/worker/sync/upload.cljs index 6a08697f77..a5bd347277 100644 --- a/src/main/frontend/worker/sync/upload.cljs +++ b/src/main/frontend/worker/sync/upload.cljs @@ -125,7 +125,7 @@ :process-batch-f (fn [batch] (p/let [datoms* (sync-large-title/offload-large-titles-in-datoms-batch - repo graph-id batch aes-key sync-large-title/upload-large-title!) + repo graph-id batch aes-key sync-apply/upload-large-title!) encrypted-datoms (if aes-key (sync-crypt/ Date: Thu, 16 Apr 2026 08:16:58 +0200 Subject: [PATCH 2/3] fix: use scheme instead of hardcoded http --- deps/db-sync/src/logseq/db_sync/node/server.cljs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deps/db-sync/src/logseq/db_sync/node/server.cljs b/deps/db-sync/src/logseq/db_sync/node/server.cljs index a75d7c0110..887f222a88 100644 --- a/deps/db-sync/src/logseq/db_sync/node/server.cljs +++ b/deps/db-sync/src/logseq/db_sync/node/server.cljs @@ -2,6 +2,7 @@ (:require ["http" :as http] ["path" :as node-path] ["ws" :as ws] + [clojure.string :as string] [lambdaisland.glogi :as log] [logseq.db-sync.index :as index] [logseq.db-sync.logging :as logging] @@ -93,6 +94,9 @@ (defn start! [overrides] (let [cfg (config/normalize-config overrides) + scheme (if (and (:base-url cfg) (string/starts-with? (:base-url cfg) "https")) + "https" + "http") index-db (storage/open-index-db (:data-dir cfg)) assets-bucket (assets/make-bucket (node-path/join (:data-dir cfg) "assets")) registry (atom {}) @@ -105,7 +109,7 @@ (graph/delete-graph! registry deps graph-id)))) server (.createServer http (fn [req res] - (-> (p/let [request (platform-node/request-from-node req {:scheme "http"}) + (-> (p/let [request (platform-node/request-from-node req {:scheme scheme}) response (dispatch/handle-node-fetch {:request request :env env :registry registry @@ -123,7 +127,7 @@ (p/let [_ (index/ Date: Thu, 16 Apr 2026 15:31:00 +0800 Subject: [PATCH 3/3] enhance(ux): add retry mechanism for clicking add button after page creation --- src/main/frontend/handler/common/page.cljs | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/frontend/handler/common/page.cljs b/src/main/frontend/handler/common/page.cljs index c53b704dd0..dfd1c7cb43 100644 --- a/src/main/frontend/handler/common/page.cljs +++ b/src/main/frontend/handler/common/page.cljs @@ -36,6 +36,22 @@ (rest parts))) (string/join " #")))) +(defn- find-page-add-button + [page-id] + (when page-id + (->> (dom/sel ".block-add-button") + (filter #(= (str page-id) (dom/attr % "parentblockid"))) + first))) + +(defn- click-page-add-button-with-retry! + [page-id] + (letfn [(poll! [remaining-ms] + (if-let [block-add-button (find-page-add-button page-id)] + (.click block-add-button) + (when (pos? remaining-ms) + (js/setTimeout #(poll! (- remaining-ms 100)) 100))))] + (poll! 500))) + (defn > (dom/sel ".block-add-button") - (filter #(= (str (:db/id page)) (dom/attr % "parentblockid"))) - first)] - (.click block-add-button))) - 200))) + (click-page-add-button-with-retry! (:db/id page)))) page))))))))) ;; favorite fns