From e12a42eb4989f6581738cad67e752c5ea4fa300c Mon Sep 17 00:00:00 2001
From: rcmerci <rcmerci@gmail.com>
Date: Thu, 6 Nov 2025 22:04:18 +0800
Subject: [PATCH] feat(rtc,e2ee): add e2ee settings

---
 deps/shui/src/logseq/shui/hooks.cljs       |  25 +++++
 src/main/frontend/components/settings.cljs | 104 +++++++++++++++------
 src/main/frontend/handler/user.cljs        |   3 +-
 src/main/frontend/rum.cljs                 |  28 +-----
 src/main/frontend/worker/rtc/crypt.cljs    |  24 +++--
 5 files changed, 120 insertions(+), 64 deletions(-)

diff --git a/deps/shui/src/logseq/shui/hooks.cljs b/deps/shui/src/logseq/shui/hooks.cljs
index 3d386b2a4f..5a3989753d 100644
--- a/deps/shui/src/logseq/shui/hooks.cljs
+++ b/deps/shui/src/logseq/shui/hooks.cljs
@@ -132,3 +132,28 @@
      :onMouseUp #(clear % true)
      :onMouseLeave #(clear % false)
      :onTouchEnd #(clear % true)}))
+
+(defn- use-atom-fn
+  [a getter-fn setter-fn]
+  (let [[val set-val] (use-state (getter-fn @a))]
+    (use-effect!
+     (fn []
+       (let [id (str (random-uuid))]
+         (add-watch a id (fn [_ _ prev-state next-state]
+                           (let [prev-value (getter-fn prev-state)
+                                 next-value (getter-fn next-state)]
+                             (when-not (= prev-value next-value)
+                               (set-val next-value)))))
+         #(remove-watch a id)))
+     [])
+    [val #(swap! a setter-fn %)]))
+
+(defn use-atom
+  "(use-atom my-atom)"
+  [a]
+  (use-atom-fn a identity (fn [_ v] v)))
+
+(defn use-atom-in
+  [a ks]
+  (let [ks (if (keyword? ks) [ks] ks)]
+    (use-atom-fn a #(get-in % ks) (fn [a' v] (assoc-in a' ks v)))))
diff --git a/src/main/frontend/components/settings.cljs b/src/main/frontend/components/settings.cljs
index e092f25a27..cb0177ca2d 100644
--- a/src/main/frontend/components/settings.cljs
+++ b/src/main/frontend/components/settings.cljs
@@ -1161,38 +1161,80 @@
 
   [:<>])
 
-(rum/defcs settings-collaboration < rum/reactive
-  (rum/local "" ::invite-email)
-  {:will-mount (fn [state]
-                 (rtc-handler/<rtc-get-users-info)
-                 state)}
-  [state]
-  (let [*invite-email (::invite-email state)
+(rum/defc settings-rtc-members
+  []
+  (let [[invite-email set-invite-email!] (hooks/use-state "")
         current-repo (state/get-current-repo)
-        users (get (state/sub :rtc/users-info) current-repo)]
-    [:div.panel-wrap.is-collaboration.mb-8
-     [:div.flex.flex-col.gap-2.mt-4
-      [:h2.opacity-50.font-medium "Members:"]
-      [:div.users.flex.flex-col.gap-1
-       (for [{user-name :user/name
-              user-email :user/email
-              graph<->user-user-type :graph<->user/user-type} users]
-         [:div.flex.flex-row.items-center.gap-2 {:key (str "user-" user-name)}
-          [:div user-name]
-          (when user-email [:div.opacity-50.text-sm user-email])
-          (when graph<->user-user-type [:div.opacity-50.text-sm (name graph<->user-user-type)])])]
-      [:div.flex.flex-col.gap-4.mt-4
-       (shui/input
-        {:placeholder   "Email address"
-         :on-change     #(reset! *invite-email (util/evalue %))})
-       (shui/button
-        {:on-click (fn []
-                     (let [user-email @*invite-email
-                           graph-uuid (ldb/get-graph-rtc-uuid (db/get-db))]
-                       (when-not (string/blank? user-email)
-                         (when graph-uuid
-                           (rtc-handler/<rtc-invite-email graph-uuid user-email)))))}
-        "Invite")]]]))
+        [users-info] (hooks/use-atom (:rtc/users-info @state/state))
+        users (get users-info current-repo)]
+    (hooks/use-effect!
+     #(c.m/run-task* (m/sp (c.m/<? (rtc-handler/<rtc-get-users-info))))
+     [])
+    [:div.flex.flex-col.gap-2.mt-4
+     [:h2.opacity-50.font-medium "Members:"]
+     [:div.users.flex.flex-col.gap-1
+      (for [{user-name :user/name
+             user-email :user/email
+             graph<->user-user-type :graph<->user/user-type} users]
+        [:div.flex.flex-row.items-center.gap-2 {:key (str "user-" user-name)}
+         [:div user-name]
+         (when user-email [:div.opacity-50.text-sm user-email])
+         (when graph<->user-user-type [:div.opacity-50.text-sm (name graph<->user-user-type)])])]
+     [:div.flex.flex-col.gap-4.mt-4
+      (shui/input
+       {:placeholder   "Email address"
+        :on-change     #(set-invite-email! (util/evalue %))})
+      (shui/button
+       {:on-click (fn []
+                    (let [user-email invite-email
+                          graph-uuid (ldb/get-graph-rtc-uuid (db/get-db))]
+                      (when-not (string/blank? user-email)
+                        (when graph-uuid
+                          (rtc-handler/<rtc-invite-email graph-uuid user-email)))))}
+       "Invite")]]))
+
+(rum/defc settings-rtc-e2ee
+  []
+  (let [user-uuid (user-handler/user-uuid)
+        token (state/get-auth-id-token)
+        [rsa-key-pair set-rsa-key-pair!] (hooks/use-state :not-inited)
+        [init-key-err set-init-key-err!] (hooks/use-state nil)
+        [get-key-err set-get-key-err!] (hooks/use-state nil)]
+    (hooks/use-effect!
+     (fn []
+       (when (and user-uuid token)
+         (-> (p/let [r (state/<invoke-db-worker :thread-api/get-user-rsa-key-pair token user-uuid)]
+               (set-rsa-key-pair! r))
+             (p/catch set-get-key-err!))))
+     [user-uuid token])
+    [:div.flex.flex-col.gap-2.mt-4
+     [:h2.opacity-50.font-medium "E2EE Settings:"]
+     (when (and user-uuid token)
+       (cond
+         get-key-err
+         [:p (str "Fetching user rsa-key-pair err: " get-key-err)]
+         (= rsa-key-pair :not-inited)
+         [:p "Fetching user rsa-key-pair..."]
+         (nil? rsa-key-pair)
+         [:div
+          (when init-key-err [:p (str "Init key-pair err:" init-key-err)])
+          (shui/button
+           {:on-click (fn []
+                        (-> (p/let [key-pair (state/<invoke-db-worker :thread-api/init-user-rsa-key-pair
+                                                                      ;; :thread-api/force-reset-user-rsa-key-pair
+                                                                      token user-uuid)]
+                              (set-rsa-key-pair! key-pair))
+                            (p/catch set-init-key-err!)))}
+           "Init E2EE encrypt-key-pair")]
+         rsa-key-pair
+         [:p "E2EE key-pair already generated!"]))]))
+
+(rum/defc settings-collaboration
+  []
+  [:div.panel-wrap.is-collaboration.mb-8
+   (settings-rtc-members)
+   [:br]
+   (settings-rtc-e2ee)])
 
 (rum/defc mcp-server-row
   [t]
diff --git a/src/main/frontend/handler/user.cljs b/src/main/frontend/handler/user.cljs
index d2713f164b..7799011d6c 100644
--- a/src/main/frontend/handler/user.cljs
+++ b/src/main/frontend/handler/user.cljs
@@ -119,8 +119,7 @@
       (let [refresh-token (js/localStorage.getItem refresh-token-key)]
         (when (and refresh-token (not= refresh-token "undefined"))
           (state/set-auth-refresh-token refresh-token)
-          (js/localStorage.setItem "refresh-token" refresh-token)))))
-  )
+          (js/localStorage.setItem "refresh-token" refresh-token))))))
 
 (defn- clear-tokens
   ([]
diff --git a/src/main/frontend/rum.cljs b/src/main/frontend/rum.cljs
index ca79f07187..91f94c29ee 100644
--- a/src/main/frontend/rum.cljs
+++ b/src/main/frontend/rum.cljs
@@ -6,7 +6,7 @@
             [clojure.walk :as w]
             [daiquiri.interpreter :as interpreter]
             [logseq.shui.hooks :as hooks]
-            [rum.core :refer [use-state] :as rum]))
+            [rum.core :as rum]))
 
 ;; copy from https://github.com/priornix/antizer/blob/35ba264cf48b84e6597743e28b3570d8aa473e74/src/antizer/core.cljs
 
@@ -66,30 +66,8 @@
               (bean/->js (map-keys->camel-case new-options :html-props true))
               new-children)))))
 
