@pluv/client 1.0.2 → 2.0.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@1.0.2 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@2.0.1 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
-ESM dist/index.mjs 57.31 KB
-ESM ⚡️ Build success in 126ms
-CJS dist/index.js 58.63 KB
-CJS ⚡️ Build success in 126ms
+ESM dist/index.mjs 57.33 KB
+ESM ⚡️ Build success in 127ms
+CJS dist/index.js 58.82 KB
+CJS ⚡️ Build success in 128ms
 DTS Build start
-DTS ⚡️ Build success in 3638ms
-DTS dist/index.d.mts 25.31 KB
-DTS dist/index.d.ts  25.31 KB
+DTS ⚡️ Build success in 4134ms
+DTS dist/index.d.mts 21.88 KB
+DTS dist/index.d.ts  21.88 KB

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @pluv/client
 
+## 2.0.1
+
+### Patch Changes
+
+- 1b93b18: Fixed `ConnectionState` not being exported.
+  - @pluv/crdt@2.0.1
+  - @pluv/types@2.0.1
+
+## 2.0.0
+
+### Patch Changes
+
+- 047a1d8: Moved several internal types to `@pluv/types`.
+- 0806212: Fix the room's id not being defined during the initialization of addons.
+- 3a34dbb: Fixed `initialStorage` on `PluvClient.createRoom` not overwriting the `initialStorage` from the `PluvClient` constructor.
+- Updated dependencies [047a1d8]
+  - @pluv/types@2.0.0
+  - @pluv/crdt@2.0.0
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,19 +1,19 @@
-import { CrdtType, AbstractCrdtDocFactory, AbstractCrdtDoc, InferCrdtJson } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDocFactory, NoopCrdtDocFactory, InferStorage, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
-import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, EventRecord, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, InferIOInput, MaybePromise } from '@pluv/types';
-export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
+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';
 
-type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
-
-declare const ConnectionState: {
-    readonly Closed: "Closed";
-    readonly Connecting: "Connecting";
-    readonly Open: "Open";
-    readonly Unavailable: "Unavailable";
-    readonly Untouched: "Untouched";
-};
-type ConnectionState = (typeof ConnectionState)[keyof typeof ConnectionState];
+declare abstract class AbstractStorageStore {
+    room: string;
+    constructor(room: string);
+    abstract addUpdate(update: string): Promise<void>;
+    abstract destroy(): Promise<void>;
+    abstract flatten(encodedState: string): Promise<void>;
+    abstract getShouldFlatten(): Promise<boolean>;
+    abstract getUpdates(start?: number): Promise<readonly string[]>;
+    abstract initialize(): Promise<void>;
+}
 
 declare const identity: <T extends unknown>(x: T) => T;
 
@@ -22,11 +22,59 @@ 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>;
+    others: readonly UserInfo<TIO, TPresence>[];
+    room: string;
+    user: UserInfo<TIO, TPresence>;
+}
+type InferMetadata<TClient extends PluvClient<any, any, any, any>> = TClient extends PluvClient<any, any, any, infer IMetadata> ? IMetadata : never;
+type MergeEventRecords<TEventRecords extends EventRecord<string, any>[], TRoot extends EventRecord<string, any> = {}> = TEventRecords extends [
+    infer IHead extends EventRecord<string, any>,
+    ...infer ITail extends EventRecord<string, any>[]
+] ? MergeEventRecords<ITail, Omit<TRoot, keyof IHead> & {
+    [P in keyof IHead]: TRoot extends Record<P, any> ? TRoot[P] | IHead[P] : IHead[P];
+}> : Id<TRoot>;
+interface PluvClientLimits {
+    /**
+     * @description Maximum size of presence object in bytes
+     */
+    presenceMaxSize?: number | null;
+}
+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;
     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" | "" = ""> {
+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> {
     private _broadcast;
     private _input;
     get config(): ProcedureLike<TInput, TOutput>["config"];
@@ -36,19 +84,8 @@ declare class PluvProcedure<TIO extends IOLike = IOLike, TInput extends JsonObje
     private _resolver;
 }
 
