refactor: migrate from clientSessionKey to clientId identity

packages/app/src/utils/test-daemon-connection.ts

@@ -1,10 +1,9 @@
 import { DaemonClient } from "@server/client/daemon-client";
 import type { DaemonClientConfig } from "@server/client/daemon-client";
-import { parseServerInfoStatusPayload } from "@server/shared/messages";
 import type { HostConnection } from "@/contexts/daemon-registry-context";
 import { buildDaemonWebSocketUrl, buildRelayWebSocketUrl } from "./daemon-endpoints";
 import { createTauriWebSocketTransportFactory } from "./tauri-daemon-transport";
-function createProbeClientSessionKey(): string {
+function createProbeClientId(): string {
   const randomUuid = (() => {
     const cryptoObj = globalThis.crypto as { randomUUID?: () => string } | undefined;
     if (cryptoObj && typeof cryptoObj.randomUUID === "function") {
@@ -12,7 +11,7 @@ function createProbeClientSessionKey(): string {
     }
     return `${Date.now().toString(36)}${Math.random().toString(36).slice(2)}`;
   })();
-  return `clsk_probe_${randomUuid}`;
+  return `cid_probe_${randomUuid}`;
 }
 
 function normalizeNonEmptyString(value: unknown): string | null {
@@ -55,10 +54,11 @@ async function buildClientConfig(
   connection: HostConnection,
   serverId?: string
 ): Promise<DaemonClientConfig> {
-  const clientSessionKey = createProbeClientSessionKey();
+  const clientId = createProbeClientId();
   const tauriTransportFactory = createTauriWebSocketTransportFactory();
   const base = {
-    clientSessionKey,
+    clientId,
+    clientType: "mobile" as const,
     suppressSendErrors: true,
     ...(tauriTransportFactory ? { transportFactory: tauriTransportFactory } : {}),
   };
@@ -66,7 +66,7 @@ async function buildClientConfig(
   if (connection.type === "direct") {
     return {
       ...base,
-      url: buildDaemonWebSocketUrl(connection.endpoint, { clientSessionKey }),
+      url: buildDaemonWebSocketUrl(connection.endpoint),
     };
   }
 
@@ -79,7 +79,6 @@ async function buildClientConfig(
     url: buildRelayWebSocketUrl({
       endpoint: connection.relayEndpoint,
       serverId,
-      clientSessionKey,
     }),
     e2ee: { enabled: true, daemonPublicKeyB64: connection.daemonPublicKeyB64 },
   };
@@ -92,35 +91,9 @@ function connectAndProbe(
   const client = new DaemonClient(config);
 
   return new Promise<{ client: DaemonClient; serverId: string; hostname: string | null }>((resolve, reject) => {
-    let cleanedUp = false;
-    let unsubscribe: (() => void) | null = null;
-    let unsubscribeStatus: (() => void) | null = null;
-    let serverId: string | null = null;
-    let hostname: string | null = null;
-
-    const cleanup = () => {
-      if (cleanedUp) return;
-      cleanedUp = true;
-      clearTimeout(timer);
-      unsubscribe?.();
-      unsubscribeStatus?.();
-    };
-
-    const maybeFinishOk = () => {
-      if (!serverId) return;
-      cleanup();
-      resolve({ client, serverId, hostname });
-    };
-
-    const finishErr = (error: Error) => {
-      if (cleanedUp) return;
-      cleanup();
-      client.close().catch(() => undefined);
-      reject(error);
-    };
-
     const timer = setTimeout(() => {
-      finishErr(
+      void client.close().catch(() => undefined);
+      reject(
         new DaemonConnectionTestError("Connection timed out", {
           reason: "Connection timed out",
           lastError: client.lastError ?? null,
@@ -128,25 +101,32 @@ function connectAndProbe(
       );
     }, timeoutMs);
 
-    unsubscribe = client.subscribeConnectionStatus((state) => {
-      if (state.status === "disconnected") {
-        const reason = normalizeNonEmptyString(state.reason);
-        const lastError = normalizeNonEmptyString(client.lastError);
-        const message = pickBestReason(reason, lastError);
-        finishErr(new DaemonConnectionTestError(message, { reason, lastError }));
+    void client.connect().then(() => {
+      clearTimeout(timer);
+      const welcome = client.getLastWelcomeMessage();
+      if (!welcome) {
+        void client.close().catch(() => undefined);
+        reject(
+          new DaemonConnectionTestError("Missing welcome message", {
+            reason: "Missing welcome message",
+            lastError: client.lastError ?? null,
+          })
+        );
+        return;
       }
+      resolve({
+        client,
+        serverId: welcome.serverId,
+        hostname: welcome.hostname,
+      });
+    }).catch((error) => {
+      clearTimeout(timer);
+      const reason = normalizeNonEmptyString(error instanceof Error ? error.message : String(error));
+      const lastError = normalizeNonEmptyString(client.lastError);
+      const message = pickBestReason(reason, lastError);
+      void client.close().catch(() => undefined);
+      reject(new DaemonConnectionTestError(message, { reason, lastError }));
     });
-
-    unsubscribeStatus = client.on("status", (message) => {
-      if (message.type !== "status") return;
-      const payload = parseServerInfoStatusPayload(message.payload);
-      if (!payload) return;
-      serverId = payload.serverId;
-      hostname = payload.hostname;
-      maybeFinishOk();
-    });
-
-    void client.connect().catch(() => undefined);
   });
 }