@liveblocks/server 1.4.0 → 1.4.2-pre1

package/dist/index.cjs

@@ -129,7 +129,9 @@ var feedMetadataRecordForCreate = _decoders.record.call(void 0,
   (value) => Object.keys(value).length <= MAX_METADATA_COUNT,
   `Must be at most ${MAX_METADATA_COUNT} items`
 );
-var optionalFeedMetadataDecoder = _decoders.optional.call(void 0, feedMetadataRecordForCreate);
+var optionalFeedMetadataDecoder = _decoders.optional.call(void 0, 
+  feedMetadataRecordForCreate
+);
 var feedMetadataUpdateDecoder = _decoders.record.call(void 0, 
   feedMetadataIdDecoder,
   feedMetadataNullableValueDecoder
@@ -476,6 +478,7 @@ function* iterJson(key, data, parent, state) {
       case "LiveMap":
         yield* iterMap(key, data.data, parent, state);
         return;
+      // istanbul ignore next
       default:
         _core.assertNever.call(void 0, data, "Unknown `liveblocksType` field");
     }
@@ -560,7 +563,7 @@ function buildNode2(snapshot2, id) {
   } else if (node.type === _core.CrdtType.MAP) {
     return buildMap2(snapshot2, id);
   } else {
-    return node.data;
+    return _nullishCoalesce(node.data, () => ( null));
   }
 }
 function buildObject2(snapshot2, id, staticData) {
@@ -604,7 +607,7 @@ function* emit2(snapshot2, id) {
   } else if (node.type === _core.CrdtType.MAP) {
     yield* emitMap2(snapshot2, id);
   } else if (node.type === _core.CrdtType.REGISTER) {
-    yield JSON.stringify(node.data);
+    yield JSON.stringify(_nullishCoalesce(node.data, () => ( null)));
   }
 }
 function* emitObject2(snapshot2, id, staticJson) {
@@ -825,7 +828,6 @@ function makeMetadataDB(driver) {
 
 
 
-
 var _asyncmutex = require('async-mutex');
 
 var _itertools = require('itertools');
@@ -940,12 +942,10 @@ var Logger = class _Logger {
       }
     });
     this.o = {
-      /* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
       debug: minLevel <= 0 /* DEBUG */ ? makeLogFn(0 /* DEBUG */) : void 0,
       info: minLevel <= 1 /* INFO */ ? makeLogFn(1 /* INFO */) : void 0,
       warn: minLevel <= 2 /* WARNING */ ? makeLogFn(2 /* WARNING */) : void 0,
       error: minLevel <= 3 /* ERROR */ ? makeLogFn(3 /* ERROR */) : void 0
-      /* eslint-enable @typescript-eslint/no-unsafe-enum-comparison */
     };
     this.debug = _nullishCoalesce(this.o.debug, () => ( noop));
     this.info = _nullishCoalesce(this.o.info, () => ( noop));
