@pluv/client 0.40.1 → 0.41.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@0.40.1 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@0.41.0 build /home/runner/work/pluv/pluv/packages/client
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-CJS dist/index.js 50.76 KB
-CJS ⚡️ Build success in 126ms
-ESM dist/index.mjs 49.44 KB
-ESM ⚡️ Build success in 128ms
+ESM dist/index.mjs 54.19 KB
+ESM ⚡️ Build success in 130ms
+CJS dist/index.js 55.51 KB
+CJS ⚡️ Build success in 131ms
 DTS Build start
-DTS ⚡️ Build success in 3361ms
-DTS dist/index.d.mts 24.50 KB
-DTS dist/index.d.ts  24.50 KB
+DTS ⚡️ Build success in 3289ms
+DTS dist/index.d.mts 24.58 KB
+DTS dist/index.d.ts  24.58 KB

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @pluv/client
 
+## 0.41.0
+
+### Minor Changes
+
+- 41aa439: **BREAKING** User's presence is now limited to be at most 512 bytes. If the presence is any larger, the `PluvRoom` will now throw an error.
+- 555b88d: Users can now have multiple simultaneous connections. Previously, if a user tried to open a connection to a room while already being connected to the room, the new connection would be blocked. Now, when the user opens another connection, the new connection will be opened and initialized with their latest presence.
+
+  Users can only have 1 identity and 1 presence, which means that all presence updates will sync across all of that user's connections. This means that even when a user opens multiple connections, they will only appear once in `others`.
+
+### Patch Changes
+
+- eb2d903: `PluvRoom` attempts to reconnect immediately after receiving a `close` event, instead of waiting for the reconnect timer. After failing the initial reconnect will the reconnects poll on the timer.
+- 555b88d: Fixed the `presence` type of `other` and `others` to equal the inferred presence type.
+  - @pluv/crdt@0.41.0
+  - @pluv/types@0.41.0
+
+## 0.40.2
+
+### Patch Changes
+
+- 6fbc2fe: Update `PluvClient.createRoom` so that the 2nd parameter is optional.
+  - @pluv/crdt@0.40.2
+  - @pluv/types@0.40.2
+
 ## 0.40.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -176,7 +176,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
     storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);
@@ -263,7 +263,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     };
     get procedure(): PluvProcedure<TIO, {}, {}, TPresence, TStorage>;
     constructor(options: PluvClientOptions<TIO, TPresence, TStorage, TMetadata>);
-    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents>;
+    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options?: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents>;
     enter: (room: string | PluvRoom<TIO, TMetadata, any, any, any>, ...args: EnterRoomParams<TMetadata>) => Promise<PluvRoom<TIO, TMetadata, TPresence, TStorage, any>>;
     getRoom: (room: string) => PluvRoom<TIO, TMetadata, TPresence, TStorage, any> | null;
     getRooms: () => readonly PluvRoom<TIO, TMetadata, TPresence, TStorage, any>[];
@@ -274,7 +274,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
 
 interface AuthorizationState<TIO extends IOLike> {
     token: string | null;
-    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>> | null;
+    user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>> | null;
 }
 type EventResolver<TIO extends IOLike = IOLike, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = (data: TInput, context: EventResolverContext<TIO, TPresence, TStorage>) => MaybePromise<TOutput | void>;
 interface EventResolverContext<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
@@ -329,7 +329,7 @@ type WithMetadata<TMetadata extends JsonObject = {}> = keyof TMetadata extends n
     metadata: TMetadata;
 };
 
-type OtherNotifierSubscriptionCallback<TIO extends IOLike> = (value: Id<UserInfo<TIO>> | null) => void;
+type OtherNotifierSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: Id<UserInfo<TIO, TPresence>> | null) => void;
 
 declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> {
     readonly id: string;
@@ -348,7 +348,7 @@ declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonOb
     abstract getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
     abstract getStorageJson(): InferCrdtJson<TStorage> | null;
     abstract getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
+    abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>): () => void;
     abstract redo(): void;
     abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
     abstract storageRoot(fn: (value: {
@@ -395,7 +395,7 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
     storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);

package/dist/index.d.ts

@@ -176,7 +176,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
     storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);
@@ -263,7 +263,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     };
     get procedure(): PluvProcedure<TIO, {}, {}, TPresence, TStorage>;
     constructor(options: PluvClientOptions<TIO, TPresence, TStorage, TMetadata>);
