@pluv/client 0.18.0 → 0.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "wonka": "^6.3.4",
-    "@pluv/crdt": "^0.18.0",
-    "@pluv/types": "^0.18.0"
+    "@pluv/crdt": "^0.20.0",
+    "@pluv/types": "^0.20.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
-    "tsup": "^8.0.2",
+    "tsup": "^8.1.0",
     "typescript": "^5.4.5",
-    "@pluv/tsconfig": "^0.18.0",
-    "eslint-config-pluv": "^0.18.0"
+    "@pluv/tsconfig": "^0.20.0",
+    "eslint-config-pluv": "^0.20.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractRoom.ts

@@ -1,14 +1,14 @@
-import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/types";
 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,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > {
     public readonly id: string;
 
@@ -44,7 +44,10 @@ export abstract class AbstractRoom<
 
     public abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
 
-    public abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
+    public abstract getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
+
+    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;
 
@@ -52,12 +55,12 @@ export abstract class AbstractRoom<
 
     public abstract storage<TKey extends keyof TStorage>(
         key: TKey,
-        fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): () => void;
 
     public abstract storageRoot(
         fn: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): () => void;
 
@@ -70,5 +73,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/CrdtManager.ts

@@ -1,7 +1,7 @@
-import type { AbstractCrdtDoc, AbstractCrdtDocFactory, AbstractCrdtType } from "@pluv/crdt";
+import type { AbstractCrdtDoc, AbstractCrdtDocFactory, CrdtType } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 
-export type CrdtManagerOptions<TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+export type CrdtManagerOptions<TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: AbstractCrdtDocFactory<TStorage>;
 };
@@ -12,7 +12,7 @@ type CrdtManagerInitializeParams = {
     update: string | readonly string[];
 };
 
