@pluv/io 0.30.2 → 0.32.0

package/dist/index.d.ts

@@ -82,34 +82,34 @@ declare abstract class AbstractWebSocket<TWebSocket = any> {
     sendMessage<TMessage extends IOEventMessage<any> = IOEventMessage<any>>(data: TMessage): void;
 }
 
-interface PluvProcedureConfig<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>, TContext extends JsonObject, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> {
-    broadcast?: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, Partial<TOutput>> | null;
+interface PluvProcedureConfig<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> {
+    broadcast?: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
     input?: InputZodLike<TInput>;
-    self?: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, Partial<TOutput>> | null;
+    self?: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
     sync?: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
 }
-declare class PluvProcedure<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>, TContext extends JsonObject, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}, TFilled extends "input" | "broadcast" | "self" | "sync" | "" = ""> {
+declare class PluvProcedure<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}, TFilled extends "input" | "broadcast" | "self" | "sync" | "" = ""> {
     private _broadcast;
     private _input;
     private _self;
     private _sync;
     get config(): ProcedureLike<TInput, TOutput>["config"];
     constructor(config?: PluvProcedureConfig<TPlatform, TAuthorize, TContext, TInput, TOutput>);
-    broadcast<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, TResult>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TInput, MergeEventRecords<[TOutput, TResult]>, TFilled | "input" | "broadcast">, TFilled | "input" | "broadcast">;
+    broadcast<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TInput, MergeEventRecords<[TOutput, TResult]>, TFilled | "input" | "broadcast">, TFilled | "input" | "broadcast">;
     input<TData extends JsonObject>(input: InputZodLike<TData>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TData, {}, TFilled | "input">, TFilled | "input">;
-    self<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, TResult>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TInput, MergeEventRecords<[TOutput, TResult]>, TFilled | "input" | "self">, TFilled | "input" | "self">;
-    sync<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, TResult>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TInput, MergeEventRecords<[TOutput, TResult]>, TFilled | "input" | "sync">, TFilled | "input" | "sync">;
+    self<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TInput, MergeEventRecords<[TOutput, TResult]>, TFilled | "input" | "self">, TFilled | "input" | "self">;
+    sync<TResult extends EventRecord<string, any> = {}>(resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>): Omit<PluvProcedure<TPlatform, TAuthorize, TContext, TInput, MergeEventRecords<[TOutput, TResult]>, TFilled | "input" | "sync">, TFilled | "input" | "sync">;
     private _resolver;
 }
 
-type PluvRouterEventConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}> = {
+type PluvRouterEventConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}> = {
     [P: string]: Pick<PluvProcedure<TPlatform, TAuthorize, TContext, any, any>, "config">;
 };
-type MergedRouter<TRouters extends PluvRouter<TPlatform, TAuthorize, TContext, any>[] = [], TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}, TRoot extends TRouters[0]["_defs"]["events"] = {}> = TRouters extends [
+type MergedRouter<TRouters extends PluvRouter<TPlatform, TAuthorize, TContext, any>[] = [], TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TRoot extends TRouters[0]["_defs"]["events"] = {}> = TRouters extends [
     infer IHead extends PluvRouter<TPlatform, TAuthorize, TContext, any>,
     ...infer ITail extends PluvRouter<TPlatform, TAuthorize, TContext, any>[]
 ] ? MergedRouter<ITail, TPlatform, TAuthorize, TContext, TRoot & IHead["_defs"]["events"]> : PluvRouter<TPlatform, TAuthorize, TContext, TRoot>;
-declare class PluvRouter<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IORouterLike<TEvents> {
+declare class PluvRouter<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IORouterLike<TEvents> {
     readonly _defs: {
         events: TEvents;
     };
@@ -122,12 +122,13 @@ declare global {
         log: (...data: any[]) => void;
     };
 }
+type PluvContext<TPlatform extends AbstractPlatform, TContext extends Record<string, any>> = TContext | ((params: InferRoomContextType<TPlatform>) => TContext);
 interface CrdtLibraryType {
     doc: (value: any) => AbstractCrdtDocFactory<any>;
     kind: "loro" | "yjs";
 }
-type EventResolver<TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = (data: TInput, context: EventResolverContext<TPlatform, TAuthorize, TContext>) => MaybePromise<TOutput | void>;
-interface EventResolverContext<TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}> {
+type EventResolver<TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = (data: TInput, context: EventResolverContext<TPlatform, TAuthorize, TContext>) => MaybePromise<TOutput | void>;
+interface EventResolverContext<TPlatform extends AbstractPlatform = AbstractPlatform, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}> {
     context: TContext;
     doc: AbstractCrdtDoc<any>;
     room: string;
@@ -176,19 +177,19 @@ type MergeEventRecords<TEventRecords extends EventRecord<string, any>[], TRoot e
 }> : Id<TRoot>;
 type GetInitialStorageEvent<TPlatform extends AbstractPlatform> = {
     room: string;
-} & InferRoomContextType<TPlatform>;
+};
 type GetInitialStorageFn<TPlatform extends AbstractPlatform> = (event: GetInitialStorageEvent<TPlatform>) => MaybePromise<Maybe<string>>;