-declare abstract class AbstractStorageStore {
-    room: string;
-    constructor(room: string);
-    abstract addUpdate(update: string): Promise<void>;
-    abstract destroy(): Promise<void>;
-    abstract flatten(encodedState: string): Promise<void>;
-    abstract getShouldFlatten(): Promise<boolean>;
-    abstract getUpdates(start?: number): Promise<readonly string[]>;
-    abstract initialize(): Promise<void>;
-}
-
-type CrdtManagerOptions<TStorage extends Record<string, CrdtType<any, any>> = {}> = {
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
+type CrdtManagerOptions<TCrdt extends AbstractCrdtDocFactory<any>> = {
+    initialStorage?: TCrdt;
 };
 
 type PluvRouterEventConfig<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = {
@@ -58,11 +95,6 @@ type MergedRouter<TRouters extends PluvRouter<TIO, TPresence, TStorage, any>[] =
     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>;
-type MergeEvents<TClientEvents extends PluvRouterEventConfig<any, any, any>, TServerIO extends IOLike<any, any>> = TServerIO extends IOLike<infer IAuthorize, infer IServerEvents> ? IOLike<IAuthorize, {
-    [P in keyof TClientEvents]: TClientEvents[P] extends ProcedureLike<infer IClientInput, infer IClientOutput> ? {
-        [K in keyof IClientOutput]: K extends keyof IServerEvents ? IServerEvents[K] : ProcedureLike<IClientInput, Id<Pick<IClientOutput, K>>>;
-    }[keyof IClientOutput] : never;
-} & IServerEvents> : never;
 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> {
     readonly _defs: {
         events: TEvents;
@@ -112,9 +144,9 @@ type RoomEndpoints<TIO extends IOLike<any, any>, TMetadata extends JsonObject> =
 } : {
     authEndpoint?: undefined;
 });
-type PluvRoomAddon<TIO extends IOLike = IOLike, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = (input: PluvRoomAddonInput<TIO, TMetadata, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
-interface PluvRoomAddonInput<TIO extends IOLike = IOLike, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
-    room: PluvRoom<TIO, TMetadata, TPresence, TStorage>;
+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>> {
+    room: PluvRoom<TIO, TMetadata, TPresence, TCrdt>;
 }
 interface PluvRoomAddonResult {
     storage: AbstractStorageStore;
@@ -128,18 +160,19 @@ interface ReconnectTimeoutMsParams {
     attempts: number;
 }
 type ReconnectTimeoutMs = number | ((params: ReconnectTimeoutMsParams) => number);
-type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> = Id<{
-    addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TStorage>[];
+type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> = Id<{
+    addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TCrdt>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     limits: PluvClientLimits;
     onAuthorizationFail?: (error: Error) => void;
     metadata?: InputZodLike<TMetadata>;
     publicKey?: PublicKey<TMetadata>;
     reconnectTimeoutMs?: ReconnectTimeoutMs;
-    router?: PluvRouter<TIO, TPresence, TStorage, TEvents>;
-} & RoomEndpoints<TIO, TMetadata> & Pick<CrdtManagerOptions<TStorage>, "initialStorage"> & UsersManagerConfig<TPresence>>;
-declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
+    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>> {
     readonly _endpoints: RoomEndpoints<TIO, TMetadata>;
+    readonly id: string;
     readonly metadata?: InputZodLike<TMetadata>;
     private readonly _crdtManager;
     private readonly _crdtNotifier;
@@ -161,7 +194,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _state;
     private _windowListeners;
     private _wsListeners;
-    constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TStorage, TEvents>);
+    constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TCrdt, TEvents>);
     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>; };
@@ -171,20 +204,20 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     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; };
     getConnection: () => WebSocketConnection;
-    getDoc: () => AbstractCrdtDoc<TStorage>;
+    getDoc: () => CrdtDocLike<InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    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;
+    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);
     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);
+    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);
-    transact: (fn: (storage: TStorage) => void, origin?: string) => void;
+    transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;
     private _addToStorageStore;
@@ -235,9 +268,9 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _updateState;
 }
 
