@liveblocks/node 3.23.0-file2 → 3.23.0-file4

package/dist/index.js

@@ -3,7 +3,7 @@ import { detectDupes } from "@liveblocks/core";
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/node";
-var PKG_VERSION = "3.23.0-file2";
+var PKG_VERSION = "3.23.0-file4";
 var PKG_FORMAT = "esm";
 
 // src/client.ts
@@ -326,10 +326,7 @@ async function uploadStorageFile({
     if (signal?.aborted) {
       throw abortError;
     }
-    if (err instanceof LiveblocksError && err.status === 413) {
-      throw err;
-    }
-    return false;
+    return err instanceof LiveblocksError && err.status >= 400 && err.status < 500;
   };
   if (file.size <= STORAGE_FILE_PART_SIZE) {
     return autoRetry(
@@ -347,6 +344,17 @@ async function uploadStorageFile({
     STORAGE_FILE_RETRY_DELAYS,
     handleRetryError
   );
+  const partUploadController = new AbortController();
+  const partUploadSignal = partUploadController.signal;
+  const abortPartUploads = (reason) => {
+    partUploadController.abort(reason);
+  };
+  const handleExternalAbort = () => abortPartUploads();
+  if (signal?.aborted) {
+    handleExternalAbort();
+  } else {
+    signal?.addEventListener("abort", handleExternalAbort, { once: true });
+  }
   try {
     uploadId = multipartUpload.uploadId;
     if (signal?.aborted) {
@@ -354,34 +362,66 @@ async function uploadStorageFile({
     }
     const batches = chunk(splitStorageFileIntoParts(file), 5);
     for (const parts of batches) {
-      const uploadedPartPromises = [];
+      const firstPartUploadFailure = {};
+      const partUploads$ = [];
       for (const { part, partNumber } of parts) {
-        uploadedPartPromises.push(
+        partUploads$.push(
           autoRetry(
-            () => uploadMultipartPart(multipartUpload.uploadId, partNumber, part),
+            () => uploadMultipartPart(
+              multipartUpload.uploadId,
+              partNumber,
+              part,
+              partUploadSignal
+            ),
             STORAGE_FILE_RETRY_ATTEMPTS,
             STORAGE_FILE_RETRY_DELAYS,
-            handleRetryError
-          )
+            (error) => {
+              if (signal?.aborted) {
+                throw abortError;
+              }
+              return partUploadSignal.aborted || handleRetryError(error);
+            }
+          ).catch((error) => {
+            if (firstPartUploadFailure.value === void 0) {
+              firstPartUploadFailure.value = { error };
+              abortPartUploads(error);
+            }
+            throw error;
+          })
         );
       }
-      uploadedParts.push(...await Promise.all(uploadedPartPromises));
+      const settledPartUploads = await Promise.allSettled(partUploads$);
+      if (firstPartUploadFailure.value !== void 0) {
+        throw firstPartUploadFailure.value.error;
+      }
+      for (const settledPartUpload of settledPartUploads) {
+        if (settledPartUpload.status === "fulfilled") {
+          uploadedParts.push(settledPartUpload.value);
+        }
+      }
     }
     if (signal?.aborted) {
       throw abortError;
     }
-    return completeMultipartUpload(
-      multipartUpload.uploadId,
-      uploadedParts.sort((a, b) => a.partNumber - b.partNumber)
+    const sortedParts = uploadedParts.sort(
+      (a, b) => a.partNumber - b.partNumber
+    );
+    return autoRetry(
+      () => completeMultipartUpload(multipartUpload.uploadId, sortedParts),
+      STORAGE_FILE_RETRY_ATTEMPTS,
+      STORAGE_FILE_RETRY_DELAYS,
+      handleRetryError
     );
   } catch (err) {
-    if (uploadId && isAbortOrTimeoutError(err)) {
+    if (uploadId) {
       try {
         await abortMultipartUpload(uploadId);
       } catch {
       }
     }
     throw err;
+  } finally {
+    signal?.removeEventListener("abort", handleExternalAbort);
   }
 }
 function splitStorageFileIntoParts(file) {
@@ -397,9 +437,6 @@ function splitStorageFileIntoParts(file) {
   }
   return parts;
 }
-function isAbortOrTimeoutError(err) {
-  return err instanceof Error && (err.name === "AbortError" || err.name === "TimeoutError");
-}
 function createAbortError(message) {
   if (typeof DOMException === "function") {
     return new DOMException(message, "AbortError");
@@ -1424,12 +1461,12 @@ var Liveblocks = class {
         );
         return await this.#readJsonResponse(res);
       },
-      uploadMultipartPart: async (uploadId, partNumber, part) => {
+      uploadMultipartPart: async (uploadId, partNumber, part, signal) => {
         const res = await this.#putBlob(
           url2`/v2/rooms/${roomId}/storage/files/${fileId}/multipart/${uploadId}/${String(partNumber)}`,
           part,
           void 0,
-          options
+          { signal }
         );
         return await this.#readJsonResponse(res);
       },
@@ -3286,10 +3323,10 @@ function isCustomNotificationEvent(event) {
 import {
   getMentionsFromCommentBody,
   isNotificationChannelEnabled,
+  LiveFile as LiveFile2,
   LiveList,
   LiveMap,
   LiveObject as LiveObject2,
-  LiveFile as LiveFile2,
   stringifyCommentBody
 } from "@liveblocks/core";
 detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);