@liveblocks/core 1.2.0-comments4 → 1.2.0-comments6

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.2.0-comments4";
+var PKG_VERSION = "1.2.0-comments6";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -637,6 +637,11 @@ var ServerMsgCode = /* @__PURE__ */ ((ServerMsgCode2) => {
   ServerMsgCode2[ServerMsgCode2["UPDATE_STORAGE"] = 201] = "UPDATE_STORAGE";
   ServerMsgCode2[ServerMsgCode2["REJECT_STORAGE_OP"] = 299] = "REJECT_STORAGE_OP";
   ServerMsgCode2[ServerMsgCode2["UPDATE_YDOC"] = 300] = "UPDATE_YDOC";
+  ServerMsgCode2[ServerMsgCode2["THREAD_CREATED"] = 400] = "THREAD_CREATED";
+  ServerMsgCode2[ServerMsgCode2["THREAD_METADATA_UPDATED"] = 401] = "THREAD_METADATA_UPDATED";
+  ServerMsgCode2[ServerMsgCode2["COMMENT_CREATED"] = 402] = "COMMENT_CREATED";
+  ServerMsgCode2[ServerMsgCode2["COMMENT_EDITED"] = 403] = "COMMENT_EDITED";
+  ServerMsgCode2[ServerMsgCode2["COMMENT_DELETED"] = 404] = "COMMENT_DELETED";
   return ServerMsgCode2;
 })(ServerMsgCode || {});
 
@@ -1250,6 +1255,9 @@ var ManagedSocket = class {
 function canWriteStorage(scopes) {
   return scopes.includes("room:write" /* Write */);
 }
+function canComment(scopes) {
+  return scopes.includes("comments:write" /* CommentsWrite */) || scopes.includes("room:write" /* Write */);
+}
 function isValidAuthTokenPayload(data) {
   return isPlainObject(data) && (data.k === "acc" /* ACCESS_TOKEN */ || data.k === "id" /* ID_TOKEN */ || data.k === "sec-legacy" /* SECRET_LEGACY */);
 }
@@ -1662,98 +1670,146 @@ function errorIf(condition, message) {
   }
 }
 
