fix: reuse core.async promise-chan to await transact

Because the worker db may not be updated from thread-api calls.

Author: tiensonqin

src/main/frontend/common/async_util.cljc

@@ -6,16 +6,14 @@
                      [logseq.common.util :as common-util]
                      [promesa.core :as p])))
 
-(comment
-  #?(:cljs
-     (defn throw-err
-       [v]
-       (if (instance? ExceptionInfo v) (throw v) v))))
+#?(:cljs
+   (defn throw-err
+     [v]
+     (if (instance? ExceptionInfo v) (throw v) v)))
 
-(comment
-  (defmacro <?
-    [port]
-    `(throw-err (cljs.core.async/<! ~port))))
+(defmacro <?
+  [port]
+  `(throw-err (cljs.core.async/<! ~port)))
 
 #?(:cljs
    (defn c->p

src/main/frontend/db/transact.cljs

@@ -1,40 +1,51 @@
 (ns frontend.db.transact
   "Provides async transact for use with ldb/transact!"
-  (:require [promesa.core :as p]))
+  (:require [clojure.core.async :as async]
+            [clojure.core.async.interop :refer [p->c]]
+            [frontend.common.async-util :include-macros true :refer [<?]]
+            [frontend.state :as state]
+            [frontend.util :as util]
+            [lambdaisland.glogi :as log]
+            [logseq.outliner.op :as outliner-op]
+            [promesa.core :as p]))
 
-(defonce *request-id (atom 0))
-
-(defonce *db-transact-requests (atom {}))
-
-(defn get-next-request-id
-  []
-  (swap! *request-id inc))
-
-(defn get-resp
-  [request-id]
-  (get @*db-transact-requests request-id))
-
-(defn remove-request!
-  [request-id]
-  (swap! *db-transact-requests dissoc request-id))
-
-(defn add-request!
-  [request-id request-f]
-  (->
-   (let [ui-db-transacted-promise (p/deferred)]
-     (swap! *db-transact-requests assoc request-id ui-db-transacted-promise)
-     (p/let [reply (request-f)]
-       ui-db-transacted-promise
-       reply))
-   (p/finally
-     (fn []
-       (remove-request! request-id)))))
+(defn worker-call
+  [request-f]
+  (let [response (p/deferred)]
+    (async/go
+      (let [result (<? (p->c (request-f)))]
+        (if (:ex-data result)
+          (do
+            (log/error :worker-request-failed result)
+            (p/reject! response result))
+          (p/resolve! response result))))
+    response))
 
 (defn transact [worker-transact repo tx-data tx-meta]
-  (let [request-id (get-next-request-id)
-        tx-meta' (assoc tx-meta
-                        :request-id request-id
+  (let [tx-meta' (assoc tx-meta
                         ;; not from remote (rtc)
                         :local-tx? true)]
-    (add-request! request-id (fn async-request []
-                               (worker-transact repo tx-data tx-meta')))))
+    (prn :debug :transact :tx-meta tx-meta)
+    (worker-call (fn async-request []
+                   (worker-transact repo tx-data tx-meta')))))
+
+(defn apply-outliner-ops
+  [conn ops opts]
+  (when (seq ops)
+    (if util/node-test?
+      (outliner-op/apply-ops! (state/get-current-repo)
+                              conn
+                              ops
+                              (state/get-date-formatter)
+                              opts)
+      (let [opts' (assoc opts
+                         :client-id (:client-id @state/state)
+                         :local-tx? true)
+            request #(frontend.state/<invoke-db-worker
+                      :thread-api/apply-outliner-ops
+                      (frontend.state/get-current-repo)
+                      ops
+                      opts')]
+        (prn :debug :apply-outliner-ops :opts opts'
+             :ops ops)
+        (frontend.db.transact/worker-call request)))))

src/main/frontend/modules/outliner/pipeline.cljs

@@ -27,9 +27,8 @@
           (state/set-edit-content! new-title))))))
 
 (defn invoke-hooks
-  [{:keys [request-id repo tx-meta tx-data deleted-block-uuids deleted-assets affected-keys blocks]}]
+  [{:keys [repo tx-meta tx-data deleted-block-uuids deleted-assets affected-keys blocks]}]
   ;; (prn :debug
-  ;;      :request-id request-id
   ;;      :tx-meta tx-meta
   ;;      ;; :tx-data tx-data
   ;;      )
@@ -82,9 +81,6 @@
             (when-not (= (:client-id tx-meta) (:client-id @state/state))
               (update-editing-block-title-if-changed! tx-data))
 
-            (when-let [resp (db-transact/get-resp request-id)]
-              (p/resolve! resp true))
-
             (when (seq deleted-assets)
               (doseq [asset deleted-assets]
                 (fs/unlink! repo (path/path-join (config/get-current-repo-assets-root) (str (:block/uuid asset) "." (:ext asset))) {})))

src/main/frontend/modules/outliner/ui.cljc

@@ -22,22 +22,7 @@
             ;;  (prn :ops r#)
             ;;  (js/console.trace)
             ;;  (js/console.groupEnd)
-           (if test?#
-             (when (seq r#)
-               (logseq.outliner.op/apply-ops! (frontend.state/get-current-repo)
-                                              (frontend.db.conn/get-db false)
-                                              r#
-                                              (frontend.state/get-date-formatter)
-                                              ~opts))
-             (when (seq r#)
-               (let [request-id# (frontend.db.transact/get-next-request-id)
-                     request# #(frontend.state/<invoke-db-worker
-                                :thread-api/apply-outliner-ops
-                                (frontend.state/get-current-repo)
-                                r#
-                                (assoc ~opts
-                                       :request-id request-id#
-                                       :client-id (:client-id @frontend.state/state)
-                                       :local-tx? true))
-                     response# (frontend.db.transact/add-request! request-id# request#)]
-                 response#))))))))
+           (frontend.db.transact/apply-outliner-ops
+            (frontend.db.conn/get-db false)
+            r#
+            ~opts))))))