@liveblocks/core 3.23.0-file3 → 3.23.0

package/dist/index.d.cts

@@ -217,6 +217,118 @@ type BaseUserMeta = {
     info?: IUserInfo;
 };
 
+type CrdtType = (typeof CrdtType)[keyof typeof CrdtType];
+declare const CrdtType: Readonly<{
+    OBJECT: 0;
+    LIST: 1;
+    MAP: 2;
+    REGISTER: 3;
+    FILE: 5;
+}>;
+declare namespace CrdtType {
+    type OBJECT = typeof CrdtType.OBJECT;
+    type LIST = typeof CrdtType.LIST;
+    type MAP = typeof CrdtType.MAP;
+    type REGISTER = typeof CrdtType.REGISTER;
+    type FILE = typeof CrdtType.FILE;
+}
+type SerializedCrdt = SerializedRootObject | SerializedChild;
+type SerializedChild = SerializedObject | SerializedList | SerializedMap | SerializedRegister | SerializedFile;
+type LiveFileData = {
+    readonly id: string;
+    readonly name: string;
+    readonly size: number;
+    readonly mimeType: string;
+};
+type SerializedRootObject = {
+    readonly type: CrdtType.OBJECT;
+    readonly data: JsonObject;
+    readonly parentId?: never;
+    readonly parentKey?: never;
+};
+type SerializedObject = {
+    readonly type: CrdtType.OBJECT;
+    readonly parentId: string;
+    readonly parentKey: string;
+    readonly data: JsonObject;
+};
+type SerializedList = {
+    readonly type: CrdtType.LIST;
+    readonly parentId: string;
+    readonly parentKey: string;
+};
+type SerializedMap = {
+    readonly type: CrdtType.MAP;
+    readonly parentId: string;
+    readonly parentKey: string;
+};
+type SerializedRegister = {
+    readonly type: CrdtType.REGISTER;
+    readonly parentId: string;
+    readonly parentKey: string;
+    readonly data: Json;
+};
+type SerializedFile = {
+    readonly type: CrdtType.FILE;
+    readonly parentId: string;
+    readonly parentKey: string;
+    readonly data: LiveFileData;
+};
+type StorageNode = RootStorageNode | ChildStorageNode;
+type ChildStorageNode = ObjectStorageNode | ListStorageNode | MapStorageNode | RegisterStorageNode | FileStorageNode;
+type RootStorageNode = [id: "root", value: SerializedRootObject];
+type ObjectStorageNode = [id: string, value: SerializedObject];
+type ListStorageNode = [id: string, value: SerializedList];
+type MapStorageNode = [id: string, value: SerializedMap];
+type RegisterStorageNode = [id: string, value: SerializedRegister];
+type FileStorageNode = [id: string, value: SerializedFile];
+type NodeMap = Map<string, SerializedCrdt>;
+type NodeStream = Iterable<StorageNode>;
+declare function isRootStorageNode(node: StorageNode): node is RootStorageNode;
+declare function isObjectStorageNode(node: StorageNode): node is RootStorageNode | ObjectStorageNode;
+declare function isListStorageNode(node: StorageNode): node is ListStorageNode;
+declare function isMapStorageNode(node: StorageNode): node is MapStorageNode;
+declare function isRegisterStorageNode(node: StorageNode): node is RegisterStorageNode;
+declare function isFileStorageNode(node: StorageNode): node is FileStorageNode;
+type CompactNode = CompactRootNode | CompactChildNode;
+type CompactChildNode = CompactObjectNode | CompactListNode | CompactMapNode | CompactRegisterNode | CompactFileNode;
+type CompactRootNode = readonly [id: "root", data: JsonObject];
+type CompactObjectNode = readonly [
+    id: string,
+    type: CrdtType.OBJECT,
+    parentId: string,
+    parentKey: string,
+    data: JsonObject
+];
+type CompactListNode = readonly [
+    id: string,
+    type: CrdtType.LIST,
+    parentId: string,
+    parentKey: string
+];
+type CompactMapNode = readonly [
+    id: string,
+    type: CrdtType.MAP,
+    parentId: string,
+    parentKey: string
+];
+type CompactRegisterNode = readonly [
+    id: string,
+    type: CrdtType.REGISTER,
+    parentId: string,
+    parentKey: string,
+    data: Json
+];
+type CompactFileNode = readonly [
+    id: string,
+    type: CrdtType.FILE,
+    parentId: string,
+    parentKey: string,
+    data: LiveFileData
+];
+declare function compactNodesToNodeStream(compactNodes: CompactNode[]): NodeStream;
+declare function nodeStreamToCompactNodes(nodes: NodeStream): Iterable<CompactNode>;
+
 declare const brand: unique symbol;
 type Brand<T, TBrand extends string> = T & {
     [brand]: TBrand;
@@ -625,112 +737,6 @@ declare class LiveMap<TKey extends string, TValue extends Lson> extends Abstract
     clone(): LiveMap<TKey, TValue>;
 }
 
