@liveblocks/core 3.20.0-exp5 → 3.20.0-exp6

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.20.0-exp5";
+var PKG_VERSION = "3.20.0-exp6";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -5804,6 +5804,9 @@ var UnacknowledgedOps = class {
   #createOpsByPosition = /* @__PURE__ */ new Map();
   // parentId -> (opId -> Create op)
   #createOpsByParent = /* @__PURE__ */ new Map();
+  // opIds of pending ops that were in flight when a connection died, so the
+  // server may already have processed them. See isPossiblyStored().
+  #possiblyStoredOpIds = /* @__PURE__ */ new Set();
   #posKey(parentId, parentKey) {
     return `${parentId}
 ${parentKey}`;
@@ -5843,6 +5846,7 @@ ${parentKey}`;
       return;
     }
     this.#byOpId.delete(opId);
+    this.#possiblyStoredOpIds.delete(opId);
     if (isCreateOp(op)) {
       const posKey = this.#posKey(op.parentId, op.parentKey);
       const atPosition = this.#createOpsByPosition.get(posKey);
@@ -5876,6 +5880,19 @@ ${parentKey}`;
   values() {
     return this.#byOpId.values();
   }
+  isPossiblyStored(opId) {
+    return this.#possiblyStoredOpIds.has(opId);
+  }
+  /**
+   * Mark every currently pending op as possibly stored on the server. Called
+   * when the connection dies: all of these ops were in flight, and their
+   * (possibly lost) acks would have been the only way to know their fate.
+   */
+  markAllAsPossiblyStored() {
+    for (const opId of this.#byOpId.keys()) {
+      this.#possiblyStoredOpIds.add(opId);
+    }
+  }
 };
 
 // src/crdts/AbstractCrdt.ts
@@ -6472,7 +6489,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     return result.modified.updates[0];
   }
-  #applyRemoteInsert(op, fromSnapshot) {
+  #applyRemoteInsert(op) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -6482,7 +6499,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       this.#shiftItemPosition(existingItemIndex, key);
     }
     const { newItem, newIndex } = this.#createAttachItemAndSort(op, key);
-    const bumpDeltas = fromSnapshot ? [] : this.#bumpUnackedPushesAbove(key);
+    const bumpDeltas = this.#bumpUnackedPushesAbove(key);
     return {
       modified: makeUpdate(this, [
         insertDelta(newIndex, newItem),
@@ -6497,6 +6514,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
    * the single source of truth, so an item drops out the instant its op is
    * acked, with no per-instance membership to leak. Yielded in push order.
    *
+   * Excludes ops that may already be stored on the server (they were in
+   * flight when a connection died, so their fate is unknown): the bump
+   * prediction assumes the server has not processed the op yet, which is only
+   * guaranteed for ops sent on the current connection. For these excluded
+   * ops, the server's (re-)ack states the authoritative position; predicting
+   * locally could produce a wrong position that no ack would correct.
+   *
    * Restricted to items currently in `#items`: a pushed node whose op is still
    * pending may have been pulled out of the list (e.g. implicitly deleted by a
    * remote set, or removed by an undo) while still living in the pool, and such
@@ -6510,6 +6534,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
       if (op.intent !== "push") {
         continue;
       }
+      if (this._pool.unacknowledgedOps.isPossiblyStored(op.opId)) {
+        continue;
+      }
       const node = this._pool.getNode(op.id);
       if (node !== void 0 && this.#items.includes(node)) {
         yield node;
@@ -6674,7 +6701,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   /** @internal */
-  _attachChild(op, source, fromSnapshot = false) {
+  _attachChild(op, source) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -6689,7 +6716,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       }
     } else {
       if (source === 1 /* THEIRS */) {
-        result = this.#applyRemoteInsert(op, fromSnapshot);
+        result = this.#applyRemoteInsert(op);
       } else if (source === 2 /* OURS */) {
         result = this.#applyInsertAck(op);
       } else {
@@ -10354,6 +10381,7 @@ function createRoom(options, config) {
   }
   function onDidDisconnect() {
     clearTimeout(context.buffer.flushTimerID);
+    context.unacknowledgedOps.markAllAsPossiblyStored();
   }
   managedSocket.events.onMessage.subscribe(handleServerMessage);
   managedSocket.events.statusDidChange.subscribe(onStatusDidChange);
@@ -10495,11 +10523,7 @@ function createRoom(options, config) {
         currentItems.set(id, crdt._serialize());
       }
       const ops = getTreesDiffOperations(currentItems, nodes);
-      const result = applyRemoteOps(
-        ops,
-        /* fromSnapshot */
-        true
-      );
+      const result = applyRemoteOps(ops);
       notify(result.updates);
     } else {
       context.root = LiveObject._fromItems(
@@ -10581,16 +10605,15 @@ function createRoom(options, config) {
     );
     return { opsToEmit: opsWithOpIds, reverse, updates };
   }
-  function applyRemoteOps(ops, fromSnapshot = false) {
+  function applyRemoteOps(ops) {
     return applyOps(
       [],
       ops,
       /* isLocal */
-      false,
-      fromSnapshot
+      false
     );
   }
-  function applyOps(pframes, ops, isLocal, fromSnapshot = false) {
+  function applyOps(pframes, ops, isLocal) {
     const output = {
       reverse: new Deque(),
       storageUpdates: /* @__PURE__ */ new Map(),
@@ -10626,7 +10649,7 @@ function createRoom(options, config) {
       } else {
         source = 1 /* THEIRS */;
       }
-      const applyOpResult = applyOp(op, source, fromSnapshot);
+      const applyOpResult = applyOp(op, source);
       if (applyOpResult.modified) {
         const nodeId = applyOpResult.modified.node._id;
         if (!(nodeId && createdNodeIds.has(nodeId))) {
@@ -10652,7 +10675,7 @@ function createRoom(options, config) {
       }
     };
   }
-  function applyOp(op, source, fromSnapshot = false) {
+  function applyOp(op, source) {
     if (isIgnoredOp(op)) {
       return { modified: false };
     }
@@ -10693,7 +10716,7 @@ function createRoom(options, config) {
         if (parentNode === void 0) {
           return { modified: false };
         }
-        return parentNode._attachChild(op, source, fromSnapshot);
+        return parentNode._attachChild(op, source);
       }
     }
   }