@liveblocks/core 2.17.0-channels1 → 2.17.0-usrnotsettings1

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.17.0-channels1";
+var PKG_VERSION = "2.17.0-usrnotsettings1";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -166,6 +166,14 @@ function wrapWithTitle(method) {
 var warnWithTitle = wrapWithTitle("warn");
 var errorWithTitle = wrapWithTitle("error");
 
+// src/lib/guards.ts
+function isPlainObject(blob) {
+  return blob !== null && typeof blob === "object" && Object.prototype.toString.call(blob) === "[object Object]";
+}
+function isStartsWithOperator(blob) {
+  return isPlainObject(blob) && typeof blob.startsWith === "string";
+}
+
 // src/lib/utils.ts
 function raise(msg) {
   throw new Error(msg);
@@ -257,13 +265,48 @@ function memoizeOnSuccess(factoryFn) {
 }
 
 // src/lib/autoRetry.ts
-var HttpError = class extends Error {
-  constructor(message, status, details) {
+var HttpError = class _HttpError extends Error {
+  response;
+  details;
+  constructor(message, response, details) {
     super(message);
-    this.message = message;
-    this.status = status;
+    this.name = "HttpError";
+    this.response = response;
     this.details = details;
   }
+  static async fromResponse(response) {
+    let bodyAsText;
+    try {
+      bodyAsText = await response.text();
+    } catch {
+    }
+    const bodyAsJson = bodyAsText ? tryParseJson(bodyAsText) : void 0;
+    let bodyAsJsonObject;
+    if (isPlainObject(bodyAsJson)) {
+      bodyAsJsonObject = bodyAsJson;
+    }
+    let message = "";
+    message ||= typeof bodyAsJsonObject?.message === "string" ? bodyAsJsonObject.message : "";
+    message ||= typeof bodyAsJsonObject?.error === "string" ? bodyAsJsonObject.error : "";
+    if (bodyAsJson === void 0) {
+      message ||= bodyAsText || "";
+    }
+    message ||= response.statusText;
+    let path;
+    try {
+      path = new URL(response.url).pathname;
+    } catch {
+    }
+    message += path !== void 0 ? ` (got status ${response.status} from ${path})` : ` (got status ${response.status})`;
+    const details = bodyAsJsonObject;
+    return new _HttpError(message, response, details);
+  }
+  /**
+   * Convenience accessor for response.status.
+   */
+  get status() {
+    return this.response.status;
+  }
 };
 var DONT_RETRY_4XX = (x) => x instanceof HttpError && x.status >= 400 && x.status < 500;
 async function autoRetry(promiseFn, maxTries, backoff, shouldStopRetrying = DONT_RETRY_4XX) {
@@ -329,7 +372,12 @@ function makeEventSource() {
     }).finally(() => unsub?.());
   }
   function notify(event) {
-    _observers.forEach((callback) => callback(event));
+    let called = false;
+    for (const callback of _observers) {
+      callback(event);
+      called = true;
+    }
+    return called;
   }
   function count() {
     return _observers.size;
@@ -370,8 +418,9 @@ function makeBufferableEventSource() {
   function notifyOrBuffer(event) {
     if (_buffer !== null) {
       _buffer.push(event);
+      return false;
     } else {
-      eventSource2.notify(event);
+      return eventSource2.notify(event);
     }
   }
   return {
@@ -676,32 +725,15 @@ var MutableSignal = class extends AbstractSignal {
 };
 
 // src/lib/stringify.ts
-var EXPLICIT_UNDEFINED_PLACEHOLDER = "_explicit_undefined";
 function replacer(_key, value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? Object.keys(value).sort().reduce((sorted, key) => {
     sorted[key] = value[key];
     return sorted;
-  }, {}) : value === void 0 ? EXPLICIT_UNDEFINED_PLACEHOLDER : value;
-}
-function reviver(key, value) {
-  if (!key && value === EXPLICIT_UNDEFINED_PLACEHOLDER) {
-    return void 0;
-  }
-  if (value && typeof value === "object") {
-    for (const k in value) {
-      if (value[k] === EXPLICIT_UNDEFINED_PLACEHOLDER) {
-        Object.defineProperty(value, k, { value: void 0 });
-      }
-    }
-  }
-  return value;
+  }, {}) : value;
 }
 function stringify(value) {
   return JSON.stringify(value, replacer);
 }
-function unstringify(value) {
-  return JSON.parse(value, reviver);
-}
 
 // src/lib/batch.ts
 var DEFAULT_SIZE = 50;
@@ -917,14 +949,6 @@ var DefaultMap = class extends Map {
   }
 };
 
-// src/lib/guards.ts
-function isPlainObject(blob) {
-  return blob !== null && typeof blob === "object" && Object.prototype.toString.call(blob) === "[object Object]";
-}
-function isStartsWithOperator(blob) {
-  return isPlainObject(blob) && typeof blob.startsWith === "string";
-}
-
 // src/lib/objectToQuery.ts
 var identifierRegex = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 function objectToQuery(obj) {
@@ -974,9 +998,7 @@ function objectToQuery(obj) {
       ...getFiltersFromKeyValuePairsWithOperator(nKeyValuePairsWithOperator)
     ];
   });
-  return filterList.map(
-    ({ key, operator, value }) => formatFilter(key, operator, formatFilterValue(value))
-  ).join(" AND ");
+  return filterList.map(({ key, operator, value }) => `${key}${operator}${quote(value)}`).join(" ");
 }
 var getFiltersFromKeyValuePairs = (keyValuePairs) => {
   const filters = [];
@@ -1003,29 +1025,27 @@ var getFiltersFromKeyValuePairsWithOperator = (keyValuePairsWithOperator) => {
   return filters;
 };
 var isSimpleValue = (value) => {
-  return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
-};
-var formatFilter = (key, operator, value) => {
-  return `${key}${operator}${value}`;
+  return typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null;
 };
 var formatFilterKey = (key, nestedKey) => {
   if (nestedKey) {
-    return `${key}[${JSON.stringify(nestedKey)}]`;
+    return `${key}[${quote(nestedKey)}]`;
   }
   return key;
 };
-var formatFilterValue = (value) => {
-  if (typeof value === "string") {
-    if (isStringEmpty(value)) {
-      throw new Error("Value cannot be empty");
-    }
-    return JSON.stringify(value);
-  }
-  return value.toString();
-};
 var isStringEmpty = (value) => {
   return !value || value.toString().trim() === "";
 };
+function quote(input) {
+  const result = JSON.stringify(input);
+  if (typeof input !== "string") {
+    return result;
+  }
+  if (result.includes("'")) {
+    return result;
+  }
+  return `'${result.slice(1, -1).replace(/\\"/g, '"')}'`;
+}
 
 // src/lib/url.ts
 function toURLSearchParams(params) {
@@ -1691,17 +1711,17 @@ function createApiClient({
       await authManager.getAuthValue({ requestedScope: "comments:read" })
     );
   }
-  async function getChannelsNotificationSettings(options) {
+  async function getUserNotificationSettings(options) {
     return httpClient.get(
-      url`/v2/c/channels-notification-settings`,
+      url`/v2/c/notification-settings`,
       await authManager.getAuthValue({ requestedScope: "comments:read" }),
       void 0,
       { signal: options?.signal }
     );
   }
-  async function updateChannelsNotificationSettings(settings) {
+  async function updateUserNotificationSettings(settings) {
     return httpClient.post(
-      url`/v2/c/channels-notification-settings`,
+      url`/v2/c/notification-settings`,
       await authManager.getAuthValue({ requestedScope: "comments:read" }),
       settings
     );
@@ -1768,12 +1788,10 @@ function createApiClient({
     removeReaction,
     markThreadAsResolved,
     markThreadAsUnresolved,
-    // Room notifications
     markRoomInboxNotificationAsRead,
-    updateNotificationSettings,
-    // Channel notification settings
+    // Room notifications
     getNotificationSettings,
-    updateChannelsNotificationSettings,
+    updateNotificationSettings,
     // Room text editor
     createTextMention,
     deleteTextMention,
@@ -1797,7 +1815,8 @@ function createApiClient({
     markInboxNotificationAsRead,
     deleteAllInboxNotifications,
     deleteInboxNotification,
-    getChannelsNotificationSettings,
+    getUserNotificationSettings,
+    updateUserNotificationSettings,
     // User threads
     getUserThreads_experimental,
     getUserThreadsSince_experimental
@@ -1868,14 +1887,7 @@ var HttpClient = class {
   async #fetch(endpoint, authValue, options, params) {
     const response = await this.#rawFetch(endpoint, authValue, options, params);
     if (!response.ok) {
-      let error3;
-      try {
-        const errorBody = await response.json();
-        error3 = new HttpError(errorBody.message, response.status, errorBody);
-      } catch {
-        error3 = new HttpError(response.statusText, response.status);
-      }
-      throw error3;
+      throw await HttpError.fromResponse(response);
     }
     let body;
     try {
@@ -2519,13 +2531,6 @@ var StopRetrying = class extends Error {
     super(reason);
   }
 };
-var LiveblocksError = class extends Error {
-  /** @internal */
-  constructor(message, code) {
-    super(message);
-    this.code = code;
-  }
-};
 function nextBackoffDelay(currentDelay, delays) {
   return delays.find((delay) => delay > currentDelay) ?? delays[delays.length - 1];
 }
@@ -2635,11 +2640,10 @@ var assign = (patch) => (ctx) => ctx.patch(patch);
 function createConnectionStateMachine(delegates, options) {
   const onMessage = makeBufferableEventSource();
   onMessage.pause();
-  const onLiveblocksError = makeEventSource();
-  function fireErrorEvent(errmsg, errcode) {
+  const onConnectionError = makeEventSource();
+  function fireErrorEvent(message, code) {
     return () => {
-      const err = new LiveblocksError(errmsg, errcode);
-      onLiveblocksError.notify(err);
+      onConnectionError.notify({ message, code });
     };
   }
   const initialContext = {
@@ -2997,7 +3001,7 @@ function createConnectionStateMachine(delegates, options) {
       didConnect,
       didDisconnect,
       onMessage: onMessage.observable,
-      onLiveblocksError: onLiveblocksError.observable
+      onConnectionError: onConnectionError.observable
     }
   };
 }
@@ -6261,6 +6265,83 @@ var ManagedOthers = class {
   }
 };
 
+// src/types/LiveblocksError.ts
+var LiveblocksError = class _LiveblocksError extends Error {
+  context;
+  constructor(message, context, cause) {
+    super(message, { cause });
+    this.context = context;
+    this.name = "LiveblocksError";
+  }
+  /** Convenience accessor for error.context.roomId (if available) */
+  get roomId() {
+    return this.context.roomId;
+  }
+  /** @deprecated Prefer using `context.code` instead, to enable type narrowing */
+  get code() {
+    return this.context.code;
+  }
+  /**
+   * Creates a LiveblocksError from a generic error, by attaching Liveblocks
+   * contextual information like room ID, thread ID, etc.
+   */
+  static from(context, cause) {
+    return new _LiveblocksError(
+      defaultMessageFromContext(context),
+      context,
+      cause
+    );
+  }
+};
+function defaultMessageFromContext(context) {
+  switch (context.type) {
+    case "ROOM_CONNECTION_ERROR": {
+      switch (context.code) {
+        case 4001:
+          return "Not allowed to connect to the room";
+        case 4005:
+          return "Room is already full";
+        case 4006:
+          return "Kicked out of the room, because the room ID changed";
+        default:
+          return "Could not connect to the room";
+      }
+    }
+    case "CREATE_THREAD_ERROR":
+      return "Could not create new thread";
+    case "DELETE_THREAD_ERROR":
+      return "Could not delete thread";
+    case "EDIT_THREAD_METADATA_ERROR":
+      return "Could not edit thread metadata";
+    case "MARK_THREAD_AS_RESOLVED_ERROR":
+      return "Could not mark thread as resolved";
+    case "MARK_THREAD_AS_UNRESOLVED_ERROR":
+      return "Could not mark thread as unresolved";
+    case "CREATE_COMMENT_ERROR":
+      return "Could not create new comment";
+    case "EDIT_COMMENT_ERROR":
+      return "Could not edit comment";
+    case "DELETE_COMMENT_ERROR":
+      return "Could not delete comment";
+    case "ADD_REACTION_ERROR":
+      return "Could not add reaction";
+    case "REMOVE_REACTION_ERROR":
+      return "Could not remove reaction";
+    case "MARK_INBOX_NOTIFICATION_AS_READ_ERROR":
+      return "Could not mark inbox notification as read";
+    case "DELETE_INBOX_NOTIFICATION_ERROR":
+      return "Could not delete inbox notification";
+    case "MARK_ALL_INBOX_NOTIFICATIONS_AS_READ_ERROR":
+      return "Could not mark all inbox notifications as read";
+    case "DELETE_ALL_INBOX_NOTIFICATIONS_ERROR":
+      return "Could not delete all inbox notifications";
+    case "UPDATE_NOTIFICATION_SETTINGS_ERROR":
+      return "Could not update notification settings";
+    default:
+      return assertNever(context, "Unhandled case");
+  }
+}
+
 // src/room.ts
 var MAX_SOCKET_MESSAGE_SIZE = 1024 * 1024 - 1024;
 function makeIdFactory(connectionId) {
@@ -6425,13 +6506,17 @@ function createRoom(options, config) {
   managedSocket.events.statusDidChange.subscribe(handleConnectionLossEvent);
   managedSocket.events.didConnect.subscribe(onDidConnect);
   managedSocket.events.didDisconnect.subscribe(onDidDisconnect);
-  managedSocket.events.onLiveblocksError.subscribe((err) => {
-    if (process.env.NODE_ENV !== "production") {
-      error2(
-        `Connection to websocket server closed. Reason: ${err.message} (code: ${err.code}).`
-      );
+  managedSocket.events.onConnectionError.subscribe(({ message, code }) => {
+    const type = "ROOM_CONNECTION_ERROR";
+    const err = new LiveblocksError(message, { type, code, roomId });
+    const didNotify = config.errorEventSource.notify(err);
+    if (!didNotify) {
+      if (process.env.NODE_ENV !== "production") {
+        error2(
+          `Connection to websocket server closed. Reason: ${message} (code: ${code}).`
+        );
+      }
     }
-    eventHub.error.notify(err);
   });
   const pool = {
     roomId: config.roomId,
@@ -6494,7 +6579,6 @@ function createRoom(options, config) {
     self: makeEventSource(),
     myPresence: makeEventSource(),
     others: makeEventSource(),
-    error: makeEventSource(),
     storageBatch: makeEventSource(),
     history: makeEventSource(),
     storageDidLoad: makeEventSource(),
@@ -7334,7 +7418,6 @@ ${Array.from(traces).join("\n\n")}`
     others: eventHub.others.observable,
     self: eventHub.self.observable,
     myPresence: eventHub.myPresence.observable,
-    error: eventHub.error.observable,
     /** @deprecated */
     storage: eventHub.storageBatch.observable,
     storageBatch: eventHub.storageBatch.observable,
@@ -7525,7 +7608,11 @@ ${Array.from(traces).join("\n\n")}`
         attachmentUrlsStore: httpClient.getOrCreateAttachmentUrlsStore(roomId)
       },
       id: config.roomId,
-      subscribe: makeClassicSubscribeFn(events),
+      subscribe: makeClassicSubscribeFn(
+        config.roomId,
+        events,
+        config.errorEventSource
+      ),
       connect: () => managedSocket.connect(),
       reconnect: () => managedSocket.reconnect(),
       disconnect: () => managedSocket.disconnect(),
@@ -7594,7 +7681,7 @@ ${Array.from(traces).join("\n\n")}`
     { enumerable: false }
   );
 }
-function makeClassicSubscribeFn(events) {
+function makeClassicSubscribeFn(roomId, events, errorEvents) {
   function subscribeToLiveStructureDeeply(node, callback) {
     return events.storageBatch.subscribe((updates) => {
       const relatedUpdates = updates.filter(
@@ -7634,8 +7721,13 @@ function makeClassicSubscribeFn(events) {
             return cb(others, internalEvent);
           });
         }
-        case "error":
-          return events.error.subscribe(callback);
+        case "error": {
+          return errorEvents.subscribe((err) => {
+            if (err.roomId === roomId) {
+              return callback(err);
+            }
+          });
+        }
         case "status":
           return events.status.subscribe(callback);
         case "lost-connection":
@@ -7807,6 +7899,7 @@ function createClient(options) {
         },
         enableDebugLogging: clientOptions.enableDebugLogging,
         baseUrl,
+        errorEventSource: liveblocksErrorSource,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData,
         roomHttpClient: httpClient,
@@ -7889,6 +7982,7 @@ function createClient(options) {
   }
   const syncStatusSources = [];
   const syncStatusSignal = new Signal("synchronized");
+  const liveblocksErrorSource = makeEventSource();
   function getSyncStatus() {
     const status = syncStatusSignal.get();
     return status === "synchronizing" ? status : "synchronized";
@@ -7941,8 +8035,8 @@ function createClient(options) {
       deleteAllInboxNotifications: httpClient.deleteAllInboxNotifications,
       deleteInboxNotification: httpClient.deleteInboxNotification,
       // Public channel notification settings API
-      getChannelsNotificationSettings: httpClient.getChannelsNotificationSettings,
-      updateChannelsNotificationSettings: httpClient.updateChannelsNotificationSettings,
+      getNotificationSettings: httpClient.getUserNotificationSettings,
+      updateNotificationSettings: httpClient.updateUserNotificationSettings,
       // Advanced resolvers APIs
       resolvers: {
         invalidateUsers: invalidateResolvedUsers,
@@ -7951,6 +8045,7 @@ function createClient(options) {
       },
       getSyncStatus,
       events: {
+        error: liveblocksErrorSource,
         syncStatus: syncStatusSignal
       },
       // Internal
@@ -7966,7 +8061,14 @@ function createClient(options) {
         httpClient,
         // Type-level helper only, it's effectively only an identity-function at runtime
         as: () => client,
-        createSyncSource
+        createSyncSource,
+        emitError: (context, cause) => {
+          const error3 = LiveblocksError.from(context, cause);
+          const didNotify = liveblocksErrorSource.notify(error3);
+          if (!didNotify) {
+            error2(error3.message);
+          }
+        }
       }
     },
     kInternal,
@@ -8802,6 +8904,7 @@ function makePoller(callback, intervalMs, options) {
   }
   doc?.addEventListener("visibilitychange", onVisibilityChange);
   win?.addEventListener("online", onVisibilityChange);
+  win?.addEventListener("focus", pollNowIfStale);
   fsm.start();
   return {
     inc,
@@ -8923,9 +9026,9 @@ var SortedList = class _SortedList {
   }
 };
 
-// src/protocol/ChannelsNotificationSettings.ts
-function isChannelNotificationSettingEnabled(setting) {
-  return values(setting).every((enabled) => enabled === true);
+// src/protocol/UserNotificationSettings.ts
+function isNotificationChannelEnabled(settings) {
+  return values(settings).every((enabled) => enabled === true);
 }
 
 // src/types/Others.ts
@@ -8949,6 +9052,7 @@ export {
   LiveList,
   LiveMap,
   LiveObject,
+  LiveblocksError,
   MutableSignal,
   NotificationsApiError,
   OpCode,
@@ -8989,7 +9093,6 @@ export {
   getMentionedIdsFromCommentBody,
   html,
   htmlSafe,
-  isChannelNotificationSettingEnabled,
   isChildCrdt,
   isCommentBodyLink,
   isCommentBodyMention,
@@ -8998,6 +9101,7 @@ export {
   isJsonObject,
   isJsonScalar,
   isLiveNode,
+  isNotificationChannelEnabled,
   isPlainObject,
   isRootCrdt,
   isStartsWithOperator,
@@ -9023,7 +9127,6 @@ export {
   toAbsoluteUrl,
   toPlainLson,
   tryParseJson,
-  unstringify,
   url,
   urljoin,
   wait,