-type CrdtType = (typeof CrdtType)[keyof typeof CrdtType];
-declare const CrdtType: Readonly<{
-    OBJECT: 0;
-    LIST: 1;
-    MAP: 2;
-    REGISTER: 3;
-    FILE: 5;
-}>;
-declare namespace CrdtType {
-    type OBJECT = typeof CrdtType.OBJECT;
-    type LIST = typeof CrdtType.LIST;
-    type MAP = typeof CrdtType.MAP;
-    type REGISTER = typeof CrdtType.REGISTER;
-    type FILE = typeof CrdtType.FILE;
-}
-type SerializedCrdt = SerializedRootObject | SerializedChild;
-type SerializedChild = SerializedObject | SerializedList | SerializedMap | SerializedRegister | SerializedFile;
-type SerializedRootObject = {
-    readonly type: CrdtType.OBJECT;
-    readonly data: JsonObject;
-    readonly parentId?: never;
-    readonly parentKey?: never;
-};
-type SerializedObject = {
-    readonly type: CrdtType.OBJECT;
-    readonly parentId: string;
-    readonly parentKey: string;
-    readonly data: JsonObject;
-};
-type SerializedList = {
-    readonly type: CrdtType.LIST;
-    readonly parentId: string;
-    readonly parentKey: string;
-};
-type SerializedMap = {
-    readonly type: CrdtType.MAP;
-    readonly parentId: string;
-    readonly parentKey: string;
-};
-type SerializedRegister = {
-    readonly type: CrdtType.REGISTER;
-    readonly parentId: string;
-    readonly parentKey: string;
-    readonly data: Json;
-};
-type SerializedFile = {
-    readonly type: CrdtType.FILE;
-    readonly parentId: string;
-    readonly parentKey: string;
-    readonly data: LiveFileData;
-};
-type StorageNode = RootStorageNode | ChildStorageNode;
-type ChildStorageNode = ObjectStorageNode | ListStorageNode | MapStorageNode | RegisterStorageNode | FileStorageNode;
-type RootStorageNode = [id: "root", value: SerializedRootObject];
-type ObjectStorageNode = [id: string, value: SerializedObject];
-type ListStorageNode = [id: string, value: SerializedList];
-type MapStorageNode = [id: string, value: SerializedMap];
-type RegisterStorageNode = [id: string, value: SerializedRegister];
-type FileStorageNode = [id: string, value: SerializedFile];
-type NodeMap = Map<string, SerializedCrdt>;
-type NodeStream = Iterable<StorageNode>;
-declare function isRootStorageNode(node: StorageNode): node is RootStorageNode;
-declare function isObjectStorageNode(node: StorageNode): node is RootStorageNode | ObjectStorageNode;
-declare function isListStorageNode(node: StorageNode): node is ListStorageNode;
-declare function isMapStorageNode(node: StorageNode): node is MapStorageNode;
-declare function isRegisterStorageNode(node: StorageNode): node is RegisterStorageNode;
-declare function isFileStorageNode(node: StorageNode): node is FileStorageNode;
-type CompactNode = CompactRootNode | CompactChildNode;
-type CompactChildNode = CompactObjectNode | CompactListNode | CompactMapNode | CompactRegisterNode | CompactFileNode;
-type CompactRootNode = readonly [id: "root", data: JsonObject];
-type CompactObjectNode = readonly [
-    id: string,
-    type: CrdtType.OBJECT,
-    parentId: string,
-    parentKey: string,
-    data: JsonObject
-];
-type CompactListNode = readonly [
-    id: string,
-    type: CrdtType.LIST,
-    parentId: string,
-    parentKey: string
-];
-type CompactMapNode = readonly [
-    id: string,
-    type: CrdtType.MAP,
-    parentId: string,
-    parentKey: string
-];
-type CompactRegisterNode = readonly [
-    id: string,
-    type: CrdtType.REGISTER,
-    parentId: string,
-    parentKey: string,
-    data: Json
-];
-type CompactFileNode = readonly [
-    id: string,
-    type: CrdtType.FILE,
-    parentId: string,
-    parentKey: string,
-    data: LiveFileData
-];
-declare function compactNodesToNodeStream(compactNodes: CompactNode[]): NodeStream;
-declare function nodeStreamToCompactNodes(nodes: NodeStream): Iterable<CompactNode>;
-
 /**
  * Extracts only the explicitly-named string keys of a type, filtering out
  * any index signature (e.g. `[key: string]: ...`).
@@ -1063,12 +1069,6 @@ declare abstract class AbstractCrdt {
     abstract clone(): Lson;
 }
 
-type LiveFileData = {
-    readonly id: string;
-    readonly name: string;
-    readonly size: number;
-    readonly mimeType: string;
-};
 type LiveFileReference = LiveFile | LiveFileData | string;
 declare function getLiveFileId(file: LiveFileReference): string;
 /**

package/dist/index.d.ts

@@ -217,6 +217,118 @@ type BaseUserMeta = {
     info?: IUserInfo;
 };
 
+type CrdtType = (typeof CrdtType)[keyof typeof CrdtType];
+declare const CrdtType: Readonly<{
+    OBJECT: 0;
+    LIST: 1;
+    MAP: 2;
+    REGISTER: 3;
+    FILE: 5;
+}>;
+declare namespace CrdtType {
+    type OBJECT = typeof CrdtType.OBJECT;
+    type LIST = typeof CrdtType.LIST;
+    type MAP = typeof CrdtType.MAP;
+    type REGISTER = typeof CrdtType.REGISTER;
+    type FILE = typeof CrdtType.FILE;
+}
+type SerializedCrdt = SerializedRootObject | SerializedChild;
+type SerializedChild = SerializedObject | SerializedList | SerializedMap | SerializedRegister | SerializedFile;
+type LiveFileData = {
+    readonly id: string;
+    readonly name: string;
+    readonly size: number;
+    readonly mimeType: string;
+};
+type SerializedRootObject = {
+    readonly type: CrdtType.OBJECT;
+    readonly data: JsonObject;
+    readonly parentId?: never;
+    readonly parentKey?: never;
+};
+type SerializedObject = {
+    readonly type: CrdtType.OBJECT;
+    readonly parentId: string;
+    readonly parentKey: string;
+    readonly data: JsonObject;
+};
+type SerializedList = {
+    readonly type: CrdtType.LIST;
+    readonly parentId: string;
+    readonly parentKey: string;
+};
+type SerializedMap = {
+    readonly type: CrdtType.MAP;
+    readonly parentId: string;
+    readonly parentKey: string;
+};
+type SerializedRegister = {
+    readonly type: CrdtType.REGISTER;
+    readonly parentId: string;
+    readonly parentKey: string;
+    readonly data: Json;
+};
+type SerializedFile = {
+    readonly type: CrdtType.FILE;
+    readonly parentId: string;
+    readonly parentKey: string;
+    readonly data: LiveFileData;
+};
+type StorageNode = RootStorageNode | ChildStorageNode;
+type ChildStorageNode = ObjectStorageNode | ListStorageNode | MapStorageNode | RegisterStorageNode | FileStorageNode;
+type RootStorageNode = [id: "root", value: SerializedRootObject];
+type ObjectStorageNode = [id: string, value: SerializedObject];
+type ListStorageNode = [id: string, value: SerializedList];
+type MapStorageNode = [id: string, value: SerializedMap];
+type RegisterStorageNode = [id: string, value: SerializedRegister];
+type FileStorageNode = [id: string, value: SerializedFile];
+type NodeMap = Map<string, SerializedCrdt>;
+type NodeStream = Iterable<StorageNode>;
+declare function isRootStorageNode(node: StorageNode): node is RootStorageNode;
+declare function isObjectStorageNode(node: StorageNode): node is RootStorageNode | ObjectStorageNode;
+declare function isListStorageNode(node: StorageNode): node is ListStorageNode;
+declare function isMapStorageNode(node: StorageNode): node is MapStorageNode;
+declare function isRegisterStorageNode(node: StorageNode): node is RegisterStorageNode;
+declare function isFileStorageNode(node: StorageNode): node is FileStorageNode;
+type CompactNode = CompactRootNode | CompactChildNode;
+type CompactChildNode = CompactObjectNode | CompactListNode | CompactMapNode | CompactRegisterNode | CompactFileNode;
+type CompactRootNode = readonly [id: "root", data: JsonObject];
+type CompactObjectNode = readonly [
+    id: string,
+    type: CrdtType.OBJECT,
+    parentId: string,
+    parentKey: string,
+    data: JsonObject
+];
+type CompactListNode = readonly [
+    id: string,
+    type: CrdtType.LIST,
+    parentId: string,
+    parentKey: string
+];
+type CompactMapNode = readonly [
+    id: string,
+    type: CrdtType.MAP,
+    parentId: string,
+    parentKey: string
+];
+type CompactRegisterNode = readonly [
+    id: string,
+    type: CrdtType.REGISTER,
+    parentId: string,
+    parentKey: string,
+    data: Json
+];
+type CompactFileNode = readonly [
+    id: string,
+    type: CrdtType.FILE,
+    parentId: string,
+    parentKey: string,
+    data: LiveFileData
+];
+declare function compactNodesToNodeStream(compactNodes: CompactNode[]): NodeStream;
+declare function nodeStreamToCompactNodes(nodes: NodeStream): Iterable<CompactNode>;
+
 declare const brand: unique symbol;
 type Brand<T, TBrand extends string> = T & {
     [brand]: TBrand;
@@ -625,112 +737,6 @@ declare class LiveMap<TKey extends string, TValue extends Lson> extends Abstract
     clone(): LiveMap<TKey, TValue>;
 }
 
-type CrdtType = (typeof CrdtType)[keyof typeof CrdtType];
-declare const CrdtType: Readonly<{
-    OBJECT: 0;
-    LIST: 1;
-    MAP: 2;
-    REGISTER: 3;
-    FILE: 5;
-}>;
-declare namespace CrdtType {
-    type OBJECT = typeof CrdtType.OBJECT;
-    type LIST = typeof CrdtType.LIST;
-    type MAP = typeof CrdtType.MAP;
-    type REGISTER = typeof CrdtType.REGISTER;
-    type FILE = typeof CrdtType.FILE;
-}
-type SerializedCrdt = SerializedRootObject | SerializedChild;
-type SerializedChild = SerializedObject | SerializedList | SerializedMap | SerializedRegister | SerializedFile;
-type SerializedRootObject = {
-    readonly type: CrdtType.OBJECT;
-    readonly data: JsonObject;
-    readonly parentId?: never;
-    readonly parentKey?: never;
-};
-type SerializedObject = {
-    readonly type: CrdtType.OBJECT;
-    readonly parentId: string;
-    readonly parentKey: string;
-    readonly data: JsonObject;
-};
-type SerializedList = {
-    readonly type: CrdtType.LIST;
-    readonly parentId: string;
-    readonly parentKey: string;
-};
-type SerializedMap = {
-    readonly type: CrdtType.MAP;
-    readonly parentId: string;
-    readonly parentKey: string;
-};
-type SerializedRegister = {
-    readonly type: CrdtType.REGISTER;
-    readonly parentId: string;
-    readonly parentKey: string;
-    readonly data: Json;
-};
-type SerializedFile = {
-    readonly type: CrdtType.FILE;
-    readonly parentId: string;
-    readonly parentKey: string;
-    readonly data: LiveFileData;
-};
-type StorageNode = RootStorageNode | ChildStorageNode;
-type ChildStorageNode = ObjectStorageNode | ListStorageNode | MapStorageNode | RegisterStorageNode | FileStorageNode;
-type RootStorageNode = [id: "root", value: SerializedRootObject];
-type ObjectStorageNode = [id: string, value: SerializedObject];
-type ListStorageNode = [id: string, value: SerializedList];
-type MapStorageNode = [id: string, value: SerializedMap];
-type RegisterStorageNode = [id: string, value: SerializedRegister];
-type FileStorageNode = [id: string, value: SerializedFile];
-type NodeMap = Map<string, SerializedCrdt>;
-type NodeStream = Iterable<StorageNode>;
-declare function isRootStorageNode(node: StorageNode): node is RootStorageNode;
-declare function isObjectStorageNode(node: StorageNode): node is RootStorageNode | ObjectStorageNode;
-declare function isListStorageNode(node: StorageNode): node is ListStorageNode;
-declare function isMapStorageNode(node: StorageNode): node is MapStorageNode;
-declare function isRegisterStorageNode(node: StorageNode): node is RegisterStorageNode;
-declare function isFileStorageNode(node: StorageNode): node is FileStorageNode;
-type CompactNode = CompactRootNode | CompactChildNode;
-type CompactChildNode = CompactObjectNode | CompactListNode | CompactMapNode | CompactRegisterNode | CompactFileNode;
-type CompactRootNode = readonly [id: "root", data: JsonObject];
-type CompactObjectNode = readonly [
-    id: string,
-    type: CrdtType.OBJECT,
-    parentId: string,
-    parentKey: string,
-    data: JsonObject
-];
-type CompactListNode = readonly [
-    id: string,
-    type: CrdtType.LIST,
-    parentId: string,
-    parentKey: string
-];
-type CompactMapNode = readonly [
-    id: string,
-    type: CrdtType.MAP,
-    parentId: string,
-    parentKey: string
-];
-type CompactRegisterNode = readonly [
-    id: string,
-    type: CrdtType.REGISTER,
-    parentId: string,
-    parentKey: string,
-    data: Json
-];
-type CompactFileNode = readonly [
-    id: string,
-    type: CrdtType.FILE,
-    parentId: string,
-    parentKey: string,
-    data: LiveFileData
-];
-declare function compactNodesToNodeStream(compactNodes: CompactNode[]): NodeStream;
-declare function nodeStreamToCompactNodes(nodes: NodeStream): Iterable<CompactNode>;
-
 /**
  * Extracts only the explicitly-named string keys of a type, filtering out
  * any index signature (e.g. `[key: string]: ...`).
@@ -1063,12 +1069,6 @@ declare abstract class AbstractCrdt {
     abstract clone(): Lson;
 }
 
-type LiveFileData = {
-    readonly id: string;
-    readonly name: string;
-    readonly size: number;
-    readonly mimeType: string;
-};
 type LiveFileReference = LiveFile | LiveFileData | string;
 declare function getLiveFileId(file: LiveFileReference): string;
 /**

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-file3";
+var PKG_VERSION = "3.23.0";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -2362,7 +2362,7 @@ function isUrl(string) {
 var ROOM_FILE_PART_SIZE = 5 * 1024 * 1024;
 var ROOM_FILE_RETRY_ATTEMPTS = 10;
 var FILE_URL_EXPIRY_BUFFER = 3e4;
-var FILE_URL_ERROR_RETRY_DELAY = 1e3;
+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 = [
@@ -2377,7 +2377,7 @@ var ROOM_FILE_RETRY_DELAYS = [
   2e3,
   2e3
 ];
-var FileUrlRetryableError = class extends Error {
+var FileUrlUnavailableError = class extends Error {
 };
 async function uploadRoomFile({
   file,
@@ -2410,7 +2410,23 @@ async function uploadRoomFile({
   }
   let uploadId;
   const uploadedParts = [];
-  const multipartUpload = await createMultipartUpload();
+  const multipartUpload = await autoRetry(
+    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 (signal?.aborted) {
+    handleExternalAbort();
+  } else {
+    signal?.addEventListener("abort", handleExternalAbort, { once: true });
+  }
   try {
     uploadId = multipartUpload.uploadId;
     if (signal?.aborted) {
@@ -2418,18 +2434,43 @@ 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;
@@ -2451,6 +2492,8 @@ async function uploadRoomFile({
       }
     }
     throw error3;
+  } finally {
+    signal?.removeEventListener("abort", handleExternalAbort);
   }
 }
 function splitFileIntoParts(file) {
@@ -2817,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,
@@ -2826,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`,
@@ -2881,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,
@@ -2890,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`,
@@ -2944,28 +2987,28 @@ function createApiClient({
     return batch2.get(options.attachmentId);
   }
   const fileUrlsBatchStoresByRoom = new DefaultMap((roomId) => {
-    const errorAttempts = /* @__PURE__ */ new Map();
-    const clearErrorAttempts = (fileId) => {
-      const attempts = errorAttempts.get(fileId);
+    const pendingFileUrlAttempts = /* @__PURE__ */ new Map();
+    const clearPendingFileUrlAttempts = (fileId) => {
+      const attempts = pendingFileUrlAttempts.get(fileId);
       if (attempts !== void 0) {
         clearTimeout(attempts.cleanupTimeoutId);
-        errorAttempts.delete(fileId);
+        pendingFileUrlAttempts.delete(fileId);
       }
     };
-    const shouldRetryFileUrlError = (fileId) => {
-      const previousAttempts = errorAttempts.get(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) {
-        errorAttempts.delete(fileId);
+        pendingFileUrlAttempts.delete(fileId);
         return false;
       }
-      errorAttempts.set(fileId, {
+      pendingFileUrlAttempts.set(fileId, {
         count,
         cleanupTimeoutId: setTimeout(
-          () => errorAttempts.delete(fileId),
+          () => pendingFileUrlAttempts.delete(fileId),
           FILE_URL_ERROR_ATTEMPTS_EXPIRY
         )
       });
@@ -2986,23 +3029,20 @@ function createApiClient({
         const expiresAtTimestamp = Date.parse(expiresAt);
         return urls.map((url2, index) => {
           const fileId = fileIds[index];
-          if (url2 !== null) {
-            clearErrorAttempts(fileId);
-            return { url: url2, expiresAt: expiresAtTimestamp };
-          }
-          if (shouldRetryFileUrlError(fileId)) {
-            return new FileUrlRetryableError(
+          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");
           }
-          return 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, {
       getCacheExpiry: ({ expiresAt }) => expiresAt - FILE_URL_EXPIRY_BUFFER,
-      getErrorCacheExpiry: (error3) => error3 instanceof FileUrlRetryableError ? Date.now() + FILE_URL_ERROR_RETRY_DELAY : void 0
+      getErrorCacheExpiry: (error3) => error3 instanceof FileUrlUnavailableError ? Date.now() + FILE_URL_ERROR_CACHE_TTL : void 0
     });
   });
   function getOrCreateFileUrlsStore(roomId) {