Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

chore(eve): upgrade undici to v8 (#1288)

Casey Gowrie9df880e43d6c
diff --git a/.changeset/modern-undici-dispatcher.md b/.changeset/modern-undici-dispatcher.md
new file mode 100644
index 000000000..97de02718
--- /dev/null
+++ b/.changeset/modern-undici-dispatcher.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Upgrade the runtime HTTP client to undici 8 while preserving Node fetch compatibility for SSRF-safe web requests.
diff --git a/packages/eve/package.json b/packages/eve/package.json
index 32763d8ca..0a56d5f69 100644
--- a/packages/eve/package.json
+++ b/packages/eve/package.json
@@ -300,7 +300,7 @@
},
"dependencies": {
"nitro": "3.0.260610-beta",
- "undici": "7.28.0"
+ "undici": "8.9.0"
},
"devDependencies": {
"@ai-sdk/anthropic": "catalog:",
diff --git a/packages/eve/src/execution/web-fetch/dispatcher.scenario.test.ts b/packages/eve/src/execution/web-fetch/dispatcher.scenario.test.ts
new file mode 100644
index 000000000..7a126fa9e
--- /dev/null
+++ b/packages/eve/src/execution/web-fetch/dispatcher.scenario.test.ts
@@ -0,0 +1,34 @@
+import { createServer } from "node:http";
+
+import { Agent, Dispatcher1Wrapper } from "undici";
+import { describe, expect, it } from "vitest";
+
+describe("undici dispatcher compatibility", () => {
+ it("bridges an undici 8 agent to Node fetch", async () => {
+ const server = createServer((_request, response) => {
+ response.end("wrapped response");
+ });
+ await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+
+ const address = server.address();
+ if (address === null || typeof address === "string") {
+ throw new Error("Expected an ephemeral TCP listener.");
+ }
+
+ const dispatcher = new Dispatcher1Wrapper(new Agent());
+
+ try {
+ const response = await fetch(`http://127.0.0.1:${address.port}`, {
+ dispatcher,
+ } as RequestInit & { dispatcher: Dispatcher1Wrapper });
+
+ expect(response.status).toBe(200);
+ await expect(response.text()).resolves.toBe("wrapped response");
+ } finally {
+ await dispatcher.close();
+ await new Promise<void>((resolve, reject) => {
+ server.close((error) => (error === undefined ? resolve() : reject(error)));
+ });
+ }
+ });
+});
diff --git a/packages/eve/src/execution/web-fetch/request.test.ts b/packages/eve/src/execution/web-fetch/request.test.ts
index ddf4539e0..74e0afa6d 100644
--- a/packages/eve/src/execution/web-fetch/request.test.ts
+++ b/packages/eve/src/execution/web-fetch/request.test.ts
@@ -7,7 +7,10 @@ import { requestPublicUrl } from "#execution/web-fetch/request.js";
const networkMocks = vi.hoisted(() => ({
agentClose: vi.fn(),
+ agentInstances: [] as unknown[],
agentOptions: [] as unknown[],
+ dispatcherInstances: [] as unknown[],
+ dispatcherTargets: [] as unknown[],
fetch: vi.fn(),
lookup: vi.fn(),
socketAddresses: [] as unknown[],
@@ -23,6 +26,7 @@ vi.mock("undici", () => ({
constructor(options: unknown) {
this.options = options;
+ networkMocks.agentInstances.push(this);
networkMocks.agentOptions.push(options);
}
@@ -30,6 +34,19 @@ vi.mock("undici", () => ({
return networkMocks.agentClose();
}
},
+ Dispatcher1Wrapper: class MockDispatcher1Wrapper {
+ readonly dispatcher: { readonly options: unknown; close(): Promise<void> };
+
+ constructor(dispatcher: { readonly options: unknown; close(): Promise<void> }) {
+ this.dispatcher = dispatcher;
+ networkMocks.dispatcherInstances.push(this);
+ networkMocks.dispatcherTargets.push(dispatcher);
+ }
+
+ close(): Promise<void> {
+ return this.dispatcher.close();
+ }
+ },
}));
const REQUEST_OPTIONS = {
@@ -47,7 +64,10 @@ interface MockResponse {
beforeEach(() => {
networkMocks.agentClose.mockReset();
networkMocks.agentClose.mockResolvedValue(undefined);
+ networkMocks.agentInstances.length = 0;
networkMocks.agentOptions.length = 0;
+ networkMocks.dispatcherInstances.length = 0;
+ networkMocks.dispatcherTargets.length = 0;
networkMocks.fetch.mockReset();
vi.stubGlobal("fetch", networkMocks.fetch);
networkMocks.lookup.mockReset();
@@ -168,6 +188,22 @@ describe("requestPublicUrl", () => {
});
});
+ it("wraps the agent for Node fetch's legacy dispatcher API", async () => {
+ queueResponse({ body: "public content" });
+
+ await requestPublicUrl("https://example.com/page", REQUEST_OPTIONS);
+
+ const [, fetchOptions] = networkMocks.fetch.mock.calls[0]!;
+ const fetchDispatcher = (
+ fetchOptions as RequestInit & {
+ dispatcher: unknown;
+ }
+ ).dispatcher;
+
+ expect(networkMocks.dispatcherTargets).toEqual(networkMocks.agentInstances);
+ expect(fetchDispatcher).toBe(networkMocks.dispatcherInstances[0]);
+ });
+
it("returns private redirect targets without requesting them", async () => {
queueResponse({
headers: { location: "https://169.254.169.254/latest/meta-data" },
@@ -279,8 +315,12 @@ async function connectThroughDispatcher(input: URL, options: RequestInit): Promi
return;
}
- const dispatcher = (options as RequestInit & { dispatcher: { options: unknown } }).dispatcher;
- const agentOptions = dispatcher.options as { connect: { lookup?: LookupFunction } };
+ const dispatcher = (
+ options as RequestInit & {
+ dispatcher: { dispatcher: { options: unknown } };
+ }
+ ).dispatcher;
+ const agentOptions = dispatcher.dispatcher.options as { connect: { lookup?: LookupFunction } };
const addresses = await runLookup(agentOptions.connect.lookup, hostname);
networkMocks.socketAddresses.push(addresses);
}
diff --git a/packages/eve/src/execution/web-fetch/request.ts b/packages/eve/src/execution/web-fetch/request.ts
index 3794e5af0..f58e74170 100644
--- a/packages/eve/src/execution/web-fetch/request.ts
+++ b/packages/eve/src/execution/web-fetch/request.ts
@@ -2,7 +2,7 @@ import { lookup } from "node:dns";
import { isIP } from "node:net";
import type { LookupFunction } from "node:net";
-import { Agent } from "undici";
+import type { Dispatcher1Wrapper } from "undici";
import { isLoopbackHostname, isPrivateOrReservedIpAddress } from "#shared/network-address.js";
@@ -10,6 +10,10 @@ const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
const UNSAFE_DESTINATION_ERROR =
"URL must not target localhost, private, link-local, or reserved IP addresses.";
+type DispatcherRequestInit = Omit<RequestInit, "dispatcher"> & {
+ readonly dispatcher: Dispatcher1Wrapper;
+};
+
/** Options for an SSRF-safe HTTPS request. */
export interface PublicUrlRequestOptions {
readonly headers: Readonly<Record<string, string>>;
@@ -67,22 +71,23 @@ function parseHttpsUrl(urlText: string): URL {
async function requestOnce(
url: URL,
options: PublicUrlRequestOptions,
-): Promise<{ readonly dispatcher: Agent; readonly response: Response }> {
+): Promise<{ readonly dispatcher: Dispatcher1Wrapper; readonly response: Response }> {
assertPublicHostname(url.hostname);
- const dispatcher = new Agent({
+ const { Agent, Dispatcher1Wrapper } = await import("undici");
+ const agent = new Agent({
connect: {
lookup: createPublicLookup(),
},
});
+ const dispatcher = new Dispatcher1Wrapper(agent);
try {
- const fetchOptions: RequestInit & { dispatcher: Agent } = {
+ const response = await fetchWithDispatcher(url, {
dispatcher,
headers: options.headers,
redirect: "manual",
signal: options.signal,
- };
- const response = await fetch(url, fetchOptions);
+ });
return { dispatcher, response };
} catch (error) {
await dispatcher.close();
@@ -90,6 +95,12 @@ async function requestOnce(
}
}
+function fetchWithDispatcher(url: URL, options: DispatcherRequestInit): Promise<Response> {
+ // Node's fetch types describe its bundled undici version, while the wrapper
+ // adapts the installed undici dispatcher to that runtime protocol.
+ return fetch(url, options as RequestInit);
+}
+
function assertPublicHostname(hostname: string): void {
const normalizedHostname = hostname.replace(/^\[(.*)\]$/u, "$1");
const family = isIP(normalizedHostname);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3436164be..9cd241748 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1043,8 +1043,8 @@ importers:
specifier: 3.0.260610-beta
undici:
- specifier: 7.28.0
- version: 7.28.0
+ specifier: 8.9.0
+ version: 8.9.0
devDependencies:
'@ai-sdk/anthropic':
specifier: 'catalog:'
@@ -13703,6 +13703,10 @@ packages:
resolution: {integrity: sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==}
engines: {node: '>=20.18.1'}
+ resolution: {integrity: sha512-aWZpUj7XoGonMClx4gdDRfgBjqeA+F473aDmROQQbM9n6PRfK/u1q/a0X4wMTgcHfT8H6fpbt98PFuDUwFg2YA==}
+ engines: {node: '>=22.19.0'}
+
resolution: {integrity: sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==}
@@ -29602,6 +29606,8 @@ snapshots:
+
dependencies:
pathe: 2.0.3