refactor(eas-cli): swap node-fetch for undici to support Node 22 better

CHANGELOG.md

@@ -13,6 +13,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes
 
 - Correctly parse the EXPO_APPLE_PROVIER_ID environment variable. ([#2349](https://github.com/expo/eas-cli/pull/2349) by [@louix](https://github.com/louix))
+- Swapped `node-fetch` for `undici` to support Node 22. ([#2414](https://github.com/expo/eas-cli/pull/2414) by [@byCedric](https://github.com/byCedric))
 
 ### 🧹 Chores
 

packages/eas-cli/__mocks__/undici.ts

@@ -0,0 +1,7 @@
+const undici = require('undici');
+
+// This workaround swaps `undici.fetch` for `global.fetch` to connect Nock with Undici.
+// See: https://github.com/nock/nock/issues/2183
+require('nock');
+
+module.exports = { ...undici, fetch: global.fetch };

packages/eas-cli/package.json

@@ -64,7 +64,6 @@
     "mime": "3.0.0",
     "minimatch": "5.1.2",
     "nanoid": "3.3.4",
-    "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
@@ -81,6 +80,7 @@
     "terminal-link": "2.1.1",
     "tslib": "2.6.2",
     "turndown": "7.1.2",
+    "undici": "6.18.2",
     "untildify": "4.0.0",
     "uuid": "9.0.1",
     "wrap-ansi": "7.0.0"
@@ -98,7 +98,6 @@
     "@types/getenv": "^1.0.0",
     "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
-    "@types/node-fetch": "2.6.2",
     "@types/node-forge": "1.3.1",
     "@types/pngjs": "6.0.4",
     "@types/promise-retry": "1.1.3",
@@ -113,7 +112,7 @@
     "express": "4.19.2",
     "memfs": "3.4.13",
     "mockdate": "3.0.5",
-    "nock": "13.4.0",
+    "nock": "14.0.0-beta.7",
     "rimraf": "3.0.2",
     "ts-deepmerge": "6.2.0",
     "ts-mockito": "2.6.1",

packages/eas-cli/src/commandUtils/context/contextUtils/createGraphqlClient.ts

@@ -11,10 +11,9 @@ import {
 } from '@urql/core';
 import { retryExchange } from '@urql/exchange-retry';
 import { DocumentNode } from 'graphql';
-import fetch from 'node-fetch';
 
 import { getExpoApiBaseUrl } from '../../../api';
-import { httpsProxyAgent } from '../../../fetch';
+import fetch, { RequestError, RequestInfo, RequestInit } from '../../../fetch';
 
 export interface ExpoGraphqlClient extends Client {
   query<Data = any, Variables extends AnyVariables = AnyVariables>(
@@ -44,19 +43,17 @@ export function createGraphqlClient(authInfo: {
       }),
       fetchExchange,
     ],
-    // @ts-expect-error Type 'typeof fetch' is not assignable to type '(input: RequestInfo, init?: RequestInit | undefined) => Promise<Response>'.
-    fetch,
-    fetchOptions: (): RequestInit => {
+    // @ts-expect-error - Type '(url: RequestInfo, init?: RequestInit) => Promise<Response>' is not assignable to type '{ (input: RequestInfo | URL, init?: RequestInit | undefined): Promise<Response>; (input: string | Request | URL, init?: RequestInit | undefined): Promise<...>; }'.
+    fetch: (url: RequestInfo, init?: RequestInit) =>
+      fetch(url, init).catch((error: RequestError) => error.response),
+    fetchOptions: () => {
       const headers: Record<string, string> = {};
       if (authInfo.accessToken) {
         headers.authorization = `Bearer ${authInfo.accessToken}`;
       } else if (authInfo.sessionSecret) {
         headers['expo-session'] = authInfo.sessionSecret;
       }
-      return {
-        ...(httpsProxyAgent ? { agent: httpsProxyAgent } : {}),
-        headers,
-      };
+      return { headers };
     },
   }) as ExpoGraphqlClient;
 }

packages/eas-cli/src/fetch.ts

@@ -1,8 +1,15 @@
-import { Agent } from 'https';
-import createHttpsProxyAgent from 'https-proxy-agent';
-import fetch, { RequestInfo, RequestInit, Response } from 'node-fetch';
+import { env } from 'node:process';
+import {
+  ProxyAgent,
+  type RequestInfo,
+  type RequestInit,
+  type Response,
+  fetch,
+  getGlobalDispatcher,
+  setGlobalDispatcher,
+} from 'undici';
 
-export * from 'node-fetch';
+export { Agent, Headers, type RequestInfo, type RequestInit, Response } from 'undici';
 
 export class RequestError extends Error {
   constructor(
@@ -13,23 +20,21 @@ export class RequestError extends Error {
   }
 }
 
-function createHttpsAgent(): Agent | null {
-  const httpsProxyUrl = process.env.https_proxy;
-  if (!httpsProxyUrl) {
-    return null;
-  }
-  return createHttpsProxyAgent(httpsProxyUrl);
-}
-
-export const httpsProxyAgent: Agent | null = createHttpsAgent();
-
 export default async function (url: RequestInfo, init?: RequestInit): Promise<Response> {
-  const response = await fetch(url, {
-    ...init,
-    ...(httpsProxyAgent ? { agent: httpsProxyAgent } : {}),
-  });
+  installProxyAgent();
+
+  const response = await fetch(url, init);
   if (response.status >= 400) {
     throw new RequestError(`Request failed: ${response.status} (${response.statusText})`, response);
   }
+
   return response;
 }
+
+function installProxyAgent(): void {
+  const httpsProxyUrl = env.https_proxy;
+
+  if (httpsProxyUrl && !(getGlobalDispatcher() instanceof ProxyAgent)) {
+    setGlobalDispatcher(new ProxyAgent(httpsProxyUrl));
+  }
+}

packages/eas-cli/src/uploads.ts

@@ -1,10 +1,9 @@
 import FormData from 'form-data';
 import fs from 'fs-extra';
-import { Response } from 'node-fetch';
 import promiseRetry from 'promise-retry';
 
 import { ExpoGraphqlClient } from './commandUtils/context/contextUtils/createGraphqlClient';
-import fetch from './fetch';
+import fetch, { type Response } from './fetch';
 import { UploadSessionType } from './graphql/generated';
 import { SignedUrl, UploadSessionMutation } from './graphql/mutations/UploadSessionMutation';
 import { ProgressHandler } from './utils/progress';

packages/eas-cli/src/utils/__tests__/download-test.ts

@@ -0,0 +1,104 @@
+import nock from 'nock';
+
+import { getExpoApiBaseUrl } from '../../api';
+import { RequestError } from '../../fetch';
+import { wrapFetchWithProgress } from '../download';
+
+describe(wrapFetchWithProgress, () => {
+  const url = getExpoApiBaseUrl();
+
+  it('returns response with body', async () => {
+    nock(url)
+      .get('/test-body')
+      .reply(200, 'success', { 'Content-Length': String(Buffer.byteLength('success')) });
+
+    const response = await wrapFetchWithProgress()(`${url}/test-body`, {}, jest.fn());
+
+    expect(await response.text()).toBe('success');
+  });
+
+  it('calls progress handler when loading body', async () => {
+    const testSize = 1024 * 1024; // 1MB
+
+    nock(url)
+      .get('/test-progress')
+      .reply(200, Buffer.alloc(testSize), { 'Content-Length': String(testSize) });
+
+    const progressTracker = jest.fn();
+    const fetchWithProgress = wrapFetchWithProgress();
+    const response = await fetchWithProgress(`${url}/test-progress`, {}, progressTracker);
+
+    // Response should be successful
+    expect(response).toMatchObject({ ok: true });
+    // Load the the response body to trigger the progress events
+    expect(await response.blob()).not.toBeUndefined();
+    // Progress tracker should start at 0%
+    expect(progressTracker).toHaveBeenCalledWith({
+      isComplete: false,
+      progress: {
+        total: testSize,
+        percent: 0,
+        transferred: 0,
+      },
+    });
+    // Progress tracker should end at 100%
+    expect(progressTracker).toHaveBeenCalledWith({
+      isComplete: true,
+      progress: {
+        total: testSize,
+        percent: 1,
+        transferred: testSize,
+      },
+    });
+  });
+
+  it('skips progress events when request fails', async () => {
+    nock(url)
+      .get('/test-fail')
+      .reply(404, 'Not Found', { 'Content-Length': String(Buffer.byteLength('Not Found')) });
+
+    const progressTracker = jest.fn();
+    const response = await wrapFetchWithProgress()(`${url}/test-fail`, {}, progressTracker).catch(
+      (requestError: RequestError) => requestError.response
+    );
+
+    // Response should not be successful
+    expect(response).toMatchObject({ ok: false });
+    // Repsonse should contain our error message
+    expect(await response.text()).toBe('Not Found');
+    // No progression events should be called
+    expect(progressTracker).not.toHaveBeenCalled();
+  });
+
+  it('skips progress events when response is empty', async () => {
+    nock(url).get('/test-empty').reply(204, undefined, { 'Content-Length': '0' });
+
+    const progressTracker = jest.fn();
+    const response = await wrapFetchWithProgress()(`${url}/test-empty`, {}, progressTracker);
+
+    // Response should be successful
+    expect(response).toMatchObject({ ok: true });
+    // Body should be empty
+    expect(await response.text()).toBe('');
+    // No progression events should be called
+    expect(progressTracker).not.toHaveBeenCalled();
+  });
+
+  it('skips progress events when no content-length header is available', async () => {
+    nock(url).get('/test-missing-content-length').reply(200, 'success');
+
+    const progressTracker = jest.fn();
+    const response = await wrapFetchWithProgress()(
+      `${url}/test-missing-content-length`,
+      {},
+      progressTracker
+    );
+
+    // Response should be successful
+    expect(response).toMatchObject({ ok: true });
+    // Body should be empty
+    expect(await response.text()).toBe('success');
+    // No progression events should be called
+    expect(progressTracker).not.toHaveBeenCalled();
+  });
+});