fix(gateway): cap pre-hello normal-close suppression

ruanrrn · ruanrrn · commit 60bef44484b0 · 2026-04-27T21:35:49.000+08:00
diff --git a/src/gateway/client.test.ts b/src/gateway/client.test.ts
@@ -595,6 +595,48 @@ describe("GatewayClient reconnect behavior", () => {
       vi.useRealTimers();
     }
   });
+
+  it("emits a failure signal after repeated pre-hello 1000 closes", async () => {
+    vi.useFakeTimers();
+    const onClose = vi.fn();
+    const onConnectError = vi.fn();
+    const client = new GatewayClient({
+      url: "ws://127.0.0.1:18789",
+      onClose,
+      onConnectError,
+    });
+
+    try {
+      (client as unknown as { backoffMs: number }).backoffMs = 1;
+      client.start();
+
+      for (let attempt = 1; attempt <= 4; attempt += 1) {
+        const ws = getLatestWs();
+        ws.emitOpen();
+        ws.emitMessage(
+          JSON.stringify({
+            type: "event",
+            event: "connect.challenge",
+            payload: { nonce: `nonce-${attempt}` },
+          }),
+        );
+        ws.emitClose(1000, "");
+
+        // Allow the reconnect timer to schedule the next socket.
+        await vi.advanceTimersByTimeAsync(30_000);
+      }
+
+      for (let i = 0; i < 5; i += 1) {
+        await Promise.resolve();
+      }
+
+      expect(onConnectError).toHaveBeenCalled();
+      expect(onClose).toHaveBeenCalledWith(1000, "");
+    } finally {
+      client.stop();
+      vi.useRealTimers();
+    }
+  });
 });
 
 describe("GatewayClient connect auth payload", () => {
diff --git a/src/gateway/client.ts b/src/gateway/client.ts
@@ -180,6 +180,7 @@ export function resolveGatewayClientConnectChallengeTimeoutMs(
 
 const FORCE_STOP_TERMINATE_GRACE_MS = 250;
 const STOP_AND_WAIT_TIMEOUT_MS = 1_000;
+const MAX_TRANSIENT_PREHELLO_NORMAL_CLOSES = 3;
 
 type PendingStop = {
   ws: WebSocket;
@@ -202,7 +203,9 @@ export class GatewayClient {
   private deviceTokenRetryBudgetUsed = false;
   private pendingConnectErrorDetailCode: string | null = null;
   private helloOkReceived = false;
-  private suppressNextConnectError = false;
+  private connectAttempt = 0;
+  private suppressConnectErrorAttempts = new Set<number>();
+  private transientPrehelloNormalCloseCount = 0;
   // Track last tick to detect silent stalls.
   private lastTick: number | null = null;
   private tickIntervalMs = 30_000;
@@ -313,9 +316,19 @@ export class GatewayClient {
     ws.on("message", (data) => this.handleMessage(rawDataToString(data)));
     ws.on("close", (code, reason) => {
       const reasonText = rawDataToString(reason);
-      const isTransientPrehelloNormalClose =
+      const isPrehelloNormalCloseCandidate =
         !this.closed && !this.helloOkReceived && code === 1000 && reasonText.trim().length === 0;
-      this.suppressNextConnectError = isTransientPrehelloNormalClose;
+      if (isPrehelloNormalCloseCandidate) {
+        this.transientPrehelloNormalCloseCount += 1;
+      } else {
+        this.transientPrehelloNormalCloseCount = 0;
+      }
+      const isTransientPrehelloNormalClose =
+        isPrehelloNormalCloseCandidate &&
+        this.transientPrehelloNormalCloseCount <= MAX_TRANSIENT_PREHELLO_NORMAL_CLOSES;
+      if (isTransientPrehelloNormalClose && this.connectSent) {
+        this.suppressConnectErrorAttempts.add(this.connectAttempt);
+      }
 
       const connectErrorDetailCode = this.pendingConnectErrorDetailCode;
       this.pendingConnectErrorDetailCode = null;
@@ -405,6 +418,8 @@ export class GatewayClient {
 
   private beginStop(): Promise<void> | null {
     this.closed = true;
+    this.suppressConnectErrorAttempts.clear();
+    this.transientPrehelloNormalCloseCount = 0;
     this.pendingDeviceTokenRetry = false;
     this.deviceTokenRetryBudgetUsed = false;
     this.pendingConnectErrorDetailCode = null;
@@ -550,10 +565,13 @@ export class GatewayClient {
       device,
     };
 
+    const connectAttempt = this.connectAttempt;
+
     void this.request<HelloOk>("connect", params)
       .then((helloOk) => {
         this.helloOkReceived = true;
-        this.suppressNextConnectError = false;
+        this.suppressConnectErrorAttempts.clear();
+        this.transientPrehelloNormalCloseCount = 0;
         this.pendingDeviceTokenRetry = false;
         this.deviceTokenRetryBudgetUsed = false;
         this.pendingConnectErrorDetailCode = null;
@@ -576,8 +594,7 @@ export class GatewayClient {
         this.opts.onHelloOk?.(helloOk);
       })
       .catch((err) => {
-        if (this.suppressNextConnectError) {
-          this.suppressNextConnectError = false;
+        if (this.suppressConnectErrorAttempts.delete(connectAttempt)) {
           return;
         }
         this.pendingConnectErrorDetailCode =
@@ -830,8 +847,8 @@ export class GatewayClient {
   }
 
   private beginPreauthHandshake() {
+    this.connectAttempt += 1;
     this.helloOkReceived = false;
-    this.suppressNextConnectError = false;
     if (this.connectSent) {
       return;
     }
