@liveblocks/core 2.15.1 → 2.16.0-rc1

package/dist/index.js

@@ -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 = "cjs";
 
 // 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 {
+  
+  
+  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 (e2) {
+    }
+    const bodyAsJson = bodyAsText ? tryParseJson(bodyAsText) : void 0;
+    let bodyAsJsonObject;
+    if (isPlainObject(bodyAsJson)) {
+      bodyAsJsonObject = bodyAsJson;
+    }
+    let message = "";
+    message ||= typeof _optionalChain([bodyAsJsonObject, 'optionalAccess', _2 => _2.message]) === "string" ? bodyAsJsonObject.message : "";
+    message ||= typeof _optionalChain([bodyAsJsonObject, 'optionalAccess', _3 => _3.error]) === "string" ? bodyAsJsonObject.error : "";
+    if (bodyAsJson === void 0) {
+      message ||= bodyAsText || "";
+    }
+    message ||= response.statusText;
+    let path;
+    try {
+      path = new URL(response.url).pathname;
+    } catch (e3) {
+    }
+    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) {
@@ -323,10 +363,15 @@ function makeEventSource() {
           res(event);
         }
       });
-    }).finally(() => _optionalChain([unsub, 'optionalCall', _2 => _2()]));
+    }).finally(() => _optionalChain([unsub, 'optionalCall', _4 => _4()]));
   }
   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,173 +431,457 @@ 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 {
-  
-  
+// 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;
+  }
+  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 */
   
+  #eventSource;
+  /** @internal */
   
