@liveblocks/core 3.14.0-pre2 → 3.14.0-pre4

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.14.0-pre2";
+var PKG_VERSION = "3.14.0-pre4";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -3227,7 +3227,7 @@ var BACKOFF_DELAYS_SLOW = [2e3, 3e4, 6e4, 3e5];
 var HEARTBEAT_INTERVAL = 3e4;
 var PONG_TIMEOUT = 2e3;
 var AUTH_TIMEOUT = 1e4;
-var SOCKET_CONNECT_TIMEOUT = 1e4;
+var SOCKET_CONNECT_TIMEOUT = 2e4;
 var StopRetrying = class extends Error {
   constructor(reason) {
     super(reason);
@@ -6215,61 +6215,79 @@ var AbstractCrdt = class {
   }
 };
 
-// src/protocol/SerializedCrdt.ts
+// src/protocol/StorageNode.ts
 var CrdtType = Object.freeze({
   OBJECT: 0,
   LIST: 1,
   MAP: 2,
   REGISTER: 3
 });
-function isRootNode(node) {
+function isRootStorageNode(node) {
   return node[0] === "root";
 }
-function isRootCrdt(id, _) {
-  return id === "root";
+function isObjectStorageNode(node) {
+  return node[1].type === CrdtType.OBJECT;
 }
-function* compactNodesToNodeStream(nodes) {
-  for (const node of nodes) {
-    const id = node[0];
-    if (isRootNode(node)) {
-      yield [id, { type: CrdtType.OBJECT, data: node[1] }];
+function isListStorageNode(node) {
+  return node[1].type === CrdtType.LIST;
+}
+function isMapStorageNode(node) {
+  return node[1].type === CrdtType.MAP;
+}
+function isRegisterStorageNode(node) {
+  return node[1].type === CrdtType.REGISTER;
+}
+function isCompactRootNode(node) {
+  return node[0] === "root";
+}
+function* compactNodesToNodeStream(compactNodes) {
+  for (const cnode of compactNodes) {
+    if (isCompactRootNode(cnode)) {
+      yield [cnode[0], { type: CrdtType.OBJECT, data: cnode[1] }];
       continue;
     }
-    switch (node[1]) {
+    switch (cnode[1]) {
       case CrdtType.OBJECT:
-        yield [id, { type: CrdtType.OBJECT, parentId: node[2], parentKey: node[3], data: node[4] }];
+        yield [cnode[0], { type: CrdtType.OBJECT, parentId: cnode[2], parentKey: cnode[3], data: cnode[4] }];
         break;
       case CrdtType.LIST:
-        yield [id, { type: CrdtType.LIST, parentId: node[2], parentKey: node[3] }];
+        yield [cnode[0], { type: CrdtType.LIST, parentId: cnode[2], parentKey: cnode[3] }];
         break;
       case CrdtType.MAP:
-        yield [id, { type: CrdtType.MAP, parentId: node[2], parentKey: node[3] }];
+        yield [cnode[0], { type: CrdtType.MAP, parentId: cnode[2], parentKey: cnode[3] }];
         break;
       case CrdtType.REGISTER:
-        yield [id, { type: CrdtType.REGISTER, parentId: node[2], parentKey: node[3], data: node[4] }];
+        yield [cnode[0], { type: CrdtType.REGISTER, parentId: cnode[2], parentKey: cnode[3], data: cnode[4] }];
         break;
+      default:
     }
   }
 }
 function* nodeStreamToCompactNodes(nodes) {
-  for (const [id, node] of nodes) {
-    switch (node.type) {
-      case CrdtType.OBJECT:
-        if (isRootCrdt(id, node)) {
-          yield [id, node.data];
-        } else {
-          yield [id, CrdtType.OBJECT, node.parentId, node.parentKey, node.data];
-        }
-        break;
-      case CrdtType.LIST:
-        yield [id, CrdtType.LIST, node.parentId, node.parentKey];
-        break;
-      case CrdtType.MAP:
-        yield [id, CrdtType.MAP, node.parentId, node.parentKey];
-        break;
-      case CrdtType.REGISTER:
-        yield [id, CrdtType.REGISTER, node.parentId, node.parentKey, node.data];
-        break;
+  for (const node of nodes) {
+    if (isObjectStorageNode(node)) {
+      if (isRootStorageNode(node)) {
+        const id = node[0];
+        const crdt = node[1];
+        yield [id, crdt.data];
+      } else {
+        const id = node[0];
+        const crdt = node[1];
+        yield [id, CrdtType.OBJECT, crdt.parentId, crdt.parentKey, crdt.data];
+      }
+    } else if (isListStorageNode(node)) {
+      const id = node[0];
+      const crdt = node[1];
+      yield [id, CrdtType.LIST, crdt.parentId, crdt.parentKey];
+    } else if (isMapStorageNode(node)) {
+      const id = node[0];
+      const crdt = node[1];
+      yield [id, CrdtType.MAP, crdt.parentId, crdt.parentKey];
+    } else if (isRegisterStorageNode(node)) {
+      const id = node[0];
+      const crdt = node[1];
+      yield [id, CrdtType.REGISTER, crdt.parentId, crdt.parentKey, crdt.data];
+    } else {
     }
   }
 }
@@ -6375,15 +6393,16 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
   }
   /** @internal */
-  static _deserialize([id], parentToChildren, pool) {
+  static _deserialize([id, _], parentToChildren, pool) {
     const list = new _LiveList([]);
     list._attach(id, pool);
     const children = parentToChildren.get(id);
     if (children === void 0) {
       return list;
     }
-    for (const [id2, crdt] of children) {
-      const child = deserialize([id2, crdt], parentToChildren, pool);
+    for (const node of children) {
+      const crdt = node[1];
+      const child = deserialize(node, parentToChildren, pool);
       child._setParentLink(list, crdt.parentKey);
       list._insertAndSort(child);
     }
@@ -7400,8 +7419,9 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     if (children === void 0) {
       return map;
     }
-    for (const [id2, crdt] of children) {
-      const child = deserialize([id2, crdt], parentToChildren, pool);
+    for (const node of children) {
+      const crdt = node[1];
+      const child = deserialize(node, parentToChildren, pool);
       child._setParentLink(map, crdt.parentKey);
       map.#map.set(crdt.parentKey, child);
       map.invalidate();
@@ -7702,9 +7722,6 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
 
 // src/crdts/LiveObject.ts
 var MAX_LIVE_OBJECT_SIZE = 128 * 1024;
-function isRootCrdt2(id, _) {
-  return id === "root";
-}
 var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   #map;
   /**
@@ -7734,16 +7751,16 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   static #buildRootAndParentToChildren(nodes) {
     const parentToChildren = /* @__PURE__ */ new Map();
     let root = null;
-    for (const [id, crdt] of nodes) {
-      if (isRootCrdt2(id, crdt)) {
-        root = crdt;
+    for (const node of nodes) {
+      if (isRootStorageNode(node)) {
+        root = node[1];
       } else {
-        const tuple = [id, crdt];
+        const crdt = node[1];
         const children = parentToChildren.get(crdt.parentId);
         if (children !== void 0) {
-          children.push(tuple);
+          children.push(node);
         } else {
-          parentToChildren.set(crdt.parentId, [tuple]);
+          parentToChildren.set(crdt.parentId, [node]);
         }
       }
     }
@@ -7808,8 +7825,9 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
     if (children === void 0) {
       return liveObj;
     }
-    for (const [id, crdt] of children) {
-      const child = deserializeToLson([id, crdt], parentToChildren, pool);
+    for (const node of children) {
+      const child = deserializeToLson(node, parentToChildren, pool);
+      const crdt = node[1];
       if (isLiveStructure(child)) {
         child._setParentLink(liveObj, crdt.parentKey);
       }
@@ -8296,42 +8314,30 @@ function isSameNodeOrChildOf(node, parent) {
   }
   return false;
 }
-function deserialize([id, crdt], parentToChildren, pool) {
-  switch (crdt.type) {
-    case CrdtType.OBJECT: {
-      return LiveObject._deserialize([id, crdt], parentToChildren, pool);
-    }
-    case CrdtType.LIST: {
-      return LiveList._deserialize([id, crdt], parentToChildren, pool);
-    }
-    case CrdtType.MAP: {
-      return LiveMap._deserialize([id, crdt], parentToChildren, pool);
-    }
-    case CrdtType.REGISTER: {
-      return LiveRegister._deserialize([id, crdt], parentToChildren, pool);
-    }
-    default: {
-      throw new Error("Unexpected CRDT type");
-    }
-  }
-}
-function deserializeToLson([id, crdt], parentToChildren, pool) {
-  switch (crdt.type) {
-    case CrdtType.OBJECT: {
-      return LiveObject._deserialize([id, crdt], parentToChildren, pool);
-    }
-    case CrdtType.LIST: {
-      return LiveList._deserialize([id, crdt], parentToChildren, pool);
-    }
-    case CrdtType.MAP: {
-      return LiveMap._deserialize([id, crdt], parentToChildren, pool);
-    }
-    case CrdtType.REGISTER: {
-      return crdt.data;
-    }
-    default: {
-      throw new Error("Unexpected CRDT type");
-    }
+function deserialize(node, parentToChildren, pool) {
+  if (isObjectStorageNode(node)) {
+    return LiveObject._deserialize(node, parentToChildren, pool);
+  } else if (isListStorageNode(node)) {
+    return LiveList._deserialize(node, parentToChildren, pool);
+  } else if (isMapStorageNode(node)) {
+    return LiveMap._deserialize(node, parentToChildren, pool);
+  } else if (isRegisterStorageNode(node)) {
+    return LiveRegister._deserialize(node, parentToChildren, pool);
+  } else {
+    throw new Error("Unexpected CRDT type");
+  }
+}
+function deserializeToLson(node, parentToChildren, pool) {
+  if (isObjectStorageNode(node)) {
+    return LiveObject._deserialize(node, parentToChildren, pool);
+  } else if (isListStorageNode(node)) {
+    return LiveList._deserialize(node, parentToChildren, pool);
+  } else if (isMapStorageNode(node)) {
+    return LiveMap._deserialize(node, parentToChildren, pool);
+  } else if (isRegisterStorageNode(node)) {
+    return node[1].data;
+  } else {
+    throw new Error("Unexpected CRDT type");
   }
 }
 function isLiveStructure(value) {
@@ -9236,9 +9242,12 @@ function createRoom(options, config) {
   );
   function createOrUpdateRootFromMessage(nodes) {
     if (context.root !== void 0) {
-      updateRoot(new Map(nodes));
+      updateRoot(nodes);
     } else {
-      context.root = LiveObject._fromItems(nodes, context.pool);
+      context.root = LiveObject._fromItems(
+        nodes,
+        context.pool
+      );
     }
     const canWrite = _nullishCoalesce(_optionalChain([self, 'access', _188 => _188.get, 'call', _189 => _189(), 'optionalAccess', _190 => _190.canWrite]), () => ( true));
     const stackSizeBefore = context.undoStack.length;
@@ -9263,8 +9272,8 @@ function createRoom(options, config) {
       return;
     }
     const currentItems = /* @__PURE__ */ new Map();
-    for (const [id, node] of context.pool.nodes) {
-      currentItems.set(id, node._serialize());
+    for (const [id, crdt] of context.pool.nodes) {
+      currentItems.set(id, crdt._serialize());
     }
     const ops = getTreesDiffOperations(currentItems, nodes);
     const result = applyRemoteOps(ops);
@@ -9799,7 +9808,9 @@ function createRoom(options, config) {
   }
   async function streamStorage() {
     if (!managedSocket.authValue) return;
-    const nodes = new Map(await httpClient.streamStorage({ roomId }));
+    const nodes = new Map(
+      await httpClient.streamStorage({ roomId })
+    );
     processInitialStorage(nodes);
   }
   function refreshStorage(options2) {
@@ -11719,5 +11730,10 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isLiveNode = isLiveNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isPlainObject = isPlainObject; exports.isStartsWithOperator = isStartsWithOperator; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
+
+
+
+
+
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.objectToQuery = objectToQuery; exports.patchLiveObjectKey = patchLiveObjectKey; exports.patchNotificationSettings = patchNotificationSettings; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.cjs.map