clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-23 12:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(rtc,e2ee): remove deprecated ns

Browse Source
This commit is contained in:
rcmerci
2025-11-10 17:25:40 +08:00
committed by Tienson Qin
parent ebdad4666b
commit 2c272cdef8
2 changed files with 0 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
src/main/frontend/worker/device.cljs
View File

@@ -1,224 +0,0 @@
(ns frontend.worker.device
"Each device is assigned an id, and has some metadata(e.g. public&private-key for each device)"
(:require ["/frontend/idbkv" :as idb-keyval]
[cljs-time.coerce :as tc]
[cljs-time.core :as t]
[clojure.string :as string]
[frontend.common.missionary :as c.m]
[frontend.common.thread-api :refer [def-thread-api]]
[frontend.worker.crypt :as crypt]
[frontend.worker.rtc.client-op :as client-op]
[frontend.worker.rtc.ws-util :as ws-util]
[frontend.worker.state :as worker-state]
[goog.crypt.base64 :as base64]
[logseq.db :as ldb]
[missionary.core :as m]
[promesa.core :as p]))
;;; TODO: move frontend.idb to deps/, then we can use it in both frontend and db-worker
;;; now, I just direct use "/frontend/idbkv" here
(defonce ^:private store (delay (idb-keyval/newStore "localforage" "keyvaluepairs" 2)))
(defn- <get-item
[key']
(when (and key' @store)
(idb-keyval/get key' @store)))
(defn- <set-item!
[key' value]
(when (and key' @store)
(idb-keyval/set key' value @store)))
(defn- <remove-item!
[key']
(idb-keyval/del key' @store))
(def ^:private item-key-device-id "device-id")
(def ^:private item-key-device-name "device-name")
(def ^:private item-key-device-created-at "device-created-at")
(def ^:private item-key-device-updated-at "device-updated-at")
(def ^:private item-key-device-public-key-jwk "device-public-key-jwk")
(def ^:private item-key-device-private-key-jwk "device-private-key-jwk")
(defonce *device-id (atom nil :validator uuid?))
(defonce *device-name (atom nil))
(defonce *device-public-key (atom nil :validator #(instance? js/CryptoKey %)))
(defonce *device-private-key (atom nil :validator #(instance? js/CryptoKey %)))
(defn- new-task--get-user-devices
[get-ws-create-task]
(m/join :devices (ws-util/send&recv get-ws-create-task {:action "get-user-devices"})))
(defn- new-task--add-user-device
[get-ws-create-task device-name]
(m/join :device (ws-util/send&recv get-ws-create-task {:action "add-user-device"
:device-name device-name})))
(defn- new-task--remove-user-device*
[get-ws-create-task device-uuid]
(ws-util/send&recv get-ws-create-task {:action "remove-user-device"
:device-uuid device-uuid}))
(comment
(defn- new-task--update-user-device-name
[get-ws-create-task device-uuid device-name]
(ws-util/send&recv get-ws-create-task {:action "update-user-device-name"
:device-uuid device-uuid
:device-name device-name})))
(defn- new-task--add-device-public-key
[get-ws-create-task device-uuid key-name public-key-jwk]
(ws-util/send&recv get-ws-create-task {:action "add-device-public-key"
:device-uuid device-uuid
:key-name key-name
:public-key (ldb/write-transit-str public-key-jwk)}))
(defn- new-task--remove-device-public-key*
[get-ws-create-task device-uuid key-name]
(ws-util/send&recv get-ws-create-task {:action "remove-device-public-key"
:device-uuid device-uuid
:key-name key-name}))
(defn- new-task--sync-encrypted-aes-key*
[get-ws-create-task device-uuid->encrypted-aes-key graph-uuid]
(ws-util/send&recv get-ws-create-task
{:action "sync-encrypted-aes-key"
:device-uuid->encrypted-aes-key device-uuid->encrypted-aes-key
:graph-uuid graph-uuid}))
(defn- new-get-ws-create-task
[token]
(:get-ws-create-task (ws-util/gen-get-ws-create-map--memoized (ws-util/get-ws-url token))))
(defn new-task--ensure-device-metadata!
"Generate new device items if not exists.
Store in indexeddb.
Import to `*device-id`, `*device-public-key`, `*device-private-key`"
[token]
(m/sp
(let [device-uuid (c.m/<? (<get-item item-key-device-id))]
(when-not device-uuid
(let [get-ws-create-task (new-get-ws-create-task token)
agent-data (js->clj (some-> js/navigator.userAgentData .toJSON) :keywordize-keys true)
generated-device-name (string/join
"-"
[(:platform agent-data)
(when (:mobile agent-data) "mobile")
(:brand (first (:brands agent-data)))
(tc/to-epoch (t/now))])
{:keys [device-id device-name created-at updated-at]}
(m/? (new-task--add-user-device get-ws-create-task generated-device-name))
{:keys [publicKey privateKey]} (c.m/<? (crypt/<gen-key-pair))
public-key-jwk (c.m/<? (crypt/<export-key publicKey))
private-key-jwk (c.m/<? (crypt/<export-key privateKey))]
(c.m/<? (<set-item! item-key-device-id (str device-id)))
(c.m/<? (<set-item! item-key-device-name device-name))
(c.m/<? (<set-item! item-key-device-created-at created-at))
(c.m/<? (<set-item! item-key-device-updated-at updated-at))
(c.m/<? (<set-item! item-key-device-public-key-jwk public-key-jwk))
(c.m/<? (<set-item! item-key-device-private-key-jwk private-key-jwk))
(m/? (new-task--add-device-public-key
get-ws-create-task device-id "default-public-key" public-key-jwk))))
(c.m/<?
(p/let [device-uuid-str (<get-item item-key-device-id)
device-name (<get-item item-key-device-name)
device-public-key-jwk (<get-item item-key-device-public-key-jwk)
device-public-key (crypt/<import-public-key device-public-key-jwk)
device-private-key-jwk (<get-item item-key-device-private-key-jwk)
device-private-key (crypt/<import-private-key device-private-key-jwk)]
(reset! *device-id (uuid device-uuid-str))
(reset! *device-name device-name)
(reset! *device-public-key device-public-key)
(reset! *device-private-key device-private-key))))))
(defn new-task--list-devices
"Return device list.
Also sync local device metadata to remote if not exists in remote side"
[token]
(m/sp
(let [get-ws-create-task (new-get-ws-create-task token)
devices (m/? (new-task--get-user-devices get-ws-create-task))]
(when
;; check current device has been synced to remote
;; if not exists in remote, remove local-metadata and recreate in local and remote
(and @*device-id @*device-name @*device-public-key
(not (some
(fn [device]
(let [{:keys [device-id]} device]
(when (= device-id (str @*device-id))
true)))
devices)))
(c.m/<? (<remove-item! item-key-device-id))
(c.m/<? (<remove-item! item-key-device-name))
(c.m/<? (<remove-item! item-key-device-created-at))
(c.m/<? (<remove-item! item-key-device-updated-at))
(c.m/<? (<remove-item! item-key-device-public-key-jwk))
(c.m/<? (<remove-item! item-key-device-private-key-jwk))
(m/? (new-task--ensure-device-metadata! token)))
devices)))
(defn new-task--remove-device-public-key
[token device-uuid key-name]
(assert (some? key-name))
(m/sp
(when-let [device-uuid* (cond-> device-uuid (string? device-uuid) parse-uuid)]
(let [get-ws-create-task (new-get-ws-create-task token)]
(m/? (new-task--remove-device-public-key* get-ws-create-task device-uuid* key-name))))))
(defn new-task--remove-device
[token device-uuid]
(m/sp
(when-let [device-uuid* (cond-> device-uuid (string? device-uuid) parse-uuid)]
(let [get-ws-create-task (new-get-ws-create-task token)]
(m/? (new-task--remove-user-device* get-ws-create-task device-uuid*))))))
(defn new-task--sync-current-graph-encrypted-aes-key
[token device-uuids]
(let [repo (worker-state/get-current-repo)]
(assert (and (seq device-uuids) (every? uuid? device-uuids)) device-uuids)
(m/sp
(when-let [graph-uuid (client-op/get-graph-uuid repo)]
(when-let [{:keys [aes-key-jwk]} (crypt/get-graph-keys-jwk repo)]
(let [device-uuids (set device-uuids)
get-ws-create-task (new-get-ws-create-task token)
devices (m/? (new-task--get-user-devices get-ws-create-task))]
(when-let [devices* (not-empty
(filter
(fn [device]
(and (contains? device-uuids (uuid (:device-id device)))
(some? (get-in device [:keys :default-public-key]))))
devices))]
(let [device-uuid->encrypted-aes-key
(m/?
(apply m/join (fn [& x] (into {} x))
(map (fn [device]
(m/sp
(let [device-public-key
(c.m/<?
(crypt/<import-public-key
(clj->js
(ldb/read-transit-str
(get-in device [:keys :default-public-key :public-key])))))]
[(uuid (:device-id device))
(base64/encodeByteArray
(js/Uint8Array.
(c.m/<? (crypt/<rsa-encrypt aes-key-jwk device-public-key))))])))
devices*)))]
(m/? (new-task--sync-encrypted-aes-key*
get-ws-create-task device-uuid->encrypted-aes-key graph-uuid))))))))))
(def-thread-api :thread-api/rtc-sync-current-graph-encrypted-aes-key
[token device-uuids]
(new-task--sync-current-graph-encrypted-aes-key token device-uuids))
(def-thread-api :thread-api/list-devices
[token]
(new-task--list-devices token))
(def-thread-api :thread-api/remove-device-public-key
[token device-uuid key-name]
(new-task--remove-device-public-key token device-uuid key-name))
(def-thread-api :thread-api/remove-device
[token device-uuid]
(new-task--remove-device token device-uuid))

3
src/main/frontend/worker/rtc/core.cljs
View File

@@ -5,7 +5,6 @@
[frontend.common.missionary :as c.m]
[frontend.common.thread-api :refer [def-thread-api]]
[frontend.worker-common.util :as worker-util]
[frontend.worker.device :as worker-device]
[frontend.worker.rtc.asset :as r.asset]
[frontend.worker.rtc.branch-graph :as r.branch-graph]
[frontend.worker.rtc.client :as r.client]
@@ -356,8 +355,6 @@
(defn- new-task--rtc-start*
[repo token]
(m/sp
;; ensure device metadata existing first
(m/? (worker-device/new-task--ensure-device-metadata! token))
(let [{:keys [conn user-uuid graph-uuid schema-version remote-schema-version date-formatter] :as r}
(validate-rtc-start-conditions repo token)]
(if (instance? ExceptionInfo r)