@liveblocks/react 2.2.3-alpha2 → 2.4.0-test1

package/dist/{chunk-AKAI4UTH.mjs → chunk-2ITOEAYK.mjs}

@@ -1,6 +1,6 @@
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.2.3-alpha2";
+var PKG_VERSION = "2.4.0-test1";
 var PKG_FORMAT = "esm";
 
 // src/ClientSideSuspense.tsx
@@ -15,13 +15,15 @@ function ClientSideSuspense(props) {
 
 // src/liveblocks.tsx
 import {
+  assert,
   createClient,
   kInternal,
   makePoller,
+  memoizeOnSuccess,
+  nanoid,
   raise,
   shallow
 } from "@liveblocks/core";
-import { nanoid } from "nanoid";
 import React2, {
   createContext,
   useCallback as useCallback2,
@@ -43,6 +45,7 @@ function selectedInboxNotifications(state) {
 }
 
 // src/lib/retry-error.ts
+import { wait } from "@liveblocks/core";
 var MAX_ERROR_RETRY_COUNT = 5;
 var ERROR_RETRY_INTERVAL = 5e3;
 function retryError(action, retryCount) {
@@ -52,6 +55,23 @@ function retryError(action, retryCount) {
     void action();
   }, timeout);
 }
+async function autoRetry(promiseFn, maxTries, backoff) {
+  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 (attempt >= maxTries) {
+        throw new Error(`Failed after ${maxTries} attempts: ${String(err)}`);
+      }
+    }
+    const delay = backoff[attempt - 1] ?? fallbackBackoff;
+    await wait(delay);
+  }
+}
 
 // src/lib/use-initial.ts
 import { useCallback, useReducer } from "react";
@@ -83,6 +103,33 @@ function useInitialUnlessFunction(latestValue) {
   }
 }
 
+// src/lib/use-polyfill.ts
+var use = (
+  // React.use ||
+  (promise) => {
+    if (promise.status === "pending") {
+      throw promise;
+    } else if (promise.status === "fulfilled") {
+      return promise.value;
+    } else if (promise.status === "rejected") {
+      throw promise.reason;
+    } else {
+      promise.status = "pending";
+      promise.then(
+        (v) => {
+          promise.status = "fulfilled";
+          promise.value = v;
+        },
+        (e) => {
+          promise.status = "rejected";
+          promise.reason = e;
+        }
+      );
+      throw promise;
+    }
+  }
+);
+
 // src/liveblocks.tsx
 var ClientContext = createContext(null);
 function missingUserError(userId) {
@@ -115,12 +162,6 @@ function selectorFor_useInboxNotifications(state) {
     isLoading: false
   };
 }