-type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends JsonObject, TStorage extends Record<string, CrdtType<any, any>>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
+type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
     debug?: boolean;
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
+    initialStorage?: TCrdt;
     /**
      * @description Configurable limits defined for client-side validation. You should only set
      * this if you control the server and have changed the limits there.
@@ -248,17 +281,17 @@ 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, TStorage extends Record<string, CrdtType<any, any>>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> = {
-    addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TStorage>[];
+type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<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;
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
+    initialStorage?: TCrdt;
     onAuthorizationFail?: (error: Error) => void;
     reconnectTimeoutMs?: ReconnectTimeoutMs;
-    router?: PluvRouter<TIO, TPresence, TStorage, TEvents>;
+    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 = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TMetadata extends JsonObject = {}> {
+declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObject = {}, TCrdt extends AbstractCrdtDocFactory<any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}> {
     readonly metadata?: InputZodLike<TMetadata>;
     private readonly _authEndpoint;
     private readonly _debug;
@@ -269,124 +302,31 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     private readonly _rooms;
     private readonly _wsEndpoint;
     get _defs(): {
-        initialStorage: AbstractCrdtDocFactory<TStorage> | undefined;
+        initialStorage: TCrdt | undefined;
     };
-    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>;
-    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>[];
+    get procedure(): PluvProcedure<TIO, {}, {}, TPresence, InferStorage<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>>;
+    getRoom: (room: string) => PluvRoom<TIO, TMetadata, TPresence, TCrdt, any> | null;
+    getRooms: () => readonly PluvRoom<TIO, TMetadata, TPresence, TCrdt, any>[];
     leave: (room: string | PluvRoom<TIO, any, any, any>) => Promise<void>;
-    router<TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(events: TEvents): PluvRouter<TIO, TPresence, TStorage, TEvents>;
+    router<TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}>(events: TEvents): PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     private _logDebug;
 }
 
-interface AuthorizationState<TIO extends IOLike> {
-    token: string | 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>> = {}> {
-    doc: AbstractCrdtDoc<TStorage>;
-    others: readonly UserInfo<TIO, TPresence>[];
-    room: string;
-    user: UserInfo<TIO, TPresence>;
-}
-type InferMetadata<TClient extends PluvClient<any, any, any, any>> = TClient extends PluvClient<any, any, any, infer IMetadata> ? IMetadata : never;
-type MergeEventRecords<TEventRecords extends EventRecord<string, any>[], TRoot extends EventRecord<string, any> = {}> = TEventRecords extends [
-    infer IHead extends EventRecord<string, any>,
-    ...infer ITail extends EventRecord<string, any>[]
-] ? MergeEventRecords<ITail, Omit<TRoot, keyof IHead> & {
-    [P in keyof IHead]: TRoot extends Record<P, any> ? TRoot[P] | IHead[P] : IHead[P];
-}> : Id<TRoot>;
-interface PluvClientLimits {
-    /**
-     * @description Maximum size of presence object in bytes
-     */
-    presenceMaxSize?: number | null;
-}
-interface PublicKeyParams<TMetadata extends JsonObject> {
-    metadata: TMetadata;
-}
-type PublicKey<TMetadata extends JsonObject> = string | ((params: PublicKeyParams<TMetadata>) => string);
-type UpdateMyPresenceAction<TPresence extends JsonObject> = Partial<TPresence> | ((oldPresence: TPresence | null) => Partial<TPresence>);
-interface UserInfo<TIO extends IOLike, TPresence extends JsonObject = {}> {
-    connectionId: string;
-    presence: TPresence;
-    user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>>;
-}
-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;
-}
-interface WebSocketState<TIO extends IOLike> {
-    authorization: AuthorizationState<TIO>;
-    connection: WebSocketConnection;
-    webSocket: WebSocket | null;
-}
-type WithMetadata<TMetadata extends JsonObject = {}> = keyof TMetadata extends never ? {
-    metadata?: undefined;
-} : {
-    metadata: TMetadata;
-};
-
-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;
-    constructor(room: string);
-    abstract storageLoaded: boolean;
-    abstract broadcast<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>): void;
-    abstract canRedo(): boolean;
-    abstract canUndo(): boolean;
-    abstract getDoc(): AbstractCrdtDoc<TStorage>;
-    abstract event<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>): () => void;
-    abstract getConnection(): WebSocketConnection;
-    abstract getMyPresence(): TPresence;
-    abstract getMyself(): Id<UserInfo<TIO, TPresence>> | null;
-    abstract getOther(connectionId: string): Id<UserInfo<TIO, TPresence>> | null;
-    abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
-    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, TPresence>): () => void;
-    abstract redo(): void;
-    abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
-    abstract storageRoot(fn: (value: {
-        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
-    }) => void): () => void;
-    abstract subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
-    abstract transact(fn: (storage: TStorage) => void, origin?: string): void;
-    abstract undo(): void;
-    abstract updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
-}
-
-declare const createClient: <TIO extends IOLike<any, any>, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TStorage, TMetadata>) => PluvClient<TIO, TPresence, TStorage, TMetadata>;
+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>;
 
 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 = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> = {
+type MockedRoomConfig<TIO extends IOLike, TPresence extends JsonObject, TCrdt extends AbstractCrdtDocFactory<any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> = {
     events?: MockedRoomEvents<MergeEvents<TEvents, TIO>>;
     limits?: PluvClientLimits;
-    router?: PluvRouter<TIO, TPresence, TStorage, TEvents>;
-} & Pick<CrdtManagerOptions<TStorage>, "initialStorage"> & Omit<UsersManagerConfig<TPresence>, "limits">;
-declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
+    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>> {
+    readonly id: string;
     private readonly _crdtManager;
     private readonly _crdtNotifier;
     private readonly _eventNotifier;
@@ -398,27 +338,27 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     private readonly _stateNotifier;
     private readonly _subscriptions;
     private readonly _usersManager;
-    constructor(room: string, options: MockedRoomConfig<TIO, TPresence, TStorage, TEvents>);
+    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>; };
     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; };
     getConnection: () => WebSocketConnection;
-    getDoc(): AbstractCrdtDoc<TStorage>;
+    getDoc(): CrdtDocLike<InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    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;
+    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);
     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);
+    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);
-    transact: (fn: (storage: TStorage) => void, origin?: string) => void;
+    transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;
     private _observeCrdt;
@@ -435,4 +375,4 @@ declare const register: <TMetadata extends JsonObject>(params: RegisterParams<TM
     wsEndpoint: (params: EndpointParams<TMetadata>) => string;
 };
 
-export { AbstractRoom, AbstractStorageStore, ConnectionState, type CreateRoomOptions, type EnterRoomParams, type InferCallback, type InferMetadata, type MergeEvents, 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 UserInfo, type WebSocketConnection, type WebSocketState, 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, type WebSocketConnection, createClient, infer, register };