Merge origin/main into daemon-server-id-host-selection

2026-02-04 15:19:06 +07:00
parent 8152deb206 6aff4b3f10
commit 1039171167
44 changed files with 1664 additions and 569 deletions
@@ -9,7 +9,14 @@ function runDaemonRequest(label: string, promise: Promise<unknown>): void {
  });
 }

-export function useDaemonClient(url: string): DaemonClient {
+type DaemonClientOptions = {
+  daemonPublicKeyB64?: string;
+};
+
+export function useDaemonClient(
+  url: string,
+  options: DaemonClientOptions = {}
+): DaemonClient {
  const client = useMemo(
    () => {
      const tauriTransportFactory = createTauriWebSocketTransportFactory();
@@ -19,9 +26,15 @@ export function useDaemonClient(url: string): DaemonClient {
        ...(tauriTransportFactory
          ? { transportFactory: tauriTransportFactory }
          : {}),
+        e2ee: options.daemonPublicKeyB64
+          ? {
+              enabled: true,
+              daemonPublicKeyB64: options.daemonPublicKeyB64,
+            }
+          : undefined,
      });
    },
-    [url]
+    [options.daemonPublicKeyB64, url]
  );

  useEffect(() => {