-export class CrdtManager<TStorage extends Record<string, AbstractCrdtType<any, any>>> {
+export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
     public doc: AbstractCrdtDoc<TStorage>;
     public initialized: boolean = false;
 

package/src/CrdtNotifier.ts

@@ -1,31 +1,31 @@
-import type { AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { Subject } from "wonka";
 import { makeSubject, subscribe } from "wonka";
 
-export class CrdtNotifier<TStorage extends Record<string, AbstractCrdtType<any, any>>> {
+export class CrdtNotifier<TStorage extends Record<string, CrdtType<any, any>>> {
     public rootSubject = makeSubject<{
-        [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
     }>();
 
-    public subjects = new Map<keyof TStorage, Subject<InferCrdtStorageJson<TStorage[keyof TStorage]>> | null>();
+    public subjects = new Map<keyof TStorage, Subject<InferCrdtJson<TStorage[keyof TStorage]>> | null>();
 
-    public subject<TKey extends keyof TStorage>(key: TKey): Subject<InferCrdtStorageJson<TStorage[TKey]>> {
+    public subject<TKey extends keyof TStorage>(key: TKey): Subject<InferCrdtJson<TStorage[TKey]>> {
         const subject = this.subjects.get(key);
 
         if (subject) {
-            return subject as Subject<InferCrdtStorageJson<TStorage[TKey]>>;
+            return subject as Subject<InferCrdtJson<TStorage[TKey]>>;
         }
 
-        const newSubject = makeSubject<InferCrdtStorageJson<TStorage[TKey]>>();
+        const newSubject = makeSubject<InferCrdtJson<TStorage[TKey]>>();
 
         this.subjects.set(key, newSubject);
 
-        return newSubject as Subject<InferCrdtStorageJson<TStorage[TKey]>>;
+        return newSubject as Subject<InferCrdtJson<TStorage[TKey]>>;
     }
 
     public subcribeRoot(
         callback: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): () => void {
         return subscribe(callback)(this.rootSubject.source).unsubscribe;
@@ -33,7 +33,7 @@ export class CrdtNotifier<TStorage extends Record<string, AbstractCrdtType<any,
 
     public subscribe<TKey extends keyof TStorage>(
         key: TKey,
-        callback: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        callback: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): () => void {
         const subject = this.subject(key);
 

package/src/MockedRoom.ts

@@ -1,4 +1,4 @@
-import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/types";
 import { AbstractRoom } from "./AbstractRoom";
 import type { CrdtManagerOptions } from "./CrdtManager";
@@ -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<{
@@ -22,14 +28,14 @@ export type MockedRoomEvents<TIO extends IOLike> = Partial<{
 export type MockedRoomConfig<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = { events?: MockedRoomEvents<TIO> } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> &
     UsersManagerConfig<TPresence>;
 
 export class MockedRoom<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > extends AbstractRoom<TIO, TPresence, TStorage> {
     private _crdtManager: CrdtManager<TStorage>;
     private _crdtNotifier = new CrdtNotifier<TStorage>();
@@ -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;
@@ -136,14 +142,24 @@ export class MockedRoom<
         return this._usersManager.getOthers();
     };
 
-    public getStorage = <TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null => {
-        const sharedType = this._crdtManager.get(key);
+    public getStorage = <TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null => {
+        const sharedType = this._crdtManager.get(type);
 
         if (typeof sharedType === "undefined") return null;
 
-        return sharedType.value;
+        return sharedType;
     };
 
+    public getStorageJson(): InferCrdtJson<TStorage> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type?: TKey) {
+        if (this._state.connection.id === null) return null;
+
+        if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+
+        return this._crdtManager.doc.toJson(type);
+    }
+
     public other = (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): (() => void) => {
         return this._otherNotifier.subscribe(connectionId, callback);
     };
@@ -154,14 +170,14 @@ export class MockedRoom<
 
     public storage = <TKey extends keyof TStorage>(
         key: TKey,
-        fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): (() => void) => {
         return this._crdtNotifier.subscribe(key, fn);
     };
 
     public storageRoot = (
         fn: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): (() => void) => {
         return this._crdtNotifier.subcribeRoot(fn);
@@ -199,8 +215,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;
@@ -222,18 +240,18 @@ export class MockedRoom<
 
             const sharedTypes = this._crdtManager.doc.get();
 
-            const storageRoot = Object.entries(sharedTypes).reduce(
-                (acc, [prop, sharedType]) => {
+            const storageRoot = Object.keys(sharedTypes).reduce(
+                (acc, prop) => {
                     if (!this._crdtManager) return acc;
 
-                    const serialized = sharedType.toJson();
+                    const serialized = this._crdtManager.doc.toJson(prop);
 
                     this._crdtNotifier.subject(prop).next(serialized);
 
                     return { ...acc, [prop]: serialized };
                 },
                 {} as {
-                    [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+                    [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
                 },
             );
 

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/PluvClient.ts

@@ -1,6 +1,7 @@
-import type { AbstractCrdtType } from "@pluv/crdt";
+import type { CrdtType } from "@pluv/crdt";
 import type { IOLike, JsonObject } from "@pluv/types";
-import { AuthEndpoint, PluvRoom, PluvRoomOptions, RoomConfig, RoomEndpoints, WsEndpoint } from "./PluvRoom";
+import type { AuthEndpoint, PluvRoomOptions, RoomConfig, RoomEndpoints, WsEndpoint } from "./PluvRoom";
+import { PluvRoom } from "./PluvRoom";
 
 export type PluvClientOptions<TIO extends IOLike> = RoomEndpoints<TIO> & {
     debug?: boolean;
@@ -21,10 +22,7 @@ export class PluvClient<TIO extends IOLike = IOLike> {
         this._wsEndpoint = wsEndpoint;
     }
 
-    public createRoom = <
-        TPresence extends JsonObject = {},
-        TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
-    >(
+    public createRoom = <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(
         room: string,
         options: PluvRoomOptions<TIO, TPresence, TStorage>,
     ): PluvRoom<TIO, TPresence, TStorage> => {
@@ -65,10 +63,7 @@ export class PluvClient<TIO extends IOLike = IOLike> {
         return toEnter;
     };
 
-    public getRoom = <
-        TPresence extends JsonObject = {},
-        TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
-    >(
+    public getRoom = <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(
         room: string,
     ): PluvRoom<TIO, TPresence, TStorage> | null => {
         const found = this._rooms.get(room) as PluvRoom<TIO, TPresence, TStorage> | undefined;

package/src/PluvRoom.ts

@@ -1,4 +1,4 @@
-import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type {
     BaseIOEventRecord,
     EventMessage,
@@ -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";
 
@@ -40,7 +47,7 @@ const ORIGIN_STORAGE_UPDATED = "$STORAGE_UPDATED";
 export const DEFAULT_PLUV_CLIENT_ADDON = <
     TIO extends IOLike = IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 >(
     input: PluvRoomAddonInput<TIO, TPresence, TStorage>,
 ): PluvRoomAddonResult => ({
@@ -94,13 +101,13 @@ interface InternalListeners {
 export type PluvRoomAddon<
     TIO extends IOLike = IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = (input: PluvRoomAddonInput<TIO, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
 
 export interface PluvRoomAddonInput<
     TIO extends IOLike = IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > {
     room: PluvRoom<TIO, TPresence, TStorage>;
 }
@@ -117,7 +124,7 @@ export type PluvRoomDebug<TIO extends IOLike> = Id<{
 export type PluvRoomOptions<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = {
     addons?: readonly PluvRoomAddon<TIO, TPresence, TStorage>[];
     debug?: boolean | PluvRoomDebug<TIO>;
@@ -128,13 +135,13 @@ export type PluvRoomOptions<
 export type RoomConfig<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
 
 export class PluvRoom<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > extends AbstractRoom<TIO, TPresence, TStorage> {
     readonly _endpoints: RoomEndpoints<TIO>;
 
@@ -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;
@@ -372,14 +379,28 @@ export class PluvRoom<
         return this._usersManager.getOthers();
     };
 
-    public getStorage = <TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null => {
-        const sharedType = this._crdtManager.get(key);
+    public getStorage = <TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null => {
+        const sharedType = this._crdtManager.get(type);
 
         if (typeof sharedType === "undefined") return null;
 
         return sharedType;
     };
 
+    public getStorageJson(): InferCrdtJson<TStorage> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type?: TKey) {
+        if (this._state.connection.id === null) return null;
+
+        if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+
+        const sharedType = this._crdtManager.get(type);
+
+        if (typeof sharedType === "undefined") return null;
+
+        return this._crdtManager.doc.toJson(type);
+    }
+
     public other = (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): (() => void) => {
         return this._otherNotifier.subscribe(connectionId, callback);
     };
@@ -390,14 +411,14 @@ export class PluvRoom<
 
     public storage = <TKey extends keyof TStorage>(
         key: TKey,
-        fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): (() => void) => {
         return this._crdtNotifier.subscribe(key, fn);
     };
 
     public storageRoot = (
         fn: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): (() => void) => {
         return this._crdtNotifier.subcribeRoot(fn);
@@ -433,8 +454,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 +465,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> {
@@ -553,17 +576,15 @@ export class PluvRoom<
     private _emitSharedTypes(): void {
         const sharedTypes = this._crdtManager.doc.get();
 
-        const storageRoot = Object.entries(sharedTypes).reduce(
-            (acc, [prop, sharedType]) => {
-                const serialized = sharedType.toJson();
+        const storageRoot = Object.keys(sharedTypes).reduce(
+            (acc, prop) => {
+                const serialized = this._crdtManager.doc.toJson(prop);
 
                 this._crdtNotifier.subject(prop).next(serialized);
 
                 return { ...acc, [prop]: serialized };
             },
-            {} as {
-                [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
-            },
+            {} as { [P in keyof TStorage]: InferCrdtJson<TStorage[P]> },
         );
 
         this._crdtNotifier.rootSubject.next(storageRoot);
@@ -705,8 +726,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);
@@ -805,18 +824,18 @@ export class PluvRoom<
 
         const sharedTypes = this._crdtManager.doc.get();
 
-        const storageRoot = Object.entries(sharedTypes).reduce(
-            (acc, [prop, sharedType]) => {
+        const storageRoot = Object.keys(sharedTypes).reduce(
+            (acc, prop) => {
                 if (!this._crdtManager) return acc;
 
-                const serialized = sharedType.toJson();
+                const serialized = this._crdtManager.doc.toJson(prop);
 
                 this._crdtNotifier.subject(prop).next(serialized);
 
                 return { ...acc, [prop]: serialized };
             },
             {} as {
-                [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+                [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
             },
         );
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export type { AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+export type { CrdtType, InferCrdtJson } from "@pluv/crdt";
 export type { BaseUser, EventMessage, EventRecord, IOEventMessage } from "@pluv/types";
 export { AbstractRoom } from "./AbstractRoom";
 export { AbstractStorageStore } from "./AbstractStorageStore";

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>>>;
-}