From b08860bf3b821310ff89e8006c7011a8db4116d0 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Wed, 7 Jan 2026 18:05:05 +0800 Subject: [PATCH] fix: http api --- deps/worker-sync/src/logseq/worker_sync/worker.cljs | 9 ++++++--- src/main/frontend/handler/db_based/worker_sync.cljs | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deps/worker-sync/src/logseq/worker_sync/worker.cljs b/deps/worker-sync/src/logseq/worker_sync/worker.cljs index 9d3f5d450d..e93056013a 100644 --- a/deps/worker-sync/src/logseq/worker_sync/worker.cljs +++ b/deps/worker-sync/src/logseq/worker_sync/worker.cljs @@ -2,7 +2,6 @@ (:require ["cloudflare:workers" :refer [DurableObject]] [clojure.string :as string] [datascript.core :as d] - [datascript.impl.entity :as de :refer [Entity]] [lambdaisland.glogi :as log] [logseq.common.config :as common-config] [logseq.common.util :as common-util] @@ -36,12 +35,16 @@ (string/starts-with? path "/sync/") (let [prefix (count "/sync/") - graph-id (subs path prefix)] + rest-path (subs path prefix) + slash-idx (string/index-of rest-path "/") + graph-id (if (neg? slash-idx) rest-path (subs rest-path 0 slash-idx)) + tail (if (neg? slash-idx) "/" (subs rest-path slash-idx)) + new-url (str (.-origin url) tail (.-search url))] (if (seq graph-id) (let [^js namespace (.-LOGSEQ_SYNC_DO env) do-id (.idFromName namespace graph-id) stub (.get namespace do-id) - rewritten (js/Request. url request)] + rewritten (js/Request. new-url request)] (.fetch stub rewritten)) (common/bad-request "missing graph id"))) diff --git a/src/main/frontend/handler/db_based/worker_sync.cljs b/src/main/frontend/handler/db_based/worker_sync.cljs index 18c447e373..7b1d4f99ad 100644 --- a/src/main/frontend/handler/db_based/worker_sync.cljs +++ b/src/main/frontend/handler/db_based/worker_sync.cljs @@ -102,8 +102,8 @@ graphs (js->clj (aget resp "graphs") :keywordize-keys true) result (mapv (fn [graph] (merge - {:url (str config/db-version-prefix (:graph_name graph)) - :GraphName (:graph_name graph) + {:url (:graph_name graph) + :GraphName (string/replace (:graph_name graph) config/db-version-prefix "") :GraphSchemaVersion (:schema_version graph) :GraphUUID (:graph_id graph) :rtc-graph? true}