@liveblocks/core 1.10.0-beta2 → 1.10.0-beta3

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.10.0-beta2";
+var PKG_VERSION = "1.10.0-beta3";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -1325,7 +1325,7 @@ function createAuthManager(authOptions) {
     }
     return false;
   }
-  function getCachedToken(roomOptions) {
+  function getCachedToken(requestOptions) {
     const now = Math.ceil(Date.now() / 1e3);
     for (let i = tokens.length - 1; i >= 0; i--) {
       const token = tokens[i];
@@ -1338,11 +1338,12 @@ function createAuthManager(authOptions) {
       if (token.parsed.k === "id" /* ID_TOKEN */) {
         return token;
       } else if (token.parsed.k === "acc" /* ACCESS_TOKEN */) {
-        if (!roomOptions) {
-          return token;
-        }
         for (const [resource, scopes] of Object.entries(token.parsed.perms)) {
-          if (resource.includes("*") && roomOptions.roomId.startsWith(resource.replace("*", "")) || roomOptions.roomId === resource && hasCorrespondingScopes(roomOptions.requestedScope, scopes)) {
+          if (!requestOptions.roomId) {
+            if (resource.includes("*") && hasCorrespondingScopes(requestOptions.requestedScope, scopes)) {
+              return token;
+            }
+          } else if (resource.includes("*") && requestOptions.roomId.startsWith(resource.replace("*", "")) || requestOptions.roomId === resource && hasCorrespondingScopes(requestOptions.requestedScope, scopes)) {
             return token;
           }
         }
@@ -1350,7 +1351,7 @@ function createAuthManager(authOptions) {
     }
     return void 0;
   }
-  async function makeAuthRequest(roomId) {
+  async function makeAuthRequest(options) {
     const fetcher = authOptions.polyfills?.fetch ?? (typeof window === "undefined" ? void 0 : window.fetch);
     if (authentication.type === "private") {
       if (fetcher === void 0) {
@@ -1359,9 +1360,10 @@ function createAuthManager(authOptions) {
         );
       }
       const response = await fetchAuthEndpoint(fetcher, authentication.url, {
-        room: roomId
+        room: options.roomId
       });
       const parsed = parseAuthToken(response.token);
+      verifyTokenPermissions(parsed, options);
       if (seenTokens.has(parsed.raw)) {
         throw new StopRetrying(
           "The same Liveblocks auth token was issued from the backend before. Caching Liveblocks tokens is not supported."
@@ -1370,10 +1372,12 @@ function createAuthManager(authOptions) {
       return parsed;
     }
     if (authentication.type === "custom") {
-      const response = await authentication.callback(roomId);
+      const response = await authentication.callback(options.roomId);
       if (response && typeof response === "object") {
         if (typeof response.token === "string") {
-          return parseAuthToken(response.token);
+          const parsed = parseAuthToken(response.token);
+          verifyTokenPermissions(parsed, options);
+          return parsed;
         } else if (typeof response.error === "string") {
           const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
           if (response.error === "forbidden") {
@@ -1391,25 +1395,39 @@ function createAuthManager(authOptions) {
       "Unexpected authentication type. Must be private or custom."
     );
   }
-  async function getAuthValue(roomOptions) {
+  function verifyTokenPermissions(parsedToken, options) {
+    if (!options.roomId && parsedToken.parsed.k === "acc" /* ACCESS_TOKEN */) {
+      for (const [resource, scopes] of Object.entries(
+        parsedToken.parsed.perms
+      )) {
+        if (resource.includes("*") && hasCorrespondingScopes(options.requestedScope, scopes)) {
+          return;
+        }
+      }
+      throw new StopRetrying(
+        "The issued Access Token doesn't grant enough permissions. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/access-tokens-not-enough-permissions"
+      );
+    }
+  }
+  async function getAuthValue(requestOptions) {
     if (authentication.type === "public") {
       return { type: "public", publicApiKey: authentication.publicApiKey };
     }
-    const cachedToken = getCachedToken(roomOptions);
+    const cachedToken = getCachedToken(requestOptions);
     if (cachedToken !== void 0) {
       return { type: "secret", token: cachedToken };
     }
     let currentPromise;
-    if (roomOptions) {
-      currentPromise = requestPromises.get(roomOptions.roomId);
+    if (requestOptions.roomId) {
+      currentPromise = requestPromises.get(requestOptions.roomId);
       if (currentPromise === void 0) {
-        currentPromise = makeAuthRequest(roomOptions.roomId);
-        requestPromises.set(roomOptions.roomId, currentPromise);
+        currentPromise = makeAuthRequest(requestOptions);
+        requestPromises.set(requestOptions.roomId, currentPromise);
       }
     } else {
       currentPromise = requestPromises.get("liveblocks-user-token");
       if (currentPromise === void 0) {
-        currentPromise = makeAuthRequest();
+        currentPromise = makeAuthRequest(requestOptions);
         requestPromises.set("liveblocks-user-token", currentPromise);
       }
     }
@@ -1424,8 +1442,8 @@ function createAuthManager(authOptions) {
       }
       return { type: "secret", token };
     } finally {
-      if (roomOptions) {
-        requestPromises.delete(roomOptions.roomId);
+      if (requestOptions.roomId) {
+        requestPromises.delete(requestOptions.roomId);
       } else {
         requestPromises.delete("liveblocks-user-token");
       }
@@ -1996,6 +2014,38 @@ function convertToInboxNotificationData(data) {
     readAt
   };
 }
+function convertToThreadDeleteInfo(data) {
+  const deletedAt = new Date(data.deletedAt);
+  return {
+    ...data,
+    deletedAt
+  };
+}
+function convertToInboxNotificationDeleteInfo(data) {
+  const deletedAt = new Date(data.deletedAt);
+  return {
+    ...data,
+    deletedAt
+  };
+}
+
+// src/lib/url.ts
+function toURLSearchParams(params) {
+  const result = new URLSearchParams();
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== void 0 && value !== null) {
+      result.set(key, value.toString());
+    }
+  }
+  return result;
+}
+function urljoin(baseUrl, path, params) {
+  const url = new URL(path, baseUrl);
+  if (params !== void 0) {
+    url.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
+  }
+  return url.toString();
+}
 
 // src/notifications.ts
 var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY = 50;
@@ -2005,13 +2055,15 @@ function createInboxNotificationsApi({
   currentUserIdStore,
   fetcher
 }) {
-  async function fetchJson(endpoint, options) {
-    const authValue = await authManager.getAuthValue();
+  async function fetchJson(endpoint, options, params) {
+    const authValue = await authManager.getAuthValue({
+      requestedScope: "comments:read"
+    });
     if (authValue.type === "secret" && authValue.token.parsed.k === "acc" /* ACCESS_TOKEN */) {
       const userId = authValue.token.parsed.uid;
       currentUserIdStore.set(() => userId);
     }
-    const url = new URL(`/v2/c${endpoint}`, baseUrl);
+    const url = urljoin(baseUrl, `/v2/c${endpoint}`, params);
     const response = await fetcher(url.toString(), {
       ...options,
       headers: {
@@ -2047,13 +2099,24 @@ function createInboxNotificationsApi({
     return body;
   }
   async function getInboxNotifications(options) {
-    const queryParams = toURLSearchParams({ limit: options?.limit });
-    const json = await fetchJson(`/inbox-notifications?${queryParams.toString()}`);
+    const json = await fetchJson("/inbox-notifications", void 0, {
+      limit: options?.limit,
+      since: options?.since?.toISOString()
+    });
     return {
       threads: json.threads.map((thread) => convertToThreadData(thread)),
       inboxNotifications: json.inboxNotifications.map(
         (notification) => convertToInboxNotificationData(notification)
-      )
+      ),
+      deletedThreads: json.deletedThreads.map(
+        (info) => convertToThreadDeleteInfo(info)
+      ),
+      deletedInboxNotifications: json.deletedInboxNotifications.map(
+        (info) => convertToInboxNotificationDeleteInfo(info)
+      ),
+      meta: {
+        requestedAt: new Date(json.meta.requestedAt)
+      }
     };
   }
   async function getUnreadInboxNotificationsCount() {
@@ -2096,15 +2159,6 @@ function createInboxNotificationsApi({
     markInboxNotificationAsRead
   };
 }
-function toURLSearchParams(params) {
-  const result = new URLSearchParams();
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0 && value !== null) {
-      result.set(key, value.toString());
-    }
-  }
-  return result;
-}
 
 // src/lib/position.ts
 var MIN_CODE = 32;
@@ -4959,12 +5013,12 @@ var CommentsApiError = class extends Error {
   }
 };
 function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
-  async function fetchCommentsApi(endpoint, options) {
+  async function fetchCommentsApi(endpoint, params, options) {
     const authValue = await getAuthValue();
-    return fetchClientApi(roomId, endpoint, authValue, options);
+    return fetchClientApi(roomId, endpoint, authValue, options, params);
   }
-  async function fetchJson(endpoint, options) {
-    const response = await fetchCommentsApi(endpoint, options);
+  async function fetchJson(endpoint, options, params) {
+    const response = await fetchCommentsApi(endpoint, params, options);
     if (!response.ok) {
       if (response.status >= 400 && response.status < 600) {
         let error3;
@@ -4990,25 +5044,48 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     return body;
   }
   async function getThreads(options) {
-    const response = await fetchCommentsApi("/threads/search", {
-      body: JSON.stringify({
-        ...options?.query?.metadata && { metadata: options.query.metadata }
-      }),
-      headers: {
-        "Content-Type": "application/json"
+    const response = await fetchCommentsApi(
+      "/threads/search",
+      {
+        since: options?.since?.toISOString()
       },
-      method: "POST"
-    });
+      {
+        body: JSON.stringify({
+          ...options?.query?.metadata && { metadata: options.query.metadata }
+        }),
+        headers: {
+          "Content-Type": "application/json"
+        },
+        method: "POST"
+      }
+    );
     if (response.ok) {
       const json = await response.json();
       return {
         threads: json.data.map((thread) => convertToThreadData(thread)),
         inboxNotifications: json.inboxNotifications.map(
           (notification) => convertToInboxNotificationData(notification)
-        )
+        ),
+        deletedThreads: json.deletedThreads.map(
+          (info) => convertToThreadDeleteInfo(info)
+        ),
+        deletedInboxNotifications: json.deletedInboxNotifications.map(
+          (info) => convertToInboxNotificationDeleteInfo(info)
+        ),
+        meta: {
+          requestedAt: new Date(json.meta.requestedAt)
+        }
       };
     } else if (response.status === 404) {
-      return { threads: [], inboxNotifications: [] };
+      return {
+        threads: [],
+        inboxNotifications: [],
+        deletedThreads: [],
+        deletedInboxNotifications: [],
+        meta: {
+          requestedAt: /* @__PURE__ */ new Date()
+        }
+      };
     } else {
       throw new Error("There was an error while getting threads.");
     }
@@ -5215,6 +5292,9 @@ function createRoom(options, config) {
     opClock: 0,
     nodes: /* @__PURE__ */ new Map(),
     root: void 0,
+    comments: {
+      lastRequestedAt: null
+    },
     undoStack: [],
     redoStack: [],
     pausedHistory: null,
@@ -5383,14 +5463,15 @@ function createRoom(options, config) {
     ydoc: makeEventSource(),
     comments: makeEventSource()
   };
-  async function fetchClientApi(roomId, endpoint, authValue, options2) {
-    const url = new URL(
+  async function fetchClientApi(roomId, endpoint, authValue, options2, params) {
+    const url = urljoin(
+      config.baseUrl,
       `/v2/c/rooms/${encodeURIComponent(roomId)}${endpoint}`,
-      config.baseUrl
+      params
     );
     const fetcher = config.polyfills?.fetch || /* istanbul ignore next */
     fetch;
-    return await fetcher(url.toString(), {
+    return await fetcher(url, {
       ...options2,
       headers: {
         ...options2?.headers,
@@ -6284,6 +6365,14 @@ ${Array.from(traces).join("\n\n")}`
           // These exist only for our E2E testing app
           explicitClose: (event) => managedSocket._privateSendMachineEvent({ type: "EXPLICIT_SOCKET_CLOSE", event }),
           rawSend: (data) => managedSocket.send(data)
+        },
+        comments: {
+          get lastRequestedAt() {
+            return context.comments.lastRequestedAt;
+          },
+          set lastRequestedAt(value) {
+            context.comments.lastRequestedAt = value;
+          }
         }
       },
       id: config.roomId,
@@ -6466,28 +6555,6 @@ function createClientStore() {
     inboxNotifications: {},
     notificationSettings: {}
   });
-  function mergeThreads(existingThreads, newThreads) {
-    const updatedThreads = { ...existingThreads };
-    Object.entries(newThreads).forEach(([id, thread]) => {
-      const existingThread = updatedThreads[id];
-      if (existingThread) {
-        const result = compareThreads(existingThread, thread);
-        if (result === 1)
-          return;
-      }
-      updatedThreads[id] = thread;
-    });
-    return updatedThreads;
-  }
-  function mergeNotifications(existingInboxNotifications, newInboxNotifications) {
-    const inboxNotifications = Object.values({
-      ...existingInboxNotifications,
-      ...newInboxNotifications
-    });
-    return Object.fromEntries(
-      inboxNotifications.map((notification) => [notification.id, notification])
-    );
-  }
   return {
     ...store,
     deleteThread(threadId) {
@@ -6516,21 +6583,19 @@ function createClientStore() {
         };
       });
     },
-    updateThreadsAndNotifications(threads, inboxNotifications, queryKey) {
+    updateThreadsAndNotifications(threads, inboxNotifications, deletedThreads, deletedInboxNotifications, queryKey) {
       store.set((state) => ({
         ...state,
-        threads: mergeThreads(
-          state.threads,
-          Object.fromEntries(threads.map((thread) => [thread.id, thread]))
-        ),
-        inboxNotifications: mergeNotifications(
+        threads: applyThreadUpdates(state.threads, {
+          newThreads: threads,
+          deletedThreads
+        }),
+        inboxNotifications: applyNotificationsUpdates(
           state.inboxNotifications,
-          Object.fromEntries(
-            inboxNotifications.map((notification) => [
-              notification.id,
-              notification
-            ])
-          )
+          {
+            newInboxNotifications: inboxNotifications,
+            deletedNotifications: deletedInboxNotifications
+          }
         ),
         queries: queryKey !== void 0 ? {
           ...state.queries,
@@ -6540,6 +6605,21 @@ function createClientStore() {
         } : state.queries
       }));
     },
+    updateRoomInboxNotificationSettings(roomId, settings, queryKey) {
+      store.set((state) => ({
+        ...state,
+        notificationSettings: {
+          ...state.notificationSettings,
+          [roomId]: settings
+        },
+        queries: {
+          ...state.queries,
+          [queryKey]: {
+            isLoading: false
+          }
+        }
+      }));
+    },
     pushOptimisticUpdate(optimisticUpdate) {
       store.set((state) => ({
         ...state,
@@ -6777,6 +6857,59 @@ function applyOptimisticUpdates(state) {
   }
   return result;
 }
+function applyThreadUpdates(existingThreads, updates) {
+  const updatedThreads = { ...existingThreads };
+  updates.newThreads.forEach((thread) => {
+    const existingThread = updatedThreads[thread.id];
+    if (existingThread) {
+      const result = compareThreads(existingThread, thread);
+      if (result === 1)
+        return;
+    }
+    updatedThreads[thread.id] = thread;
+  });
+  updates.deletedThreads.forEach(({ id, deletedAt }) => {
+    const existingThread = updatedThreads[id];
+    if (existingThread === void 0)
+      return;
+    existingThread.deletedAt = deletedAt;
+    existingThread.updatedAt = deletedAt;
+    existingThread.comments = [];
+  });
+  return updatedThreads;
+}
+function applyNotificationsUpdates(existingInboxNotifications, updates) {
+  const updatedInboxNotifications = { ...existingInboxNotifications };
+  updates.newInboxNotifications.forEach((notification) => {
+    const existingNotification = updatedInboxNotifications[notification.id];
+    if (existingNotification) {
+      const result = compareInboxNotifications(
+        existingNotification,
+        notification
+      );
+      if (result === 1)
+        return;
+    }
+    updatedInboxNotifications[notification.id] = notification;
+  });
+  updates.deletedNotifications.forEach(
+    ({ id }) => delete updatedInboxNotifications[id]
+  );
+  return updatedInboxNotifications;
+}
+function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
+  if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
+    return 1;
+  } else if (inboxNotificationA.notifiedAt < inboxNotificationB.notifiedAt) {
+    return -1;
+  }
+  if (inboxNotificationA.readAt && inboxNotificationB.readAt) {
+    return inboxNotificationA.readAt > inboxNotificationB.readAt ? 1 : inboxNotificationA.readAt < inboxNotificationB.readAt ? -1 : 0;
+  } else if (inboxNotificationA.readAt || inboxNotificationB.readAt) {
+    return inboxNotificationA.readAt ? 1 : -1;
+  }
+  return 0;
+}
 
 // src/client.ts
 var MIN_THROTTLE = 16;
@@ -6982,7 +7115,10 @@ function createClient(options) {
         resolveMentionSuggestions: clientOptions.resolveMentionSuggestions,
         cacheStore,
         usersStore,
-        roomsInfoStore
+        roomsInfoStore,
+        getRoomIds() {
+          return Array.from(roomsById.keys());
+        }
       }
     },
     kInternal,