@liveblocks/core 2.7.2 → 2.8.0-beta2

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.7.2";
+var PKG_VERSION = "2.8.0-beta2";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -1871,8 +1871,7 @@ var Batch = class {
     this.clearDelayTimeout();
   }
 };
-function createBatchStore(callback, options) {
-  const batch = new Batch(callback, options);
+function createBatchStore(batch) {
   const cache = /* @__PURE__ */ new Map();
   const eventSource2 = makeEventSource();
   function getCacheKey(args) {
@@ -4796,9 +4795,41 @@ function findNonSerializableValue(value, path = "") {
   return false;
 }
 
+// src/lib/autoRetry.ts
+async function autoRetry(promiseFn, maxTries, backoff, exitCondition) {
+  const fallbackBackoff = backoff.length > 0 ? backoff[backoff.length - 1] : 0;
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    const promise = promiseFn();
+    try {
+      return await promise;
+    } catch (err) {
+      if (exitCondition && exitCondition(err)) {
+        throw err;
+      }
+      if (attempt >= maxTries) {
+        throw new Error(`Failed after ${maxTries} attempts: ${String(err)}`);
+      }
+    }
+    const delay = backoff[attempt - 1] ?? fallbackBackoff;
+    await wait(delay);
+  }
+}
+
+// src/lib/chunk.ts
+function chunk(array, size) {
+  const chunks = [];
+  for (let i = 0, j = array.length; i < j; i += size) {
+    chunks.push(array.slice(i, i + size));
+  }
+  return chunks;
+}
+
 // src/lib/createIds.ts
 var THREAD_ID_PREFIX = "th";
 var COMMENT_ID_PREFIX = "cm";
+var COMMENT_ATTACHMENT_ID_PREFIX = "at";
 var INBOX_NOTIFICATION_ID_PREFIX = "in";
 function createOptimisticId(prefix) {
   return `${prefix}_${nanoid()}`;
@@ -4809,6 +4840,9 @@ function createThreadId() {
 function createCommentId() {
   return createOptimisticId(COMMENT_ID_PREFIX);
 }
+function createCommentAttachmentId() {
+  return createOptimisticId(COMMENT_ATTACHMENT_ID_PREFIX);
+}
 function createInboxNotificationId() {
   return createOptimisticId(INBOX_NOTIFICATION_ID_PREFIX);
 }
@@ -5211,6 +5245,22 @@ function installBackgroundTabSpy() {
   };
   return [inBackgroundSince, unsub];
 }
+var GET_ATTACHMENT_URLS_BATCH_DELAY = 50;
+var ATTACHMENT_PART_SIZE = 5 * 1024 * 1024;
+var ATTACHMENT_PART_BATCH_SIZE = 5;
+function splitFileIntoParts(file) {
+  const parts = [];
+  let start = 0;
+  while (start < file.size) {
+    const end = Math.min(start + ATTACHMENT_PART_SIZE, file.size);
+    parts.push({
+      partNumber: parts.length + 1,
+      part: file.slice(start, end)
+    });
+    start = end;
+  }
+  return parts;
+}
 var CommentsApiError = class extends Error {
   constructor(message, status, details) {
     super(message);
@@ -6504,7 +6554,8 @@ ${Array.from(traces).join("\n\n")}`
     metadata,
     body,
     commentId = createCommentId(),
-    threadId = createThreadId()
+    threadId = createThreadId(),
+    attachmentIds
   }) {
     const thread = await fetchCommentsJson("/threads", {
       method: "POST",
@@ -6515,7 +6566,8 @@ ${Array.from(traces).join("\n\n")}`
         id: threadId,
         comment: {
           id: commentId,
-          body
+          body,
+          attachmentIds
         },
         metadata
       })
@@ -6561,7 +6613,8 @@ ${Array.from(traces).join("\n\n")}`
   async function createComment({
     threadId,
     commentId = createCommentId(),
-    body
+    body,
+    attachmentIds
   }) {
     const comment = await fetchCommentsJson(
       `/threads/${encodeURIComponent(threadId)}/comments`,
@@ -6572,7 +6625,8 @@ ${Array.from(traces).join("\n\n")}`
         },
         body: JSON.stringify({
           id: commentId,
-          body
+          body,
+          attachmentIds
         })
       }
     );
