@liveblocks/client 0.17.0-test1 → 0.17.0

package/shared.js

@@ -945,14 +945,14 @@ var LiveList = (function (_AbstractCrdt) {
         var parentKey = nn(child._parentKey),
           reverse = child._serialize(nn(this._id), parentKey, this._doc),
           indexToDelete = this._items.indexOf(child);
-        return (
-          this._items.splice(indexToDelete, 1),
-          child._detach(),
-          {
-            modified: makeUpdate(this, [deleteDelta(indexToDelete)]),
-            reverse: reverse,
-          }
-        );
+        return -1 === indexToDelete
+          ? { modified: !1 }
+          : (this._items.splice(indexToDelete, 1),
+            child._detach(),
+            {
+              modified: makeUpdate(this, [deleteDelta(indexToDelete)]),
+              reverse: reverse,
+            });
       }
       return { modified: !1 };
     }),
@@ -1448,10 +1448,12 @@ var LiveMap = (function (_AbstractCrdt) {
       var _this;
       if (
         (((_this = _AbstractCrdt.call(this) || this)._map = void 0),
+        (_this.unacknowledgedSet = void 0),
         errorIf(
           null === entries,
           "Support for calling `new LiveMap(null)` will be removed in @liveblocks/client 0.18. Please call as `new LiveMap()`, or `new LiveMap([])`."
         ),
+        (_this.unacknowledgedSet = new Map()),
         entries)
       ) {
         for (
@@ -1531,14 +1533,24 @@ var LiveMap = (function (_AbstractCrdt) {
           isLiveNode(_value3) && _value3._attach(doc.generateId(), doc);
         }
       }),
-      (_proto._attachChild = function (op) {
+      (_proto._attachChild = function (op, source) {
         var _updates;
         if (null == this._doc)
           throw new Error("Can't attach child if doc is not present");
         var id = op.id,
-          key = op.parentKey,
+          parentKey = op.parentKey,
+          opId = op.opId,
+          key = parentKey,
           child = creationOpToLiveNode(op);
         if (void 0 !== this._doc.getItem(id)) return { modified: !1 };
+        if (source === exports.OpSource.ACK) {
+          var lastUpdateOpId = this.unacknowledgedSet.get(key);
+          if (lastUpdateOpId === opId)
+            return this.unacknowledgedSet.delete(key), { modified: !1 };
+          if (null != lastUpdateOpId) return { modified: !1 };
+        } else
+          source === exports.OpSource.REMOTE &&
+            this.unacknowledgedSet.delete(key);
         var reverse,
           previousValue = this._map.get(key);
         if (previousValue) {
@@ -1637,7 +1649,9 @@ var LiveMap = (function (_AbstractCrdt) {
               ((_updates3 = {}),
               (_updates3[key] = { type: "update" }),
               _updates3),
-          }),
+          });
+          var ops = item._serialize(this._id, key, this._doc);
+          this.unacknowledgedSet.set(key, nn(ops[0].opId)),
             this._doc.dispatch(
               item._serialize(this._id, key, this._doc),
               oldValue
@@ -2385,9 +2399,6 @@ function isRoomAuthToken(data) {
       "number" == typeof data.maxConnectionsPerRoom)
   );
 }
-function isAuthToken(data) {
-  return isAppOnlyAuthToken(data) || isRoomAuthToken(data);
-}
 function parseJwtToken(token) {
   var tokenParts = token.split(".");
   if (3 !== tokenParts.length)
@@ -2542,7 +2553,9 @@ function isJsonArray(data) {
     );
   }),
   (exports.isAppOnlyAuthToken = isAppOnlyAuthToken),
-  (exports.isAuthToken = isAuthToken),
+  (exports.isAuthToken = function (data) {
+    return isAppOnlyAuthToken(data) || isRoomAuthToken(data);
+  }),
   (exports.isChildCrdt = isChildCrdt),
   (exports.isJsonArray = isJsonArray),
   (exports.isJsonObject = function (data) {
@@ -2554,6 +2567,15 @@ function isJsonArray(data) {
   (exports.isLiveObject = isLiveObject),
   (exports.isPlainObject = isPlainObject),
   (exports.isRoomAuthToken = isRoomAuthToken),
+  (exports.isRoomEventName = function (value) {
+    return (
+      "my-presence" === value ||
+      "others" === value ||
+      "event" === value ||
+      "error" === value ||
+      "connection" === value
+    );
+  }),
   (exports.isRootCrdt = function (crdt) {
     return crdt.type === exports.CrdtType.OBJECT && !isChildCrdt(crdt);
   }),
@@ -2620,20 +2642,15 @@ function isJsonArray(data) {
       : second;
   }),
   (exports.nn = nn),
-  (exports.parseAuthToken = function (token) {
-    var data = parseJwtToken(token);
-    if (data && isAuthToken(data)) return data;
-    throw new Error(
-      "Authentication error. Liveblocks could not parse the response of your authentication endpoint"
-    );
-  }),
   (exports.parseRoomAuthToken = function (tokenString) {
     var data = parseJwtToken(tokenString);
     if (data && isRoomAuthToken(data))
       return (
         data.maxConnections, _objectWithoutPropertiesLoose(data, _excluded)
       );
-    throw new Error("Authentication error: invalid room auth token");
+    throw new Error(
+      "Authentication error: we expected a room token but did not get one. Hint: if you are using a callback, ensure the room is passed when creating the token. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientCallback"
+    );
   }),
   (exports.remove = function (array, item) {
     for (var i = 0; i < array.length; i++)

package/shared.mjs

@@ -60,6 +60,15 @@ function isRootCrdt(crdt) {
 function isChildCrdt(crdt) {
   return void 0 !== crdt.parentId && void 0 !== crdt.parentKey;
 }
+function isRoomEventName(value) {
+  return (
+    "my-presence" === value ||
+    "others" === value ||
+    "event" === value ||
+    "error" === value ||
+    "connection" === value
+  );
+}
 function HasParent(node, key) {
   return Object.freeze({ type: "HasParent", node: node, key: key });
 }
@@ -684,14 +693,14 @@ class LiveList extends AbstractCrdt {
       const parentKey = nn(child._parentKey),
         reverse = child._serialize(nn(this._id), parentKey, this._doc),
         indexToDelete = this._items.indexOf(child);
-      return (
-        this._items.splice(indexToDelete, 1),
-        child._detach(),
-        {
-          modified: makeUpdate(this, [deleteDelta(indexToDelete)]),
-          reverse: reverse,
-        }
-      );
+      return -1 === indexToDelete
+        ? { modified: !1 }
+        : (this._items.splice(indexToDelete, 1),
+          child._detach(),
+          {
+            modified: makeUpdate(this, [deleteDelta(indexToDelete)]),
+            reverse: reverse,
+          });
     }
     return { modified: !1 };
   }
@@ -1143,6 +1152,7 @@ class LiveMap extends AbstractCrdt {
         null === entries,
         "Support for calling `new LiveMap(null)` will be removed in @liveblocks/client 0.18. Please call as `new LiveMap()`, or `new LiveMap([])`."
       ),
+      (this.unacknowledgedSet = new Map()),
       entries)
     ) {
       const mappedEntries = [];
@@ -1187,12 +1197,19 @@ class LiveMap extends AbstractCrdt {
     for (const [_key, value] of this._map)
       isLiveNode(value) && value._attach(doc.generateId(), doc);
   }
-  _attachChild(op) {
+  _attachChild(op, source) {
     if (null == this._doc)
       throw new Error("Can't attach child if doc is not present");
-    const { id: id, parentKey: key } = op,
+    const { id: id, parentKey: parentKey, opId: opId } = op,
+      key = parentKey,
       child = creationOpToLiveNode(op);
     if (void 0 !== this._doc.getItem(id)) return { modified: !1 };
+    if (source === OpSource.ACK) {
+      const lastUpdateOpId = this.unacknowledgedSet.get(key);
+      if (lastUpdateOpId === opId)
+        return this.unacknowledgedSet.delete(key), { modified: !1 };
+      if (null != lastUpdateOpId) return { modified: !1 };
+    } else source === OpSource.REMOTE && this.unacknowledgedSet.delete(key);
     const previousValue = this._map.get(key);
     let reverse;
     if (previousValue) {
@@ -1263,7 +1280,9 @@ class LiveMap extends AbstractCrdt {
         node: this,
         type: "LiveMap",
         updates: { [key]: { type: "update" } },
-      }),
+      });
+      const ops = item._serialize(this._id, key, this._doc);
+      this.unacknowledgedSet.set(key, nn(ops[0].opId)),
         this._doc.dispatch(
           item._serialize(this._id, key, this._doc),
           oldValue
@@ -1989,13 +2008,8 @@ function parseRoomAuthToken(tokenString) {
   if (data && isRoomAuthToken(data)) {
     return __rest(data, ["maxConnections"]);
   }
-  throw new Error("Authentication error: invalid room auth token");
-}
-function parseAuthToken(token) {
-  const data = parseJwtToken(token);
-  if (data && isAuthToken(data)) return data;
   throw new Error(
-    "Authentication error. Liveblocks could not parse the response of your authentication endpoint"
+    "Authentication error: we expected a room token but did not get one. Hint: if you are using a callback, ensure the room is passed when creating the token. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientCallback"
   );
 }
 function isJsonScalar(data) {
@@ -2013,8 +2027,8 @@ function isJsonObject(data) {
   return !isJsonScalar(data) && !isJsonArray(data);
 }
 export {
-  isScope as A,
-  parseAuthToken as B,
+  isRoomAuthToken as A,
+  isScope as B,
   ClientMsgCode as C,
   deprecate as D,
   deprecateIf as E,
@@ -2030,30 +2044,30 @@ export {
   ServerMsgCode as S,
   WebsocketCloseCodes as W,
   __rest as _,
-  isPlainObject as a,
-  isTokenExpired as b,
-  isSameNodeOrChildOf as c,
-  OpCode as d,
-  isLiveList as e,
-  isJsonArray as f,
+  isRoomEventName as a,
+  isPlainObject as b,
+  isTokenExpired as c,
+  isSameNodeOrChildOf as d,
+  OpCode as e,
+  isLiveList as f,
   getTreesDiffOperations as g,
-  compact as h,
+  isJsonArray as h,
   isLiveNode as i,
-  isRootCrdt as j,
-  isJsonObject as k,
-  errorIf as l,
+  compact as j,
+  isRootCrdt as k,
+  isJsonObject as l,
   mergeStorageUpdates as m,
   nn as n,
-  LiveList as o,
+  errorIf as o,
   parseRoomAuthToken as p,
-  LiveMap as q,
+  LiveList as q,
   remove as r,
-  LiveRegister as s,
+  LiveMap as s,
   tryParseJson as t,
-  findNonSerializableValue as u,
-  isLiveObject as v,
-  assertNever as w,
-  isAppOnlyAuthToken as x,
-  isAuthToken as y,
-  isRoomAuthToken as z,
+  LiveRegister as u,
+  findNonSerializableValue as v,
+  isLiveObject as w,
+  assertNever as x,
+  isAppOnlyAuthToken as y,
+  isAuthToken as z,
 };