@liveblocks/core 3.12.1 → 3.13.0-ack1

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.12.1";
+var PKG_VERSION = "3.13.0-ack1";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -3092,6 +3092,7 @@ var ServerMsgCode = Object.freeze({
   // For Storage
   INITIAL_STORAGE_STATE: 200,
   UPDATE_STORAGE: 201,
+  STORAGE_ACK: 202,
   // For Yjs Docs
   UPDATE_YDOC: 300,
   // For Comments
@@ -5926,10 +5927,6 @@ var OpCode = Object.freeze({
   ACK: 9
   // Will only appear in v8+
 });
-function isAck(op) {
-  return op.type === OpCode.ACK || // >= v8
-  op.type === OpCode.DELETE_CRDT && op.id === "ACK";
-}
 
 // src/crdts/AbstractCrdt.ts
 function createManagedPool(roomId, options) {
@@ -6384,7 +6381,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       };
     }
   }
-  #applySetAck(op) {
+  #applySetFixop(op) {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
@@ -6494,7 +6491,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       reverse: []
     };
   }
-  #applyInsertAck(op) {
+  #applyInsertFixop(op) {
     const existingItem = this.#items.find((item) => item._id === op.id);
     const key = asPos(op.parentKey);
     const itemIndexAtPosition = this._indexOfPosition(key);
@@ -6616,16 +6613,16 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (op.intent === "set") {
       if (source === 1 /* REMOTE */) {
         result = this.#applySetRemote(op);
-      } else if (source === 2 /* ACK */) {
-        result = this.#applySetAck(op);
+      } else if (source === 2 /* FIXOP */) {
+        result = this.#applySetFixop(op);
       } else {
         result = this.#applySetUndoRedo(op);
       }
     } else {
       if (source === 1 /* REMOTE */) {
         result = this.#applyRemoteInsert(op);
-      } else if (source === 2 /* ACK */) {
-        result = this.#applyInsertAck(op);
+      } else if (source === 2 /* FIXOP */) {
+        result = this.#applyInsertFixop(op);
       } else {
         result = this.#applyInsertUndoRedo(op);
       }
@@ -6708,7 +6705,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
       };
     }
   }