@@ -6581,7 +6635,8 @@ ${Array.from(traces).join("\n\n")}`
   async function editComment({
     threadId,
     commentId,
-    body
+    body,
+    attachmentIds
   }) {
     const comment = await fetchCommentsJson(
       `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
@@ -6593,7 +6648,8 @@ ${Array.from(traces).join("\n\n")}`
           "Content-Type": "application/json"
         },
         body: JSON.stringify({
-          body
+          body,
+          attachmentIds
         })
       }
     );
@@ -6645,6 +6701,165 @@ ${Array.from(traces).join("\n\n")}`
       }
     );
   }
+  function prepareAttachment(file) {
+    return {
+      type: "localAttachment",
+      status: "idle",
+      id: createCommentAttachmentId(),
+      name: file.name,
+      size: file.size,
+      mimeType: file.type,
+      file
+    };
+  }
+  async function uploadAttachment(attachment, options2 = {}) {
+    const abortSignal = options2.signal;
+    const abortError = abortSignal ? new DOMException(
+      `Upload of attachment ${attachment.id} was aborted.`,
+      "AbortError"
+    ) : void 0;
+    if (abortSignal?.aborted) {
+      throw abortError;
+    }
+    if (attachment.size <= ATTACHMENT_PART_SIZE) {
+      return autoRetry(
+        () => fetchCommentsJson(
+          `/attachments/${encodeURIComponent(attachment.id)}/upload/${encodeURIComponent(attachment.name)}`,
+          {
+            method: "PUT",
+            body: attachment.file,
+            signal: abortSignal
+          },
+          {
+            fileSize: attachment.size
+          }
+        ),
+        10,
+        [2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3],
+        () => {
+          if (abortSignal?.aborted) {
+            throw abortError;
+          }
+          return false;
+        }
+      );
+    } else {
+      let uploadId;
+      const uploadedParts = [];
+      const createMultiPartUpload = await autoRetry(
+        () => fetchCommentsJson(
+          `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(attachment.name)}`,
+          {
+            method: "POST",
+            signal: abortSignal
+          },
+          {
+            fileSize: attachment.size
+          }
+        ),
+        10,
+        [2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3],
+        () => {
+          if (abortSignal?.aborted) {
+            throw abortError;
+          }
+          return false;
+        }
+      );
+      try {
+        uploadId = createMultiPartUpload.uploadId;
+        const parts = splitFileIntoParts(attachment.file);
+        if (abortSignal?.aborted) {
+          throw abortError;
+        }
+        const batches = chunk(parts, ATTACHMENT_PART_BATCH_SIZE);
+        for (const parts2 of batches) {
+          const uploadedPartsPromises = [];
+          for (const { part, partNumber } of parts2) {
+            uploadedPartsPromises.push(
+              autoRetry(
+                () => fetchCommentsJson(
+                  `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(createMultiPartUpload.uploadId)}/${encodeURIComponent(partNumber)}`,
+                  {
+                    method: "PUT",
+                    body: part,
+                    signal: abortSignal
+                  }
+                ),
+                10,
+                [2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3, 2e3],
+                () => {
+                  if (abortSignal?.aborted) {
+                    throw abortError;
+                  }
+                  return false;
+                }
+              )
+            );
+          }
+          uploadedParts.push(...await Promise.all(uploadedPartsPromises));
+        }
+        if (abortSignal?.aborted) {
+          throw abortError;
+        }
+        const sortedUploadedParts = uploadedParts.sort(
+          (a, b) => a.partNumber - b.partNumber
+        );
+        return fetchCommentsJson(
+          `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(uploadId)}/complete`,
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({ parts: sortedUploadedParts }),
+            signal: abortSignal
+          }
+        );
+      } catch (error3) {
+        if (uploadId && error3?.name && (error3.name === "AbortError" || error3.name === "TimeoutError")) {
+          try {
+            await fetchCommentsApi(
+              `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(uploadId)}`,
+              void 0,
+              {
+                method: "DELETE"
+              }
+            );
+          } catch (error4) {
+          }
+        }
+        throw error3;
+      }
+    }
+  }
+  async function getAttachmentUrls(attachmentIds) {
+    const { urls } = await fetchCommentsJson(
+      "/attachments/presigned-urls",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ attachmentIds })
+      }
+    );
+    return urls;
+  }
+  const batchedGetAttachmentUrls = new Batch(
+    async (batchedAttachmentIds) => {
+      const attachmentIds = batchedAttachmentIds.flat();
+      const attachmentUrls = await getAttachmentUrls(attachmentIds);
+      return attachmentUrls.map(
+        (url) => url ?? new Error("There was an error while getting this attachment's URL")
+      );
+    },
+    { delay: GET_ATTACHMENT_URLS_BATCH_DELAY }
+  );
+  const attachmentUrlsStore = createBatchStore(batchedGetAttachmentUrls);
+  function getAttachmentUrl(attachmentId) {
+    return batchedGetAttachmentUrls.get(attachmentId);
+  }
   async function fetchNotificationsJson(endpoint, options2) {
     const authValue = await delegates.authenticate();
     const response = await fetchClientApi(
@@ -6760,7 +6975,8 @@ ${Array.from(traces).join("\n\n")}`
           // These exist only for our E2E testing app
           explicitClose: (event) => managedSocket._privateSendMachineEvent({ type: "EXPLICIT_SOCKET_CLOSE", event }),
           rawSend: (data) => managedSocket.send(data)
-        }
+        },
+        attachmentUrlsStore
       },
       id: config.roomId,
       subscribe: makeClassicSubscribeFn(events),
@@ -6815,6 +7031,9 @@ ${Array.from(traces).join("\n\n")}`
       deleteComment,
       addReaction,
       removeReaction,
+      prepareAttachment,
+      uploadAttachment,
+      getAttachmentUrl,
       // Notifications
       getNotificationSettings,
       updateNotificationSettings,
@@ -7095,7 +7314,7 @@ function createClient(options) {
     () => !resolveUsers,
     "Set the resolveUsers option in createClient to specify user info."
   );
-  const usersStore = createBatchStore(
+  const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
       const users = await resolveUsers?.({ userIds });
@@ -7104,12 +7323,13 @@ function createClient(options) {
     },
     { delay: RESOLVE_USERS_BATCH_DELAY }
   );
+  const usersStore = createBatchStore(batchedResolveUsers);
   const resolveRoomsInfo = clientOptions.resolveRoomsInfo;
   const warnIfNoResolveRoomsInfo = createDevelopmentWarning(
     () => !resolveRoomsInfo,
     "Set the resolveRoomsInfo option in createClient to specify room info."
   );
-  const roomsInfoStore = createBatchStore(
+  const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
       const roomsInfo = await resolveRoomsInfo?.({ roomIds });
@@ -7118,6 +7338,7 @@ function createClient(options) {
     },
     { delay: RESOLVE_ROOMS_INFO_BATCH_DELAY }
   );
+  const roomsInfoStore = createBatchStore(batchedResolveRoomsInfo);
   return Object.defineProperty(
     {
       enterRoom,
@@ -7203,7 +7424,7 @@ function createDevelopmentWarning(condition, ...args) {
 
 // src/comments/comment-body.ts
 function isCommentBodyParagraph(element) {
-  return "type" in element && element.type === "paragraph";
+  return "type" in element && element.type === "mention";
 }
 function isCommentBodyText(element) {
   return !("type" in element) && "text" in element && typeof element.text === "string";
@@ -8019,7 +8240,9 @@ export {
   asPos,
   assert,
   assertNever,
+  autoRetry,
   b64decode,
+  chunk,
   cloneLson,
   compactObject,
   fancy_console_exports as console,