-  constructor(input) {
-    this.input = input;
-    const { promise, resolve, reject } = Promise_withResolvers();
-    this.promise = promise;
-    this.resolve = resolve;
-    this.reject = reject;
+  constructor(equals) {
+    this.equals = _nullishCoalesce(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);
   }
-};
-var Batch = (_class = class {
-  #queue = [];
-  #callback;
-  #size;
-  #delay;
-  #delayTimeoutId;
-  __init() {this.error = false}
-  constructor(callback, options) {;_class.prototype.__init.call(this);
-    this.#callback = callback;
-    this.#size = _nullishCoalesce(options.size, () => ( DEFAULT_SIZE));
-    this.#delay = options.delay;
+  [Symbol.dispose]() {
+    this.#eventSource[Symbol.dispose]();
+    this.#eventSource = "(disposed)";
+    this.equals = "(disposed)";
   }
-  #clearDelayTimeout() {
-    if (this.#delayTimeoutId !== void 0) {
-      clearTimeout(this.#delayTimeoutId);
-      this.#delayTimeoutId = void 0;
+  get hasWatchers() {
+    if (this.#eventSource.count() > 0) return true;
+    for (const sink of this[kSinks]) {
+      if (sink.hasWatchers) {
+        return true;
+      }
     }
+    return false;
   }
-  #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);
+  [kTrigger]() {
+    this.#eventSource.notify();
+    for (const sink of this[kSinks]) {
+      enqueueTrigger(sink);
     }
   }
-  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 = _optionalChain([results, 'optionalAccess', _3 => _3[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);
   }
-}, _class);
-function createBatchStore(batch2) {
-  const cache = /* @__PURE__ */ new Map();
-  const eventSource2 = makeEventSource();
-  function getCacheKey(args) {
-    return stringify(args);
+  removeSink(sink) {
+    this[kSinks].delete(sink);
   }
-  function setStateAndNotify(cacheKey, state) {
-    cache.set(cacheKey, state);
-    eventSource2.notify();
+  asReadonly() {
+    return this;
   }
-  function invalidate(inputs) {
-    if (Array.isArray(inputs)) {
-      for (const input of inputs) {
-        cache.delete(getCacheKey(input));
-      }
-    } else {
-      cache.clear();
-    }
-    eventSource2.notify();
+};
+var Signal = class extends AbstractSignal {
+  #value;
+  constructor(value, equals) {
+    super(equals);
+    this.#value = freeze(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
-      });
-    }
+  [Symbol.dispose]() {
+    super[Symbol.dispose]();
+    this.#value = "(disposed)";
   }
-  function getState(input) {
-    const cacheKey = getCacheKey(input);
-    return cache.get(cacheKey);
+  get() {
+    _optionalChain([trackedReads, 'optionalAccess', _5 => _5.add, 'call', _6 => _6(this)]);
+    return this.#value;
   }
-  function _cacheKeys() {
-    return [...cache.keys()];
+  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 getBatch() {
-    return batch2;
+};
+var PatchableSignal = class extends Signal {
+  constructor(data) {
+    super(freeze(compactObject(data)));
   }
-  return {
-    ...eventSource2.observable,
-    get,
-    getState,
-    invalidate,
-    getBatch,
-    _cacheKeys
-  };
-}
-
-// src/lib/chunk.ts
-function chunk(array, size) {
-  const chunks = [];
-  for (let i = 0, j = array.length; i < j; i += size) {
-    chunks.push(array.slice(i, i + size));
+  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
+  #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();
+    }
+    _optionalChain([trackedReads, 'optionalAccess', _7 => _7.add, 'call', _8 => _8(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() {
+    _optionalChain([trackedReads, 'optionalAccess', _9 => _9.add, 'call', _10 => _10(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 {
+  
+  
+  
+  
+  constructor(input) {
+    this.input = input;
+    const { promise, resolve, reject } = Promise_withResolvers();
+    this.promise = promise;
+    this.resolve = resolve;
+    this.reject = reject;
+  }
+};
+var Batch = (_class = class {
+  #queue = [];
+  #callback;
+  #size;
+  #delay;
+  #delayTimeoutId;
+  __init() {this.error = false}
+  constructor(callback, options) {;_class.prototype.__init.call(this);
+    this.#callback = callback;
+    this.#size = _nullishCoalesce(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 = _optionalChain([results, 'optionalAccess', _11 => _11[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();
+  }
+}, _class);
+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,
+    batch: batch2,
+    _cacheKeys
+  };
+}
+
+// src/lib/chunk.ts
+function chunk(array, size) {
+  const chunks = [];
+  for (let i = 0, j = array.length; i < j; i += size) {
+    chunks.push(array.slice(i, i + size));
   }
   return chunks;
 }
@@ -583,9 +913,39 @@ function createInboxNotificationId() {
   return createOptimisticId(INBOX_NOTIFICATION_ID_PREFIX);
 }
 
-// src/lib/objectToQuery.ts
-var identifierRegex = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-function objectToQuery(obj) {
+// 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 = _nullishCoalesce(_nullishCoalesce(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) {
   let filterList = [];
   const entries2 = Object.entries(obj);
   const keyValuePairs = [];
@@ -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;
-};
-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}`;
+  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(value) {
+  return typeof value !== "string" || value.includes("'") ? JSON.stringify(value) : `'${value}'`;
+}
 
 // src/lib/url.ts
 function toURLSearchParams(params) {
@@ -948,11 +1290,11 @@ function createApiClient({
       `Upload of attachment ${options.attachment.id} was aborted.`,
       "AbortError"
     ) : void 0;
-    if (_optionalChain([abortSignal, 'optionalAccess', _4 => _4.aborted])) {
+    if (_optionalChain([abortSignal, 'optionalAccess', _12 => _12.aborted])) {
       throw abortError;
     }
     const handleRetryError = (err) => {
-      if (_optionalChain([abortSignal, 'optionalAccess', _5 => _5.aborted])) {
+      if (_optionalChain([abortSignal, 'optionalAccess', _13 => _13.aborted])) {
         throw abortError;
       }
       if (err instanceof HttpError && err.status === 413) {
@@ -1024,7 +1366,7 @@ function createApiClient({
       try {
         uploadId = createMultiPartUpload.uploadId;
         const parts = splitFileIntoParts(attachment.file);
-        if (_optionalChain([abortSignal, 'optionalAccess', _6 => _6.aborted])) {
+        if (_optionalChain([abortSignal, 'optionalAccess', _14 => _14.aborted])) {
           throw abortError;
         }
         const batches = chunk(parts, 5);
@@ -1051,7 +1393,7 @@ function createApiClient({
           }
           uploadedParts.push(...await Promise.all(uploadedPartsPromises));
         }
-        if (_optionalChain([abortSignal, 'optionalAccess', _7 => _7.aborted])) {
+        if (_optionalChain([abortSignal, 'optionalAccess', _15 => _15.aborted])) {
           throw abortError;
         }
         const sortedUploadedParts = uploadedParts.sort(
@@ -1067,7 +1409,7 @@ function createApiClient({
           { signal: abortSignal }
         );
       } catch (error3) {
-        if (uploadId && _optionalChain([error3, 'optionalAccess', _8 => _8.name]) && (error3.name === "AbortError" || error3.name === "TimeoutError")) {
+        if (uploadId && _optionalChain([error3, 'optionalAccess', _16 => _16.name]) && (error3.name === "AbortError" || error3.name === "TimeoutError")) {
           try {
             await httpClient.rawDelete(
               url`/v2/c/rooms/${roomId}/attachments/${attachment.id}/multipart/${uploadId}`,
@@ -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) => _nullishCoalesce(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) => _nullishCoalesce(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) {
@@ -1291,7 +1616,7 @@ function createApiClient({
       url`/v2/c/inbox-notifications`,
       await authManager.getAuthValue({ requestedScope: "comments:read" }),
       {
-        cursor: _optionalChain([options, 'optionalAccess', _9 => _9.cursor]),
+        cursor: _optionalChain([options, 'optionalAccess', _17 => _17.cursor]),
         limit: PAGE_SIZE
       }
     );
@@ -1375,7 +1700,7 @@ function createApiClient({
   }
   async function getUserThreads_experimental(options) {
     let query;
-    if (_optionalChain([options, 'optionalAccess', _10 => _10.query])) {
+    if (_optionalChain([options, 'optionalAccess', _18 => _18.query])) {
       query = objectToQuery(options.query);
     }
     const PAGE_SIZE = 50;
@@ -1383,7 +1708,7 @@ function createApiClient({
       url`/v2/c/threads`,
       await authManager.getAuthValue({ requestedScope: "comments:read" }),
       {
-        cursor: _optionalChain([options, 'optionalAccess', _11 => _11.cursor]),
+        cursor: _optionalChain([options, 'optionalAccess', _19 => _19.cursor]),
         query,
         limit: PAGE_SIZE
       }
@@ -1508,7 +1833,7 @@ var HttpClient = class {
         // These headers are default, but can be overriden by custom headers
         "Content-Type": "application/json; charset=utf-8",
         // Possible header overrides
-        ..._optionalChain([options, 'optionalAccess', _12 => _12.headers]),
+        ..._optionalChain([options, 'optionalAccess', _20 => _20.headers]),
         // Cannot be overriden by custom headers
         Authorization: `Bearer ${getBearerTokenFromAuthValue(authValue)}`,
         "X-LB-Client": PKG_VERSION || "dev"
@@ -1532,19 +1857,12 @@ 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 (e2) {
-        error3 = new HttpError(response.statusText, response.status);
-      }
-      throw error3;
+      throw await HttpError.fromResponse(response);
     }
     let body;
     try {
       body = await response.json();
-    } catch (e3) {
+    } catch (e4) {
       body = {};
     }
     return body;
@@ -1990,7 +2308,7 @@ var FSM = class {
     });
   }
   #getTargetFn(eventName) {
-    return _optionalChain([this, 'access', _13 => _13.#allowedTransitions, 'access', _14 => _14.get, 'call', _15 => _15(this.currentState), 'optionalAccess', _16 => _16.get, 'call', _17 => _17(eventName)]);
+    return _optionalChain([this, 'access', _21 => _21.#allowedTransitions, 'access', _22 => _22.get, 'call', _23 => _23(this.currentState), 'optionalAccess', _24 => _24.get, 'call', _25 => _25(eventName)]);
   }
   /**
    * Exits the current state, and executes any necessary cleanup functions.
@@ -2007,7 +2325,7 @@ var FSM = class {
     this.#currentContext.allowPatching((patchableContext) => {
       levels = _nullishCoalesce(levels, () => ( this.#cleanupStack.length));
       for (let i = 0; i < levels; i++) {
-        _optionalChain([this, 'access', _18 => _18.#cleanupStack, 'access', _19 => _19.pop, 'call', _20 => _20(), 'optionalCall', _21 => _21(patchableContext)]);
+        _optionalChain([this, 'access', _26 => _26.#cleanupStack, 'access', _27 => _27.pop, 'call', _28 => _28(), 'optionalCall', _29 => _29(patchableContext)]);
       }
     });
   }
@@ -2023,7 +2341,7 @@ var FSM = class {
     this.#currentContext.allowPatching((patchableContext) => {
       for (const pattern of enterPatterns) {
         const enterFn = this.#enterFns.get(pattern);
-        const cleanupFn = _optionalChain([enterFn, 'optionalCall', _22 => _22(patchableContext)]);
+        const cleanupFn = _optionalChain([enterFn, 'optionalCall', _30 => _30(patchableContext)]);
         if (typeof cleanupFn === "function") {
           this.#cleanupStack.push(cleanupFn);
         } else {
@@ -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 _nullishCoalesce(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 = {
@@ -2424,7 +2735,7 @@ function createConnectionStateMachine(delegates, options) {
           }
           function waitForActorId(event) {
             const serverMsg = tryParseJson(event.data);
-            if (_optionalChain([serverMsg, 'optionalAccess', _23 => _23.type]) === 104 /* ROOM_STATE */) {
+            if (_optionalChain([serverMsg, 'optionalAccess', _31 => _31.type]) === 104 /* ROOM_STATE */) {
               didReceiveActor();
             }
           }
@@ -2533,12 +2844,12 @@ function createConnectionStateMachine(delegates, options) {
   const sendHeartbeat = {
     target: "@ok.awaiting-pong",
     effect: (ctx) => {
-      _optionalChain([ctx, 'access', _24 => _24.socket, 'optionalAccess', _25 => _25.send, 'call', _26 => _26("ping")]);
+      _optionalChain([ctx, 'access', _32 => _32.socket, 'optionalAccess', _33 => _33.send, 'call', _34 => _34("ping")]);
     }
   };
   const maybeHeartbeat = () => {
     const doc = typeof document !== "undefined" ? document : void 0;
-    const canZombie = _optionalChain([doc, 'optionalAccess', _27 => _27.visibilityState]) === "hidden" && delegates.canZombie();
+    const canZombie = _optionalChain([doc, 'optionalAccess', _35 => _35.visibilityState]) === "hidden" && delegates.canZombie();
     return canZombie ? "@idle.zombie" : sendHeartbeat;
   };
   machine.addTimedTransition("@ok.connected", HEARTBEAT_INTERVAL, maybeHeartbeat).addTransitions("@ok.connected", {
@@ -2577,7 +2888,7 @@ function createConnectionStateMachine(delegates, options) {
     // socket, or not. So always check to see if the socket is still OPEN or
     // not. When still OPEN, don't transition.
     EXPLICIT_SOCKET_ERROR: (_, context) => {
-      if (_optionalChain([context, 'access', _28 => _28.socket, 'optionalAccess', _29 => _29.readyState]) === 1) {
+      if (_optionalChain([context, 'access', _36 => _36.socket, 'optionalAccess', _37 => _37.readyState]) === 1) {
         return null;
       }
       return {
@@ -2629,17 +2940,17 @@ function createConnectionStateMachine(delegates, options) {
         machine.send({ type: "NAVIGATOR_ONLINE" });
       }
       function onVisibilityChange() {
-        if (_optionalChain([doc, 'optionalAccess', _30 => _30.visibilityState]) === "visible") {
+        if (_optionalChain([doc, 'optionalAccess', _38 => _38.visibilityState]) === "visible") {
           machine.send({ type: "WINDOW_GOT_FOCUS" });
         }
       }
-      _optionalChain([win, 'optionalAccess', _31 => _31.addEventListener, 'call', _32 => _32("online", onNetworkBackOnline)]);
-      _optionalChain([win, 'optionalAccess', _33 => _33.addEventListener, 'call', _34 => _34("offline", onNetworkOffline)]);
-      _optionalChain([root, 'optionalAccess', _35 => _35.addEventListener, 'call', _36 => _36("visibilitychange", onVisibilityChange)]);
+      _optionalChain([win, 'optionalAccess', _39 => _39.addEventListener, 'call', _40 => _40("online", onNetworkBackOnline)]);
+      _optionalChain([win, 'optionalAccess', _41 => _41.addEventListener, 'call', _42 => _42("offline", onNetworkOffline)]);
+      _optionalChain([root, 'optionalAccess', _43 => _43.addEventListener, 'call', _44 => _44("visibilitychange", onVisibilityChange)]);
       return () => {
-        _optionalChain([root, 'optionalAccess', _37 => _37.removeEventListener, 'call', _38 => _38("visibilitychange", onVisibilityChange)]);
-        _optionalChain([win, 'optionalAccess', _39 => _39.removeEventListener, 'call', _40 => _40("online", onNetworkBackOnline)]);
-        _optionalChain([win, 'optionalAccess', _41 => _41.removeEventListener, 'call', _42 => _42("offline", onNetworkOffline)]);
+        _optionalChain([root, 'optionalAccess', _45 => _45.removeEventListener, 'call', _46 => _46("visibilitychange", onVisibilityChange)]);
+        _optionalChain([win, 'optionalAccess', _47 => _47.removeEventListener, 'call', _48 => _48("online", onNetworkBackOnline)]);
+        _optionalChain([win, 'optionalAccess', _49 => _49.removeEventListener, 'call', _50 => _50("offline", onNetworkOffline)]);
         teardownSocket(ctx.socket);
       };
     });
@@ -2660,7 +2971,7 @@ function createConnectionStateMachine(delegates, options) {
       didConnect,
       didDisconnect,
       onMessage: onMessage.observable,
-      onLiveblocksError: onLiveblocksError.observable
+      onConnectionError: onConnectionError.observable
     }
   };
 }
@@ -2680,7 +2991,7 @@ var ManagedSocket = class {
   getStatus() {
     try {
       return toNewConnectionStatus(this.#machine);
-    } catch (e4) {
+    } catch (e5) {
       return "initial";
     }
   }
@@ -2728,7 +3039,7 @@ var ManagedSocket = class {
    * message if this is somehow impossible.
    */
   send(data) {
-    const socket = _optionalChain([this, 'access', _43 => _43.#machine, 'access', _44 => _44.context, 'optionalAccess', _45 => _45.socket]);
+    const socket = _optionalChain([this, 'access', _51 => _51.#machine, 'access', _52 => _52.context, 'optionalAccess', _53 => _53.socket]);
     if (socket === null) {
       warn("Cannot send: not connected yet", data);
     } else if (socket.readyState !== 1) {
@@ -2832,7 +3143,7 @@ function createAuthManager(authOptions, onAuthenticate) {
     return void 0;
   }
   async function makeAuthRequest(options) {
-    const fetcher = _nullishCoalesce(_optionalChain([authOptions, 'access', _46 => _46.polyfills, 'optionalAccess', _47 => _47.fetch]), () => ( (typeof window === "undefined" ? void 0 : window.fetch)));
+    const fetcher = _nullishCoalesce(_optionalChain([authOptions, 'access', _54 => _54.polyfills, 'optionalAccess', _55 => _55.fetch]), () => ( (typeof window === "undefined" ? void 0 : window.fetch)));
     if (authentication.type === "private") {
       if (fetcher === void 0) {
         throw new StopRetrying(
@@ -2848,7 +3159,7 @@ function createAuthManager(authOptions, onAuthenticate) {
           "The same Liveblocks auth token was issued from the backend before. Caching Liveblocks tokens is not supported."
         );
       }
-      _optionalChain([onAuthenticate, 'optionalCall', _48 => _48(parsed.parsed)]);
+      _optionalChain([onAuthenticate, 'optionalCall', _56 => _56(parsed.parsed)]);
       return parsed;
     }
     if (authentication.type === "custom") {
@@ -2856,7 +3167,7 @@ function createAuthManager(authOptions, onAuthenticate) {
       if (response && typeof response === "object") {
         if (typeof response.token === "string") {
           const parsed = parseAuthToken(response.token);
-          _optionalChain([onAuthenticate, 'optionalCall', _49 => _49(parsed.parsed)]);
+          _optionalChain([onAuthenticate, 'optionalCall', _57 => _57(parsed.parsed)]);
           return parsed;
         } else if (typeof response.error === "string") {
           const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
@@ -3017,7 +3328,7 @@ function sendToPanel(message, options) {
     ...message,
     source: "liveblocks-devtools-client"
   };
-  if (!(_optionalChain([options, 'optionalAccess', _50 => _50.force]) || _bridgeActive)) {
+  if (!(_optionalChain([options, 'optionalAccess', _58 => _58.force]) || _bridgeActive)) {
     return;
   }
   window.postMessage(fullMsg, "*");
@@ -3025,7 +3336,7 @@ function sendToPanel(message, options) {
 var eventSource = makeEventSource();
 if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
   window.addEventListener("message", (event) => {
-    if (event.source === window && _optionalChain([event, 'access', _51 => _51.data, 'optionalAccess', _52 => _52.source]) === "liveblocks-devtools-panel") {
+    if (event.source === window && _optionalChain([event, 'access', _59 => _59.data, 'optionalAccess', _60 => _60.source]) === "liveblocks-devtools-panel") {
       eventSource.notify(event.data);
     } else {
     }
@@ -3038,442 +3349,189 @@ 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 = _nullishCoalesce(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: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _53 => _53.toTreeNode, 'call', _54 => _54("root"), 'access', _55 => _55.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 */
-  
-  #eventSource;
-  /** @internal */
-  
-  constructor(equals) {
-    this.equals = _nullishCoalesce(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;
+    return;
   }
-  #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;
-    }
-    return false;
+  if (_devtoolsSetupHasRun) {
+    return;
   }
-  markDirty() {
-    if (!this.#dirty) {
-      this.#dirty = true;
-      this.markSinksDirty();
+  _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;
+      }
     }
+  });
+  sendToPanel({ msg: "wake-up-devtools" }, { force: true });
+}
+var unsubsByRoomId = /* @__PURE__ */ new Map();
+function stopSyncStream(roomId) {
+  const unsubs = _nullishCoalesce(unsubsByRoomId.get(roomId), () => ( []));
+  unsubsByRoomId.delete(roomId);
+  for (const unsub of unsubs) {
+    unsub();
   }
-  get() {
-    if (this.#dirty) {
-      this.#recompute();
+}
+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
     }
-    return this.#prevValue;
+  });
+}
+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
+    });
   }
-  /**
-   * 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 partialSyncMe(room) {
+  const me = room[kInternal].getSelf_forDevTools();
+  if (me) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      me
+    });
   }
-};
-var MutableSignal = class extends AbstractSignal {
-  #state;
-  constructor(initialState) {
-    super();
-    this.#state = initialState;
+}
+function partialSyncOthers(room) {
+  const others = room[kInternal].getOthers_forDevTools();
+  if (others) {
+    sendToPanel({
+      msg: "room::sync::partial",
+      roomId: room.id,
+      others
+    });
   }
-  [Symbol.dispose]() {
-    super[Symbol.dispose]();
-    this.#state = "(disposed)";
+}
+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: _nullishCoalesce(_optionalChain([root, 'optionalAccess', _61 => _61.toTreeNode, 'call', _62 => _62("root"), 'access', _63 => _63.payload]), () => ( null)),
+    me,
+    others
+  });
+}
+var roomChannelListeners = /* @__PURE__ */ new Map();
+function stopRoomChannelListener(roomId) {
+  const listener = roomChannelListeners.get(roomId);
+  roomChannelListeners.delete(roomId);
+  if (listener) {
+    listener();
   }
-  get() {
-    return this.#state;
+}
+function linkDevTools(roomId, room) {
+  if (process.env.NODE_ENV === "production" || typeof window === "undefined") {
+    return;
   }
-  /**
-   * 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);
+  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;
@@ -3844,7 +3902,7 @@ var LiveRegister = class _LiveRegister extends AbstractCrdt {
     return [
       {
         type: 8 /* CREATE_REGISTER */,
-        opId: _optionalChain([pool, 'optionalAccess', _56 => _56.generateOpId, 'call', _57 => _57()]),
+        opId: _optionalChain([pool, 'optionalAccess', _64 => _64.generateOpId, 'call', _65 => _65()]),
         id: this._id,
         parentId,
         parentKey,
@@ -3950,7 +4008,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _58 => _58.generateOpId, 'call', _59 => _59()]),
+      opId: _optionalChain([pool, 'optionalAccess', _66 => _66.generateOpId, 'call', _67 => _67()]),
       type: 2 /* CREATE_LIST */,
       parentId,
       parentKey
@@ -4221,7 +4279,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   #applyInsertUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _60 => _60._pool, 'optionalAccess', _61 => _61.getNode, 'call', _62 => _62(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _68 => _68._pool, 'optionalAccess', _69 => _69.getNode, 'call', _70 => _70(id)]) !== void 0) {
       return { modified: false };
     }
     child._attach(id, nn(this._pool));
@@ -4229,8 +4287,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     const existingItemIndex = this._indexOfPosition(key);
     let newKey = key;
     if (existingItemIndex !== -1) {
-      const before2 = _optionalChain([this, 'access', _63 => _63.#items, 'access', _64 => _64[existingItemIndex], 'optionalAccess', _65 => _65._parentPos]);
-      const after2 = _optionalChain([this, 'access', _66 => _66.#items, 'access', _67 => _67[existingItemIndex + 1], 'optionalAccess', _68 => _68._parentPos]);
+      const before2 = _optionalChain([this, 'access', _71 => _71.#items, 'access', _72 => _72[existingItemIndex], 'optionalAccess', _73 => _73._parentPos]);
+      const after2 = _optionalChain([this, 'access', _74 => _74.#items, 'access', _75 => _75[existingItemIndex + 1], 'optionalAccess', _76 => _76._parentPos]);
       newKey = makePosition(before2, after2);
       child._setParentLink(this, newKey);
     }
@@ -4244,7 +4302,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   #applySetUndoRedo(op) {
     const { id, parentKey: key } = op;
     const child = creationOpToLiveNode(op);
-    if (_optionalChain([this, 'access', _69 => _69._pool, 'optionalAccess', _70 => _70.getNode, 'call', _71 => _71(id)]) !== void 0) {
+    if (_optionalChain([this, 'access', _77 => _77._pool, 'optionalAccess', _78 => _78.getNode, 'call', _79 => _79(id)]) !== void 0) {
       return { modified: false };
     }
     this.#unacknowledgedSets.set(key, nn(op.opId));
@@ -4365,7 +4423,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     } else {
       this.#items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _72 => _72.#items, 'access', _73 => _73[existingItemIndex + 1], 'optionalAccess', _74 => _74._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _80 => _80.#items, 'access', _81 => _81[existingItemIndex + 1], 'optionalAccess', _82 => _82._parentPos]))
       );
       const previousIndex = this.#items.indexOf(child);
       child._setParentLink(this, newKey);
@@ -4390,7 +4448,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this.#items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _75 => _75.#items, 'access', _76 => _76[existingItemIndex + 1], 'optionalAccess', _77 => _77._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _83 => _83.#items, 'access', _84 => _84[existingItemIndex + 1], 'optionalAccess', _85 => _85._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -4409,7 +4467,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (existingItemIndex !== -1) {
         this.#items[existingItemIndex]._setParentLink(
           this,
-          makePosition(newKey, _optionalChain([this, 'access', _78 => _78.#items, 'access', _79 => _79[existingItemIndex + 1], 'optionalAccess', _80 => _80._parentPos]))
+          makePosition(newKey, _optionalChain([this, 'access', _86 => _86.#items, 'access', _87 => _87[existingItemIndex + 1], 'optionalAccess', _88 => _88._parentPos]))
         );
       }
       child._setParentLink(this, newKey);
@@ -4436,7 +4494,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (existingItemIndex !== -1) {
       this.#items[existingItemIndex]._setParentLink(
         this,
-        makePosition(newKey, _optionalChain([this, 'access', _81 => _81.#items, 'access', _82 => _82[existingItemIndex + 1], 'optionalAccess', _83 => _83._parentPos]))
+        makePosition(newKey, _optionalChain([this, 'access', _89 => _89.#items, 'access', _90 => _90[existingItemIndex + 1], 'optionalAccess', _91 => _91._parentPos]))
       );
     }
     child._setParentLink(this, newKey);
@@ -4494,7 +4552,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param element The element to add to the end of the LiveList.
    */
   push(element) {
-    _optionalChain([this, 'access', _84 => _84._pool, 'optionalAccess', _85 => _85.assertStorageIsWritable, 'call', _86 => _86()]);
+    _optionalChain([this, 'access', _92 => _92._pool, 'optionalAccess', _93 => _93.assertStorageIsWritable, 'call', _94 => _94()]);
     return this.insert(element, this.length);
   }
   /**
@@ -4503,7 +4561,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index at which you want to insert the element.
    */
   insert(element, index) {
-    _optionalChain([this, 'access', _87 => _87._pool, 'optionalAccess', _88 => _88.assertStorageIsWritable, 'call', _89 => _89()]);
+    _optionalChain([this, 'access', _95 => _95._pool, 'optionalAccess', _96 => _96.assertStorageIsWritable, 'call', _97 => _97()]);
     if (index < 0 || index > this.#items.length) {
       throw new Error(
         `Cannot insert list item at index "${index}". index should be between 0 and ${this.#items.length}`
@@ -4533,7 +4591,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param targetIndex The index where the element should be after moving.
    */
   move(index, targetIndex) {
-    _optionalChain([this, 'access', _90 => _90._pool, 'optionalAccess', _91 => _91.assertStorageIsWritable, 'call', _92 => _92()]);
+    _optionalChain([this, 'access', _98 => _98._pool, 'optionalAccess', _99 => _99.assertStorageIsWritable, 'call', _100 => _100()]);
     if (targetIndex < 0) {
       throw new Error("targetIndex cannot be less than 0");
     }
@@ -4591,7 +4649,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * @param index The index of the element to delete
    */
   delete(index) {
-    _optionalChain([this, 'access', _93 => _93._pool, 'optionalAccess', _94 => _94.assertStorageIsWritable, 'call', _95 => _95()]);
+    _optionalChain([this, 'access', _101 => _101._pool, 'optionalAccess', _102 => _102.assertStorageIsWritable, 'call', _103 => _103()]);
     if (index < 0 || index >= this.#items.length) {
       throw new Error(
         `Cannot delete list item at index "${index}". index should be between 0 and ${this.#items.length - 1}`
@@ -4624,7 +4682,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   clear() {
-    _optionalChain([this, 'access', _96 => _96._pool, 'optionalAccess', _97 => _97.assertStorageIsWritable, 'call', _98 => _98()]);
+    _optionalChain([this, 'access', _104 => _104._pool, 'optionalAccess', _105 => _105.assertStorageIsWritable, 'call', _106 => _106()]);
     if (this._pool) {
       const ops = [];
       const reverseOps = [];
@@ -4658,7 +4716,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   set(index, item) {
-    _optionalChain([this, 'access', _99 => _99._pool, 'optionalAccess', _100 => _100.assertStorageIsWritable, 'call', _101 => _101()]);
+    _optionalChain([this, 'access', _107 => _107._pool, 'optionalAccess', _108 => _108.assertStorageIsWritable, 'call', _109 => _109()]);
     if (index < 0 || index >= this.#items.length) {
       throw new Error(
         `Cannot set list item at index "${index}". index should be between 0 and ${this.#items.length - 1}`
@@ -4804,7 +4862,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
   #shiftItemPosition(index, key) {
     const shiftedPosition = makePosition(
       key,
-      this.#items.length > index + 1 ? _optionalChain([this, 'access', _102 => _102.#items, 'access', _103 => _103[index + 1], 'optionalAccess', _104 => _104._parentPos]) : void 0
+      this.#items.length > index + 1 ? _optionalChain([this, 'access', _110 => _110.#items, 'access', _111 => _111[index + 1], 'optionalAccess', _112 => _112._parentPos]) : void 0
     );
     this.#items[index]._setParentLink(this, shiftedPosition);
   }
@@ -4929,7 +4987,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     const ops = [];
     const op = {
       id: this._id,
-      opId: _optionalChain([pool, 'optionalAccess', _105 => _105.generateOpId, 'call', _106 => _106()]),
+      opId: _optionalChain([pool, 'optionalAccess', _113 => _113.generateOpId, 'call', _114 => _114()]),
       type: 7 /* CREATE_MAP */,
       parentId,
       parentKey
@@ -5064,7 +5122,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @param value The value of the element to add. Should be serializable to JSON.
    */
   set(key, value) {
-    _optionalChain([this, 'access', _107 => _107._pool, 'optionalAccess', _108 => _108.assertStorageIsWritable, 'call', _109 => _109()]);
+    _optionalChain([this, 'access', _115 => _115._pool, 'optionalAccess', _116 => _116.assertStorageIsWritable, 'call', _117 => _117()]);
     const oldValue = this.#map.get(key);
     if (oldValue) {
       oldValue._detach();
@@ -5110,7 +5168,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
    * @returns true if an element existed and has been removed, or false if the element does not exist.
    */
   delete(key) {
-    _optionalChain([this, 'access', _110 => _110._pool, 'optionalAccess', _111 => _111.assertStorageIsWritable, 'call', _112 => _112()]);
+    _optionalChain([this, 'access', _118 => _118._pool, 'optionalAccess', _119 => _119.assertStorageIsWritable, 'call', _120 => _120()]);
     const item = this.#map.get(key);
     if (item === void 0) {
       return false;
@@ -5289,7 +5347,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
     if (this._id === void 0) {
       throw new Error("Cannot serialize item is not attached");
     }
-    const opId = _optionalChain([pool, 'optionalAccess', _113 => _113.generateOpId, 'call', _114 => _114()]);
+    const opId = _optionalChain([pool, 'optionalAccess', _121 => _121.generateOpId, 'call', _122 => _122()]);
     const ops = [];
     const op = {
       type: 4 /* CREATE_OBJECT */,
@@ -5561,7 +5619,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param value The value of the property to add
    */
   set(key, value) {
-    _optionalChain([this, 'access', _115 => _115._pool, 'optionalAccess', _116 => _116.assertStorageIsWritable, 'call', _117 => _117()]);
+    _optionalChain([this, 'access', _123 => _123._pool, 'optionalAccess', _124 => _124.assertStorageIsWritable, 'call', _125 => _125()]);
     this.update({ [key]: value });
   }
   /**
@@ -5576,7 +5634,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param key The key of the property to delete
    */
   delete(key) {
-    _optionalChain([this, 'access', _118 => _118._pool, 'optionalAccess', _119 => _119.assertStorageIsWritable, 'call', _120 => _120()]);
+    _optionalChain([this, 'access', _126 => _126._pool, 'optionalAccess', _127 => _127.assertStorageIsWritable, 'call', _128 => _128()]);
     const keyAsString = key;
     const oldValue = this.#map.get(keyAsString);
     if (oldValue === void 0) {
@@ -5629,7 +5687,7 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
    * @param patch The object used to overrides properties
    */
   update(patch) {
-    _optionalChain([this, 'access', _121 => _121._pool, 'optionalAccess', _122 => _122.assertStorageIsWritable, 'call', _123 => _123()]);
+    _optionalChain([this, 'access', _129 => _129._pool, 'optionalAccess', _130 => _130.assertStorageIsWritable, 'call', _131 => _131()]);
     if (this._pool === void 0 || this._id === void 0) {
       for (const key in patch) {
         const newValue = patch[key];
@@ -6177,6 +6235,83 @@ var ManagedOthers = class {
   }
 };
 
+// src/types/LiveblocksError.ts
+var LiveblocksError = class _LiveblocksError extends Error {
+  
+  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) {
@@ -6201,15 +6336,15 @@ function installBackgroundTabSpy() {
   const doc = typeof document !== "undefined" ? document : void 0;
   const inBackgroundSince = { current: null };
   function onVisibilityChange() {
-    if (_optionalChain([doc, 'optionalAccess', _124 => _124.visibilityState]) === "hidden") {
+    if (_optionalChain([doc, 'optionalAccess', _132 => _132.visibilityState]) === "hidden") {
       inBackgroundSince.current = _nullishCoalesce(inBackgroundSince.current, () => ( Date.now()));
     } else {
       inBackgroundSince.current = null;
     }
   }
-  _optionalChain([doc, 'optionalAccess', _125 => _125.addEventListener, 'call', _126 => _126("visibilitychange", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _133 => _133.addEventListener, 'call', _134 => _134("visibilitychange", onVisibilityChange)]);
   const unsub = () => {
-    _optionalChain([doc, 'optionalAccess', _127 => _127.removeEventListener, 'call', _128 => _128("visibilitychange", onVisibilityChange)]);
+    _optionalChain([doc, 'optionalAccess', _135 => _135.removeEventListener, 'call', _136 => _136("visibilitychange", onVisibilityChange)]);
   };
   return [inBackgroundSince, unsub];
 }
@@ -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,
@@ -6390,7 +6529,7 @@ function createRoom(options, config) {
       }
     },
     assertStorageIsWritable: () => {
-      const scopes = _optionalChain([context, 'access', _129 => _129.dynamicSessionInfoSig, 'access', _130 => _130.get, 'call', _131 => _131(), 'optionalAccess', _132 => _132.scopes]);
+      const scopes = _optionalChain([context, 'access', _137 => _137.dynamicSessionInfoSig, 'access', _138 => _138.get, 'call', _139 => _139(), 'optionalAccess', _140 => _140.scopes]);
       if (scopes === void 0) {
         return;
       }
@@ -6410,7 +6549,6 @@ function createRoom(options, config) {
     self: makeEventSource(),
     myPresence: makeEventSource(),
     others: makeEventSource(),
-    error: makeEventSource(),
     storageBatch: makeEventSource(),
     history: makeEventSource(),
     storageDidLoad: makeEventSource(),
@@ -6446,7 +6584,7 @@ function createRoom(options, config) {
   }
   function sendMessages(messages) {
     const serializedPayload = JSON.stringify(messages);
-    const nonce = _optionalChain([context, 'access', _133 => _133.dynamicSessionInfoSig, 'access', _134 => _134.get, 'call', _135 => _135(), 'optionalAccess', _136 => _136.nonce]);
+    const nonce = _optionalChain([context, 'access', _141 => _141.dynamicSessionInfoSig, 'access', _142 => _142.get, 'call', _143 => _143(), 'optionalAccess', _144 => _144.nonce]);
     if (config.unstable_fallbackToHTTP && nonce) {
       const size = new TextEncoder().encode(serializedPayload).length;
       if (size > MAX_SOCKET_MESSAGE_SIZE) {
@@ -6504,7 +6642,7 @@ function createRoom(options, config) {
     } else {
       context.root = LiveObject._fromItems(message.items, pool);
     }
-    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _137 => _137.get, 'call', _138 => _138(), 'optionalAccess', _139 => _139.canWrite]), () => ( true));
+    const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _145 => _145.get, 'call', _146 => _146(), 'optionalAccess', _147 => _147.canWrite]), () => ( true));
     const stackSizeBefore = context.undoStack.length;
     for (const key in context.initialStorage) {
       if (context.root.get(key) === void 0) {
@@ -6707,7 +6845,7 @@ function createRoom(options, config) {
     }
     context.myPresence.patch(patch);
     if (context.activeBatch) {
-      if (_optionalChain([options2, 'optionalAccess', _140 => _140.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _148 => _148.addToHistory])) {
         context.activeBatch.reverseOps.unshift({
           type: "presence",
           data: oldValues
@@ -6716,7 +6854,7 @@ function createRoom(options, config) {
       context.activeBatch.updates.presence = true;
     } else {
       flushNowOrSoon();
-      if (_optionalChain([options2, 'optionalAccess', _141 => _141.addToHistory])) {
+      if (_optionalChain([options2, 'optionalAccess', _149 => _149.addToHistory])) {
         addToUndoStack([{ type: "presence", data: oldValues }]);
       }
       notify({ presence: true });
@@ -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",
@@ -6907,7 +7051,7 @@ function createRoom(options, config) {
           if (process.env.NODE_ENV !== "production") {
             const traces = /* @__PURE__ */ new Set();
             for (const opId of message.opIds) {
-              const trace = _optionalChain([context, 'access', _142 => _142.opStackTraces, 'optionalAccess', _143 => _143.get, 'call', _144 => _144(opId)]);
+              const trace = _optionalChain([context, 'access', _150 => _150.opStackTraces, 'optionalAccess', _151 => _151.get, 'call', _152 => _152(opId)]);
               if (trace) {
                 traces.add(trace);
               }
@@ -7040,7 +7184,7 @@ ${Array.from(traces).join("\n\n")}`
     const unacknowledgedOps = new Map(context.unacknowledgedOps);
     createOrUpdateRootFromMessage(message);
     applyAndSendOps(unacknowledgedOps);
-    _optionalChain([_resolveStoragePromise, 'optionalCall', _145 => _145()]);
+    _optionalChain([_resolveStoragePromise, 'optionalCall', _153 => _153()]);
     notifyStorageStatus();
     eventHub.storageDidLoad.notify();
   }
@@ -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,
@@ -7262,8 +7405,8 @@ ${Array.from(traces).join("\n\n")}`
   async function getThreads(options2) {
     return httpClient.getThreads({
       roomId,
-      query: _optionalChain([options2, 'optionalAccess', _146 => _146.query]),
-      cursor: _optionalChain([options2, 'optionalAccess', _147 => _147.cursor])
+      query: _optionalChain([options2, 'optionalAccess', _154 => _154.query]),
+      cursor: _optionalChain([options2, 'optionalAccess', _155 => _155.cursor])
     });
   }
   async function getThread(threadId) {
@@ -7364,7 +7507,7 @@ ${Array.from(traces).join("\n\n")}`
   function getNotificationSettings(options2) {
     return httpClient.getNotificationSettings({
       roomId,
-      signal: _optionalChain([options2, 'optionalAccess', _148 => _148.signal])
+      signal: _optionalChain([options2, 'optionalAccess', _156 => _156.signal])
     });
   }
   function updateNotificationSettings(settings) {
@@ -7386,7 +7529,7 @@ ${Array.from(traces).join("\n\n")}`
     {
       [kInternal]: {
         get presenceBuffer() {
-          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _149 => _149.buffer, 'access', _150 => _150.presenceUpdates, 'optionalAccess', _151 => _151.data]), () => ( null)));
+          return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _157 => _157.buffer, 'access', _158 => _158.presenceUpdates, 'optionalAccess', _159 => _159.data]), () => ( null)));
         },
         // prettier-ignore
         get undoStack() {
@@ -7401,9 +7544,9 @@ ${Array.from(traces).join("\n\n")}`
           return context.yjsProvider;
         },
         setYjsProvider(newProvider) {
-          _optionalChain([context, 'access', _152 => _152.yjsProvider, 'optionalAccess', _153 => _153.off, 'call', _154 => _154("status", yjsStatusDidChange)]);
+          _optionalChain([context, 'access', _160 => _160.yjsProvider, 'optionalAccess', _161 => _161.off, 'call', _162 => _162("status", yjsStatusDidChange)]);
           context.yjsProvider = newProvider;
-          _optionalChain([newProvider, 'optionalAccess', _155 => _155.on, 'call', _156 => _156("status", yjsStatusDidChange)]);
+          _optionalChain([newProvider, 'optionalAccess', _163 => _163.on, 'call', _164 => _164("status", yjsStatusDidChange)]);
           context.yjsProviderDidChange.notify();
         },
         yjsProviderDidChange: context.yjsProviderDidChange.observable,
@@ -7433,13 +7576,17 @@ ${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(),
       destroy: () => {
         syncSourceForStorage.destroy();
-        _optionalChain([context, 'access', _157 => _157.yjsProvider, 'optionalAccess', _158 => _158.off, 'call', _159 => _159("status", yjsStatusDidChange)]);
+        _optionalChain([context, 'access', _165 => _165.yjsProvider, 'optionalAccess', _166 => _166.off, 'call', _167 => _167("status", yjsStatusDidChange)]);
         syncSourceForYjs.destroy();
         uninstallBgTabSpy();
         managedSocket.destroy();
@@ -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,
@@ -7577,7 +7730,7 @@ function makeClassicSubscribeFn(events) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _160 => _160.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _168 => _168.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -7656,8 +7809,8 @@ function createClient(options) {
     const userId = token.k === "sec-legacy" /* SECRET_LEGACY */ ? token.id : token.uid;
     currentUserId.set(() => userId);
   });
-  const fetchPolyfill = _optionalChain([clientOptions, 'access', _161 => _161.polyfills, 'optionalAccess', _162 => _162.fetch]) || /* istanbul ignore next */
-  _optionalChain([globalThis, 'access', _163 => _163.fetch, 'optionalAccess', _164 => _164.bind, 'call', _165 => _165(globalThis)]);
+  const fetchPolyfill = _optionalChain([clientOptions, 'access', _169 => _169.polyfills, 'optionalAccess', _170 => _170.fetch]) || /* istanbul ignore next */
+  _optionalChain([globalThis, 'access', _171 => _171.fetch, 'optionalAccess', _172 => _172.bind, 'call', _173 => _173(globalThis)]);
   const httpClient = createApiClient({
     baseUrl,
     fetchPolyfill,
@@ -7708,12 +7861,13 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _166 => _166.polyfills, 'optionalAccess', _167 => _167.WebSocket])
+            _optionalChain([clientOptions, 'access', _174 => _174.polyfills, 'optionalAccess', _175 => _175.WebSocket])
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),
         enableDebugLogging: clientOptions.enableDebugLogging,
         baseUrl,
+        errorEventSource: liveblocksErrorSource,
         unstable_fallbackToHTTP: !!clientOptions.unstable_fallbackToHTTP,
         unstable_streamData: !!clientOptions.unstable_streamData,
         roomHttpClient: httpClient,
@@ -7730,7 +7884,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _168 => _168.polyfills, 'optionalAccess', _169 => _169.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _176 => _176.polyfills, 'optionalAccess', _177 => _177.atob]) === void 0) {
           throw new Error(
             "You need to polyfill atob to use the client in your environment. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/atob-polyfill"
           );
@@ -7742,7 +7896,7 @@ function createClient(options) {
     return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
-    const room = _optionalChain([roomsById, 'access', _170 => _170.get, 'call', _171 => _171(roomId), 'optionalAccess', _172 => _172.room]);
+    const room = _optionalChain([roomsById, 'access', _178 => _178.get, 'call', _179 => _179(roomId), 'optionalAccess', _180 => _180.room]);
     return room ? room : null;
   }
   function logout() {
@@ -7762,7 +7916,7 @@ function createClient(options) {
   const batchedResolveUsers = new Batch(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _173 => _173({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _181 => _181({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -7780,7 +7934,7 @@ function createClient(options) {
   const batchedResolveRoomsInfo = new Batch(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _174 => _174({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _182 => _182({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -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";
@@ -7832,7 +7987,7 @@ function createClient(options) {
       }
     };
     const win = typeof window !== "undefined" ? window : void 0;
-    _optionalChain([win, 'optionalAccess', _175 => _175.addEventListener, 'call', _176 => _176("beforeunload", maybePreventClose)]);
+    _optionalChain([win, 'optionalAccess', _183 => _183.addEventListener, 'call', _184 => _184("beforeunload", maybePreventClose)]);
   }
   const client = Object.defineProperty(
     {
@@ -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,
@@ -7949,7 +8112,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _177 => _177.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _185 => _185.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -7959,13 +8122,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _178 => _178(block)]);
+        _optionalChain([visitor, 'optionalCall', _186 => _186(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _179 => _179(inline)]);
+          _optionalChain([visitor, 'optionalCall', _187 => _187(inline)]);
         }
       }
     }
@@ -7990,7 +8153,7 @@ async function resolveUsersInCommentBody(body, resolveUsers) {
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _180 => _180[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _188 => _188[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -8117,7 +8280,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => _nullishCoalesce(element.text, () => ( element.url)),
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _181 => _181.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _189 => _189.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -8147,7 +8310,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${_nullishCoalesce(element.text, () => ( element.url))}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _182 => _182.name]), () => ( element.id))}</span>`;
+    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _190 => _190.name]), () => ( element.id))}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -8177,19 +8340,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${_nullishCoalesce(element.text, () => ( element.url))}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _191 => _191.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _184 => _184.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _185 => _185.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _192 => _192.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _193 => _193.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _186 => _186.elements])
+    ..._optionalChain([options, 'optionalAccess', _194 => _194.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _187 => _187.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _195 => _195.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -8480,12 +8643,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _188 => _188.updates, 'access', _189 => _189[key], 'optionalAccess', _190 => _190.type]) === "update") {
+          if (_optionalChain([update, 'access', _196 => _196.updates, 'access', _197 => _197[key], 'optionalAccess', _198 => _198.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _191 => _191.updates, 'access', _192 => _192[key], 'optionalAccess', _193 => _193.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _199 => _199.updates, 'access', _200 => _200[key], 'optionalAccess', _201 => _201.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8546,12 +8709,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _194 => _194.updates, 'access', _195 => _195[key], 'optionalAccess', _196 => _196.type]) === "update") {
+          if (_optionalChain([update, 'access', _202 => _202.updates, 'access', _203 => _203[key], 'optionalAccess', _204 => _204.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _197 => _197.updates, 'access', _198 => _198[key], 'optionalAccess', _199 => _199.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _205 => _205.updates, 'access', _206 => _206[key], 'optionalAccess', _207 => _207.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8622,9 +8785,9 @@ function makePoller(callback, intervalMs, options) {
   const startTime = performance.now();
   const doc = typeof document !== "undefined" ? document : void 0;
   const win = typeof window !== "undefined" ? window : void 0;
-  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _200 => _200.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
+  const maxStaleTimeMs = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _208 => _208.maxStaleTimeMs]), () => ( Number.POSITIVE_INFINITY));
   const context = {
-    inForeground: _optionalChain([doc, 'optionalAccess', _201 => _201.visibilityState]) !== "hidden",
+    inForeground: _optionalChain([doc, 'optionalAccess', _209 => _209.visibilityState]) !== "hidden",
     lastSuccessfulPollAt: startTime,
     count: 0,
     backoff: 0
@@ -8702,10 +8865,10 @@ function makePoller(callback, intervalMs, options) {
     pollNowIfStale();
   }
   function onVisibilityChange() {
-    setInForeground(_optionalChain([doc, 'optionalAccess', _202 => _202.visibilityState]) !== "hidden");
+    setInForeground(_optionalChain([doc, 'optionalAccess', _210 => _210.visibilityState]) !== "hidden");
   }
-  _optionalChain([doc, 'optionalAccess', _203 => _203.addEventListener, 'call', _204 => _204("visibilitychange", onVisibilityChange)]);
-  _optionalChain([win, 'optionalAccess', _205 => _205.addEventListener, 'call', _206 => _206("online", onVisibilityChange)]);
+  _optionalChain([doc, 'optionalAccess', _211 => _211.addEventListener, 'call', _212 => _212("visibilitychange", onVisibilityChange)]);
+  _optionalChain([win, 'optionalAccess', _213 => _213.addEventListener, 'call', _214 => _214("online", onVisibilityChange)]);
   fsm.start();
   return {
     inc,
@@ -8921,5 +9084,8 @@ var NotificationsApiError = HttpError;
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.MutableSignal = MutableSignal; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createThreadId = createThreadId; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.kInternal = kInternal; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
+
+
+
+exports.ClientMsgCode = ClientMsgCode; exports.CommentsApiError = CommentsApiError; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MutableSignal = MutableSignal; exports.NotificationsApiError = NotificationsApiError; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.ackOp = ackOp; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToThreadData = convertToThreadData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createThreadId = createThreadId; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.generateCommentUrl = generateCommentUrl; exports.getMentionedIdsFromCommentBody = getMentionedIdsFromCommentBody; exports.html = html; exports.htmlSafe = htmlSafe; exports.isChildCrdt = isChildCrdt; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.isStartsWithOperator = isStartsWithOperator; exports.kInternal = kInternal; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.raise = raise; exports.resolveUsersInCommentBody = resolveUsersInCommentBody; exports.shallow = shallow; exports.stringify = stringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toAbsoluteUrl = toAbsoluteUrl; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map