fix: db worker doesn't need to wait for plugin initialization

Author: tiensonqin

src/main/frontend/core.cljs

@@ -88,8 +88,7 @@
 
   ;; (setup-entity-profile!)
   (log/info ::init "App started")
-  (plugin-handler/setup!
-   #(handler/start! start)))
+  (handler/start! start))
 
 (defn ^:export stop []
   ;; stop is called before any code is reloaded

src/main/frontend/handler.cljs

@@ -25,6 +25,7 @@
             [frontend.handler.global-config :as global-config-handler]
             [frontend.handler.notification :as notification]
             [frontend.handler.page :as page-handler]
+            [frontend.handler.plugin :as plugin-handler]
             [frontend.handler.plugin-config :as plugin-config-handler]
             [frontend.handler.repo :as repo-handler]
             [frontend.handler.repo-config :as repo-config-handler]
@@ -137,65 +138,67 @@
 
 (defn start!
   [render]
-
-  (idb/start)
-  (get-system-info)
-  (set-global-error-notification!)
-
-  (register-components-fns!)
-  (user-handler/restore-tokens-from-localstorage)
-  (user.login/setup-configure!)
-  (state/set-db-restoring! true)
-  (when (util/electron?)
-    (el/listen!))
-  (render)
-  (i18n/start)
-  (instrument/init)
-
-  (-> (util/indexeddb-check?)
-      (p/catch (fn [_e]
-                 (notification/show! "Sorry, it seems that your browser doesn't support IndexedDB, we recommend to use latest Chrome(Chromium) or Firefox(Non-private mode)." :error false)
-                 (state/set-indexedb-support! false))))
-
-  (react/run-custom-queries-when-idle!)
-
-  (events/run!)
-
-  (log/info ::start-web-worker {})
-
-  (p/do!
-   (-> (p/let [_ (db-browser/start-db-worker!)
-               repos (repo-handler/get-repos)
-               _ (state/set-repos! repos)
-               _ (mobile-util/hide-splash) ;; hide splash as early as ui is stable
-               repo (or (state/get-current-repo) (:url (first repos)))
-               _ (if (empty? repos)
-                   (repo-handler/new-db! config/demo-repo)
-                   (restore-and-setup! repo))]
-         (set-network-watcher!)
-
-         (when (util/electron?)
-           (persist-db/run-export-periodically!))
-         (when (mobile-util/native-platform?)
-           (state/restore-mobile-theme!)))
-       (p/catch (fn [e]
-                  (js/console.error "Error while restoring repos: " e)))
-       (p/finally (fn []
-                    (state/set-db-restoring! false)
-                    (p/resolve! state/app-ready-promise true)
-                    (when-not (util/mobile?)
-                      (p/let [webgpu-available? (db-browser/<check-webgpu-available?)]
-                        (log/info :webgpu-available? webgpu-available?)
-                        (when webgpu-available?
-                          (p/do! (db-browser/start-inference-worker!)
-                                 (db-browser/<connect-db-worker-and-infer-worker!)
-                                 (reset! vector-search-flows/*infer-worker-ready true))))
-                      nil))))
-
-   (util/<app-wake-up-from-sleep-loop (atom false))
-
-   (when-not (util/mobile?)
-     (persist-var/load-vars))))
+  (let [t1 (util/time-ms)]
+    (p/do!
+     (idb/start)
+     (plugin-handler/setup!)
+     (render))
+
+    (get-system-info)
+    (set-global-error-notification!)
+
+    (register-components-fns!)
+    (user-handler/restore-tokens-from-localstorage)
+    (user.login/setup-configure!)
+    (state/set-db-restoring! true)
+    (when (util/electron?)
+      (el/listen!))
+
+    (i18n/start)
+    (instrument/init)
+
+    (react/run-custom-queries-when-idle!)
+
+    (events/run!)
+
+    (log/info ::start-web-worker {})
+
+    (p/do!
+     (-> (p/let [t2 (util/time-ms)
+                 _ (db-browser/start-db-worker!)
+                 _ (log/info ::db-worker-spent-time (- (util/time-ms) t2))
+                 repos (repo-handler/get-repos)
+                 _ (state/set-repos! repos)
+                 _ (mobile-util/hide-splash) ;; hide splash as early as ui is stable
+                 repo (or (state/get-current-repo) (:url (first repos)))
+                 _ (if (empty? repos)
+                     (repo-handler/new-db! config/demo-repo)
+                     (restore-and-setup! repo))]
+           (set-network-watcher!)
+
+           (when (util/electron?)
+             (persist-db/run-export-periodically!))
+           (when (mobile-util/native-platform?)
+             (state/restore-mobile-theme!)))
+         (p/catch (fn [e]
+                    (js/console.error "Error while restoring repos: " e)))
+         (p/finally (fn []
+                      (state/set-db-restoring! false)
+                      (p/resolve! state/app-ready-promise true)
+                      (log/info ::app-init-spent-time (- (util/time-ms) t1))
+                      (when-not (util/mobile?)
+                        ;; (p/let [webgpu-available? (db-browser/<check-webgpu-available?)]
+                        ;;   (log/info :webgpu-available? webgpu-available?)
+                        ;;   (when webgpu-available?
+                        ;;     (p/do! (db-browser/start-inference-worker!)
+                        ;;            (db-browser/<connect-db-worker-and-infer-worker!)
+                        ;;            (reset! vector-search-flows/*infer-worker-ready true))))
+                        nil))))
+
+     (util/<app-wake-up-from-sleep-loop (atom false))
+
+     (when-not (util/mobile?)
+       (persist-var/load-vars)))))
 
 (defn stop! []
   (prn "stop!"))

src/main/frontend/handler/plugin.cljs

@@ -829,7 +829,7 @@
          (str text)]]])))
 
 (defn ^:large-vars/cleanup-todo init-plugins!
-  [callback]
+  []
 
   (let [el (js/document.createElement "div")]
     (.appendChild js/document.body el)
@@ -951,7 +951,7 @@
          (state/set-state! :plugin/indicator-text true)
           ;; wait for the plugin register async messages
          (js/setTimeout
-          (fn [] (callback)
+          (fn []
             (some-> (seq plugins-async)
                     (p/delay 16)
                     (p/then #(.register js/LSPluginCore (bean/->js plugins-async) true))))
@@ -963,13 +963,10 @@
 
 (defn setup!
   "setup plugin core handler"
-  [callback]
-  (if (not config/lsp-enabled?)
-    (callback)
-    (do
-      (idb/start)
-      (setup-global-apis-for-web!)
-      (init-plugins! callback))))
+  []
+  (when (and config/lsp-enabled? (not (util/mobile?)))
+    (setup-global-apis-for-web!)
+    (init-plugins!)))
 
 (comment
   {:pending (count (:plugin/updates-pending @state/state))

src/main/frontend/persist_db/browser.cljs

@@ -142,7 +142,7 @@
        (reset! state/*db-worker wrapped-worker)
        (-> (p/let [_ (state/<invoke-db-worker :thread-api/init config/RTC-WS-URL)
                    _ (sync-app-state!)
-                   _ (log/debug "init worker spent" (str (- (util/time-ms) t1) "ms"))
+                   _ (log/info "init worker spent" (str (- (util/time-ms) t1) "ms"))
                    _ (sync-ui-state!)
                    _ (ask-persist-permission!)
                    _ (state/pub-event! [:graph/sync-context])]