@liveblocks/core 1.2.0-internal1 → 1.2.0-internal2

package/dist/index.d.ts

@@ -686,11 +686,11 @@ declare function asArrayWithLegacyMethods<T>(arr: readonly T[]): ReadonlyArrayWi
  */
 declare type User<TPresence extends JsonObject, TUserMeta extends BaseUserMeta> = {
     /**
-     * The connection id of the user. It is unique and increment at every new connection.
+     * The connection ID of the User. It is unique and increment at every new connection.
      */
     readonly connectionId: number;
     /**
-     * The id of the user that has been set in the authentication endpoint.
+     * The ID of the User that has been set in the authentication endpoint.
      * Useful to get additional information about the connected user.
      */
     readonly id: TUserMeta["id"];
@@ -699,7 +699,7 @@ declare type User<TPresence extends JsonObject, TUserMeta extends BaseUserMeta>
      */
     readonly info: TUserMeta["info"];
     /**
-     * The user presence.
+     * The user’s presence data.
      */
     readonly presence: TPresence;
     /**
@@ -1670,16 +1670,6 @@ declare type RoomStateServerMsg<TUserMeta extends BaseUserMeta> = {
             scopes: string[];
         };
     };
-    /**
-     * Informs the client what their actor ID is.
-     * @since v1.2 (WS API v7)
-     */
-    readonly actor: number;
-    /**
-     * Informs the client whether their access is read-only.
-     * @since v1.2 (WS API v7)
-     */
-    readonly isReadOnly: boolean;
 };
 /**
  * Sent by the WebSocket server to a single client in response to the client

package/dist/index.js

@@ -145,7 +145,7 @@ var onMessageFromPanel = eventSource.observable;
 // src/devtools/index.ts
 var VERSION = true ? (
   /* istanbul ignore next */
-  "1.2.0-internal1"
+  "1.2.0-internal2"
 ) : "dev";
 var _devtoolsSetupHasRun = false;
 function setupDevTools(getAllRooms) {
@@ -3973,6 +3973,19 @@ var ServerMsgCode = /* @__PURE__ */ ((ServerMsgCode2) => {
   return ServerMsgCode2;
 })(ServerMsgCode || {});
 
+// src/lib/LegacyArray.ts
+function asArrayWithLegacyMethods(arr) {
+  Object.defineProperty(arr, "count", {
+    value: arr.length,
+    enumerable: false
+  });
+  Object.defineProperty(arr, "toArray", {
+    value: () => arr,
+    enumerable: false
+  });
+  return freeze(arr);
+}
+
 // src/refs/ImmutableRef.ts
 function merge(target, patch) {
   let updated = false;
@@ -4010,42 +4023,6 @@ var ImmutableRef = class {
   }
 };
 
-// src/refs/MeRef.ts
-var MeRef = class extends ImmutableRef {
-  constructor(initialPresence) {
-    super();
-    this._me = freeze(compactObject(initialPresence));
-  }
-  /** @internal */
-  _toImmutable() {
-    return this._me;
-  }
-  /**
-   * Patches the current "me" instance.
-   */
-  patch(patch) {
-    const oldMe = this._me;
-    const newMe = merge(oldMe, patch);
-    if (oldMe !== newMe) {
-      this._me = freeze(newMe);
-      this.invalidate();
-    }
-  }
-};
-
-// src/lib/LegacyArray.ts
-function asArrayWithLegacyMethods(arr) {
-  Object.defineProperty(arr, "count", {
-    value: arr.length,
-    enumerable: false
-  });
-  Object.defineProperty(arr, "toArray", {
-    value: () => arr,
-    enumerable: false
-  });
-  return freeze(arr);
-}
-
 // src/refs/OthersRef.ts
 function makeUser(conn, presence) {
   return freeze(compactObject(__spreadProps(__spreadValues({}, conn), { presence })));
@@ -4155,6 +4132,29 @@ var OthersRef = class extends ImmutableRef {
   }
 };
 
+// src/refs/PatchableRef.ts
+var PatchableRef = class extends ImmutableRef {
+  constructor(data) {
+    super();
+    this._data = freeze(compactObject(data));
+  }
+  /** @internal */
+  _toImmutable() {
+    return this._data;
+  }
+  /**
+   * Patches the current object.
+   */
+  patch(patch) {
+    const oldMe = this._data;
+    const newMe = merge(oldMe, patch);
+    if (oldMe !== newMe) {
+      this._data = freeze(newMe);
+      this.invalidate();
+    }
+  }
+};
+
 // src/refs/ValueRef.ts
 var ValueRef = class extends ImmutableRef {
   constructor(initialValue) {
@@ -4237,7 +4237,7 @@ function createRoom(options, config) {
       storageOperations: []
     },
     sessionInfo: new ValueRef(null),
-    me: new MeRef(initialPresence),
+    me: new PatchableRef(initialPresence),
     others: new OthersRef(),
     initialStorage,
     idFactory: null,
@@ -4262,9 +4262,10 @@ function createRoom(options, config) {
     const token = (_a2 = managedSocket.token) == null ? void 0 : _a2.parsed;
     if (token !== void 0 && token !== lastToken) {
       context.sessionInfo.set({
-        id: token.actor,
         userInfo: token.info,
         userId: token.id,
+        // NOTE: In the future, these fields will get assigned in the connection phase
+        actor: token.actor,
         isReadOnly: isStorageReadOnly(token.scopes)
       });
       lastToken = token;
@@ -4316,7 +4317,7 @@ function createRoom(options, config) {
         __spreadValues({}, context.me.current)
       )
     };
-    context.idFactory = makeIdFactory(sessionInfo.id);
+    context.idFactory = makeIdFactory(sessionInfo.actor);
     if (_getStorage$ !== null) {
       refreshStorage({ flush: false });
     }
@@ -4433,7 +4434,7 @@ function createRoom(options, config) {
     context.me,
     (info, me) => {
       return info !== null ? {
-        connectionId: info.id,
+        connectionId: info.actor,
         id: info.userId,
         info: info.userInfo,
         presence: me,
@@ -4510,7 +4511,7 @@ function createRoom(options, config) {
   function getConnectionId() {
     const info = context.sessionInfo.current;
     if (info) {
-      return info.id;
+      return info.actor;
     }
     throw new Error(
       "Internal. Tried to get connection id but connection was never open"
@@ -5304,7 +5305,7 @@ function makeCreateSocketDelegateForRoom(liveblocksServer, WebSocketPolyfill) {
       // @ts-ignore (__PACKAGE_VERSION__ will be injected by the build script)
       true ? (
         /* istanbul ignore next */
-        "1.2.0-internal1"
+        "1.2.0-internal2"
       ) : "dev"}`
     );
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/core",
-  "version": "1.2.0-internal1",
+  "version": "1.2.0-internal2",
   "description": "Shared code and foundational internals for Liveblocks",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",