@pluv/client 0.18.0 → 0.19.0

package/src/AbstractRoom.ts

@@ -3,7 +3,7 @@ import type { IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/
 import type { EventNotifierSubscriptionCallback } from "./EventNotifier";
 import type { OtherNotifierSubscriptionCallback } from "./OtherNotifier";
 import type { StateNotifierSubjects, SubscriptionCallback } from "./StateNotifier";
-import type { UserInfo, WebSocketConnection } from "./types";
+import type { UpdateMyPresenceAction, UserInfo, WebSocketConnection } from "./types";
 
 export abstract class AbstractRoom<
     TIO extends IOLike,
@@ -70,5 +70,5 @@ export abstract class AbstractRoom<
 
     public abstract undo(): void;
 
-    public abstract updateMyPresence(presence: Partial<TPresence>): void;
+    public abstract updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
 }

package/src/MockedRoom.ts

@@ -12,7 +12,13 @@ import type { StateNotifierSubjects, SubscriptionCallback } from "./StateNotifie
 import { StateNotifier } from "./StateNotifier";
 import type { UsersManagerConfig } from "./UsersManager";
 import { UsersManager } from "./UsersManager";
-import type { InternalSubscriptions, UserInfo, WebSocketConnection, WebSocketState } from "./types";
+import type {
+    InternalSubscriptions,
+    UpdateMyPresenceAction,
+    UserInfo,
+    WebSocketConnection,
+    WebSocketState,
+} from "./types";
 import { ConnectionState } from "./types";
 
 export type MockedRoomEvents<TIO extends IOLike> = Partial<{
@@ -111,10 +117,10 @@ export class MockedRoom<
         return this._eventNotifier.subscribe(event, callback);
     };
 
-    public getConnection(): WebSocketConnection {
+    public getConnection = (): WebSocketConnection => {
         // Create a read-only clone of the connection state
         return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
-    }
+    };
 
     public getDoc(): AbstractCrdtDoc<TStorage> {
         return this._crdtManager.doc;
@@ -199,8 +205,10 @@ export class MockedRoom<
         this._crdtManager.doc.undo();
     };
 
-    public updateMyPresence = (presence: Partial<TPresence>): void => {
-        this._usersManager.updateMyPresence(presence);
+    public updateMyPresence = (presence: UpdateMyPresenceAction<TPresence>): void => {
+        const newPresence = typeof presence === "function" ? presence(this.getMyPresence()) : presence;
+
+        this._usersManager.updateMyPresence(newPresence);
 
         const myPresence = this._usersManager.myPresence;
         const myself = this._usersManager.myself ?? null;

package/src/OtherNotifier.ts

@@ -3,16 +3,12 @@ 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> = (value: Id<UserInfo<TIO>> | null) => void;
 
 export class OtherNotifier<TIO extends IOLike> {
     public subjects = new Map<string, Subject<Id<UserInfo<TIO>> | null>>();
 
-    public subject<TEvent extends string>(
-        name: TEvent,
-    ): Subject<Id<UserInfo<TIO>> | null> {
+    public subject<TEvent extends string>(name: TEvent): Subject<Id<UserInfo<TIO>> | null> {
         const subject = this.subjects.get(name);
 
         if (subject) return subject;

package/src/PluvRoom.ts

@@ -26,7 +26,14 @@ import { StateNotifier } from "./StateNotifier";
 import { StorageStore } from "./StorageStore";
 import type { UsersManagerConfig } from "./UsersManager";
 import { UsersManager } from "./UsersManager";
-import type { AuthorizationState, InternalSubscriptions, UserInfo, WebSocketConnection, WebSocketState } from "./types";
+import type {
+    AuthorizationState,
+    InternalSubscriptions,
+    UpdateMyPresenceAction,
+    UserInfo,
+    WebSocketConnection,
+    WebSocketState,
+} from "./types";
 import { ConnectionState } from "./types";
 import { debounce } from "./utils";
 
@@ -347,14 +354,14 @@ export class PluvRoom<
         [event in keyof InferIOOutput<TIO>]: (callback: EventNotifierSubscriptionCallback<TIO, event>) => () => void;
     };
 
-    public getConnection(): WebSocketConnection {
+    public getConnection = (): WebSocketConnection => {
         // Create a read-only clone of the connection state
         return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
-    }
+    };
 
-    public getDoc(): AbstractCrdtDoc<TStorage> {
+    public getDoc = (): AbstractCrdtDoc<TStorage> => {
         return this._crdtManager.doc;
-    }
+    };
 
     public getMyPresence = (): TPresence => {
         return this._usersManager.myPresence;
@@ -433,8 +440,10 @@ export class PluvRoom<
         this._crdtManager.doc.undo();
     };
 
-    public updateMyPresence = (presence: Partial<TPresence>): void => {
-        this._usersManager.updateMyPresence(presence);
+    public updateMyPresence = (presence: UpdateMyPresenceAction<TPresence>): void => {
+        const newPresence = typeof presence === "function" ? presence(this.getMyPresence()) : presence;
+
+        this._usersManager.updateMyPresence(newPresence);
 
         const myPresence = this._usersManager.myPresence;
         const myself = this._usersManager.myself ?? null;
@@ -442,7 +451,7 @@ export class PluvRoom<
         this._stateNotifier.subjects["my-presence"].next(myPresence);
         !!myself && this._stateNotifier.subjects["myself"].next(myself);
 
-        this.broadcast("$UPDATE_PRESENCE" as keyof InferIOInput<TIO>, { presence } as any);
+        this.broadcast("$UPDATE_PRESENCE" as keyof InferIOInput<TIO>, { presence: newPresence } as any);
     };
 
     private async _addToStorageStore(update: string): Promise<void> {
@@ -705,8 +714,6 @@ export class PluvRoom<
         Object.keys(data.others).forEach((connectionId) => {
             const { presence, user } = data.others[connectionId];
 
-            if (!user) return;
-
             this._usersManager.setUser(connectionId, user);
 
             const other = this._usersManager.getOther(connectionId);

package/src/types.ts

@@ -17,6 +17,16 @@ export interface InternalSubscriptions {
     observeCrdt: (() => void) | null;
 }
 
+export type UpdateMyPresenceAction<TPresence extends JsonObject> =
+    | Partial<TPresence>
+    | ((oldPresence: TPresence | null) => Partial<TPresence>);
+
+export interface UserInfo<TIO extends IOLike, TPresence extends JsonObject = {}> {
+    connectionId: string;
+    presence: TPresence;
+    user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>>;
+}
+
 export interface WebSocketConnection {
     count: number;
     id: string | null;
@@ -28,9 +38,3 @@ export interface WebSocketState<TIO extends IOLike> {
     connection: WebSocketConnection;
     webSocket: WebSocket | null;
 }
-
-export interface UserInfo<TIO extends IOLike, TPresence extends JsonObject = {}> {
-    connectionId: string;
-    presence: TPresence;
-    user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>>;
-}