fix: can't export db on browser

Author: tiensonqin

AGENTS.md

@@ -46,3 +46,4 @@
 - New properties should be added to `logseq.db.frontend.property/built-in-properties`.
 - Avoid creating new class or property unless you have to.
 - Avoid shadow var, e.g. `bytes` should be named as `payload`.
+- Avoid using `js/Buffer` in browser related code.

src/main/frontend/persist_db/browser.cljs

@@ -226,7 +226,7 @@
 
   (<import-db [_this repo data]
     (->
-     (p/let [base64 (util/unit8array-to-base64string data)]
+     (p/let [base64 (util/uint8array-to-base64string data)]
        (state/<invoke-db-worker :thread-api/import-db-base64 repo base64))
      (p/catch (fn [error]
                 (log/error :import-db-error repo error "SQLiteDB import error")

src/main/frontend/persist_db/remote.cljs

@@ -178,7 +178,7 @@
 
   (<import-db [_this repo data]
     (->
-     (p/let [base64 (util/unit8array-to-base64string data)]
+     (p/let [base64 (util/uint8array-to-base64string data)]
        (invoke! client "thread-api/import-db-base64" [repo base64]))
      (p/catch (fn [error]
                 (log/error :import-db-error repo error "SQLiteDB import error")

src/main/frontend/util.cljc

@@ -105,23 +105,7 @@
 #?(:cljs (defonce convert-to-letters utils/convertToLetters))
 #?(:cljs (defonce hsl2hex utils/hsl2hex))
 #?(:cljs (defonce base64string-to-unit8array utils/base64ToUint8Array))
-#?(:cljs
-   (defn unit8array-to-base64string
-     [payload]
-     (when payload
-       (let [buffer (cond
-                      (instance? js/Buffer payload)
-                      payload
-
-                      (instance? js/Uint8Array payload)
-                      (js/Buffer.from payload)
-
-                      (instance? js/ArrayBuffer payload)
-                      (js/Buffer.from payload)
-
-                      :else
-                      (js/Buffer.from payload))]
-         (.toString buffer "base64")))))
+#?(:cljs (defonce uint8array-to-base64string utils/uint8ArrayToBase64))
 
 #?(:cljs (def string-join-path common-util/string-join-path))
 

src/main/frontend/utils.js

@@ -514,3 +514,17 @@ export function base64ToUint8Array (base64String) {
     return null
   }
 }
+
+export function uint8ArrayToBase64 (uint8Array) {
+  try {
+    let binary = ''
+    const len = uint8Array.byteLength
+    for (let i = 0; i < len; i++) {
+      binary += String.fromCharCode(uint8Array[i])
+    }
+    return btoa(binary)
+  } catch (e) {
+    console.error('Error converting Uint8Array to base64:', e)
+    return null
+  }
+}

src/main/frontend/worker/db_core.cljs

@@ -891,10 +891,7 @@
     (checkpoint-db! repo db))
   (p/let [data (<export-db-file repo)]
     (when data
-      (let [buffer (if (instance? js/Buffer data)
-                     data
-                     (js/Buffer.from data))]
-        (.toString buffer "base64")))))
+      (worker-util/uint8array-to-base64string data))))
 
 (def-thread-api :thread-api/export-client-ops-db-base64
   [repo]
@@ -914,10 +911,7 @@
                       (str "client-ops-" repo-path)]]
     (p/let [payload (<export-db-file-with-paths repo export-paths)]
       (when payload
-        (let [buffer (if (instance? js/Buffer payload)
-                       payload
-                       (js/Buffer.from payload))]
-          (.toString buffer "base64"))))))
+        (worker-util/uint8array-to-base64string payload)))))
 
 (def-thread-api :thread-api/backup-db-sqlite
   [repo dst-path]
@@ -939,7 +933,7 @@
   [repo base64]
   (when-not (string/blank? repo)
     (p/let [pool (<get-opfs-pool repo)
-            data (require-sqlite-payload repo (js/Buffer.from base64 "base64"))
+            data (require-sqlite-payload repo (worker-util/base64string-to-unit8array base64))
             _ (close-db! repo)
             _ (<import-db pool data)
             _ (start-db! repo {:import-type :sqlite-db})]

src/main/frontend/worker_common/util.cljc

@@ -31,6 +31,30 @@
 
 #?(:cljs
    (do
+     (defn uint8array-to-base64string
+       [payload]
+       (when payload
+         (try
+           (let [binary (apply str (map #(char %) payload))]
+             (base64/encodeString binary false))
+           (catch :default e
+             (js/console.error "Error converting Uint8Array to base64:" e)
+             nil))))
+
+     (defn base64string-to-unit8array
+       [base64-string]
+       (when base64-string
+         (try
+           (let [binary (base64/decodeString base64-string true)
+                 len (.-length binary)
+                 arr (new js/Uint8Array len)]
+             (doseq [i (range len)]
+               (aset arr i (.charCodeAt binary i)))
+             arr)
+           (catch :default e
+             (js/console.error "Error converting base64 to Uint8Array:" e)
+             nil))))
+
      (defn post-message
        [type data & {:keys [port]}]
        (when-let [worker (or port (when (exists? js/self) js/self))]