-(defn use-atom-fn
-  [a getter-fn setter-fn]
-  (let [[val set-val] (use-state (getter-fn @a))]
-    (hooks/use-effect!
-     (fn []
-       (let [id (str (random-uuid))]
-         (add-watch a id (fn [_ _ prev-state next-state]
-                           (let [prev-value (getter-fn prev-state)
-                                 next-value (getter-fn next-state)]
-                             (when-not (= prev-value next-value)
-                               (set-val next-value)))))
-         #(remove-watch a id)))
-     [])
-    [val #(swap! a setter-fn %)]))
-
-(defn use-atom
-  "(use-atom my-atom)"
-  [a]
-  (use-atom-fn a identity (fn [_ v] v)))
-
-(defn use-atom-in
-  [a ks]
-  (let [ks (if (keyword? ks) [ks] ks)]
-    (use-atom-fn a #(get-in % ks) (fn [a' v] (assoc-in a' ks v)))))
+(def use-atom hooks/use-atom)
+(def use-atom-in hooks/use-atom-in)
 
 (defn use-mounted
   []
diff --git a/src/main/frontend/worker/rtc/crypt.cljs b/src/main/frontend/worker/rtc/crypt.cljs
index ccc53c2678..783cf1e30b 100644
--- a/src/main/frontend/worker/rtc/crypt.cljs
+++ b/src/main/frontend/worker/rtc/crypt.cljs
@@ -118,15 +118,13 @@
   []
   (m/sp (c.m/<? (crypt/<generate-aes-key))))
 
-(defn task--get-rsa-key-pair
+(defn task--get-decrypted-rsa-key-pair
   [get-ws-create-task user-uuid]
   (m/sp
     (let [{:keys [public-key encrypted-private-key]}
           (m/? (task--fetch-user-rsa-key-pair get-ws-create-task user-uuid))
-          _ (prn :xxxxx1)
           exported-private-key (c.m/<? (worker-state/<invoke-main-thread
                                         :thread-api/decrypt-user-e2ee-private-key encrypted-private-key))
-          _ (prn :xxxxx2)
           private-key (c.m/<? (crypt/<import-private-key exported-private-key))]
       {:public-key public-key
        :private-key private-key})))
@@ -134,13 +132,27 @@
 (defn task--get-aes-key
   [get-ws-create-task user-uuid graph-uuid]
   (m/sp
-    (let [{:keys [_public-key private-key]} (m/? (task--get-rsa-key-pair get-ws-create-task user-uuid))]
+    (let [{:keys [_public-key private-key]} (m/? (task--get-decrypted-rsa-key-pair get-ws-create-task user-uuid))]
       (m/? (task--fetch-graph-aes-key get-ws-create-task graph-uuid private-key)))))
 
 (def-thread-api :thread-api/get-user-rsa-key-pair-from-indexeddb
   [user-uuid]
   (<get-item (user-rsa-key-pair-idb-key user-uuid)))
 
+(def-thread-api :thread-api/get-user-rsa-key-pair
+  [token user-uuid]
+  (m/sp
+    (let [{:keys [get-ws-create-task]} (ws-util/gen-get-ws-create-map--memoized (ws-util/get-ws-url token))
+          {:keys [public-key encrypted-private-key]}
+          (m/? (task--fetch-user-rsa-key-pair get-ws-create-task user-uuid))]
+      {:public-key (c.m/<? (crypt/<export-public-key public-key))
+       :encrypted-private-key encrypted-private-key})))
+
+(def-thread-api :thread-api/throw-ex-test
+  []
+  (m/sp
+    (throw (ex-info "throw test" {}))))
+
 (def-thread-api :thread-api/init-user-rsa-key-pair
   [token user-uuid]
   (m/sp
@@ -151,7 +163,7 @@
                 {:keys [password]} (c.m/<? (worker-state/<invoke-main-thread :thread-api/request-e2ee-password))
                 encrypted-private-key (c.m/<? (crypt/<encrypt-private-key password privateKey))]
             (m/? (task--upload-user-rsa-key-pair get-ws-create-task user-uuid publicKey encrypted-private-key))
-            ;; fetch again
+           ;; fetch again
             (c.m/<? (<remove-item! (user-rsa-key-pair-idb-key user-uuid)))
             (m/? (task--fetch-user-rsa-key-pair get-ws-create-task user-uuid))
             (c.m/<? (<get-item (user-rsa-key-pair-idb-key user-uuid))))))
@@ -168,7 +180,7 @@
             encrypted-private-key (c.m/<? (crypt/<encrypt-private-key password privateKey))]
         (m/? (task--upload-user-rsa-key-pair get-ws-create-task user-uuid publicKey encrypted-private-key
                                              :force-reset true))
-        ;; fetch again
+       ;; fetch again
         (c.m/<? (<remove-item! (user-rsa-key-pair-idb-key user-uuid)))
         (m/? (task--fetch-user-rsa-key-pair get-ws-create-task user-uuid))
         (c.m/<? (<get-item (user-rsa-key-pair-idb-key user-uuid))))