-    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents>;
+    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options?: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents>;
     enter: (room: string | PluvRoom<TIO, TMetadata, any, any, any>, ...args: EnterRoomParams<TMetadata>) => Promise<PluvRoom<TIO, TMetadata, TPresence, TStorage, any>>;
     getRoom: (room: string) => PluvRoom<TIO, TMetadata, TPresence, TStorage, any> | null;
     getRooms: () => readonly PluvRoom<TIO, TMetadata, TPresence, TStorage, any>[];
@@ -274,7 +274,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
 
 interface AuthorizationState<TIO extends IOLike> {
     token: string | null;
-    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>> | null;
+    user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>> | null;
 }
 type EventResolver<TIO extends IOLike = IOLike, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = (data: TInput, context: EventResolverContext<TIO, TPresence, TStorage>) => MaybePromise<TOutput | void>;
 interface EventResolverContext<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
@@ -329,7 +329,7 @@ type WithMetadata<TMetadata extends JsonObject = {}> = keyof TMetadata extends n
     metadata: TMetadata;
 };
 
-type OtherNotifierSubscriptionCallback<TIO extends IOLike> = (value: Id<UserInfo<TIO>> | null) => void;
+type OtherNotifierSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: Id<UserInfo<TIO, TPresence>> | null) => void;
 
 declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> {
     readonly id: string;
@@ -348,7 +348,7 @@ declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonOb
     abstract getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
     abstract getStorageJson(): InferCrdtJson<TStorage> | null;
     abstract getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
+    abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>): () => void;
     abstract redo(): void;
     abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
     abstract storageRoot(fn: (value: {
@@ -395,7 +395,7 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
     storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);

package/dist/index.js

@@ -223,24 +223,27 @@ var EventNotifier = class {
 var import_wonka3 = require("wonka");
 var OtherNotifier = class {
   constructor() {
-    this.subjects = /* @__PURE__ */ new Map();
+    this._subjects = /* @__PURE__ */ new Map();
   }
   clear() {
-    const connectionIds = Array.from(this.subjects.keys());
-    connectionIds.forEach((connectionId) => {
-      this.subject(connectionId).next(null);
-      this.subjects.delete(connectionId);
+    this._subjects.forEach((subject) => {
+      subject.next(null);
     });
+    this._subjects.clear();
   }
-  subject(name) {
-    const subject = this.subjects.get(name);
+  delete(clientId) {
+    this.subject(clientId).next(null);
+    this._subjects.delete(clientId);
+  }
+  subject(clientId) {
+    const subject = this._subjects.get(clientId);
     if (subject) return subject;
     const newSubject = (0, import_wonka3.makeSubject)();
-    this.subjects.set(name, newSubject);
+    this._subjects.set(clientId, newSubject);
     return newSubject;
   }
-  subscribe(name, callback) {
-    const source = this.subject(name).source;
+  subscribe(clientId, callback) {
+    const source = this.subject(clientId).source;
     return (0, import_wonka3.subscribe)(callback)(source).unsubscribe;
   }
 };
@@ -314,9 +317,16 @@ var StorageStore = class extends AbstractStorageStore {
   }
 };
 
+// src/constants.ts
+var MAX_PRESENCE_SIZE_BYTES = 512;
+
 // src/UsersManager.ts
 var UsersManager = class {
   constructor(config) {
+    this._idMap = {
+      fromConnectionId: /* @__PURE__ */ new Map(),
+      fromClientId: /* @__PURE__ */ new Map()
+    };
     /**
      * @description This is only set when the user is connected.
      */
@@ -334,74 +344,154 @@ var UsersManager = class {
   get myself() {
     return this._myself;
   }
-  clear() {
+  addConnection(userInfo) {
+    var _a;
+    const data = __spreadProps(__spreadValues({}, userInfo), {
+      presence: (_a = userInfo.presence) != null ? _a : this._initialPresence
+    });
+    const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
+    const clientId = this.getClientId(data);
+    const remaining = this._setConnectionId(userInfo.connectionId, clientId).size;
+    if (myClientId === clientId) {
+      const result2 = {
+        clientId,
+        data,
+        isMyself: true,
+        remaining
+      };
+      return result2;
+    }
+    const other = this._others.get(clientId);
+    if (!other) this._others.set(clientId, data);
+    const result = {
+      clientId,
+      data,
+      isMyself: false,
+      remaining
+    };
+    return result;
+  }
+  clearConnections() {
+    this.removeMyself();
     this._others.clear();
+    this._idMap.fromClientId.clear();
+    this._idMap.fromConnectionId.clear();
+  }
+  deleteConnection(connectionId) {
+    var _a, _b, _c;
+    const clientId = this.getClientId(connectionId);
+    this._deleteConnectionId(connectionId);
+    if (!clientId) return null;
+    const userInfo = (_a = this._others.get(clientId)) != null ? _a : null;
+    if (!userInfo) return null;
+    const remaining = (_c = (_b = this._getConnectionIds(clientId)) == null ? void 0 : _b.size) != null ? _c : 0;
+    const result = { clientId, remaining, data: userInfo };
+    if (!remaining) this._others.delete(clientId);
+    return result;
+  }
+  getClientId(input) {
+    var _a, _b, _c, _d;
+    if (typeof input !== "string") {
+      const userInfo = input;
+      const connectionId2 = userInfo.connectionId;
+      const userId = (_b = (_a = userInfo.user) == null ? void 0 : _a.id) != null ? _b : null;
+      return userId != null ? userId : connectionId2;
+    }
+    const connectionId = input;
+    if (((_c = this._myself) == null ? void 0 : _c.connectionId) === connectionId) {
+      return this.getClientId(this._myself);
+    }
+    const clientId = (_d = this._idMap.fromConnectionId.get(connectionId)) != null ? _d : null;
+    return clientId;
   }
   getOther(connectionId) {
     var _a;
-    return (_a = this._others.get(connectionId)) != null ? _a : null;
+    const clientId = this.getClientId(connectionId);
+    if (!clientId) return null;
+    return (_a = this._others.get(clientId)) != null ? _a : null;
   }
   getOthers() {
     return Array.from(this._others.values());
   }
   patchPresence(connectionId, patch) {
-    var _a, _b;
-    if (((_a = this._myself) == null ? void 0 : _a.connectionId) === connectionId) {
-      this.updateMyPresence(patch);
-      return;
-    }
-    const other = this._others.get(connectionId);
-    if (!other) return;
+    const clientId = this.getClientId(connectionId);
+    const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
+    if (!clientId) return null;
+    if (myClientId === clientId) return this.updateMyPresence(patch);
+    const other = this._others.get(clientId);
+    if (!other) return null;
     const presence = __spreadValues(__spreadValues({}, other.presence), patch);
-    (_b = this._presence) == null ? void 0 : _b.parse(presence);
-    this._others.set(connectionId, __spreadProps(__spreadValues({}, other), { presence }));
+    const validated = this._presence ? this._presence.parse(presence) : presence;
+    this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence: validated }));
+    return validated;
   }
   removeMyself() {
+    if (!this._myself) return;
+    const connectionId = this._myself.connectionId;
+    this._deleteConnectionId(connectionId);
     this._myself = null;
   }
-  removeUser(connectionId) {
-    this._others.delete(connectionId);
-  }
-  removeUsers() {
-    this._others.clear();
-  }
-  setMyself(connectionId, user) {
-    this._myself = {
-      connectionId,
-      presence: this._initialPresence,
-      user
-    };
-    this._myPresence = this._initialPresence;
+  setMyself(userInfo) {
+    var _a;
+    const connectionId = userInfo.connectionId;
+    const presence = (_a = userInfo.presence) != null ? _a : this._initialPresence;
+    this._myself = __spreadProps(__spreadValues({}, userInfo), { presence });
+    this._myPresence = presence;
+    const clientId = this.getClientId(this._myself);
+    this._setConnectionId(connectionId, clientId);
   }
   setPresence(connectionId, presence) {
-    var _a;
-    if (((_a = this._myself) == null ? void 0 : _a.connectionId) === connectionId) {
+    const clientId = this.getClientId(connectionId);
+    const myClientId = !!this._myself ? this.getClientId(this._myself) : null;
+    if (!clientId) return;
+    if (myClientId === clientId) {
+      if (!this._myself) return;
       this._myself.presence = presence;
       this._myPresence = presence;
       return;
     }
-    const other = this._others.get(connectionId);
+    const other = this._others.get(clientId);
     if (!other) return;
-    this._others.set(connectionId, __spreadProps(__spreadValues({}, other), { presence }));
-  }
-  setUser(connectionId, user, presence) {
-    var _a;
-    if (((_a = this._myself) == null ? void 0 : _a.connectionId) === connectionId) return;
-    const other = this._others.get(connectionId);
-    if (other) return;
-    this._others.set(connectionId, {
-      connectionId,
-      presence: presence != null ? presence : this._initialPresence,
-      user
-    });
+    this._others.set(clientId, __spreadProps(__spreadValues({}, other), { presence }));
   }
   /**
    * @description This method need not care about being connected.
    */
   updateMyPresence(patch) {
-    this._myPresence = __spreadValues(__spreadValues({}, this._myPresence), patch);
-    if (!this._myself) return;
-    this._myself.presence = this._myPresence;
+    const updated = __spreadValues(__spreadValues({}, this._myPresence), patch);
+    const bytes = new TextEncoder().encode(JSON.stringify(updated)).length;
+    if (bytes > MAX_PRESENCE_SIZE_BYTES) {
+      throw new Error(
+        `Large presence. Presence must be at most 512 bytes. Current size: ${bytes.toLocaleString()}`
+      );
+    }
+    this._myPresence = updated;
+    if (!this._myself) return updated;
+    this._myself.presence = updated;
+    return updated;
+  }
+  _deleteConnectionId(connectionId) {
+    var _a;
+    const clientId = this.getClientId(connectionId);
+    this._idMap.fromConnectionId.delete(connectionId);
+    if (!clientId) return;
+    const set = (_a = this._idMap.fromClientId.get(clientId)) != null ? _a : null;
+    if (!set) return;
+    set.delete(connectionId);
+    if (!!set.size) return;
+    this._idMap.fromClientId.delete(clientId);
+  }
+  _getConnectionIds(clientId) {
+    const set = this._idMap.fromClientId.get(clientId);
+    return set != null ? set : null;
+  }
+  _setConnectionId(connectionId, clientId) {
+    var _a;
+    const set = (_a = this._idMap.fromClientId.get(clientId)) != null ? _a : /* @__PURE__ */ new Set();
+    const updated = set.add(connectionId);
+    this._idMap.fromConnectionId.set(connectionId, clientId);
+    this._idMap.fromClientId.set(clientId, updated);
+    return updated;
   }
 };
 
@@ -567,7 +657,9 @@ var PluvRoom = class extends AbstractRoom {
       return sharedType;
     };
     this.other = (connectionId, callback) => {
-      return this._otherNotifier.subscribe(connectionId, callback);
+      const clientId = this._usersManager.getClientId(connectionId);
+      if (!clientId) return () => void 0;
+      return this._otherNotifier.subscribe(clientId, callback);
     };
     this.redo = () => {
       this._crdtManager.doc.redo();
@@ -599,7 +691,7 @@ var PluvRoom = class extends AbstractRoom {
       const myPresence = this._usersManager.myPresence;
       const myself = (_a = this._usersManager.myself) != null ? _a : null;
       this._stateNotifier.subjects["my-presence"].next(myPresence);
-      !!myself && this._stateNotifier.subjects["myself"].next(myself);
+      if (!!myself) this._stateNotifier.subjects.myself.next(myself);
       this.broadcast(
         "$updatePresence",
         { presence: newPresence }
@@ -669,8 +761,8 @@ var PluvRoom = class extends AbstractRoom {
       try {
         const publicKey = this._getPublicKey(params);
         authToken = yield this._getAuthorization(this.id, params);
-        authToken && url.searchParams.set("token", encodeURIComponent(authToken));
-        publicKey && url.searchParams.set("public_key", encodeURIComponent(publicKey));
+        if (authToken) url.searchParams.set("token", encodeURIComponent(authToken));
+        if (publicKey) url.searchParams.set("public_key", encodeURIComponent(publicKey));
         webSocket = new WebSocket(url.toString());
       } catch (err) {
         this._updateState((oldState) => {
@@ -781,7 +873,7 @@ var PluvRoom = class extends AbstractRoom {
     this._clearTimeout(this._timeouts.pong);
     this._detachWindowListeners();
     this._usersManager.removeMyself();
-    this._usersManager.removeUsers();
+    this._usersManager.clearConnections();
     this._otherNotifier.clear();
     this._stateNotifier.subjects.myself.next(null);
     this._stateNotifier.subjects.others.next([]);
@@ -869,11 +961,11 @@ var PluvRoom = class extends AbstractRoom {
     const { connectionId } = message;
     if (!connectionId) return;
     if (!this._state.webSocket) throw new Error("Could not find WebSocket");
-    this._usersManager.removeUser(connectionId);
+    const clientId = this._usersManager.getClientId(connectionId);
+    const deleted = this._usersManager.deleteConnection(connectionId);
     const others = this._usersManager.getOthers();
     this._stateNotifier.subjects.others.next(others);
-    this._otherNotifier.subject(connectionId).next(null);
-    this._otherNotifier.subjects.delete(connectionId);
+    if (!(deleted == null ? void 0 : deleted.remaining) && !!clientId) this._otherNotifier.delete(clientId);
   }
   _handlePresenceUpdatedMessage(message) {
     var _a;
@@ -883,11 +975,18 @@ var PluvRoom = class extends AbstractRoom {
     const data = message.data;
     const myself = (_a = this._usersManager.myself) != null ? _a : null;
     if ((myself == null ? void 0 : myself.connectionId) === connectionId) return;
-    this._usersManager.patchPresence(connectionId, data.presence);
+    const updated = this._usersManager.patchPresence(connectionId, data.presence);
+    const myClientId = !!myself ? this._usersManager.getClientId(myself) : null;
+    const clientId = this._usersManager.getClientId(connectionId);
+    if (!!clientId && myClientId === clientId) {
+      this._stateNotifier.subjects["my-presence"].next(updated);
+      this._stateNotifier.subjects.myself.next(this._usersManager.myself);
+      return;
+    }
     const other = this._usersManager.getOther(connectionId);
     const others = this._usersManager.getOthers();
-    this._otherNotifier.subject(connectionId).next(other);
-    this._stateNotifier.subjects["others"].next(others);
+    if (!!clientId) this._otherNotifier.subject(clientId).next(other);
+    this._stateNotifier.subjects.others.next(others);
   }
   _handleReceiveOthers(message) {
     if (!message.connectionId) return;
@@ -895,31 +994,44 @@ var PluvRoom = class extends AbstractRoom {
     const data = message.data;
     Object.keys(data.others).forEach((connectionId) => {
       const { presence, user } = data.others[connectionId];
-      this._usersManager.setUser(connectionId, user);
+      const result = this._usersManager.addConnection({
+        connectionId,
+        presence: presence != null ? presence : void 0,
+        user
+      });
+      if (!!presence) this._usersManager.patchPresence(connectionId, presence);
+      if (result.isMyself) return;
+      const clientId = result.clientId;
       const other = this._usersManager.getOther(connectionId);
-      !!presence && this._usersManager.patchPresence(connectionId, presence);
-      this._otherNotifier.subject(connectionId).next(other);
+      this._otherNotifier.subject(clientId).next(other);
     });
     const others = this._usersManager.getOthers();
-    this._stateNotifier.subjects["others"].next(others);
+    this._stateNotifier.subjects.others.next(others);
   }
   _handleRegisteredMessage(message) {
-    var _a, _b;
-    const { connectionId, user } = message;
+    var _a, _b, _c;
+    const { connectionId } = message;
+    const user = message.user;
     if (!connectionId) return;
     if (!this._state.webSocket) throw new Error("Could not find WebSocket");
+    const data = message.data;
     this._updateState((oldState) => {
       oldState.connection.count += 1;
       oldState.connection.id = connectionId;
       oldState.authorization.user = user != null ? user : null;
       return oldState;
     });
-    this._usersManager.setMyself(connectionId, user);
+    const userInfo = {
+      connectionId,
+      presence: (_a = data.presence) != null ? _a : void 0,
+      user
+    };
+    this._usersManager.setMyself(userInfo);
     const presence = this._usersManager.myPresence;
-    const myself = (_a = this._usersManager.myself) != null ? _a : null;
+    const myself = (_b = this._usersManager.myself) != null ? _b : null;
     this._stateNotifier.subjects["my-presence"].next(presence);
-    this._stateNotifier.subjects["myself"].next(myself);
-    const update = this._state.connection.count > 1 ? (_b = this._crdtManager.doc.getEncodedState()) != null ? _b : null : null;
+    this._stateNotifier.subjects.myself.next(myself);
+    const update = this._state.connection.count > 1 ? (_c = this._crdtManager.doc.getEncodedState()) != null ? _c : null : null;
     this._sendMessage({
       type: "$initializeSession",
       data: { presence, update }
@@ -974,6 +1086,7 @@ var PluvRoom = class extends AbstractRoom {
     this._crdtNotifier.rootSubject.next(storageRoot);
   }
   _handleUserJoinedMessage(message) {
+    var _a;
     const { connectionId } = message;
     if (!connectionId) return;
     if (!this._state.webSocket) throw new Error("Could not find WebSocket");
@@ -982,12 +1095,18 @@ var PluvRoom = class extends AbstractRoom {
     const myself = this._usersManager.myself;
     if (myself.connectionId === connectionId) {
       this._sendMessage({ type: "$getOthers", data: {} });
+      return;
     }
-    this._usersManager.setUser(connectionId, data.user, data.presence);
+    const result = this._usersManager.addConnection({
+      connectionId,
+      presence: data.presence,
+      user: data.user
+    });
+    const clientId = (_a = result == null ? void 0 : result.clientId) != null ? _a : null;
     const other = this._usersManager.getOther(connectionId);
     const others = this._usersManager.getOthers();
-    this._otherNotifier.subject(connectionId).next(other);
-    this._stateNotifier.subjects["others"].next(others);
+    if (!!clientId) this._otherNotifier.subject(clientId).next(other);
+    this._stateNotifier.subjects.others.next(others);
   }
   _heartbeat() {
     this._clearTimeout(this._timeouts.pong);
@@ -997,7 +1116,7 @@ var PluvRoom = class extends AbstractRoom {
   _logDebug(...data) {
     var _a;
     if (((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.NODE_ENV) === "production") return;
-    this._debug && console.log(...data);
+    if (this._debug) console.log(...data);
   }
   _observeCrdt() {
     var _a, _b;
@@ -1032,7 +1151,7 @@ var PluvRoom = class extends AbstractRoom {
   _onClose(event) {
     return __async(this, null, function* () {
       this._logDebug("WebSocket closed");
-      !!event.reason && this._logDebug(event.reason);
+      if (!!event.reason) this._logDebug(event.reason);
       const shouldRetry = [
         // Going away: Client/server is shutting down or navigating
         1001,
@@ -1047,15 +1166,18 @@ var PluvRoom = class extends AbstractRoom {
         // Bad gateway
         1014
       ].some((okToRetryCode) => event.code === okToRetryCode);
-      this._closeWs();
-      if (!shouldRetry) this._clearTimeout(this._timeouts.reconnect);
-      else this._pollReconnect();
       this._updateState((oldState) => {
         oldState.authorization.token = null;
         oldState.connection.state = shouldRetry ? "Unavailable" /* Unavailable */ : "Closed" /* Closed */;
         oldState.webSocket = null;
         return oldState;
       });
+      if (shouldRetry) {
+        yield this._reconnect();
+        return;
+      }
+      this._closeWs();
+      this._clearTimeout(this._timeouts.reconnect);
     });
   }
   /**
@@ -1226,7 +1348,7 @@ var PluvClient = class {
   constructor(options) {
     this._publicKey = null;
     this._rooms = /* @__PURE__ */ new Map();
-    this.createRoom = (room, options) => {
+    this.createRoom = (room, options = {}) => {
       var _a;
       const oldRoom = this.getRoom(room);
       if (oldRoom) return oldRoom;
@@ -1297,7 +1419,7 @@ var PluvClient = class {
   _logDebug(...data) {
     var _a;
     if (((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.NODE_ENV) === "production") return;
-    this._debug && console.log(...data);
+    if (this._debug) console.log(...data);
   }
 };
 
@@ -1404,7 +1526,9 @@ var MockedRoom = class extends AbstractRoom {
       return sharedType;
     };
     this.other = (connectionId, callback) => {
-      return this._otherNotifier.subscribe(connectionId, callback);
+      const clientId = this._usersManager.getClientId(connectionId);
+      if (!clientId) return () => void 0;
+      return this._otherNotifier.subscribe(clientId, callback);
     };
     this.redo = () => {
       this._crdtManager.doc.redo();
@@ -1438,7 +1562,7 @@ var MockedRoom = class extends AbstractRoom {
       const myPresence = this._usersManager.myPresence;
       const myself = (_a = this._usersManager.myself) != null ? _a : null;
       this._stateNotifier.subjects["my-presence"].next(myPresence);
-      !!myself && this._stateNotifier.subjects["myself"].next(myself);
+      if (!!myself) this._stateNotifier.subjects["myself"].next(myself);
     };
     this._events = events;
     this._router = router != null ? router : new PluvRouter({});