fix: make maxReconnectAttempts opt-in, fix test hello-ok response shape

stellamariesays · stellamariesays · commit b3385ff8c15c · 2026-05-05T16:54:26.000Z
Address ClawSweeper review feedback:
- P2: Make reconnect cap opt-in via maxReconnectAttempts option.
  Undefined = unlimited, preserving node-host unbounded retry behavior.
- P3: Fix reset test to send proper type:"res" with payload.type:"hello-ok"
  instead of type:"connect" so handleMessage actually processes it.
diff --git a/src/gateway/client.test.ts b/src/gateway/client.test.ts
@@ -1011,6 +1011,7 @@ describe("GatewayClient connect auth payload", () => {
       const onReconnectPaused = vi.fn();
       const client = new GatewayClient({
         url: "ws://127.0.0.1:18789",
+        maxReconnectAttempts: 30,
         onReconnectPaused,
       });
 
@@ -1056,6 +1057,7 @@ describe("GatewayClient connect auth payload", () => {
       const onReconnectPaused = vi.fn();
       const client = new GatewayClient({
         url: "ws://127.0.0.1:18789",
+        maxReconnectAttempts: 10,
         onReconnectPaused,
       });
 
@@ -1071,17 +1073,19 @@ describe("GatewayClient connect auth payload", () => {
       // Now succeed — complete the handshake
       const goodWs = getLatestWs();
       goodWs.emitOpen();
+      // Find the connect frame the client sent so we can reply with its id
+      const lastSent = goodWs.sent.at(-1);
+      const connectFrameId = lastSent ? JSON.parse(lastSent).id : "unknown";
       goodWs.emitMessage(
         JSON.stringify({
-          type: "connect",
-          id: "handshake-1",
+          type: "res",
+          id: connectFrameId,
           ok: true,
-          result: {
-            hello: {
-              sessionId: "test-session",
-              protocol: 1,
-              policy: { tickIntervalMs: 30000 },
-            },
+          payload: {
+            type: "hello-ok",
+            sessionId: "test-session",
+            protocol: 1,
+            policy: { tickIntervalMs: 30000 },
           },
         }),
       );
diff --git a/src/gateway/client.ts b/src/gateway/client.ts
@@ -160,6 +160,8 @@ export type GatewayClientOptions = {
   onConnectError?: (err: Error) => void;
   onReconnectPaused?: (info: GatewayReconnectPausedInfo) => void;
   onClose?: (code: number, reason: string) => void;
+  /** Maximum reconnect attempts before pausing. Undefined = unlimited (node-host default). */
+  maxReconnectAttempts?: number;
   onGap?: (info: { expected: number; received: number }) => void;
 };
 
@@ -925,18 +927,17 @@ export class GatewayClient {
     }, connectChallengeTimeoutMs);
   }
 
-  private static readonly MAX_RECONNECT_ATTEMPTS = 30;
-
   private scheduleReconnect() {
     if (this.closed) {
       return;
     }
-    if (this.reconnectAttempts >= GatewayClient.MAX_RECONNECT_ATTEMPTS) {
+    const maxAttempts = this.opts.maxReconnectAttempts;
+    if (maxAttempts != null && this.reconnectAttempts >= maxAttempts) {
       logDebug(`gateway reconnect giving up after ${this.reconnectAttempts} attempts`);
       this.closed = true;
       this.opts.onReconnectPaused?.({
         code: -1,
-        reason: `max reconnect attempts reached (${GatewayClient.MAX_RECONNECT_ATTEMPTS})`,
+        reason: `max reconnect attempts reached (${maxAttempts})`,
         detailCode: null,
       });
       return;
