@liveblocks/core 3.23.0-file2 → 3.23.0-file4

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.23.0-file2";
+var PKG_VERSION = "3.23.0-file4";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -1919,8 +1919,10 @@ var Batch = class {
     this.#clearDelayTimeout();
   }
 };
-function createBatchStore(batch2) {
+function createBatchStore(batch2, options) {
   const signal = new MutableSignal(/* @__PURE__ */ new Map());
+  const cacheExpiryTimeouts = /* @__PURE__ */ new Map();
+  const pendingEnqueues = /* @__PURE__ */ new Map();
   function getCacheKey(args) {
     return stableStringify(args);
   }
@@ -1935,7 +1937,42 @@ function createBatchStore(batch2) {
       }
     });
   }
+  function clearCacheExpiry(cacheKey) {
+    const timeoutId = cacheExpiryTimeouts.get(cacheKey);
+    if (timeoutId !== void 0) {
+      clearTimeout(timeoutId);
+      cacheExpiryTimeouts.delete(cacheKey);
+    }
+  }
+  function scheduleCacheExpiry(input, expiresAt) {
+    const cacheKey = getCacheKey(input);
+    clearCacheExpiry(cacheKey);
+    if (expiresAt === void 0 || !Number.isFinite(expiresAt)) {
+      return;
+    }
+    const timeoutId = setTimeout(
+      () => {
+        cacheExpiryTimeouts.delete(cacheKey);
+        invalidate([input]);
+      },
+      Math.max(0, expiresAt - Date.now())
+    );
+    cacheExpiryTimeouts.set(cacheKey, timeoutId);
+  }
   function invalidate(inputs) {
+    if (Array.isArray(inputs)) {
+      for (const input of inputs) {
+        const cacheKey = getCacheKey(input);
+        clearCacheExpiry(cacheKey);
+        pendingEnqueues.delete(cacheKey);
+      }
+    } else {
+      for (const timeoutId of cacheExpiryTimeouts.values()) {
+        clearTimeout(timeoutId);
+      }
+      cacheExpiryTimeouts.clear();
+      pendingEnqueues.clear();
+    }
     signal.mutate((cache) => {
       if (Array.isArray(inputs)) {
         for (const input of inputs) {
@@ -1946,23 +1983,54 @@ function createBatchStore(batch2) {
       }
     });
   }
-  async function enqueue(input) {
-    const cacheKey = getCacheKey(input);
-    const cache = signal.get();
-    if (cache.has(cacheKey)) {
-      return;
-    }
+  async function processEnqueue(input, cacheKey, batchResult$, pendingEnqueueId) {
     try {
-      update({ key: cacheKey, state: { isLoading: true } });
-      const result = await batch2.get(input);
+      const result = await batchResult$;
+      if (pendingEnqueues.get(cacheKey)?.id !== pendingEnqueueId) {
+        return;
+      }
       update({ key: cacheKey, state: { isLoading: false, data: result } });
+      scheduleCacheExpiry(input, options?.getCacheExpiry?.(result));
     } catch (error3) {
+      if (pendingEnqueues.get(cacheKey)?.id !== pendingEnqueueId) {
+        return;
+      }
+      scheduleCacheExpiry(input, options?.getErrorCacheExpiry?.(error3));
       update({
         key: cacheKey,
         state: { isLoading: false, error: error3 }
       });
+    } finally {
+      if (pendingEnqueues.get(cacheKey)?.id === pendingEnqueueId) {
+        pendingEnqueues.delete(cacheKey);
+      }
     }
   }
+  function enqueue(input) {
+    const cacheKey = getCacheKey(input);
+    const existingEnqueue = pendingEnqueues.get(cacheKey);
+    if (existingEnqueue !== void 0) {
+      return existingEnqueue.promise;
+    }
+    const cache = signal.get();
+    if (cache.has(cacheKey)) {
+      return Promise.resolve();
+    }
+    const batchResult$ = batch2.get(input);
+    const pendingEnqueueId = /* @__PURE__ */ Symbol();
+    const pendingEnqueue$ = processEnqueue(
+      input,
+      cacheKey,
+      batchResult$,
+      pendingEnqueueId
+    );
+    pendingEnqueues.set(cacheKey, {
+      id: pendingEnqueueId,
+      promise: pendingEnqueue$
+    });
+    update({ key: cacheKey, state: { isLoading: true } });
+    return pendingEnqueue$;
+  }
   function setData(entries2) {
     update(
       entries2.map((entry) => ({
@@ -1970,6 +2038,9 @@ function createBatchStore(batch2) {
         state: { isLoading: false, data: entry[1] }
       }))
     );
+    for (const [input, output] of entries2) {
+      scheduleCacheExpiry(input, options?.getCacheExpiry?.(output));
+    }
   }
   function getItemState(input) {
     const cacheKey = getCacheKey(input);
@@ -1981,6 +2052,21 @@ function createBatchStore(batch2) {
     const cache = signal.get();
     return cache.get(cacheKey)?.data;
   }
+  function waitUntilItemCacheExpires(input) {
+    const cacheKey = getCacheKey(input);
+    if (!cacheExpiryTimeouts.has(cacheKey)) {
+      return void 0;
+    }
+    const initialState = signal.get().get(cacheKey);
+    return new Promise((resolve) => {
+      const unsubscribe = signal.subscribe(() => {
+        if (signal.get().get(cacheKey) !== initialState) {
+          unsubscribe();
+          resolve();
+        }
+      });
+    });
+  }
   function _cacheKeys() {
     const cache = signal.get();
     return [...cache.keys()];
@@ -1991,6 +2077,7 @@ function createBatchStore(batch2) {
     setData,
     getItemState,
     getData,
+    waitUntilItemCacheExpires,
     invalidate,
     batch: batch2,
     _cacheKeys
@@ -2274,6 +2361,10 @@ function isUrl(string) {
 // src/api-client.ts
 var ROOM_FILE_PART_SIZE = 5 * 1024 * 1024;
 var ROOM_FILE_RETRY_ATTEMPTS = 10;
+var FILE_URL_EXPIRY_BUFFER = 3e4;
+var FILE_URL_ERROR_CACHE_TTL = 1e3;
+var FILE_URL_ERROR_MAX_ATTEMPTS = 3;
+var FILE_URL_ERROR_ATTEMPTS_EXPIRY = 3e4;
 var ROOM_FILE_RETRY_DELAYS = [
   2e3,
   2e3,
@@ -2286,10 +2377,13 @@ var ROOM_FILE_RETRY_DELAYS = [
   2e3,
   2e3
 ];
+var FileUrlUnavailableError = class extends Error {
+};
 async function uploadRoomFile({
   file,
   signal,
   abortErrorMessage,
+  retryMultipartCompletion,
   uploadSingle,
   createMultipartUpload,
   uploadMultipartPart,
@@ -2304,10 +2398,7 @@ async function uploadRoomFile({
     if (signal?.aborted) {
       throw abortError;
     }
-    if (err instanceof HttpError && err.status === 413) {
-      throw err;
-    }
-    return false;
+    return err instanceof HttpError && err.status >= 400 && err.status < 500;
   };
   if (file.size <= ROOM_FILE_PART_SIZE) {
     return autoRetry(
@@ -2325,6 +2416,17 @@ async function uploadRoomFile({
     ROOM_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) {
@@ -2332,34 +2434,66 @@ async function uploadRoomFile({
     }
     const batches = chunk(splitFileIntoParts(file), 5);
     for (const parts of batches) {
-      const uploadedPartsPromises = [];
+      const firstPartUploadFailure = {};
+      const partUploads$ = [];
       for (const { part, partNumber } of parts) {
-        uploadedPartsPromises.push(
+        partUploads$.push(
           autoRetry(
-            () => uploadMultipartPart(multipartUpload.uploadId, partNumber, part),
+            () => uploadMultipartPart(
+              multipartUpload.uploadId,
+              partNumber,
+              part,
+              partUploadSignal
+            ),
             ROOM_FILE_RETRY_ATTEMPTS,
             ROOM_FILE_RETRY_DELAYS,
-            handleRetryError
-          )
+            (error3) => {
+              if (signal?.aborted) {
+                throw abortError;
+              }
+              return partUploadSignal.aborted || handleRetryError(error3);
+            }
+          ).catch((error3) => {
+            if (firstPartUploadFailure.value === void 0) {
+              firstPartUploadFailure.value = { error: error3 };
+              abortPartUploads(error3);
+            }
+            throw error3;
+          })
         );
       }
-      uploadedParts.push(...await Promise.all(uploadedPartsPromises));
+      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(
-      uploadId,
-      uploadedParts.sort((a, b) => a.partNumber - b.partNumber)
+    const sortedParts = uploadedParts.sort(
+      (a, b) => a.partNumber - b.partNumber
     );
+    return retryMultipartCompletion ? autoRetry(
+      () => completeMultipartUpload(multipartUpload.uploadId, sortedParts),
+      ROOM_FILE_RETRY_ATTEMPTS,
+      ROOM_FILE_RETRY_DELAYS,
+      handleRetryError
+    ) : completeMultipartUpload(uploadId, sortedParts);
   } catch (error3) {
-    if (uploadId && isAbortOrTimeoutError(error3)) {
+    if (uploadId) {
       try {
         await abortMultipartUpload(uploadId);
       } catch {
       }
     }
     throw error3;
+  } finally {
+    signal?.removeEventListener("abort", handleExternalAbort);
   }
 }
 function splitFileIntoParts(file) {
@@ -2375,9 +2509,6 @@ function splitFileIntoParts(file) {
   }
   return parts;
 }
-function isAbortOrTimeoutError(error3) {
-  return error3 instanceof Error && (error3.name === "AbortError" || error3.name === "TimeoutError");
-}
 function createAbortError(message) {
   if (typeof DOMException === "function") {
     return new DOMException(message, "AbortError");
@@ -2706,6 +2837,7 @@ function createApiClient({
       file: attachment.file,
       signal: options.signal,
       abortErrorMessage: `Upload of attachment ${attachment.id} was aborted.`,
+      retryMultipartCompletion: false,
       uploadSingle: async () => httpClient.putBlob(
         url`/v2/c/rooms/${roomId}/attachments/${attachment.id}/upload/${attachment.name}`,
         await authManager.getAuthValue({
@@ -2728,7 +2860,7 @@ function createApiClient({
         { signal: options.signal },
         { fileSize: attachment.size }
       ),
-      uploadMultipartPart: async (uploadId, partNumber, part) => httpClient.putBlob(
+      uploadMultipartPart: async (uploadId, partNumber, part, signal) => httpClient.putBlob(
         url`/v2/c/rooms/${roomId}/attachments/${attachment.id}/multipart/${uploadId}/${String(partNumber)}`,
         await authManager.getAuthValue({
           roomId,
@@ -2737,7 +2869,7 @@ function createApiClient({
         }),
         part,
         void 0,
-        { signal: options.signal }
+        { signal }
       ),
       completeMultipartUpload: async (uploadId, parts) => httpClient.post(
         url`/v2/c/rooms/${roomId}/attachments/${attachment.id}/multipart/${uploadId}/complete`,
@@ -2769,6 +2901,7 @@ function createApiClient({
       file,
       signal: options.signal,
       abortErrorMessage: `Upload of file ${fileId} was aborted.`,
+      retryMultipartCompletion: true,
       uploadSingle: async () => httpClient.putBlob(
         url`/v2/c/rooms/${roomId}/storage/files/${fileId}/upload/${file.name}`,
         await authManager.getAuthValue({
@@ -2791,7 +2924,7 @@ function createApiClient({
         { signal: options.signal },
         { fileSize: file.size }
       ),
-      uploadMultipartPart: async (uploadId, partNumber, part) => httpClient.putBlob(
+      uploadMultipartPart: async (uploadId, partNumber, part, signal) => httpClient.putBlob(
         url`/v2/c/rooms/${roomId}/storage/files/${fileId}/multipart/${uploadId}/${String(partNumber)}`,
         await authManager.getAuthValue({
           roomId,
@@ -2800,7 +2933,7 @@ function createApiClient({
         }),
         part,
         void 0,
-        { signal: options.signal }
+        { signal }
       ),
       completeMultipartUpload: async (uploadId, parts) => httpClient.post(
         url`/v2/c/rooms/${roomId}/storage/files/${fileId}/multipart/${uploadId}/complete`,
@@ -2854,10 +2987,37 @@ function createApiClient({
     return batch2.get(options.attachmentId);
   }
   const fileUrlsBatchStoresByRoom = new DefaultMap((roomId) => {
+    const pendingFileUrlAttempts = /* @__PURE__ */ new Map();
+    const clearPendingFileUrlAttempts = (fileId) => {
+      const attempts = pendingFileUrlAttempts.get(fileId);
+      if (attempts !== void 0) {
+        clearTimeout(attempts.cleanupTimeoutId);
+        pendingFileUrlAttempts.delete(fileId);
+      }
+    };
+    const shouldRetryPendingFileUrl = (fileId) => {
+      const previousAttempts = pendingFileUrlAttempts.get(fileId);
+      if (previousAttempts !== void 0) {
+        clearTimeout(previousAttempts.cleanupTimeoutId);
+      }
+      const count = (previousAttempts?.count ?? 0) + 1;
+      if (count >= FILE_URL_ERROR_MAX_ATTEMPTS) {
+        pendingFileUrlAttempts.delete(fileId);
+        return false;
+      }
+      pendingFileUrlAttempts.set(fileId, {
+        count,
+        cleanupTimeoutId: setTimeout(
+          () => pendingFileUrlAttempts.delete(fileId),
+          FILE_URL_ERROR_ATTEMPTS_EXPIRY
+        )
+      });
+      return true;
+    };
     const batch2 = new Batch(
       async (batchedFileIds) => {
         const fileIds = batchedFileIds.flat();
-        const { urls } = await httpClient.post(
+        const { urls, expiresAt } = await httpClient.post(
           url`/v2/c/rooms/${roomId}/storage/files/presigned-urls`,
           await authManager.getAuthValue({
             roomId,
@@ -2866,20 +3026,31 @@ function createApiClient({
           }),
           { fileIds }
         );
-        return urls.map(
-          (url2) => url2 ?? new Error("There was an error while getting this file's URL")
-        );
+        const expiresAtTimestamp = Date.parse(expiresAt);
+        return urls.map((url2, index) => {
+          const fileId = fileIds[index];
+          if (url2 === false) {
+            return shouldRetryPendingFileUrl(fileId) ? new FileUrlUnavailableError(
+              "There was an error while getting this file's URL"
+            ) : new Error("There was an error while getting this file's URL");
+          }
+          clearPendingFileUrlAttempts(fileId);
+          return url2 !== null ? { url: url2, expiresAt: expiresAtTimestamp } : new Error("There was an error while getting this file's URL");
+        });
       },
       { delay: 50 }
     );
-    return createBatchStore(batch2);
+    return createBatchStore(batch2, {
+      getCacheExpiry: ({ expiresAt }) => expiresAt - FILE_URL_EXPIRY_BUFFER,
+      getErrorCacheExpiry: (error3) => error3 instanceof FileUrlUnavailableError ? Date.now() + FILE_URL_ERROR_CACHE_TTL : void 0
+    });
   });
   function getOrCreateFileUrlsStore(roomId) {
     return fileUrlsBatchStoresByRoom.getOrCreate(roomId);
   }
-  function getFileUrl(options) {
+  async function getFileUrl(options) {
     const batch2 = getOrCreateFileUrlsStore(options.roomId).batch;
-    return batch2.get(options.fileId);
+    return (await batch2.get(options.fileId)).url;
   }
   async function getSubscriptionSettings(options) {
     return httpClient.get(
@@ -8247,6 +8418,8 @@ function reconcile(live, json, config) {
     return reconcileLiveList(live, json, config);
   } else if (isLiveMap(live) && isPlainObject(json)) {
     return reconcileLiveMap(live, config);
+  } else if (isLiveFile(live) && shallow(live.data, json)) {
+    return live;
   } else {
     return deepLiveify(json, config);
   }
@@ -9173,8 +9346,31 @@ function isJsonEq(a, b) {
 }
 function diffNodeMap(prev, next) {
   const ops = [];
-  prev.forEach((_, id) => {
-    if (!next.get(id)) {
+  const idsToRecreate = /* @__PURE__ */ new Set();
+  next.forEach((nextCrdt, id) => {
+    const currentCrdt = prev.get(id);
+    if (currentCrdt === void 0) {
+      return;
+    }
+    if (currentCrdt.type !== nextCrdt.type || currentCrdt.type === CrdtType.FILE && nextCrdt.type === CrdtType.FILE && (currentCrdt.data.id !== nextCrdt.data.id || currentCrdt.data.name !== nextCrdt.data.name || currentCrdt.data.size !== nextCrdt.data.size || currentCrdt.data.mimeType !== nextCrdt.data.mimeType)) {
+      idsToRecreate.add(id);
+    }
+  });
+  let foundDescendant = true;
+  while (foundDescendant) {
+    foundDescendant = false;
+    for (const nodes of [prev, next]) {
+      nodes.forEach((crdt, id) => {
+        if (!idsToRecreate.has(id) && crdt.parentId !== void 0 && idsToRecreate.has(crdt.parentId)) {
+          idsToRecreate.add(id);
+          foundDescendant = true;
+        }
+      });
+    }
+  }
+  prev.forEach((crdt, id) => {
+    const parentWillBeRecreated = crdt.parentId !== void 0 && idsToRecreate.has(crdt.parentId);
+    if ((!next.has(id) || idsToRecreate.has(id)) && !parentWillBeRecreated) {
       ops.push({ type: OpCode.DELETE_CRDT, id });
     }
   });
@@ -9185,7 +9381,7 @@ function diffNodeMap(prev, next) {
     }
     emitted.add(id);
     const parentId = crdt.parentId;
-    if (parentId !== void 0 && !prev.has(parentId)) {
+    if (parentId !== void 0 && (!prev.has(parentId) || idsToRecreate.has(parentId))) {
       const parentCrdt = next.get(parentId);
       if (parentCrdt !== void 0) {
         emitCreate(parentId, parentCrdt);
@@ -9244,29 +9440,25 @@ function diffNodeMap(prev, next) {
   }
   next.forEach((crdt, id) => {
     const currentCrdt = prev.get(id);
-    if (currentCrdt) {
-      if (crdt.type === CrdtType.OBJECT) {
-        if (currentCrdt.type !== CrdtType.OBJECT) {
-          ops.push({ type: OpCode.UPDATE_OBJECT, id, data: crdt.data });
-        } else {
-          const changed = /* @__PURE__ */ new Map();
-          for (const key of Object.keys(crdt.data)) {
-            const value = crdt.data[key];
-            if (value !== void 0 && !isJsonEq(value, currentCrdt.data[key])) {
-              changed.set(key, value);
-            }
-          }
-          if (changed.size > 0) {
-            ops.push({
-              type: OpCode.UPDATE_OBJECT,
-              id,
-              data: Object.fromEntries(changed)
-            });
+    if (currentCrdt && !idsToRecreate.has(id)) {
+      if (crdt.type === CrdtType.OBJECT && currentCrdt.type === CrdtType.OBJECT) {
+        const changed = /* @__PURE__ */ new Map();
+        for (const key of Object.keys(crdt.data)) {
+          const value = crdt.data[key];
+          if (value !== void 0 && !isJsonEq(value, currentCrdt.data[key])) {
+            changed.set(key, value);
           }
-          for (const key of Object.keys(currentCrdt.data)) {
-            if (!(key in crdt.data)) {
-              ops.push({ type: OpCode.DELETE_OBJECT_KEY, id, key });
-            }
+        }
+        if (changed.size > 0) {
+          ops.push({
+            type: OpCode.UPDATE_OBJECT,
+            id,
+            data: Object.fromEntries(changed)
+          });
+        }
+        for (const key of Object.keys(currentCrdt.data)) {
+          if (!(key in crdt.data)) {
+            ops.push({ type: OpCode.DELETE_OBJECT_KEY, id, key });
           }
         }
       }