@liveblocks/core 2.8.0-beta3 → 2.8.0

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.8.0-beta3";
+var PKG_VERSION = "2.8.0";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -2055,11 +2055,16 @@ function toURLSearchParams(params) {
   return result;
 }
 function urljoin(baseUrl, path, params) {
-  const url = new URL(path, baseUrl);
+  const url2 = new URL(path, baseUrl);
   if (params !== void 0) {
-    url.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
+    url2.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
   }
-  return url.toString();
+  return url2.toString();
+}
+function url(strings, ...values) {
+  return strings.reduce(
+    (result, str, i) => result + encodeURIComponent(_nullishCoalesce(values[i - 1], () => ( ""))) + str
+  );
 }
 
 // src/notifications.ts
@@ -2071,6 +2076,9 @@ function createNotificationsApi({
   fetcher
 }) {
   async function fetchJson(endpoint, options, params) {
+    if (!endpoint.startsWith("/v2/c/")) {
+      raise("Expected a /v2/c/* endpoint");
+    }
     const authValue = await authManager.getAuthValue({
       requestedScope: "comments:read"
     });
@@ -2078,8 +2086,8 @@ function createNotificationsApi({
       const userId = authValue.token.parsed.uid;
       currentUserIdStore.set(() => userId);
     }
-    const url = urljoin(baseUrl, `/v2/c${endpoint}`, params);
-    const response = await fetcher(url.toString(), {
+    const url2 = urljoin(baseUrl, endpoint, params);
+    const response = await fetcher(url2.toString(), {
       ...options,
       headers: {
         ..._optionalChain([options, 'optionalAccess', _45 => _45.headers]),
@@ -2114,7 +2122,7 @@ function createNotificationsApi({
     return body;
   }
   async function getInboxNotifications() {
-    const json = await fetchJson("/inbox-notifications", void 0, {});
+    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {});
     return {
       threads: json.threads.map(convertToThreadData),
       inboxNotifications: json.inboxNotifications.map(
@@ -2124,7 +2132,7 @@ function createNotificationsApi({
     };
   }
   async function getInboxNotificationsSince(options) {
-    const json = await fetchJson("/inbox-notifications", void 0, {
+    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {
       since: options.since.toISOString()
     });
     return {
@@ -2142,11 +2150,11 @@ function createNotificationsApi({
     };
   }
   async function getUnreadInboxNotificationsCount() {
-    const { count } = await fetchJson("/inbox-notifications/count");
+    const { count } = await fetchJson(url`/v2/c/inbox-notifications/count`);
     return count;
   }
   async function markAllInboxNotificationsAsRead() {
-    await fetchJson("/inbox-notifications/read", {
+    await fetchJson(url`/v2/c/inbox-notifications/read`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -2155,7 +2163,7 @@ function createNotificationsApi({
     });
   }
   async function markInboxNotificationsAsRead(inboxNotificationIds) {
-    await fetchJson("/inbox-notifications/read", {
+    await fetchJson(url`/v2/c/inbox-notifications/read`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -2175,24 +2183,21 @@ function createNotificationsApi({
     await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
   }
   async function deleteAllInboxNotifications() {
-    await fetchJson("/inbox-notifications", {
+    await fetchJson(url`/v2/c/inbox-notifications`, {
       method: "DELETE"
     });
   }
   async function deleteInboxNotification(inboxNotificationId) {
-    await fetchJson(
-      `/inbox-notifications/${encodeURIComponent(inboxNotificationId)}`,
-      {
-        method: "DELETE"
-      }
-    );
+    await fetchJson(url`/v2/c/inbox-notifications/${inboxNotificationId}`, {
+      method: "DELETE"
+    });
   }
   async function getThreads(options) {
     let query;
     if (_optionalChain([options, 'optionalAccess', _46 => _46.query])) {
       query = objectToQuery(options.query);
     }
-    const json = await fetchJson("/threads", void 0, {
+    const json = await fetchJson(url`/v2/c/threads`, void 0, {
       query
     });
     return {
@@ -2208,7 +2213,7 @@ function createNotificationsApi({
     if (_optionalChain([options, 'optionalAccess', _47 => _47.query])) {
       query = objectToQuery(options.query);
     }
-    const json = await fetchJson("/threads", void 0, {
+    const json = await fetchJson(url`/v2/c/threads`, void 0, {
       since: options.since.toISOString(),
       query
     });
@@ -4796,7 +4801,7 @@ function findNonSerializableValue(value, path = "") {
 }
 
 // src/lib/autoRetry.ts
-async function autoRetry(promiseFn, maxTries, backoff, exitCondition) {
+async function autoRetry(promiseFn, maxTries, backoff, throwError) {
   const fallbackBackoff = backoff.length > 0 ? backoff[backoff.length - 1] : 0;
   let attempt = 0;
   while (true) {
@@ -4805,7 +4810,7 @@ async function autoRetry(promiseFn, maxTries, backoff, exitCondition) {
     try {
       return await promise;
     } catch (err) {
-      if (exitCondition && exitCondition(err)) {
+      if (_optionalChain([throwError, 'optionalCall', _116 => _116(err)])) {
         throw err;
       }
       if (attempt >= maxTries) {
@@ -5233,15 +5238,15 @@ function installBackgroundTabSpy() {
   const doc = typeof document !== "undefined" ? document : void 0;
   const inBackgroundSince = { current: null };
   function onVisibilityChange() {
-    if (_optionalChain([doc, 'optionalAccess', _116 => _116.visibilityState]) === "hidden") {
+    if (_optionalChain([doc, 'optionalAccess', _117 => _117.visibilityState]) === "hidden") {
       inBackgroundSince.current = _nullishCoalesce(inBackgroundSince.current, () => ( Date.now()));
     } else {
       inBackgroundSince.current = null;
     }
   }
-  _optionalChain([doc, 'optionalAccess', _117 => _117.addEventListener, 'call', _118 => _118("visibilitychange", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _118 => _118.addEventListener, 'call', _119 => _119("visibilitychange", onVisibilityChange)]);
   const unsub = () => {
-    _optionalChain([doc, 'optionalAccess', _119 => _119.removeEventListener, 'call', _120 => _120("visibilitychange", onVisibilityChange)]);
+    _optionalChain([doc, 'optionalAccess', _120 => _120.removeEventListener, 'call', _121 => _121("visibilitychange", onVisibilityChange)]);
   };
   return [inBackgroundSince, unsub];
 }
@@ -5473,7 +5478,7 @@ function createRoom(options, config) {
       }
     },
     assertStorageIsWritable: () => {
-      const scopes = _optionalChain([context, 'access', _121 => _121.dynamicSessionInfo, 'access', _122 => _122.current, 'optionalAccess', _123 => _123.scopes]);
+      const scopes = _optionalChain([context, 'access', _122 => _122.dynamicSessionInfo, 'access', _123 => _123.current, 'optionalAccess', _124 => _124.scopes]);
       if (scopes === void 0) {
         return;
       }
@@ -5501,24 +5506,23 @@ function createRoom(options, config) {
     ydoc: makeEventSource(),
     comments: makeEventSource()
   };
-  async function fetchClientApi(roomId, endpoint, authValue, options2, params) {
-    const url = urljoin(
-      config.baseUrl,
-      `/v2/c/rooms/${encodeURIComponent(roomId)}${endpoint}`,
-      params
-    );
-    const fetcher = _optionalChain([config, 'access', _124 => _124.polyfills, 'optionalAccess', _125 => _125.fetch]) || /* istanbul ignore next */
+  async function fetchClientApi(endpoint, authValue, options2, params) {
+    if (!endpoint.startsWith("/v2/c/rooms/")) {
+      raise("Expected a /v2/c/rooms/* endpoint");
+    }
+    const url2 = urljoin(config.baseUrl, endpoint, params);
+    const fetcher = _optionalChain([config, 'access', _125 => _125.polyfills, 'optionalAccess', _126 => _126.fetch]) || /* istanbul ignore next */
     fetch;
-    return await fetcher(url, {
+    return await fetcher(url2, {
       ...options2,
       headers: {
-        ..._optionalChain([options2, 'optionalAccess', _126 => _126.headers]),
+        ..._optionalChain([options2, 'optionalAccess', _127 => _127.headers]),
         Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`
       }
     });
   }
   async function streamFetch(authValue, roomId) {
-    return fetchClientApi(roomId, "/storage", authValue, {
+    return fetchClientApi(url`/v2/c/rooms/${roomId}/storage`, authValue, {
       method: "GET",
       headers: {
         "Content-Type": "application/json"
@@ -5529,21 +5533,24 @@ function createRoom(options, config) {
     if (!managedSocket.authValue) {
       throw new Error("Not authorized");
     }
-    return fetchClientApi(config.roomId, endpoint, managedSocket.authValue, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body)
-    });
+    return fetchClientApi(
+      endpoint === "/send-message" ? url`/v2/c/rooms/${config.roomId}/send-message` : url`/v2/c/rooms/${config.roomId}/text-metadata`,
+      managedSocket.authValue,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(body)
+      }
+    );
   }
   async function createTextMention(userId, mentionId) {
     if (!managedSocket.authValue) {
       throw new Error("Not authorized");
     }
     return fetchClientApi(
-      config.roomId,
-      "/text-mentions",
+      url`/v2/c/rooms/${config.roomId}/text-mentions`,
       managedSocket.authValue,
       {
         method: "POST",
@@ -5562,8 +5569,7 @@ function createRoom(options, config) {
       throw new Error("Not authorized");
     }
     return fetchClientApi(
-      config.roomId,
-      `/text-mentions/${mentionId}`,
+      url`/v2/c/rooms/${config.roomId}/text-mentions/${mentionId}`,
       managedSocket.authValue,
       {
         method: "DELETE"
@@ -5572,43 +5578,45 @@ function createRoom(options, config) {
   }
   async function reportTextEditor(type, rootKey) {
     const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, "/text-metadata", authValue, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        type,
-        rootKey
-      })
-    });
+    return fetchClientApi(
+      url`/v2/c/rooms/${config.roomId}/text-metadata`,
+      authValue,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ type, rootKey })
+      }
+    );
   }
   async function listTextVersions() {
-    const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, "/versions/", authValue, {
-      method: "GET"
-    });
-  }
-  async function getTextVersion(versionId) {
     const authValue = await delegates.authenticate();
     return fetchClientApi(
-      config.roomId,
-      `/y-version/${encodeURIComponent(versionId)}`,
+      url`/v2/c/rooms/${config.roomId}/versions`,
       authValue,
       {
         method: "GET"
       }
     );
   }
+  async function getTextVersion(versionId) {
+    const authValue = await delegates.authenticate();
+    return fetchClientApi(
+      url`/v2/c/rooms/${config.roomId}/y-version/${versionId}`,
+      authValue,
+      { method: "GET" }
+    );
+  }
   async function createTextVersion() {
     const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, "/version", authValue, {
-      method: "POST"
-    });
+    return fetchClientApi(
+      url`/v2/c/rooms/${config.roomId}/version`,
+      authValue,
+      { method: "POST" }
+    );
   }
   function sendMessages(messages) {
     const serializedPayload = JSON.stringify(messages);
-    const nonce = _optionalChain([context, 'access', _127 => _127.dynamicSessionInfo, 'access', _128 => _128.current, 'optionalAccess', _129 => _129.nonce]);
+    const nonce = _optionalChain([context, 'access', _128 => _128.dynamicSessionInfo, 'access', _129 => _129.current, 'optionalAccess', _130 => _130.nonce]);
     if (config.unstable_fallbackToHTTP && nonce) {
       const size = new TextEncoder().encode(serializedPayload).length;
       if (size > MAX_SOCKET_MESSAGE_SIZE) {
@@ -5670,7 +5678,7 @@ function createRoom(options, config) {
     } else {
       context.root = LiveObject._fromItems(message.items, pool);
     }
-    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _130 => _130.current, 'optionalAccess', _131 => _131.canWrite]), () => ( true));
+    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _131 => _131.current, 'optionalAccess', _132 => _132.canWrite]), () => ( true));
     const stackSizeBefore = context.undoStack.length;
     for (const key in context.initialStorage) {
       if (context.root.get(key) === void 0) {
@@ -5875,7 +5883,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _132 => _132.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _133 => _133.addToHistory])) {
         context.activeBatch.reverseOps.unshift({
           type: "presence",
           data: oldValues
@@ -5885,7 +5893,7 @@ function createRoom(options, config) {
     } else {
       flushNowOrSoon();
       batchUpdates(() => {
-        if (_optionalChain([options2, 'optionalAccess', _133 => _133.addToHistory])) {
+        if (_optionalChain([options2, 'optionalAccess', _134 => _134.addToHistory])) {
           addToUndoStack(
             [{ type: "presence", data: oldValues }],
             doNotBatchUpdates
@@ -6083,7 +6091,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', _134 => _134.opStackTraces, 'optionalAccess', _135 => _135.get, 'call', _136 => _136(opId)]);
+                const trace = _optionalChain([context, 'access', _135 => _135.opStackTraces, 'optionalAccess', _136 => _136.get, 'call', _137 => _137(opId)]);
                 if (trace) {
                   traces.add(trace);
                 }
@@ -6217,7 +6225,7 @@ ${Array.from(traces).join("\n\n")}`
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
     createOrUpdateRootFromMessage(message, doNotBatchUpdates);
     applyAndSendOps(unacknowledgedOps, doNotBatchUpdates);
-    _optionalChain([_resolveStoragePromise, 'optionalCall', _137 => _137()]);
+    _optionalChain([_resolveStoragePromise, 'optionalCall', _138 => _138()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
@@ -6436,7 +6444,7 @@ ${Array.from(traces).join("\n\n")}`
   };
   async function fetchCommentsApi(endpoint, params, options2) {
     const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, endpoint, authValue, options2, params);
+    return fetchClientApi(endpoint, authValue, options2, params);
   }
   async function fetchCommentsJson(endpoint, options2, params) {
     const response = await fetchCommentsApi(endpoint, params, options2);
@@ -6466,9 +6474,9 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getThreadsSince(options2) {
     const response = await fetchCommentsApi(
-      "/threads",
+      url`/v2/c/rooms/${config.roomId}/threads`,
       {
-        since: _optionalChain([options2, 'optionalAccess', _138 => _138.since, 'optionalAccess', _139 => _139.toISOString, 'call', _140 => _140()])
+        since: _optionalChain([options2, 'optionalAccess', _139 => _139.since, 'optionalAccess', _140 => _140.toISOString, 'call', _141 => _141()])
       },
       {
         headers: {
@@ -6509,19 +6517,13 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getThreads(options2) {
     let query;
-    if (_optionalChain([options2, 'optionalAccess', _141 => _141.query])) {
+    if (_optionalChain([options2, 'optionalAccess', _142 => _142.query])) {
       query = objectToQuery(options2.query);
     }
     const response = await fetchCommentsApi(
-      "/threads",
-      {
-        query
-      },
-      {
-        headers: {
-          "Content-Type": "application/json"
-        }
-      }
+      url`/v2/c/rooms/${config.roomId}/threads`,
+      { query },
+      { headers: { "Content-Type": "application/json" } }
     );
     if (response.ok) {
       const json = await response.json();
@@ -6546,7 +6548,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getThread(threadId) {
     const response = await fetchCommentsApi(
-      `/thread-with-notification/${threadId}`
+      url`/v2/c/rooms/${config.roomId}/thread-with-notification/${threadId}`
     );
     if (response.ok) {
       const json = await response.json();
@@ -6570,34 +6572,38 @@ ${Array.from(traces).join("\n\n")}`
     threadId = createThreadId(),
     attachmentIds
   }) {
-    const thread = await fetchCommentsJson("/threads", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        id: threadId,
-        comment: {
-          id: commentId,
-          body,
-          attachmentIds
+    const thread = await fetchCommentsJson(
+      url`/v2/c/rooms/${config.roomId}/threads`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
         },
-        metadata
-      })
-    });
+        body: JSON.stringify({
+          id: threadId,
+          comment: {
+            id: commentId,
+            body,
+            attachmentIds
+          },
+          metadata
+        })
+      }
+    );
     return convertToThreadData(thread);
   }
   async function deleteThread(threadId) {
-    await fetchCommentsJson(`/threads/${encodeURIComponent(threadId)}`, {
-      method: "DELETE"
-    });
+    await fetchCommentsJson(
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}`,
+      { method: "DELETE" }
+    );
   }
   async function editThreadMetadata({
     metadata,
     threadId
   }) {
     return await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/metadata`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/metadata`,
       {
         method: "POST",
         headers: {
@@ -6609,18 +6615,14 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function markThreadAsResolved(threadId) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/mark-as-resolved`,
-      {
-        method: "POST"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/mark-as-resolved`,
+      { method: "POST" }
     );
   }
   async function markThreadAsUnresolved(threadId) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/mark-as-unresolved`,
-      {
-        method: "POST"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/mark-as-unresolved`,
+      { method: "POST" }
     );
   }
   async function createComment({
@@ -6630,7 +6632,7 @@ ${Array.from(traces).join("\n\n")}`
     attachmentIds
   }) {
     const comment = await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments`,
       {
         method: "POST",
         headers: {
@@ -6652,9 +6654,7 @@ ${Array.from(traces).join("\n\n")}`
     attachmentIds
   }) {
     const comment = await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}`,
       {
         method: "POST",
         headers: {
@@ -6673,12 +6673,8 @@ ${Array.from(traces).join("\n\n")}`
     commentId
   }) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}`,
-      {
-        method: "DELETE"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}`,
+      { method: "DELETE" }
     );
   }
   async function addReaction({
@@ -6687,9 +6683,7 @@ ${Array.from(traces).join("\n\n")}`
     emoji
   }) {
     const reaction = await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}/reactions`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}/reactions`,
       {
         method: "POST",
         headers: {
@@ -6706,12 +6700,8 @@ ${Array.from(traces).join("\n\n")}`
     emoji
   }) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}/reactions/${encodeURIComponent(emoji)}`,
-      {
-        method: "DELETE"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}/reactions/${emoji}`,
+      { method: "DELETE" }
     );
   }
   function prepareAttachment(file) {
@@ -6731,11 +6721,11 @@ ${Array.from(traces).join("\n\n")}`
       `Upload of attachment ${attachment.id} was aborted.`,
       "AbortError"
     ) : void 0;
-    if (_optionalChain([abortSignal, 'optionalAccess', _142 => _142.aborted])) {
+    if (_optionalChain([abortSignal, 'optionalAccess', _143 => _143.aborted])) {
       throw abortError;
     }
     const handleRetryError = (err) => {
-      if (_optionalChain([abortSignal, 'optionalAccess', _143 => _143.aborted])) {
+      if (_optionalChain([abortSignal, 'optionalAccess', _144 => _144.aborted])) {
         throw abortError;
       }
       if (err instanceof CommentsApiError && err.status === 413) {
@@ -6746,7 +6736,7 @@ ${Array.from(traces).join("\n\n")}`
     if (attachment.size <= ATTACHMENT_PART_SIZE) {
       return autoRetry(
         () => fetchCommentsJson(
-          `/attachments/${encodeURIComponent(attachment.id)}/upload/${encodeURIComponent(attachment.name)}`,
+          url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/upload/${encodeURIComponent(attachment.name)}`,
           {
             method: "PUT",
             body: attachment.file,
@@ -6765,7 +6755,7 @@ ${Array.from(traces).join("\n\n")}`
       const uploadedParts = [];
       const createMultiPartUpload = await autoRetry(
         () => fetchCommentsJson(
-          `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(attachment.name)}`,
+          url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${encodeURIComponent(attachment.name)}`,
           {
             method: "POST",
             signal: abortSignal
@@ -6781,7 +6771,7 @@ ${Array.from(traces).join("\n\n")}`
       try {
         uploadId = createMultiPartUpload.uploadId;
         const parts = splitFileIntoParts(attachment.file);
-        if (_optionalChain([abortSignal, 'optionalAccess', _144 => _144.aborted])) {
+        if (_optionalChain([abortSignal, 'optionalAccess', _145 => _145.aborted])) {
           throw abortError;
         }
         const batches = chunk(parts, ATTACHMENT_PART_BATCH_SIZE);
@@ -6791,7 +6781,7 @@ ${Array.from(traces).join("\n\n")}`
             uploadedPartsPromises.push(
               autoRetry(
                 () => fetchCommentsJson(
-                  `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(createMultiPartUpload.uploadId)}/${encodeURIComponent(partNumber)}`,
+                  url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${createMultiPartUpload.uploadId}/${String(partNumber)}`,
                   {
                     method: "PUT",
                     body: part,
@@ -6806,14 +6796,14 @@ ${Array.from(traces).join("\n\n")}`
           }
           uploadedParts.push(...await Promise.all(uploadedPartsPromises));
         }
-        if (_optionalChain([abortSignal, 'optionalAccess', _145 => _145.aborted])) {
+        if (_optionalChain([abortSignal, 'optionalAccess', _146 => _146.aborted])) {
           throw abortError;
         }
         const sortedUploadedParts = uploadedParts.sort(
           (a, b) => a.partNumber - b.partNumber
         );
         return fetchCommentsJson(
-          `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(uploadId)}/complete`,
+          url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${uploadId}/complete`,
           {
             method: "POST",
             headers: {
@@ -6824,10 +6814,10 @@ ${Array.from(traces).join("\n\n")}`
           }
         );
       } catch (error3) {
-        if (uploadId && _optionalChain([error3, 'optionalAccess', _146 => _146.name]) && (error3.name === "AbortError" || error3.name === "TimeoutError")) {
+        if (uploadId && _optionalChain([error3, 'optionalAccess', _147 => _147.name]) && (error3.name === "AbortError" || error3.name === "TimeoutError")) {
           try {
             await fetchCommentsApi(
-              `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(uploadId)}`,
+              url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${uploadId}`,
               void 0,
               {
                 method: "DELETE"
@@ -6842,7 +6832,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getAttachmentUrls(attachmentIds) {
     const { urls } = await fetchCommentsJson(
-      "/attachments/presigned-urls",
+      url`/v2/c/rooms/${config.roomId}/attachments/presigned-urls`,
       {
         method: "POST",
         headers: {
@@ -6858,7 +6848,7 @@ ${Array.from(traces).join("\n\n")}`
       const attachmentIds = batchedAttachmentIds.flat();
       const attachmentUrls = await getAttachmentUrls(attachmentIds);
       return attachmentUrls.map(
-        (url) => _nullishCoalesce(url, () => ( new Error("There was an error while getting this attachment's URL")))
+        (url2) => _nullishCoalesce(url2, () => ( new Error("There was an error while getting this attachment's URL")))
       );
     },
     { delay: GET_ATTACHMENT_URLS_BATCH_DELAY }
@@ -6869,12 +6859,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function fetchNotificationsJson(endpoint, options2) {
     const authValue = await delegates.authenticate();
-    const response = await fetchClientApi(
-      config.roomId,
-      endpoint,
-      authValue,
-      options2
-    );
+    const response = await fetchClientApi(endpoint, authValue, options2);
     if (!response.ok) {
       if (response.status >= 400 && response.status < 600) {
         let error3;
@@ -6904,12 +6889,12 @@ ${Array.from(traces).join("\n\n")}`
   }
   function getNotificationSettings() {
     return fetchNotificationsJson(
-      "/notification-settings"
+      url`/v2/c/rooms/${config.roomId}/notification-settings`
     );
   }
   function updateNotificationSettings(settings) {
     return fetchNotificationsJson(
-      "/notification-settings",
+      url`/v2/c/rooms/${config.roomId}/notification-settings`,
       {
         method: "POST",
         body: JSON.stringify(settings),
@@ -6920,13 +6905,16 @@ ${Array.from(traces).join("\n\n")}`
     );
   }
   async function markInboxNotificationsAsRead(inboxNotificationIds) {
-    await fetchNotificationsJson("/inbox-notifications/read", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ inboxNotificationIds })
-    });
+    await fetchNotificationsJson(
+      url`/v2/c/rooms/${config.roomId}/inbox-notifications/read`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ inboxNotificationIds })
+      }
+    );
   }
   const batchedMarkInboxNotificationsAsRead = new Batch(
     async (batchedInboxNotificationIds) => {
@@ -6943,7 +6931,7 @@ ${Array.from(traces).join("\n\n")}`
     {
       [kInternal]: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _147 => _147.buffer, 'access', _148 => _148.presenceUpdates, 'optionalAccess', _149 => _149.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _148 => _148.buffer, 'access', _149 => _149.presenceUpdates, 'optionalAccess', _150 => _150.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -7127,7 +7115,7 @@ function makeClassicSubscribeFn(events) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _150 => _150.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _151 => _151.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -7157,19 +7145,19 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
         "To use Liveblocks client in a non-DOM environment, you need to provide a WebSocket polyfill."
       );
     }
-    const url = new URL(baseUrl);
-    url.protocol = url.protocol === "http:" ? "ws" : "wss";
-    url.pathname = "/v7";
-    url.searchParams.set("roomId", roomId);
+    const url2 = new URL(baseUrl);
+    url2.protocol = url2.protocol === "http:" ? "ws" : "wss";
+    url2.pathname = "/v7";
+    url2.searchParams.set("roomId", roomId);
     if (authValue.type === "secret") {
-      url.searchParams.set("tok", authValue.token.raw);
+      url2.searchParams.set("tok", authValue.token.raw);
     } else if (authValue.type === "public") {
-      url.searchParams.set("pubkey", authValue.publicApiKey);
+      url2.searchParams.set("pubkey", authValue.publicApiKey);
     } else {
       return assertNever(authValue, "Unhandled case");
     }
-    url.searchParams.set("version", PKG_VERSION || "dev");
-    return new ws(url.toString());
+    url2.searchParams.set("version", PKG_VERSION || "dev");
+    return new ws(url2.toString());
   };
 }
 
@@ -7254,12 +7242,12 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _151 => _151.polyfills, 'optionalAccess', _152 => _152.WebSocket])
+            _optionalChain([clientOptions, 'access', _152 => _152.polyfills, 'optionalAccess', _153 => _153.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
-        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _153 => _153.unstable_batchedUpdates]),
+        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _154 => _154.unstable_batchedUpdates]),
         baseUrl,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData
@@ -7275,7 +7263,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _154 => _154.polyfills, 'optionalAccess', _155 => _155.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _155 => _155.polyfills, 'optionalAccess', _156 => _156.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"
           );
@@ -7287,7 +7275,7 @@ function createClient(options) {
     return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _156 => _156.get, 'call', _157 => _157(roomId), 'optionalAccess', _158 => _158.room]);
+    const room = _optionalChain([roomsById, 'access', _157 => _157.get, 'call', _158 => _158(roomId), 'optionalAccess', _159 => _159.room]);
     return room ? room : null;
   }
   function logout() {
@@ -7311,7 +7299,7 @@ function createClient(options) {
     getThreadsSince
   } = createNotificationsApi({
     baseUrl,
-    fetcher: _optionalChain([clientOptions, 'access', _159 => _159.polyfills, 'optionalAccess', _160 => _160.fetch]) || /* istanbul ignore next */
+    fetcher: _optionalChain([clientOptions, 'access', _160 => _160.polyfills, 'optionalAccess', _161 => _161.fetch]) || /* istanbul ignore next */
     fetch,
     authManager,
     currentUserIdStore
@@ -7324,7 +7312,7 @@ function createClient(options) {
   const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _161 => _161({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _162 => _162({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -7339,7 +7327,7 @@ function createClient(options) {
   const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _162 => _162({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _163 => _163({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -7431,7 +7419,7 @@ function createDevelopmentWarning(condition, ...args) {
 
 // src/comments/comment-body.ts
 function isCommentBodyParagraph(element) {
-  return "type" in element && element.type === "mention";
+  return "type" in element && element.type === "paragraph";
 }
 function isCommentBodyText(element) {
   return !("type" in element) && "text" in element && typeof element.text === "string";
@@ -7455,7 +7443,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _163 => _163.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _164 => _164.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -7465,13 +7453,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _164 => _164(block)]);
+        _optionalChain([visitor, 'optionalCall', _165 => _165(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _165 => _165(inline)]);
+          _optionalChain([visitor, 'optionalCall', _166 => _166(inline)]);
         }
       }
     }
@@ -7496,7 +7484,7 @@ async function resolveUsersInCommentBody(body, resolveUsers) {
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _166 => _166[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _167 => _167[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -7606,11 +7594,11 @@ var MarkdownSafeString = class {
 function markdown(strings, ...values) {
   return new MarkdownSafeString(strings, values);
 }
-function toAbsoluteUrl(url) {
-  if (url.startsWith("http://") || url.startsWith("https://")) {
-    return url;
-  } else if (url.startsWith("www.")) {
-    return "https://" + url;
+function toAbsoluteUrl(url2) {
+  if (url2.startsWith("http://") || url2.startsWith("https://")) {
+    return url2;
+  } else if (url2.startsWith("www.")) {
+    return "https://" + url2;
   }
   return;
 }
@@ -7619,7 +7607,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => _nullishCoalesce(element.text, () => ( element.url)),
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _167 => _167.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _168 => _168.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -7649,7 +7637,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${_nullishCoalesce(element.text, () => ( element.url))}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _168 => _168.name]), () => ( element.id))}</span>`;
+    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _169 => _169.name]), () => ( element.id))}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -7679,19 +7667,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${_nullishCoalesce(element.text, () => ( element.url))}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _169 => _169.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _170 => _170.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _170 => _170.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _171 => _171.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  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 elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _172 => _172.elements])
+    ..._optionalChain([options, 'optionalAccess', _173 => _173.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _173 => _173.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _174 => _174.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -7966,12 +7954,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _174 => _174.updates, 'access', _175 => _175[key], 'optionalAccess', _176 => _176.type]) === "update") {
+          if (_optionalChain([update, 'access', _175 => _175.updates, 'access', _176 => _176[key], 'optionalAccess', _177 => _177.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _177 => _177.updates, 'access', _178 => _178[key], 'optionalAccess', _179 => _179.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _178 => _178.updates, 'access', _179 => _179[key], 'optionalAccess', _180 => _180.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8032,12 +8020,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _180 => _180.updates, 'access', _181 => _181[key], 'optionalAccess', _182 => _182.type]) === "update") {
+          if (_optionalChain([update, 'access', _181 => _181.updates, 'access', _182 => _182[key], 'optionalAccess', _183 => _183.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _183 => _183.updates, 'access', _184 => _184[key], 'optionalAccess', _185 => _185.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _184 => _184.updates, 'access', _185 => _185[key], 'optionalAccess', _186 => _186.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8296,5 +8284,7 @@ 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.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createStore = createStore; exports.createThreadId = createThreadId; 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.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; 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.wait = wait; 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.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createStore = createStore; exports.createThreadId = createThreadId; 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.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; 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.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map