From 9f7599b9fd1cb11d7977abe0e1c400a8bb0a1ce0 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sun, 10 Dec 2023 19:45:03 +0800 Subject: [PATCH] fix: sqlite wasm path on Electron --- src/main/frontend/db_worker.cljs | 7 +++++-- src/main/frontend/persist_db/browser.cljs | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/frontend/db_worker.cljs b/src/main/frontend/db_worker.cljs index b893fbdad6..e7676f53a1 100644 --- a/src/main/frontend/db_worker.cljs +++ b/src/main/frontend/db_worker.cljs @@ -34,8 +34,11 @@ (defn- init-sqlite-module! [] (when-not @*sqlite - (p/let [base-url (str js/self.location.protocol "//" js/self.location.host) - sqlite-wasm-url (str base-url "/js/") + (p/let [electron? (string/includes? (.. js/location -href) "electron=true") + base-url (str js/self.location.protocol "//" js/self.location.host) + sqlite-wasm-url (if electron? + (js/URL. "sqlite3.wasm" (.. js/location -href)) + (str base-url "/js/")) sqlite (sqlite3InitModule (clj->js {:url sqlite-wasm-url :print js/console.log :printErr js/console.error}))] diff --git a/src/main/frontend/persist_db/browser.cljs b/src/main/frontend/persist_db/browser.cljs index 7e17ba63de..db04e4a19e 100644 --- a/src/main/frontend/persist_db/browser.cljs +++ b/src/main/frontend/persist_db/browser.cljs @@ -20,7 +20,7 @@ (let [worker-url (if (util/electron?) "js/db-worker.js" "/static/js/db-worker.js") - worker (js/Worker. worker-url) + worker (js/Worker. (str worker-url "?electron=" (util/electron?))) sqlite (Comlink/wrap worker)] (reset! *sqlite sqlite) (p/let [opfs-supported? (.supportOPFS sqlite)]