@liveblocks/core 1.2.0-comments5 → 1.2.0-comments6

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.2.0-comments5";
+var PKG_VERSION = "1.2.0-comments6";
 var PKG_FORMAT = "esm";
 
 // 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 {
+      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: {
+        ...options?.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
   };
 }
 
@@ -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
@@ -4735,7 +4803,8 @@ function createRoom(options, config) {
     history: makeEventSource(),
     storageDidLoad: makeEventSource(),
     storageStatus: makeEventSource(),
-    ydoc: makeEventSource()
+    ydoc: makeEventSource(),
+    comments: makeEventSource()
   };
   function sendMessages(messageOrMessages) {
     const message = JSON.stringify(messageOrMessages);
@@ -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
         };
@@ -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,8 +5572,12 @@ ${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 */
@@ -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
@@ -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) {
@@ -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 {
-      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: {
-        ...options?.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);
 export {
@@ -6590,7 +6503,6 @@ export {
   errorIf,
   freeze,
   isChildCrdt,
-  isCommentBodyMention,
   isJsonArray,
   isJsonObject,
   isJsonScalar,