From e58b3739b3d938ae9df887baf527cfb935be82c9 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 4 Feb 2026 15:21:36 +0700
Subject: [PATCH] Fix relay transport e2e ping/pong

---
 .../server/daemon-e2e/relay-transport.e2e.test.ts    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts b/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
index 30837c251..e72cbaf36 100644
--- a/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts
@@ -126,15 +126,19 @@ describe("Relay transport (E2EE) - daemon E2E", () => {
                 daemonPublicKeyB64,
                 {
                   onmessage: (data) => {
-                    clearTimeout(timeout);
                     try {
                       const payload =
                         typeof data === "string" ? JSON.parse(data) : data;
-                      resolve(payload);
+                      // The daemon may send an initial `server_info` status message
+                      // immediately upon connect; ignore everything until we see `pong`.
+                      if (payload && typeof payload === "object" && (payload as any).type === "pong") {
+                        clearTimeout(timeout);
+                        resolve(payload);
+                        ws.close();
+                      }
                     } catch (err) {
+                      clearTimeout(timeout);
                       reject(err);
-                    } finally {
-                      ws.close();
                     }
                   },
                   onerror: (err) => {