@@ -968,6 +968,12 @@ var Logger = class _Logger {
 
 
 
+
+
+
+
+
+
 // src/lib/text.ts
 function quote(value) {
   return value !== void 0 ? `'${value}'` : "???";
@@ -1375,6 +1381,17 @@ var InMemoryDriver = class {
        * Yield all nodes as [id, node] pairs. Must always include the root node.
        */
       iter_nodes: () => nodes,
+      /**
+       * Yield each node as a pre-built CompactNode JSON tuple string.
+       *
+       * This implementation IS the canonical reference for the invariant:
+       * iter_nodes_optimized` ≡ `nodeStreamToCompactNodes(iter_nodes())
+       */
+      *iter_nodes_optimized() {
+        for (const compact of _core.nodeStreamToCompactNodes.call(void 0, nodes)) {
+          yield JSON.stringify(compact);
+        }
+      },
       /**
        * Return true iff a node with the given id exists. Must return true for "root".
        */
@@ -1494,6 +1511,7 @@ function nodeFromCreateChildOp(op2) {
         parentKey: op2.parentKey,
         data: op2.data
       };
+    // istanbul ignore next
     default:
       return _core.assertNever.call(void 0, op2, "Unknown op code");
   }
@@ -1562,6 +1580,7 @@ var Storage = class {
         return await this.applyDeleteObjectKeyOp(op2);
       case _core.OpCode.DELETE_CRDT:
         return await this.applyDeleteCrdtOp(op2);
+      // istanbul ignore next
       default:
         if (process.env.NODE_ENV === "production") {
           return ignore(op2);
@@ -1584,6 +1603,7 @@ var Storage = class {
         if (op2.type === _core.OpCode.CREATE_REGISTER) {
           return ignore(op2);
         }
+      // fall through
       case _core.CrdtType.MAP:
         await this.loadedDriver.set_child(op2.id, node, true);
         return accept(op2);
@@ -1591,6 +1611,7 @@ var Storage = class {
         return this.createChildAsListItem(op2, node);
       case _core.CrdtType.REGISTER:
         return ignore(op2);
+      // istanbul ignore next
       default:
         return _core.assertNever.call(void 0, parent, "Unhandled CRDT type");
     }
@@ -1731,6 +1752,7 @@ var _jsbase64 = require('js-base64');
 
 var _yjs = require('yjs'); var Y = _interopRequireWildcard(_yjs);
 var UPDATE_COUNT_THRESHOLD = 1e3;
+var MERGE_SHRINK_THRESHOLD = 0.8;
 var YjsStorage = class {
   constructor(driver, updateCountThreshold = UPDATE_COUNT_THRESHOLD) {
     __publicField(this, "driver");
@@ -1748,15 +1770,16 @@ var YjsStorage = class {
       await this.driver.delete_y_updates(docId, storedKeys);
       this.storedKeysById.set(docId, [newKey]);
     });
-    __publicField(this, "_loadYDocFromDurableStorage", async (doc, docId) => {
+    __publicField(this, "_loadYDocFromDurableStorage", async (_logger, doc, docId) => {
       const docUpdates = Object.fromEntries(
         await this.driver.iter_y_updates(docId)
       );
       const updates = Object.values(docUpdates);
+      const beforeSize = updates.reduce((acc, update) => acc + update.length, 0);
       const newupdate = Y.mergeUpdates(updates);
       const storedKeys = Object.keys(docUpdates);
       Y.applyUpdate(doc, newupdate);
-      if (this.shouldCompact(storedKeys)) {
+      if (this.shouldCompactByKeyCount(storedKeys) || this.shouldCompactBySize(beforeSize, newupdate.length)) {
         await this._compactYJSUpdates(doc, docId, storedKeys);
       } else {
         this.storedKeysById.set(docId, storedKeys);
@@ -1775,8 +1798,8 @@ var YjsStorage = class {
   // ------------------------------------------------------------------------------------
   // Public API
   // ------------------------------------------------------------------------------------
-  async getYDoc(docId) {
-    const doc = await this.loadDocByIdIfNotAlreadyLoaded(docId);
+  async getYDoc(logger, docId) {
+    const doc = await this.loadDocByIdIfNotAlreadyLoaded(logger, docId);
     return doc;
   }
   /**
@@ -1796,7 +1819,7 @@ var YjsStorage = class {
     return _jsbase64.Base64.fromUint8Array(update);
   }
   async getYDocUpdateBinary(logger, stateVector = "", guid, isV2 = false) {
-    const doc = guid !== void 0 ? await this.getYSubdoc(guid) : this.doc;
+    const doc = guid !== void 0 ? await this.getYSubdoc(logger, guid) : this.doc;
     if (!doc) {
       return null;
     }
@@ -1813,15 +1836,15 @@ var YjsStorage = class {
     }
     return Y.encodeStateAsUpdate(doc, encodedTargetVector);
   }
-  async getYStateVector(guid) {
-    const doc = guid !== void 0 ? await this.getYSubdoc(guid) : this.doc;
+  async getYStateVector(logger, guid) {
+    const doc = guid !== void 0 ? await this.getYSubdoc(logger, guid) : this.doc;
     if (!doc) {
       return null;
     }
     return _jsbase64.Base64.fromUint8Array(Y.encodeStateVector(doc));
   }
-  async getSnapshotHash(options) {
-    const doc = options.guid !== void 0 ? await this.getYSubdoc(options.guid) : this.doc;
+  async getSnapshotHash(logger, options) {
+    const doc = options.guid !== void 0 ? await this.getYSubdoc(logger, options.guid) : this.doc;
     if (!doc) {
       return null;
     }
@@ -1835,7 +1858,7 @@ var YjsStorage = class {
    *   snapshotHash: the hash of the new snapshot
    */
   async addYDocUpdate(logger, update, guid, isV2) {
-    const doc = guid !== void 0 ? await this.getYSubdoc(guid) : this.doc;
+    const doc = guid !== void 0 ? await this.getYSubdoc(logger, guid) : this.doc;
     if (!doc) {
       throw new Error(`YDoc with guid ${guid} not found`);
     }
@@ -1860,20 +1883,20 @@ var YjsStorage = class {
       );
     }
   }
-  loadDocByIdIfNotAlreadyLoaded(docId) {
+  loadDocByIdIfNotAlreadyLoaded(logger, docId) {
     let loaded$ = this.initPromisesById.get(docId);
     let doc = docId === ROOT_YDOC_ID ? this.doc : this.findYSubdocByGuid(docId);
     if (!doc) {
       doc = new Y.Doc();
     }
     if (loaded$ === void 0) {
-      loaded$ = this._loadYDocFromDurableStorage(doc, docId);
+      loaded$ = this._loadYDocFromDurableStorage(logger, doc, docId);
       this.initPromisesById.set(docId, loaded$);
     }
     return loaded$;
   }
-  async load(_logger) {
-    await this.loadDocByIdIfNotAlreadyLoaded(ROOT_YDOC_ID);
+  async load(logger) {
+    await this.loadDocByIdIfNotAlreadyLoaded(logger, ROOT_YDOC_ID);
   }
   /**
    * Unloads the Yjs documents from memory.
@@ -1916,12 +1939,12 @@ var YjsStorage = class {
     );
   }
   // gets a subdoc, it will be loaded if not already loaded
-  async getYSubdoc(guid) {
+  async getYSubdoc(logger, guid) {
     const subdoc = this.findYSubdocByGuid(guid);
     if (!subdoc) {
       return null;
     }
-    await this.loadDocByIdIfNotAlreadyLoaded(guid);
+    await this.loadDocByIdIfNotAlreadyLoaded(logger, guid);
     return subdoc;
   }
   // When the YJS doc changes, update it in durable storage
@@ -1929,7 +1952,7 @@ var YjsStorage = class {
     const v1update = isV2 ? Y.convertUpdateFormatV2ToV1(update) : update;
     const docId = doc.guid === this.doc.guid ? ROOT_YDOC_ID : doc.guid;
     const storedKeys = this.storedKeysById.get(docId);
-    if (this.shouldCompact(storedKeys)) {
+    if (this.shouldCompactByKeyCount(storedKeys)) {
       await this._compactYJSUpdates(doc, docId, storedKeys || []);
       return;
     }
@@ -1941,7 +1964,10 @@ var YjsStorage = class {
       storedKeys.push(newKey);
     }
   }
-  shouldCompact(storedKeys) {
+  shouldCompactBySize(beforeSize, afterSize) {
+    return beforeSize * MERGE_SHRINK_THRESHOLD > afterSize;
+  }
+  shouldCompactByKeyCount(storedKeys) {
     if (!storedKeys) {
       return false;
     }
@@ -2027,6 +2053,7 @@ function isLeasedSessionExpired(leasedSession) {
 }
 
 // src/Room.ts
+var MB = 1024 * 1024;
 var messagesDecoder = _decoders.array.call(void 0, clientMsgDecoder);
 var ServerMsgCode2 = { ..._core.ServerMsgCode, ...FeedMsgCode };
 var HIGHEST_PROTOCOL_VERSION = Math.max(
@@ -2040,6 +2067,11 @@ var SERVER_MSG_CODE_NAMES = Object.fromEntries(
 var BLACK_HOLE = new Logger([
   /* No targets, i.e. black hole logger */
 ]);
+function groupNodesForWebSocketMessages(input) {
+  const MAX_SIZE = 16 * MB;
+  const idealSize = (chunkIndex) => chunkIndex < 3 ? 1 * MB : Math.min(8, chunkIndex - 1) * MB;
+  return _itertools.chunkedByCost.call(void 0, input, (tup) => tup.length, MAX_SIZE, idealSize);
+}
 function collectSideEffects() {
   const deferred = [];
   return {
@@ -2173,7 +2205,7 @@ var BackendSession = class extends BrowserSession {
     super(ticket, socket, debug);
   }
 };
-var __debug2, __allowStreaming;
+var __debug2;
 var Room = class {
   constructor(meta, options) {
     //              ^^^^^^^^^^ User-defined Room Metadata, Session Metadata, and Client Metadata
@@ -2195,29 +2227,27 @@ var Room = class {
     __publicField(this, "sessions", new UniqueMap((s) => s.actor));
     __publicField(this, "hooks");
     __privateAdd(this, __debug2);
-    __privateAdd(this, __allowStreaming);
     const driver = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _61 => _61.storage]), () => ( makeNewInMemoryDriver()));
     this.meta = meta;
     this.driver = driver;
     this.logger = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _62 => _62.logger]), () => ( BLACK_HOLE));
-    __privateSet(this, __allowStreaming, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _63 => _63.allowStreaming]), () => ( true)));
     this.hooks = {
-      isClientMsgAllowed: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _64 => _64.hooks, 'optionalAccess', _65 => _65.isClientMsgAllowed]), () => ( (() => {
+      isClientMsgAllowed: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _63 => _63.hooks, 'optionalAccess', _64 => _64.isClientMsgAllowed]), () => ( (() => {
         return {
           allowed: true
         };
       }))),
       // YYY .load() isn't called on the RoomServer yet! As soon as it does, these hooks will get called
-      onRoomWillLoad: _optionalChain([options, 'optionalAccess', _66 => _66.hooks, 'optionalAccess', _67 => _67.onRoomWillLoad]),
-      onRoomDidLoad: _optionalChain([options, 'optionalAccess', _68 => _68.hooks, 'optionalAccess', _69 => _69.onRoomDidLoad]),
-      onRoomWillUnload: _optionalChain([options, 'optionalAccess', _70 => _70.hooks, 'optionalAccess', _71 => _71.onRoomWillUnload]),
-      onRoomDidUnload: _optionalChain([options, 'optionalAccess', _72 => _72.hooks, 'optionalAccess', _73 => _73.onRoomDidUnload]),
-      onSessionDidStart: _optionalChain([options, 'optionalAccess', _74 => _74.hooks, 'optionalAccess', _75 => _75.onSessionDidStart]),
-      onSessionDidEnd: _optionalChain([options, 'optionalAccess', _76 => _76.hooks, 'optionalAccess', _77 => _77.onSessionDidEnd]),
-      postClientMsgStorageDidUpdate: _optionalChain([options, 'optionalAccess', _78 => _78.hooks, 'optionalAccess', _79 => _79.postClientMsgStorageDidUpdate]),
-      postClientMsgYdocDidUpdate: _optionalChain([options, 'optionalAccess', _80 => _80.hooks, 'optionalAccess', _81 => _81.postClientMsgYdocDidUpdate])
+      onRoomWillLoad: _optionalChain([options, 'optionalAccess', _65 => _65.hooks, 'optionalAccess', _66 => _66.onRoomWillLoad]),
+      onRoomDidLoad: _optionalChain([options, 'optionalAccess', _67 => _67.hooks, 'optionalAccess', _68 => _68.onRoomDidLoad]),
+      onRoomWillUnload: _optionalChain([options, 'optionalAccess', _69 => _69.hooks, 'optionalAccess', _70 => _70.onRoomWillUnload]),
+      onRoomDidUnload: _optionalChain([options, 'optionalAccess', _71 => _71.hooks, 'optionalAccess', _72 => _72.onRoomDidUnload]),
+      onSessionDidStart: _optionalChain([options, 'optionalAccess', _73 => _73.hooks, 'optionalAccess', _74 => _74.onSessionDidStart]),
+      onSessionDidEnd: _optionalChain([options, 'optionalAccess', _75 => _75.hooks, 'optionalAccess', _76 => _76.onSessionDidEnd]),
+      postClientMsgStorageDidUpdate: _optionalChain([options, 'optionalAccess', _77 => _77.hooks, 'optionalAccess', _78 => _78.postClientMsgStorageDidUpdate]),
+      postClientMsgYdocDidUpdate: _optionalChain([options, 'optionalAccess', _79 => _79.hooks, 'optionalAccess', _80 => _80.postClientMsgYdocDidUpdate])
     };
-    __privateSet(this, __debug2, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _82 => _82.enableDebugLogging]), () => ( false)));
+    __privateSet(this, __debug2, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _81 => _81.enableDebugLogging]), () => ( false)));
   }
   get loadingState() {
     if (this._loadData$ === null) {
@@ -2291,13 +2321,13 @@ var Room = class {
    * room will be reloaded from storage.
    */
   unload(ctx) {
-    _optionalChain([this, 'access', _83 => _83.hooks, 'access', _84 => _84.onRoomWillUnload, 'optionalCall', _85 => _85(ctx)]);
+    _optionalChain([this, 'access', _82 => _82.hooks, 'access', _83 => _83.onRoomWillUnload, 'optionalCall', _84 => _84(ctx)]);
     if (this._data) {
       this.storage.unload();
       this.yjsStorage.unload();
     }
     this._loadData$ = null;
-    _optionalChain([this, 'access', _86 => _86.hooks, 'access', _87 => _87.onRoomDidUnload, 'optionalCall', _88 => _88(ctx)]);
+    _optionalChain([this, 'access', _85 => _85.hooks, 'access', _86 => _86.onRoomDidUnload, 'optionalCall', _87 => _87(ctx)]);
   }
   /**
    * Issues a Ticket with a new/unique actor ID
@@ -2311,17 +2341,17 @@ var Room = class {
    * unused Ticket will simply get garbage collected.
    */
   async createTicket(options) {
-    const actor$ = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _89 => _89.actor]), () => ( this.getNextActor()));
+    const actor$ = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _88 => _88.actor]), () => ( this.getNextActor()));
     const sessionKey = _nanoid.nanoid.call(void 0, );