-// src/lib/Json.ts
-function isJsonScalar(data) {
-  return data === null || typeof data === "string" || typeof data === "number" || typeof data === "boolean";
-}
-function isJsonArray(data) {
-  return Array.isArray(data);
-}
-function isJsonObject(data) {
-  return !isJsonScalar(data) && !isJsonArray(data);
-}
-
-// src/realtime-client.ts
-function authValueToString(authValue) {
-  return authValue.type === "secret" ? authValue.token.raw : authValue.publicApiKey;
+// src/comments/index.ts
+function getAuthBearerHeaderFromAuthValue(authValue) {
+  if (authValue.type === "public") {
+    return authValue.publicApiKey;
+  } else {
+    return authValue.token.raw;
+  }
 }
-function createRealtimeClient(authManager, serverEndpoint) {
-  const eventHub = {
-    error: makeEventSource(),
-    connection: makeEventSource(),
-    events: {}
-  };
-  let managedSocket = null;
-  function createManagedSocket(roomId) {
-    managedSocket = new ManagedSocket(
-      {
-        // TODO: We're trying to (re)connect based on the first roomId that the user is asking for
-        // This is bad because the user might now have access to this room (anymore)
-        // This prevent any future reconnection to the websocket server
-        // We need to find a better way to handle the first (re)connection
-        // (Could it be based on the current listeners)
-        authenticate: () => authManager.getAuthValue("room:read", roomId),
-        createSocket: (authValue) => new WebSocket(
-          `${serverEndpoint}?token=${authValue.type === "secret" ? authValue.token.raw : authValue.publicApiKey}`
-        )
-      },
-      true,
-      false
-    );
-    managedSocket.events.statusDidChange.subscribe((status) => {
-      if (status === "connected") {
-        for (const roomId2 in eventHub.events) {
-          const eventSource2 = eventHub.events[roomId2];
-          if (eventSource2.count() > 0) {
-            subscribeToRoomEvents(roomId2);
-          }
+function createCommentsApi(roomId, getAuthValue, { serverEndpoint }) {
+  async function fetchJson(endpoint, options) {
+    const response = await fetchApi(roomId, endpoint, options);
+    if (!response.ok) {
+      if (response.status >= 400 && response.status < 600) {
+        let errorMessage = "";
+        try {
+          const errorBody = await response.json();
+          errorMessage = errorBody.message;
+        } catch (error3) {
+          errorMessage = response.statusText;
         }
+        throw new Error(
+          `Request failed with status ${response.status}: ${errorMessage}`
+        );
       }
-      eventHub.connection.notify(status);
-    });
-    managedSocket.events.onLiveblocksError.subscribe(eventHub.error.notify);
-    managedSocket.events.onMessage.subscribe((event) => {
-      if (typeof event.data !== "string") {
-        return;
-      }
-      const jsonEvent = tryParseJson(event.data);
-      if (jsonEvent !== void 0 && isJsonObject(jsonEvent) && typeof jsonEvent.roomId === "string") {
-        eventHub.events[jsonEvent.roomId].notify(jsonEvent);
+    }
+    let body;
+    try {
+      body = await response.json();
+    } catch (e3) {
+      body = {};
+    }
+    return body;
+  }
+  async function fetchApi(roomId2, endpoint, options) {
+    const authValue = await getAuthValue();
+    const url = `${serverEndpoint}/c/rooms/${roomId2}${endpoint}`;
+    return await fetch(url, {
+      ...options,
+      headers: {
+        ..._optionalChain([options, 'optionalAccess', _43 => _43.headers]),
+        Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`
       }
     });
-    managedSocket.connect();
   }
-  function getOrCreateEventSource(roomId) {
-    let eventSource2 = eventHub.events[roomId];
-    if (eventSource2 === void 0) {
-      eventSource2 = makeEventSource();
-      eventHub.events[roomId] = eventSource2;
+  async function getThreads() {
+    const response = await fetchApi(roomId, "/threads");
+    if (response.ok) {
+      const json = await response.json();
+      return json.data;
+    } else if (response.status === 404) {
+      return [];
+    } else {
+      throw new Error("FAIL");
     }
-    return eventSource2;
   }
-  async function subscribeToRoomEvents(roomId) {
-    const authValue = await authManager.getAuthValue("room:read", roomId);
-    if (managedSocket === null || managedSocket.getStatus() !== "connected") {
-      return;
-    }
-    managedSocket.send(
-      JSON.stringify({
-        type: "subscribeToRooms",
-        rooms: [roomId],
-        token: authValueToString(authValue)
+  function createThread({
+    metadata,
+    body,
+    commentId,
+    threadId
+  }) {
+    return fetchJson("/threads", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        id: threadId,
+        comment: {
+          id: commentId,
+          body
+        },
+        metadata
       })
+    });
+  }
+  function editThreadMetadata({
+    metadata,
+    threadId
+  }) {
+    return fetchJson(
+      `/threads/${threadId}/metadata`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(metadata)
+      }
     );
   }
-  return {
-    subscribeToEvents: (roomId, callback) => {
-      if (!managedSocket) {
-        createManagedSocket(roomId);
+  function createComment({
+    threadId,
+    commentId,
+    body
+  }) {
+    return fetchJson(`/threads/${threadId}/comments`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        id: commentId,
+        body
+      })
+    });
+  }
+  function editComment({
+    threadId,
+    commentId,
+    body
+  }) {
+    return fetchJson(
+      `/threads/${threadId}/comments/${commentId}`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          body
+        })
       }
-      subscribeToRoomEvents(roomId);
-      return getOrCreateEventSource(roomId).subscribe(callback);
-    },
-    error: eventHub.error.observable,
-    connection: eventHub.connection.observable
+    );
+  }
+  async function deleteComment({
+    threadId,
+    commentId
+  }) {
+    await fetchJson(`/threads/${threadId}/comments/${commentId}`, {
+      method: "DELETE"
+    });
+  }
+  return {
+    getThreads,
+    createThread,
+    editThreadMetadata,
+    createComment,
+    editComment,
+    deleteComment
   };
 }
 
@@ -2118,7 +2174,7 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return [
       {
         type: 8 /* CREATE_REGISTER */,
-        opId: _optionalChain([pool, 'optionalAccess', _43 => _43.generateOpId, 'call', _44 => _44()]),
+        opId: _optionalChain([pool, 'optionalAccess', _44 => _44.generateOpId, 'call', _45 => _45()]),
         id: this._id,
         parentId,
         parentKey,
@@ -2209,7 +2265,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _45 => _45.generateOpId, 'call', _46 => _46()]),
+      opId: _optionalChain([pool, 'optionalAccess', _46 => _46.generateOpId, 'call', _47 => _47()]),
       type: 2 /* CREATE_LIST */,
       parentId,
       parentKey
@@ -2477,7 +2533,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _applyInsertUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _47 => _47._pool, 'optionalAccess', _48 => _48.getNode, 'call', _49 => _49(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _48 => _48._pool, 'optionalAccess', _49 => _49.getNode, 'call', _50 => _50(id)]) !== void 0) {
       return { modified: false };
     }
     child._attach(id, nn(this._pool));
@@ -2485,8 +2541,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const existingItemIndex = this._indexOfPosition(key);
     let newKey = key;
     if (existingItemIndex !== -1) {
-      const before2 = _optionalChain([this, 'access', _50 => _50._items, 'access', _51 => _51[existingItemIndex], 'optionalAccess', _52 => _52._parentPos]);
-      const after2 = _optionalChain([this, 'access', _53 => _53._items, 'access', _54 => _54[existingItemIndex + 1], 'optionalAccess', _55 => _55._parentPos]);
+      const before2 = _optionalChain([this, 'access', _51 => _51._items, 'access', _52 => _52[existingItemIndex], 'optionalAccess', _53 => _53._parentPos]);
+      const after2 = _optionalChain([this, 'access', _54 => _54._items, 'access', _55 => _55[existingItemIndex + 1], 'optionalAccess', _56 => _56._parentPos]);
       newKey = makePosition(before2, after2);
       child._setParentLink(this, newKey);
     }
@@ -2501,7 +2557,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _applySetUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _56 => _56._pool, 'optionalAccess', _57 => _57.getNode, 'call', _58 => _58(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _57 => _57._pool, 'optionalAccess', _58 => _58.getNode, 'call', _59 => _59(id)]) !== void 0) {
       return { modified: false };
     }
     this._unacknowledgedSets.set(key, nn(op.opId));
@@ -2623,7 +2679,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     } else {
       this._items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _59 => _59._items, 'access', _60 => _60[existingItemIndex + 1], 'optionalAccess', _61 => _61._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _60 => _60._items, 'access', _61 => _61[existingItemIndex + 1], 'optionalAccess', _62 => _62._parentPos]))
       );
       const previousIndex = this._items.indexOf(child);
       child._setParentLink(this, newKey);
@@ -2649,7 +2705,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this._items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _62 => _62._items, 'access', _63 => _63[existingItemIndex + 1], 'optionalAccess', _64 => _64._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _63 => _63._items, 'access', _64 => _64[existingItemIndex + 1], 'optionalAccess', _65 => _65._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -2668,7 +2724,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this._items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _65 => _65._items, 'access', _66 => _66[existingItemIndex + 1], 'optionalAccess', _67 => _67._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _66 => _66._items, 'access', _67 => _67[existingItemIndex + 1], 'optionalAccess', _68 => _68._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -2696,7 +2752,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (existingItemIndex !== -1) {
       this._items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _68 => _68._items, 'access', _69 => _69[existingItemIndex + 1], 'optionalAccess', _70 => _70._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _69 => _69._items, 'access', _70 => _70[existingItemIndex + 1], 'optionalAccess', _71 => _71._parentPos]))
       );
     }
     child._setParentLink(this, newKey);
@@ -2754,7 +2810,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param element The element to add to the end of the LiveList.
    */
   push(element) {
-    _optionalChain([this, 'access', _71 => _71._pool, 'optionalAccess', _72 => _72.assertStorageIsWritable, 'call', _73 => _73()]);
+    _optionalChain([this, 'access', _72 => _72._pool, 'optionalAccess', _73 => _73.assertStorageIsWritable, 'call', _74 => _74()]);
     return this.insert(element, this.length);
   }
   /**
@@ -2763,7 +2819,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index at which you want to insert the element.
    */
   insert(element, index) {
-    _optionalChain([this, 'access', _74 => _74._pool, 'optionalAccess', _75 => _75.assertStorageIsWritable, 'call', _76 => _76()]);
+    _optionalChain([this, 'access', _75 => _75._pool, 'optionalAccess', _76 => _76.assertStorageIsWritable, 'call', _77 => _77()]);
     if (index < 0 || index > this._items.length) {
       throw new Error(
         `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
@@ -2793,7 +2849,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param targetIndex The index where the element should be after moving.
    */
   move(index, targetIndex) {
-    _optionalChain([this, 'access', _77 => _77._pool, 'optionalAccess', _78 => _78.assertStorageIsWritable, 'call', _79 => _79()]);
+    _optionalChain([this, 'access', _78 => _78._pool, 'optionalAccess', _79 => _79.assertStorageIsWritable, 'call', _80 => _80()]);
     if (targetIndex < 0) {
       throw new Error("targetIndex cannot be less than 0");
     }
@@ -2851,7 +2907,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index of the element to delete
    */
   delete(index) {
-    _optionalChain([this, 'access', _80 => _80._pool, 'optionalAccess', _81 => _81.assertStorageIsWritable, 'call', _82 => _82()]);
+    _optionalChain([this, 'access', _81 => _81._pool, 'optionalAccess', _82 => _82.assertStorageIsWritable, 'call', _83 => _83()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
         `Cannot delete list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
@@ -2884,7 +2940,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   clear() {
-    _optionalChain([this, 'access', _83 => _83._pool, 'optionalAccess', _84 => _84.assertStorageIsWritable, 'call', _85 => _85()]);
+    _optionalChain([this, 'access', _84 => _84._pool, 'optionalAccess', _85 => _85.assertStorageIsWritable, 'call', _86 => _86()]);
     if (this._pool) {
       const ops = [];
       const reverseOps = [];
@@ -2918,7 +2974,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   set(index, item) {
-    _optionalChain([this, 'access', _86 => _86._pool, 'optionalAccess', _87 => _87.assertStorageIsWritable, 'call', _88 => _88()]);
+    _optionalChain([this, 'access', _87 => _87._pool, 'optionalAccess', _88 => _88.assertStorageIsWritable, 'call', _89 => _89()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
         `Cannot set list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
@@ -3066,7 +3122,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _shiftItemPosition(index, key) {
     const shiftedPosition = makePosition(
       key,
-      this._items.length > index + 1 ? _optionalChain([this, 'access', _89 => _89._items, 'access', _90 => _90[index + 1], 'optionalAccess', _91 => _91._parentPos]) : void 0
+      this._items.length > index + 1 ? _optionalChain([this, 'access', _90 => _90._items, 'access', _91 => _91[index + 1], 'optionalAccess', _92 => _92._parentPos]) : void 0
     );
     this._items[index]._setParentLink(this, shiftedPosition);
   }
@@ -3192,7 +3248,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _92 => _92.generateOpId, 'call', _93 => _93()]),
+      opId: _optionalChain([pool, 'optionalAccess', _93 => _93.generateOpId, 'call', _94 => _94()]),
       type: 7 /* CREATE_MAP */,
       parentId,
       parentKey
@@ -3339,7 +3395,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @param value The value of the element to add. Should be serializable to JSON.
    */
   set(key, value) {
-    _optionalChain([this, 'access', _94 => _94._pool, 'optionalAccess', _95 => _95.assertStorageIsWritable, 'call', _96 => _96()]);
+    _optionalChain([this, 'access', _95 => _95._pool, 'optionalAccess', _96 => _96.assertStorageIsWritable, 'call', _97 => _97()]);
     const oldValue = this._map.get(key);
     if (oldValue) {
       oldValue._detach();
@@ -3385,7 +3441,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @returns true if an element existed and has been removed, or false if the element does not exist.
    */
   delete(key) {
-    _optionalChain([this, 'access', _97 => _97._pool, 'optionalAccess', _98 => _98.assertStorageIsWritable, 'call', _99 => _99()]);
+    _optionalChain([this, 'access', _98 => _98._pool, 'optionalAccess', _99 => _99.assertStorageIsWritable, 'call', _100 => _100()]);
     const item = this._map.get(key);
     if (item === void 0) {
       return false;
@@ -3559,7 +3615,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
-    const opId = _optionalChain([pool, 'optionalAccess', _100 => _100.generateOpId, 'call', _101 => _101()]);
+    const opId = _optionalChain([pool, 'optionalAccess', _101 => _101.generateOpId, 'call', _102 => _102()]);
     const ops = [];
     const op = parentId !== void 0 && parentKey !== void 0 ? {
       type: 4 /* CREATE_OBJECT */,
@@ -3840,7 +3896,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param value The value of the property to add
    */
   set(key, value) {
-    _optionalChain([this, 'access', _102 => _102._pool, 'optionalAccess', _103 => _103.assertStorageIsWritable, 'call', _104 => _104()]);
+    _optionalChain([this, 'access', _103 => _103._pool, 'optionalAccess', _104 => _104.assertStorageIsWritable, 'call', _105 => _105()]);
     this.update({ [key]: value });
   }
   /**
@@ -3855,7 +3911,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param key The key of the property to delete
    */
   delete(key) {
-    _optionalChain([this, 'access', _105 => _105._pool, 'optionalAccess', _106 => _106.assertStorageIsWritable, 'call', _107 => _107()]);
+    _optionalChain([this, 'access', _106 => _106._pool, 'optionalAccess', _107 => _107.assertStorageIsWritable, 'call', _108 => _108()]);
     const keyAsString = key;
     const oldValue = this._map.get(keyAsString);
     if (oldValue === void 0) {
@@ -3908,7 +3964,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param patch The object used to overrides properties
    */
   update(patch) {
-    _optionalChain([this, 'access', _108 => _108._pool, 'optionalAccess', _109 => _109.assertStorageIsWritable, 'call', _110 => _110()]);
+    _optionalChain([this, 'access', _109 => _109._pool, 'optionalAccess', _110 => _110.assertStorageIsWritable, 'call', _111 => _111()]);
     if (this._pool === void 0 || this._id === void 0) {
       for (const key in patch) {
         const newValue = patch[key];
@@ -4278,6 +4334,17 @@ function captureStackTrace(msg, traceRoot) {
   return errorLike.stack;
 }
 
+// src/lib/Json.ts
+function isJsonScalar(data) {
+  return data === null || typeof data === "string" || typeof data === "number" || typeof data === "boolean";
+}
+function isJsonArray(data) {
+  return Array.isArray(data);
+}
+function isJsonObject(data) {
+  return !isJsonScalar(data) && !isJsonArray(data);
+}
+
 // src/protocol/ClientMsg.ts
 var ClientMsgCode = /* @__PURE__ */ ((ClientMsgCode2) => {
   ClientMsgCode2[ClientMsgCode2["UPDATE_PRESENCE"] = 100] = "UPDATE_PRESENCE";
@@ -4348,6 +4415,7 @@ function makeUser(conn, presence) {
       id,
       info,
       canWrite,
+      canComment: canComment(conn.scopes),
       isReadOnly: !canWrite,
       // Deprecated, kept for backward-compatibility
       presence
@@ -4708,7 +4776,7 @@ function createRoom(options, config) {
       }
     },
     assertStorageIsWritable: () => {
-      const scopes = _optionalChain([context, 'access', _111 => _111.dynamicSessionInfo, 'access', _112 => _112.current, 'optionalAccess', _113 => _113.scopes]);
+      const scopes = _optionalChain([context, 'access', _112 => _112.dynamicSessionInfo, 'access', _113 => _113.current, 'optionalAccess', _114 => _114.scopes]);
       if (scopes === void 0) {
         return;
       }
@@ -4735,19 +4803,20 @@ function createRoom(options, config) {
     history: makeEventSource(),
     storageDidLoad: makeEventSource(),
     storageStatus: makeEventSource(),
-    ydoc: makeEventSource()
+    ydoc: makeEventSource(),
+    comments: makeEventSource()
   };
   function sendMessages(messageOrMessages) {
     const message = JSON.stringify(messageOrMessages);
     if (config.unstable_fallbackToHTTP) {
       const size = new TextEncoder().encode(message).length;
       if (size > MAX_MESSAGE_SIZE && // TODO: support public api key auth in REST API
-      _optionalChain([managedSocket, 'access', _114 => _114.authValue, 'optionalAccess', _115 => _115.type]) === "secret" && config.httpSendEndpoint) {
+      _optionalChain([managedSocket, 'access', _115 => _115.authValue, 'optionalAccess', _116 => _116.type]) === "secret" && config.httpSendEndpoint) {
         void httpSend(
           message,
           managedSocket.authValue.token.raw,
           config.httpSendEndpoint,
-          _optionalChain([config, 'access', _116 => _116.polyfills, 'optionalAccess', _117 => _117.fetch])
+          _optionalChain([config, 'access', _117 => _117.polyfills, 'optionalAccess', _118 => _118.fetch])
         ).then((resp) => {
           if (!resp.ok && resp.status === 403) {
             managedSocket.reconnect();
@@ -4776,6 +4845,7 @@ function createRoom(options, config) {
           info: staticSession.userInfo,
           presence: myPresence,
           canWrite,
+          canComment: canComment(dynamicSession.scopes),
           isReadOnly: !canWrite
           // Deprecated, kept for backward-compatibility
         };
@@ -5003,7 +5073,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _118 => _118.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _119 => _119.addToHistory])) {
         context.activeBatch.reverseOps.unshift({
           type: "presence",
           data: oldValues
@@ -5013,7 +5083,7 @@ function createRoom(options, config) {
     } else {
       flushNowOrSoon();
       batchUpdates(() => {
-        if (_optionalChain([options2, 'optionalAccess', _119 => _119.addToHistory])) {
+        if (_optionalChain([options2, 'optionalAccess', _120 => _120.addToHistory])) {
           addToUndoStack(
             [{ type: "presence", data: oldValues }],
             doNotBatchUpdates
@@ -5190,7 +5260,7 @@ function createRoom(options, config) {
             const unacknowledgedOps = new Map(context.unacknowledgedOps);
             createOrUpdateRootFromMessage(message, doNotBatchUpdates);
             applyAndSendOps(unacknowledgedOps, doNotBatchUpdates);
-            _optionalChain([_resolveStoragePromise, 'optionalCall', _120 => _120()]);
+            _optionalChain([_resolveStoragePromise, 'optionalCall', _121 => _121()]);
             notifyStorageStatus();
             eventHub.storageDidLoad.notify();
             break;
@@ -5213,7 +5283,7 @@ function createRoom(options, config) {
             if (process.env.NODE_ENV !== "production") {
               const traces = /* @__PURE__ */ new Set();
               for (const opId of message.opIds) {
-                const trace = _optionalChain([context, 'access', _121 => _121.opStackTraces, 'optionalAccess', _122 => _122.get, 'call', _123 => _123(opId)]);
+                const trace = _optionalChain([context, 'access', _122 => _122.opStackTraces, 'optionalAccess', _123 => _123.get, 'call', _124 => _124(opId)]);
                 if (trace) {
                   traces.add(trace);
                 }
@@ -5232,6 +5302,14 @@ ${Array.from(traces).join("\n\n")}`
             }
             break;
           }
+          case 400 /* THREAD_CREATED */:
+          case 401 /* THREAD_METADATA_UPDATED */:
+          case 402 /* COMMENT_CREATED */:
+          case 403 /* COMMENT_EDITED */:
+          case 404 /* COMMENT_DELETED */: {
+            eventHub.comments.notify(message);
+            break;
+          }
         }
       }
       notify(updates, doNotBatchUpdates);
@@ -5494,14 +5572,18 @@ ${Array.from(traces).join("\n\n")}`
     history: eventHub.history.observable,
     storageDidLoad: eventHub.storageDidLoad.observable,
     storageStatus: eventHub.storageStatus.observable,
-    ydoc: eventHub.ydoc.observable
+    ydoc: eventHub.ydoc.observable,
+    comments: eventHub.comments.observable
   };
+  const commentsApi = createCommentsApi(config.roomId, delegates.authenticate, {
+    serverEndpoint: "https://api.liveblocks.io/v2"
+  });
   return Object.defineProperty(
     {
       /* NOTE: Exposing __internal here only to allow testing implementation details in unit tests */
       __internal: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _124 => _124.buffer, 'access', _125 => _125.presenceUpdates, 'optionalAccess', _126 => _126.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _125 => _125.buffer, 'access', _126 => _126.presenceUpdates, 'optionalAccess', _127 => _127.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -5553,7 +5635,8 @@ ${Array.from(traces).join("\n\n")}`
       getSelf: () => self.current,
       // Presence
       getPresence: () => context.myPresence.current,
-      getOthers: () => context.others.current
+      getOthers: () => context.others.current,
+      ...commentsApi
     },
     // Explictly make the __internal field non-enumerable, to avoid aggressive
     // freezing when used with Immer
@@ -5632,7 +5715,7 @@ function makeClassicSubscribeFn(events) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _127 => _127.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _128 => _128.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -5733,12 +5816,12 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             getServerFromClientOptions(clientOptions),
-            _optionalChain([clientOptions, 'access', _128 => _128.polyfills, 'optionalAccess', _129 => _129.WebSocket])
+            _optionalChain([clientOptions, 'access', _129 => _129.polyfills, 'optionalAccess', _130 => _130.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
-        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _130 => _130.unstable_batchedUpdates]),
+        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _131 => _131.unstable_batchedUpdates]),
         liveblocksServer: getServerFromClientOptions(clientOptions),
         httpSendEndpoint: buildLiveblocksHttpSendEndpoint(
           clientOptions,
@@ -5753,7 +5836,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.shouldInitiallyConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _131 => _131.polyfills, 'optionalAccess', _132 => _132.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _132 => _132.polyfills, 'optionalAccess', _133 => _133.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"
           );
@@ -5773,13 +5856,6 @@ function createClient(options) {
     }
   }
   return {
-    __internal: {
-      getAuthValue: authManager.getAuthValue,
-      realtimeClient: createRealtimeClient(
-        authManager,
-        getWsEventServerEndpoint(options)
-      )
-    },
     getRoom,
     enter,
     leave
@@ -5813,12 +5889,6 @@ function buildLiveblocksHttpSendEndpoint(options, roomId) {
     roomId
   )}/send-message`;
 }
-function getWsEventServerEndpoint(options) {
-  if (typeof options.eventsServerEndpoint === "string") {
-    return options.eventsServerEndpoint;
-  }
-  return `wss://events.liveblocks.io/v1`;
-}
 
 // src/crdts/utils.ts
 function toPlainLson(lson) {
@@ -6049,12 +6119,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _133 => _133.updates, 'access', _134 => _134[key], 'optionalAccess', _135 => _135.type]) === "update") {
+          if (_optionalChain([update, 'access', _134 => _134.updates, 'access', _135 => _135[key], 'optionalAccess', _136 => _136.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _136 => _136.updates, 'access', _137 => _137[key], 'optionalAccess', _138 => _138.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _137 => _137.updates, 'access', _138 => _138[key], 'optionalAccess', _139 => _139.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -6115,12 +6185,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _139 => _139.updates, 'access', _140 => _140[key], 'optionalAccess', _141 => _141.type]) === "update") {
+          if (_optionalChain([update, 'access', _140 => _140.updates, 'access', _141 => _141[key], 'optionalAccess', _142 => _142.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _142 => _142.updates, 'access', _143 => _143[key], 'optionalAccess', _144 => _144.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _143 => _143.updates, 'access', _144 => _144[key], 'optionalAccess', _145 => _145.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -6210,7 +6280,7 @@ function createCacheItem(key, defaultAsyncFunction, options) {
   let previousState = { isLoading: false };
   const eventSource2 = makeEventSource();
   function notify() {
-    const isEqual = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _145 => _145.isStateEqual]), () => ( isShallowEqual));
+    const isEqual = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _146 => _146.isStateEqual]), () => ( isShallowEqual));
     if (!isEqual(previousState, state)) {
       previousState = state;
       eventSource2.notify(state);
@@ -6289,7 +6359,7 @@ function createAsyncCache(asyncFunction, options) {
     return create(key).get();
   }
   function getState(key) {
-    return _optionalChain([cache, 'access', _146 => _146.get, 'call', _147 => _147(key), 'optionalAccess', _148 => _148.getState, 'call', _149 => _149()]);
+    return _optionalChain([cache, 'access', _147 => _147.get, 'call', _148 => _148(key), 'optionalAccess', _149 => _149.getState, 'call', _150 => _150()]);
   }
   function revalidate(key) {
     return create(key).revalidate();
@@ -6407,163 +6477,6 @@ function makePoller(callback) {
   };
 }
 
-// src/comments/index.ts
-function createCommentsApi(client, { serverEndpoint }) {
-  async function fetchJson(roomId, endpoint, options) {
-    const response = await fetchApi(roomId, endpoint, options);
-    if (!response.ok) {
-      if (response.status >= 400 && response.status < 600) {
-        let errorMessage = "";
-        try {
-          const errorBody = await response.json();
-          errorMessage = errorBody.message;
-        } catch (error3) {
-          errorMessage = response.statusText;
-        }
-        throw new Error(
-          `Request failed with status ${response.status}: ${errorMessage}`
-        );
-      }
-    }
-    let body;
-    try {
-      body = await response.json();
-    } catch (e3) {
-      body = {};
-    }
-    return body;
-  }
-  async function fetchApi(roomId, endpoint, options) {
-    const authValue = await client.__internal.getAuthValue(
-      "comments:read",
-      // TODO: Use the right scope
-      roomId
-    );
-    if (authValue.type !== "secret") {
-      throw new Error("Only secret key are supported for client.");
-    }
-    const url = `${serverEndpoint}/rooms/${roomId}${endpoint}`;
-    return await fetch(url, {
-      ...options,
-      headers: {
-        ..._optionalChain([options, 'optionalAccess', _150 => _150.headers]),
-        Authorization: `Bearer ${authValue.token.raw}`
-      }
-    });
-  }
-  async function getThreads({
-    roomId
-  }) {
-    const response = await fetchApi(roomId, "/threads");
-    if (response.ok) {
-      const json = await response.json();
-      return json.data;
-    } else if (response.status === 404) {
-      return [];
-    } else {
-      throw new Error("FAIL");
-    }
-  }
-  function createThread({
-    roomId,
-    metadata,
-    body,
-    commentId,
-    threadId
-  }) {
-    return fetchJson(roomId, "/threads", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        id: threadId,
-        comment: {
-          id: commentId,
-          body
-        },
-        metadata
-      })
-    });
-  }
-  function editThreadMetadata({
-    roomId,
-    metadata,
-    threadId
-  }) {
-    return fetchJson(
-      roomId,
-      `/threads/${threadId}/metadata`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(metadata)
-      }
-    );
-  }
-  function createComment({
-    roomId,
-    threadId,
-    commentId,
-    body
-  }) {
-    return fetchJson(roomId, `/threads/${threadId}/comments`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        id: commentId,
-        body
-      })
-    });
-  }
-  function editComment({
-    roomId,
-    threadId,
-    commentId,
-    body
-  }) {
-    return fetchJson(
-      roomId,
-      `/threads/${threadId}/comments/${commentId}`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          body
-        })
-      }
-    );
-  }
-  async function deleteComment({
-    roomId,
-    threadId,
-    commentId
-  }) {
-    await fetchJson(roomId, `/threads/${threadId}/comments/${commentId}`, {
-      method: "DELETE"
-    });
-  }
-  return {
-    getThreads,
-    createThread,
-    editThreadMetadata,
-    createComment,
-    editComment,
-    deleteComment
-  };
-}
-
-// src/comments/utils.ts
-function isCommentBodyMention(element) {
-  return "type" in element && element.type === "mention";
-}
-
 // src/index.ts
 detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
@@ -6607,6 +6520,5 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.console = fancy_console_exports; exports.createAsyncCache = createAsyncCache; exports.createClient = createClient; exports.createCommentsApi = createCommentsApi; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyMention = isCommentBodyMention; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.withTimeout = withTimeout;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.console = fancy_console_exports; exports.createAsyncCache = createAsyncCache; exports.createClient = createClient; exports.createCommentsApi = createCommentsApi; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map