@liveblocks/react 2.16.0 → 2.16.1-ai

package/dist/{chunk-JZBPCFEX.mjs → chunk-FQKGWA7O.mjs}

@@ -224,13 +224,15 @@ import {
   console as console2,
   DefaultMap,
   DerivedSignal,
+  HttpError,
   kInternal,
   MutableSignal as MutableSignal2,
   nanoid,
   nn,
   shallow as shallow3,
   Signal,
-  stringify
+  stringify,
+  unstringify
 } from "@liveblocks/core";
 
 // src/lib/autobind.ts
@@ -280,16 +282,16 @@ function matchesMetadata(thread, q) {
   const metadata = thread.metadata;
   return q.metadata === void 0 || Object.entries(q.metadata).every(
     ([key, op]) => (
-      // Ignore explicit-undefined filters
-      // Boolean logic: op? => value matches the operator
-      op === void 0 || matchesOperator(metadata[key], op)
+      // NOTE: `op` can be explicitly-`undefined` here, which ideally would not
+      // mean "filter for absence" like it does now, as this does not match the
+      // backend behavior at the moment. For an in-depth discussion, see
+      // https://liveblocks.slack.com/archives/C02PZL7QAAW/p1728546988505989
+      matchesOperator(metadata[key], op)
     )
   );
 }
 function matchesOperator(value, op) {
-  if (op === null) {
-    return value === void 0;
-  } else if (isStartsWithOperator(op)) {
+  if (isStartsWithOperator(op)) {
     return typeof value === "string" && value.startsWith(op.startsWith);
   } else {
     return value === op;
@@ -834,7 +836,7 @@ var UmbrellaStore = class {
     );
     const loadingUserThreads = new DefaultMap(
       (queryKey) => {
-        const query = JSON.parse(queryKey);
+        const query = unstringify(queryKey);
         const resource = new PaginatedResource(async (cursor) => {
           const result = await this.#client[kInternal].httpClient.getUserThreads_experimental({
             cursor,
@@ -876,7 +878,7 @@ var UmbrellaStore = class {
     );
     const loadingRoomThreads = new DefaultMap(
       (queryKey) => {
-        const [roomId, query] = JSON.parse(queryKey);
+        const [roomId, query] = unstringify(queryKey);
         const resource = new PaginatedResource(async (cursor) => {
           const result = await this.#client[kInternal].httpClient.getThreads({
             roomId,
@@ -939,7 +941,10 @@ var UmbrellaStore = class {
       const resource = new SinglePageResource(async () => {
         const room = this.#client.getRoom(roomId);
         if (room === null) {
-          throw new Error(`Room '${roomId}' is not available on client`);
+          throw new HttpError(
+            `Room '${roomId}' is not available on client`,
+            479
+          );
         }
         const result = await room.getNotificationSettings();
         this.roomNotificationSettings.update(roomId, result);
@@ -962,7 +967,10 @@ var UmbrellaStore = class {
         const resource = new SinglePageResource(async () => {
           const room = this.#client.getRoom(roomId);
           if (room === null) {
-            throw new Error(`Room '${roomId}' is not available on client`);
+            throw new HttpError(
+              `Room '${roomId}' is not available on client`,
+              479
+            );
           }
           const result = await room[kInternal].listTextVersions();
           this.historyVersions.update(roomId, result.versions);
@@ -1818,15 +1826,8 @@ function useMarkInboxNotificationAsRead_withClient(client) {
             optimisticId
           );
         },
-        (err) => {
+        () => {
           store.optimisticUpdates.remove(optimisticId);
-          client[kInternal2].emitError(
-            {
-              type: "MARK_INBOX_NOTIFICATION_AS_READ_ERROR",
-              inboxNotificationId
-            },
-            err
-          );
         }
       );
     },
@@ -1845,13 +1846,8 @@ function useMarkAllInboxNotificationsAsRead_withClient(client) {
       () => {
         store.markAllInboxNotificationsRead(optimisticId, readAt);
       },
-      (err) => {
+      () => {
         store.optimisticUpdates.remove(optimisticId);
-        client[kInternal2].emitError(
-          // No roomId, threadId, commentId to include for this error
-          { type: "MARK_ALL_INBOX_NOTIFICATIONS_AS_READ_ERROR" },
-          err
-        );
       }
     );
   }, [client]);
@@ -1870,12 +1866,8 @@ function useDeleteInboxNotification_withClient(client) {
         () => {
           store.deleteInboxNotification(inboxNotificationId, optimisticId);
         },
-        (err) => {
+        () => {
           store.optimisticUpdates.remove(optimisticId);
-          client[kInternal2].emitError(
-            { type: "DELETE_INBOX_NOTIFICATION_ERROR", inboxNotificationId },
-            err
-          );
         }
       );
     },
@@ -1894,12 +1886,8 @@ function useDeleteAllInboxNotifications_withClient(client) {
       () => {
         store.deleteAllInboxNotifications(optimisticId);
       },
-      (err) => {
+      () => {
         store.optimisticUpdates.remove(optimisticId);
-        client[kInternal2].emitError(
-          { type: "DELETE_ALL_INBOX_NOTIFICATIONS_ERROR" },
-          err
-        );
       }
     );
   }, [client]);
@@ -2061,7 +2049,6 @@ function createSharedContext(client) {
       useUser: (userId) => useUser_withClient(client, userId),
       useRoomInfo: (roomId) => useRoomInfo_withClient(client, roomId),
       useIsInsideRoom,
-      useErrorListener,
       useSyncStatus: useSyncStatus2
     },
     suspense: {
@@ -2069,7 +2056,6 @@ function createSharedContext(client) {
       useUser: (userId) => useUserSuspense_withClient(client, userId),
       useRoomInfo: (roomId) => useRoomInfoSuspense_withClient(client, roomId),
       useIsInsideRoom,
-      useErrorListener,
       useSyncStatus: useSyncStatus2
     }
   };
@@ -2249,14 +2235,104 @@ function useSyncStatusSmooth_withClient(client) {
 function useSyncStatus(options) {
   return useSyncStatus_withClient(useClient(), options);
 }
-function useErrorListener(callback) {
-  const client = useClient();
-  const savedCallback = useLatest(callback);
-  useEffect3(
-    () => client.events.error.subscribe((e) => savedCallback.current(e)),
-    [client, savedCallback]
-  );
-}
+
+// src/types/errors.ts
+var CreateThreadError = class extends Error {
+  constructor(cause, context) {
+    super("Create thread failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "CreateThreadError";
+  }
+};
+var DeleteThreadError = class extends Error {
+  constructor(cause, context) {
+    super("Delete thread failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "DeleteThreadError";
+  }
+};
+var EditThreadMetadataError = class extends Error {
+  constructor(cause, context) {
+    super("Edit thread metadata failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "EditThreadMetadataError";
+  }
+};
+var MarkThreadAsResolvedError = class extends Error {
+  constructor(cause, context) {
+    super("Mark thread as resolved failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "MarkThreadAsResolvedError";
+  }
+};
+var MarkThreadAsUnresolvedError = class extends Error {
+  constructor(cause, context) {
+    super("Mark thread as unresolved failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "MarkThreadAsUnresolvedError";
+  }
+};
+var CreateCommentError = class extends Error {
+  constructor(cause, context) {
+    super("Create comment failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "CreateCommentError";
+  }
+};
+var EditCommentError = class extends Error {
+  constructor(cause, context) {
+    super("Edit comment failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "EditCommentError";
+  }
+};
+var DeleteCommentError = class extends Error {
+  constructor(cause, context) {
+    super("Delete comment failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "DeleteCommentError";
+  }
+};
+var AddReactionError = class extends Error {
+  constructor(cause, context) {
+    super("Add reaction failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "AddReactionError";
+  }
+};
+var RemoveReactionError = class extends Error {
+  constructor(cause, context) {
+    super("Remove reaction failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "RemoveReactionError";
+  }
+};
+var MarkInboxNotificationAsReadError = class extends Error {
+  constructor(cause, context) {
+    super("Mark inbox notification as read failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "MarkInboxNotificationAsReadError";
+  }
+};
+var UpdateNotificationSettingsError = class extends Error {
+  constructor(cause, context) {
+    super("Update notification settings failed.");
+    this.cause = cause;
+    this.context = context;
+    this.name = "UpdateNotificationSettingsError";
+  }
+};
 
 // src/room.tsx
 import { shallow as shallow5 } from "@liveblocks/client";
@@ -2267,8 +2343,9 @@ import {
   createThreadId,
   DefaultMap as DefaultMap2,
   errorIf,
-  HttpError,
+  HttpError as HttpError2,
   kInternal as kInternal3,
+  makeEventSource,
   makePoller as makePoller2,
   ServerMsgCode
 } from "@liveblocks/core";
@@ -2362,6 +2439,14 @@ function getCurrentUserId(client) {
   }
   return userId;
 }
+function handleApiError(err) {
+  const message = `Request failed with status ${err.status}: ${err.message}`;
+  if (err.details?.error === "FORBIDDEN") {
+    const detailedMessage = [message, err.details.suggestion, err.details.docs].filter(Boolean).join("\n");
+    console3.error(detailedMessage);
+  }
+  return new Error(message);
+}
 var _extras2 = /* @__PURE__ */ new WeakMap();
 var _bundles2 = /* @__PURE__ */ new WeakMap();
 function getOrCreateRoomContextBundle(client) {
@@ -2382,21 +2467,19 @@ function getRoomExtrasForClient(client) {
 }
 function makeRoomExtrasForClient(client) {
   const store = getUmbrellaStoreForClient(client);
-  function onMutationFailure(optimisticId, context, innerError) {
+  const commentsErrorEventSource = makeEventSource();
+  function onMutationFailure(innerError, optimisticId, createPublicError) {
     store.optimisticUpdates.remove(optimisticId);
-    if (innerError instanceof HttpError) {
-      if (innerError.status === 403) {
-        const detailedMessage = [
-          innerError.message,
-          innerError.details?.suggestion,
-          innerError.details?.docs
-        ].filter(Boolean).join("\n");
-        console3.error(detailedMessage);
-      }
-      client[kInternal3].emitError(context, innerError);
-    } else {
-      throw innerError;
+    if (innerError instanceof HttpError2) {
+      const error = handleApiError(innerError);
+      commentsErrorEventSource.notify(createPublicError(error));
+      return;
     }
+    if (innerError instanceof HttpError2) {
+      handleApiError(innerError);
+      return;
+    }
+    throw innerError;
   }
   const threadsPollersByRoomId = new DefaultMap2(
     (roomId) => makePoller2(
@@ -2442,6 +2525,7 @@ function makeRoomExtrasForClient(client) {
   );
   return {
     store,
+    commentsErrorEventSource: commentsErrorEventSource.observable,
     onMutationFailure,
     getOrCreateThreadsPollerForRoomId: threadsPollersByRoomId.getOrCreate.bind(
       threadsPollersByRoomId
@@ -2467,6 +2551,7 @@ function makeRoomContextBundle(client) {
     useBroadcastEvent,
     useOthersListener,
     useLostConnectionListener,
+    useErrorListener,
     useEventListener,
     useHistory,
     useUndo,
@@ -2512,6 +2597,7 @@ function makeRoomContextBundle(client) {
       useBroadcastEvent,
       useOthersListener,
       useLostConnectionListener,
+      useErrorListener,
       useEventListener,
       useHistory,
       useUndo,
@@ -2547,7 +2633,8 @@ function makeRoomContextBundle(client) {
       useRoomNotificationSettings: useRoomNotificationSettingsSuspense,
       useUpdateRoomNotificationSettings,
       ...shared.suspense
-    }
+    },
+    useCommentsErrorListener
   };
   return Object.defineProperty(bundle, kInternal3, {
     enumerable: false
@@ -2808,6 +2895,14 @@ function useLostConnectionListener(callback) {
     [room, savedCallback]
   );
 }
+function useErrorListener(callback) {
+  const room = useRoom();
+  const savedCallback = useLatest(callback);
+  useEffect5(
+    () => room.events.error.subscribe((e) => savedCallback.current(e)),
+    [room, savedCallback]
+  );
+}
 function useEventListener(callback) {
   const room = useRoom();
   const savedCallback = useLatest(callback);
@@ -3017,6 +3112,14 @@ function useThreads(options = {}) {
   useScrollToCommentOnLoadEffect(scrollOnLoad, result);
   return result;
 }
+function useCommentsErrorListener(callback) {
+  const client = useClient();
+  const savedCallback = useLatest(callback);
+  const { commentsErrorEventSource } = getRoomExtrasForClient(client);
+  useEffect5(() => {
+    return commentsErrorEventSource.subscribe(savedCallback.current);
+  }, [savedCallback, commentsErrorEventSource]);
+}
 function useCreateThread() {
   return useCreateRoomThread(useRoom().id);
 }
@@ -3070,16 +3173,15 @@ function useCreateRoomThread(roomId) {
           store.createThread(optimisticId, thread);
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          {
-            type: "CREATE_THREAD_ERROR",
+          (err2) => new CreateThreadError(err2, {
             roomId,
             threadId,
             commentId,
             body,
             metadata
-          },
-          err
+          })
         )
       );
       return newThread;
@@ -3111,9 +3213,9 @@ function useDeleteRoomThread(roomId) {
           store.deleteThread(threadId, optimisticId);
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          { type: "DELETE_THREAD_ERROR", roomId, threadId },
-          err
+          (err2) => new DeleteThreadError(err2, { roomId, threadId })
         )
       );
     },
@@ -3146,14 +3248,13 @@ function useEditRoomThreadMetadata(roomId) {
           store.patchThread(threadId, optimisticId, { metadata: metadata2 }, updatedAt)
         ),
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          {
-            type: "EDIT_THREAD_METADATA_ERROR",
+          (error) => new EditThreadMetadataError(error, {
             roomId,
             threadId,
             metadata
-          },
-          err
+          })
         )
       );
     },
@@ -3191,15 +3292,14 @@ function useCreateRoomComment(roomId) {
           store.createComment(newComment, optimisticId);
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          {
-            type: "CREATE_COMMENT_ERROR",
+          (err2) => new CreateCommentError(err2, {
             roomId,
             threadId,
             commentId,
             body
-          },
-          err
+          })
         )
       );
       return comment;
@@ -3247,9 +3347,14 @@ function useEditRoomComment(roomId) {
           store.editComment(threadId, optimisticId, editedComment);
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          { type: "EDIT_COMMENT_ERROR", roomId, threadId, commentId, body },
-          err
+          (error) => new EditCommentError(error, {
+            roomId,
+            threadId,
+            commentId,
+            body
+          })
         )
       );
     },
@@ -3277,9 +3382,13 @@ function useDeleteRoomComment(roomId) {
           store.deleteComment(threadId, optimisticId, commentId, deletedAt);
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          { type: "DELETE_COMMENT_ERROR", roomId, threadId, commentId },
-          err
+          (error) => new DeleteCommentError(error, {
+            roomId,
+            threadId,
+            commentId
+          })
         )
       );
     },
@@ -3317,15 +3426,14 @@ function useAddRoomCommentReaction(roomId) {
           );
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          {
-            type: "ADD_REACTION_ERROR",
+          (error) => new AddReactionError(error, {
             roomId,
             threadId,
             commentId,
             emoji
-          },
-          err
+          })
         )
       );
     },
@@ -3362,15 +3470,14 @@ function useRemoveRoomCommentReaction(roomId) {
           );
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          {
-            type: "REMOVE_REACTION_ERROR",
+          (error) => new RemoveReactionError(error, {
             roomId,
             threadId,
             commentId,
             emoji
-          },
-          err
+          })
         )
       );
     },
@@ -3410,13 +3517,11 @@ function useMarkRoomThreadAsRead(roomId) {
         },
         (err) => {
           onMutationFailure(
+            err,
             optimisticId,
-            {
-              type: "MARK_INBOX_NOTIFICATION_AS_READ_ERROR",
-              roomId,
+            (error) => new MarkInboxNotificationAsReadError(error, {
               inboxNotificationId: inboxNotification.id
-            },
-            err
+            })
           );
           return;
         }
@@ -3449,9 +3554,12 @@ function useMarkRoomThreadAsResolved(roomId) {
           );
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          { type: "MARK_THREAD_AS_RESOLVED_ERROR", roomId, threadId },
-          err
+          (error) => new MarkThreadAsResolvedError(error, {
+            roomId,
+            threadId
+          })
         )
       );
     },
@@ -3482,9 +3590,12 @@ function useMarkRoomThreadAsUnresolved(roomId) {
           );
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          { type: "MARK_THREAD_AS_UNRESOLVED_ERROR", roomId, threadId },
-          err
+          (error) => new MarkThreadAsUnresolvedError(error, {
+            roomId,
+            threadId
+          })
         )
       );
     },
@@ -3634,9 +3745,11 @@ function useUpdateRoomNotificationSettings() {
           store.updateRoomNotificationSettings(room.id, optimisticId, settings2);
         },
         (err) => onMutationFailure(
+          err,
           optimisticId,
-          { type: "UPDATE_NOTIFICATION_SETTINGS_ERROR", roomId: room.id },
-          err
+          (error) => new UpdateNotificationSettingsError(error, {
+            roomId: room.id
+          })
         )
       );
     },
@@ -3849,7 +3962,7 @@ export {
   _useUserThreads_experimental,
   _useUserThreadsSuspense_experimental,
   useSyncStatus,
-  useErrorListener,
+  CreateThreadError,
   useStatus,
   useReportTextEditor,
   useYjsProvider,
@@ -3860,12 +3973,14 @@ export {
   useStorageStatus,
   useBatch,
   useLostConnectionListener,
+  useErrorListener,
   useHistory,
   useUndo,
   useRedo,
   useCanUndo,
   useCanRedo,
   useOthersConnectionIds,
+  useCommentsErrorListener,
   useCreateRoomThread,
   useDeleteRoomThread,
   useEditRoomThreadMetadata,
@@ -3925,4 +4040,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-JZBPCFEX.mjs.map
+//# sourceMappingURL=chunk-FQKGWA7O.mjs.map