-  #applySetChildKeyAck(newKey, child) {
+  #applySetChildKeyFixop(newKey, child) {
     const previousKey = nn(child._parentKey);
     if (this.#implicitlyDeletedItems.has(child)) {
       const existingItemIndex = this._indexOfPosition(newKey);
@@ -6789,8 +6786,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
   _setChildKey(newKey, child, source) {
     if (source === 1 /* REMOTE */) {
       return this.#applySetChildKeyRemote(newKey, child);
-    } else if (source === 2 /* ACK */) {
-      return this.#applySetChildKeyAck(newKey, child);
+    } else if (source === 2 /* FIXOP */) {
+      return this.#applySetChildKeyFixop(newKey, child);
     } else {
       return this.#applySetChildKeyUndoRedo(newKey, child);
     }
@@ -7303,7 +7300,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     if (this._pool.getNode(id) !== void 0) {
       return { modified: false };
     }
-    if (source === 2 /* ACK */) {
+    if (source === 2 /* FIXOP */) {
       const lastUpdateOpId = this.#unacknowledgedSet.get(key);
       if (lastUpdateOpId === opId) {
         this.#unacknowledgedSet.delete(key);
@@ -7704,7 +7701,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       }
       return { modified: false };
     }
-    if (source === 0 /* UNDOREDO_RECONNECT */) {
+    if (source === 0 /* LOCAL */) {
       this.#propToLastUpdate.set(key, nn(opId));
     } else if (this.#propToLastUpdate.get(key) === void 0) {
     } else if (this.#propToLastUpdate.get(key) === opId) {
@@ -9110,7 +9107,11 @@ function createRoom(options, config) {
       currentItems.set(id, node._serialize());
     }
     const ops = getTreesDiffOperations(currentItems, new Map(items));
-    const result = applyOps(ops, false);
+    const result = applyOps(
+      ops,
+      /* isLocal */
+      false
+    );
     notify(result.updates);
   }
   function _addToRealUndoStack(historyOps) {
@@ -9191,11 +9192,12 @@ function createRoom(options, config) {
       } else {
         let source;
         if (isLocal) {
-          source = 0 /* UNDOREDO_RECONNECT */;
+          source = 0 /* LOCAL */;
+        } else if (op.opId) {
+          context.unacknowledgedOps.delete(op.opId);
+          source = 2 /* FIXOP */;
         } else {
-          const opId = nn(op.opId);
-          const deleted = context.unacknowledgedOps.delete(opId);
-          source = deleted ? 2 /* ACK */ : 1 /* REMOTE */;
+          source = 1 /* REMOTE */;
         }
         const applyOpResult = applyOp(op, source);
         if (applyOpResult.modified) {
@@ -9226,9 +9228,6 @@ function createRoom(options, config) {
     };
   }
   function applyOp(op, source) {
-    if (isAck(op)) {
-      return { modified: false };
-    }
     switch (op.type) {
       case OpCode.DELETE_OBJECT_KEY:
       case OpCode.UPDATE_OBJECT:
@@ -9237,7 +9236,7 @@ function createRoom(options, config) {
         if (node === void 0) {
           return { modified: false };
         }
-        return node._apply(op, source === 0 /* UNDOREDO_RECONNECT */);
+        return node._apply(op, source === 0 /* LOCAL */);
       }
       case OpCode.SET_PARENT_KEY: {
         const node = context.pool.nodes.get(op.id);
@@ -9408,7 +9407,11 @@ function createRoom(options, config) {
     }
     const messages = [];
     const inOps = Array.from(offlineOps.values());
-    const result = applyOps(inOps, true);
+    const result = applyOps(
+      inOps,
+      /* isLocal */
+      true
+    );
     messages.push({
       type: ClientMsgCode.UPDATE_STORAGE,
       ops: result.ops
@@ -9472,9 +9475,12 @@ function createRoom(options, config) {
           processInitialStorage(message);
           break;
         }
-        // Write event
         case ServerMsgCode.UPDATE_STORAGE: {
-          const applyResult = applyOps(message.ops, false);
+          const applyResult = applyOps(
+            message.ops,
+            /* isLocal */
+            false
+          );
           for (const [key, value] of applyResult.updates.storageUpdates) {
             updates.storageUpdates.set(
               key,
@@ -9483,6 +9489,14 @@ function createRoom(options, config) {
           }
           break;
         }
+        // Since V8. On V7, acks were sent disguised as an Ops in UPDATE_STORAGE messages.
+        case ServerMsgCode.STORAGE_ACK: {
+          for (const opId of message.opIds) {
+            context.unacknowledgedOps.delete(opId);
+          }
+          notifyStorageStatus();
+          break;
+        }
         // Receiving a RejectedOps message in the client means that the server is no
         // longer in sync with the client. Trying to synchronize the client again by
         // rolling back particular Ops may be hard/impossible. It's fine to not try and
@@ -9688,7 +9702,11 @@ function createRoom(options, config) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyOps(historyOps, true);
+    const result = applyOps(
+      historyOps,
+      /* isLocal */
+      true
+    );
     notify(result.updates);
     context.redoStack.push(result.reverse);
     onHistoryChange();
@@ -9708,7 +9726,11 @@ function createRoom(options, config) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyOps(historyOps, true);
+    const result = applyOps(
+      historyOps,
+      /* isLocal */
+      true
+    );
     notify(result.updates);
     context.undoStack.push(result.reverse);
     onHistoryChange();
@@ -10212,7 +10234,7 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
     }
     const url2 = new URL(baseUrl);
     url2.protocol = url2.protocol === "http:" ? "ws" : "wss";
-    url2.pathname = "/v7";
+    url2.pathname = "/v8";
     url2.searchParams.set("roomId", roomId);
     if (authValue.type === "secret") {
       url2.searchParams.set("tok", authValue.token.raw);