@liveblocks/core 2.8.2 → 2.9.0-rc1

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.8.2";
+var PKG_VERSION = "2.9.0-rc1";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -2044,6 +2044,15 @@ function convertToInboxNotificationDeleteInfo(data) {
   };
 }
 
+// src/http-client.ts
+function getBearerTokenFromAuthValue(authValue) {
+  if (authValue.type === "public") {
+    return authValue.publicApiKey;
+  } else {
+    return authValue.token.raw;
+  }
+}
+
 // src/lib/url.ts
 function toURLSearchParams(params) {
   const result = new URLSearchParams();
@@ -2068,7 +2077,6 @@ function url(strings, ...values) {
 }
 
 // src/notifications.ts
-var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY = 50;
 function createNotificationsApi({
   baseUrl,
   authManager,
@@ -2091,7 +2099,7 @@ function createNotificationsApi({
       ...options,
       headers: {
         ...options?.headers,
-        Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`,
+        Authorization: `Bearer ${getBearerTokenFromAuthValue(authValue)}`,
         "X-LB-Client": PKG_VERSION || "dev"
       }
     });
@@ -2122,31 +2130,36 @@ function createNotificationsApi({
     }
     return body;
   }
-  async function getInboxNotifications() {
-    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {});
+  async function getInboxNotifications(options) {
+    const PAGE_SIZE = 50;
+    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {
+      cursor: options?.cursor,
+      limit: PAGE_SIZE
+    });
     return {
-      threads: json.threads.map(convertToThreadData),
       inboxNotifications: json.inboxNotifications.map(
         convertToInboxNotificationData
       ),
+      threads: json.threads.map(convertToThreadData),
+      nextCursor: json.meta.nextCursor,
       requestedAt: new Date(json.meta.requestedAt)
     };
   }
-  async function getInboxNotificationsSince(options) {
-    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {
-      since: options.since.toISOString()
+  async function getInboxNotificationsSince(since) {
+    const json = await fetchJson(url`/v2/c/inbox-notifications/delta`, void 0, {
+      since: since.toISOString()
     });
     return {
-      threads: {
-        updated: json.threads.map(convertToThreadData),
-        deleted: json.deletedThreads.map(convertToThreadDeleteInfo)
-      },
       inboxNotifications: {
         updated: json.inboxNotifications.map(convertToInboxNotificationData),
         deleted: json.deletedInboxNotifications.map(
           convertToInboxNotificationDeleteInfo
         )
       },
+      threads: {
+        updated: json.threads.map(convertToThreadData),
+        deleted: json.deletedThreads.map(convertToThreadDeleteInfo)
+      },
       requestedAt: new Date(json.meta.requestedAt)
     };
   }
@@ -2178,7 +2191,7 @@ function createNotificationsApi({
       await markInboxNotificationsAsRead(inboxNotificationIds);
       return inboxNotificationIds;
     },
-    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY }
+    { delay: 50 }
   );
   async function markInboxNotificationAsRead(inboxNotificationId) {
     await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
@@ -2193,30 +2206,29 @@ function createNotificationsApi({
       method: "DELETE"
     });
   }
-  async function getThreads(options) {
+  async function getUserThreads_experimental(options) {
     let query;
     if (options?.query) {
       query = objectToQuery(options.query);
     }
+    const PAGE_SIZE = 50;
     const json = await fetchJson(url`/v2/c/threads`, void 0, {
-      query
+      cursor: options.cursor,
+      query,
+      limit: PAGE_SIZE
     });
     return {
       threads: json.threads.map(convertToThreadData),
       inboxNotifications: json.inboxNotifications.map(
         convertToInboxNotificationData
       ),
+      nextCursor: json.meta.nextCursor,
       requestedAt: new Date(json.meta.requestedAt)
     };
   }
-  async function getThreadsSince(options) {
-    let query;
-    if (options?.query) {
-      query = objectToQuery(options.query);
-    }
+  async function getUserThreadsSince_experimental(options) {
     const json = await fetchJson(url`/v2/c/threads`, void 0, {
-      since: options.since.toISOString(),
-      query
+      since: options.since.toISOString()
     });
     return {
       threads: {
@@ -2240,8 +2252,8 @@ function createNotificationsApi({
     markInboxNotificationAsRead,
     deleteAllInboxNotifications,
     deleteInboxNotification,
-    getThreads,
-    getThreadsSince
+    getUserThreads_experimental,
+    getUserThreadsSince_experimental
   };
 }
 
@@ -4811,7 +4823,7 @@ async function autoRetry(promiseFn, maxTries, backoff, throwError) {
     try {
       return await promise;
     } catch (err) {
-      if (throwError?.(err)) {
+      if (throwError?.(err) || err instanceof StopRetrying2) {
         throw err;
       }
       if (attempt >= maxTries) {
@@ -4819,9 +4831,17 @@ async function autoRetry(promiseFn, maxTries, backoff, throwError) {
       }
     }
     const delay = backoff[attempt - 1] ?? fallbackBackoff;
+    warn(
+      `Attempt ${attempt} was unsuccessful. Retrying in ${delay} milliseconds.`
+    );
     await wait(delay);
   }
 }
+var StopRetrying2 = class extends Error {
+  constructor(reason) {
+    super(reason);
+  }
+};
 
 // src/lib/chunk.ts
 function chunk(array, size) {
@@ -5288,7 +5308,6 @@ var CommentsApiError = class extends Error {
     this.details = details;
   }
 };
-var MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 = 50;
 function createRoom(options, config) {
   const initialPresence = options.initialPresence;
   const initialStorage = options.initialStorage;
@@ -5353,7 +5372,7 @@ function createRoom(options, config) {
   function onStatusDidChange(newStatus) {
     const authValue = managedSocket.authValue;
     if (authValue !== null) {
-      const tokenKey = getAuthBearerHeaderFromAuthValue(authValue);
+      const tokenKey = getBearerTokenFromAuthValue(authValue);
       if (tokenKey !== lastTokenKey) {
         lastTokenKey = tokenKey;
         if (authValue.type === "secret") {
@@ -5518,7 +5537,7 @@ function createRoom(options, config) {
       ...options2,
       headers: {
         ...options2?.headers,
-        Authorization: `Bearer ${getAuthBearerHeaderFromAuthValue(authValue)}`,
+        Authorization: `Bearer ${getBearerTokenFromAuthValue(authValue)}`,
         "X-LB-Client": PKG_VERSION || "dev"
       }
     });
@@ -6477,9 +6496,7 @@ ${Array.from(traces).join("\n\n")}`
   async function getThreadsSince(options2) {
     const response = await fetchCommentsApi(
       url`/v2/c/rooms/${config.roomId}/threads`,
-      {
-        since: options2?.since?.toISOString()
-      },
+      { since: options2?.since?.toISOString() },
       {
         headers: {
           "Content-Type": "application/json"
@@ -6522,9 +6539,14 @@ ${Array.from(traces).join("\n\n")}`
     if (options2?.query) {
       query = objectToQuery(options2.query);
     }
+    const PAGE_SIZE = 50;
     const response = await fetchCommentsApi(
       url`/v2/c/rooms/${config.roomId}/threads`,
-      { query },
+      {
+        cursor: options2?.cursor,
+        query,
+        limit: PAGE_SIZE
+      },
       { headers: { "Content-Type": "application/json" } }
     );
     if (response.ok) {
@@ -6534,6 +6556,7 @@ ${Array.from(traces).join("\n\n")}`
         inboxNotifications: json.inboxNotifications.map(
           convertToInboxNotificationData
         ),
+        nextCursor: json.meta.nextCursor,
         requestedAt: new Date(json.meta.requestedAt)
       };
     } else if (response.status === 404) {
@@ -6542,6 +6565,7 @@ ${Array.from(traces).join("\n\n")}`
         inboxNotifications: [],
         deletedThreads: [],
         deletedInboxNotifications: [],
+        nextCursor: null,
         requestedAt: /* @__PURE__ */ new Date()
       };
     } else {
@@ -6924,7 +6948,7 @@ ${Array.from(traces).join("\n\n")}`
       await markInboxNotificationsAsRead(inboxNotificationIds);
       return inboxNotificationIds;
     },
-    { delay: MARK_INBOX_NOTIFICATIONS_AS_READ_BATCH_DELAY2 }
+    { delay: 50 }
   );
   async function markInboxNotificationAsRead(inboxNotificationId) {
     await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
@@ -7181,13 +7205,6 @@ function getBaseUrl(baseUrl) {
     return DEFAULT_BASE_URL;
   }
 }
-function getAuthBearerHeaderFromAuthValue(authValue) {
-  if (authValue.type === "public") {
-    return authValue.publicApiKey;
-  } else {
-    return authValue.token.raw;
-  }
-}
 function createClient(options) {
   const clientOptions = options;
   const throttleDelay = getThrottle(clientOptions.throttle ?? DEFAULT_THROTTLE);
@@ -7289,20 +7306,11 @@ function createClient(options) {
     }
   }
   const currentUserIdStore = createStore(null);
-  const {
-    getInboxNotifications,
-    getInboxNotificationsSince,
-    getUnreadInboxNotificationsCount,
-    markAllInboxNotificationsAsRead,
-    markInboxNotificationAsRead,
-    deleteAllInboxNotifications,
-    deleteInboxNotification,
-    getThreads,
-    getThreadsSince
-  } = createNotificationsApi({
+  const fetcher = clientOptions.polyfills?.fetch || /* istanbul ignore next */
+  fetch;
+  const httpClientLike = createNotificationsApi({
     baseUrl,
-    fetcher: clientOptions.polyfills?.fetch || /* istanbul ignore next */
-    fetch,
+    fetcher,
     authManager,
     currentUserIdStore
   });
@@ -7341,14 +7349,7 @@ function createClient(options) {
       enterRoom,
       getRoom,
       logout,
-      getInboxNotifications,
-      getInboxNotificationsSince,
-      getUnreadInboxNotificationsCount,
-      markAllInboxNotificationsAsRead,
-      markInboxNotificationAsRead,
-      deleteAllInboxNotifications,
-      deleteInboxNotification,
-      getThreads,
+      ...httpClientLike,
       // Internal
       [kInternal]: {
         currentUserIdStore,
@@ -7358,8 +7359,9 @@ function createClient(options) {
         getRoomIds() {
           return Array.from(roomsById.keys());
         },
-        getThreads,
-        getThreadsSince
+        // "All" threads (= "user" threads)
+        getUserThreads_experimental: httpClientLike.getUserThreads_experimental,
+        getUserThreadsSince_experimental: httpClientLike.getUserThreadsSince_experimental
       }
     },
     kInternal,
@@ -8093,69 +8095,26 @@ function errorIf(condition, message) {
 }
 
 // src/lib/Poller.ts
-function makePoller(callback) {
-  let context = {
-    state: "stopped",
-    timeoutHandle: null,
-    interval: null,
-    lastScheduledAt: null,
-    remainingInterval: null
-  };
+function makePoller(callback, interval) {
+  let context = { state: "stopped" };
   function poll() {
     if (context.state === "running") {
-      schedule(context.interval);
+      schedule();
     }
     void callback();
   }
-  function schedule(interval) {
+  function schedule() {
     context = {
       state: "running",
-      interval: context.state !== "stopped" ? context.interval : interval,
       lastScheduledAt: performance.now(),
-      timeoutHandle: setTimeout(poll, interval),
-      remainingInterval: null
+      timeoutHandle: setTimeout(poll, interval)
     };
   }
-  function scheduleRemaining(remaining) {
-    if (context.state !== "paused") {
-      return;
-    }
-    context = {
-      state: "running",
-      interval: context.interval,
-      lastScheduledAt: context.lastScheduledAt,
-      timeoutHandle: setTimeout(poll, remaining),
-      remainingInterval: null
-    };
-  }
-  function start(interval) {
+  function start() {
     if (context.state === "running") {
       return;
     }
-    schedule(interval);
-  }
-  function restart(interval) {
-    stop();
-    start(interval);
-  }
-  function pause() {
-    if (context.state !== "running") {
-      return;
-    }
-    clearTimeout(context.timeoutHandle);
-    context = {
-      state: "paused",
-      interval: context.interval,
-      lastScheduledAt: context.lastScheduledAt,
-      timeoutHandle: null,
-      remainingInterval: context.interval - (performance.now() - context.lastScheduledAt)
-    };
-  }
-  function resume() {
-    if (context.state !== "paused") {
-      return;
-    }
-    scheduleRemaining(context.remainingInterval);
+    schedule();
   }
   function stop() {
     if (context.state === "stopped") {
@@ -8164,20 +8123,17 @@ function makePoller(callback) {
     if (context.timeoutHandle) {
       clearTimeout(context.timeoutHandle);
     }
-    context = {
-      state: "stopped",
-      interval: null,
-      lastScheduledAt: null,
-      timeoutHandle: null,
-      remainingInterval: null
-    };
+    context = { state: "stopped" };
+  }
+  function enable(condition) {
+    if (condition) {
+      start();
+    } else {
+      stop();
+    }
   }
   return {
-    start,
-    restart,
-    pause,
-    resume,
-    stop
+    enable
   };
 }
 
@@ -8232,6 +8188,7 @@ export {
   NotificationsApiError,
   OpCode,
   ServerMsgCode,
+  StopRetrying2 as StopRetrying,
   WebsocketCloseCodes,
   ackOp,
   asPos,