Save and restore original dispatcher on true→false transition

MarkShawn2020 · claude · MarkShawn2020 · commit 33991d91aa02 · 2026-02-26T07:30:42.000+08:00
Address review feedback: when autoSelectFamily switches from true to
false, restore the original global dispatcher instead of leaving the
replacement sticky for the process lifetime.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/telegram/fetch.test.ts b/src/telegram/fetch.test.ts
@@ -27,9 +27,13 @@ vi.mock("node:dns", async () => {
   };
 });
 
+const mockOriginalDispatcher = vi.hoisted(() => ({ __original: true }));
+const getGlobalDispatcher = vi.hoisted(() => vi.fn(() => mockOriginalDispatcher));
+
 vi.mock("undici", () => ({
   Agent: AgentCtor,
   setGlobalDispatcher,
+  getGlobalDispatcher,
 }));
 
 const originalFetch = globalThis.fetch;
@@ -39,6 +43,7 @@ afterEach(() => {
   setDefaultAutoSelectFamily.mockReset();
   setDefaultResultOrder.mockReset();
   setGlobalDispatcher.mockReset();
+  getGlobalDispatcher.mockReset().mockReturnValue(mockOriginalDispatcher);
   AgentCtor.mockClear();
   vi.unstubAllEnvs();
   vi.clearAllMocks();
@@ -168,19 +173,21 @@ describe("resolveTelegramFetch", () => {
     expect(setGlobalDispatcher).toHaveBeenCalledTimes(1);
   });
 
-  it("does not replace global dispatcher when autoSelectFamily is false", async () => {
+  it("restores original dispatcher when autoSelectFamily switches from true to false", async () => {
     globalThis.fetch = vi.fn(async () => ({})) as unknown as typeof fetch;
     resolveTelegramFetch(undefined, { network: { autoSelectFamily: true } });
     resolveTelegramFetch(undefined, { network: { autoSelectFamily: false } });
 
-    // Only the first call (true) should replace the dispatcher;
-    // switching to false should leave the default dispatcher untouched.
-    expect(setGlobalDispatcher).toHaveBeenCalledTimes(1);
-    expect(AgentCtor).toHaveBeenNthCalledWith(1, {
+    // First call replaces with autoSelectFamily agent, second restores original.
+    expect(setGlobalDispatcher).toHaveBeenCalledTimes(2);
+    expect(AgentCtor).toHaveBeenCalledTimes(1);
+    expect(AgentCtor).toHaveBeenCalledWith({
       connect: {
         autoSelectFamily: true,
         autoSelectFamilyAttemptTimeout: 300,
       },
     });
+    // Second setGlobalDispatcher call should restore the original dispatcher.
+    expect(setGlobalDispatcher).toHaveBeenNthCalledWith(2, mockOriginalDispatcher);
   });
 });
diff --git a/src/telegram/fetch.ts b/src/telegram/fetch.ts
@@ -1,6 +1,7 @@
 import * as dns from "node:dns";
 import * as net from "node:net";
-import { Agent, setGlobalDispatcher } from "undici";
+import { Agent, getGlobalDispatcher, setGlobalDispatcher } from "undici";
+import type { Dispatcher } from "undici";
 import type { TelegramNetworkConfig } from "../config/types.telegram.js";
 import { resolveFetch } from "../infra/fetch.js";
 import { createSubsystemLogger } from "../logging/subsystem.js";
@@ -12,6 +13,7 @@ import {
 let appliedAutoSelectFamily: boolean | null = null;
 let appliedDnsResultOrder: string | null = null;
 let appliedGlobalDispatcherAutoSelectFamily: boolean | null = null;
+let originalGlobalDispatcher: Dispatcher | null = null;
 const log = createSubsystemLogger("telegram/network");
 
 // Node 22 workaround: enable autoSelectFamily to allow IPv4 fallback on broken IPv6 networks.
@@ -41,26 +43,39 @@ function applyTelegramNetworkWorkarounds(network?: TelegramNetworkConfig): void
   // inherit the same decision.
   // See: https://github.com/openclaw/openclaw/issues/25676
   //
-  // IMPORTANT: Only replace the global dispatcher when autoSelectFamily is
-  // explicitly *enabled*. Replacing it unconditionally (even with false)
-  // swaps in a bare Agent that discards any configuration the original
-  // default dispatcher carried, which can break other HTTP clients in the
-  // same process (e.g. LLM provider fetches returning 403).
+  // IMPORTANT: Replacing the global dispatcher unconditionally (even with
+  // autoSelectFamily=false) swaps in a bare Agent that discards any config
+  // the original default dispatcher carried, breaking other HTTP clients in
+  // the same process (e.g. LLM provider fetches returning 403).
+  //
+  // When enabling (true): save the original dispatcher and replace it.
+  // When disabling (false) after a previous enable: restore the original.
   if (
-    autoSelectDecision.value === true &&
+    autoSelectDecision.value !== null &&
     autoSelectDecision.value !== appliedGlobalDispatcherAutoSelectFamily
   ) {
     try {
-      setGlobalDispatcher(
-        new Agent({
-          connect: {
-            autoSelectFamily: true,
-            autoSelectFamilyAttemptTimeout: 300,
-          },
-        }),
-      );
-      appliedGlobalDispatcherAutoSelectFamily = true;
-      log.info(`global undici dispatcher autoSelectFamily=true`);
+      if (autoSelectDecision.value) {
+        // Save the original dispatcher before first replacement.
+        if (originalGlobalDispatcher === null) {
+          originalGlobalDispatcher = getGlobalDispatcher();
+        }
+        setGlobalDispatcher(
+          new Agent({
+            connect: {
+              autoSelectFamily: true,
+              autoSelectFamilyAttemptTimeout: 300,
+            },
+          }),
+        );
+        appliedGlobalDispatcherAutoSelectFamily = true;
+        log.info(`global undici dispatcher autoSelectFamily=true`);
+      } else if (originalGlobalDispatcher !== null) {
+        // Restore the original dispatcher so other HTTP clients are unaffected.
+        setGlobalDispatcher(originalGlobalDispatcher);
+        appliedGlobalDispatcherAutoSelectFamily = false;
+        log.info("global undici dispatcher restored to original");
+      }
     } catch {
       // ignore if setGlobalDispatcher is unavailable
     }
@@ -104,4 +119,5 @@ export function resetTelegramFetchStateForTests(): void {
   appliedAutoSelectFamily = null;
   appliedDnsResultOrder = null;
   appliedGlobalDispatcherAutoSelectFamily = null;
+  originalGlobalDispatcher = null;
 }
