@liveblocks/server 1.4.1 → 1.4.2-pre2

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
@@ -156,6 +158,14 @@ var jsonObjectYolo = jsonYolo.refine(
 // src/decoders/Op.ts
 
 
+
+
+
+
+
+
+
+var intent = _decoders.oneOf.call(void 0, ["set", "push"]);
 var updateObjectOp = _decoders.object.call(void 0, {
   type: _decoders.constant.call(void 0, _core.OpCode.UPDATE_OBJECT),
   opId: _decoders.string,
@@ -169,7 +179,7 @@ var createObjectOp = _decoders.object.call(void 0, {
   parentId: _decoders.string,
   parentKey: _decoders.string,
   data: jsonObjectYolo,
-  intent: _decoders.optional.call(void 0, _decoders.constant.call(void 0, "set")),
+  intent: _decoders.optional.call(void 0, intent),
   deletedId: _decoders.optional.call(void 0, _decoders.string)
 });
 var createListOp = _decoders.object.call(void 0, {
@@ -178,7 +188,7 @@ var createListOp = _decoders.object.call(void 0, {
   id: _decoders.string,
   parentId: _decoders.string,
   parentKey: _decoders.string,
-  intent: _decoders.optional.call(void 0, _decoders.constant.call(void 0, "set")),
+  intent: _decoders.optional.call(void 0, intent),
   deletedId: _decoders.optional.call(void 0, _decoders.string)
 });
 var createMapOp = _decoders.object.call(void 0, {
@@ -187,7 +197,7 @@ var createMapOp = _decoders.object.call(void 0, {
   id: _decoders.string,
   parentId: _decoders.string,
   parentKey: _decoders.string,
-  intent: _decoders.optional.call(void 0, _decoders.constant.call(void 0, "set")),
+  intent: _decoders.optional.call(void 0, intent),
   deletedId: _decoders.optional.call(void 0, _decoders.string)
 });
 var createRegisterOp = _decoders.object.call(void 0, {
@@ -197,7 +207,7 @@ var createRegisterOp = _decoders.object.call(void 0, {
   parentId: _decoders.string,
   parentKey: _decoders.string,
   data: jsonYolo,
-  intent: _decoders.optional.call(void 0, _decoders.constant.call(void 0, "set")),
+  intent: _decoders.optional.call(void 0, intent),
   deletedId: _decoders.optional.call(void 0, _decoders.string)
 });
 var deleteCrdtOp = _decoders.object.call(void 0, {
@@ -826,7 +836,6 @@ function makeMetadataDB(driver) {
 
 
 
-
 var _asyncmutex = require('async-mutex');
 
 var _itertools = require('itertools');
@@ -967,6 +976,12 @@ var Logger = class _Logger {
 
 
 
+
+
+
+
+
+
 // src/lib/text.ts
 function quote(value) {
   return value !== void 0 ? `'${value}'` : "???";
@@ -1287,6 +1302,16 @@ var InMemoryDriver = class {
       }
       return nextPos;
     }
+    function get_last_sibling(parentId) {
+      let lastPos;
+      for (const siblingKey of revNodes.keysAt(parentId)) {
+        const siblingPos = _core.asPos.call(void 0, siblingKey);
+        if (lastPos === void 0 || siblingPos > lastPos) {
+          lastPos = siblingPos;
+        }
+      }
+      return lastPos;
+    }
     async function set_child(id, node, allowOverwrite = false) {
       const parentNode = nodes.get(node.parentId);
       if (parentNode === void 0) {
@@ -1374,6 +1399,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".
        */
@@ -1395,6 +1431,11 @@ var InMemoryDriver = class {
        * does not have to exist already. Positions compare lexicographically.
        */
       get_next_sibling,
+      /**
+       * Return the position of the last (rightmost) child under parentId, or
+       * undefined if the node has no children.
+       */
+      get_last_sibling,
       /**
        * Insert a child node with the given id.
        *
@@ -1600,8 +1641,8 @@ var Storage = class {
   }
   async createChildAsListItem(op2, node) {
     let fix;
-    const intent = _nullishCoalesce(op2.intent, () => ( "insert"));
-    if (intent === "insert") {
+    const intent2 = _nullishCoalesce(op2.intent, () => ( "insert"));
+    if (intent2 === "insert") {
       const insertedParentKey = await this.insertIntoList(op2.id, node);
       if (insertedParentKey !== node.parentKey) {
         op2 = { ...op2, parentKey: insertedParentKey };
@@ -1613,7 +1654,7 @@ var Storage = class {
         return accept(op2, fix);
       }
       return accept(op2);
-    } else if (intent === "set") {
+    } else if (intent2 === "set") {
       const deletedId = op2.deletedId !== void 0 && op2.deletedId !== op2.id && _optionalChain([this, 'access', _47 => _47.loadedDriver, 'access', _48 => _48.get_node, 'call', _49 => _49(op2.deletedId), 'optionalAccess', _50 => _50.parentId]) === node.parentId ? op2.deletedId : void 0;
       if (deletedId !== void 0) {
         await this.loadedDriver.delete_node(deletedId);
@@ -1630,8 +1671,26 @@ var Storage = class {
       }
       await this.loadedDriver.set_child(op2.id, node, true);
       return accept(op2, fix);
+    } else if (intent2 === "push") {
+      const lastPos = this.loadedDriver.get_last_sibling(node.parentId);
+      const guessedKey = _core.asPos.call(void 0, node.parentKey);
+      const pushedKey = lastPos === void 0 || guessedKey > lastPos ? guessedKey : _core.makePosition.call(void 0, lastPos);
+      await this.loadedDriver.set_child(op2.id, {
+        ...node,
+        parentKey: pushedKey
+      });
+      if (pushedKey !== node.parentKey) {
+        op2 = { ...op2, parentKey: pushedKey };
+        fix = {
+          type: _core.OpCode.SET_PARENT_KEY,
+          id: op2.id,
+          parentKey: pushedKey
+        };
+        return accept(op2, fix);
+      }
+      return accept(op2);
     } else {
-      return _core.assertNever.call(void 0, intent, "Invalid intent");
+      return _core.assertNever.call(void 0, intent2, "Invalid intent");
     }
   }
   async applyDeleteObjectKeyOp(op2) {
@@ -2035,6 +2094,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(
@@ -2048,6 +2108,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 {
@@ -2181,7 +2246,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
@@ -2203,29 +2268,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) {
@@ -2299,13 +2362,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
@@ -2319,17 +2382,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)}`);
@@ -2463,7 +2526,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$);
   }
   /**
@@ -2487,7 +2550,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$);
     }
   }
@@ -2518,7 +2581,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 {
@@ -2873,7 +2936,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 = {
@@ -2881,7 +2944,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.
@@ -2921,7 +2984,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) {
@@ -2973,7 +3036,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);
         }
@@ -3031,24 +3100,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 {
@@ -3060,7 +3115,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] : []
@@ -3093,7 +3148,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;
@@ -3144,7 +3199,7 @@ 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;
@@ -3327,7 +3382,6 @@ var Room = class {
   }
 };
 __debug2 = new WeakMap();
-__allowStreaming = new WeakMap();