-interface PluvIOListeners<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>, TContext extends JsonObject, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> {
+interface PluvIOListeners<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> {
     onRoomDeleted: (event: IORoomListenerEvent<TPlatform, TAuthorize, TContext, TEvents>) => void;
     onRoomMessage: (event: IORoomMessageEvent<TPlatform, TAuthorize, TContext, TEvents>) => void;
     onStorageUpdated: (event: IORoomListenerEvent<TPlatform, TAuthorize, TContext, TEvents>) => void;
 }
-type IORoomListenerEvent<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>, TContext extends JsonObject, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = {
-    context: TContext & InferRoomContextType<TPlatform>;
+type IORoomListenerEvent<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = {
+    context: TContext;
     encodedState: string | null;
     room: string;
 };
-type IORoomMessageEvent<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>, TContext extends JsonObject, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = IORoomListenerEvent<TPlatform, TAuthorize, TContext, TEvents> & {
+type IORoomMessageEvent<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = IORoomListenerEvent<TPlatform, TAuthorize, TContext, TEvents> & {
     message: InferEventMessage<InferEventsOutput<TEvents>, keyof InferEventsOutput<TEvents>>;
     user?: InferIOAuthorizeUser<TAuthorize>;
 };
@@ -206,31 +207,31 @@ declare abstract class AbstractPubSub {
 type WebSocketRegistrationMode = "attached" | "detached";
 type InferPlatformWebSocketType<TPlatform extends AbstractPlatform> = TPlatform extends AbstractPlatform<infer IAbstractWebSocket> ? IAbstractWebSocket : never;
 type InferPlatformWebSocketSource<TPlatform> = TPlatform extends AbstractPlatform<infer IAbstractWebSocket> ? InferWebSocketSource<IAbstractWebSocket> : never;
-type InferPlatformContextType<TPlatform extends AbstractPlatform> = TPlatform extends AbstractPlatform<any, infer IPlatformContext> ? IPlatformContext : never;
-type InferRoomContextType<TPlatform extends AbstractPlatform> = TPlatform extends AbstractPlatform<any, infer IPlatformContext, infer IRoomContext> ? IPlatformContext & IRoomContext : never;
-type AbstractPlatformConfig<TPlatformContext extends Record<string, any> = {}, TRoomContext extends Record<string, any> = {}> = {
-    context?: TPlatformContext & TRoomContext;
+type InferInitContextType<TPlatform extends AbstractPlatform> = TPlatform extends AbstractPlatform<any, infer IInitContext> ? IInitContext : never;
+type InferRoomContextType<TPlatform extends AbstractPlatform> = TPlatform extends AbstractPlatform<any, any, infer IRoomContext> ? IRoomContext : never;
+type AbstractPlatformConfig<TRoomContext extends Record<string, any> = {}> = {
+    context?: TRoomContext;
     persistence?: AbstractPersistence;
     pubSub?: AbstractPubSub;
 };
 interface ConvertWebSocketConfig {
     room: string;
 }
-declare abstract class AbstractPlatform<TWebSocket extends AbstractWebSocket = AbstractWebSocket, TPlatformContext extends Record<string, any> = {}, TRoomContext extends Record<string, any> = {}> {
-    protected readonly _ioContext: TPlatformContext | undefined;
+declare abstract class AbstractPlatform<TWebSocket extends AbstractWebSocket = AbstractWebSocket, TInitContext extends Record<string, any> = {}, TRoomContext extends Record<string, any> = {}> {
+    protected readonly _initContext: TInitContext | undefined;
     protected readonly _roomContext: TRoomContext | undefined;
     private _initialized;
     persistence: AbstractPersistence;
     pubSub: AbstractPubSub;
     abstract readonly _registrationMode: WebSocketRegistrationMode;
-    constructor(config?: AbstractPlatformConfig<TPlatformContext, TRoomContext>);
+    constructor(config?: AbstractPlatformConfig<TRoomContext>);
     abstract acceptWebSocket(webSocket: AbstractWebSocket): Promise<void>;
     abstract convertWebSocket(webSocket: InferWebSocketSource<TWebSocket>, config: ConvertWebSocketConfig): AbstractWebSocket;
     abstract getLastPing(webSocket: AbstractWebSocket): number | null;
     abstract getSerializedState(webSocket: InferWebSocketSource<TWebSocket>): WebSocketSerializedState | null;
     abstract getSessionId(webSocket: InferWebSocketSource<TWebSocket>): string | null;
     abstract getWebSockets(): readonly InferWebSocketSource<TWebSocket>[];
-    abstract initialize(config: AbstractPlatformConfig<TPlatformContext, TRoomContext>): this;
+    abstract initialize(config: AbstractPlatformConfig<TRoomContext>): this;
     abstract parseData(data: string | ArrayBuffer): Record<string, any>;
     abstract randomUUID(): string;
     abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): void;
@@ -246,7 +247,7 @@ type JWTEncodeParams<TUser extends BaseUser, TPlatform extends AbstractPlatform>
     maxAge?: number;
     room: string;
     user: TUser;
-} & InferPlatformContextType<TPlatform>;
+} & InferInitContextType<TPlatform>;
 interface AuthorizeParams {
     platform: AbstractPlatform;
     secret: string;
@@ -260,27 +261,28 @@ declare const authorize: (params: AuthorizeParams) => {
     encode: <TUser extends BaseUser, TPlatform extends AbstractPlatform>(encodeParams: JWTEncodeParams<TUser, TPlatform>) => Promise<string>;
 };
 
-interface IORoomListeners<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>, TContext extends JsonObject, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> {
+interface IORoomListeners<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> {
     onDestroy: (event: IORoomListenerEvent<TPlatform, TAuthorize, TContext, TEvents>) => void;
     onMessage: (event: IORoomMessageEvent<TPlatform, TAuthorize, TContext, TEvents>) => void;
 }
 type BroadcastProxy<TIO extends IORoom<any, any, any, any>> = (<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>) => Promise<void>) & {
     [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>>[event]) => Promise<void>;
 };
-type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
+type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     authorize?: TAuthorize;
-    context: TContext & InferRoomContextType<TPlatform>;
+    context: TContext;
     crdt?: {
         doc: (value: any) => AbstractCrdtDocFactory<any>;
     };
     debug: boolean;
     platform: TPlatform;
+    roomContext: InferRoomContextType<TPlatform>;
     router: PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
 };
-interface WebsocketRegisterOptions {
+type WebsocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
     token?: string | null;
-}
-declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IOLike<TAuthorize, TEvents> {
+} & InferInitContextType<TPlatform>;
+declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IOLike<TAuthorize, TEvents> {
     readonly id: string;
     private _doc;
     private _uninitialize;
@@ -299,7 +301,7 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
      */
     get _defs(): {
         authorize: TAuthorize | null;
-        context: TContext & InferRoomContextType<TPlatform>;
+        context: TContext;
         events: TEvents;
         platform: TPlatform;
     };
@@ -310,7 +312,9 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     onClose(webSocket: WebSocketType<TPlatform>): (event: AbstractCloseEvent) => Promise<void>;
     onError(webSocket: WebSocketType<TPlatform>): (event: AbstractErrorEvent) => Promise<void>;
     onMessage(webSocket: WebSocketType<TPlatform>): (event: AbstractMessageEvent) => Promise<void>;
-    register(webSocket: InferPlatformWebSocketSource<TPlatform>, options?: WebsocketRegisterOptions): Promise<void>;
+    register(webSocket: InferPlatformWebSocketSource<TPlatform>, ...options: keyof InferInitContextType<TPlatform> extends never ? [{
+        token?: string;
+    }?] : [WebsocketRegisterConfig<TPlatform>]): Promise<void>;
     private _broadcast;
     private _emitQuitters;
     private _emitRegistered;
@@ -335,9 +339,9 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
 }
 
 type InferIORoom<TServer extends PluvServer<any, any, any, any>> = TServer extends PluvServer<infer IPlatform, infer IAuthorize, infer IContext, infer IEvents> ? IORoom<IPlatform, IAuthorize, IContext, IEvents> : never;
-type PluvServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<PluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
+type PluvServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<PluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     authorize?: TAuthorize;
-    context?: TContext;
+    context?: PluvContext<TPlatform, TContext>;
     crdt?: {
         doc: (value: any) => AbstractCrdtDocFactory<any>;
     };
@@ -346,11 +350,11 @@ type PluvServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform
     platform: TPlatform;
     router?: PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
 };
-type BaseCreateRoomOptions<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>>, TContext extends JsonObject, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
+type BaseCreateRoomOptions<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     debug?: boolean;
 };
-type CreateRoomOptions<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>>, TContext extends JsonObject, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = keyof InferRoomContextType<TPlatform> extends never ? [BaseCreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>] | [] : [Id<BaseCreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents> & InferRoomContextType<TPlatform>>];
-declare class PluvServer<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IORouterLike<TEvents> {
+type CreateRoomOptions<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>> = keyof InferRoomContextType<TPlatform> extends never ? [BaseCreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents>] | [] : [Id<BaseCreateRoomOptions<TPlatform, TAuthorize, TContext, TEvents> & InferRoomContextType<TPlatform>>];
+declare class PluvServer<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IORouterLike<TEvents> {
     readonly version: string;
     private readonly _authorize;
     private readonly _baseRouter;
@@ -367,7 +371,7 @@ declare class PluvServer<TPlatform extends AbstractPlatform<any> = AbstractPlatf
      */
     get _defs(): {
         authorize: TAuthorize | null;
-        context: TContext;
+        context: PluvContext<TPlatform, TContext>;
         events: TEvents;
         platform: TPlatform;
     };
@@ -379,18 +383,18 @@ declare class PluvServer<TPlatform extends AbstractPlatform<any> = AbstractPlatf
     private _logDebug;
 }
 
-type PluvIOConfig<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>>, TContext extends JsonObject> = {
+type PluvIOConfig<TPlatform extends AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>, TContext extends Record<string, any>> = {
     authorize?: TAuthorize;
-    context?: TContext;
+    context?: PluvContext<TPlatform, TContext>;
     crdt?: CrdtLibraryType;
     debug?: boolean;
     platform: TPlatform;
 };
-type ServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<PluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
+type ServerConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> = Partial<PluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
     getInitialStorage?: GetInitialStorageFn<TPlatform>;
     router?: PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
 };
-declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize, TContext extends JsonObject = {}> {
+declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize, TContext extends Record<string, any> = {}> {
     readonly version: string;
     private readonly _authorize;
     private readonly _context;
@@ -405,13 +409,13 @@ declare class PluvIO<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     server<TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>>(config?: ServerConfig<TPlatform, TAuthorize, TContext, TEvents>): PluvServer<TPlatform, TAuthorize, TContext, TEvents>;
 }
 
-type CreateIOParams<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TContext extends JsonObject = {}, TAuthorizeUser extends BaseUser = BaseUser, TAuthorizeRequired extends boolean = false> = {
-    authorize?: IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferPlatformContextType<TPlatform>>;
-    context?: TContext;
+type CreateIOParams<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TContext extends Record<string, any> = {}, TAuthorizeUser extends BaseUser = BaseUser, TAuthorizeRequired extends boolean = false> = {
+    authorize?: IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>;
+    context?: PluvContext<TPlatform, TContext>;
     crdt?: CrdtLibraryType;
     debug?: boolean;
     platform: TPlatform;
 };
-declare const createIO: <TPlatform extends AbstractPlatform<any> = AbstractPlatform<any, {}, {}>, TContext extends JsonObject = {}, TAuthorizeUser extends BaseUser = BaseUser, TAuthorizeRequired extends boolean = false>(params: CreateIOParams<TPlatform, TContext, TAuthorizeUser, TAuthorizeRequired>) => PluvIO<TPlatform, IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferPlatformContextType<TPlatform>>, TContext>;
+declare const createIO: <TPlatform extends AbstractPlatform<any> = AbstractPlatform<any, {}, {}>, TContext extends Record<string, any> = {}, TAuthorizeUser extends BaseUser = BaseUser, TAuthorizeRequired extends boolean = false>(params: CreateIOParams<TPlatform, TContext, TAuthorizeUser, TAuthorizeRequired>) => PluvIO<TPlatform, IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>, TContext>;
 
-export { type AbstractCloseEvent, type AbstractErrorEvent, type AbstractEvent, type AbstractEventMap, type AbstractListener, type AbstractMessageEvent, AbstractPersistence, AbstractPlatform, type AbstractPlatformConfig, AbstractPubSub, AbstractWebSocket, type AbstractWebSocketConfig, type AbstractWebSocketHandleErrorParams, type AuthorizeModule, type AuthorizeParams, type ConvertWebSocketConfig, type CrdtLibraryType, type CreateIOParams, type CreateRoomOptions, type GetInitialStorageFn, type IOPubSubEventMessage, IORoom, type IORoomListenerEvent, type IORoomMessageEvent, type InferIORoom, type InferPlatformContextType, type InferPlatformWebSocketType, type InferRoomContextType, type JWT, type JWTEncodeParams, type MergedRouter, PluvIO, type PluvIOConfig, type PluvIOListeners, PluvProcedure, type PluvProcedureConfig, PluvRouter, type PluvRouterEventConfig, PluvServer, type PluvServerConfig, type ServerConfig, type WebSocketRegistrationMode, type WebSocketSerializedState, type WebSocketSession, authorize, createIO };
+export { type AbstractCloseEvent, type AbstractErrorEvent, type AbstractEvent, type AbstractEventMap, type AbstractListener, type AbstractMessageEvent, AbstractPersistence, AbstractPlatform, type AbstractPlatformConfig, AbstractPubSub, AbstractWebSocket, type AbstractWebSocketConfig, type AbstractWebSocketHandleErrorParams, type AuthorizeModule, type AuthorizeParams, type ConvertWebSocketConfig, type CrdtLibraryType, type CreateIOParams, type CreateRoomOptions, type GetInitialStorageFn, type IOPubSubEventMessage, IORoom, type IORoomListenerEvent, type IORoomMessageEvent, type InferIORoom, type InferInitContextType, type InferPlatformWebSocketType, type InferRoomContextType, type JWT, type JWTEncodeParams, type MergedRouter, PluvIO, type PluvIOConfig, type PluvIOListeners, PluvProcedure, type PluvProcedureConfig, PluvRouter, type PluvRouterEventConfig, PluvServer, type PluvServerConfig, type ServerConfig, type WebSocketRegistrationMode, type WebSocketSerializedState, type WebSocketSession, authorize, createIO };

package/dist/index.js

@@ -220,7 +220,6 @@ var AbstractPlatform = class {
     this._initialized = false;
     const { context, persistence, pubSub } = config;
     this._meta = config._meta;
-    context && (this._ioContext = context);
     context && (this._roomContext = context);
     this.persistence = persistence != null ? persistence : new Persistence();
     this.pubSub = pubSub != null ? pubSub : new PubSub();
@@ -408,6 +407,7 @@ var IORoom = class {
       onDestroy,
       onMessage,
       platform,
+      roomContext,
       router
     } = config;
     this.id = id;
@@ -415,7 +415,7 @@ var IORoom = class {
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
     this._router = router;
-    this._platform = platform.initialize(__spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), { context }));
+    this._platform = platform.initialize(__spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), { context: roomContext }));
     this._listeners = {
       onDestroy: (event) => onDestroy == null ? void 0 : onDestroy(event),
       onMessage: (event) => onMessage == null ? void 0 : onMessage(event)
@@ -495,9 +495,11 @@ var IORoom = class {
     });
     return this._onMessage(wsSession);
   }
-  register(_0) {
-    return __async(this, arguments, function* (webSocket, options = {}) {
-      const { token } = options;
+  register(webSocket, ...options) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      const _options = (_a = options[0]) != null ? _a : {};
+      const token = (_b = _options.token) != null ? _b : null;
       const sessionId = this._platform.getSessionId(webSocket);
       const sessionExists = typeof sessionId === "string" && this._sessions.has(sessionId);
       if (sessionExists) return;
@@ -505,12 +507,12 @@ var IORoom = class {
         this._initialize();
         yield this._initialized;
       }
-      const user = yield this._getAuthorizedUser(token);
-      const ioAuthorize = this._getIOAuthorize();
+      const user = yield this._getAuthorizedUser(token, _options);
+      const ioAuthorize = this._getIOAuthorize(_options);
       const isUnauthorized = !!(ioAuthorize == null ? void 0 : ioAuthorize.required) && !user;
       const isTokenInUse = !!user && (yield this._getSessions().then((sessions) => sessions.some((session) => {
-        var _a;
-        return ((_a = session.user) == null ? void 0 : _a.id) === user.id;
+        var _a2;
+        return ((_a2 = session.user) == null ? void 0 : _a2.id) === user.id;
       })));
       const pluvWs = this._platform.convertWebSocket(webSocket, { room: this.id });
       this._logDebug(`${import_kleur.default.blue(`Registering connection for room ${this.id}:`)} ${pluvWs.sessionId}`);
@@ -594,10 +596,10 @@ var IORoom = class {
     const sessions = Array.from(this._sessions.values());
     return (_b = sessions.find((pluvWs) => pluvWs.webSocket === webSocket)) != null ? _b : null;
   }
-  _getAuthorizedUser(token) {
+  _getAuthorizedUser(token, options) {
     return __async(this, null, function* () {
       var _a;
-      const ioAuthorize = this._getIOAuthorize();
+      const ioAuthorize = this._getIOAuthorize(options);
       if (!ioAuthorize) return null;
       if (!token) return null;
       const payload = yield authorize({
@@ -631,9 +633,9 @@ var IORoom = class {
       return doc;
     });
   }
-  _getIOAuthorize() {
+  _getIOAuthorize(options) {
     if (typeof this._authorize === "function") {
-      return this._authorize(this._context);
+      return this._authorize(options);
     }
     return this._authorize;
   }
@@ -753,7 +755,7 @@ var IORoom = class {
         this._getSessions()
       ]);
       const doc = yield this._doc;
-      const baseContext = {
+      const eventContext = {
         context: this._context,
         doc,
         room: this.id,
@@ -795,11 +797,10 @@ var IORoom = class {
         });
         return;
       }
-      const extendedContext = __spreadProps(__spreadValues({}, baseContext), { context: __spreadValues({}, this._context) });
       yield Promise.all([
-        (_b = (_a = procedure.config).broadcast) == null ? void 0 : _b.call(_a, inputs, extendedContext),
-        (_d = (_c = procedure.config).self) == null ? void 0 : _d.call(_c, inputs, extendedContext),
-        (_f = (_e = procedure.config).sync) == null ? void 0 : _f.call(_e, inputs, baseContext)
+        (_b = (_a = procedure.config).broadcast) == null ? void 0 : _b.call(_a, inputs, eventContext),
+        (_d = (_c = procedure.config).self) == null ? void 0 : _d.call(_c, inputs, eventContext),
+        (_f = (_e = procedure.config).sync) == null ? void 0 : _f.call(_e, inputs, eventContext)
       ]).then((_0) => __async(this, [_0], function* ([broadcast, self, sync]) {
         const handleBroadcast = () => __async(this, null, function* () {
           if (!broadcast) return;
@@ -931,7 +932,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.30.2";
+var version = "0.32.0";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1068,10 +1069,11 @@ var PluvServer = class {
     var _a, _c;
     const _b = (_a = options[0]) != null ? _a : {}, { _meta, debug, onDestroy, onMessage } = _b, platformRoomContext = __objRest(_b, ["_meta", "debug", "onDestroy", "onMessage"]);
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");
-    const roomContext = __spreadValues(__spreadValues({}, this._context), platformRoomContext);
+    const roomContext = platformRoomContext;
+    const context = typeof this._context === "function" ? this._context(roomContext) : this._context;
     const newRoom = new IORoom(room, __spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), {
       authorize: (_c = this._authorize) != null ? _c : void 0,
-      context: roomContext,
+      context,
       crdt: this._crdt,
       debug: debug != null ? debug : this._debug,
       onDestroy: (event) => __async(this, null, function* () {
@@ -1086,6 +1088,7 @@ var PluvServer = class {
         yield Promise.resolve(this._getListeners().onRoomMessage(event));
       }),
       platform: this._platform,
+      roomContext,
       router: this._router
     }));
     this._logDebug(`${import_kleur2.default.blue("Created room:")} ${room}`);

package/dist/index.mjs

@@ -178,7 +178,6 @@ var AbstractPlatform = class {
     this._initialized = false;
     const { context, persistence, pubSub } = config;
     this._meta = config._meta;
-    context && (this._ioContext = context);
     context && (this._roomContext = context);
     this.persistence = persistence != null ? persistence : new Persistence();
     this.pubSub = pubSub != null ? pubSub : new PubSub();
@@ -366,6 +365,7 @@ var IORoom = class {
       onDestroy,
       onMessage,
       platform,
+      roomContext,
       router
     } = config;
     this.id = id;
@@ -373,7 +373,7 @@ var IORoom = class {
     this._debug = debug;
     this._docFactory = crdt.doc(() => ({}));
     this._router = router;
-    this._platform = platform.initialize(__spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), { context }));
+    this._platform = platform.initialize(__spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), { context: roomContext }));
     this._listeners = {
       onDestroy: (event) => onDestroy == null ? void 0 : onDestroy(event),
       onMessage: (event) => onMessage == null ? void 0 : onMessage(event)
@@ -453,9 +453,11 @@ var IORoom = class {
     });
     return this._onMessage(wsSession);
   }
-  register(_0) {
-    return __async(this, arguments, function* (webSocket, options = {}) {
-      const { token } = options;
+  register(webSocket, ...options) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      const _options = (_a = options[0]) != null ? _a : {};
+      const token = (_b = _options.token) != null ? _b : null;
       const sessionId = this._platform.getSessionId(webSocket);
       const sessionExists = typeof sessionId === "string" && this._sessions.has(sessionId);
       if (sessionExists) return;
@@ -463,12 +465,12 @@ var IORoom = class {
         this._initialize();
         yield this._initialized;
       }
-      const user = yield this._getAuthorizedUser(token);
-      const ioAuthorize = this._getIOAuthorize();
+      const user = yield this._getAuthorizedUser(token, _options);
+      const ioAuthorize = this._getIOAuthorize(_options);
       const isUnauthorized = !!(ioAuthorize == null ? void 0 : ioAuthorize.required) && !user;
       const isTokenInUse = !!user && (yield this._getSessions().then((sessions) => sessions.some((session) => {
-        var _a;
-        return ((_a = session.user) == null ? void 0 : _a.id) === user.id;
+        var _a2;
+        return ((_a2 = session.user) == null ? void 0 : _a2.id) === user.id;
       })));
       const pluvWs = this._platform.convertWebSocket(webSocket, { room: this.id });
       this._logDebug(`${colors.blue(`Registering connection for room ${this.id}:`)} ${pluvWs.sessionId}`);
@@ -552,10 +554,10 @@ var IORoom = class {
     const sessions = Array.from(this._sessions.values());
     return (_b = sessions.find((pluvWs) => pluvWs.webSocket === webSocket)) != null ? _b : null;
   }
-  _getAuthorizedUser(token) {
+  _getAuthorizedUser(token, options) {
     return __async(this, null, function* () {
       var _a;
-      const ioAuthorize = this._getIOAuthorize();
+      const ioAuthorize = this._getIOAuthorize(options);
       if (!ioAuthorize) return null;
       if (!token) return null;
       const payload = yield authorize({
@@ -589,9 +591,9 @@ var IORoom = class {
       return doc;
     });
   }
-  _getIOAuthorize() {
+  _getIOAuthorize(options) {
     if (typeof this._authorize === "function") {
-      return this._authorize(this._context);
+      return this._authorize(options);
     }
     return this._authorize;
   }
@@ -711,7 +713,7 @@ var IORoom = class {
         this._getSessions()
       ]);
       const doc = yield this._doc;
-      const baseContext = {
+      const eventContext = {
         context: this._context,
         doc,
         room: this.id,
@@ -753,11 +755,10 @@ var IORoom = class {
         });
         return;
       }
-      const extendedContext = __spreadProps(__spreadValues({}, baseContext), { context: __spreadValues({}, this._context) });
       yield Promise.all([
-        (_b = (_a = procedure.config).broadcast) == null ? void 0 : _b.call(_a, inputs, extendedContext),
-        (_d = (_c = procedure.config).self) == null ? void 0 : _d.call(_c, inputs, extendedContext),
-        (_f = (_e = procedure.config).sync) == null ? void 0 : _f.call(_e, inputs, baseContext)
+        (_b = (_a = procedure.config).broadcast) == null ? void 0 : _b.call(_a, inputs, eventContext),
+        (_d = (_c = procedure.config).self) == null ? void 0 : _d.call(_c, inputs, eventContext),
+        (_f = (_e = procedure.config).sync) == null ? void 0 : _f.call(_e, inputs, eventContext)
       ]).then((_0) => __async(this, [_0], function* ([broadcast, self, sync]) {
         const handleBroadcast = () => __async(this, null, function* () {
           if (!broadcast) return;
@@ -889,7 +890,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.30.2";
+var version = "0.32.0";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1026,10 +1027,11 @@ var PluvServer = class {
     var _a, _c;
     const _b = (_a = options[0]) != null ? _a : {}, { _meta, debug, onDestroy, onMessage } = _b, platformRoomContext = __objRest(_b, ["_meta", "debug", "onDestroy", "onMessage"]);
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");
-    const roomContext = __spreadValues(__spreadValues({}, this._context), platformRoomContext);
+    const roomContext = platformRoomContext;
+    const context = typeof this._context === "function" ? this._context(roomContext) : this._context;
     const newRoom = new IORoom(room, __spreadProps(__spreadValues({}, !!_meta ? { _meta } : {}), {
       authorize: (_c = this._authorize) != null ? _c : void 0,
-      context: roomContext,
+      context,
       crdt: this._crdt,
       debug: debug != null ? debug : this._debug,
       onDestroy: (event) => __async(this, null, function* () {
@@ -1044,6 +1046,7 @@ var PluvServer = class {
         yield Promise.resolve(this._getListeners().onRoomMessage(event));
       }),
       platform: this._platform,
+      roomContext,
       router: this._router
     }));
     this._logDebug(`${colors2.blue("Created room:")} ${room}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.30.2",
+  "version": "0.32.0",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -21,16 +21,16 @@
     "jose": "^5.9.3",
     "kleur": "^4.1.5",
     "wonka": "^6.3.4",
-    "@pluv/crdt": "^0.30.2",
-    "@pluv/types": "^0.30.2"
+    "@pluv/crdt": "^0.32.0",
+    "@pluv/types": "^0.32.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "genversion": "^3.2.0",
     "tsup": "^8.3.0",
     "typescript": "^5.6.2",
-    "@pluv/tsconfig": "^0.30.2",
-    "eslint-config-pluv": "^0.30.2"
+    "@pluv/tsconfig": "^0.32.0",
+    "eslint-config-pluv": "^0.32.0"
   },
   "scripts": {
     "build": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",