@liveblocks/core 1.1.6-test2 → 1.1.7

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.1.6-test2";
+var PKG_VERSION = "1.1.7";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -20,6 +20,7 @@ function detectDupes(pkgName, pkgVersion, pkgFormat) {
   const pkgBuildInfo = pkgFormat ? `${pkgVersion || "dev"} (${pkgFormat})` : pkgVersion || "dev";
   if (!g[pkgId]) {
     g[pkgId] = pkgBuildInfo;
+  } else if (g[pkgId] === pkgBuildInfo) {
   } else {
     const msg = [
       `Multiple copies of Liveblocks are being loaded in your project. This will cause issues! See ${dupesDocs + SPACE}`,
@@ -194,7 +195,7 @@ function startSyncStream(room) {
     // Any time storage updates, send the new storage root
     room.events.storage.subscribe(() => partialSyncStorage(room)),
     // Any time "me" or "others" updates, send the new values accordingly
-    room.events.me.subscribe(() => partialSyncMe(room)),
+    room.events.self.subscribe(() => partialSyncMe(room)),
     room.events.others.subscribe(() => partialSyncOthers(room))
   ]);
 }
@@ -1779,7 +1780,6 @@ var LiveList = class _LiveList extends AbstractCrdt {
     this._items = [];
     this._implicitlyDeletedItems = /* @__PURE__ */ new WeakSet();
     this._unacknowledgedSets = /* @__PURE__ */ new Map();
-    this._unacknowledgedDeletedIds = /* @__PURE__ */ new Set();
     let position = void 0;
     for (const item of items) {
       const newPosition = makePosition(position);
@@ -1917,7 +1917,6 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (this._pool === void 0) {
       throw new Error("Can't attach child if managed pool is not present");
     }
-    this._unacknowledgedDeletedIds.delete(nn(op.deletedId));
     const delta = [];
     const deletedDelta = this._detachItemAssociatedToSetOperation(op.deletedId);
     if (deletedDelta) {
@@ -2028,11 +2027,6 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /** @internal */
   _applyInsertAck(op) {
-    if (this._unacknowledgedDeletedIds.has(op.id)) {
-      return {
-        modified: false
-      };
-    }
     const existingItem = this._items.find((item) => item._id === op.id);
     const key = asPos(op.parentKey);
     const itemIndexAtPosition = this._indexOfPosition(key);
@@ -2375,7 +2369,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     _optionalChain([this, 'access', _71 => _71._pool, 'optionalAccess', _72 => _72.assertStorageIsWritable, 'call', _73 => _73()]);
     if (index < 0 || index > this._items.length) {
       throw new Error(
-        `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
+        `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
       );
     }
     const before2 = this._items[index - 1] ? this._items[index - 1]._parentPos : void 0;
@@ -2463,7 +2457,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     _optionalChain([this, 'access', _77 => _77._pool, 'optionalAccess', _78 => _78.assertStorageIsWritable, 'call', _79 => _79()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
-        `Cannot delete list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
+        `Cannot delete list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
       );
     }
     const item = this._items[index];
@@ -2471,8 +2465,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     this._items.splice(index, 1);
     this.invalidate();
     if (this._pool) {
-      const childId = item._id;
-      if (childId) {
+      const childRecordId = item._id;
+      if (childRecordId) {
         const storageUpdates = /* @__PURE__ */ new Map();
         storageUpdates.set(
           nn(this._id),
@@ -2481,7 +2475,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         this._pool.dispatch(
           [
             {
-              id: childId,
+              id: childRecordId,
               opId: this._pool.generateOpId(),
               type: 5 /* DELETE_CRDT */
             }
@@ -2530,16 +2524,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
     _optionalChain([this, 'access', _83 => _83._pool, 'optionalAccess', _84 => _84.assertStorageIsWritable, 'call', _85 => _85()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
-        `Cannot set list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
+        `Cannot set list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
       );
     }
     const existingItem = this._items[index];
     const position = existingItem._getParentKeyOrThrow();
     const existingId = existingItem._id;
     existingItem._detach();
-    if (existingId !== void 0) {
-      this._unacknowledgedDeletedIds.add(existingId);
-    }
     const value = lsonToLiveNode(item);
     value._setParentLink(this, position);
     this._items[index] = value;
@@ -3902,16 +3893,11 @@ function isJsonObject(data) {
 }
 
 // src/protocol/AuthToken.ts
-function isTokenExpired(token) {
-  const now = Date.now() / 1e3;
-  const valid = now <= token.exp - 300 && now >= token.iat - 300;
-  return !valid;
-}
 function isStringList(value) {
   return Array.isArray(value) && value.every((i) => typeof i === "string");
 }
 function isMinimalTokenPayload(data) {
-  return isPlainObject(data) && typeof data.iat === "number" && typeof data.exp === "number" && typeof data.actor === "number" && (data.id === void 0 || typeof data.id === "string") && isStringList(data.scopes);
+  return isPlainObject(data) && typeof data.actor === "number" && (data.id === void 0 || typeof data.id === "string") && isStringList(data.scopes);
 }
 function parseAuthToken(rawTokenString) {
   const tokenParts = rawTokenString.split(".");
@@ -4252,6 +4238,7 @@ function createRoom(options, config) {
     batchUpdates(() => {
       eventHub.status.notify(newStatus);
       eventHub.connection.notify(newToLegacyStatus(newStatus));
+      notifySelfChanged(doNotBatchUpdates);
     });
   }
   let _connectionLossTimerId;
@@ -4375,7 +4362,8 @@ function createRoom(options, config) {
     // New/recommended API
     lostConnection: makeEventSource(),
     customEvent: makeEventSource(),
-    me: makeEventSource(),
+    self: makeEventSource(),
+    myPresence: makeEventSource(),
     others: makeEventSource(),
     error: makeEventSource(),
     storage: makeEventSource(),
@@ -4389,15 +4377,16 @@ function createRoom(options, config) {
     if (config.unstable_fallbackToHTTP) {
       const size = new TextEncoder().encode(message).length;
       if (size > MAX_MESSAGE_SIZE && _optionalChain([managedSocket, 'access', _117 => _117.token, 'optionalAccess', _118 => _118.raw]) && config.httpSendEndpoint) {
-        if (isTokenExpired(managedSocket.token.parsed)) {
-          return managedSocket.reconnect();
-        }
         void httpSend(
           message,
           managedSocket.token.raw,
           config.httpSendEndpoint,
           _optionalChain([config, 'access', _119 => _119.polyfills, 'optionalAccess', _120 => _120.fetch])
-        );
+        ).then((resp) => {
+          if (!resp.ok && resp.status === 403) {
+            managedSocket.reconnect();
+          }
+        });
         warn(
           "Message was too large for websockets and sent over HTTP instead"
         );
@@ -4419,6 +4408,16 @@ function createRoom(options, config) {
       } : null;
     }
   );
+  let _lastSelf;
+  function notifySelfChanged(batchedUpdatesWrapper) {
+    const currSelf = self.current;
+    if (currSelf !== null && currSelf !== _lastSelf) {
+      batchedUpdatesWrapper(() => {
+        eventHub.self.notify(currSelf);
+      });
+      _lastSelf = currSelf;
+    }
+  }
   const selfAsTreeNode = new DerivedRef(
     self,
     (me) => me !== null ? userToTreeNode("Me", me) : null
@@ -4477,12 +4476,14 @@ function createRoom(options, config) {
         }
       }
       if (presence) {
-        eventHub.me.notify(context.me.current);
+        notifySelfChanged(doNotBatchUpdates);
+        eventHub.myPresence.notify(context.me.current);
       }
       if (storageUpdates.size > 0) {
         const updates = Array.from(storageUpdates.values());
         eventHub.storage.notify(updates);
       }
+      notifyStorageStatus();
     });
   }
   function getConnectionId() {
@@ -4558,7 +4559,6 @@ function createRoom(options, config) {
         }
       }
     }
-    notifyStorageStatus();
     return {
       ops,
       reverse: output.reverse,
@@ -4802,7 +4802,7 @@ function createRoom(options, config) {
             break;
           }
           case 300 /* UPDATE_YDOC */: {
-            eventHub.ydoc.notify(message.update);
+            eventHub.ydoc.notify(message);
             break;
           }
           case 104 /* ROOM_STATE */: {
@@ -5110,7 +5110,8 @@ ${Array.from(traces).join("\n\n")}`
     lostConnection: eventHub.lostConnection.observable,
     customEvent: eventHub.customEvent.observable,
     others: eventHub.others.observable,
-    me: eventHub.me.observable,
+    self: eventHub.self.observable,
+    myPresence: eventHub.myPresence.observable,
     error: eventHub.error.observable,
     storage: eventHub.storage.observable,
     history: eventHub.history.observable,
@@ -5216,7 +5217,7 @@ function makeClassicSubscribeFn(events) {
             callback
           );
         case "my-presence":
-          return events.me.subscribe(callback);
+          return events.myPresence.subscribe(callback);
         case "others": {
           const cb = callback;
           return events.others.subscribe(
@@ -5324,12 +5325,25 @@ function makeAuthDelegateForRoom(roomId, authentication, fetchPolyfill) {
   } else if (authentication.type === "custom") {
     return async () => {
       const response = await authentication.callback(roomId);
-      if (!response || !response.token) {
+      if (!response || typeof response !== "object") {
+        throw new Error(
+          'We expect the authentication callback to return a token, but it does not. Hint: the return value should look like: { token: "..." }'
+        );
+      }
+      if (typeof response.token === "string") {
+        return parseAuthToken(response.token);
+      } else if (typeof response.error === "string") {
+        const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
+        if (response.error === "forbidden") {
+          throw new StopRetrying(reason);
+        } else {
+          throw new Error(reason);
+        }
+      } else {
         throw new Error(
           'We expect the authentication callback to return a token, but it does not. Hint: the return value should look like: { token: "..." }'
         );
       }
-      return parseAuthToken(response.token);
     };
   } else {
     throw new Error("Internal error. Unexpected authentication type");