@liveblocks/core 1.1.6 → 1.1.8

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.1.6";
+var PKG_VERSION = "1.1.8";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -195,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))
   ]);
 }
@@ -3893,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(".");
@@ -4243,6 +4238,7 @@ function createRoom(options, config) {
     batchUpdates(() => {
       eventHub.status.notify(newStatus);
       eventHub.connection.notify(newToLegacyStatus(newStatus));
+      notifySelfChanged(doNotBatchUpdates);
     });
   }
   let _connectionLossTimerId;
@@ -4366,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(),
@@ -4380,15 +4377,16 @@ function createRoom(options, config) {
     if (config.unstable_fallbackToHTTP) {
       const size = new TextEncoder().encode(message).length;
       if (size > MAX_MESSAGE_SIZE && managedSocket.token?.raw && config.httpSendEndpoint) {
-        if (isTokenExpired(managedSocket.token.parsed)) {
-          return managedSocket.reconnect();
-        }
         void httpSend(
           message,
           managedSocket.token.raw,
           config.httpSendEndpoint,
           config.polyfills?.fetch
-        );
+        ).then((resp) => {
+          if (!resp.ok && resp.status === 403) {
+            managedSocket.reconnect();
+          }
+        });
         warn(
           "Message was too large for websockets and sent over HTTP instead"
         );
@@ -4410,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
@@ -4468,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() {
@@ -4549,7 +4559,6 @@ function createRoom(options, config) {
         }
       }
     }
-    notifyStorageStatus();
     return {
       ops,
       reverse: output.reverse,
@@ -4793,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 */: {
@@ -5101,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,
@@ -5207,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(
@@ -5315,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");