@liveblocks/core 2.15.1 → 2.16.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.15.1";
+var PKG_VERSION = "2.16.0-rc1";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -166,13 +166,18 @@ 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);
 }
-function isPlainObject(blob) {
-  return blob !== null && typeof blob === "object" && Object.prototype.toString.call(blob) === "[object Object]";
-}
 function entries(obj) {
   return Object.entries(obj);
 }
@@ -254,13 +259,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) {
@@ -326,7 +366,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;
@@ -367,8 +412,9 @@ function makeBufferableEventSource() {
   function notifyOrBuffer(event) {
     if (_buffer !== null) {
       _buffer.push(event);
+      return false;
     } else {
-      eventSource2.notify(event);
+      return eventSource2.notify(event);
     }
   }
   return {
@@ -385,164 +431,448 @@ function makeBufferableEventSource() {
   };
 }
 
-// src/lib/stringify.ts
-function stringify(object, ...args) {
-  if (typeof object !== "object" || object === null || Array.isArray(object)) {
-    return JSON.stringify(object, ...args);
-  }
-  const sortedObject = Object.keys(object).sort().reduce(
-    (sortedObject2, key) => {
-      sortedObject2[key] = object[key];
-      return sortedObject2;
-    },
-    {}
-  );
-  return JSON.stringify(sortedObject, ...args);
-}
+// src/lib/freeze.ts
+var freeze = process.env.NODE_ENV === "production" ? (
+  /* istanbul ignore next */
+  (x) => x
+) : Object.freeze;
 
-// src/lib/batch.ts
-var DEFAULT_SIZE = 50;
-var BatchCall = class {
-  input;
-  resolve;
-  reject;
-  promise;
-  constructor(input) {
-    this.input = input;
-    const { promise, resolve, reject } = Promise_withResolvers();
-    this.promise = promise;
-    this.resolve = resolve;
-    this.reject = reject;
+// src/lib/signals.ts
+var kSinks = Symbol("kSinks");
+var kTrigger = Symbol("kTrigger");
+var signalsToTrigger = null;
+var trackedReads = null;
+function batch(callback) {
+  if (signalsToTrigger !== null) {
+    callback();
+    return;
   }
-};
-var Batch = class {
-  #queue = [];
-  #callback;
-  #size;
-  #delay;
-  #delayTimeoutId;
-  error = false;
-  constructor(callback, options) {
-    this.#callback = callback;
-    this.#size = options.size ?? DEFAULT_SIZE;
-    this.#delay = options.delay;
+  signalsToTrigger = /* @__PURE__ */ new Set();
+  try {
+    callback();
+  } finally {
+    for (const signal of signalsToTrigger) {
+      signal[kTrigger]();
+    }
+    signalsToTrigger = null;
   }
-  #clearDelayTimeout() {
-    if (this.#delayTimeoutId !== void 0) {
-      clearTimeout(this.#delayTimeoutId);
-      this.#delayTimeoutId = void 0;
+}
+function enqueueTrigger(signal) {
+  if (!signalsToTrigger) raise("Expected to be in an active batch");
+  signalsToTrigger.add(signal);
+}
+function merge(target, patch) {
+  let updated = false;
+  const newValue = { ...target };
+  Object.keys(patch).forEach((k) => {
+    const key = k;
+    const val = patch[key];
+    if (newValue[key] !== val) {
+      if (val === void 0) {
+        delete newValue[key];
+      } else {
+        newValue[key] = val;
+      }
+      updated = true;
     }
+  });
+  return updated ? newValue : target;
+}
+var AbstractSignal = class {
+  /** @internal */
+  equals;
+  #eventSource;
+  /** @internal */
+  [kSinks];
+  constructor(equals) {
+    this.equals = equals ?? Object.is;
+    this.#eventSource = makeEventSource();
+    this[kSinks] = /* @__PURE__ */ new Set();
+    this.get = this.get.bind(this);
+    this.subscribe = this.subscribe.bind(this);
+    this.subscribeOnce = this.subscribeOnce.bind(this);
   }
-  #schedule() {
-    if (this.#queue.length === this.#size) {
-      void this.#flush();
-    } else if (this.#queue.length === 1) {
-      this.#clearDelayTimeout();
-      this.#delayTimeoutId = setTimeout(() => void this.#flush(), this.#delay);
+  [Symbol.dispose]() {
+    this.#eventSource[Symbol.dispose]();
+    this.#eventSource = "(disposed)";
+    this.equals = "(disposed)";
+  }
+  get hasWatchers() {
+    if (this.#eventSource.count() > 0) return true;
+    for (const sink of this[kSinks]) {
+      if (sink.hasWatchers) {
+        return true;
+      }
     }
+    return false;
   }
-  async #flush() {
-    if (this.#queue.length === 0) {
-      return;
+  [kTrigger]() {
+    this.#eventSource.notify();
+    for (const sink of this[kSinks]) {
+      enqueueTrigger(sink);
     }
-    const calls = this.#queue.splice(0);
-    const inputs = calls.map((call) => call.input);
-    try {
-      const results = await this.#callback(inputs);
-      this.error = false;
-      calls.forEach((call, index) => {
-        const result = results?.[index];
-        if (!Array.isArray(results)) {
-          call.reject(new Error("Callback must return an array."));
-        } else if (calls.length !== results.length) {
-          call.reject(
-            new Error(
-              `Callback must return an array of the same length as the number of provided items. Expected ${calls.length}, but got ${results.length}.`
-            )
-          );
-        } else if (result instanceof Error) {
-          call.reject(result);
-        } else {
-          call.resolve(result);
-        }
-      });
-    } catch (error3) {
-      this.error = true;
-      calls.forEach((call) => {
-        call.reject(error3);
-      });
+  }
+  subscribe(callback) {
+    if (this.#eventSource.count() === 0) {
+      this.get();
     }
+    return this.#eventSource.subscribe(callback);
   }
-  get(input) {
-    const existingCall = this.#queue.find(
-      (call2) => stringify(call2.input) === stringify(input)
-    );
-    if (existingCall) {
-      return existingCall.promise;
+  subscribeOnce(callback) {
+    const unsub = this.subscribe(() => {
+      unsub();
+      return callback();
+    });
+    return unsub;
+  }
+  waitUntil() {
+    throw new Error("waitUntil not supported on Signals");
+  }
+  markSinksDirty() {
+    for (const sink of this[kSinks]) {
+      sink.markDirty();
     }
-    const call = new BatchCall(input);
-    this.#queue.push(call);
-    this.#schedule();
-    return call.promise;
   }
-  clear() {
-    this.#queue = [];
-    this.error = false;
-    this.#clearDelayTimeout();
+  addSink(sink) {
+    this[kSinks].add(sink);
+  }
+  removeSink(sink) {
+    this[kSinks].delete(sink);
+  }
+  asReadonly() {
+    return this;
   }
 };
-function createBatchStore(batch2) {
-  const cache = /* @__PURE__ */ new Map();
-  const eventSource2 = makeEventSource();
-  function getCacheKey(args) {
-    return stringify(args);
+var Signal = class extends AbstractSignal {
+  #value;
+  constructor(value, equals) {
+    super(equals);
+    this.#value = freeze(value);
   }
-  function setStateAndNotify(cacheKey, state) {
-    cache.set(cacheKey, state);
-    eventSource2.notify();
+  [Symbol.dispose]() {
+    super[Symbol.dispose]();
+    this.#value = "(disposed)";
   }
-  function invalidate(inputs) {
-    if (Array.isArray(inputs)) {
-      for (const input of inputs) {
-        cache.delete(getCacheKey(input));
-      }
-    } else {
-      cache.clear();
-    }
-    eventSource2.notify();
+  get() {
+    trackedReads?.add(this);
+    return this.#value;
   }
-  async function get(input) {
-    const cacheKey = getCacheKey(input);
-    if (cache.has(cacheKey)) {
-      return;
-    }
-    try {
-      setStateAndNotify(cacheKey, { isLoading: true });
-      const result = await batch2.get(input);
-      setStateAndNotify(cacheKey, { isLoading: false, data: result });
-    } catch (error3) {
-      setStateAndNotify(cacheKey, {
-        isLoading: false,
-        error: error3
-      });
-    }
+  set(newValue) {
+    batch(() => {
+      if (typeof newValue === "function") {
+        newValue = newValue(this.#value);
+      }
+      if (!this.equals(this.#value, newValue)) {
+        this.#value = freeze(newValue);
+        this.markSinksDirty();
+        enqueueTrigger(this);
+      }
+    });
   }
-  function getState(input) {
-    const cacheKey = getCacheKey(input);
-    return cache.get(cacheKey);
+};
+var PatchableSignal = class extends Signal {
+  constructor(data) {
+    super(freeze(compactObject(data)));
   }
-  function _cacheKeys() {
-    return [...cache.keys()];
+  set() {
+    throw new Error("Don't call .set() directly, use .patch()");
   }
-  function getBatch() {
-    return batch2;
+  /**
+   * Patches the current object.
+   */
+  patch(patch) {
+    super.set((old) => merge(old, patch));
   }
-  return {
-    ...eventSource2.observable,
-    get,
-    getState,
+};
+var INITIAL = Symbol();
+var DerivedSignal = class _DerivedSignal extends AbstractSignal {
+  #prevValue;
+  #dirty;
+  // When true, the value in #value may not be up-to-date and needs re-checking
+  #sources;
+  #deps;
+  #transform;
+  // prettier-ignore
+  static from(...args) {
+    const last = args.pop();
+    if (typeof last !== "function")
+      raise("Invalid .from() call, last argument expected to be a function");
+    if (typeof args[args.length - 1] === "function") {
+      const equals = last;
+      const transform = args.pop();
+      return new _DerivedSignal(args, transform, equals);
+    } else {
+      const transform = last;
+      return new _DerivedSignal(args, transform);
+    }
+  }
+  constructor(deps, transform, equals) {
+    super(equals);
+    this.#dirty = true;
+    this.#prevValue = INITIAL;
+    this.#deps = deps;
+    this.#sources = /* @__PURE__ */ new Set();
+    this.#transform = transform;
+  }
+  [Symbol.dispose]() {
+    for (const src of this.#sources) {
+      src.removeSink(this);
+    }
+    this.#prevValue = "(disposed)";
+    this.#sources = "(disposed)";
+    this.#deps = "(disposed)";
+    this.#transform = "(disposed)";
+  }
+  get isDirty() {
+    return this.#dirty;
+  }
+  #recompute() {
+    const oldTrackedReads = trackedReads;
+    let derived;
+    trackedReads = /* @__PURE__ */ new Set();
+    try {
+      derived = this.#transform(...this.#deps.map((p) => p.get()));
+    } finally {
+      const oldSources = this.#sources;
+      this.#sources = /* @__PURE__ */ new Set();
+      for (const sig of trackedReads) {
+        this.#sources.add(sig);
+        oldSources.delete(sig);
+      }
+      for (const oldSource of oldSources) {
+        oldSource.removeSink(this);
+      }
+      for (const newSource of this.#sources) {
+        newSource.addSink(this);
+      }
+      trackedReads = oldTrackedReads;
+    }
+    this.#dirty = false;
+    if (!this.equals(this.#prevValue, derived)) {
+      this.#prevValue = derived;
+      return true;
+    }
+    return false;
+  }
+  markDirty() {
+    if (!this.#dirty) {
+      this.#dirty = true;
+      this.markSinksDirty();
+    }
+  }
+  get() {
+    if (this.#dirty) {
+      this.#recompute();
+    }
+    trackedReads?.add(this);
+    return this.#prevValue;
+  }
+  /**
+   * Called by the Signal system if one or more of the dependent signals have
+   * changed. In the case of a DerivedSignal, we'll only want to re-evaluate
+   * the actual value if it's being watched, or any of their sinks are being
+   * watched actively.
+   */
+  [kTrigger]() {
+    if (!this.hasWatchers) {
+      return;
+    }
+    const updated = this.#recompute();
+    if (updated) {
+      super[kTrigger]();
+    }
+  }
+};
+var MutableSignal = class extends AbstractSignal {
+  #state;
+  constructor(initialState) {
+    super();
+    this.#state = initialState;
+  }
+  [Symbol.dispose]() {
+    super[Symbol.dispose]();
+    this.#state = "(disposed)";
+  }
+  get() {
+    trackedReads?.add(this);
+    return this.#state;
+  }
+  /**
+   * Invokes a callback function that is allowed to mutate the given state
+   * value. Do not change the value outside of the callback.
+   *
+   * If the callback explicitly returns `false`, it's assumed that the state
+   * was not changed.
+   */
+  mutate(callback) {
+    batch(() => {
+      const result = callback ? callback(this.#state) : true;
+      if (result !== null && typeof result === "object" && "then" in result) {
+        raise("MutableSignal.mutate() does not support async callbacks");
+      }
+      if (result !== false) {
+        this.markSinksDirty();
+        enqueueTrigger(this);
+      }
+    });
+  }
+};
+
+// src/lib/stringify.ts
+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;
+}
+function stringify(value) {
+  return JSON.stringify(value, replacer);
+}
+
+// src/lib/batch.ts
+var DEFAULT_SIZE = 50;
+var BatchCall = class {
+  input;
+  resolve;
+  reject;
+  promise;
+  constructor(input) {
+    this.input = input;
+    const { promise, resolve, reject } = Promise_withResolvers();
+    this.promise = promise;
+    this.resolve = resolve;
+    this.reject = reject;
+  }
+};
+var Batch = class {
+  #queue = [];
+  #callback;
+  #size;
+  #delay;
+  #delayTimeoutId;
+  error = false;
+  constructor(callback, options) {
+    this.#callback = callback;
+    this.#size = options.size ?? DEFAULT_SIZE;
+    this.#delay = options.delay;
+  }
+  #clearDelayTimeout() {
+    if (this.#delayTimeoutId !== void 0) {
+      clearTimeout(this.#delayTimeoutId);
+      this.#delayTimeoutId = void 0;
+    }
+  }
+  #schedule() {
+    if (this.#queue.length === this.#size) {
+      void this.#flush();
+    } else if (this.#queue.length === 1) {
+      this.#clearDelayTimeout();
+      this.#delayTimeoutId = setTimeout(() => void this.#flush(), this.#delay);
+    }
+  }
+  async #flush() {
+    if (this.#queue.length === 0) {
+      return;
+    }
+    const calls = this.#queue.splice(0);
+    const inputs = calls.map((call) => call.input);
+    try {
+      const results = await this.#callback(inputs);
+      this.error = false;
+      calls.forEach((call, index) => {
+        const result = results?.[index];
+        if (!Array.isArray(results)) {
+          call.reject(new Error("Callback must return an array."));
+        } else if (calls.length !== results.length) {
+          call.reject(
+            new Error(
+              `Callback must return an array of the same length as the number of provided items. Expected ${calls.length}, but got ${results.length}.`
+            )
+          );
+        } else if (result instanceof Error) {
+          call.reject(result);
+        } else {
+          call.resolve(result);
+        }
+      });
+    } catch (error3) {
+      this.error = true;
+      calls.forEach((call) => {
+        call.reject(error3);
+      });
+    }
+  }
+  get(input) {
+    const existingCall = this.#queue.find(
+      (call2) => stringify(call2.input) === stringify(input)
+    );
+    if (existingCall) {
+      return existingCall.promise;
+    }
+    const call = new BatchCall(input);
+    this.#queue.push(call);
+    this.#schedule();
+    return call.promise;
+  }
+  clear() {
+    this.#queue = [];
+    this.error = false;
+    this.#clearDelayTimeout();
+  }
+};
+function createBatchStore(batch2) {
+  const signal = new MutableSignal(/* @__PURE__ */ new Map());
+  function getCacheKey(args) {
+    return stringify(args);
+  }
+  function update(cacheKey, state) {
+    signal.mutate((cache) => {
+      cache.set(cacheKey, state);
+    });
+  }
+  function invalidate(inputs) {
+    signal.mutate((cache) => {
+      if (Array.isArray(inputs)) {
+        for (const input of inputs) {
+          cache.delete(getCacheKey(input));
+        }
+      } else {
+        cache.clear();
+      }
+    });
+  }
+  async function enqueue(input) {
+    const cacheKey = getCacheKey(input);
+    const cache = signal.get();
+    if (cache.has(cacheKey)) {
+      return;
+    }
+    try {
+      update(cacheKey, { isLoading: true });
+      const result = await batch2.get(input);
+      update(cacheKey, { isLoading: false, data: result });
+    } catch (error3) {
+      update(cacheKey, {
+        isLoading: false,
+        error: error3
+      });
+    }
+  }
+  function getItemState(input) {
+    const cacheKey = getCacheKey(input);
+    const cache = signal.get();
+    return cache.get(cacheKey);
+  }
+  function _cacheKeys() {
+    const cache = signal.get();
+    return [...cache.keys()];
+  }
+  return {
+    subscribe: signal.subscribe,
+    enqueue,
+    getItemState,
     invalidate,
-    getBatch,
+    batch: batch2,
     _cacheKeys
   };
 }
@@ -583,6 +913,36 @@ function createInboxNotificationId() {
   return createOptimisticId(INBOX_NOTIFICATION_ID_PREFIX);
 }
 
+// src/lib/DefaultMap.ts
+var DefaultMap = class extends Map {
+  #defaultFn;
+  /**
+   * If the default function is not provided to the constructor, it has to be
+   * provided in each .getOrCreate() call individually.
+   */
+  constructor(defaultFn, entries2) {
+    super(entries2);
+    this.#defaultFn = defaultFn;
+  }
+  /**
+   * Gets the value at the given key, or creates it.
+   *
+   * Difference from normal Map: if the key does not exist, it will be created
+   * on the fly using the factory function, and that value will get returned
+   * instead of `undefined`.
+   */
+  getOrCreate(key, defaultFn) {
+    if (super.has(key)) {
+      return super.get(key);
+    } else {
+      const fn = defaultFn ?? this.#defaultFn ?? raise("DefaultMap used without a factory function");
+      const value = fn(key);
+      this.set(key, value);
+      return value;
+    }
+  }
+};
+
 // src/lib/objectToQuery.ts
 var identifierRegex = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 function objectToQuery(obj) {
@@ -597,10 +957,12 @@ function objectToQuery(obj) {
     }
     if (isSimpleValue(value)) {
       keyValuePairs.push([key, value]);
-    } else if (isValueWithOperator(value)) {
-      keyValuePairsWithOperator.push([key, value]);
-    } else if (typeof value === "object" && !("startsWith" in value)) {
-      indexedKeys.push([key, value]);
+    } else if (isPlainObject(value)) {
+      if (isStartsWithOperator(value)) {
+        keyValuePairsWithOperator.push([key, value]);
+      } else {
+        indexedKeys.push([key, value]);
+      }
     }
   });
   filterList = [
@@ -617,7 +979,7 @@ function objectToQuery(obj) {
       }
       if (isSimpleValue(nestedValue)) {
         nKeyValuePairs.push([formatFilterKey(key, nestedKey), nestedValue]);
-      } else if (isValueWithOperator(nestedValue)) {
+      } else if (isStartsWithOperator(nestedValue)) {
         nKeyValuePairsWithOperator.push([
           formatFilterKey(key, nestedKey),
           nestedValue
@@ -630,9 +992,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 = [];
@@ -659,38 +1019,20 @@ var getFiltersFromKeyValuePairsWithOperator = (keyValuePairsWithOperator) => {
   return filters;
 };
 var isSimpleValue = (value) => {
-  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-    return true;
-  }
-  return false;
+  return typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null;
 };
-var isValueWithOperator = (value) => {
-  if (typeof value === "object" && value !== null && "startsWith" in value) {
-    return true;
-  }
-  return false;
-};
-var formatFilter = (key, operator, value) => {
-  return `${key}${operator}${value}`;
-};
-var formatFilterKey = (key, nestedKey) => {
-  if (nestedKey) {
-    return `${key}[${JSON.stringify(nestedKey)}]`;
+var formatFilterKey = (key, nestedKey) => {
+  if (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(value) {
+  return typeof value !== "string" || value.includes("'") ? JSON.stringify(value) : `'${value}'`;
+}
 
 // src/lib/url.ts
 function toURLSearchParams(params) {
@@ -1083,40 +1425,31 @@ function createApiClient({
       }
     }
   }
-  const getAttachmentUrlsBatchStoreByRoom = /* @__PURE__ */ new Map();
+  const attachmentUrlsBatchStoresByRoom = new DefaultMap((roomId) => {
+    const batch2 = new Batch(
+      async (batchedAttachmentIds) => {
+        const attachmentIds = batchedAttachmentIds.flat();
+        const { urls } = await httpClient.post(
+          url`/v2/c/rooms/${roomId}/attachments/presigned-urls`,
+          await authManager.getAuthValue({
+            requestedScope: "comments:read",
+            roomId
+          }),
+          { attachmentIds }
+        );
+        return urls.map(
+          (url2) => url2 ?? new Error("There was an error while getting this attachment's URL")
+        );
+      },
+      { delay: 50 }
+    );
+    return createBatchStore(batch2);
+  });
   function getOrCreateAttachmentUrlsStore(roomId) {
-    let store = getAttachmentUrlsBatchStoreByRoom.get(roomId);
-    if (store === void 0) {
-      const batch2 = new Batch(
-        async (batchedAttachmentIds) => {
-          const attachmentIds = batchedAttachmentIds.flat();
-          const { urls } = await httpClient.post(
-            url`/v2/c/rooms/${roomId}/attachments/presigned-urls`,
-            await authManager.getAuthValue({
-              requestedScope: "comments:read",
-              roomId
-            }),
-            {
-              attachmentIds
-            }
-          );
-          return urls.map(
-            (url2) => url2 ?? new Error(
-              "There was an error while getting this attachment's URL"
-            )
-          );
-        },
-        {
-          delay: 50
-        }
-      );
-      store = createBatchStore(batch2);
-      getAttachmentUrlsBatchStoreByRoom.set(roomId, store);
-    }
-    return store;
+    return attachmentUrlsBatchStoresByRoom.getOrCreate(roomId);
   }
   function getAttachmentUrl(options) {
-    const batch2 = getOrCreateAttachmentUrlsStore(options.roomId).getBatch();
+    const batch2 = getOrCreateAttachmentUrlsStore(options.roomId).batch;
     return batch2.get(options.attachmentId);
   }
   async function getNotificationSettings(options) {
@@ -1142,33 +1475,25 @@ function createApiClient({
       options.settings
     );
   }
-  const markInboxNotificationsAsReadBatchByRoom = /* @__PURE__ */ new Map();
-  function getOrCreateMarkInboxNotificationsAsReadBatch(roomId) {
-    let batch2 = markInboxNotificationsAsReadBatchByRoom.get(roomId);
-    if (batch2 === void 0) {
-      batch2 = new Batch(
-        async (batchedInboxNotificationIds) => {
-          const inboxNotificationIds = batchedInboxNotificationIds.flat();
-          await httpClient.post(
-            url`/v2/c/rooms/${roomId}/inbox-notifications/read`,
-            await authManager.getAuthValue({
-              requestedScope: "comments:read",
-              roomId
-            }),
-            { inboxNotificationIds }
-          );
-          return inboxNotificationIds;
-        },
-        {
-          delay: 50
-        }
-      );
-      markInboxNotificationsAsReadBatchByRoom.set(roomId, batch2);
-    }
-    return batch2;
-  }
+  const markAsReadBatchesByRoom = new DefaultMap(
+    (roomId) => new Batch(
+      async (batchedInboxNotificationIds) => {
+        const inboxNotificationIds = batchedInboxNotificationIds.flat();
+        await httpClient.post(
+          url`/v2/c/rooms/${roomId}/inbox-notifications/read`,
+          await authManager.getAuthValue({
+            requestedScope: "comments:read",
+            roomId
+          }),
+          { inboxNotificationIds }
+        );
+        return inboxNotificationIds;
+      },
+      { delay: 50 }
+    )
+  );
   async function markRoomInboxNotificationAsRead(options) {
-    const batch2 = getOrCreateMarkInboxNotificationsAsReadBatch(options.roomId);
+    const batch2 = markAsReadBatchesByRoom.getOrCreate(options.roomId);
     return batch2.get(options.inboxNotificationId);
   }
   async function createTextMention(options) {
@@ -1532,14 +1857,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 {
@@ -2166,6 +2484,7 @@ function toNewConnectionStatus(machine) {
       return machine.context.successCount > 0 ? "reconnecting" : "connecting";
     case "@idle.failed":
       return "disconnected";
+    // istanbul ignore next
     default:
       return assertNever(state, "Unknown state");
   }
@@ -2182,13 +2501,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];
 }
@@ -2298,11 +2610,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 = {
@@ -2660,7 +2971,7 @@ function createConnectionStateMachine(delegates, options) {
       didConnect,
       didDisconnect,
       onMessage: onMessage.observable,
-      onLiveblocksError: onLiveblocksError.observable
+      onConnectionError: onConnectionError.observable
     }
   };
 }
@@ -3022,458 +3333,205 @@ function sendToPanel(message, options) {
   }
   window.postMessage(fullMsg, "*");
 }
-var eventSource = makeEventSource();
-if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
-  window.addEventListener("message", (event) => {
-    if (event.source === window && event.data?.source === "liveblocks-devtools-panel") {
-      eventSource.notify(event.data);
-    } else {
-    }
-  });
-}
-var onMessageFromPanel = eventSource.observable;
-
-// src/devtools/index.ts
-var VERSION = PKG_VERSION || "dev";
-var _devtoolsSetupHasRun = false;
-function setupDevTools(getAllRooms) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
-  }
-  if (_devtoolsSetupHasRun) {
-    return;
-  }
-  _devtoolsSetupHasRun = true;
-  onMessageFromPanel.subscribe((msg) => {
-    switch (msg.msg) {
-      case "connect": {
-        activateBridge(true);
-        for (const roomId of getAllRooms()) {
-          sendToPanel({
-            msg: "room::available",
-            roomId,
-            clientVersion: VERSION
-          });
-        }
-        break;
-      }
-    }
-  });
-  sendToPanel({ msg: "wake-up-devtools" }, { force: true });
-}
-var unsubsByRoomId = /* @__PURE__ */ new Map();
-function stopSyncStream(roomId) {
-  const unsubs = unsubsByRoomId.get(roomId) ?? [];
-  unsubsByRoomId.delete(roomId);
-  for (const unsub of unsubs) {
-    unsub();
-  }
-}
-function startSyncStream(room) {
-  stopSyncStream(room.id);
-  fullSync(room);
-  unsubsByRoomId.set(room.id, [
-    // When the connection status changes
-    room.events.status.subscribe(() => partialSyncConnection(room)),
-    // When storage initializes, send the update
-    room.events.storageDidLoad.subscribeOnce(() => partialSyncStorage(room)),
-    // Any time storage updates, send the new storage root
-    room.events.storageBatch.subscribe(() => partialSyncStorage(room)),
-    // Any time "me" or "others" updates, send the new values accordingly
-    room.events.self.subscribe(() => partialSyncMe(room)),
-    room.events.others.subscribe(() => partialSyncOthers(room)),
-    // Any time ydoc is updated, forward the update
-    room.events.ydoc.subscribe((update) => syncYdocUpdate(room, update)),
-    // Any time a custom room event is received, forward it
-    room.events.customEvent.subscribe(
-      (eventData) => forwardEvent(room, eventData)
-    )
-  ]);
-}
-function syncYdocUpdate(room, update) {
-  sendToPanel({
-    msg: "room::sync::ydoc",
-    roomId: room.id,
-    update
-  });
-}
-var loadedAt = Date.now();
-var eventCounter = 0;
-function nextEventId() {
-  return `event-${loadedAt}-${eventCounter++}`;
-}
-function forwardEvent(room, eventData) {
-  sendToPanel({
-    msg: "room::events::custom-event",
-    roomId: room.id,
-    event: {
-      type: "CustomEvent",
-      id: nextEventId(),
-      key: "Event",
-      connectionId: eventData.connectionId,
-      payload: eventData.event
-    }
-  });
-}
-function partialSyncConnection(room) {
-  sendToPanel({
-    msg: "room::sync::partial",
-    roomId: room.id,
-    status: room.getStatus()
-  });
-}
-function partialSyncStorage(room) {
-  const root = room.getStorageSnapshot();
-  if (root) {
-    sendToPanel({
-      msg: "room::sync::partial",
-      roomId: room.id,
-      storage: root.toTreeNode("root").payload
-    });
-  }
-}
-function partialSyncMe(room) {
-  const me = room[kInternal].getSelf_forDevTools();
-  if (me) {
-    sendToPanel({
-      msg: "room::sync::partial",
-      roomId: room.id,
-      me
-    });
-  }
-}
-function partialSyncOthers(room) {
-  const others = room[kInternal].getOthers_forDevTools();
-  if (others) {
-    sendToPanel({
-      msg: "room::sync::partial",
-      roomId: room.id,
-      others
-    });
-  }
-}
-function fullSync(room) {
-  const root = room.getStorageSnapshot();
-  const me = room[kInternal].getSelf_forDevTools();
-  const others = room[kInternal].getOthers_forDevTools();
-  room.fetchYDoc("");
-  sendToPanel({
-    msg: "room::sync::full",
-    roomId: room.id,
-    status: room.getStatus(),
-    storage: root?.toTreeNode("root").payload ?? null,
-    me,
-    others
-  });
-}
-var roomChannelListeners = /* @__PURE__ */ new Map();
-function stopRoomChannelListener(roomId) {
-  const listener = roomChannelListeners.get(roomId);
-  roomChannelListeners.delete(roomId);
-  if (listener) {
-    listener();
-  }
-}
-function linkDevTools(roomId, room) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
-  }
-  sendToPanel({ msg: "room::available", roomId, clientVersion: VERSION });
-  stopRoomChannelListener(roomId);
-  roomChannelListeners.set(
-    roomId,
-    // Returns the unsubscribe callback, that we store in the
-    // roomChannelListeners registry
-    onMessageFromPanel.subscribe((msg) => {
-      switch (msg.msg) {
-        case "room::subscribe": {
-          if (msg.roomId === roomId) {
-            startSyncStream(room);
-          }
-          break;
-        }
-        case "room::unsubscribe": {
-          if (msg.roomId === roomId) {
-            stopSyncStream(roomId);
-          }
-          break;
-        }
-      }
-    })
-  );
-}
-function unlinkDevTools(roomId) {
-  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
-    return;
-  }
-  stopSyncStream(roomId);
-  stopRoomChannelListener(roomId);
-  sendToPanel({
-    msg: "room::unavailable",
-    roomId
-  });
-}
-
-// src/lib/freeze.ts
-var freeze = process.env.NODE_ENV === "production" ? (
-  /* istanbul ignore next */
-  (x) => x
-) : Object.freeze;
-
-// src/lib/signals.ts
-var kSinks = Symbol("kSinks");
-var kTrigger = Symbol("kTrigger");
-var signalsToTrigger = null;
-function batch(callback) {
-  if (signalsToTrigger !== null) {
-    callback();
-    return;
-  }
-  signalsToTrigger = /* @__PURE__ */ new Set();
-  try {
-    callback();
-  } finally {
-    for (const signal of signalsToTrigger) {
-      signal[kTrigger]();
-    }
-    signalsToTrigger = null;
-  }
-}
-function enqueueTrigger(signal) {
-  if (!signalsToTrigger) raise("Expected to be in an active batch");
-  signalsToTrigger.add(signal);
-}
-function merge(target, patch) {
-  let updated = false;
-  const newValue = { ...target };
-  Object.keys(patch).forEach((k) => {
-    const key = k;
-    const val = patch[key];
-    if (newValue[key] !== val) {
-      if (val === void 0) {
-        delete newValue[key];
-      } else {
-        newValue[key] = val;
-      }
-      updated = true;
-    }
-  });
-  return updated ? newValue : target;
-}
-var AbstractSignal = class {
-  /** @internal */
-  equals;
-  #eventSource;
-  /** @internal */
-  [kSinks];
-  constructor(equals) {
-    this.equals = equals ?? Object.is;
-    this.#eventSource = makeEventSource();
-    this[kSinks] = /* @__PURE__ */ new Set();
-    this.get = this.get.bind(this);
-    this.subscribe = this.subscribe.bind(this);
-    this.subscribeOnce = this.subscribeOnce.bind(this);
-  }
-  [Symbol.dispose]() {
-    this.#eventSource[Symbol.dispose]();
-    this.#eventSource = "(disposed)";
-    this.equals = "(disposed)";
-  }
-  get hasWatchers() {
-    if (this.#eventSource.count() > 0) return true;
-    for (const sink of this[kSinks]) {
-      if (sink.hasWatchers) {
-        return true;
-      }
-    }
-    return false;
-  }
-  [kTrigger]() {
-    this.#eventSource.notify();
-    for (const sink of this[kSinks]) {
-      enqueueTrigger(sink);
-    }
-  }
-  subscribe(callback) {
-    return this.#eventSource.subscribe(callback);
-  }
-  subscribeOnce(callback) {
-    const unsub = this.subscribe(() => {
-      unsub();
-      return callback();
-    });
-    return unsub;
-  }
-  waitUntil() {
-    throw new Error("waitUntil not supported on Signals");
-  }
-  markSinksDirty() {
-    for (const sink of this[kSinks]) {
-      sink.markDirty();
-    }
-  }
-  addSink(sink) {
-    this[kSinks].add(sink);
-  }
-  removeSink(sink) {
-    this[kSinks].delete(sink);
-  }
-  asReadonly() {
-    return this;
-  }
-};
-var Signal = class extends AbstractSignal {
-  #value;
-  constructor(value, equals) {
-    super(equals);
-    this.#value = freeze(value);
-  }
-  [Symbol.dispose]() {
-    super[Symbol.dispose]();
-    this.#value = "(disposed)";
-  }
-  get() {
-    return this.#value;
-  }
-  set(newValue) {
-    batch(() => {
-      if (typeof newValue === "function") {
-        newValue = newValue(this.#value);
-      }
-      if (!this.equals(this.#value, newValue)) {
-        this.#value = freeze(newValue);
-        this.markSinksDirty();
-        enqueueTrigger(this);
-      }
-    });
-  }
-};
-var PatchableSignal = class extends Signal {
-  constructor(data) {
-    super(freeze(compactObject(data)));
-  }
-  set() {
-    throw new Error("Don't call .set() directly, use .patch()");
-  }
-  /**
-   * Patches the current object.
-   */
-  patch(patch) {
-    super.set((old) => merge(old, patch));
-  }
-};
-var INITIAL = Symbol();
-var DerivedSignal = class _DerivedSignal extends AbstractSignal {
-  #prevValue;
-  #dirty;
-  // When true, the value in #value may not be up-to-date and needs re-checking
-  #parents;
-  #transform;
-  // prettier-ignore
-  static from(...args) {
-    const last = args.pop();
-    if (typeof last !== "function")
-      raise("Invalid .from() call, last argument expected to be a function");
-    if (typeof args[args.length - 1] === "function") {
-      const equals = last;
-      const transform = args.pop();
-      return new _DerivedSignal(args, transform, equals);
-    } else {
-      const transform = last;
-      return new _DerivedSignal(args, transform);
-    }
-  }
-  constructor(parents, transform, equals) {
-    super(equals);
-    this.#dirty = true;
-    this.#prevValue = INITIAL;
-    this.#parents = parents;
-    this.#transform = transform;
-    for (const parent of parents) {
-      parent.addSink(this);
-    }
-  }
-  [Symbol.dispose]() {
-    for (const parent of this.#parents) {
-      parent.removeSink(this);
-    }
-    this.#prevValue = "(disposed)";
-    this.#parents = "(disposed)";
-    this.#transform = "(disposed)";
-  }
-  get isDirty() {
-    return this.#dirty;
-  }
-  #recompute() {
-    const derived = this.#transform(...this.#parents.map((p) => p.get()));
-    this.#dirty = false;
-    if (!this.equals(this.#prevValue, derived)) {
-      this.#prevValue = derived;
-      return true;
+var eventSource = makeEventSource();
+if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
+  window.addEventListener("message", (event) => {
+    if (event.source === window && event.data?.source === "liveblocks-devtools-panel") {
+      eventSource.notify(event.data);
+    } else {
     }
-    return false;
+  });
+}
+var onMessageFromPanel = eventSource.observable;
+
+// src/devtools/index.ts
+var VERSION = PKG_VERSION || "dev";
+var _devtoolsSetupHasRun = false;
+function setupDevTools(getAllRooms) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
   }
-  markDirty() {
-    if (!this.#dirty) {
-      this.#dirty = true;
-      this.markSinksDirty();
-    }
+  if (_devtoolsSetupHasRun) {
+    return;
   }
-  get() {
-    if (this.#dirty) {
-      this.#recompute();
+  _devtoolsSetupHasRun = true;
+  onMessageFromPanel.subscribe((msg) => {
+    switch (msg.msg) {
+      // When a devtool panel sends an explicit "connect" message back to this
+      // live running client (in response to the "wake-up-devtools" message,
+      // or when the devtool panel is opened for the first time), it means that it's okay to
+      // start emitting messages.
+      // Before this explicit acknowledgement, any call to sendToPanel() will
+      // be a no-op.
+      case "connect": {
+        activateBridge(true);
+        for (const roomId of getAllRooms()) {
+          sendToPanel({
+            msg: "room::available",
+            roomId,
+            clientVersion: VERSION
+          });
+        }
+        break;
+      }
     }
-    return this.#prevValue;
+  });
+  sendToPanel({ msg: "wake-up-devtools" }, { force: true });
+}
+var unsubsByRoomId = /* @__PURE__ */ new Map();
+function stopSyncStream(roomId) {
+  const unsubs = unsubsByRoomId.get(roomId) ?? [];
+  unsubsByRoomId.delete(roomId);
+  for (const unsub of unsubs) {
+    unsub();
   }
-  /**
-   * Called by the Signal system if one or more of the dependent signals have
-   * changed. In the case of a DerivedSignal, we'll only want to re-evaluate
-   * the actual value if it's being watched, or any of their sinks are being
-   * watched actively.
-   */
-  [kTrigger]() {
-    if (!this.hasWatchers) {
-      return;
-    }
-    const updated = this.#recompute();
-    if (updated) {
-      super[kTrigger]();
+}
+function startSyncStream(room) {
+  stopSyncStream(room.id);
+  fullSync(room);
+  unsubsByRoomId.set(room.id, [
+    // When the connection status changes
+    room.events.status.subscribe(() => partialSyncConnection(room)),
+    // When storage initializes, send the update
+    room.events.storageDidLoad.subscribeOnce(() => partialSyncStorage(room)),
+    // Any time storage updates, send the new storage root
+    room.events.storageBatch.subscribe(() => partialSyncStorage(room)),
+    // Any time "me" or "others" updates, send the new values accordingly
+    room.events.self.subscribe(() => partialSyncMe(room)),
+    room.events.others.subscribe(() => partialSyncOthers(room)),
+    // Any time ydoc is updated, forward the update
+    room.events.ydoc.subscribe((update) => syncYdocUpdate(room, update)),
+    // Any time a custom room event is received, forward it
+    room.events.customEvent.subscribe(
+      (eventData) => forwardEvent(room, eventData)
+    )
+  ]);
+}
+function syncYdocUpdate(room, update) {
+  sendToPanel({
+    msg: "room::sync::ydoc",
+    roomId: room.id,
+    update
+  });
+}
+var loadedAt = Date.now();
+var eventCounter = 0;
+function nextEventId() {
+  return `event-${loadedAt}-${eventCounter++}`;
+}
+function forwardEvent(room, eventData) {
+  sendToPanel({
+    msg: "room::events::custom-event",
+    roomId: room.id,
+    event: {
+      type: "CustomEvent",
+      id: nextEventId(),
+      key: "Event",
+      connectionId: eventData.connectionId,
+      payload: eventData.event
     }
+  });
+}
+function partialSyncConnection(room) {
+  sendToPanel({
+    msg: "room::sync::partial",
+    roomId: room.id,
+    status: room.getStatus()
+  });
+}
+function partialSyncStorage(room) {
+  const root = room.getStorageSnapshot();
+  if (root) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      storage: root.toTreeNode("root").payload
+    });
   }
-};
-var MutableSignal = class extends AbstractSignal {
-  #state;
-  constructor(initialState) {
-    super();
-    this.#state = initialState;
+}
+function partialSyncMe(room) {
+  const me = room[kInternal].getSelf_forDevTools();
+  if (me) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      me
+    });
   }
-  [Symbol.dispose]() {
-    super[Symbol.dispose]();
-    this.#state = "(disposed)";
+}
+function partialSyncOthers(room) {
+  const others = room[kInternal].getOthers_forDevTools();
+  if (others) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      others
+    });
   }
-  get() {
-    return this.#state;
+}
+function fullSync(room) {
+  const root = room.getStorageSnapshot();
+  const me = room[kInternal].getSelf_forDevTools();
+  const others = room[kInternal].getOthers_forDevTools();
+  room.fetchYDoc("");
+  sendToPanel({
+    msg: "room::sync::full",
+    roomId: room.id,
+    status: room.getStatus(),
+    storage: root?.toTreeNode("root").payload ?? null,
+    me,
+    others
+  });
+}
+var roomChannelListeners = /* @__PURE__ */ new Map();
+function stopRoomChannelListener(roomId) {
+  const listener = roomChannelListeners.get(roomId);
+  roomChannelListeners.delete(roomId);
+  if (listener) {
+    listener();
   }
-  /**
-   * Invokes a callback function that is allowed to mutate the given state
-   * value. Do not change the value outside of the callback.
-   *
-   * If the callback explicitly returns `false`, it's assumed that the state
-   * was not changed.
-   */
-  mutate(callback) {
-    batch(() => {
-      const result = callback ? callback(this.#state) : true;
-      if (result !== null && typeof result === "object" && "then" in result) {
-        raise("MutableSignal.mutate() does not support async callbacks");
-      }
-      if (result !== false) {
-        this.markSinksDirty();
-        enqueueTrigger(this);
+}
+function linkDevTools(roomId, room) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
+  }
+  sendToPanel({ msg: "room::available", roomId, clientVersion: VERSION });
+  stopRoomChannelListener(roomId);
+  roomChannelListeners.set(
+    roomId,
+    // Returns the unsubscribe callback, that we store in the
+    // roomChannelListeners registry
+    onMessageFromPanel.subscribe((msg) => {
+      switch (msg.msg) {
+        // Sent by the devtool panel when it wants to receive the sync stream
+        // for a room
+        case "room::subscribe": {
+          if (msg.roomId === roomId) {
+            startSyncStream(room);
+          }
+          break;
+        }
+        case "room::unsubscribe": {
+          if (msg.roomId === roomId) {
+            stopSyncStream(roomId);
+          }
+          break;
+        }
       }
-    });
+    })
+  );
+}
+function unlinkDevTools(roomId) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
   }
-};
+  stopSyncStream(roomId);
+  stopRoomChannelListener(roomId);
+  sendToPanel({
+    msg: "room::unavailable",
+    roomId
+  });
+}
 
 // src/lib/position.ts
 var MIN_CODE = 32;
@@ -6177,6 +6235,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) {
@@ -6341,13 +6476,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,
@@ -6410,7 +6549,6 @@ function createRoom(options, config) {
     self: makeEventSource(),
     myPresence: makeEventSource(),
     others: makeEventSource(),
-    error: makeEventSource(),
     storageBatch: makeEventSource(),
     history: makeEventSource(),
     storageDidLoad: makeEventSource(),
@@ -6889,6 +7027,7 @@ function createRoom(options, config) {
           processInitialStorage(message);
           break;
         }
+        // Write event
         case 201 /* UPDATE_STORAGE */: {
           const applyResult = applyOps(message.ops, false);
           for (const [key, value] of applyResult.updates.storageUpdates) {
@@ -6899,6 +7038,11 @@ function createRoom(options, config) {
           }
           break;
         }
+        // Receiving a RejectedOps message in the client means that the server is no
+        // longer in sync with the client. Trying to synchronize the client again by
+        // rolling back particular Ops may be hard/impossible. It's fine to not try and
+        // accept the out-of-sync reality and throw an error. We look at this kind of bug
+        // as a developer-owned bug. In production, these errors are not expected to happen.
         case 299 /* REJECT_STORAGE_OP */: {
           errorWithTitle(
             "Storage mutation rejection error",
@@ -7242,7 +7386,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,
@@ -7433,7 +7576,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(),
@@ -7502,7 +7649,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(
@@ -7542,8 +7689,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":
@@ -7560,6 +7712,7 @@ function makeClassicSubscribeFn(events) {
           return events.comments.subscribe(
             callback
           );
+        // istanbul ignore next
         default:
           return assertNever(
             first,
@@ -7714,6 +7867,7 @@ function createClient(options) {
         },
         enableDebugLogging: clientOptions.enableDebugLogging,
         baseUrl,
+        errorEventSource: liveblocksErrorSource,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData,
         roomHttpClient: httpClient,
@@ -7796,6 +7950,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";
@@ -7855,6 +8010,7 @@ function createClient(options) {
       },
       getSyncStatus,
       events: {
+        error: liveblocksErrorSource,
         syncStatus: syncStatusSignal
       },
       // Internal
@@ -7870,7 +8026,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,
@@ -8842,11 +9005,13 @@ export {
   ClientMsgCode,
   CommentsApiError,
   CrdtType,
+  DefaultMap,
   DerivedSignal,
   HttpError,
   LiveList,
   LiveMap,
   LiveObject,
+  LiveblocksError,
   MutableSignal,
   NotificationsApiError,
   OpCode,
@@ -8896,6 +9061,7 @@ export {
   isLiveNode,
   isPlainObject,
   isRootCrdt,
+  isStartsWithOperator,
   kInternal,
   legacy_patchImmutableObject,
   lsonToJson,