-    const info = _optionalChain([options, 'optionalAccess', _90 => _90.info]);
+    const info = _optionalChain([options, 'optionalAccess', _89 => _89.info]);
     const ticket = {
-      version: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _91 => _91.version]), () => ( HIGHEST_PROTOCOL_VERSION)),
+      version: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _90 => _90.version]), () => ( HIGHEST_PROTOCOL_VERSION)),
       actor: await actor$,
       sessionKey,
-      meta: _optionalChain([options, 'optionalAccess', _92 => _92.meta]),
-      publicMeta: _optionalChain([options, 'optionalAccess', _93 => _93.publicMeta]),
-      user: _optionalChain([options, 'optionalAccess', _94 => _94.id]) ? { id: options.id, info } : { anonymousId: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _95 => _95.anonymousId]), () => ( _nanoid.nanoid.call(void 0, ))), info },
-      scopes: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _96 => _96.scopes]), () => ( ["room:write"]))
+      meta: _optionalChain([options, 'optionalAccess', _91 => _91.meta]),
+      publicMeta: _optionalChain([options, 'optionalAccess', _92 => _92.publicMeta]),
+      user: _optionalChain([options, 'optionalAccess', _93 => _93.id]) ? { id: options.id, info } : { anonymousId: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _94 => _94.anonymousId]), () => ( _nanoid.nanoid.call(void 0, ))), info },
+      scopes: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _95 => _95.scopes]), () => ( ["room:write"]))
     };
     if (__privateGet(this, __debug2)) {
       console.log(`new ticket created: ${JSON.stringify(ticket)}`);
@@ -2455,7 +2485,7 @@ var Room = class {
       ctx,
       defer
     );
-    const p$ = _optionalChain([this, 'access', _97 => _97.hooks, 'access', _98 => _98.onSessionDidStart, 'optionalCall', _99 => _99(newSession, ctx)]);
+    const p$ = _optionalChain([this, 'access', _96 => _96.hooks, 'access', _97 => _97.onSessionDidStart, 'optionalCall', _98 => _98(newSession, ctx)]);
     if (p$) defer(p$);
   }
   /**
@@ -2479,7 +2509,7 @@ var Room = class {
       for (const other of this.otherSessions(key)) {
         other.send({ type: ServerMsgCode2.USER_LEFT, actor: session.actor });
       }
-      const p$ = _optionalChain([this, 'access', _100 => _100.hooks, 'access', _101 => _101.onSessionDidEnd, 'optionalCall', _102 => _102(session, ctx)]);
+      const p$ = _optionalChain([this, 'access', _99 => _99.hooks, 'access', _100 => _100.onSessionDidEnd, 'optionalCall', _101 => _101(session, ctx)]);
       if (p$) defer(p$);
     }
   }
@@ -2510,7 +2540,7 @@ var Room = class {
     );
   }) {
     const text = typeof data === "string" ? data : _core.raise.call(void 0, "Unsupported message format");
-    _optionalChain([this, 'access', _103 => _103.sessions, 'access', _104 => _104.get, 'call', _105 => _105(key), 'optionalAccess', _106 => _106.markActive, 'call', _107 => _107()]);
+    _optionalChain([this, 'access', _102 => _102.sessions, 'access', _103 => _103.get, 'call', _104 => _104(key), 'optionalAccess', _105 => _105.markActive, 'call', _106 => _106()]);
     if (text === "ping") {
       await this.handlePing(key, ctx);
     } else {
@@ -2865,7 +2895,7 @@ var Room = class {
   }
   // Don't ever manually call this!
   async _load(ctx) {
-    await _optionalChain([this, 'access', _108 => _108.hooks, 'access', _109 => _109.onRoomWillLoad, 'optionalCall', _110 => _110(ctx)]);
+    await _optionalChain([this, 'access', _107 => _107.hooks, 'access', _108 => _108.onRoomWillLoad, 'optionalCall', _109 => _109(ctx)]);
     const storage = await this._loadStorage();
     const yjsStorage = await this._loadYjsStorage();
     this._data = {
@@ -2873,7 +2903,7 @@ var Room = class {
       storage,
       yjsStorage
     };
-    await _optionalChain([this, 'access', _111 => _111.hooks, 'access', _112 => _112.onRoomDidLoad, 'optionalCall', _113 => _113(ctx)]);
+    await _optionalChain([this, 'access', _110 => _110.hooks, 'access', _111 => _111.onRoomDidLoad, 'optionalCall', _112 => _112(ctx)]);
   }
   /**
    * Returns a new, unique, actor ID.
@@ -2905,7 +2935,6 @@ var Room = class {
    * @internal
    * Handles an incoming ping, by sending a pong back.
    */
