@automattic/vip 4.0.6 → 4.0.8

package/dist/lib/client-file-uploader.js

@@ -43,6 +43,45 @@ function parseEtagHeader(etag) {
   }
   return normalizedEtag.replace(/^"(.*)"$/u, '$1');
 }
+const isStreamBody = body => typeof body?.pipe === 'function';
+function createProgressTransform(onChunk) {
+  return new _stream.Transform({
+    transform(chunk, _encoding, callback) {
+      onChunk(chunk);
+      callback(null, chunk);
+    }
+  });
+}
+function omitUnsupportedFetchHeaders(init) {
+  if (!init.headers) {
+    return init;
+  }
+  const headers = new _undici.Headers(init.headers);
+  headers.delete('expect');
+  return {
+    ...init,
+    headers
+  };
+}
+function withCauseMessage(err) {
+  if (!(err instanceof Error)) {
+    return err;
+  }
+  const cause = err.cause;
+  let causeMessage;
+  if (cause instanceof Error) {
+    causeMessage = cause.message;
+  } else if (typeof cause === 'string') {
+    causeMessage = cause;
+  }
+  if (!causeMessage || err.message.includes(causeMessage)) {
+    return err;
+  }
+  return new Error(`${err.message}: ${causeMessage}`, {
+    cause: err
+  });
+}
+
 /**
  * Wraps `fetch` with exponential-backoff retries.
  *
@@ -58,20 +97,25 @@ function parseEtagHeader(etag) {
  * once so the underlying error surfaces instead of the misleading undici one.
  */
 async function fetchWithRetry(input, init = {}, retries = 3, createBody) {
-  const bodyIsStream = typeof init.body?.pipe === 'function';
+  const bodyIsStream = isStreamBody(init.body);
   // Only retry when we can hand `fetch` a fresh, replayable body each attempt.
   const maxAttempts = createBody || !bodyIsStream ? retries : 0;
   for (let attempt = 0; attempt <= maxAttempts; attempt++) {
     const requestInit = createBody ? {
       ...init,
       body: createBody()
-    } : init;
+    } : {
+      ...init
+    };
+    if (isStreamBody(requestInit.body) && !requestInit.duplex) {
+      requestInit.duplex = 'half';
+    }
     try {
       // eslint-disable-next-line no-await-in-loop
-      return await (0, _undici.fetch)(input, requestInit);
+      return await (0, _undici.fetch)(input, omitUnsupportedFetchHeaders(requestInit));
     } catch (err) {
       if (attempt === maxAttempts) {
-        throw err;
+        throw withCauseMessage(err);
       }
       // eslint-disable-next-line no-await-in-loop
       await (0, _promises3.setTimeout)(Math.pow(2, attempt) * 1000); // 1000, 2000, 4000
@@ -253,8 +297,7 @@ async function uploadUsingPutObject({
       return fileContent;
     }
     let readBytes = 0;
-    const progressPassThrough = new _stream.PassThrough();
-    progressPassThrough.on('data', data => {
+    const progressTransform = createProgressTransform(data => {
       readBytes += data.length;
       const percentage = `${Math.floor(100 * readBytes / fileSize)}%`;
       debug(percentage);
@@ -262,7 +305,7 @@ async function uploadUsingPutObject({
         progressCallback(percentage);
       }
     });
-    return (0, _fs.createReadStream)(fileName).pipe(progressPassThrough);
+    return (0, _fs.createReadStream)(fileName).pipe(progressTransform);
   };
   const response = await fetchWithRetry(presignedRequest.url, fetchOptions, 3, createBody);
   if (response.status === 200) {
@@ -500,15 +543,14 @@ async function uploadParts({
     const createBody = () => {
       partBytesRead[index] = 0;
       partPercentages[index] = 0;
-      const progressPassThrough = new _stream.PassThrough();
-      progressPassThrough.on('data', data => {
+      const progressTransform = createProgressTransform(data => {
         partBytesRead[index] += data.length;
         partPercentages[index] = Math.floor(100 * partBytesRead[index] / partSize);
       });
       return (0, _fs.createReadStream)(fileMeta.fileName, {
         start,
         end
-      }).pipe(progressPassThrough);
+      }).pipe(progressTransform);
     };
     await readyForPartUpload();
     const uploadResult = await uploadPart({

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "4.0.6",
+      "version": "4.0.8",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {