@liveblocks/node 3.23.0-file3 → 3.23.0

package/dist/index.cjs

@@ -3,7 +3,7 @@ var _core = require('@liveblocks/core');
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/node";
-var PKG_VERSION = "3.23.0-file3";
+var PKG_VERSION = "3.23.0";
 var PKG_FORMAT = "cjs";
 
 // src/client.ts
@@ -34,6 +34,7 @@ var PKG_FORMAT = "cjs";
 
 
 
+
 
 
 // src/lib/itertools.ts
@@ -294,9 +295,9 @@ var Session = (_class = class {
 }, _class);
 
 // src/client.ts
-var STORAGE_FILE_PART_SIZE = 5 * 1024 * 1024;
-var STORAGE_FILE_RETRY_ATTEMPTS = 10;
-var STORAGE_FILE_RETRY_DELAYS = [
+var ROOM_FILE_PART_SIZE = 5 * 1024 * 1024;
+var ROOM_FILE_RETRY_ATTEMPTS = 10;
+var ROOM_FILE_RETRY_DELAYS = [
   2e3,
   2e3,
   2e3,
@@ -308,10 +309,11 @@ var STORAGE_FILE_RETRY_DELAYS = [
   2e3,
   2e3
 ];
-async function uploadStorageFile({
+async function uploadRoomFile({
   file,
   signal,
   abortErrorMessage,
+  retryMultipartCompletion,
   uploadSingle,
   createMultipartUpload,
   uploadMultipartPart,
@@ -328,49 +330,90 @@ async function uploadStorageFile({
     }
     return err instanceof LiveblocksError && err.status >= 400 && err.status < 500;
   };
-  if (file.size <= STORAGE_FILE_PART_SIZE) {
+  if (file.size <= ROOM_FILE_PART_SIZE) {
     return _core.autoRetry.call(void 0, 
       uploadSingle,
-      STORAGE_FILE_RETRY_ATTEMPTS,
-      STORAGE_FILE_RETRY_DELAYS,
+      ROOM_FILE_RETRY_ATTEMPTS,
+      ROOM_FILE_RETRY_DELAYS,
       handleRetryError
     );
   }
   let uploadId;
   const uploadedParts = [];
-  const multipartUpload = await createMultipartUpload();
+  const multipartUpload = await _core.autoRetry.call(void 0, 
+    createMultipartUpload,
+    ROOM_FILE_RETRY_ATTEMPTS,
+    ROOM_FILE_RETRY_DELAYS,
+    handleRetryError
+  );
+  const partUploadController = new AbortController();
+  const partUploadSignal = partUploadController.signal;
+  const abortPartUploads = (reason) => {
+    partUploadController.abort(reason);
+  };
+  const handleExternalAbort = () => abortPartUploads();
+  if (_optionalChain([signal, 'optionalAccess', _4 => _4.aborted])) {
+    handleExternalAbort();
+  } else {
+    _optionalChain([signal, 'optionalAccess', _5 => _5.addEventListener, 'call', _6 => _6("abort", handleExternalAbort, { once: true })]);
+  }
   try {
     uploadId = multipartUpload.uploadId;
-    if (_optionalChain([signal, 'optionalAccess', _4 => _4.aborted])) {
+    if (_optionalChain([signal, 'optionalAccess', _7 => _7.aborted])) {
       throw abortError;
     }
-    const batches = _core.chunk.call(void 0, splitStorageFileIntoParts(file), 5);
+    const batches = _core.chunk.call(void 0, splitRoomFileIntoParts(file), 5);
     for (const parts of batches) {
-      const uploadedPartPromises = [];
+      const firstPartUploadFailure = {};
+      const partUploads$ = [];
       for (const { part, partNumber } of parts) {
-        uploadedPartPromises.push(
+        partUploads$.push(
           _core.autoRetry.call(void 0, 
-            () => uploadMultipartPart(multipartUpload.uploadId, partNumber, part),
-            STORAGE_FILE_RETRY_ATTEMPTS,
-            STORAGE_FILE_RETRY_DELAYS,
-            handleRetryError
-          )
+            () => uploadMultipartPart(
+              multipartUpload.uploadId,
+              partNumber,
+              part,
+              partUploadSignal
+            ),
+            ROOM_FILE_RETRY_ATTEMPTS,
+            ROOM_FILE_RETRY_DELAYS,
+            (error) => {
+              if (_optionalChain([signal, 'optionalAccess', _8 => _8.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 (_optionalChain([signal, 'optionalAccess', _5 => _5.aborted])) {
+    if (_optionalChain([signal, 'optionalAccess', _9 => _9.aborted])) {
       throw abortError;
     }
     const sortedParts = uploadedParts.sort(
       (a, b) => a.partNumber - b.partNumber
     );
-    return _core.autoRetry.call(void 0, 
+    return retryMultipartCompletion ? _core.autoRetry.call(void 0, 
       () => completeMultipartUpload(multipartUpload.uploadId, sortedParts),
-      STORAGE_FILE_RETRY_ATTEMPTS,
-      STORAGE_FILE_RETRY_DELAYS,
+      ROOM_FILE_RETRY_ATTEMPTS,
+      ROOM_FILE_RETRY_DELAYS,
       handleRetryError
-    );
+    ) : completeMultipartUpload(uploadId, sortedParts);
   } catch (err) {
     if (uploadId) {
       try {
@@ -379,13 +422,15 @@ async function uploadStorageFile({
       }
     }
     throw err;
+  } finally {
+    _optionalChain([signal, 'optionalAccess', _10 => _10.removeEventListener, 'call', _11 => _11("abort", handleExternalAbort)]);
   }
 }
-function splitStorageFileIntoParts(file) {
+function splitRoomFileIntoParts(file) {
   const parts = [];
   let start = 0;
   while (start < file.size) {
-    const end = Math.min(start + STORAGE_FILE_PART_SIZE, file.size);
+    const end = Math.min(start + ROOM_FILE_PART_SIZE, file.size);
     parts.push({
       partNumber: parts.length + 1,
       part: file.slice(start, end)
@@ -483,7 +528,7 @@ var Liveblocks = class {
       method: "POST",
       headers,
       body: JSON.stringify(json),
-      signal: _optionalChain([options, 'optionalAccess', _6 => _6.signal])
+      signal: _optionalChain([options, 'optionalAccess', _12 => _12.signal])
     });
     xwarn(res, "POST", path);
     return res;
@@ -505,7 +550,7 @@ var Liveblocks = class {
       method: "PATCH",
       headers,
       body: JSON.stringify(json),
-      signal: _optionalChain([options, 'optionalAccess', _7 => _7.signal])
+      signal: _optionalChain([options, 'optionalAccess', _13 => _13.signal])
     });
     xwarn(res, "PATCH", path);
     return res;
@@ -521,7 +566,7 @@ var Liveblocks = class {
       method: "PUT",
       headers,
       body,
-      signal: _optionalChain([options, 'optionalAccess', _8 => _8.signal])
+      signal: _optionalChain([options, 'optionalAccess', _14 => _14.signal])
     });
     xwarn(res, "PUT", path);
     return res;
@@ -537,7 +582,7 @@ var Liveblocks = class {
       method: "PUT",
       headers,
       body,
-      signal: _optionalChain([options, 'optionalAccess', _9 => _9.signal])
+      signal: _optionalChain([options, 'optionalAccess', _15 => _15.signal])
     });
     xwarn(res, "PUT", path);
     return res;
@@ -551,7 +596,7 @@ var Liveblocks = class {
     const res = await fetch(url3, {
       method: "DELETE",
       headers,
-      signal: _optionalChain([options, 'optionalAccess', _10 => _10.signal])
+      signal: _optionalChain([options, 'optionalAccess', _16 => _16.signal])
     });
     xwarn(res, "DELETE", path);
     return res;
@@ -565,7 +610,7 @@ var Liveblocks = class {
     const res = await fetch(url3, {
       method: "GET",
       headers,
-      signal: _optionalChain([options, 'optionalAccess', _11 => _11.signal])
+      signal: _optionalChain([options, 'optionalAccess', _17 => _17.signal])
     });
     xwarn(res, "GET", path);
     return res;
@@ -596,8 +641,8 @@ var Liveblocks = class {
     return new Session(
       this.#post.bind(this),
       userId,
-      _optionalChain([options, 'optionalAccess', _12 => _12.userInfo]),
-      _nullishCoalesce(_optionalChain([options, 'optionalAccess', _13 => _13.organizationId]), () => ( _optionalChain([options, 'optionalAccess', _14 => _14.tenantId]))),
+      _optionalChain([options, 'optionalAccess', _18 => _18.userInfo]),
+      _nullishCoalesce(_optionalChain([options, 'optionalAccess', _19 => _19.organizationId]), () => ( _optionalChain([options, 'optionalAccess', _20 => _20.tenantId]))),
       this.#localDev
     );
   }
@@ -647,7 +692,7 @@ var Liveblocks = class {
     const body = {
       userId,
       groupIds,
-      userInfo: _optionalChain([options, 'optionalAccess', _15 => _15.userInfo])
+      userInfo: _optionalChain([options, 'optionalAccess', _21 => _21.userInfo])
     };
     if (organizationId !== void 0) {
       body.organizationId = organizationId;
@@ -733,7 +778,7 @@ var Liveblocks = class {
    */
   async *iterRooms(criteria, options) {
     const { signal } = _nullishCoalesce(options, () => ( {}));
-    const pageSize = _core.checkBounds.call(void 0, "pageSize", _nullishCoalesce(_optionalChain([options, 'optionalAccess', _16 => _16.pageSize]), () => ( 40)), 20);
+    const pageSize = _core.checkBounds.call(void 0, "pageSize", _nullishCoalesce(_optionalChain([options, 'optionalAccess', _22 => _22.pageSize]), () => ( 40)), 20);
     let cursor = void 0;
     while (true) {
       const { nextCursor, data } = await this.getRooms(
@@ -783,7 +828,7 @@ var Liveblocks = class {
       body.organizationId = tenantId;
     }
     const res = await this.#post(
-      _optionalChain([options, 'optionalAccess', _17 => _17.idempotent]) ? _core.url`/v2/rooms?idempotent` : _core.url`/v2/rooms`,
+      _optionalChain([options, 'optionalAccess', _23 => _23.idempotent]) ? _core.url`/v2/rooms?idempotent` : _core.url`/v2/rooms`,
       body,
       options
     );
@@ -1309,6 +1354,7 @@ var Liveblocks = class {
    * @param params.data.userId The user ID of the user who is set to create the comment.
    * @param params.data.createdAt (optional) The date the comment is set to be created.
    * @param params.data.body The body of the comment.
+   * @param params.data.attachmentIds (optional) The attachment IDs to add to the comment.
    * @param params.data.metadata (optional) The metadata for the comment.
    * @param options.signal (optional) An abort signal to cancel the request.
    * @returns The created comment.
@@ -1319,7 +1365,7 @@ var Liveblocks = class {
       _core.url`/v2/rooms/${roomId}/threads/${threadId}/comments`,
       {
         ...data,
-        createdAt: _optionalChain([data, 'access', _18 => _18.createdAt, 'optionalAccess', _19 => _19.toISOString, 'call', _20 => _20()])
+        createdAt: _optionalChain([data, 'access', _24 => _24.createdAt, 'optionalAccess', _25 => _25.toISOString, 'call', _26 => _26()])
       },
       options
     );
@@ -1334,6 +1380,7 @@ var Liveblocks = class {
    * @param params.threadId The thread ID to edit the comment in.
    * @param params.commentId The comment ID to edit.
    * @param params.data.body The body of the comment.
+   * @param params.data.attachmentIds (optional) The IDs of every attachment that should remain on the comment.
    * @param params.data.metadata (optional) The metadata for the comment. Value must be a string, boolean or number. Use null to delete a key.
    * @param params.data.editedAt (optional) The date the comment was edited.
    * @param options.signal (optional) An abort signal to cancel the request.
@@ -1345,7 +1392,8 @@ var Liveblocks = class {
       _core.url`/v2/rooms/${roomId}/threads/${threadId}/comments/${commentId}`,
       {
         body: data.body,
-        editedAt: _optionalChain([data, 'access', _21 => _21.editedAt, 'optionalAccess', _22 => _22.toISOString, 'call', _23 => _23()]),
+        editedAt: _optionalChain([data, 'access', _27 => _27.editedAt, 'optionalAccess', _28 => _28.toISOString, 'call', _29 => _29()]),
+        attachmentIds: data.attachmentIds,
         metadata: data.metadata
       },
       options
@@ -1393,13 +1441,77 @@ var Liveblocks = class {
     }
     return await res.json();
   }
+  /**
+   * Uploads an attachment that can be added to a comment.
+   *
+   * @param params.roomId The room ID to upload the attachment to.
+   * @param params.userId The user ID of the user uploading the attachment.
+   * @param params.file The file to upload.
+   * @param options.signal (optional) An abort signal to cancel the upload.
+   * @returns The uploaded attachment.
+   */
+  async uploadAttachment(params, options) {
+    const { roomId, userId, file } = params;
+    const attachmentId = _core.createCommentAttachmentId.call(void 0, );
+    return await uploadRoomFile({
+      file,
+      signal: _optionalChain([options, 'optionalAccess', _30 => _30.signal]),
+      abortErrorMessage: `Upload of attachment ${attachmentId} was aborted.`,
+      retryMultipartCompletion: false,
+      uploadSingle: async () => {
+        const res = await this.#putBlob(
+          _core.url`/v2/rooms/${roomId}/attachments/${attachmentId}/upload/${file.name}`,
+          file,
+          { fileSize: file.size, userId },
+          options
+        );
+        return await this.#readJsonResponse(res);
+      },
+      createMultipartUpload: async () => {
+        const res = await this.#post(
+          _core.url`/v2/rooms/${roomId}/attachments/${attachmentId}/multipart/${file.name}`,
+          void 0,
+          options,
+          { fileSize: file.size }
+        );
+        return await this.#readJsonResponse(res);
+      },
+      uploadMultipartPart: async (uploadId, partNumber, part, signal) => {
+        const res = await this.#putBlob(
+          _core.url`/v2/rooms/${roomId}/attachments/${attachmentId}/multipart/${uploadId}/${String(partNumber)}`,
+          part,
+          void 0,
+          { signal }
+        );
+        return await this.#readJsonResponse(res);
+      },
+      completeMultipartUpload: async (uploadId, parts) => {
+        const res = await this.#post(
+          _core.url`/v2/rooms/${roomId}/attachments/${attachmentId}/multipart/${uploadId}/complete`,
+          { parts },
+          options,
+          { userId }
+        );
+        return await this.#readJsonResponse(res);
+      },
+      abortMultipartUpload: async (uploadId) => {
+        const res = await this.#delete(
+          _core.url`/v2/rooms/${roomId}/attachments/${attachmentId}/multipart/${uploadId}`
+        );
+        if (!res.ok) {
+          throw await LiveblocksError.from(res);
+        }
+      }
+    });
+  }
   async uploadFile(params, options) {
     const { roomId, file } = params;
     const fileId = _core.createStorageFileId.call(void 0, );
-    const fileData = await uploadStorageFile({
+    const fileData = await uploadRoomFile({
       file,
-      signal: _optionalChain([options, 'optionalAccess', _24 => _24.signal]),
+      signal: _optionalChain([options, 'optionalAccess', _31 => _31.signal]),
       abortErrorMessage: `Upload of file ${fileId} was aborted.`,
+      retryMultipartCompletion: true,
       uploadSingle: async () => {
         const res = await this.#putBlob(
           _core.url`/v2/rooms/${roomId}/storage/files/${fileId}/upload/${file.name}`,
@@ -1418,12 +1530,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(
           _core.url`/v2/rooms/${roomId}/storage/files/${fileId}/multipart/${uploadId}/${String(partNumber)}`,
           part,
           void 0,
-          options
+          { signal }
         );
         return await this.#readJsonResponse(res);
       },
@@ -1468,6 +1580,7 @@ var Liveblocks = class {
    * @param params.thread.comment.userId The user ID of the user who created the comment.
    * @param params.thread.comment.createdAt (optional) The date the comment was created.
    * @param params.thread.comment.body The body of the comment.
+   * @param params.thread.comment.attachmentIds (optional) The attachment IDs to add to the comment.
    * @param params.thread.comment.metadata (optional) The metadata for the comment.
    * @param options.signal (optional) An abort signal to cancel the request.
    * @returns The created thread. The thread will be created with the specified comment as its first comment.
@@ -1480,7 +1593,7 @@ var Liveblocks = class {
         ...data,
         comment: {
           ...data.comment,
-          createdAt: _optionalChain([data, 'access', _25 => _25.comment, 'access', _26 => _26.createdAt, 'optionalAccess', _27 => _27.toISOString, 'call', _28 => _28()])
+          createdAt: _optionalChain([data, 'access', _32 => _32.comment, 'access', _33 => _33.createdAt, 'optionalAccess', _34 => _34.toISOString, 'call', _35 => _35()])
         }
       },
       options
@@ -1603,7 +1716,7 @@ var Liveblocks = class {
       _core.url`/v2/rooms/${roomId}/threads/${threadId}/metadata`,
       {
         ...data,
-        updatedAt: _optionalChain([data, 'access', _29 => _29.updatedAt, 'optionalAccess', _30 => _30.toISOString, 'call', _31 => _31()])
+        updatedAt: _optionalChain([data, 'access', _36 => _36.updatedAt, 'optionalAccess', _37 => _37.toISOString, 'call', _38 => _38()])
       },
       options
     );
@@ -1629,7 +1742,7 @@ var Liveblocks = class {
       _core.url`/v2/rooms/${roomId}/threads/${threadId}/comments/${commentId}/metadata`,
       {
         ...data,
-        updatedAt: _optionalChain([data, 'access', _32 => _32.updatedAt, 'optionalAccess', _33 => _33.toISOString, 'call', _34 => _34()])
+        updatedAt: _optionalChain([data, 'access', _39 => _39.updatedAt, 'optionalAccess', _40 => _40.toISOString, 'call', _41 => _41()])
       },
       options
     );
@@ -1655,7 +1768,7 @@ var Liveblocks = class {
       _core.url`/v2/rooms/${roomId}/threads/${threadId}/comments/${commentId}/add-reaction`,
       {
         ...data,
-        createdAt: _optionalChain([data, 'access', _35 => _35.createdAt, 'optionalAccess', _36 => _36.toISOString, 'call', _37 => _37()])
+        createdAt: _optionalChain([data, 'access', _42 => _42.createdAt, 'optionalAccess', _43 => _43.toISOString, 'call', _44 => _44()])
       },
       options
     );
@@ -1681,7 +1794,7 @@ var Liveblocks = class {
       _core.url`/v2/rooms/${roomId}/threads/${threadId}/comments/${params.commentId}/remove-reaction`,
       {
         ...data,
-        removedAt: _optionalChain([data, 'access', _38 => _38.removedAt, 'optionalAccess', _39 => _39.toISOString, 'call', _40 => _40()])
+        removedAt: _optionalChain([data, 'access', _45 => _45.removedAt, 'optionalAccess', _46 => _46.toISOString, 'call', _47 => _47()])
       },
       options
     );
@@ -1762,7 +1875,7 @@ var Liveblocks = class {
    */
   async *iterInboxNotifications(criteria, options) {
     const { signal } = _nullishCoalesce(options, () => ( {}));
-    const pageSize = _core.checkBounds.call(void 0, "pageSize", _nullishCoalesce(_optionalChain([options, 'optionalAccess', _41 => _41.pageSize]), () => ( 50)), 10);
+    const pageSize = _core.checkBounds.call(void 0, "pageSize", _nullishCoalesce(_optionalChain([options, 'optionalAccess', _48 => _48.pageSize]), () => ( 50)), 10);
     let cursor = void 0;
     while (true) {
       const { nextCursor, data } = await this.getInboxNotifications(
@@ -2109,7 +2222,7 @@ var Liveblocks = class {
   async getGroups(params, options) {
     const res = await this.#get(
       _core.url`/v2/groups`,
-      { startingAfter: _optionalChain([params, 'optionalAccess', _42 => _42.startingAfter]), limit: _optionalChain([params, 'optionalAccess', _43 => _43.limit]) },
+      { startingAfter: _optionalChain([params, 'optionalAccess', _49 => _49.startingAfter]), limit: _optionalChain([params, 'optionalAccess', _50 => _50.limit]) },
       options
     );
     if (!res.ok) {
@@ -2171,7 +2284,7 @@ var Liveblocks = class {
   async massMutateStorage(criteria, callback, massOptions) {
     const concurrency = _core.checkBounds.call(void 0, 
       "concurrency",
-      _nullishCoalesce(_optionalChain([massOptions, 'optionalAccess', _44 => _44.concurrency]), () => ( 8)),
+      _nullishCoalesce(_optionalChain([massOptions, 'optionalAccess', _51 => _51.concurrency]), () => ( 8)),
       1,
       20
     );
@@ -2187,7 +2300,7 @@ var Liveblocks = class {
   }
   async #_mutateOneRoom(roomId, room, callback, options) {
     const debounceInterval = 200;
-    const { signal, abort } = _core.makeAbortController.call(void 0, _optionalChain([options, 'optionalAccess', _45 => _45.signal]));
+    const { signal, abort } = _core.makeAbortController.call(void 0, _optionalChain([options, 'optionalAccess', _52 => _52.signal]));
     let opsBuffer = [];
     let outstandingFlush$ = void 0;
     let lastFlush = performance.now();
@@ -2253,7 +2366,7 @@ var Liveblocks = class {
     const res = await this.#post(
       _core.url`/v2/rooms/${roomId}/send-message`,
       { messages },
-      { signal: _optionalChain([options, 'optionalAccess', _46 => _46.signal]) }
+      { signal: _optionalChain([options, 'optionalAccess', _53 => _53.signal]) }
     );
     if (!res.ok) {
       throw await LiveblocksError.from(res);
@@ -2390,7 +2503,7 @@ var Liveblocks = class {
           "Content-Type": params.file.type,
           "Content-Length": String(params.file.size)
         },
-        signal: _optionalChain([options, 'optionalAccess', _47 => _47.signal])
+        signal: _optionalChain([options, 'optionalAccess', _54 => _54.signal])
       }
     );
     if (!res.ok) {
@@ -2766,7 +2879,7 @@ var WHITESPACE_REGEX = /\s/;
 var MarkedCustomTokenizer = class extends _marked.Tokenizer {
   url(src) {
     const token = super.url(src);
-    if (_optionalChain([token, 'optionalAccess', _48 => _48.href, 'access', _49 => _49.startsWith, 'call', _50 => _50("mailto:")])) {
+    if (_optionalChain([token, 'optionalAccess', _55 => _55.href, 'access', _56 => _56.startsWith, 'call', _57 => _57("mailto:")])) {
       return void 0;
     }
     return token;
@@ -2946,7 +3059,7 @@ function tokensToCommentBodyInlines(tokens, formatting = {}) {
       case "escape":
       case "html":
       case "text": {
-        if (token.type === "text" && _optionalChain([token, 'access', _51 => _51.tokens, 'optionalAccess', _52 => _52.length])) {
+        if (token.type === "text" && _optionalChain([token, 'access', _58 => _58.tokens, 'optionalAccess', _59 => _59.length])) {
           appendFormattedInlinesFromTokens(inlines, token.tokens, formatting);
         } else {
           appendTextWithMentions(inlines, token.text, formatting);