@liveblocks/core 3.24.3-livetextreplay → 3.24.3

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.24.3-livetextreplay";
+var PKG_VERSION = "3.24.3";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -9852,6 +9852,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
   #acceptedOps = [];
   /** Wait for replay history before applying post-snapshot remote ops. */
   #reconnecting = false;
+  #deferredHistorylessAck = false;
   #bufferedRemoteOps = [];
   /**
    * Creates a new LiveText document.
@@ -9924,6 +9925,14 @@ var LiveText = class _LiveText extends AbstractCrdt {
     throw new Error("LiveText cannot contain child nodes");
   }
   /** @internal */
+  _deferAckWithoutHistory(op) {
+    if (this.#reconnecting && !this.#deferredHistorylessAck && op.opId !== void 0 && op.opId === this.#inFlightOpId && op.history === void 0) {
+      this.#deferredHistorylessAck = true;
+      return true;
+    }
+    return false;
+  }
+  /** @internal */
   _apply(op, source) {
     if (op.type !== OpCode.UPDATE_TEXT) {
       return super._apply(op, source);
@@ -10232,11 +10241,13 @@ var LiveText = class _LiveText extends AbstractCrdt {
   }
   /** Recover the missing server timeline, preserving the normal OT invariants. */
   #reconcileAck(op, source) {
-    const history = nn(
-      op.history,
-      "LiveText replay acknowledgement requires history"
-    );
+    const history = op.history;
+    if (history === void 0) {
+      this._rejectPendingOp(nn(op.opId));
+      return { modified: false, needsStorageResync: true };
+    }
     this.#reconnecting = false;
+    this.#deferredHistorylessAck = false;
     const buffered = this.#bufferedRemoteOps;
     this.#bufferedRemoteOps = [];
     const changes = [];
@@ -10405,6 +10416,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
   _resyncText(data, version, source) {
     if (this.#inFlightOpId !== void 0) {
       this.#reconnecting = true;
+      this.#deferredHistorylessAck = false;
       return void 0;
     }
     this.#confirmed = dataToSegments(data);
@@ -10438,6 +10450,7 @@ var LiveText = class _LiveText extends AbstractCrdt {
     this.#queuedOps = [];
     this.#bufferedRemoteOps = [];
     this.#reconnecting = false;
+    this.#deferredHistorylessAck = false;
   }
   #recordAccepted(version, ops, opId) {
     if (this.#acceptedOps.some((entry) => entry.version === version)) {
@@ -12372,6 +12385,12 @@ function createRoom(options, config) {
     }
     const createdNodeIds = /* @__PURE__ */ new Set();
     for (const op of ops) {
+      if (!isLocal && op.type === OpCode.UPDATE_TEXT && op.opId !== void 0) {
+        const node = context.pool.nodes.get(op.id);
+        if (node !== void 0 && isLiveText(node) && node._deferAckWithoutHistory(op)) {
+          continue;
+        }
+      }
       let source;
       if (isLocal) {
         source = { ...localSource, optimistic: true };
@@ -12386,6 +12405,10 @@ function createRoom(options, config) {
         source = REMOTE;
       }
       const applyOpResult = applyOp(op, source);
+      if ("needsStorageResync" in applyOpResult) {
+        refreshStorage();
+        flushNowOrSoon();
+      }
       if (applyOpResult.modified) {
         const nodeId = applyOpResult.modified.node._id;
         if (!(nodeId && createdNodeIds.has(nodeId))) {