@vercel/client 13.4.19 → 13.4.20

package/dist/upload.js

@@ -34,7 +34,7 @@ module.exports = __toCommonJS(upload_exports);
 var import_http = __toESM(require("http"));
 var import_https = __toESM(require("https"));
 var import_stream = require("stream");
-var import_node_events = __toESM(require("node:events"));
+var import_node_events = require("node:events");
 var import_async_retry = __toESM(require("async-retry"));
 var import_async_sema = require("async-sema");
 var import_utils = require("./utils");
@@ -82,8 +82,8 @@ async function* upload(files, clientOptions, deploymentOptions) {
   debug("Building an upload list...");
   const semaphore = new import_async_sema.Sema(50, { capacity: 50 });
   const defaultAgent = apiUrl?.startsWith("https://") ? new import_https.default.Agent({ keepAlive: true }) : new import_http.default.Agent({ keepAlive: true });
-  const abortController = new AbortController();
-  import_node_events.default.setMaxListeners(50);
+  const abortControllers = /* @__PURE__ */ new Set();
+  let aborted = false;
   shas.forEach((sha, index) => {
     const uploadProgress = uploads[index];
     uploadList[sha] = (0, import_async_retry.default)(
@@ -94,6 +94,9 @@ async function* upload(files, clientOptions, deploymentOptions) {
           return bail(new Error(`File ${sha} is undefined`));
         }
         await semaphore.acquire();
+        if (aborted) {
+          return bail(new Error("Upload aborted"));
+        }
         const { data } = file;
         if (typeof data === "undefined") {
           return;
@@ -117,6 +120,8 @@ async function* upload(files, clientOptions, deploymentOptions) {
         body.push(null);
         let err;
         let result;
+        const abortController = new AbortController();
+        abortControllers.add(abortController);
         try {
           const res = await (0, import_utils.fetch)(
             import_utils.API_FILES,
@@ -170,10 +175,14 @@ ${e}`);
             throw err;
           } else {
             debug("Other error, bailing: " + err.message);
-            abortController.abort();
+            if (!aborted) {
+              aborted = true;
+              abortControllers.forEach((controller) => controller.abort());
+            }
             return bail(err);
           }
         }
+        abortControllers.delete(abortController);
         return result;
       },
       {
@@ -186,9 +195,7 @@ ${e}`);
   debug("Starting upload");
   while (Object.keys(uploadList).length > 0) {
     try {
-      const event = await Promise.race(
-        Object.keys(uploadList).map((key) => uploadList[key])
-      );
+      const event = await Promise.race(Object.values(uploadList));
       delete uploadList[event.payload.sha];
       yield event;
     } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "13.4.19",
+  "version": "13.4.20",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -27,6 +27,7 @@
     "@types/recursive-readdir": "2.2.0",
     "@types/tar-fs": "1.16.1",
     "jest-junit": "16.0.0",
+    "vitest": "2.0.1",
     "typescript": "4.9.5"
   },
   "dependencies": {
@@ -46,9 +47,10 @@
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",
-    "test-e2e": "pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
-    "test-unit": "pnpm test tests/unit.*test.*",
+    "vitest-run": "vitest -c ./vitest.config.mts",
+    "vitest-unit": "glob --absolute 'tests/unit.*.test.ts'",
+    "vitest-e2e": "glob --absolute 'tests/integration-*.test.ts'",
     "type-check": "tsc --noEmit"
   }
 }