test(rtc): update basic-edits-test

1. start rtc on repo
2. wait for client-ops synced

src/main/frontend/worker/rtc/core.cljs

@@ -211,8 +211,7 @@
         (let [user-uuid (:sub (worker-util/parse-jwt token))
               config (worker-state/get-config repo)
               date-formatter (common-config/get-date-formatter config)
-              {:keys [rtc-state-flow *rtc-auto-push? rtc-loop-task *online-users]
-               onstarted-task :onstarted-task}
+              {:keys [rtc-state-flow *rtc-auto-push? rtc-loop-task *online-users onstarted-task]}
               (create-rtc-loop graph-uuid repo conn date-formatter token)
               canceler (c.m/run-task rtc-loop-task :rtc-loop-task)
               start-ex (m/? onstarted-task)]

src/main/frontend/worker/rtc/log_and_state.cljs

@@ -6,6 +6,7 @@
             [missionary.core :as m]))
 
 (def ^:private *rtc-log (atom nil))
+(def rtc-log-flow (m/watch *rtc-log))
 
 (sr/defkeyword :rtc.log/upload
   "rtc log type for upload-graph.")

src/rtc_e2e_test/basic_edits_test.cljs

@@ -4,9 +4,12 @@
             [datascript.core :as d]
             [fixture]
             [frontend.worker.rtc.client-op :as client-op]
+            [frontend.worker.rtc.core :as rtc-core]
+            [frontend.worker.rtc.log-and-state :as rtc-log-and-state]
             [helper]
             [logseq.outliner.batch-tx :as batch-tx]
-            [meander.epsilon :as me]))
+            [meander.epsilon :as me]
+            [missionary.core :as m]))
 
 (t/use-fixtures :once
   fixture/install-some-consts
@@ -19,46 +22,69 @@
   #_:clj-kondo/ignore
   (me/find
    client-op
-    [?op-type _t {:block-uuid ?block-uuid :av-coll [[!a !v _t !add] ...]}]
+    [?op-type _ {:block-uuid ?block-uuid :av-coll [[!a !v _ !add] ...]}]
     [?op-type ?block-uuid (map vector !a !v !add)]
 
-    [?op-type _t {:block-uuid ?block-uuid}]
+    [?op-type _ {:block-uuid ?block-uuid}]
     [?op-type ?block-uuid]))
 
+(def ^:private page-uuid1 (random-uuid))
+(def ^:private block-uuid1 (random-uuid))
+
+(def ^:private tx-data-map
+  {:create-page
+   [{:db/id "page"
+     :block/name "basic-edits-test"
+     :block/title "basic-edits-test"
+     :block/uuid page-uuid1
+     :block/created-at 1724836490809
+     :block/updated-at 1724836490809
+     :block/type "page"
+     :block/format :markdown}
+    {:block/uuid block-uuid1
+     :block/updated-at 1724836490810
+     :block/created-at 1724836490810
+     :block/format :markdown
+     :block/title "block1"
+     :block/parent "page"
+     :block/order "a0"
+     :block/page "page"}]})
+
 (deftest basic-edits-test
-  (let [conn1 (helper/get-downloaded-test-conn)
-        conn2 (helper/get-downloaded-test-conn2)
-        [page-uuid1 block-uuid1] (repeatedly random-uuid)]
-    (testing "create page first"
-      (let [tx-data [{:db/id "page"
-                      :block/name "basic-edits-test"
-                      :block/title "basic-edits-test"
-                      :block/uuid page-uuid1
-                      :block/created-at 1724836490809
-                      :block/updated-at 1724836490809
-                      :block/type "page"
-                      :block/format :markdown}
-                     {:block/uuid block-uuid1
-                      :block/updated-at 1724836490810
-                      :block/created-at 1724836490810
-                      :block/format :markdown
-                      :block/title "block1"
-                      :block/parent "page"
-                      :block/order "a0"
-                      :block/page "page"}]]
-        (batch-tx/with-batch-tx-mode conn1 {:e2e-test const/downloaded-test-repo}
-          (d/transact! conn1 tx-data))
+  (let [conn1 (helper/get-downloaded-test-conn)]
+    (t/async
+     done
+     (js/Promise.
+      (m/sp
+        (testing "create page first"
+          (let [tx-data (tx-data-map :create-page)]
+            (batch-tx/with-batch-tx-mode conn1 {:e2e-test const/downloaded-test-repo}
+              (d/transact! conn1 tx-data))
+
+            (is (=
+                 #{[:update-page page-uuid1]
+                   [:update page-uuid1
+                    [[:block/title "[\"~#'\",\"basic-edits-test\"]" true]
+                     [:block/created-at "[\"~#'\",1724836490809]" true]
+                     [:block/updated-at "[\"~#'\",1724836490809]" true]
+                     [:block/type "[\"~#'\",\"page\"]" true]]]
+                   [:move block-uuid1]
+                   [:update block-uuid1
+                    [[:block/updated-at "[\"~#'\",1724836490810]" true]
+                     [:block/created-at "[\"~#'\",1724836490810]" true]
+                     [:block/title "[\"~#'\",\"block1\"]" true]]]}
+                 (set (map simplify-client-op (client-op/get-all-ops const/downloaded-test-repo)))))))
+
+        (testing "start rtc on repo"
+          (let [r (m/? (rtc-core/new-task--rtc-start const/downloaded-test-repo const/test-token))]
+            (is (nil? r))))
+        (testing "waiting for :create-page synced"
+          (let [r (m/? (m/timeout
+                        (m/reduce (fn [_ v]
+                                    (when (= :rtc.log/push-local-update (:type v))
+                                      (reduced v)))
+                                  rtc-log-and-state/rtc-log-flow)
+                        6000 :timeout))]
+            (is (not= :timeout r))))
 
-        (is (=
-             #{[:update-page page-uuid1]
-               [:update page-uuid1
-                [[:block/title "[\"~#'\",\"basic-edits-test\"]" true]
-                 [:block/created-at "[\"~#'\",1724836490809]" true]
-                 [:block/updated-at "[\"~#'\",1724836490809]" true]
-                 [:block/type "[\"~#'\",\"page\"]" true]]]
-               [:move block-uuid1]
-               [:update block-uuid1
-                [[:block/updated-at "[\"~#'\",1724836490810]" true]
-                 [:block/created-at "[\"~#'\",1724836490810]" true]
-                 [:block/title "[\"~#'\",\"block1\"]" true]]]}
-             (set (map simplify-client-op (client-op/get-all-ops const/downloaded-test-repo)))))))))
+        (done))))))