@pluv/client 0.40.2 → 0.41.1

package/dist/index.mjs

@@ -192,24 +192,27 @@ var EventNotifier = class {
 import { makeSubject as makeSubject3, subscribe as subscribe3 } from "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 = makeSubject3();
-    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 subscribe3(callback)(source).unsubscribe;
   }
 };
@@ -283,9 +286,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.
      */
@@ -303,74 +313,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;
   }
 };
 
@@ -536,7 +626,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();
@@ -568,7 +660,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 }
@@ -638,8 +730,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) => {
@@ -750,7 +842,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([]);
@@ -838,11 +930,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;
@@ -852,11 +944,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;
@@ -864,31 +963,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 }
@@ -943,6 +1055,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");
@@ -951,12 +1064,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);
@@ -966,7 +1085,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;
@@ -1001,7 +1120,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,
@@ -1016,15 +1135,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);
     });
   }
   /**
@@ -1373,7 +1495,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();
@@ -1407,7 +1531,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({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "0.40.2",
+  "version": "0.41.1",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,20 +18,20 @@
   },
   "dependencies": {
     "wonka": "^6.3.5",
-    "@pluv/crdt": "^0.40.2",
-    "@pluv/types": "^0.40.2"
+    "@pluv/crdt": "^0.41.1",
+    "@pluv/types": "^0.41.1"
   },
   "devDependencies": {
-    "eslint": "^9.24.0",
+    "eslint": "^9.25.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^0.40.2",
-    "eslint-config-pluv": "^0.40.2"
+    "@pluv/tsconfig": "^0.41.1",
+    "eslint-config-pluv": "^0.41.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
-    "lint": "eslint src/**/*.ts* --fix --max-warnings 0",
+    "lint": "eslint \"src/**/*.ts*\" --fix --max-warnings 0",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   }
 }

package/src/AbstractRoom.ts

@@ -51,7 +51,10 @@ export abstract class AbstractRoom<
     public abstract getStorageJson(): InferCrdtJson<TStorage> | null;
     public abstract getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
 
-    public abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
+    public abstract other(
+        connectionId: string,
+        callback: OtherNotifierSubscriptionCallback<TIO, TPresence>,
+    ): () => void;
 
     public abstract redo(): void;
 

package/src/MockedRoom.ts

@@ -51,7 +51,7 @@ export class MockedRoom<
     private _crdtNotifier = new CrdtNotifier<TStorage>();
     private _eventNotifier = new EventNotifier<MergeEvents<TEvents, TIO>>();
     private _events?: MockedRoomEvents<MergeEvents<TEvents, TIO>>;
-    private _otherNotifier = new OtherNotifier<TIO>();
+    private _otherNotifier = new OtherNotifier<TIO, TPresence>();
     private _router: PluvRouter<TIO, TPresence, TStorage, TEvents>;
     private _state: WebSocketState<TIO> = {
         authorization: {
@@ -226,8 +226,15 @@ export class MockedRoom<
         return this._crdtManager.doc.toJson(type);
     }
 
-    public other = (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): (() => void) => {
-        return this._otherNotifier.subscribe(connectionId, callback);
+    public other = (
+        connectionId: string,
+        callback: OtherNotifierSubscriptionCallback<TIO, TPresence>,
+    ): (() => void) => {
+        const clientId = this._usersManager.getClientId(connectionId);
+
+        if (!clientId) return () => undefined;
+
+        return this._otherNotifier.subscribe(clientId, callback);
     };
 
     public redo = (): void => {
@@ -290,7 +297,7 @@ export class MockedRoom<
         const myself = this._usersManager.myself ?? null;
 
         this._stateNotifier.subjects["my-presence"].next(myPresence);
-        !!myself && this._stateNotifier.subjects["myself"].next(myself);
+        if (!!myself) this._stateNotifier.subjects["myself"].next(myself);
     };
 
     private _observeCrdt(): void {

package/src/OtherNotifier.ts

@@ -1,39 +1,42 @@
-import type { Id, IOLike } from "@pluv/types";
+import type { Id, IOLike, JsonObject } from "@pluv/types";
 import type { Subject } from "wonka";
 import { makeSubject, subscribe } from "wonka";
 import type { UserInfo } from "./types";
 
-export type OtherNotifierSubscriptionCallback<TIO extends IOLike> = (value: Id<UserInfo<TIO>> | null) => void;
+export type OtherNotifierSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (
+    value: Id<UserInfo<TIO, TPresence>> | null,
+) => void;
 
-export class OtherNotifier<TIO extends IOLike> {
-    public subjects = new Map<string, Subject<Id<UserInfo<TIO>> | null>>();
+export class OtherNotifier<TIO extends IOLike, TPresence extends JsonObject = {}> {
+    private _subjects = new Map<[clientId: string][0], Subject<Id<UserInfo<TIO, TPresence>> | null>>();
 
     public clear(): void {
-        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();
+    }
+
+    public delete(clientId: string): void {
+        this.subject(clientId).next(null);
+        this._subjects.delete(clientId);
     }
 
-    public subject<TEvent extends string>(name: TEvent): Subject<Id<UserInfo<TIO>> | null> {
-        const subject = this.subjects.get(name);
+    public subject(clientId: string): Subject<Id<UserInfo<TIO, TPresence>> | null> {
+        const subject = this._subjects.get(clientId);
 
         if (subject) return subject;
 
-        const newSubject = makeSubject<Id<UserInfo<TIO>>>();
+        const newSubject = makeSubject<Id<UserInfo<TIO, TPresence>>>();
 
-        this.subjects.set(name, newSubject);
+        this._subjects.set(clientId, newSubject);
 
         return newSubject;
     }
 
-    public subscribe<TEvent extends string>(
-        name: TEvent,
-        callback: OtherNotifierSubscriptionCallback<TIO>,
-    ): () => void {
-        const source = this.subject(name).source;
+    public subscribe(clientId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>): () => void {
+        const source = this.subject(clientId).source;
 
         return subscribe(callback)(source).unsubscribe;
     }