@pluv/client 2.0.2 → 2.2.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@2.0.2 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@2.2.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 58.82 KB
-CJS ⚡️ Build success in 123ms
-ESM dist/index.mjs 57.33 KB
-ESM ⚡️ Build success in 131ms
+ESM dist/index.mjs 63.81 KB
+ESM ⚡️ Build success in 137ms
+CJS dist/index.js 65.55 KB
+CJS ⚡️ Build success in 136ms
 DTS Build start
-DTS ⚡️ Build success in 4303ms
-DTS dist/index.d.mts 21.88 KB
-DTS dist/index.d.ts  21.88 KB
+DTS ⚡️ Build success in 4812ms
+DTS dist/index.d.mts 20.11 KB
+DTS dist/index.d.ts  20.11 KB

package/CHANGELOG.md

@@ -1,5 +1,146 @@
 # @pluv/client
 
+## 2.2.0
+
+### Minor Changes
+
+- 3ce1547: Updated typings for `PluvRoom.getDoc` to be narrower to get the native doc type.
+
+  ```ts
+  import { createClient } from "@pluv/client";
+  import { yjs } from "@pluv/crdt-yjs";
+  import type { Doc as YDoc } from "yjs";
+
+  const client = createClient({
+    // ...
+    crdt: yjs,
+  });
+  const room = client.createRoom("example-room");
+
+  const doc = room.getDoc();
+
+  // This is now typed as the native YDoc
+  doc.value;
+  //  ^? const value: YDoc
+  ```
+
+- fd3bfe2: Added the ability to listen to the room's underlying websocket's event listeners.
+- aee40cb: Updated `presence` types to be more lenient (i.e. no-longer extends `JsonObject`). This is to enable types like `.passthrough` with zod, which can be useful for integrating `yjs.awareness` with libraries such as [lexical](https://lexical.dev/).
+- edd1789: **DEPRECATED** `PluvRoom.storageLoaded` will be removed in v3. Added `PluvRoom.getStorageLoaded` with improved detection of when the storage was synced.
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // Before
+  room.storageLoaded;
+
+  // After
+  room.getStorageLoaded();
+  ```
+
+### Patch Changes
+
+- 48191fa: Fixed `PluvRoom.getDoc` not returning a stable doc reference for a single connection.
+  - @pluv/crdt@2.2.0
+  - @pluv/types@2.2.0
+
+## 2.1.0
+
+### Minor Changes
+
+- e8d8fbc: **DEPRECATED** Subscribing to data via string parameters on `PluvRoom.subscribe` is deprecated, to be removed in v3. To subscribe to things such as `myself`, `my-presence` and `others`, you must now do so via nested properties on the `subscribe` object (see example below).
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // Before (now deprecated)
+  room.subscribe("connection", (state) => {});
+  room.subscribe("my-presence", (myPresence) => {});
+  room.subscribe("myself", (myself) => {});
+  room.subscribe("others", (others) => {});
+  room.subscribe("storage-loaded", (storageLoaded) => {});
+
+  // After
+  room.subscribe.connection((state) => {});
+  room.subscribe.myPresence((myPresence) => {});
+  room.subscribe.myself((myself) => {});
+  room.subscribe.others((others) => {});
+  room.subscribe.storageLoaded((storageLoaded) => {});
+  ```
+
+- d5ac29e: **DEPRECATED** `PluvRoom.event`, `PluvRoom.storage`, `PluvRoom.storageRoot` and `PluvRoom.other` have all been deprecated, to be removed in v3. These now exist under `PluvRoom.subscribe` instead.
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // Before (now deprecated)
+  room.event.receiveMessage((event) => {});
+  room.storage.messages((messages) => {});
+  room.storageRoot((storage) => {});
+  room.other(("id_...", other) => {});
+
+  // After
+  room.subscribe.event.receiveMessage((event) => {});
+  room.subscribe.storage.messages((messages) => {});
+  room.subscribe.storageRoot((storage) => {});
+  room.subscribe.other(("id_...", other) => {});
+  ```
+
+- 5ca5cb6: Updated `PluvRoom.storage` to also allow subscribing to storage fields as nested properties.
+
+  ```ts
+  const client = createClient({
+    // ...
+    initialStorage: yjs.doc((t) => ({
+      messages: yjs.array<string>(),
+    })),
+  });
+
+  const room = client.createRoom("example-room");
+
+  // The two statements below are equivalent.
+  room.storage("messages", (value) => {});
+
+  // You can now subscribe to storage fields as nested properties like so
+  room.storage.messages((value) => {});
+  ```
+
+- 4acbe1e: Updated `PluvRoom.storage` to also allow subscribing to the root storage when no field is provided.
+
+  ```ts
+  const client = createClient({
+    // ...
+    initialStorage: yjs.doc((t) => ({
+      messages: yjs.array<string>(),
+    })),
+  });
+
+  const room = client.createRoom("example-room");
+
+  room.storage("messages", (value) => {});
+  //                        ^? const value: string[];
+
+  // You can now subscribe to the storage root when no key is provided
+  room.storage((value) => {});
+  //            ^? const value: { messages: string[] };
+  ```
+
+- e8d8fbc: Updated `PluvRoom.subscribe` so that `PluvRoom.event` and `PluvRoom.storage` can be accessed as properties under `PluvRoom.subscribe`.
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // These are now available under the subscribe object
+  room.subscribe.event.receiveEvent((event) => {});
+  room.subscribe.storage.messages((data) => {});
+  ```
+
+### Patch Changes
+
+- a86ff5e: Updated internal types to simplify the type for `PluvRoom.broadcast` and `PluvRoom.event`.
+  - @pluv/crdt@2.1.0
+  - @pluv/types@2.1.0
+
 ## 2.0.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,8 +1,7 @@
-import { CrdtType, AbstractCrdtDocFactory, NoopCrdtDocFactory, InferStorage, InferCrdtJson } from '@pluv/crdt';
+import { AbstractCrdtDocFactory, InferDocLike, NoopCrdtDocFactory, InferStorage, InferDoc, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
-import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ConnectionState, ProcedureLike, InputZodLike, IORouterLike, WebSocketState, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, MergeEvents, EventNotifierSubscriptionCallback, OtherNotifierSubscriptionCallback, UpdateMyPresenceAction } from '@pluv/types';
-export { BaseUser, ConnectionState, EventMessage, EventNotifierSubscriptionCallback, EventRecord, IOEventMessage, MergeEvents, RoomLike, UserInfo, WebSocketState } from '@pluv/types';
-import { Subject } from 'wonka';
+import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, RoomEventListenerMap, BroadcastProxy, EventProxy, WebSocketConnection, OtherSubscriptionCallback, StorageProxy, SubscribeProxy, UpdateMyPresenceAction, MergeEvents } from '@pluv/types';
+export { BaseUser, ConnectionState, EventMessage, EventNotifierSubscriptionCallback, EventRecord, IOEventMessage, MergeEvents, RoomLike, UserInfo, WebSocketConnection, WebSocketState } from '@pluv/types';
 
 declare abstract class AbstractStorageStore {
     room: string;
@@ -22,9 +21,9 @@ type InferCallback<TIO extends IOLike<any, any>> = (i: typeof identity) => {
 };
 declare const infer: <TIO extends IOLike<any, any>>(callback: InferCallback<TIO>) => InferCallback<TIO>;
 
-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>> = {}> {
-    doc: CrdtDocLike<TStorage>;
+type EventResolver<TIO extends IOLike, TInput extends JsonObject, TOutput extends EventRecord<string, any>, TPresence extends Record<string, any>, TDocLike extends CrdtDocLike<any, any>> = (data: TInput, context: EventResolverContext<TIO, TPresence, TDocLike>) => MaybePromise<TOutput | void>;
+interface EventResolverContext<TIO extends IOLike, TPresence extends Record<string, any>, TDocLike extends CrdtDocLike<any, any>> {
+    doc: TDocLike;
     others: readonly UserInfo<TIO, TPresence>[];
     room: string;
     user: UserInfo<TIO, TPresence>;
@@ -46,75 +45,47 @@ interface PublicKeyParams<TMetadata extends JsonObject> {
     metadata: TMetadata;
 }
 type PublicKey<TMetadata extends JsonObject> = string | ((params: PublicKeyParams<TMetadata>) => string);
-interface WebSocketConnection {
-    /**
-     * @description How many times a connection attempt was made. This will increment upon each
-     * unsuccessful attempt, and will reset upon a successful connection.
-     * @date April 13, 2025
-     */
-    attempts: number;
-    /**
-     * @description How many times the user has connected to the room. This can be more than 1 in
-     * the case of reconnects. This is tracked because on the very first connection (i.e. when
-     * count is 0) we don't want to send the storage state as an update to the room and overwrite
-     * the upstream state.
-     * @date April 13, 2025
-     */
-    count: number;
-    id: string | null;
-    state: ConnectionState;
-}
 type WithMetadata<TMetadata extends JsonObject = {}> = keyof TMetadata extends never ? {
     metadata?: undefined;
 } : {
     metadata: TMetadata;
 };
 
-interface PluvProcedureConfig<TIO extends IOLike = IOLike, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
-    broadcast?: EventResolver<TIO, TInput, TOutput, TPresence, TStorage> | null;
+interface PluvProcedureConfig<TIO extends IOLike, TInput extends JsonObject, TOutput extends EventRecord<string, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>> {
+    broadcast?: EventResolver<TIO, TInput, TOutput, TPresence, InferDocLike<TCrdt>> | null;
     input?: InputZodLike<TInput>;
 }
-declare class PluvProcedure<TIO extends IOLike = IOLike, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TFilled extends "input" | "broadcast" | "" = ""> implements ProcedureLike<TInput, TOutput> {
+declare class PluvProcedure<TIO extends IOLike, TInput extends JsonObject, TOutput extends EventRecord<string, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TFilled extends "input" | "broadcast" | ""> implements ProcedureLike<TInput, TOutput> {
     private _broadcast;
     private _input;
     get config(): ProcedureLike<TInput, TOutput>["config"];
-    constructor(config?: PluvProcedureConfig<TIO, TInput, TOutput, TPresence, TStorage>);
-    broadcast<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TIO, TInput, TResult, TPresence, TStorage>): Omit<PluvProcedure<TIO, TInput, MergeEventRecords<[TOutput, TResult]>, TPresence, TStorage, TFilled | "input" | "broadcast">, TFilled | "input" | "broadcast">;
-    input<TData extends JsonObject>(input: InputZodLike<TData>): Omit<PluvProcedure<TIO, TData, {}, TPresence, TStorage, TFilled | "input">, TFilled | "input">;
+    constructor(config?: PluvProcedureConfig<TIO, TInput, TOutput, TPresence, TCrdt>);
+    broadcast<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TIO, TInput, TResult, TPresence, InferDocLike<TCrdt>>): Omit<PluvProcedure<TIO, TInput, MergeEventRecords<[TOutput, TResult]>, TPresence, TCrdt, TFilled | "input" | "broadcast">, TFilled | "input" | "broadcast">;
+    input<TData extends JsonObject>(input: InputZodLike<TData>): Omit<PluvProcedure<TIO, TData, {}, TPresence, TCrdt, TFilled | "input">, TFilled | "input">;
     private _resolver;
 }
 
-type CrdtManagerOptions<TCrdt extends AbstractCrdtDocFactory<any>> = {
+type CrdtManagerOptions<TCrdt extends AbstractCrdtDocFactory<any, any>> = {
     initialStorage?: TCrdt;
 };
 
-type PluvRouterEventConfig<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = {
-    [P: string]: Pick<PluvProcedure<TIO, any, any, TPresence, TStorage>, "config">;
+type PluvRouterEventConfig<TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>> = {
+    [P: string]: Pick<PluvProcedure<TIO, any, any, TPresence, TCrdt, "">, "config">;
 };
-type MergedRouter<TRouters extends PluvRouter<TIO, TPresence, TStorage, any>[] = [], TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TRoot extends TRouters[0]["_defs"]["events"] = {}> = TRouters extends [
-    infer IHead extends PluvRouter<TIO, TPresence, TStorage, any>,
-    ...infer ITail extends PluvRouter<TIO, TPresence, TStorage, any>[]
-] ? MergedRouter<ITail, TIO, TPresence, TStorage, TRoot & IHead["_defs"]["events"]> : PluvRouter<TIO, TPresence, TStorage, TRoot>;
-declare class PluvRouter<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> implements IORouterLike<TEvents> {
+type MergedRouter<TRouters extends PluvRouter<TIO, TPresence, TCrdt, any>[], TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TRoot extends TRouters[0]["_defs"]["events"]> = TRouters extends [
+    infer IHead extends PluvRouter<TIO, TPresence, TCrdt, any>,
+    ...infer ITail extends PluvRouter<TIO, TPresence, TCrdt, any>[]
+] ? MergedRouter<ITail, TIO, TPresence, TCrdt, TRoot & IHead["_defs"]["events"]> : PluvRouter<TIO, TPresence, TCrdt, TRoot>;
+declare class PluvRouter<TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, TCrdt> = {}> implements IORouterLike<TEvents> {
     readonly _defs: {
         events: TEvents;
     };
     constructor(events: TEvents);
-    static merge<TRouters extends PluvRouter<any, any, any, any>[]>(...routers: TRouters): MergedRouter<TRouters>;
+    static merge<TRouters extends PluvRouter<TIO, TPresence, TCrdt, any>[], TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>>(...routers: TRouters): MergedRouter<TRouters, TIO, TPresence, TCrdt, {}>;
     private _isValidEventName;
 }
 
-interface StateNotifierSubjects<TIO extends IOLike, TPresence extends JsonObject> {
-    connection: Subject<Id<WebSocketState<TIO>>>;
-    "my-presence": Subject<TPresence | null>;
-    myself: Subject<Readonly<Id<UserInfo<TIO>>> | null>;
-    others: Subject<readonly Id<UserInfo<TIO>>[]>;
-    "storage-loaded": Subject<boolean>;
-}
-type InferSubjectValue<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = StateNotifierSubjects<TIO, TPresence>[TSubject] extends Subject<infer IValue> ? Id<IValue> : never;
-type SubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = (value: InferSubjectValue<TIO, TPresence, TSubject>) => void;
-
-type UsersManagerConfig<TPresence extends JsonObject = {}> = {
+type UsersManagerConfig<TPresence extends Record<string, any> = {}> = {
     initialPresence?: TPresence;
     limits: PluvClientLimits;
     presence?: InputZodLike<TPresence>;
@@ -144,8 +115,8 @@ type RoomEndpoints<TIO extends IOLike<any, any>, TMetadata extends JsonObject> =
 } : {
     authEndpoint?: undefined;
 });
-type PluvRoomAddon<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>> = (input: PluvRoomAddonInput<TIO, TMetadata, TPresence, TCrdt>) => Partial<PluvRoomAddonResult>;
-interface PluvRoomAddonInput<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>> {
+type PluvRoomAddon<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>> = (input: PluvRoomAddonInput<TIO, TMetadata, TPresence, TCrdt>) => Partial<PluvRoomAddonResult>;
+interface PluvRoomAddonInput<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>> {
     room: PluvRoom<TIO, TMetadata, TPresence, TCrdt>;
 }
 interface PluvRoomAddonResult {
@@ -160,7 +131,7 @@ interface ReconnectTimeoutMsParams {
     attempts: number;
 }
 type ReconnectTimeoutMs = number | ((params: ReconnectTimeoutMsParams) => number);
-type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> = Id<{
+type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> = Id<{
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TCrdt>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     limits: PluvClientLimits;
@@ -170,7 +141,7 @@ type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject, TPresence exte
     reconnectTimeoutMs?: ReconnectTimeoutMs;
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 } & RoomEndpoints<TIO, TMetadata> & Pick<CrdtManagerOptions<TCrdt>, "initialStorage"> & UsersManagerConfig<TPresence>>;
-declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TCrdt extends AbstractCrdtDocFactory<any> = NoopCrdtDocFactory, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> implements RoomLike<TIO, TPresence, InferStorage<TCrdt>> {
+declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObject = {}, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
     readonly _endpoints: RoomEndpoints<TIO, TMetadata>;
     readonly id: string;
     readonly metadata?: InputZodLike<TMetadata>;
@@ -180,8 +151,8 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private readonly _eventNotifier;
     private readonly _intervals;
     private readonly _limits;
+    private readonly _listenerManager;
     private readonly _listeners;
-    private readonly _otherNotifier;
     private readonly _publicKey;
     private readonly _reconnectTimeoutMs;
     private readonly _router;
@@ -190,21 +161,29 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private readonly _subscriptions;
     private readonly _timeouts;
     private readonly _usersManager;
+    private readonly _usersNotifier;
     private _lastMetadata;
     private _state;
     private _windowListeners;
     private _wsListeners;
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TCrdt, TEvents>);
+    /**
+     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
+     */
     get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [PEvent in keyof InferIOInput<MergeEvents<TEvents, TIO>>]: (data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[PEvent]>) => Promise<void>; };
+    addEventListener<TKind extends keyof RoomEventListenerMap>(kind: TKind, handler: RoomEventListenerMap[TKind]): () => void;
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
     connect(...args: RoomConnectParams<TMetadata>): Promise<void>;
     disconnect(): Promise<void>;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void; };
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
+     */
+    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
-    getDoc: () => CrdtDocLike<InferStorage<TCrdt>>;
+    getDoc: () => CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
@@ -212,11 +191,22 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorage: <TKey extends keyof InferStorage<TCrdt>>(type: TKey) => InferStorage<TCrdt>[TKey] | null;
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
+    getStorageLoaded: () => boolean;
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
+     */
+    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof InferStorage<TCrdt>>(key: TKey, fn: (value: InferCrdtJson<InferStorage<TCrdt>[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
-    subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
+     */
+    storage: StorageProxy<InferStorage<TCrdt>>;
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
+     * @description Subscribes to the root storage object (serialized)
+     */
+    storageRoot: (callback: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
+    subscribe: SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;
@@ -268,7 +258,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _updateState;
 }
 
-type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
+type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
     debug?: boolean;
     initialStorage?: TCrdt;
     /**
@@ -281,7 +271,7 @@ type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends JsonObjec
     publicKey?: PublicKey<TMetadata>;
     types: InferCallback<TIO>;
 };
-type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> = {
+type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, InferStorage<TCrdt>>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     initialPresence?: TPresence;
@@ -291,7 +281,7 @@ type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends JsonObjec
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 };
 type EnterRoomParams<TMetadata extends JsonObject = {}> = keyof TMetadata extends never ? [] : [WithMetadata<TMetadata>];
-declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObject = {}, TCrdt extends AbstractCrdtDocFactory<any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}> {
+declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}> {
     readonly metadata?: InputZodLike<TMetadata>;
     private readonly _authEndpoint;
     private readonly _debug;
@@ -304,7 +294,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     get _defs(): {
         initialStorage: TCrdt | undefined;
     };
-    get procedure(): PluvProcedure<TIO, {}, {}, TPresence, InferStorage<TCrdt>>;
+    get procedure(): PluvProcedure<TIO, {}, {}, TPresence, TCrdt, "">;
     constructor(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>);
     createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}>(room: string, options?: CreateRoomOptions<TIO, TPresence, TCrdt, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TCrdt, TEvents>;
     enter: (room: string | PluvRoom<TIO, TMetadata, any, any, any>, ...args: EnterRoomParams<TMetadata>) => Promise<PluvRoom<TIO, TMetadata, TPresence, TCrdt, any>>;
@@ -315,37 +305,41 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     private _logDebug;
 }
 
-declare const createClient: <TIO extends IOLike<any, any>, TPresence extends JsonObject = {}, TCrdt extends AbstractCrdtDocFactory<any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) => PluvClient<TIO, TPresence, TCrdt, TMetadata>;
+declare const createClient: <TIO extends IOLike<any, any>, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) => PluvClient<TIO, TPresence, TCrdt, TMetadata>;
 
 type MockedRoomEvents<TIO extends IOLike> = Partial<{
     [P in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[P]>) => Partial<InferIOOutput<TIO>>;
 }>;
-type MockedRoomConfig<TIO extends IOLike, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> = {
+type MockedRoomConfig<TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> = {
     events?: MockedRoomEvents<MergeEvents<TEvents, TIO>>;
     limits?: PluvClientLimits;
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 } & Pick<CrdtManagerOptions<TCrdt>, "initialStorage"> & Omit<UsersManagerConfig<TPresence>, "limits">;
-declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> implements RoomLike<TIO, TPresence, InferStorage<TCrdt>> {
+declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
     readonly id: string;
+    /**
+     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
+     */
+    readonly storageLoaded: boolean;
     private readonly _crdtManager;
     private readonly _crdtNotifier;
     private readonly _eventNotifier;
     private readonly _events?;
     private readonly _limits;
-    private readonly _otherNotifier;
+    private readonly _usersNotifier;
     private readonly _router;
     private _state;
     private readonly _stateNotifier;
     private readonly _subscriptions;
     private readonly _usersManager;
     constructor(room: string, options: MockedRoomConfig<TIO, TPresence, TCrdt, TEvents>);
-    get storageLoaded(): boolean;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[event]>) => Promise<void>; };
+    addEventListener<TKind extends keyof RoomEventListenerMap>(kind: TKind, handler: RoomEventListenerMap[TKind]): () => void;
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [event in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>) => () => void; };
+    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
-    getDoc(): CrdtDocLike<InferStorage<TCrdt>>;
+    getDoc(): CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
@@ -353,11 +347,12 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     getStorage: <TKey extends keyof InferStorage<TCrdt>>(type: TKey) => InferStorage<TCrdt>[TKey] | null;
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
+    getStorageLoaded(): boolean;
+    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof InferStorage<TCrdt>>(key: TKey, fn: (value: InferCrdtJson<InferStorage<TCrdt>[TKey]>) => void) => (() => void);
+    storage: StorageProxy<InferStorage<TCrdt>>;
     storageRoot: (fn: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
-    subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    subscribe: SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;
@@ -375,4 +370,4 @@ declare const register: <TMetadata extends JsonObject>(params: RegisterParams<TM
     wsEndpoint: (params: EndpointParams<TMetadata>) => string;
 };
 
-export { AbstractStorageStore, type CreateRoomOptions, type EnterRoomParams, type InferCallback, type InferMetadata, MockedRoom, type MockedRoomConfig, type MockedRoomEvents, PluvClient, type PluvClientOptions, type PluvProcedureConfig, PluvRoom, type PluvRoomAddon, type PluvRoomAddonInput, type PluvRoomAddonResult, type PluvRoomDebug, PluvRouter, type PluvRouterEventConfig, type PublicKey, type PublicKeyParams, type RegisterParams, type RoomConnectParams, type RoomEndpoints, type WebSocketConnection, createClient, infer, register };
+export { AbstractStorageStore, type CreateRoomOptions, type EnterRoomParams, type InferCallback, type InferMetadata, MockedRoom, type MockedRoomConfig, type MockedRoomEvents, PluvClient, type PluvClientOptions, type PluvProcedureConfig, PluvRoom, type PluvRoomAddon, type PluvRoomAddonInput, type PluvRoomAddonResult, type PluvRoomDebug, PluvRouter, type PluvRouterEventConfig, type PublicKey, type PublicKeyParams, type RegisterParams, type RoomConnectParams, type RoomEndpoints, createClient, infer, register };