-  // eslint-disable-next-line @typescript-eslint/require-await
   async handlePing(sessionKey, ctx) {
     const session = this.sessions.get(sessionKey);
     if (session === void 0) {
@@ -2914,7 +2943,7 @@ var Room = class {
     }
     const sent = session.sendPong();
     if (sent !== 0) {
-      await _optionalChain([this, 'access', _114 => _114.hooks, 'access', _115 => _115.onDidPong, 'optionalCall', _116 => _116(ctx)]);
+      await _optionalChain([this, 'access', _113 => _113.hooks, 'access', _114 => _114.onDidPong, 'optionalCall', _115 => _115(ctx)]);
     }
   }
   async _processClientMsg_withExclusiveAccess(sessionKey, messages, ctx, defer) {
@@ -2966,7 +2995,13 @@ var Room = class {
     const toReplyImmediately = [];
     const toReplyAfter = [];
     const replyImmediately = (msg) => {
-      if (Array.isArray(msg)) {
+      if (typeof msg === "string") {
+        if (toReplyImmediately.length > 0) {
+          session.send(toReplyImmediately);
+          toReplyImmediately.length = 0;
+        }
+        session.send(msg);
+      } else if (Array.isArray(msg)) {
         for (const m of msg) {
           toReplyImmediately.push(m);
         }
@@ -3024,24 +3059,10 @@ var Room = class {
       }
       case _core.ClientMsgCode.FETCH_STORAGE: {
         if (session.version >= 8 /* V8 */) {
-          if (__privateGet(this, __allowStreaming)) {
-            const NODES_PER_CHUNK = 250;
-            for (const chunk of _itertools.chunked.call(void 0, 
-              _core.nodeStreamToCompactNodes.call(void 0, this.storage.loadedDriver.iter_nodes()),
-              NODES_PER_CHUNK
-            )) {
-              replyImmediately({
-                type: ServerMsgCode2.STORAGE_CHUNK,
-                nodes: chunk
-              });
-            }
-          } else {
-            replyImmediately({
-              type: ServerMsgCode2.STORAGE_CHUNK,
-              nodes: Array.from(
-                _core.nodeStreamToCompactNodes.call(void 0, this.storage.loadedDriver.iter_nodes())
-              )
-            });
+          const rawStream = this.storage.loadedDriver.iter_nodes_optimized();
+          for (const chunk of groupNodesForWebSocketMessages(rawStream)) {
+            const frame = `{"type":${ServerMsgCode2.STORAGE_CHUNK},"nodes":[${chunk.join(",")}]}`;
+            replyImmediately(frame);
           }
           replyImmediately({ type: ServerMsgCode2.STORAGE_STREAM_END });
         } else {
@@ -3053,7 +3074,7 @@ var Room = class {
         break;
       }
       case _core.ClientMsgCode.UPDATE_STORAGE: {
-        _optionalChain([this, 'access', _117 => _117.driver, 'access', _118 => _118.bump_storage_version, 'optionalCall', _119 => _119()]);
+        _optionalChain([this, 'access', _116 => _116.driver, 'access', _117 => _117.bump_storage_version, 'optionalCall', _118 => _118()]);
         const result = await this.storage.applyOps(msg.ops);
         const opsToForward = result.flatMap(
           (r) => r.action === "accepted" ? [r.op] : []
@@ -3064,6 +3085,7 @@ var Room = class {
               return r.ignoredOpId !== void 0 ? [ackIgnoredOp(r.ignoredOpId)] : [];
             case "accepted":
               return r.fix !== void 0 ? [r.fix] : [];
+            // istanbul ignore next
             default:
               return _core.assertNever.call(void 0, r, "Unhandled case");
           }
@@ -3085,7 +3107,7 @@ var Room = class {
           });
         }
         if (opsToForward.length > 0) {
-          const p$ = _optionalChain([this, 'access', _120 => _120.hooks, 'access', _121 => _121.postClientMsgStorageDidUpdate, 'optionalCall', _122 => _122(ctx)]);
+          const p$ = _optionalChain([this, 'access', _119 => _119.hooks, 'access', _120 => _120.postClientMsgStorageDidUpdate, 'optionalCall', _121 => _121(ctx)]);
           if (p$) defer(p$);
         }
         break;
@@ -3096,8 +3118,8 @@ var Room = class {
         const isV2 = msg.v2;
         const [update, stateVector, snapshotHash] = await Promise.all([
           this.yjsStorage.getYDocUpdate(this.logger, vector, guid, isV2),
-          this.yjsStorage.getYStateVector(guid),
-          this.yjsStorage.getSnapshotHash({ guid, isV2 })
+          this.yjsStorage.getYStateVector(this.logger, guid),
+          this.yjsStorage.getSnapshotHash(this.logger, { guid, isV2 })
         ]);
         if (update !== null && snapshotHash !== null) {
           replyImmediately({
@@ -3136,11 +3158,12 @@ var Room = class {
           defer
         );
         if (result.isUpdated) {
-          const p$ = _optionalChain([this, 'access', _123 => _123.hooks, 'access', _124 => _124.postClientMsgYdocDidUpdate, 'optionalCall', _125 => _125(ctx, session)]);
+          const p$ = _optionalChain([this, 'access', _122 => _122.hooks, 'access', _123 => _123.postClientMsgYdocDidUpdate, 'optionalCall', _124 => _124(ctx, session)]);
           if (p$) defer(p$);
         }
         break;
       }
+      // Feed messages
       case FeedMsgCode.FETCH_FEEDS: {
         const fetchMsg = msg;
         const [result, err] = await tryCatch(
@@ -3190,8 +3213,7 @@ var Room = class {
         const [feed, err] = await tryCatch(
           this.createFeed({
             feedId: addMsg.feedId,
-            metadata: _nullishCoalesce(addMsg.metadata, () => ( {})),
-            timestamp: addMsg.timestamp
+            metadata: _nullishCoalesce(addMsg.metadata, () => ( {}))
           })
         );
         if (err) {
@@ -3253,8 +3275,7 @@ var Room = class {
         const [message, err] = await tryCatch(
           this.addFeedMessage(addMsg.feedId, {
             data: addMsg.data,
-            id: addMsg.id,
-            timestamp: addMsg.timestamp
+            id: addMsg.id
           })
         );
         if (err) {
@@ -3276,8 +3297,7 @@ var Room = class {
           this.updateFeedMessage(
             updateMsg.feedId,
             updateMsg.messageId,
-            updateMsg.data,
-            updateMsg.timestamp
+            updateMsg.data
           )
         );
         if (err) {
@@ -3321,7 +3341,6 @@ var Room = class {
   }
 };
 __debug2 = new WeakMap();
-__allowStreaming = new WeakMap();