fix(feishu): pass timeoutMs through app-registration guarded fetch

hugenshen · hugenshen · commit 3ec4fce6a90e · 2026-07-14T22:49:01.000+08:00
diff --git a/extensions/feishu/src/app-registration.test.ts b/extensions/feishu/src/app-registration.test.ts
@@ -7,6 +7,7 @@ import { withFetchPreconnect } from "openclaw/plugin-sdk/test-env";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   beginAppRegistration,
+  FEISHU_APP_REGISTRATION_TIMEOUT_MS,
   type FeishuAppRegistrationFetch,
   pollAppRegistration,
   printQrCode,
@@ -254,6 +255,40 @@ describe("Feishu app registration", () => {
     expect(writeSpy).toHaveBeenCalledWith("terminal-qr\n");
   });
 
+  it("times out registration POSTs when accounts never return headers", async () => {
+    expect(FEISHU_APP_REGISTRATION_TIMEOUT_MS).toBe(10_000);
+    await withRegistrationServer(
+      // Accept TCP but never write headers — idle body timers never start.
+      (_req, _res) => {},
+      async (options) => {
+        const started = Date.now();
+        const outcome = await beginAppRegistration("feishu", {
+          ...options,
+          // Stand-in for FEISHU_APP_REGISTRATION_TIMEOUT_MS; keep the suite fast.
+          timeoutMs: 80,
+        }).then(
+          (value) => ({ ok: true as const, value }),
+          (error: unknown) => ({ ok: false as const, error }),
+        );
+        const elapsedMs = Date.now() - started;
+        expect(outcome.ok).toBe(false);
+        if (!outcome.ok) {
+          expect(outcome.error).toMatchObject({
+            name: "TimeoutError",
+            message: "request timed out",
+          });
+        }
+        expect(elapsedMs).toBeGreaterThanOrEqual(60);
+        expect(elapsedMs).toBeLessThan(2_000);
+        console.log(
+          `[feishu fetchFeishuJson hang proof] timed_out=${!outcome.ok} name=${
+            outcome.ok ? "n/a" : (outcome.error as Error).name
+          } elapsed_ms=${elapsedMs} production_timeout_ms=${FEISHU_APP_REGISTRATION_TIMEOUT_MS}`,
+        );
+      },
+    );
+  });
+
   // over-cap: body > 16 MiB, no Content-Length. The bounded reader cancels
   // through the real SSRF guard and rejects before full buffering.
   it("rejects Feishu API responses that exceed the 16 MiB JSON body cap", async () => {
diff --git a/extensions/feishu/src/app-registration.ts b/extensions/feishu/src/app-registration.ts
@@ -22,7 +22,8 @@ const LARK_ACCOUNTS_URL = "https://accounts.larksuite.com";
 
 const REGISTRATION_PATH = "/oauth/v1/app/registration";
 
-const REQUEST_TIMEOUT_MS = 10_000;
+/** Wizard/onboarding hang floor for registration guarded fetches (not FEISHU_HTTP_TIMEOUT_MS). */
+export const FEISHU_APP_REGISTRATION_TIMEOUT_MS = 10_000;
 const DEFAULT_REGISTRATION_POLL_INTERVAL_SECONDS = 5;
 const DEFAULT_REGISTRATION_EXPIRE_SECONDS = 600;
 
@@ -57,6 +58,8 @@ type FeishuAppRegistrationFetchOptions = {
   fetchImpl?: FeishuAppRegistrationFetch;
   /** Override hostname lookup for hermetic SSRF-guard tests. */
   lookupFn?: LookupFn;
+  /** Override the guarded-fetch hang floor (defaults to FEISHU_APP_REGISTRATION_TIMEOUT_MS). */
+  timeoutMs?: number;
 };
 
 interface RawBeginResponse {
@@ -105,11 +108,11 @@ async function postRegistration<T>(
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body: new URLSearchParams(body).toString(),
-      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
     },
     auditContext: "feishu.app-registration.post",
     fetchImpl: options?.fetchImpl,
     lookupFn: options?.lookupFn,
+    timeoutMs: options?.timeoutMs,
   });
 }
 
@@ -119,12 +122,18 @@ async function fetchFeishuJson<T>(params: {
   auditContext: string;
   fetchImpl?: FeishuAppRegistrationFetch;
   lookupFn?: LookupFn;
+  timeoutMs?: number;
 }): Promise<T> {
+  // Mirror streaming-card: pass timeoutMs into fetchWithSsrFGuard so undici
+  // dispatcher + guarded abort both fire. Registration keeps the tighter
+  // FEISHU_APP_REGISTRATION_TIMEOUT_MS wizard budget (not FEISHU_HTTP_TIMEOUT_MS).
+  const timeoutMs = params.timeoutMs ?? FEISHU_APP_REGISTRATION_TIMEOUT_MS;
   const { response, release } = await fetchWithSsrFGuard({
     url: params.url,
     init: params.init,
     fetchImpl: params.fetchImpl,
     lookupFn: params.lookupFn,
+    timeoutMs,
     policy: { allowedHostnames: [new URL(params.url).hostname] },
     auditContext: params.auditContext,
   });
@@ -229,7 +238,7 @@ export async function pollAppRegistration(params: {
   const expireInMs =
     finiteSecondsToTimerSafeMilliseconds(expireIn) ??
     finiteSecondsToTimerSafeMilliseconds(DEFAULT_REGISTRATION_EXPIRE_SECONDS) ??
-    REQUEST_TIMEOUT_MS;
+    FEISHU_APP_REGISTRATION_TIMEOUT_MS;
   const deadline = Date.now() + expireInMs;
 
   while (Date.now() < deadline) {
@@ -342,7 +351,6 @@ export async function getAppOwnerOpenId(params: {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ app_id: params.appId, app_secret: params.appSecret }),
-        signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
       },
       auditContext: "feishu.app-registration.owner-token",
       fetchImpl: params.fetchImpl,
@@ -369,7 +377,6 @@ export async function getAppOwnerOpenId(params: {
           Authorization: `Bearer ${tokenData.tenant_access_token}`,
           "Content-Type": "application/json",
         },
-        signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
       },
       auditContext: "feishu.app-registration.owner-app",
       fetchImpl: params.fetchImpl,
@@ -395,6 +402,6 @@ function sleepRegistrationPollInterval(intervalSeconds: number): Promise<void> {
   const intervalMs =
     finiteSecondsToTimerSafeMilliseconds(intervalSeconds) ??
     finiteSecondsToTimerSafeMilliseconds(DEFAULT_REGISTRATION_POLL_INTERVAL_SECONDS) ??
-    REQUEST_TIMEOUT_MS;
+    FEISHU_APP_REGISTRATION_TIMEOUT_MS;
   return sleep(intervalMs);
 }
