@liveblocks/core 3.13.0-metadata1 → 3.13.0-metadata2

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.13.0-metadata1";
+var PKG_VERSION = "3.13.0-metadata2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -3104,7 +3104,7 @@ var ServerMsgCode = Object.freeze({
   BROADCASTED_EVENT: 103,
   ROOM_STATE: 104,
   // For Storage
-  INITIAL_STORAGE_STATE: 200,
+  STORAGE_STATE: 200,
   UPDATE_STORAGE: 201,
   // For Yjs Docs
   UPDATE_YDOC: 300,
@@ -5941,9 +5941,8 @@ 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";
+function isAckOp(op) {
+  return op.type === OpCode.DELETE_CRDT && op.id === "ACK";
 }
 
 // src/crdts/AbstractCrdt.ts
@@ -6629,17 +6628,17 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     let result;
     if (op.intent === "set") {
-      if (source === 1 /* REMOTE */) {
+      if (source === 1 /* THEIRS */) {
         result = this.#applySetRemote(op);
-      } else if (source === 2 /* ACK */) {
+      } else if (source === 2 /* OURS */) {
         result = this.#applySetAck(op);
       } else {
         result = this.#applySetUndoRedo(op);
       }
     } else {
-      if (source === 1 /* REMOTE */) {
+      if (source === 1 /* THEIRS */) {
         result = this.#applyRemoteInsert(op);
-      } else if (source === 2 /* ACK */) {
+      } else if (source === 2 /* OURS */) {
         result = this.#applyInsertAck(op);
       } else {
         result = this.#applyInsertUndoRedo(op);
@@ -6802,9 +6801,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /** @internal */
   _setChildKey(newKey, child, source) {
-    if (source === 1 /* REMOTE */) {
+    if (source === 1 /* THEIRS */) {
       return this.#applySetChildKeyRemote(newKey, child);
-    } else if (source === 2 /* ACK */) {
+    } else if (source === 2 /* OURS */) {
       return this.#applySetChildKeyAck(newKey, child);
     } else {
       return this.#applySetChildKeyUndoRedo(newKey, child);
@@ -7318,7 +7317,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     if (this._pool.getNode(id) !== void 0) {
       return { modified: false };
     }
-    if (source === 2 /* ACK */) {
+    if (source === 2 /* OURS */) {
       const lastUpdateOpId = this.#unacknowledgedSet.get(key);
       if (lastUpdateOpId === opId) {
         this.#unacknowledgedSet.delete(key);
@@ -7326,7 +7325,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
       } else if (lastUpdateOpId !== void 0) {
         return { modified: false };
       }
-    } else if (source === 1 /* REMOTE */) {
+    } else if (source === 1 /* THEIRS */) {
       this.#unacknowledgedSet.delete(key);
     }
     const previousValue = this.#map.get(key);
@@ -7719,7 +7718,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) {
@@ -9127,7 +9126,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) {
@@ -9208,11 +9211,11 @@ function createRoom(options, config) {
       } else {
         let source;
         if (isLocal) {
-          source = 0 /* UNDOREDO_RECONNECT */;
+          source = 0 /* LOCAL */;
         } else {
           const opId = nn(op.opId);
           const deleted = context.unacknowledgedOps.delete(opId);
-          source = deleted ? 2 /* ACK */ : 1 /* REMOTE */;
+          source = deleted ? 2 /* OURS */ : 1 /* THEIRS */;
         }
         const applyOpResult = applyOp(op, source);
         if (applyOpResult.modified) {
@@ -9243,7 +9246,7 @@ function createRoom(options, config) {
     };
   }
   function applyOp(op, source) {
-    if (isAck(op)) {
+    if (isAckOp(op)) {
       return { modified: false };
     }
     switch (op.type) {
@@ -9254,7 +9257,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);
@@ -9425,7 +9428,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
@@ -9485,13 +9492,16 @@ function createRoom(options, config) {
           updates.others.push(onRoomStateMessage(message));
           break;
         }
-        case ServerMsgCode.INITIAL_STORAGE_STATE: {
+        case ServerMsgCode.STORAGE_STATE: {
           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,
@@ -9641,7 +9651,7 @@ function createRoom(options, config) {
   async function streamStorage() {
     if (!managedSocket.authValue) return;
     const items = await httpClient.streamStorage({ roomId });
-    processInitialStorage({ type: ServerMsgCode.INITIAL_STORAGE_STATE, items });
+    processInitialStorage({ type: ServerMsgCode.STORAGE_STATE, items });
   }
   function refreshStorage(options2) {
     const messages = context.buffer.messages;
@@ -9706,7 +9716,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();
@@ -9726,7 +9740,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();
@@ -10236,7 +10254,7 @@ function makeAuthDelegateForRoom(roomId, authManager) {
     return authManager.getAuthValue({ requestedScope: "room:read", roomId });
   };
 }
-function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
+function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill, engine) {
   return (authValue) => {
     const ws = _nullishCoalesce(WebSocketPolyfill, () => ( (typeof WebSocket === "undefined" ? void 0 : WebSocket)));
     if (ws === void 0) {
@@ -10256,6 +10274,9 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
       return assertNever(authValue, "Unhandled case");
     }
     url2.searchParams.set("version", PKG_VERSION || "dev");
+    if (engine !== void 0) {
+      url2.searchParams.set("e", String(engine));
+    }
     return new ws(url2.toString());
   };
 }
@@ -10375,7 +10396,8 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _224 => _224.polyfills, 'optionalAccess', _225 => _225.WebSocket])
+            _optionalChain([clientOptions, 'access', _224 => _224.polyfills, 'optionalAccess', _225 => _225.WebSocket]),
+            options2.engine
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),