clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 02:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(rtc): generate salt and encrypt-key when create-db-graph

Browse Source
This commit is contained in:
rcmerci
2025-09-21 00:24:43 +08:00
committed by Tienson Qin
parent b3c20056a7
commit b2f314556a
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/frontend/worker/db_worker.cljs
View File

@@ -30,6 +30,7 @@
[frontend.worker.rtc.client-op :as client-op]
[frontend.worker.rtc.core :as rtc.core]
[frontend.worker.rtc.db-listener]
[frontend.worker.rtc.encrypt :as rtc-encrypt]
[frontend.worker.rtc.migrate :as rtc-migrate]
[frontend.worker.search :as search]
[frontend.worker.shared-service :as shared-service]
@@ -260,8 +261,8 @@
(ldb/transact! datascript-conn [{:db/ident :logseq.kv/graph-last-gc-at
:kv/value (common-util/time-ms)}]))))
(defn- create-or-open-db!
[repo {:keys [config datoms] :as opts}]
(defn- <create-or-open-db!
[repo {:keys [config datoms rtc-e2ee-password] :as opts}]
(when-not (worker-state/get-sqlite-conn repo)
(p/let [[db search-db client-ops-db :as dbs] (get-dbs repo)
storage (new-sqlite-storage db)
@@ -301,15 +302,12 @@
initial-data (sqlite-create-graph/build-db-initial-data
config (select-keys opts [:import-type :graph-git-sha]))]
(ldb/transact! conn initial-data {:initial-db? true})))
(let [migration-result (db-migrate/migrate conn)]
(when (client-op/rtc-db-graph? repo)
(let [client-ops (rtc-migrate/migration-results=>client-ops migration-result)]
(client-op/add-ops! repo client-ops))))
(gc-sqlite-dbs! db client-ops-db conn {})
(let [migration-result (db-migrate/migrate conn)]
(when (client-op/rtc-db-graph? repo)
(let [client-ops (rtc-migrate/migration-results=>client-ops migration-result)]
(client-op/add-ops! repo client-ops))))
(db-listener/listen-db-changes! repo (get @*datascript-conns repo))))))
(db-listener/listen-db-changes! repo (get @*datascript-conns repo)))))))
(defn- iter->vec [iter']
(when iter'
@@ -414,7 +412,7 @@
(when close-other-db?
(close-other-dbs! repo))
(when @shared-service/*master-client?
(create-or-open-db! repo (dissoc opts :close-other-db?)))
(<create-or-open-db! repo (dissoc opts :close-other-db?)))
nil))
(def-thread-api :thread-api/create-or-open-db