-function selectorFor_useInboxNotificationsSuspense(state) {
-  return {
-    inboxNotifications: selectedInboxNotifications(state),
-    isLoading: false
-  };
-}
 function selectUnreadInboxNotificationsCount(state) {
   let count = 0;
   for (const notification of selectedInboxNotifications(state)) {
@@ -148,10 +189,40 @@ function selectorFor_useUnreadInboxNotificationsCount(state) {
     count: selectUnreadInboxNotificationsCount(state)
   };
 }
-function selectorFor_useUnreadInboxNotificationsCountSuspense(state) {
+function selectorFor_useUser(state, userId) {
+  if (state === void 0 || state?.isLoading) {
+    return state ?? { isLoading: true };
+  }
+  if (state.error) {
+    return state;
+  }
+  if (!state.data) {
+    return {
+      isLoading: false,
+      error: missingUserError(userId)
+    };
+  }
   return {
     isLoading: false,
-    count: selectUnreadInboxNotificationsCount(state)
+    user: state.data
+  };
+}
+function selectorFor_useRoomInfo(state, roomId) {
+  if (state === void 0 || state?.isLoading) {
+    return state ?? { isLoading: true };
+  }
+  if (state.error) {
+    return state;
+  }
+  if (!state.data) {
+    return {
+      isLoading: false,
+      error: missingRoomInfoError(roomId)
+    };
+  }
+  return {
+    isLoading: false,
+    info: state.data
   };
 }
 function getOrCreateContextBundle(client) {
@@ -173,94 +244,96 @@ function getExtrasForClient(client) {
 function makeExtrasForClient(client) {
   const internals = client[kInternal];
   const store = internals.cacheStore;
-  const notifications = internals.notifications;
-  let fetchInboxNotifications$ = null;
   let lastRequestedAt;
-  const poller = makePoller(
-    () => notifications.getInboxNotifications({ since: lastRequestedAt }).then(
-      (result) => {
-        lastRequestedAt = result.meta.requestedAt;
-        store.updateThreadsAndNotifications(
-          result.threads,
-          result.inboxNotifications,
-          result.deletedThreads,
-          result.deletedInboxNotifications,
-          INBOX_NOTIFICATIONS_QUERY
-        );
-      },
-      () => {
+  async function fetchInboxNotifications() {
+    if (lastRequestedAt === void 0) {
+      const result = await client.getInboxNotifications();
+      store.updateThreadsAndNotifications(
+        result.threads,
+        result.inboxNotifications,
+        [],
+        [],
+        INBOX_NOTIFICATIONS_QUERY
+      );
+      lastRequestedAt = result.requestedAt;
+    } else {
+      const result = await client.getInboxNotificationsSince({
+        since: lastRequestedAt
+      });
+      store.updateThreadsAndNotifications(
+        result.threads.modified,
+        result.inboxNotifications.modified,
+        result.threads.deleted,
+        result.inboxNotifications.deleted,
+        INBOX_NOTIFICATIONS_QUERY
+      );
+      if (lastRequestedAt < result.requestedAt) {
+        lastRequestedAt = result.requestedAt;
       }
-    )
-  );
-  async function fetchInboxNotifications({ retryCount } = { retryCount: 0 }) {
-    if (fetchInboxNotifications$ !== null) {
-      return fetchInboxNotifications$;
     }
+  }
+  let pollerSubscribers = 0;
+  const poller = makePoller(async () => {
+    try {
+      await waitUntilInboxNotificationsLoaded();
+      await fetchInboxNotifications();
+    } catch (err) {
+      console.warn(`Polling new inbox notifications failed: ${String(err)}`);
+    }
+  });
+  const waitUntilInboxNotificationsLoaded = memoizeOnSuccess(async () => {
     store.setQueryState(INBOX_NOTIFICATIONS_QUERY, {
       isLoading: true
     });
     try {
-      fetchInboxNotifications$ = notifications.getInboxNotifications();
-      const result = await fetchInboxNotifications$;
-      store.updateThreadsAndNotifications(
-        result.threads,
-        result.inboxNotifications,
-        result.deletedThreads,
-        result.deletedInboxNotifications,
-        INBOX_NOTIFICATIONS_QUERY
+      await autoRetry(
+        () => fetchInboxNotifications(),
+        5,
+        [5e3, 5e3, 1e4, 15e3]
       );
-      if (lastRequestedAt === void 0 || lastRequestedAt > result.meta.requestedAt) {
-        lastRequestedAt = result.meta.requestedAt;
-      }
-      poller.start(POLLING_INTERVAL);
-    } catch (er) {
-      fetchInboxNotifications$ = null;
-      retryError(() => {
-        void fetchInboxNotifications({
-          retryCount: retryCount + 1
-        });
-      }, retryCount);
+    } catch (err) {
       store.setQueryState(INBOX_NOTIFICATIONS_QUERY, {
         isLoading: false,
-        error: er
+        error: err
       });
+      throw err;
     }
-    return;
+  });
+  function loadInboxNotifications() {
+    void waitUntilInboxNotificationsLoaded().catch(() => {
+    });
   }
-  let inboxNotificationsSubscribers = 0;
-  function useSubscribeToInboxNotificationsEffect(options) {
-    const autoFetch = useInitial(options?.autoFetch ?? true);
+  function useEnableInboxNotificationsPolling() {
     useEffect3(() => {
-      if (autoFetch) {
-        void fetchInboxNotifications();
-      }
-      inboxNotificationsSubscribers++;
+      pollerSubscribers++;
       poller.start(POLLING_INTERVAL);
       return () => {
-        if (inboxNotificationsSubscribers <= 0) {
+        if (pollerSubscribers <= 0) {
           console.warn(
             `Internal unexpected behavior. Cannot decrease subscriber count for query "${INBOX_NOTIFICATIONS_QUERY}"`
           );
           return;
         }
-        inboxNotificationsSubscribers--;
-        if (inboxNotificationsSubscribers <= 0) {
+        pollerSubscribers--;
+        if (pollerSubscribers <= 0) {
           poller.stop();
         }
       };
-    }, [autoFetch]);
+    }, []);
   }
   return {
     store,
-    notifications,
-    fetchInboxNotifications,
-    useSubscribeToInboxNotificationsEffect
+    useEnableInboxNotificationsPolling,
+    waitUntilInboxNotificationsLoaded,
+    loadInboxNotifications
   };
 }
 function makeLiveblocksContextBundle(client) {
   const useInboxNotificationThread2 = (inboxNotificationId) => useInboxNotificationThread_withClient(client, inboxNotificationId);
   const useMarkInboxNotificationAsRead2 = () => useMarkInboxNotificationAsRead_withClient(client);
   const useMarkAllInboxNotificationsAsRead2 = () => useMarkAllInboxNotificationsAsRead_withClient(client);
+  const useDeleteInboxNotification2 = () => useDeleteInboxNotification_withClient(client);
+  const useDeleteAllInboxNotifications2 = () => useDeleteAllInboxNotifications_withClient(client);
   function LiveblocksProvider2(props) {
     useEnsureNoLiveblocksProvider();
     return /* @__PURE__ */ React2.createElement(ClientContext.Provider, { value: client }, props.children);
@@ -272,6 +345,8 @@ function makeLiveblocksContextBundle(client) {
     useUnreadInboxNotificationsCount: () => useUnreadInboxNotificationsCount_withClient(client),
     useMarkInboxNotificationAsRead: useMarkInboxNotificationAsRead2,
     useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
+    useDeleteInboxNotification: useDeleteInboxNotification2,
+    useDeleteAllInboxNotifications: useDeleteAllInboxNotifications2,
     useInboxNotificationThread: useInboxNotificationThread2,
     ...shared.classic,
     suspense: {
@@ -280,6 +355,8 @@ function makeLiveblocksContextBundle(client) {
       useUnreadInboxNotificationsCount: () => useUnreadInboxNotificationsCountSuspense_withClient(client),
       useMarkInboxNotificationAsRead: useMarkInboxNotificationAsRead2,
       useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
+      useDeleteInboxNotification: useDeleteInboxNotification2,
+      useDeleteAllInboxNotifications: useDeleteAllInboxNotifications2,
       useInboxNotificationThread: useInboxNotificationThread2,
       ...shared.suspense
     }
@@ -287,8 +364,11 @@ function makeLiveblocksContextBundle(client) {
   return bundle;
 }
 function useInboxNotifications_withClient(client) {
-  const { store, useSubscribeToInboxNotificationsEffect } = getExtrasForClient(client);
-  useSubscribeToInboxNotificationsEffect();
+  const { loadInboxNotifications, store, useEnableInboxNotificationsPolling } = getExtrasForClient(client);
+  useEffect3(() => {
+    loadInboxNotifications();
+  }, [loadInboxNotifications]);
+  useEnableInboxNotificationsPolling();
   return useSyncExternalStoreWithSelector(
     store.subscribe,
     store.get,
@@ -298,30 +378,19 @@ function useInboxNotifications_withClient(client) {
   );
 }
 function useInboxNotificationsSuspense_withClient(client) {
-  const {
-    store,
-    fetchInboxNotifications,
-    useSubscribeToInboxNotificationsEffect
-  } = getExtrasForClient(client);
-  const query = store.get().queries[INBOX_NOTIFICATIONS_QUERY];
-  if (query === void 0 || query.isLoading) {
-    throw fetchInboxNotifications();
-  }
-  if (query.error !== void 0) {
-    throw query.error;
-  }
-  useSubscribeToInboxNotificationsEffect({ autoFetch: false });
-  return useSyncExternalStoreWithSelector(
-    store.subscribe,
-    store.get,
-    store.get,
-    selectorFor_useInboxNotificationsSuspense,
-    shallow
-  );
+  const { waitUntilInboxNotificationsLoaded } = getExtrasForClient(client);
+  use(waitUntilInboxNotificationsLoaded());
+  const result = useInboxNotifications_withClient(client);
+  assert(!result.error, "Did not expect error");
+  assert(!result.isLoading, "Did not expect loading");
+  return result;
 }
 function useUnreadInboxNotificationsCount_withClient(client) {
-  const { store, useSubscribeToInboxNotificationsEffect } = getExtrasForClient(client);
-  useSubscribeToInboxNotificationsEffect();
+  const { store, loadInboxNotifications, useEnableInboxNotificationsPolling } = getExtrasForClient(client);
+  useEffect3(() => {
+    loadInboxNotifications();
+  }, [loadInboxNotifications]);
+  useEnableInboxNotificationsPolling();
   return useSyncExternalStoreWithSelector(
     store.subscribe,
     store.get,
@@ -331,28 +400,17 @@ function useUnreadInboxNotificationsCount_withClient(client) {
   );
 }
 function useUnreadInboxNotificationsCountSuspense_withClient(client) {
-  const {
-    store,
-    fetchInboxNotifications,
-    useSubscribeToInboxNotificationsEffect
-  } = getExtrasForClient(client);
-  const query = store.get().queries[INBOX_NOTIFICATIONS_QUERY];
-  if (query === void 0 || query.isLoading) {
-    throw fetchInboxNotifications();
-  }
-  useSubscribeToInboxNotificationsEffect({ autoFetch: false });
-  return useSyncExternalStoreWithSelector(
-    store.subscribe,
-    store.get,
-    store.get,
-    selectorFor_useUnreadInboxNotificationsCountSuspense,
-    shallow
-  );
+  const { waitUntilInboxNotificationsLoaded } = getExtrasForClient(client);
+  use(waitUntilInboxNotificationsLoaded());
+  const result = useUnreadInboxNotificationsCount_withClient(client);
+  assert(!result.isLoading, "Did not expect loading");
+  assert(!result.error, "Did not expect error");
+  return result;
 }
 function useMarkInboxNotificationAsRead_withClient(client) {
   return useCallback2(
     (inboxNotificationId) => {
-      const { store, notifications } = getExtrasForClient(client);
+      const { store } = getExtrasForClient(client);
       const optimisticUpdateId = nanoid();
       const readAt = /* @__PURE__ */ new Date();
       store.pushOptimisticUpdate({
@@ -361,7 +419,7 @@ function useMarkInboxNotificationAsRead_withClient(client) {
         inboxNotificationId,
         readAt
       });
-      notifications.markInboxNotificationAsRead(inboxNotificationId).then(
+      client.markInboxNotificationAsRead(inboxNotificationId).then(
         () => {
           store.set((state) => {
             const existingNotification = state.inboxNotifications[inboxNotificationId];
@@ -403,15 +461,15 @@ function useMarkInboxNotificationAsRead_withClient(client) {
 }
 function useMarkAllInboxNotificationsAsRead_withClient(client) {
   return useCallback2(() => {
-    const { store, notifications } = getExtrasForClient(client);
+    const { store } = getExtrasForClient(client);
     const optimisticUpdateId = nanoid();
     const readAt = /* @__PURE__ */ new Date();
     store.pushOptimisticUpdate({
-      type: "mark-inbox-notifications-as-read",
+      type: "mark-all-inbox-notifications-as-read",
       id: optimisticUpdateId,
       readAt
     });
-    notifications.markAllInboxNotificationsAsRead().then(
+    client.markAllInboxNotificationsAsRead().then(
       () => {
         store.set((state) => ({
           ...state,
@@ -439,6 +497,84 @@ function useMarkAllInboxNotificationsAsRead_withClient(client) {
     );
   }, [client]);
 }
+function useDeleteInboxNotification_withClient(client) {
+  return useCallback2(
+    (inboxNotificationId) => {
+      const { store } = getExtrasForClient(client);
+      const optimisticUpdateId = nanoid();
+      const deletedAt = /* @__PURE__ */ new Date();
+      store.pushOptimisticUpdate({
+        type: "delete-inbox-notification",
+        id: optimisticUpdateId,
+        inboxNotificationId,
+        deletedAt
+      });
+      client.deleteInboxNotification(inboxNotificationId).then(
+        () => {
+          store.set((state) => {
+            const existingNotification = state.inboxNotifications[inboxNotificationId];
+            if (existingNotification === void 0) {
+              return {
+                ...state,
+                optimisticUpdates: state.optimisticUpdates.filter(
+                  (update) => update.id !== optimisticUpdateId
+                )
+              };
+            }
+            const { [inboxNotificationId]: _, ...inboxNotifications } = state.inboxNotifications;
+            return {
+              ...state,
+              inboxNotifications,
+              optimisticUpdates: state.optimisticUpdates.filter(
+                (update) => update.id !== optimisticUpdateId
+              )
+            };
+          });
+        },
+        () => {
+          store.set((state) => ({
+            ...state,
+            optimisticUpdates: state.optimisticUpdates.filter(
+              (update) => update.id !== optimisticUpdateId
+            )
+          }));
+        }
+      );
+    },
+    [client]
+  );
+}
+function useDeleteAllInboxNotifications_withClient(client) {
+  return useCallback2(() => {
+    const { store } = getExtrasForClient(client);
+    const optimisticUpdateId = nanoid();
+    const deletedAt = /* @__PURE__ */ new Date();
+    store.pushOptimisticUpdate({
+      type: "delete-all-inbox-notifications",
+      id: optimisticUpdateId,
+      deletedAt
+    });
+    client.deleteAllInboxNotifications().then(
+      () => {
+        store.set((state) => ({
+          ...state,
+          inboxNotifications: {},
+          optimisticUpdates: state.optimisticUpdates.filter(
+            (update) => update.id !== optimisticUpdateId
+          )
+        }));
+      },
+      () => {
+        store.set((state) => ({
+          ...state,
+          optimisticUpdates: state.optimisticUpdates.filter(
+            (update) => update.id !== optimisticUpdateId
+          )
+        }));
+      }
+    );
+  }, [client]);
+}
 function useInboxNotificationThread_withClient(client, inboxNotificationId) {
   const { store } = getExtrasForClient(client);
   const selector = useCallback2(
@@ -472,17 +608,17 @@ function useUser_withClient(client, userId) {
   useEffect3(() => {
     void usersStore.get(userId);
   }, [usersStore, userId]);
-  const state = useSyncExternalStore(
+  const selector = useCallback2(
+    (state) => selectorFor_useUser(state, userId),
+    [userId]
+  );
+  return useSyncExternalStoreWithSelector(
     usersStore.subscribe,
     getUserState,
-    getUserState
+    getUserState,
+    selector,
+    shallow
   );
-  return state ? {
-    isLoading: state.isLoading,
-    user: state.data,
-    // Return an error if `undefined` was returned by `resolveUsers` for this user ID
-    error: !state.isLoading && !state.data && !state.error ? missingUserError(userId) : state.error
-  } : { isLoading: true };
 }
 function useUserSuspense_withClient(client, userId) {
   const usersStore = client[kInternal].usersStore;
@@ -505,10 +641,13 @@ function useUserSuspense_withClient(client, userId) {
     getUserState,
     getUserState
   );
+  assert(state !== void 0, "Unexpected missing state");
+  assert(!state.isLoading, "Unexpected loading state");
+  assert(!state.error, "Unexpected error state");
   return {
     isLoading: false,
-    user: state?.data,
-    error: state?.error
+    user: state.data,
+    error: void 0
   };
 }
 function useRoomInfo_withClient(client, roomId) {
@@ -517,20 +656,20 @@ function useRoomInfo_withClient(client, roomId) {
     () => roomsInfoStore.getState(roomId),
     [roomsInfoStore, roomId]
   );
+  const selector = useCallback2(
+    (state) => selectorFor_useRoomInfo(state, roomId),
+    [roomId]
+  );
   useEffect3(() => {
     void roomsInfoStore.get(roomId);
   }, [roomsInfoStore, roomId]);
-  const state = useSyncExternalStore(
+  return useSyncExternalStoreWithSelector(
     roomsInfoStore.subscribe,
     getRoomInfoState,
-    getRoomInfoState
+    getRoomInfoState,
+    selector,
+    shallow
   );
-  return state ? {
-    isLoading: state.isLoading,
-    info: state.data,
-    // Return an error if `undefined` was returned by `resolveRoomsInfo` for this room ID
-    error: !state.isLoading && !state.data && !state.error ? missingRoomInfoError(roomId) : state.error
-  } : { isLoading: true };
 }
 function useRoomInfoSuspense_withClient(client, roomId) {
   const roomsInfoStore = client[kInternal].roomsInfoStore;
@@ -553,10 +692,14 @@ function useRoomInfoSuspense_withClient(client, roomId) {
     getRoomInfoState,
     getRoomInfoState
   );
+  assert(state !== void 0, "Unexpected missing state");
+  assert(!state.isLoading, "Unexpected loading state");
+  assert(!state.error, "Unexpected error state");
+  assert(state.data !== void 0, "Unexpected missing room info data");
   return {
     isLoading: false,
-    info: state?.data,
-    error: state?.error
+    info: state.data,
+    error: void 0
   };
 }
 function createSharedContext(client) {
@@ -641,6 +784,12 @@ function useMarkAllInboxNotificationsAsRead() {
 function useMarkInboxNotificationAsRead() {
   return useMarkInboxNotificationAsRead_withClient(useClient());
 }
+function useDeleteAllInboxNotifications() {
+  return useDeleteAllInboxNotifications_withClient(useClient());
+}
+function useDeleteInboxNotification() {
+  return useDeleteInboxNotification_withClient(useClient());
+}
 function useUnreadInboxNotificationsCount() {
   return useUnreadInboxNotificationsCount_withClient(useClient());
 }
@@ -777,6 +926,9 @@ function selectedThreads(roomId, state, options) {
       }
       const query = options.query;
       if (!query) return true;
+      if (query.resolved !== void 0 && thread.resolved !== query.resolved) {
+        return false;
+      }
       for (const key in query.metadata) {
         const metadataValue = thread.metadata[key];
         const filterValue = query.metadata[key];
@@ -811,36 +963,24 @@ import {
   addReaction,
   CommentsApiError,
   console as console2,
+  createCommentId,
+  createThreadId,
   deleteComment,
   deprecateIf,
   errorIf,
   kInternal as kInternal2,
   makeEventSource,
   makePoller as makePoller2,
+  nanoid as nanoid2,
   NotificationsApiError,
   removeReaction,
   ServerMsgCode,
   stringify,
   upsertComment
 } from "@liveblocks/core";
-import { nanoid as nanoid3 } from "nanoid";
 import * as React4 from "react";
 import { useSyncExternalStoreWithSelector as useSyncExternalStoreWithSelector2 } from "use-sync-external-store/shim/with-selector.js";
 
-// src/comments/lib/createIds.ts
-import { nanoid as nanoid2 } from "nanoid";
-var THREAD_ID_PREFIX = "th";
-var COMMENT_ID_PREFIX = "cm";
-function createOptimisticId(prefix) {
-  return `${prefix}_${nanoid2()}`;
-}
-function createThreadId() {
-  return createOptimisticId(THREAD_ID_PREFIX);
-}
-function createCommentId() {
-  return createOptimisticId(COMMENT_ID_PREFIX);
-}
-
 // src/comments/lib/select-notification-settings.ts
 import {
   applyOptimisticUpdates as applyOptimisticUpdates3,
@@ -851,33 +991,6 @@ function selectNotificationSettings(roomId, state) {
   return nn(notificationSettings[roomId]);
 }
 
-// src/lib/use-polyfill.ts
-var use = (
-  // React.use ||
-  (promise) => {
-    if (promise.status === "pending") {
-      throw promise;
-    } else if (promise.status === "fulfilled") {
-      return promise.value;
-    } else if (promise.status === "rejected") {
-      throw promise.reason;
-    } else {
-      promise.status = "pending";
-      promise.then(
-        (v) => {
-          promise.status = "fulfilled";
-          promise.value = v;
-        },
-        (e) => {
-          promise.status = "rejected";
-          promise.reason = e;
-        }
-      );
-      throw promise;
-    }
-  }
-);
-
 // src/use-scroll-to-comment-on-load-effect.ts
 import * as React3 from "react";
 function handleScrollToCommentOnLoad(shouldScrollOnLoad, state) {
@@ -1052,18 +1165,17 @@ function makeExtrasForClient2(client) {
     if (isFetchingThreadsUpdates === true) return;
     try {
       requestStatusByRoom.set(room.id, true);
-      const commentsAPI = room[kInternal2].comments;
-      const updates = await commentsAPI.getThreads({ since });
+      const updates = await room.getThreadsSince({ since });
       setTimeout(() => {
         requestStatusByRoom.set(room.id, false);
       }, DEFAULT_DEDUPING_INTERVAL);
       store.updateThreadsAndNotifications(
-        updates.threads,
-        updates.inboxNotifications,
-        updates.deletedThreads,
-        updates.deletedInboxNotifications
+        updates.threads.modified,
+        updates.inboxNotifications.modified,
+        updates.threads.deleted,
+        updates.inboxNotifications.deleted
       );
-      lastRequestedAtByRoom.set(room.id, updates.meta.requestedAt);
+      lastRequestedAtByRoom.set(room.id, updates.requestedAt);
     } catch (err) {
       requestStatusByRoom.set(room.id, false);
       return;
@@ -1072,8 +1184,7 @@ function makeExtrasForClient2(client) {
   async function getThreadsAndInboxNotifications(room, queryKey, options, { retryCount } = { retryCount: 0 }) {
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
-    const commentsAPI = room[kInternal2].comments;
-    const request = commentsAPI.getThreads(options);
+    const request = room.getThreads(options);
     requestsByQuery.set(queryKey, request);
     store.setQueryState(queryKey, {
       isLoading: true
@@ -1082,14 +1193,15 @@ function makeExtrasForClient2(client) {
       const result = await request;
       store.updateThreadsAndNotifications(
         result.threads,
+        // TODO: Figure out how to remove this casting
         result.inboxNotifications,
-        result.deletedThreads,
-        result.deletedInboxNotifications,
+        [],
+        [],
         queryKey
       );
       const lastRequestedAt = lastRequestedAtByRoom.get(room.id);
-      if (lastRequestedAt === void 0 || lastRequestedAt > result.meta.requestedAt) {
-        lastRequestedAtByRoom.set(room.id, result.meta.requestedAt);
+      if (lastRequestedAt === void 0 || lastRequestedAt > result.requestedAt) {
+        lastRequestedAtByRoom.set(room.id, result.requestedAt);
       }
       poller.start(POLLING_INTERVAL2);
     } catch (err) {
@@ -1110,7 +1222,7 @@ function makeExtrasForClient2(client) {
     const existingRequest = requestsByQuery.get(queryKey);
     if (existingRequest !== void 0) return existingRequest;
     try {
-      const request = room[kInternal2].notifications.getRoomNotificationSettings();
+      const request = room.getNotificationSettings();
       requestsByQuery.set(queryKey, request);
       store.setQueryState(queryKey, {
         isLoading: true
@@ -1330,10 +1442,8 @@ function RoomProviderInner(props) {
         store.deleteThread(message.threadId);
         return;
       }
-      const info = await room[kInternal2].comments.getThread({
-        threadId: message.threadId
-      });
-      if (!info) {
+      const info = await room.getThread(message.threadId);
+      if (!info.thread) {
         store.deleteThread(message.threadId);
         return;
       }
@@ -1734,7 +1844,7 @@ function useCreateThread() {
         comments: [newComment],
         resolved: false
       };
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "create-thread",
@@ -1742,8 +1852,7 @@ function useCreateThread() {
         id: optimisticUpdateId,
         roomId: room.id
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.createThread({ threadId, commentId, body, metadata }).then(
+      room.createThread({ threadId, commentId, body, metadata }).then(
         (thread) => {
           store.set((state) => ({
             ...state,
@@ -1778,7 +1887,7 @@ function useDeleteThread() {
   const room = useRoom();
   return React4.useCallback(
     (threadId) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       const thread = store.get().threads[threadId];
       const userId = getCurrentUserId(room);
@@ -1792,8 +1901,7 @@ function useDeleteThread() {
         threadId,
         deletedAt: /* @__PURE__ */ new Date()
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.deleteThread({ threadId }).then(
+      room.deleteThread(threadId).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -1837,7 +1945,7 @@ function useEditThreadMetadata() {
       const threadId = options.threadId;
       const metadata = options.metadata;
       const updatedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "edit-thread-metadata",
@@ -1846,8 +1954,7 @@ function useEditThreadMetadata() {
         threadId,
         updatedAt
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.editThreadMetadata({ metadata, threadId }).then(
+      room.editThreadMetadata({ metadata, threadId }).then(
         (metadata2) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -1916,14 +2023,14 @@ function useCreateComment() {
         body,
         reactions: []
       };
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "create-comment",
         comment,
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.createComment({ threadId, commentId, body }).then(
+      room.createComment({ threadId, commentId, body }).then(
         (newComment) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -1983,7 +2090,7 @@ function useEditComment() {
   return React4.useCallback(
     ({ threadId, commentId, body }) => {
       const editedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       const thread = store.get().threads[threadId];
       if (thread === void 0) {
@@ -2010,7 +2117,7 @@ function useEditComment() {
         },
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.editComment({ threadId, commentId, body }).then(
+      room.editComment({ threadId, commentId, body }).then(
         (editedComment) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2055,7 +2162,7 @@ function useDeleteComment() {
   return React4.useCallback(
     ({ threadId, commentId }) => {
       const deletedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "delete-comment",
@@ -2065,7 +2172,7 @@ function useDeleteComment() {
         id: optimisticUpdateId,
         roomId: room.id
       });
-      room[kInternal2].comments.deleteComment({ threadId, commentId }).then(
+      room.deleteComment({ threadId, commentId }).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2109,7 +2216,7 @@ function useAddReaction() {
     ({ threadId, commentId, emoji }) => {
       const createdAt = /* @__PURE__ */ new Date();
       const userId = getCurrentUserId(room);
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "add-reaction",
@@ -2122,7 +2229,7 @@ function useAddReaction() {
         },
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.addReaction({ threadId, commentId, emoji }).then(
+      room.addReaction({ threadId, commentId, emoji }).then(
         (addedReaction) => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2171,7 +2278,7 @@ function useRemoveReaction() {
     ({ threadId, commentId, emoji }) => {
       const userId = getCurrentUserId(room);
       const removedAt = /* @__PURE__ */ new Date();
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         type: "remove-reaction",
@@ -2182,7 +2289,7 @@ function useRemoveReaction() {
         removedAt,
         id: optimisticUpdateId
       });
-      room[kInternal2].comments.removeReaction({ threadId, commentId, emoji }).then(
+      room.removeReaction({ threadId, commentId, emoji }).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2238,7 +2345,7 @@ function useMarkThreadAsRead() {
         (inboxNotification2) => inboxNotification2.kind === "thread" && inboxNotification2.threadId === threadId
       );
       if (!inboxNotification) return;
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const now = /* @__PURE__ */ new Date();
       store.pushOptimisticUpdate({
         type: "mark-inbox-notification-as-read",
@@ -2246,7 +2353,7 @@ function useMarkThreadAsRead() {
         inboxNotificationId: inboxNotification.id,
         readAt: now
       });
-      room[kInternal2].notifications.markInboxNotificationAsRead(inboxNotification.id).then(
+      room.markInboxNotificationAsRead(inboxNotification.id).then(
         () => {
           store.set((state) => ({
             ...state,
@@ -2282,7 +2389,7 @@ function useMarkThreadAsResolved() {
   const room = useRoom();
   return React4.useCallback(
     (threadId) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const updatedAt = /* @__PURE__ */ new Date();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
@@ -2291,8 +2398,7 @@ function useMarkThreadAsResolved() {
         threadId,
         updatedAt
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.markThreadAsResolved({ threadId }).then(
+      room.markThreadAsResolved(threadId).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2348,7 +2454,7 @@ function useMarkThreadAsUnresolved() {
   const room = useRoom();
   return React4.useCallback(
     (threadId) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const updatedAt = /* @__PURE__ */ new Date();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
@@ -2357,8 +2463,7 @@ function useMarkThreadAsUnresolved() {
         threadId,
         updatedAt
       });
-      const commentsAPI = room[kInternal2].comments;
-      commentsAPI.markThreadAsUnresolved({ threadId }).then(
+      room.markThreadAsUnresolved(threadId).then(
         () => {
           store.set((state) => {
             const existingThread = state.threads[threadId];
@@ -2478,7 +2583,7 @@ function useUpdateRoomNotificationSettings() {
   const room = useRoom();
   return React4.useCallback(
     (settings) => {
-      const optimisticUpdateId = nanoid3();
+      const optimisticUpdateId = nanoid2();
       const { store, onMutationFailure } = getExtrasForClient2(client);
       store.pushOptimisticUpdate({
         id: optimisticUpdateId,
@@ -2486,7 +2591,7 @@ function useUpdateRoomNotificationSettings() {
         roomId: room.id,
         settings
       });
-      room[kInternal2].notifications.updateRoomNotificationSettings(settings).then(
+      room.updateNotificationSettings(settings).then(
         (settings2) => {
           store.set((state) => ({
             ...state,
@@ -2693,6 +2798,8 @@ export {
   useInboxNotificationsSuspense,
   useMarkAllInboxNotificationsAsRead,
   useMarkInboxNotificationAsRead,
+  useDeleteAllInboxNotifications,
+  useDeleteInboxNotification,
   useUnreadInboxNotificationsCount,
   useUnreadInboxNotificationsCountSuspense,
   useRoomInfo,
@@ -2754,4 +2861,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-AKAI4UTH.mjs.map
+//# sourceMappingURL=chunk-2ITOEAYK.mjs.map