fix(gateway): cap node reconnect wait timers

steipete · steipete · commit 7d71c5d0c62f · 2026-05-30T04:11:02.000-04:00
diff --git a/src/gateway/server-methods/nodes.invoke-wake.test.ts b/src/gateway/server-methods/nodes.invoke-wake.test.ts
@@ -1,10 +1,12 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { ErrorCodes } from "../../../packages/gateway-protocol/src/index.js";
+import { MAX_TIMER_TIMEOUT_MS } from "../../shared/number-coercion.js";
 import {
   clearNodeWakeState,
   maybeSendNodeWakeNudge,
   maybeWakeNodeWithApns,
   nodeHandlers,
+  waitForNodeReconnect,
 } from "./nodes.js";
 
 type MockNodeCommandPolicyParams = {
@@ -630,6 +632,25 @@ describe("node.invoke APNs wake path", () => {
     expectRecordFields(call[1], "respond payload", { ok: true, nodeId: "ios-node-reconnect" });
   });
 
+  it("caps oversized reconnect wait timers", async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(0);
+    const nodeRegistry = {
+      get: vi.fn(() => undefined),
+    };
+
+    const reconnectPromise = waitForNodeReconnect({
+      nodeId: "ios-node-never-reconnects",
+      context: { nodeRegistry },
+      timeoutMs: Number.MAX_SAFE_INTEGER,
+      pollMs: Number.MAX_SAFE_INTEGER,
+    });
+
+    await vi.advanceTimersByTimeAsync(MAX_TIMER_TIMEOUT_MS);
+    await expect(reconnectPromise).resolves.toBe(false);
+    expect(nodeRegistry.get).toHaveBeenCalledWith("ios-node-never-reconnects");
+  });
+
   it("broadcasts canonical Talk capture events for successful PTT node commands", async () => {
     const respond = vi.fn();
     const broadcast = vi.fn();
diff --git a/src/gateway/server-methods/nodes.ts b/src/gateway/server-methods/nodes.ts
@@ -38,6 +38,7 @@ import {
   resolveApnsAuthConfigFromEnv,
   resolveApnsRelayConfigFromEnv,
 } from "../../infra/push-apns.js";
+import { resolveTimerTimeoutMs } from "../../shared/number-coercion.js";
 import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalString,
@@ -672,8 +673,8 @@ export async function waitForNodeReconnect(params: {
   timeoutMs?: number;
   pollMs?: number;
 }): Promise<boolean> {
-  const timeoutMs = Math.max(250, params.timeoutMs ?? NODE_WAKE_RECONNECT_WAIT_MS);
-  const pollMs = Math.max(50, params.pollMs ?? NODE_WAKE_RECONNECT_POLL_MS);
+  const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, NODE_WAKE_RECONNECT_WAIT_MS, 250);
+  const pollMs = resolveTimerTimeoutMs(params.pollMs, NODE_WAKE_RECONNECT_POLL_MS, 50);
   const deadline = Date.now() + timeoutMs;
 
   while (Date.now() < deadline) {
