@liveblocks/core 1.10.0-beta3 → 1.10.0

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.10.0-beta3";
+var PKG_VERSION = "1.10.0";
 var PKG_FORMAT = "cjs";
 
 // 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) => ({
@@ -1338,6 +1355,9 @@ function createAuthManager(authOptions) {
       if (token.parsed.k === "id" /* ID_TOKEN */) {
         return token;
       } else if (token.parsed.k === "acc" /* ACCESS_TOKEN */) {
+        if (!requestOptions.roomId && Object.entries(token.parsed.perms).length === 0) {
+          return token;
+        }
         for (const [resource, scopes] of Object.entries(token.parsed.perms)) {
           if (!requestOptions.roomId) {
             if (resource.includes("*") && hasCorrespondingScopes(requestOptions.requestedScope, scopes)) {
@@ -1397,6 +1417,9 @@ function createAuthManager(authOptions) {
   }
   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
       )) {
@@ -1405,7 +1428,7 @@ function createAuthManager(authOptions) {
         }
       }
       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"
+        "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"
       );
     }
   }
@@ -2049,7 +2072,7 @@ function urljoin(baseUrl, path, params) {
 
 // src/notifications.ts
 var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY = 50;
-function createInboxNotificationsApi({
+function createNotificationsApi({
   baseUrl,
   authManager,
   currentUserIdStore,
@@ -5187,7 +5210,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     );
     return convertToCommentData(comment);
   }
-  async function deleteComment({
+  async function deleteComment2({
     threadId,
     commentId
   }) {
@@ -5200,7 +5223,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
       }
     );
   }
-  async function addReaction({
+  async function addReaction2({
     threadId,
     commentId,
     emoji
@@ -5219,7 +5242,7 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     );
     return convertToCommentUserReaction(reaction);
   }
-  async function removeReaction({
+  async function removeReaction2({
     threadId,
     commentId,
     emoji
@@ -5240,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;
@@ -5292,9 +5316,6 @@ function createRoom(options, config) {
     opClock: 0,
     nodes: /* @__PURE__ */ new Map(),
     root: void 0,
-    comments: {
-      lastRequestedAt: null
-    },
     undoStack: [],
     redoStack: [],
     pausedHistory: null,
@@ -6299,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,
@@ -6309,41 +6330,70 @@ ${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 (e7) {
+          error3 = new NotificationsApiError(
+            response.statusText,
+            response.status
+          );
         }
-        throw new Error(
-          `Request failed with status ${response.status}: ${errorMessage}`
-        );
+        throw error3;
       }
     }
     let body;
     try {
       body = await response.json();
-    } catch (e7) {
+    } catch (e8) {
       body = {};
     }
     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(_nullishCoalesce(_optionalChain([context, 'access', _145 => _145.buffer, 'access', _146 => _146.presenceUpdates, 'optionalAccess', _147 => _147.data]), () => ( null)));
@@ -6367,12 +6417,12 @@ ${Array.from(traces).join("\n\n")}`
           rawSend: (data) => managedSocket.send(data)
         },
         comments: {
-          get lastRequestedAt() {
-            return context.comments.lastRequestedAt;
-          },
-          set lastRequestedAt(value) {
-            context.comments.lastRequestedAt = value;
-          }
+          ...commentsApi
+        },
+        notifications: {
+          getRoomNotificationSettings,
+          updateRoomNotificationSettings,
+          markInboxNotificationAsRead
         }
       },
       id: config.roomId,
@@ -6410,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
@@ -6680,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
@@ -6694,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
@@ -6711,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": {
@@ -6732,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": {
@@ -6754,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": {
@@ -6798,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": {
@@ -6910,6 +6891,169 @@ function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
   }
   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(_optionalChain([thread, 'access', _149 => _149.updatedAt, 'optionalAccess', _150 => _150.getTime, 'call', _151 => _151()]) || 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(
+          _optionalChain([thread, 'access', _152 => _152.updatedAt, 'optionalAccess', _153 => _153.getTime, 'call', _154 => _154()]) || 0,
+          _optionalChain([comment, 'access', _155 => _155.editedAt, 'optionalAccess', _156 => _156.getTime, 'call', _157 => _157()]) || 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(), _optionalChain([thread, 'access', _158 => _158.updatedAt, 'optionalAccess', _159 => _159.getTime, 'call', _160 => _160()]) || 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(), _optionalChain([thread, 'access', _161 => _161.updatedAt, 'optionalAccess', _162 => _162.getTime, 'call', _163 => _163()]) || 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;
@@ -6999,12 +7143,12 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _149 => _149.polyfills, 'optionalAccess', _150 => _150.WebSocket])
+            _optionalChain([clientOptions, 'access', _164 => _164.polyfills, 'optionalAccess', _165 => _165.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
-        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _151 => _151.unstable_batchedUpdates]),
+        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _166 => _166.unstable_batchedUpdates]),
         baseUrl,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData
@@ -7020,7 +7164,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(_nullishCoalesce(options2.autoConnect, () => ( options2.shouldInitiallyConnect)), () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _152 => _152.polyfills, 'optionalAccess', _153 => _153.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _167 => _167.polyfills, 'optionalAccess', _168 => _168.atob]) === void 0) {
           throw new Error(
             "You need to polyfill atob to use the client in your environment. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/atob-polyfill"
           );
@@ -7036,11 +7180,11 @@ function createClient(options) {
     return room;
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _154 => _154.get, 'call', _155 => _155(roomId), 'optionalAccess', _156 => _156.room]);
+    const room = _optionalChain([roomsById, 'access', _169 => _169.get, 'call', _170 => _170(roomId), 'optionalAccess', _171 => _171.room]);
     return room ? room : null;
   }
   function forceLeave(roomId) {
-    const unsubs = _nullishCoalesce(_optionalChain([roomsById, 'access', _157 => _157.get, 'call', _158 => _158(roomId), 'optionalAccess', _159 => _159.unsubs]), () => ( /* @__PURE__ */ new Set()));
+    const unsubs = _nullishCoalesce(_optionalChain([roomsById, 'access', _172 => _172.get, 'call', _173 => _173(roomId), 'optionalAccess', _174 => _174.unsubs]), () => ( /* @__PURE__ */ new Set()));
     for (const unsub of unsubs) {
       unsub();
     }
@@ -7059,9 +7203,9 @@ function createClient(options) {
     getUnreadInboxNotificationsCount,
     markAllInboxNotificationsAsRead,
     markInboxNotificationAsRead
-  } = createInboxNotificationsApi({
+  } = createNotificationsApi({
     baseUrl,
-    fetcher: _optionalChain([clientOptions, 'access', _160 => _160.polyfills, 'optionalAccess', _161 => _161.fetch]) || /* istanbul ignore next */
+    fetcher: _optionalChain([clientOptions, 'access', _175 => _175.polyfills, 'optionalAccess', _176 => _176.fetch]) || /* istanbul ignore next */
     fetch,
     authManager,
     currentUserIdStore
@@ -7075,7 +7219,7 @@ function createClient(options) {
   const usersStore = createBatchStore(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _162 => _162({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _177 => _177({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -7089,7 +7233,7 @@ function createClient(options) {
   const roomsInfoStore = createBatchStore(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _163 => _163({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _178 => _178({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -7104,13 +7248,14 @@ 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,
@@ -7205,7 +7350,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _164 => _164.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _179 => _179.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -7215,13 +7360,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _165 => _165(block)]);
+        _optionalChain([visitor, 'optionalCall', _180 => _180(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _166 => _166(inline)]);
+          _optionalChain([visitor, 'optionalCall', _181 => _181(inline)]);
         }
       }
     }
@@ -7246,7 +7391,7 @@ async function resolveUsersInCommentBody(body, resolveUsers) {
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _167 => _167[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _182 => _182[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -7369,7 +7514,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => element.url,
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _168 => _168.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -7399,7 +7544,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${element.url}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _169 => _169.name]), () => ( element.id))}</span>`;
+    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _184 => _184.name]), () => ( element.id))}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -7429,19 +7574,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${element.url}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _170 => _170.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _185 => _185.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _171 => _171.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _172 => _172.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _186 => _186.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _187 => _187.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _173 => _173.elements])
+    ..._optionalChain([options, 'optionalAccess', _188 => _188.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _174 => _174.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _189 => _189.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -7716,12 +7861,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _175 => _175.updates, 'access', _176 => _176[key], 'optionalAccess', _177 => _177.type]) === "update") {
+          if (_optionalChain([update, 'access', _190 => _190.updates, 'access', _191 => _191[key], 'optionalAccess', _192 => _192.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _178 => _178.updates, 'access', _179 => _179[key], 'optionalAccess', _180 => _180.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _193 => _193.updates, 'access', _194 => _194[key], 'optionalAccess', _195 => _195.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -7782,12 +7927,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _181 => _181.updates, 'access', _182 => _182[key], 'optionalAccess', _183 => _183.type]) === "update") {
+          if (_optionalChain([update, 'access', _196 => _196.updates, 'access', _197 => _197[key], 'optionalAccess', _198 => _198.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _184 => _184.updates, 'access', _185 => _185[key], 'optionalAccess', _186 => _186.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _199 => _199.updates, 'access', _200 => _200[key], 'optionalAccess', _201 => _201.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8001,5 +8146,9 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.applyOptimisticUpdates = applyOptimisticUpdates; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.cloneLson = cloneLson; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.kInternal = kInternal; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.withTimeout = withTimeout;
+
+
+
+
+exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.addReaction = addReaction; exports.applyOptimisticUpdates = applyOptimisticUpdates; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.cloneLson = cloneLson; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.deleteComment = deleteComment; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.kInternal = kInternal; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.removeReaction = removeReaction; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.upsertComment = upsertComment; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map