@vercel/client 17.6.4 → 18.0.0

package/dist/check-deployment-status.js

@@ -146,8 +146,7 @@ async function* checkDeploymentStatus(deployment, clientOptions) {
             {
               apiUrl,
               userAgent,
-              agent: clientOptions.agent,
-              // node-fetch's bundled AbortSignal type predates the native one.
+              dispatcher: clientOptions.dispatcher,
               signal: aliasAssignedSignal
             }
           );

package/dist/continue.d.ts

@@ -1,12 +1,11 @@
-import type { Agent } from 'http';
-import type { ArchiveFormat, DeploymentEventType } from './types';
+import type { ArchiveFormat, DeploymentEventType, FetchDispatcher } from './types';
 /**
  * Continues a manual deployment by uploading build outputs and calling the
  * continue endpoint. Waits for READY state unless the caller stops consuming
  * events early.
  */
 export declare function continueDeployment(options: {
-    agent?: Agent;
+    dispatcher?: FetchDispatcher;
     apiUrl?: string;
     debug?: boolean;
     deploymentId: string;

package/dist/continue.js

@@ -84,7 +84,7 @@ async function* continueDeployment(options) {
     teamId: options.teamId,
     apiUrl: options.apiUrl,
     userAgent: options.userAgent,
-    agent: options.agent,
+    dispatcher: options.dispatcher,
     debug: options.debug
   });
   if (result.type === "missing_files") {
@@ -97,7 +97,7 @@ async function* continueDeployment(options) {
       payload: { total: files, missing: result.missing, uploads }
     };
     for await (const event of (0, import_upload.uploadFiles)({
-      agent: options.agent,
+      dispatcher: options.dispatcher,
       apiUrl: options.apiUrl,
       debug: options.debug,
       teamId: options.teamId,
@@ -122,7 +122,7 @@ async function* continueDeployment(options) {
       teamId: options.teamId,
       apiUrl: options.apiUrl,
       userAgent: options.userAgent,
-      agent: options.agent,
+      dispatcher: options.dispatcher,
       debug: options.debug
     });
     if (result.type === "missing_files") {
@@ -157,7 +157,7 @@ async function* continueDeployment(options) {
     return yield { type: "alias-assigned", payload: deployment };
   }
   yield* (0, import_check_deployment_status.checkDeploymentStatus)(deployment, {
-    agent: options.agent,
+    dispatcher: options.dispatcher,
     apiUrl: options.apiUrl,
     debug: options.debug,
     path: options.path,
@@ -187,7 +187,7 @@ async function postContinue(options) {
       }),
       apiUrl: options.apiUrl,
       userAgent: options.userAgent,
-      agent: options.agent
+      dispatcher: options.dispatcher
     }
   );
   let result;

package/dist/deploy.js

@@ -56,7 +56,7 @@ async function* postDeployment(files, clientOptions, deploymentOptions) {
         }),
         apiUrl: clientOptions.apiUrl,
         userAgent: clientOptions.userAgent,
-        agent: clientOptions.agent
+        dispatcher: clientOptions.dispatcher
       }
     );
     let deployment = void 0;

package/dist/types.d.ts

@@ -1,7 +1,14 @@
-import type { Agent } from 'http';
 import type { Builder, BuilderFunctions, Images, ProjectSettings, Cron, ExperimentalServices, ExperimentalServiceGroups, ExperimentalServicesV2, Services } from '@vercel/build-utils';
 import type { Header, Route, Redirect, Rewrite } from '@vercel/routing-utils';
 export { DeploymentEventType } from './utils';
+/**
+ * Minimal interface of an undici `Dispatcher` (e.g. `undici.ProxyAgent`),
+ * passed to `fetch` as the non-standard `dispatcher` init option to customize
+ * connection handling, such as routing requests through an HTTP(S) proxy.
+ */
+export interface FetchDispatcher {
+    dispatch(options: unknown, handler: unknown): boolean;
+}
 export interface Dictionary<T> {
     [key: string]: T;
 }
@@ -39,7 +46,7 @@ export interface VercelClientOptions {
     isDirectory?: boolean;
     skipAutoDetectionConfirmation?: boolean;
     archive?: ArchiveFormat;
-    agent?: Agent;
+    dispatcher?: FetchDispatcher;
     projectName?: string;
     /**
      * Path to a file containing bulk redirects (relative to the project root).

package/dist/upload.d.ts

@@ -1,13 +1,12 @@
 import { EventEmitter } from 'node:events';
 import { DeploymentFile, FilesMap } from './utils/hashes';
-import type { Agent } from 'http';
-import type { VercelClientOptions, DeploymentOptions, DeploymentEventType } from './types';
+import type { FetchDispatcher, VercelClientOptions, DeploymentOptions, DeploymentEventType } from './types';
 export declare function upload(files: FilesMap, clientOptions: VercelClientOptions, deploymentOptions: DeploymentOptions): AsyncIterableIterator<any>;
 /**
  * Uploads files to the /v2/files endpoint with retry and fault tolerance.
  */
 export declare function uploadFiles(options: {
-    agent?: Agent;
+    dispatcher?: FetchDispatcher;
     apiUrl?: string;
     debug?: boolean;
     files: FilesMap;

package/dist/upload.js

@@ -33,8 +33,6 @@ __export(upload_exports, {
   uploadFiles: () => uploadFiles
 });
 module.exports = __toCommonJS(upload_exports);
-var import_http = __toESM(require("http"));
-var import_https = __toESM(require("https"));
 var import_fs = require("fs");
 var import_stream = require("stream");
 var import_node_events = require("node:events");
@@ -44,10 +42,16 @@ var import_utils = require("./utils");
 var import_errors = require("./errors");
 var import_deploy = require("./deploy");
 const isClientNetworkError = (err) => {
+  if (!(err instanceof Error)) {
+    return false;
+  }
   if (err.message) {
-    return err.message.includes("ETIMEDOUT") || err.message.includes("ECONNREFUSED") || err.message.includes("ENOTFOUND") || err.message.includes("ECONNRESET") || err.message.includes("EAI_FAIL") || err.message.includes("socket hang up") || err.message.includes("network socket disconnected");
+    const matches = err.message.includes("ETIMEDOUT") || err.message.includes("ECONNREFUSED") || err.message.includes("ENOTFOUND") || err.message.includes("ECONNRESET") || err.message.includes("EAI_FAIL") || err.message.includes("socket hang up") || err.message.includes("network socket disconnected");
+    if (matches) {
+      return true;
+    }
   }
-  return false;
+  return isClientNetworkError(err.cause);
 };
 async function* upload(files, clientOptions, deploymentOptions) {
   const debug = (0, import_utils.createDebug)(clientOptions.debug);
@@ -83,7 +87,7 @@ async function* upload(files, clientOptions, deploymentOptions) {
     payload: { total: files, missing: shas, uploads }
   };
   const uploadGenerator = uploadFiles({
-    agent: clientOptions.agent,
+    dispatcher: clientOptions.dispatcher,
     apiUrl: clientOptions.apiUrl,
     debug: clientOptions.debug,
     teamId: clientOptions.teamId,
@@ -121,7 +125,6 @@ async function* uploadFiles(options) {
   const uploadList = {};
   debug("Building an upload list...");
   const semaphore = new import_async_sema.Sema(50, { capacity: 50 });
-  const defaultAgent = options.apiUrl?.startsWith("https://") ? new import_https.default.Agent({ keepAlive: true }) : new import_http.default.Agent({ keepAlive: true });
   const abortControllers = /* @__PURE__ */ new Set();
   let aborted = false;
   options.shas.forEach((sha, index) => {
@@ -142,35 +145,27 @@ async function* uploadFiles(options) {
         uploadProgress.bytesUploaded = 0;
         let body;
         let contentLength;
+        const counter = new import_stream.Transform({
+          transform(chunk, _encoding, callback) {
+            uploadProgress.bytesUploaded += chunk.length;
+            uploadProgress.emit("progress");
+            callback(null, chunk);
+          }
+        });
         if (typeof data !== "undefined") {
           contentLength = data.length;
-          const buffered = new import_stream.Readable();
-          const originalRead = buffered.read.bind(buffered);
-          buffered.read = function(...args) {
-            const chunk = originalRead(...args);
-            if (chunk) {
-              uploadProgress.bytesUploaded += chunk.length;
-              uploadProgress.emit("progress");
-            }
-            return chunk;
-          };
           const chunkSize = 16384;
-          for (let i = 0; i < data.length; i += chunkSize) {
-            const chunk = data.slice(i, i + chunkSize);
-            buffered.push(chunk);
+          function* chunks() {
+            for (let i = 0; i < data.length; i += chunkSize) {
+              yield data.slice(i, i + chunkSize);
+            }
           }
-          buffered.push(null);
-          body = buffered;
+          const buffered = import_stream.Readable.from(chunks());
+          buffered.on("error", (err2) => counter.destroy(err2));
+          body = buffered.pipe(counter);
         } else if (typeof size === "number") {
           contentLength = size;
           const fileStream = (0, import_fs.createReadStream)(names[0]);
-          const counter = new import_stream.Transform({
-            transform(chunk, _encoding, callback) {
-              uploadProgress.bytesUploaded += chunk.length;
-              uploadProgress.emit("progress");
-              callback(null, chunk);
-            }
-          });
           fileStream.on("error", (err2) => counter.destroy(err2));
           counter.on("close", () => fileStream.destroy());
           body = fileStream.pipe(counter);
@@ -187,19 +182,18 @@ async function* uploadFiles(options) {
             import_utils.API_FILES,
             options.token,
             {
-              agent: options.agent || defaultAgent,
+              dispatcher: options.dispatcher,
               method: "POST",
               headers: {
                 "Content-Type": "application/octet-stream",
-                "Content-Length": contentLength,
+                "Content-Length": String(contentLength),
                 "x-now-digest": sha,
-                "x-now-size": contentLength
+                "x-now-size": String(contentLength)
               },
               body,
               teamId: options.teamId,
               apiUrl: options.apiUrl,
               userAgent: options.userAgent,
-              // @ts-expect-error: typescript is getting confused with the signal types from node (web & server) and node-fetch (server only)
               signal: abortController.signal
             },
             options.debug
@@ -226,7 +220,7 @@ async function* uploadFiles(options) {
         } catch (e) {
           debug(`An unexpected error occurred in upload promise:
 ${e}`);
-          err = new Error(e);
+          err = e instanceof Error ? e : new Error(String(e));
         }
         semaphore.release();
         if (err) {

package/dist/utils/index.d.ts

@@ -1,7 +1,7 @@
 import { FilesMap } from './hashes';
-import { RequestInit } from 'node-fetch';
+import { Readable } from 'stream';
 import ignore from 'ignore';
-import { VercelClientOptions, VercelConfig } from '../types';
+import { FetchDispatcher, VercelClientOptions, VercelConfig } from '../types';
 type Ignore = ReturnType<typeof ignore>;
 export declare const API_FILES = "/v2/files";
 declare const EVENTS_ARRAY: readonly ["hashes-calculated", "file-count", "file-uploaded", "all-files-uploaded", "created", "building", "ready", "alias-assigned", "warning", "error", "notice", "tip", "canceled", "checks-registered", "checks-completed", "checks-running", "checks-conclusion-succeeded", "checks-conclusion-failed", "checks-conclusion-skipped", "checks-conclusion-canceled", "checks-v2-failed"];
@@ -17,7 +17,8 @@ export declare function getVercelIgnore(cwd: string | string[], prebuilt?: boole
     ig: Ignore;
     ignores: string[];
 }>;
-interface FetchOpts extends RequestInit {
+type NativeRequestInit = NonNullable<Parameters<typeof globalThis.fetch>[1]>;
+interface FetchOpts extends Omit<NativeRequestInit, 'body' | 'headers' | 'dispatcher'> {
     apiUrl?: string;
     method?: string;
     teamId?: string;
@@ -25,6 +26,8 @@ interface FetchOpts extends RequestInit {
         [key: string]: any;
     };
     userAgent?: string;
+    body?: NonNullable<NativeRequestInit['body']> | Buffer | Readable;
+    dispatcher?: FetchDispatcher;
 }
 export declare const fetchApi: (url: string, token: string, opts?: FetchOpts, debugEnabled?: boolean) => Promise<any>;
 export interface PreparedFile {

package/dist/utils/index.js

@@ -39,8 +39,8 @@ __export(utils_exports, {
   prepareFiles: () => prepareFiles
 });
 module.exports = __toCommonJS(utils_exports);
-var import_node_fetch = __toESM(require("node-fetch"));
 var import_path = require("path");
+var import_stream = require("stream");
 var import_url = require("url");
 var import_ignore = __toESM(require("ignore"));
 var import_pkg = require("../pkg");
@@ -320,10 +320,13 @@ const fetchApi = async (url, token, opts = {}, debugEnabled) => {
     accept: "application/json",
     "user-agent": userAgent
   };
+  if (opts.body instanceof import_stream.Readable) {
+    opts.duplex = "half";
+  }
   debug(`${opts.method || "GET"} ${url}`);
   time = Date.now();
   try {
-    const res = await (0, import_node_fetch.default)(url, opts);
+    const res = await fetch(url, opts);
     debug(`DONE in ${Date.now() - time}ms: ${opts.method || "GET"} ${url}`);
     return res;
   } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "17.6.4",
+  "version": "18.0.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -22,7 +22,6 @@
     "@types/minimatch": "3.0.5",
     "@types/ms": "0.7.30",
     "@types/node": "20.11.0",
-    "@types/node-fetch": "2.5.4",
     "@types/recursive-readdir": "2.2.0",
     "@types/tar-fs": "1.16.1",
     "vitest": "2.0.1"
@@ -35,13 +34,12 @@
     "ignore": "4.0.6",
     "minimatch": "5.0.1",
     "ms": "2.1.2",
-    "node-fetch": "2.6.7",
     "querystring": "^0.2.0",
     "sleep-promise": "8.0.1",
     "tar-fs": "1.16.3",
-    "@vercel/build-utils": "13.32.3",
-    "@vercel/routing-utils": "6.4.0",
-    "@vercel/error-utils": "2.2.0"
+    "@vercel/error-utils": "2.2.0",
+    "@vercel/build-utils": "13.33.1",
+    "@vercel/routing-utils": "6.4.0"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",