@liveblocks/core 1.10.0-beta2 → 1.10.0-beta4

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.10.0-beta2";
+var PKG_VERSION = "1.10.0-beta4";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -362,23 +362,29 @@ var FSM = class {
   }
   onEnterAsync(nameOrPattern, promiseFn, onOK, onError) {
     return this.onEnter(nameOrPattern, () => {
-      let cancelled = false;
-      void promiseFn(this.currentContext.current).then(
+      const abortController = new AbortController();
+      const signal = abortController.signal;
+      let done = false;
+      void promiseFn(this.currentContext.current, signal).then(
         // On OK
         (data) => {
-          if (!cancelled) {
+          if (!signal.aborted) {
+            done = true;
             this.transition({ type: "ASYNC_OK", data }, onOK);
           }
         },
         // On Error
         (reason) => {
-          if (!cancelled) {
+          if (!signal.aborted) {
+            done = true;
             this.transition({ type: "ASYNC_ERROR", reason }, onError);
           }
         }
       );
       return () => {
-        cancelled = true;
+        if (!done) {
+          abortController.abort();
+        }
       };
     });
   }
@@ -652,6 +658,7 @@ var ServerMsgCode = /* @__PURE__ */ ((ServerMsgCode2) => {
 
 // src/types/IWebSocket.ts
 var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
+  WebsocketCloseCodes2[WebsocketCloseCodes2["CLOSE_NORMAL"] = 1e3] = "CLOSE_NORMAL";
   WebsocketCloseCodes2[WebsocketCloseCodes2["CLOSE_ABNORMAL"] = 1006] = "CLOSE_ABNORMAL";
   WebsocketCloseCodes2[WebsocketCloseCodes2["UNEXPECTED_CONDITION"] = 1011] = "UNEXPECTED_CONDITION";
   WebsocketCloseCodes2[WebsocketCloseCodes2["TRY_AGAIN_LATER"] = 1013] = "TRY_AGAIN_LATER";
@@ -661,6 +668,7 @@ var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
   WebsocketCloseCodes2[WebsocketCloseCodes2["MAX_NUMBER_OF_CONCURRENT_CONNECTIONS"] = 4003] = "MAX_NUMBER_OF_CONCURRENT_CONNECTIONS";
   WebsocketCloseCodes2[WebsocketCloseCodes2["MAX_NUMBER_OF_MESSAGES_PER_DAY_PER_APP"] = 4004] = "MAX_NUMBER_OF_MESSAGES_PER_DAY_PER_APP";
   WebsocketCloseCodes2[WebsocketCloseCodes2["MAX_NUMBER_OF_CONCURRENT_CONNECTIONS_PER_ROOM"] = 4005] = "MAX_NUMBER_OF_CONCURRENT_CONNECTIONS_PER_ROOM";
+  WebsocketCloseCodes2[WebsocketCloseCodes2["KICKED"] = 4100] = "KICKED";
   WebsocketCloseCodes2[WebsocketCloseCodes2["TOKEN_EXPIRED"] = 4109] = "TOKEN_EXPIRED";
   WebsocketCloseCodes2[WebsocketCloseCodes2["CLOSE_WITHOUT_RETRY"] = 4999] = "CLOSE_WITHOUT_RETRY";
   return WebsocketCloseCodes2;
@@ -728,6 +736,7 @@ var StopRetrying = class extends Error {
   }
 };
 var LiveblocksError = class extends Error {
+  /** @internal */
   constructor(message, code) {
     super(message);
     this.code = code;
@@ -942,14 +951,16 @@ function createConnectionStateMachine(delegates, options) {
     // When the "open" event happens, we're ready to transition to the
     // OK state. This is done by resolving the Promise.
     //
-    async (ctx) => {
+    async (ctx, signal) => {
       let capturedPrematureEvent = null;
+      let unconfirmedSocket = null;
       const connect$ = new Promise(
         (resolve, rej) => {
           if (ctx.authValue === null) {
             throw new Error("No auth authValue");
           }
           const socket = delegates.createSocket(ctx.authValue);
+          unconfirmedSocket = socket;
           function reject(event) {
             capturedPrematureEvent = event;
             socket.removeEventListener("message", onSocketMessage);
@@ -1005,12 +1016,18 @@ function createConnectionStateMachine(delegates, options) {
         //
         ([socket, unsub]) => {
           unsub();
+          if (signal.aborted) {
+            throw new Error("Aborted");
+          }
           if (capturedPrematureEvent) {
             throw capturedPrematureEvent;
           }
           return socket;
         }
-      );
+      ).catch((e) => {
+        teardownSocket(unconfirmedSocket);
+        throw e;
+      });
     },
     // Only transition to OK state after a successfully opened WebSocket connection
     (okEvent) => ({
@@ -1325,7 +1342,7 @@ function createAuthManager(authOptions) {
     }
     return false;
   }
-  function getCachedToken(roomOptions) {
+  function getCachedToken(requestOptions) {
     const now = Math.ceil(Date.now() / 1e3);
     for (let i = tokens.length - 1; i >= 0; i--) {
       const token = tokens[i];
@@ -1338,11 +1355,15 @@ function createAuthManager(authOptions) {
       if (token.parsed.k === "id" /* ID_TOKEN */) {
         return token;
       } else if (token.parsed.k === "acc" /* ACCESS_TOKEN */) {
-        if (!roomOptions) {
+        if (!requestOptions.roomId && Object.entries(token.parsed.perms).length === 0) {
           return token;
         }
         for (const [resource, scopes] of Object.entries(token.parsed.perms)) {
-          if (resource.includes("*") && roomOptions.roomId.startsWith(resource.replace("*", "")) || roomOptions.roomId === resource && hasCorrespondingScopes(roomOptions.requestedScope, scopes)) {
+          if (!requestOptions.roomId) {
+            if (resource.includes("*") && hasCorrespondingScopes(requestOptions.requestedScope, scopes)) {
+              return token;
+            }
+          } else if (resource.includes("*") && requestOptions.roomId.startsWith(resource.replace("*", "")) || requestOptions.roomId === resource && hasCorrespondingScopes(requestOptions.requestedScope, scopes)) {
             return token;
           }
         }
@@ -1350,7 +1371,7 @@ function createAuthManager(authOptions) {
     }
     return void 0;
   }
-  async function makeAuthRequest(roomId) {
+  async function makeAuthRequest(options) {
     const fetcher = authOptions.polyfills?.fetch ?? (typeof window === "undefined" ? void 0 : window.fetch);
     if (authentication.type === "private") {
       if (fetcher === void 0) {
@@ -1359,9 +1380,10 @@ function createAuthManager(authOptions) {
         );
       }
       const response = await fetchAuthEndpoint(fetcher, authentication.url, {
-        room: roomId
+        room: options.roomId
       });
       const parsed = parseAuthToken(response.token);
+      verifyTokenPermissions(parsed, options);
       if (seenTokens.has(parsed.raw)) {
         throw new StopRetrying(
           "The same Liveblocks auth token was issued from the backend before. Caching Liveblocks tokens is not supported."
@@ -1370,10 +1392,12 @@ function createAuthManager(authOptions) {
       return parsed;
     }
     if (authentication.type === "custom") {
-      const response = await authentication.callback(roomId);
+      const response = await authentication.callback(options.roomId);
       if (response && typeof response === "object") {
         if (typeof response.token === "string") {
-          return parseAuthToken(response.token);
+          const parsed = parseAuthToken(response.token);
+          verifyTokenPermissions(parsed, options);
+          return parsed;
         } else if (typeof response.error === "string") {
           const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
           if (response.error === "forbidden") {
@@ -1391,25 +1415,42 @@ function createAuthManager(authOptions) {
       "Unexpected authentication type. Must be private or custom."
     );
   }
-  async function getAuthValue(roomOptions) {
+  function verifyTokenPermissions(parsedToken, options) {
+    if (!options.roomId && parsedToken.parsed.k === "acc" /* ACCESS_TOKEN */) {
+      if (Object.entries(parsedToken.parsed.perms).length === 0) {
+        return;
+      }
+      for (const [resource, scopes] of Object.entries(
+        parsedToken.parsed.perms
+      )) {
+        if (resource.includes("*") && hasCorrespondingScopes(options.requestedScope, scopes)) {
+          return;
+        }
+      }
+      throw new StopRetrying(
+        "The issued access token doesn't grant enough permissions. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/access-tokens-not-enough-permissions"
+      );
+    }
+  }
+  async function getAuthValue(requestOptions) {
     if (authentication.type === "public") {
       return { type: "public", publicApiKey: authentication.publicApiKey };
     }
-    const cachedToken = getCachedToken(roomOptions);
+    const cachedToken = getCachedToken(requestOptions);
     if (cachedToken !== void 0) {
       return { type: "secret", token: cachedToken };
     }
     let currentPromise;
-    if (roomOptions) {
-      currentPromise = requestPromises.get(roomOptions.roomId);
+    if (requestOptions.roomId) {
+      currentPromise = requestPromises.get(requestOptions.roomId);
       if (currentPromise === void 0) {
-        currentPromise = makeAuthRequest(roomOptions.roomId);
-        requestPromises.set(roomOptions.roomId, currentPromise);
+        currentPromise = makeAuthRequest(requestOptions);
+        requestPromises.set(requestOptions.roomId, currentPromise);
       }
     } else {
       currentPromise = requestPromises.get("liveblocks-user-token");
       if (currentPromise === void 0) {
-        currentPromise = makeAuthRequest();
+        currentPromise = makeAuthRequest(requestOptions);
         requestPromises.set("liveblocks-user-token", currentPromise);
       }
     }
@@ -1424,8 +1465,8 @@ function createAuthManager(authOptions) {
       }
       return { type: "secret", token };
     } finally {
-      if (roomOptions) {
-        requestPromises.delete(roomOptions.roomId);
+      if (requestOptions.roomId) {
+        requestPromises.delete(requestOptions.roomId);
       } else {
         requestPromises.delete("liveblocks-user-token");
       }
@@ -1996,22 +2037,56 @@ function convertToInboxNotificationData(data) {
     readAt
   };
 }
+function convertToThreadDeleteInfo(data) {
+  const deletedAt = new Date(data.deletedAt);
+  return {
+    ...data,
+    deletedAt
+  };
+}
+function convertToInboxNotificationDeleteInfo(data) {
+  const deletedAt = new Date(data.deletedAt);
+  return {
+    ...data,
+    deletedAt
+  };
+}
+
+// src/lib/url.ts
+function toURLSearchParams(params) {
+  const result = new URLSearchParams();
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== void 0 && value !== null) {
+      result.set(key, value.toString());
+    }
+  }
+  return result;
+}
+function urljoin(baseUrl, path, params) {
+  const url = new URL(path, baseUrl);
+  if (params !== void 0) {
+    url.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
+  }
+  return url.toString();
+}
 
 // src/notifications.ts
 var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY = 50;
-function createInboxNotificationsApi({
+function createNotificationsApi({
   baseUrl,
   authManager,
   currentUserIdStore,
   fetcher
 }) {
-  async function fetchJson(endpoint, options) {
-    const authValue = await authManager.getAuthValue();
+  async function fetchJson(endpoint, options, params) {
+    const authValue = await authManager.getAuthValue({
+      requestedScope: "comments:read"
+    });
     if (authValue.type === "secret" && authValue.token.parsed.k === "acc" /* ACCESS_TOKEN */) {
       const userId = authValue.token.parsed.uid;
       currentUserIdStore.set(() => userId);
     }
-    const url = new URL(`/v2/c${endpoint}`, baseUrl);
+    const url = urljoin(baseUrl, `/v2/c${endpoint}`, params);
     const response = await fetcher(url.toString(), {
       ...options,
       headers: {
@@ -2047,13 +2122,24 @@ function createInboxNotificationsApi({
     return body;
   }
   async function getInboxNotifications(options) {
-    const queryParams = toURLSearchParams({ limit: options?.limit });
-    const json = await fetchJson(`/inbox-notifications?${queryParams.toString()}`);
+    const json = await fetchJson("/inbox-notifications", void 0, {
+      limit: options?.limit,
+      since: options?.since?.toISOString()
+    });
     return {
       threads: json.threads.map((thread) => convertToThreadData(thread)),
       inboxNotifications: json.inboxNotifications.map(
         (notification) => convertToInboxNotificationData(notification)
-      )
+      ),
+      deletedThreads: json.deletedThreads.map(
+        (info) => convertToThreadDeleteInfo(info)
+      ),
+      deletedInboxNotifications: json.deletedInboxNotifications.map(
+        (info) => convertToInboxNotificationDeleteInfo(info)
+      ),
+      meta: {
+        requestedAt: new Date(json.meta.requestedAt)
+      }
     };
   }
   async function getUnreadInboxNotificationsCount() {
@@ -2096,15 +2182,6 @@ function createInboxNotificationsApi({
     markInboxNotificationAsRead
   };
 }
-function toURLSearchParams(params) {
-  const result = new URLSearchParams();
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0 && value !== null) {
-      result.set(key, value.toString());
-    }
-  }
-  return result;
-}
 
 // src/lib/position.ts
 var MIN_CODE = 32;
@@ -4959,12 +5036,12 @@ var CommentsApiError = class extends Error {
   }
 };
 function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
-  async function fetchCommentsApi(endpoint, options) {
+  async function fetchCommentsApi(endpoint, params, options) {
     const authValue = await getAuthValue();
-    return fetchClientApi(roomId, endpoint, authValue, options);
+    return fetchClientApi(roomId, endpoint, authValue, options, params);
   }
-  async function fetchJson(endpoint, options) {
-    const response = await fetchCommentsApi(endpoint, options);
+  async function fetchJson(endpoint, options, params) {
+    const response = await fetchCommentsApi(endpoint, params, options);
     if (!response.ok) {
       if (response.status >= 400 && response.status < 600) {
         let error3;
@@ -4990,25 +5067,48 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     return body;
   }
   async function getThreads(options) {
-    const response = await fetchCommentsApi("/threads/search", {
-      body: JSON.stringify({
-        ...options?.query?.metadata && { metadata: options.query.metadata }
-      }),
-      headers: {
-        "Content-Type": "application/json"
+    const response = await fetchCommentsApi(
+      "/threads/search",
+      {
+        since: options?.since?.toISOString()
       },
-      method: "POST"
-    });
+      {
+        body: JSON.stringify({
+          ...options?.query?.metadata && { metadata: options.query.metadata }
+        }),
+        headers: {
+          "Content-Type": "application/json"
+        },
+        method: "POST"
+      }
+    );
     if (response.ok) {
       const json = await response.json();
       return {
         threads: json.data.map((thread) => convertToThreadData(thread)),
         inboxNotifications: json.inboxNotifications.map(
           (notification) => convertToInboxNotificationData(notification)
-        )
+        ),
+        deletedThreads: json.deletedThreads.map(
+          (info) => convertToThreadDeleteInfo(info)
+        ),
+        deletedInboxNotifications: json.deletedInboxNotifications.map(
+          (info) => convertToInboxNotificationDeleteInfo(info)
+        ),
+        meta: {
+          requestedAt: new Date(json.meta.requestedAt)
+        }
       };
     } else if (response.status === 404) {
-      return { threads: [], inboxNotifications: [] };
+      return {
+        threads: [],
+        inboxNotifications: [],
+        deletedThreads: [],
+        deletedInboxNotifications: [],
+        meta: {
+          requestedAt: /* @__PURE__ */ new Date()
+        }
+      };
     } else {
       throw new Error("There was an error while getting threads.");
     }
@@ -5110,7 +5210,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     );
     return convertToCommentData(comment);
   }
-  async function deleteComment({
+  async function deleteComment2({
     threadId,
     commentId
   }) {
@@ -5123,7 +5223,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
       }
     );
   }
-  async function addReaction({
+  async function addReaction2({
     threadId,
     commentId,
     emoji
@@ -5142,7 +5242,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     );
     return convertToCommentUserReaction(reaction);
   }
-  async function removeReaction({
+  async function removeReaction2({
     threadId,
     commentId,
     emoji
@@ -5163,11 +5263,12 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     editThreadMetadata,
     createComment,
     editComment,
-    deleteComment,
-    addReaction,
-    removeReaction
+    deleteComment: deleteComment2,
+    addReaction: addReaction2,
+    removeReaction: removeReaction2
   };
 }
+var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 = 50;
 function createRoom(options, config) {
   const initialPresence = typeof options.initialPresence === "function" ? options.initialPresence(config.roomId) : options.initialPresence;
   const initialStorage = typeof options.initialStorage === "function" ? options.initialStorage(config.roomId) : options.initialStorage;
@@ -5383,14 +5484,15 @@ function createRoom(options, config) {
     ydoc: makeEventSource(),
     comments: makeEventSource()
   };
-  async function fetchClientApi(roomId, endpoint, authValue, options2) {
-    const url = new URL(
+  async function fetchClientApi(roomId, endpoint, authValue, options2, params) {
+    const url = urljoin(
+      config.baseUrl,
       `/v2/c/rooms/${encodeURIComponent(roomId)}${endpoint}`,
-      config.baseUrl
+      params
     );
     const fetcher = config.polyfills?.fetch || /* istanbul ignore next */
     fetch;
-    return await fetcher(url.toString(), {
+    return await fetcher(url, {
       ...options2,
       headers: {
         ...options2?.headers,
@@ -6218,7 +6320,7 @@ ${Array.from(traces).join("\n\n")}`
     delegates.authenticate,
     fetchClientApi
   );
-  async function fetchJson(endpoint, options2) {
+  async function fetchNotificationsJson(endpoint, options2) {
     const authValue = await delegates.authenticate();
     const response = await fetchClientApi(
       config.roomId,
@@ -6228,16 +6330,21 @@ ${Array.from(traces).join("\n\n")}`
     );
     if (!response.ok) {
       if (response.status >= 400 && response.status < 600) {
-        let errorMessage = "";
+        let error3;
         try {
           const errorBody = await response.json();
-          errorMessage = errorBody.message;
-        } catch (error3) {
-          errorMessage = response.statusText;
+          error3 = new NotificationsApiError(
+            errorBody.message,
+            response.status,
+            errorBody
+          );
+        } catch {
+          error3 = new NotificationsApiError(
+            response.statusText,
+            response.status
+          );
         }
-        throw new Error(
-          `Request failed with status ${response.status}: ${errorMessage}`
-        );
+        throw error3;
       }
     }
     let body;
@@ -6249,20 +6356,44 @@ ${Array.from(traces).join("\n\n")}`
     return body;
   }
   function getRoomNotificationSettings() {
-    return fetchJson("/notification-settings");
+    return fetchNotificationsJson(
+      "/notification-settings"
+    );
   }
   function updateRoomNotificationSettings(settings) {
-    return fetchJson("/notification-settings", {
+    return fetchNotificationsJson(
+      "/notification-settings",
+      {
+        method: "POST",
+        body: JSON.stringify(settings),
+        headers: {
+          "Content-Type": "application/json"
+        }
+      }
+    );
+  }
+  async function markInboxNotificationsAsRead(inboxNotificationIds) {
+    await fetchNotificationsJson("/inbox-notifications/read", {
       method: "POST",
-      body: JSON.stringify(settings),
       headers: {
         "Content-Type": "application/json"
-      }
+      },
+      body: JSON.stringify({ inboxNotificationIds })
     });
   }
+  const batchedMarkInboxNotificationsAsRead = new Batch(
+    async (batchedInboxNotificationIds) => {
+      const inboxNotificationIds = batchedInboxNotificationIds.flat();
+      await markInboxNotificationsAsRead(inboxNotificationIds);
+      return inboxNotificationIds;
+    },
+    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 }
+  );
+  async function markInboxNotificationAsRead(inboxNotificationId) {
+    await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
+  }
   return Object.defineProperty(
     {
-      /* NOTE: Exposing internals here only to allow testing implementation details in unit tests */
       [kInternal]: {
         get presenceBuffer() {
           return deepClone(context.buffer.presenceUpdates?.data ?? null);
@@ -6284,6 +6415,14 @@ ${Array.from(traces).join("\n\n")}`
           // These exist only for our E2E testing app
           explicitClose: (event) => managedSocket._privateSendMachineEvent({ type: "EXPLICIT_SOCKET_CLOSE", event }),
           rawSend: (data) => managedSocket.send(data)
+        },
+        comments: {
+          ...commentsApi
+        },
+        notifications: {
+          getRoomNotificationSettings,
+          updateRoomNotificationSettings,
+          markInboxNotificationAsRead
         }
       },
       id: config.roomId,
@@ -6321,12 +6460,7 @@ ${Array.from(traces).join("\n\n")}`
       getSelf: () => self.current,
       // Presence
       getPresence: () => context.myPresence.current,
-      getOthers: () => context.others.current,
-      // Comments
-      ...commentsApi,
-      // Notifications
-      getRoomNotificationSettings,
-      updateRoomNotificationSettings
+      getOthers: () => context.others.current
     },
     // Explictly make the internal field non-enumerable, to avoid aggressive
     // freezing when used with Immer
@@ -6466,28 +6600,6 @@ function createClientStore() {
     inboxNotifications: {},
     notificationSettings: {}
   });
-  function mergeThreads(existingThreads, newThreads) {
-    const updatedThreads = { ...existingThreads };
-    Object.entries(newThreads).forEach(([id, thread]) => {
-      const existingThread = updatedThreads[id];
-      if (existingThread) {
-        const result = compareThreads(existingThread, thread);
-        if (result === 1)
-          return;
-      }
-      updatedThreads[id] = thread;
-    });
-    return updatedThreads;
-  }
-  function mergeNotifications(existingInboxNotifications, newInboxNotifications) {
-    const inboxNotifications = Object.values({
-      ...existingInboxNotifications,
-      ...newInboxNotifications
-    });
-    return Object.fromEntries(
-      inboxNotifications.map((notification) => [notification.id, notification])
-    );
-  }
   return {
     ...store,
     deleteThread(threadId) {
@@ -6516,21 +6628,19 @@ function createClientStore() {
         };
       });
     },
-    updateThreadsAndNotifications(threads, inboxNotifications, queryKey) {
+    updateThreadsAndNotifications(threads, inboxNotifications, deletedThreads, deletedInboxNotifications, queryKey) {
       store.set((state) => ({
         ...state,
-        threads: mergeThreads(
-          state.threads,
-          Object.fromEntries(threads.map((thread) => [thread.id, thread]))
-        ),
-        inboxNotifications: mergeNotifications(
+        threads: applyThreadUpdates(state.threads, {
+          newThreads: threads,
+          deletedThreads
+        }),
+        inboxNotifications: applyNotificationsUpdates(
           state.inboxNotifications,
-          Object.fromEntries(
-            inboxNotifications.map((notification) => [
-              notification.id,
-              notification
-            ])
-          )
+          {
+            newInboxNotifications: inboxNotifications,
+            deletedNotifications: deletedInboxNotifications
+          }
         ),
         queries: queryKey !== void 0 ? {
           ...state.queries,
@@ -6540,6 +6650,21 @@ function createClientStore() {
         } : state.queries
       }));
     },
+    updateRoomInboxNotificationSettings(roomId, settings, queryKey) {
+      store.set((state) => ({
+        ...state,
+        notificationSettings: {
+          ...state.notificationSettings,
+          [roomId]: settings
+        },
+        queries: {
+          ...state.queries,
+          [queryKey]: {
+            isLoading: false
+          }
+        }
+      }));
+    },
     pushOptimisticUpdate(optimisticUpdate) {
       store.set((state) => ({
         ...state,
@@ -6600,8 +6725,15 @@ function applyOptimisticUpdates(state) {
         if (thread === void 0) {
           break;
         }
+        if (thread.deletedAt !== void 0) {
+          break;
+        }
+        if (thread.updatedAt !== void 0 && thread.updatedAt > optimisticUpdate.updatedAt) {
+          break;
+        }
         result.threads[thread.id] = {
           ...thread,
+          updatedAt: optimisticUpdate.updatedAt,
           metadata: {
             ...thread.metadata,
             ...optimisticUpdate.metadata
@@ -6614,16 +6746,17 @@ function applyOptimisticUpdates(state) {
         if (thread === void 0) {
           break;
         }
-        result.threads[thread.id] = {
-          ...thread,
-          comments: [...thread.comments, optimisticUpdate.comment]
-          // TODO: Handle replace comment
-        };
-        if (!optimisticUpdate.inboxNotificationId) {
+        result.threads[thread.id] = upsertComment(
+          thread,
+          optimisticUpdate.comment
+        );
+        const inboxNotification = Object.values(result.inboxNotifications).find(
+          (notification) => notification.threadId === thread.id
+        );
+        if (inboxNotification === void 0) {
           break;
         }
-        const inboxNotification = result.inboxNotifications[optimisticUpdate.inboxNotificationId];
-        result.inboxNotifications[optimisticUpdate.inboxNotificationId] = {
+        result.inboxNotifications[inboxNotification.id] = {
           ...inboxNotification,
           notifiedAt: optimisticUpdate.comment.createdAt,
           readAt: optimisticUpdate.comment.createdAt
@@ -6631,20 +6764,14 @@ function applyOptimisticUpdates(state) {
         break;
       }
       case "edit-comment": {
-        const thread = result.threads[optimisticUpdate.threadId];
+        const thread = result.threads[optimisticUpdate.comment.threadId];
         if (thread === void 0) {
           break;
         }
-        result.threads[thread.id] = {
-          ...thread,
-          comments: thread.comments.map(
-            (comment) => comment.id === optimisticUpdate.commentId ? {
-              ...comment,
-              editedAt: optimisticUpdate.editedAt,
-              body: optimisticUpdate.body
-            } : comment
-          )
-        };
+        result.threads[thread.id] = upsertComment(
+          thread,
+          optimisticUpdate.comment
+        );
         break;
       }
       case "delete-comment": {
@@ -6652,21 +6779,11 @@ function applyOptimisticUpdates(state) {
         if (thread === void 0) {
           break;
         }
-        result.threads[thread.id] = {
-          ...thread,
-          comments: thread.comments.map(
-            (comment) => comment.id === optimisticUpdate.commentId ? {
-              ...comment,
-              deletedAt: optimisticUpdate.deletedAt,
-              body: void 0
-            } : comment
-          )
-        };
-        if (!result.threads[thread.id].comments.some(
-          (comment) => comment.deletedAt === void 0
-        )) {
-          delete result.threads[thread.id];
-        }
+        result.threads[thread.id] = deleteComment(
+          thread,
+          optimisticUpdate.commentId,
+          optimisticUpdate.deletedAt
+        );
         break;
       }
       case "add-reaction": {
@@ -6674,43 +6791,11 @@ function applyOptimisticUpdates(state) {
         if (thread === void 0) {
           break;
         }
-        result.threads[thread.id] = {
-          ...thread,
-          comments: thread.comments.map((comment) => {
-            if (comment.id === optimisticUpdate.commentId) {
-              if (comment.reactions.some(
-                (reaction) => reaction.emoji === optimisticUpdate.emoji
-              )) {
-                return {
-                  ...comment,
-                  reactions: comment.reactions.map(
-                    (reaction) => reaction.emoji === optimisticUpdate.emoji ? {
-                      ...reaction,
-                      users: [
-                        ...reaction.users,
-                        { id: optimisticUpdate.userId }
-                      ]
-                    } : reaction
-                  )
-                };
-              } else {
-                return {
-                  ...comment,
-                  reactions: [
-                    ...comment.reactions,
-                    {
-                      emoji: optimisticUpdate.emoji,
-                      createdAt: optimisticUpdate.createdAt,
-                      users: [{ id: optimisticUpdate.userId }]
-                    }
-                  ]
-                };
-              }
-            } else {
-              return comment;
-            }
-          })
-        };
+        result.threads[thread.id] = addReaction(
+          thread,
+          optimisticUpdate.commentId,
+          optimisticUpdate.reaction
+        );
         break;
       }
       case "remove-reaction": {
@@ -6718,37 +6803,13 @@ function applyOptimisticUpdates(state) {
         if (thread === void 0) {
           break;
         }
-        result.threads[thread.id] = {
-          ...thread,
-          comments: thread.comments.map((comment) => {
-            if (comment.id !== optimisticUpdate.commentId) {
-              return comment;
-            }
-            const reactionIndex = comment.reactions.findIndex(
-              (reaction) => reaction.emoji === optimisticUpdate.emoji
-            );
-            let reactions = comment.reactions;
-            if (reactionIndex >= 0 && comment.reactions[reactionIndex].users.some(
-              (user) => user.id === optimisticUpdate.userId
-            )) {
-              if (comment.reactions[reactionIndex].users.length <= 1) {
-                reactions = [...comment.reactions];
-                reactions.splice(reactionIndex, 1);
-              } else {
-                reactions[reactionIndex] = {
-                  ...reactions[reactionIndex],
-                  users: reactions[reactionIndex].users.filter(
-                    (user) => user.id !== optimisticUpdate.userId
-                  )
-                };
-              }
-            }
-            return {
-              ...comment,
-              reactions
-            };
-          })
-        };
+        result.threads[thread.id] = removeReaction(
+          thread,
+          optimisticUpdate.commentId,
+          optimisticUpdate.emoji,
+          optimisticUpdate.userId,
+          optimisticUpdate.removedAt
+        );
         break;
       }
       case "mark-inbox-notification-as-read": {
@@ -6777,6 +6838,222 @@ function applyOptimisticUpdates(state) {
   }
   return result;
 }
+function applyThreadUpdates(existingThreads, updates) {
+  const updatedThreads = { ...existingThreads };
+  updates.newThreads.forEach((thread) => {
+    const existingThread = updatedThreads[thread.id];
+    if (existingThread) {
+      const result = compareThreads(existingThread, thread);
+      if (result === 1)
+        return;
+    }
+    updatedThreads[thread.id] = thread;
+  });
+  updates.deletedThreads.forEach(({ id, deletedAt }) => {
+    const existingThread = updatedThreads[id];
+    if (existingThread === void 0)
+      return;
+    existingThread.deletedAt = deletedAt;
+    existingThread.updatedAt = deletedAt;
+    existingThread.comments = [];
+  });
+  return updatedThreads;
+}
+function applyNotificationsUpdates(existingInboxNotifications, updates) {
+  const updatedInboxNotifications = { ...existingInboxNotifications };
+  updates.newInboxNotifications.forEach((notification) => {
+    const existingNotification = updatedInboxNotifications[notification.id];
+    if (existingNotification) {
+      const result = compareInboxNotifications(
+        existingNotification,
+        notification
+      );
+      if (result === 1)
+        return;
+    }
+    updatedInboxNotifications[notification.id] = notification;
+  });
+  updates.deletedNotifications.forEach(
+    ({ id }) => delete updatedInboxNotifications[id]
+  );
+  return updatedInboxNotifications;
+}
+function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
+  if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
+    return 1;
+  } else if (inboxNotificationA.notifiedAt < inboxNotificationB.notifiedAt) {
+    return -1;
+  }
+  if (inboxNotificationA.readAt && inboxNotificationB.readAt) {
+    return inboxNotificationA.readAt > inboxNotificationB.readAt ? 1 : inboxNotificationA.readAt < inboxNotificationB.readAt ? -1 : 0;
+  } else if (inboxNotificationA.readAt || inboxNotificationB.readAt) {
+    return inboxNotificationA.readAt ? 1 : -1;
+  }
+  return 0;
+}
+function upsertComment(thread, comment) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
+  }
+  if (comment.threadId !== thread.id) {
+    warn(
+      `Comment ${comment.id} does not belong to thread ${thread.id}`
+    );
+    return thread;
+  }
+  const existingComment = thread.comments.find(
+    (existingComment2) => existingComment2.id === comment.id
+  );
+  if (existingComment === void 0) {
+    const updatedAt = new Date(
+      Math.max(thread.updatedAt?.getTime() || 0, comment.createdAt.getTime())
+    );
+    const updatedThread = {
+      ...thread,
+      updatedAt,
+      comments: [...thread.comments, comment]
+    };
+    return updatedThread;
+  }
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
+  }
+  if (existingComment.editedAt === void 0 || comment.editedAt === void 0 || existingComment.editedAt <= comment.editedAt) {
+    const updatedComments = thread.comments.map(
+      (existingComment2) => existingComment2.id === comment.id ? comment : existingComment2
+    );
+    const updatedThread = {
+      ...thread,
+      updatedAt: new Date(
+        Math.max(
+          thread.updatedAt?.getTime() || 0,
+          comment.editedAt?.getTime() || comment.createdAt.getTime()
+        )
+      ),
+      comments: updatedComments
+    };
+    return updatedThread;
+  }
+  return thread;
+}
+function deleteComment(thread, commentId, deletedAt) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
+  }
+  const existingComment = thread.comments.find(
+    (comment) => comment.id === commentId
+  );
+  if (existingComment === void 0) {
+    return thread;
+  }
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
+  }
+  const updatedComments = thread.comments.map(
+    (comment) => comment.id === commentId ? {
+      ...comment,
+      deletedAt,
+      body: void 0
+    } : comment
+  );
+  if (!updatedComments.some((comment) => comment.deletedAt === void 0)) {
+    return {
+      ...thread,
+      deletedAt,
+      updatedAt: deletedAt,
+      comments: []
+    };
+  }
+  return {
+    ...thread,
+    updatedAt: deletedAt,
+    comments: updatedComments
+  };
+}
+function addReaction(thread, commentId, reaction) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
+  }
+  const existingComment = thread.comments.find(
+    (comment) => comment.id === commentId
+  );
+  if (existingComment === void 0) {
+    return thread;
+  }
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
+  }
+  const updatedComments = thread.comments.map(
+    (comment) => comment.id === commentId ? {
+      ...comment,
+      reactions: upsertReaction(comment.reactions, reaction)
+    } : comment
+  );
+  return {
+    ...thread,
+    updatedAt: new Date(
+      Math.max(reaction.createdAt.getTime(), thread.updatedAt?.getTime() || 0)
+    ),
+    comments: updatedComments
+  };
+}
+function removeReaction(thread, commentId, emoji, userId, removedAt) {
+  if (thread.deletedAt !== void 0) {
+    return thread;
+  }
+  const existingComment = thread.comments.find(
+    (comment) => comment.id === commentId
+  );
+  if (existingComment === void 0) {
+    return thread;
+  }
+  if (existingComment.deletedAt !== void 0) {
+    return thread;
+  }
+  const updatedComments = thread.comments.map(
+    (comment) => comment.id === commentId ? {
+      ...comment,
+      reactions: comment.reactions.map(
+        (reaction) => reaction.emoji === emoji ? {
+          ...reaction,
+          users: reaction.users.filter((user) => user.id !== userId)
+        } : reaction
+      ).filter((reaction) => reaction.users.length > 0)
+      // Remove reactions with no users left
+    } : comment
+  );
+  return {
+    ...thread,
+    updatedAt: new Date(
+      Math.max(removedAt.getTime(), thread.updatedAt?.getTime() || 0)
+    ),
+    comments: updatedComments
+  };
+}
+function upsertReaction(reactions, reaction) {
+  const existingReaction = reactions.find(
+    (existingReaction2) => existingReaction2.emoji === reaction.emoji
+  );
+  if (existingReaction === void 0) {
+    return [
+      ...reactions,
+      {
+        emoji: reaction.emoji,
+        createdAt: reaction.createdAt,
+        users: [{ id: reaction.userId }]
+      }
+    ];
+  }
+  if (existingReaction.users.some((user) => user.id === reaction.userId) === false) {
+    return reactions.map(
+      (existingReaction2) => existingReaction2.emoji === reaction.emoji ? {
+        ...existingReaction2,
+        users: [...existingReaction2.users, { id: reaction.userId }]
+      } : existingReaction2
+    );
+  }
+  return reactions;
+}
 
 // src/client.ts
 var MIN_THROTTLE = 16;
@@ -6926,7 +7203,7 @@ function createClient(options) {
     getUnreadInboxNotificationsCount,
     markAllInboxNotificationsAsRead,
     markInboxNotificationAsRead
-  } = createInboxNotificationsApi({
+  } = createNotificationsApi({
     baseUrl,
     fetcher: clientOptions.polyfills?.fetch || /* istanbul ignore next */
     fetch,
@@ -6971,18 +7248,22 @@ function createClient(options) {
       leave: forceLeave,
       // New, preferred API
       enterRoom,
-      // Notifications API
-      getInboxNotifications,
-      getUnreadInboxNotificationsCount,
-      markAllInboxNotificationsAsRead,
-      markInboxNotificationAsRead,
       // Internal
       [kInternal]: {
+        notifications: {
+          getInboxNotifications,
+          getUnreadInboxNotificationsCount,
+          markAllInboxNotificationsAsRead,
+          markInboxNotificationAsRead
+        },
         currentUserIdStore,
         resolveMentionSuggestions: clientOptions.resolveMentionSuggestions,
         cacheStore,
         usersStore,
-        roomsInfoStore
+        roomsInfoStore,
+        getRoomIds() {
+          return Array.from(roomsById.keys());
+        }
       }
     },
     kInternal,
@@ -7825,6 +8106,7 @@ export {
   ServerMsgCode,
   WebsocketCloseCodes,
   ackOp,
+  addReaction,
   applyOptimisticUpdates,
   asPos,
   assert,
@@ -7836,6 +8118,7 @@ export {
   convertToCommentUserReaction,
   convertToThreadData,
   createClient,
+  deleteComment,
   deprecate,
   deprecateIf,
   detectDupes,
@@ -7858,12 +8141,14 @@ export {
   nn,
   patchLiveObjectKey,
   raise,
+  removeReaction,
   shallow,
   stringify,
   stringifyCommentBody,
   throwUsageError,
   toPlainLson,
   tryParseJson,
+  upsertComment,
   withTimeout
 };
 //# sourceMappingURL=index.mjs.map