Merge pull request #281 from modelstudioai/fix/node26-fetch-dispatcher

fix: resolve Node 26 fetch and dispatcher incompatibility

Author: XXPermanentXX

packages/commands/src/commands/knowledge/upload-stream.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
 
@@ -29,7 +30,7 @@ export async function putFileStream(
       duplex: "half",
       signal,
     };
-    return await fetch(lease.url, request);
+    return await httpTransport.fetch(lease.url, request);
   } finally {
     source.destroy();
   }

packages/commands/src/commands/managed-agent/_engine/playground-launcher.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import { execFile, spawn, type ChildProcess } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
@@ -310,7 +311,7 @@ async function waitForPlaygroundReady(
   while (Date.now() <= deadline) {
     if (child.exitCode !== null) return null;
     try {
-      const response = await fetch(`http://localhost:${port}/health`, {
+      const response = await httpTransport.fetch(`http://localhost:${port}/health`, {
         signal: AbortSignal.timeout(1_000),
       });
       const body = response.ok
@@ -327,7 +328,7 @@ async function waitForPlaygroundReady(
 
 async function probeExistingPlayground(port: number): Promise<ExistingPlayground | null> {
   try {
-    const response = await fetch(`http://localhost:${port}/health`, {
+    const response = await httpTransport.fetch(`http://localhost:${port}/health`, {
       signal: AbortSignal.timeout(2_000),
     });
     if (!response.ok) return null;
@@ -383,7 +384,7 @@ async function resolvePlaygroundBrowserTarget(
 ): Promise<PlaygroundBrowserTarget> {
   const baseUrl = `http://localhost:${port}`;
   try {
-    const response = await fetch(`${baseUrl}/api/project`, {
+    const response = await httpTransport.fetch(`${baseUrl}/api/project`, {
       signal: AbortSignal.timeout(3_000),
     });
     if (!response.ok) return { url: baseUrl };

packages/commands/src/commands/shared/telemetry.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import {
   BailianError,
   ExitCode,
@@ -204,7 +205,7 @@ export async function resolveOssPayload<T>(resp: Record<string, unknown>): Promi
   };
   if (originData !== undefined && originData !== null) return originData;
   if (dataDownloadUrl) {
-    const res = await fetch(dataDownloadUrl.replace(/^http:\/\//, "https://"));
+    const res = await httpTransport.fetch(dataDownloadUrl.replace(/^http:\/\//, "https://"));
     if (!res.ok) {
       throw new BailianError(
         `Failed to download telemetry data (HTTP ${res.status}).`,

packages/commands/src/commands/speech/recognize.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import { writeFileSync } from "fs";
 import {
   BailianError,
@@ -435,7 +436,7 @@ async function handleAsyncMode(
     }
 
     // Fetch transcription JSON
-    const transRes = await fetch(subResult.transcription_url);
+    const transRes = await httpTransport.fetch(subResult.transcription_url);
     if (!transRes.ok) {
       throw new BailianError(
         `Failed to download transcription: HTTP ${transRes.status}`,

packages/commands/tests/auth-api-key.test.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import { BailianError, ExitCode, type Identity, type Settings } from "bailian-cli-core";
 import { expect, test } from "vite-plus/test";
 import {
@@ -105,9 +106,9 @@ test("显式 Base URL 只校验指定站点，并根据 Key 类型选择 /models
 });
 
 test("Token Plan 多地区并行校验选择实际接受 Key 的国际站点", async () => {
-  const originalFetch = globalThis.fetch;
+  const originalFetch = httpTransport.fetch;
   const requests: Array<{ authorization: string; url: string }> = [];
-  globalThis.fetch = async (input, init) => {
+  httpTransport.fetch = async (input, init) => {
     const url = requestUrl(input);
     requests.push({
       authorization: new Headers(init?.headers).get("authorization") ?? "",
@@ -135,30 +136,30 @@ test("Token Plan 多地区并行校验选择实际接受 Key 的国际站点", a
       },
     ]);
   } finally {
-    globalThis.fetch = originalFetch;
+    httpTransport.fetch = originalFetch;
   }
 });
 
 test("所有候选站点明确拒绝 Key 时返回 AUTH 校验失败", async () => {
-  const originalFetch = globalThis.fetch;
-  globalThis.fetch = async () =>
+  const originalFetch = httpTransport.fetch;
+  httpTransport.fetch = async () =>
     jsonResponse({ code: "InvalidApiKey", message: "invalid key" }, 401);
 
   try {
     const error = await captureValidationError("sk-sp-placeholder");
     expect(error.exitCode).toBe(ExitCode.AUTH);
     expect(error.message).toMatch(/API key validation failed/);
   } finally {
-    globalThis.fetch = originalFetch;
+    httpTransport.fetch = originalFetch;
   }
 });
 
 test.each([
   { name: "5xx", status: 503, message: "temporary outage" },
   { name: "429", status: 429, message: "too many requests" },
 ])("存在 $name 时校验结论不确定，不误报 Key 无效", async ({ status, message }) => {
-  const originalFetch = globalThis.fetch;
-  globalThis.fetch = async (input) => {
+  const originalFetch = httpTransport.fetch;
+  httpTransport.fetch = async (input) => {
     if (requestUrl(input).startsWith("https://dashscope.aliyuncs.com/")) {
       return jsonResponse({ code: "TemporaryFailure", message }, status);
     }
@@ -170,6 +171,6 @@ test.each([
     expect(error.exitCode).toBe(ExitCode.GENERAL);
     expect(error.message).toBe(message);
   } finally {
-    globalThis.fetch = originalFetch;
+    httpTransport.fetch = originalFetch;
   }
 });

packages/commands/tests/deploy-capacity-write.test.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import {
   BailianError,
   ExitCode,
@@ -242,12 +243,14 @@ beforeEach(() => {
     stderr += String(chunk);
     return true;
   });
-  vi.stubGlobal("fetch", vi.fn().mockRejectedValue(new Error("Real network is forbidden")));
+  vi.spyOn(httpTransport, "fetch").mockImplementation(
+    vi.fn().mockRejectedValue(new Error("Real network is forbidden")),
+  );
 });
 
 afterEach(() => {
   try {
-    expect(fetch).not.toHaveBeenCalled();
+    expect(httpTransport.fetch).not.toHaveBeenCalled();
     for (const mock of mocks) expect(mock.request).not.toHaveBeenCalled();
     expect(process.listeners("SIGINT")).toEqual(interruptListeners);
     expect(vi.getTimerCount()).toBe(0);

packages/commands/tests/deploy-legacy-write.test.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import {
   BailianError,
   ExitCode,
@@ -124,12 +125,14 @@ beforeEach(() => {
     stderr += String(chunk);
     return true;
   });
-  vi.stubGlobal("fetch", vi.fn().mockRejectedValue(new Error("Real network is forbidden")));
+  vi.spyOn(httpTransport, "fetch").mockImplementation(
+    vi.fn().mockRejectedValue(new Error("Real network is forbidden")),
+  );
 });
 
 afterEach(() => {
   try {
-    expect(fetch).not.toHaveBeenCalled();
+    expect(httpTransport.fetch).not.toHaveBeenCalled();
     for (const mock of mocks) expect(mock.request).not.toHaveBeenCalled();
     if (vi.isFakeTimers()) expect(vi.getTimerCount()).toBe(0);
   } finally {

packages/commands/tests/deploy-query.test.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import {
   BailianError,
   ExitCode,
@@ -137,8 +138,7 @@ beforeEach(() => {
     stdout += String(chunk);
     return true;
   });
-  vi.stubGlobal(
-    "fetch",
+  vi.spyOn(httpTransport, "fetch").mockImplementation(
     vi.fn().mockRejectedValue(new Error("Real network is forbidden in deploy query tests")),
   );
 });
@@ -153,7 +153,7 @@ afterEach(() => {
         expect(request).not.toHaveProperty("body");
       }
     }
-    expect(fetch).not.toHaveBeenCalled();
+    expect(httpTransport.fetch).not.toHaveBeenCalled();
     if (vi.isFakeTimers()) expect(vi.getTimerCount()).toBe(0);
   } finally {
     vi.useRealTimers();

packages/commands/tests/deploy-wait-http.test.ts

@@ -15,8 +15,11 @@ const CONFIG_DIRECTORY = fileURLToPath(
 // Keep real loopback fetch, but block background npm/telemetry requests before
 // they reach the network. Disallow redirects so local responses cannot escape.
 const LOCAL_FETCH_ONLY = `
-const realFetch = globalThis.fetch;
-globalThis.fetch = async (input, init) => {
+import { createRequire } from "node:module";
+const require = createRequire(${JSON.stringify(fileURLToPath(new URL("../../core/package.json", import.meta.url)))});
+const undici = require("undici");
+const realFetch = undici.fetch;
+undici.fetch = globalThis.fetch = async (input, init) => {
   const url = new URL(input instanceof Request ? input.url : input);
   if (url.protocol !== "http:" || url.hostname !== "127.0.0.1") {
     throw new Error("Remote fetch blocked for deploy HTTP regression");

packages/commands/tests/e2e/auth.e2e.test.ts

@@ -1,3 +1,4 @@
+import { httpTransport } from "bailian-cli-core";
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs";
 import { createServer, type Server } from "http";
 import { tmpdir } from "os";
@@ -163,9 +164,9 @@ describe("e2e: auth", () => {
           console_switch_agent: 123,
         };
         await writeConfigFile(previous, "token-plan");
-        const originalFetch = globalThis.fetch;
+        const originalFetch = httpTransport.fetch;
         const requests: string[] = [];
-        globalThis.fetch = async (input, init) => {
+        httpTransport.fetch = async (input, init) => {
           const endpoint = new URL(input instanceof Request ? input.url : input);
           requests.push(endpoint.hostname);
           expect(readConfigFile("token-plan")).toEqual(previous);
@@ -246,7 +247,7 @@ describe("e2e: auth", () => {
                 ],
           );
         } finally {
-          globalThis.fetch = originalFetch;
+          httpTransport.fetch = originalFetch;
         }
       });
     },
@@ -354,9 +355,9 @@ describe("e2e: auth", () => {
         const stdin = vi
           .spyOn(process, "stdin", "get")
           .mockReturnValue(input as typeof process.stdin);
-        const originalFetch = globalThis.fetch;
+        const originalFetch = httpTransport.fetch;
         let validations = 0;
-        globalThis.fetch = async (url, init) => {
+        httpTransport.fetch = async (url, init) => {
           const endpoint = new URL(url instanceof Request ? url.url : url);
           expect(endpoint.hostname).toBe("bailian-singapore-cs.alibabacloud.com");
           expect(endpoint.searchParams.get("api")).toBe(
@@ -424,7 +425,7 @@ describe("e2e: auth", () => {
         } finally {
           stdin.mockRestore();
           input.destroy();
-          globalThis.fetch = originalFetch;
+          httpTransport.fetch = originalFetch;
         }
       });
     },