@liveblocks/server 1.3.0 → 1.4.1

package/dist/index.cjs

@@ -476,6 +476,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 +561,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 +605,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) {
@@ -940,12 +941,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));
@@ -1494,6 +1493,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 +1562,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 +1585,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 +1593,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 +1734,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 +1752,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 +1780,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 +1801,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 +1818,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 +1840,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 +1865,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 +1921,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 +1934,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 +1946,10 @@ var YjsStorage = class {
       storedKeys.push(newKey);
     }
   }
-  shouldCompact(storedKeys) {
+  shouldCompactBySize(beforeSize, afterSize) {
+    return beforeSize * MERGE_SHRINK_THRESHOLD > afterSize;
+  }
+  shouldCompactByKeyCount(storedKeys) {
     if (!storedKeys) {
       return false;
     }
@@ -2905,7 +2913,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) {
@@ -3064,6 +3071,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");
           }
@@ -3096,8 +3104,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({
@@ -3141,6 +3149,7 @@ var Room = class {
         }
         break;
       }
+      // Feed messages
       case FeedMsgCode.FETCH_FEEDS: {
         const fetchMsg = msg;
         const [result, err] = await tryCatch(
@@ -3190,8 +3199,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 +3261,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 +3283,7 @@ var Room = class {
           this.updateFeedMessage(
             updateMsg.feedId,
             updateMsg.messageId,
-            updateMsg.data,
-            updateMsg.timestamp
+            updateMsg.data
           )
         );
         if (err) {