@pluv/io 0.30.2 → 0.32.0

package/src/AbstractPlatform.ts

@@ -13,19 +13,14 @@ export type InferPlatformWebSocketType<TPlatform extends AbstractPlatform> =
 export type InferPlatformWebSocketSource<TPlatform> =
     TPlatform extends AbstractPlatform<infer IAbstractWebSocket> ? InferWebSocketSource<IAbstractWebSocket> : never;
 
-export type InferPlatformContextType<TPlatform extends AbstractPlatform> =
-    TPlatform extends AbstractPlatform<any, infer IPlatformContext> ? IPlatformContext : never;
+export type InferInitContextType<TPlatform extends AbstractPlatform> =
+    TPlatform extends AbstractPlatform<any, infer IInitContext> ? IInitContext : never;
 
 export type InferRoomContextType<TPlatform extends AbstractPlatform> =
-    TPlatform extends AbstractPlatform<any, infer IPlatformContext, infer IRoomContext>
-        ? IPlatformContext & IRoomContext
-        : never;
+    TPlatform extends AbstractPlatform<any, any, infer IRoomContext> ? IRoomContext : never;
 
-export type AbstractPlatformConfig<
-    TPlatformContext extends Record<string, any> = {},
-    TRoomContext extends Record<string, any> = {},
-> = {
-    context?: TPlatformContext & TRoomContext;
+export type AbstractPlatformConfig<TRoomContext extends Record<string, any> = {}> = {
+    context?: TRoomContext;
     persistence?: AbstractPersistence;
     pubSub?: AbstractPubSub;
 };
@@ -36,10 +31,10 @@ export interface ConvertWebSocketConfig {
 
 export abstract class AbstractPlatform<
     TWebSocket extends AbstractWebSocket = AbstractWebSocket,
-    TPlatformContext extends Record<string, any> = {},
+    TInitContext extends Record<string, any> = {},
     TRoomContext extends Record<string, any> = {},
 > {
-    protected readonly _ioContext: TPlatformContext | undefined;
+    protected readonly _initContext: TInitContext | undefined;
     protected readonly _roomContext: TRoomContext | undefined;
 
     private _initialized: boolean = false;
@@ -49,11 +44,10 @@ export abstract class AbstractPlatform<
 
     public abstract readonly _registrationMode: WebSocketRegistrationMode;
 
-    constructor(config: AbstractPlatformConfig<TPlatformContext, TRoomContext> = {}) {
+    constructor(config: AbstractPlatformConfig<TRoomContext> = {}) {
         const { context, persistence, pubSub } = config;
 
         (this as any)._meta = (config as any)._meta;
-        context && (this._ioContext = context);
         context && (this._roomContext = context);
 
         this.persistence = persistence ?? new Persistence();
@@ -75,7 +69,7 @@ export abstract class AbstractPlatform<
 
     public abstract getWebSockets(): readonly InferWebSocketSource<TWebSocket>[];
 
-    public abstract initialize(config: AbstractPlatformConfig<TPlatformContext, TRoomContext>): this;
+    public abstract initialize(config: AbstractPlatformConfig<TRoomContext>): this;
 
     public abstract parseData(data: string | ArrayBuffer): Record<string, any>;
 

package/src/IORoom.ts

@@ -18,7 +18,12 @@ import type {
     Maybe,
 } from "@pluv/types";
 import colors from "kleur";
-import type { AbstractPlatform, InferPlatformWebSocketSource, InferRoomContextType } from "./AbstractPlatform";
+import type {
+    AbstractPlatform,
+    InferInitContextType,
+    InferPlatformWebSocketSource,
+    InferRoomContextType,
+} from "./AbstractPlatform";
 import { AbstractCloseEvent, AbstractErrorEvent, AbstractMessageEvent, AbstractWebSocket } from "./AbstractWebSocket";
 import type { PluvRouter, PluvRouterEventConfig } from "./PluvRouter";
 import { authorize } from "./authorize";
@@ -42,8 +47,8 @@ interface BroadcastParams<TIO extends IORoom<any, any, any, any>> {
 
 export interface IORoomListeners<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>,
-    TContext extends JsonObject,
+    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;
@@ -59,15 +64,16 @@ export type BroadcastProxy<TIO extends IORoom<any, any, any, any>> = (<TEvent ex
 
 export type IORoomConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    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>;
 };
 
@@ -76,13 +82,13 @@ interface SendMessageSender {
     user: JsonObject | null;
 }
 
-export interface WebsocketRegisterOptions {
+export type WebsocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
     token?: string | null;
-}
+} & InferInitContextType<TPlatform>;
 
 export class IORoom<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > implements IOLike<TAuthorize, TEvents>
@@ -93,7 +99,7 @@ export class IORoom<
     private _uninitialize: Promise<() => Promise<void>> | null = null;
 
     private readonly _authorize: TAuthorize | null = null;
-    private readonly _context: TContext & InferRoomContextType<TPlatform>;
+    private readonly _context: TContext;
     private readonly _debug: boolean;
     private readonly _docFactory: AbstractCrdtDocFactory<any>;
     private readonly _listeners: IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>;
@@ -146,6 +152,7 @@ export class IORoom<
             onDestroy,
             onMessage,
             platform,
+            roomContext,
             router,
         } = config as IORoomConfig<TPlatform, TAuthorize, TContext, TEvents> & { _meta?: any };
 
@@ -155,7 +162,7 @@ export class IORoom<
         this._debug = debug;
         this._docFactory = crdt.doc(() => ({}));
         this._router = router;
-        this._platform = platform.initialize({ ...(!!_meta ? { _meta } : {}), context });
+        this._platform = platform.initialize({ ...(!!_meta ? { _meta } : {}), context: roomContext });
 
         this._listeners = {
             onDestroy: (event) => onDestroy?.(event),
@@ -234,9 +241,12 @@ export class IORoom<
 
     public async register(
         webSocket: InferPlatformWebSocketSource<TPlatform>,
-        options: WebsocketRegisterOptions = {},
+        ...options: keyof InferInitContextType<TPlatform> extends never
+            ? [{ token?: string }?]
+            : [WebsocketRegisterConfig<TPlatform>]
     ): Promise<void> {
-        const { token } = options;
+        const _options = (options[0] ?? {}) as WebsocketRegisterConfig<TPlatform>;
+        const token = _options.token ?? null;
 
         const sessionId = this._platform.getSessionId(webSocket);
         const sessionExists = typeof sessionId === "string" && this._sessions.has(sessionId);
@@ -248,8 +258,8 @@ export class IORoom<
             await this._initialized;
         }
 
-        const user = await this._getAuthorizedUser(token);
-        const ioAuthorize = this._getIOAuthorize();
+        const user = await this._getAuthorizedUser(token, _options);
+        const ioAuthorize = this._getIOAuthorize(_options);
         const isUnauthorized = !!ioAuthorize?.required && !user;
 
         // There is an attempt for multiple of the same identities. Probably malicious.
@@ -362,8 +372,11 @@ export class IORoom<
         return sessions.find((pluvWs) => pluvWs.webSocket === webSocket) ?? null;
     }
 
-    private async _getAuthorizedUser(token: Maybe<string>): Promise<InferIOAuthorizeUser<InferIOAuthorize<this>>> {
-        const ioAuthorize = this._getIOAuthorize();
+    private async _getAuthorizedUser(
+        token: Maybe<string>,
+        options: WebsocketRegisterConfig<TPlatform>,
+    ): Promise<InferIOAuthorizeUser<InferIOAuthorize<this>>> {
+        const ioAuthorize = this._getIOAuthorize(options);
 
         if (!ioAuthorize) return null as InferIOAuthorizeUser<InferIOAuthorize<this>>;
         if (!token) return null as InferIOAuthorizeUser<InferIOAuthorize<this>>;
@@ -406,9 +419,9 @@ export class IORoom<
         return doc;
     }
 
-    private _getIOAuthorize() {
+    private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>) {
         if (typeof this._authorize === "function") {
-            return this._authorize(this._context);
+            return this._authorize(options);
         }
 
         return this._authorize as {
@@ -566,7 +579,7 @@ export class IORoom<
             ]);
 
             const doc = await this._doc;
-            const baseContext: EventResolverContext<TPlatform, TAuthorize, TContext> = {
+            const eventContext: EventResolverContext<TPlatform, TAuthorize, TContext> = {
                 context: this._context,
                 doc,
                 room: this.id,
@@ -622,16 +635,10 @@ export class IORoom<
                 return;
             }
 
-            const extendedContext: EventResolverContext<
-                TPlatform,
-                TAuthorize,
-                TContext & InferRoomContextType<TPlatform>
-            > = { ...baseContext, context: { ...this._context } };
-
             await Promise.all([
-                procedure.config.broadcast?.(inputs, extendedContext),
-                procedure.config.self?.(inputs, extendedContext),
-                procedure.config.sync?.(inputs, baseContext),
+                procedure.config.broadcast?.(inputs, eventContext),
+                procedure.config.self?.(inputs, eventContext),
+                procedure.config.sync?.(inputs, eventContext),
             ]).then(async ([broadcast, self, sync]) => {
                 const handleBroadcast = async () => {
                     if (!broadcast) return;

package/src/PluvIO.ts

@@ -1,23 +1,23 @@
 import type { AbstractCrdtDocFactory } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
-import type { BaseIOAuthorize, IOAuthorize, InferIOAuthorizeUser, JsonObject } from "@pluv/types";
-import type { AbstractPlatform, InferPlatformContextType } from "./AbstractPlatform";
+import type { BaseIOAuthorize, IOAuthorize, InferIOAuthorizeUser } from "@pluv/types";
+import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import { PluvProcedure } from "./PluvProcedure";
 import type { MergedRouter, PluvRouterEventConfig } from "./PluvRouter";
 import { PluvRouter } from "./PluvRouter";
 import { PluvServer } from "./PluvServer";
 import type { JWTEncodeParams } from "./authorize";
 import { authorize } from "./authorize";
-import type { CrdtLibraryType, GetInitialStorageFn, PluvIOListeners } from "./types";
+import type { CrdtLibraryType, GetInitialStorageFn, PluvContext, PluvIOListeners } from "./types";
 import { __PLUV_VERSION } from "./version";
 
 export type PluvIOConfig<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>>,
-    TContext extends JsonObject,
+    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;
@@ -25,8 +25,8 @@ export type PluvIOConfig<
 
 export type ServerConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    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>;
@@ -35,13 +35,13 @@ export type ServerConfig<
 
 export class PluvIO<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TContext extends Record<string, any> = {},
 > {
     public readonly version: string = __PLUV_VERSION as any;
 
     private readonly _authorize: TAuthorize | null = null;
-    private readonly _context: TContext = {} as TContext;
+    private readonly _context: PluvContext<TPlatform, TContext> = {} as PluvContext<TPlatform, TContext>;
     private readonly _crdt: { doc: (value: any) => AbstractCrdtDocFactory<any> };
     private readonly _debug: boolean;
     private readonly _platform: TPlatform;

package/src/PluvProcedure.ts

@@ -1,55 +1,31 @@
 import type { EventRecord, IOAuthorize, InputZodLike, JsonObject, ProcedureLike } from "@pluv/types";
-import type { AbstractPlatform, InferRoomContextType } from "./AbstractPlatform";
+import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import type { EventResolver, MergeEventRecords } from "./types";
 
 export interface PluvProcedureConfig<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>,
-    TContext extends JsonObject,
+    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 & InferRoomContextType<TPlatform>,
-        TInput,
-        Partial<TOutput>
-    > | null;
+    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;
 }
 
 export class PluvProcedure<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>>,
-    TContext extends JsonObject,
+    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: EventResolver<
-        TPlatform,
-        TAuthorize,
-        TContext & InferRoomContextType<TPlatform>,
-        TInput,
-        Partial<TOutput>
-    > | null = null;
+    private _broadcast: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
     private _input: InputZodLike<TInput> | null = null;
-    private _self: EventResolver<
-        TPlatform,
-        TAuthorize,
-        TContext & InferRoomContextType<TPlatform>,
-        TInput,
-        Partial<TOutput>
-    > | null = null;
+    private _self: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
     private _sync: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
 
     public get config(): ProcedureLike<TInput, TOutput>["config"] {
@@ -72,7 +48,7 @@ export class PluvProcedure<
     }
 
     public broadcast<TResult extends EventRecord<string, any> = {}>(
-        resolver: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, TResult>,
+        resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>,
     ): Omit<
         PluvProcedure<
             TPlatform,
@@ -108,7 +84,7 @@ export class PluvProcedure<
     }
 
     public self<TResult extends EventRecord<string, any> = {}>(
-        resolver: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, TResult>,
+        resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>,
     ): Omit<
         PluvProcedure<
             TPlatform,
@@ -138,7 +114,7 @@ export class PluvProcedure<
     }
 
     public sync<TResult extends EventRecord<string, any> = {}>(
-        resolver: EventResolver<TPlatform, TAuthorize, TContext & InferRoomContextType<TPlatform>, TInput, TResult>,
+        resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>,
     ): Omit<
         PluvProcedure<
             TPlatform,
@@ -167,13 +143,7 @@ export class PluvProcedure<
         });
     }
 
-    private _resolver(): EventResolver<
-        TPlatform,
-        TAuthorize,
-        TContext & InferRoomContextType<TPlatform>,
-        TInput,
-        TOutput
-    > {
+    private _resolver(): EventResolver<TPlatform, TAuthorize, TContext, TInput, TOutput> {
         return (data, context) => {
             return {
                 ...this._broadcast?.(data, context),

package/src/PluvRouter.ts

@@ -1,18 +1,18 @@
-import type { BaseIOAuthorize, IOAuthorize, IORouterLike, JsonObject } from "@pluv/types";
-import type { AbstractPlatform, InferRoomContextType } from "./AbstractPlatform";
+import type { BaseIOAuthorize, IOAuthorize, IORouterLike } from "@pluv/types";
+import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import type { PluvProcedure } from "./PluvProcedure";
 
 export type PluvRouterEventConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TContext extends Record<string, any> = {},
 > = { [P: string]: Pick<PluvProcedure<TPlatform, TAuthorize, TContext, any, any>, "config"> };
 
 export 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 = {},
+    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>,
@@ -23,8 +23,8 @@ export type MergedRouter<
 
 export class PluvRouter<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferRoomContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > implements IORouterLike<TEvents>
 {

package/src/PluvServer.ts

@@ -11,7 +11,7 @@ import type {
     Maybe,
 } from "@pluv/types";
 import colors from "kleur";
-import type { AbstractPlatform, InferPlatformContextType, InferRoomContextType } from "./AbstractPlatform";
+import type { AbstractPlatform, InferInitContextType, InferRoomContextType } from "./AbstractPlatform";
 import type { IORoomListeners } from "./IORoom";
 import { IORoom } from "./IORoom";
 import { PluvProcedure } from "./PluvProcedure";
@@ -20,7 +20,7 @@ import { PluvRouter } from "./PluvRouter";
 import type { JWTEncodeParams } from "./authorize";
 import { authorize } from "./authorize";
 import { PING_TIMEOUT_MS } from "./constants";
-import type { GetInitialStorageFn, PluvIOListeners } from "./types";
+import type { GetInitialStorageFn, PluvContext, PluvIOListeners } from "./types";
 import { __PLUV_VERSION } from "./version";
 
 export type InferIORoom<TServer extends PluvServer<any, any, any, any>> =
@@ -30,12 +30,12 @@ export type InferIORoom<TServer extends PluvServer<any, any, any, any>> =
 
 export type PluvServerConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    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> };
     debug?: boolean;
     getInitialStorage?: GetInitialStorageFn<TPlatform>;
@@ -45,8 +45,8 @@ export type PluvServerConfig<
 
 type BaseCreateRoomOptions<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>>,
-    TContext extends JsonObject,
+    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;
@@ -54,8 +54,8 @@ type BaseCreateRoomOptions<
 
 export type CreateRoomOptions<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>>,
-    TContext extends JsonObject,
+    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>] | []
@@ -63,8 +63,8 @@ export type CreateRoomOptions<
 
 export class PluvServer<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferPlatformContextType<TPlatform>> = BaseIOAuthorize,
-    TContext extends JsonObject = {},
+    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > implements IORouterLike<TEvents>
 {
@@ -188,7 +188,7 @@ export class PluvServer<
             return { $STORAGE_UPDATED: { state: encodedState } };
         }),
     });
-    private readonly _context: TContext = {} as TContext;
+    private readonly _context: PluvContext<TPlatform, TContext> = {} as PluvContext<TPlatform, TContext>;
     private readonly _crdt: { doc: (value: any) => AbstractCrdtDocFactory<any> };
     private readonly _debug: boolean;
     private readonly _getInitialStorage: GetInitialStorageFn<TPlatform> | null = null;
@@ -261,15 +261,13 @@ export class PluvServer<
 
         if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");
 
-        const roomContext = {
-            ...this._context,
-            ...platformRoomContext,
-        } as TContext & InferRoomContextType<TPlatform>;
+        const roomContext = platformRoomContext as InferRoomContextType<TPlatform>;
+        const context: TContext = typeof this._context === "function" ? this._context(roomContext) : this._context;
 
         const newRoom = new IORoom<TPlatform, TAuthorize, TContext, TEvents>(room, {
             ...(!!_meta ? { _meta } : {}),
             authorize: this._authorize ?? undefined,
-            context: roomContext,
+            context,
             crdt: this._crdt,
             debug: debug ?? this._debug,
             onDestroy: async (event) => {
@@ -286,6 +284,7 @@ export class PluvServer<
                 await Promise.resolve(this._getListeners().onRoomMessage(event));
             },
             platform: this._platform,
+            roomContext,
             router: this._router,
         });
 

package/src/authorize.ts

@@ -1,7 +1,7 @@
 import hkdf from "@panva/hkdf";
 import type { BaseUser } from "@pluv/types";
 import { EncryptJWT, jwtDecrypt } from "jose";
-import type { AbstractPlatform, InferPlatformContextType } from "./AbstractPlatform";
+import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 
 const DEFAULT_MAX_AGE_MS = 60_000;
 
@@ -19,7 +19,7 @@ export type JWTEncodeParams<TUser extends BaseUser, TPlatform extends AbstractPl
     maxAge?: number;
     room: string;
     user: TUser;
-} & InferPlatformContextType<TPlatform>;
+} & InferInitContextType<TPlatform>;
 
 export interface AuthorizeParams {
     platform: AbstractPlatform;

package/src/createIO.ts

@@ -1,16 +1,16 @@
-import type { BaseUser, IOAuthorize, JsonObject } from "@pluv/types";
-import type { AbstractPlatform, InferPlatformContextType } from "./AbstractPlatform";
+import type { BaseUser, IOAuthorize } from "@pluv/types";
+import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import { PluvIO } from "./PluvIO";
-import { CrdtLibraryType } from "./types";
+import type { CrdtLibraryType, PluvContext } from "./types";
 
 export type CreateIOParams<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TContext extends JsonObject = {},
+    TContext extends Record<string, any> = {},
     TAuthorizeUser extends BaseUser = BaseUser,
     TAuthorizeRequired extends boolean = false,
 > = {
-    authorize?: IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferPlatformContextType<TPlatform>>;
-    context?: TContext;
+    authorize?: IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>;
+    context?: PluvContext<TPlatform, TContext>;
     crdt?: CrdtLibraryType;
     debug?: boolean;
     platform: TPlatform;
@@ -18,21 +18,17 @@ export type CreateIOParams<
 
 export const createIO = <
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TContext extends JsonObject = {},
+    TContext extends Record<string, any> = {},
     TAuthorizeUser extends BaseUser = BaseUser,
     TAuthorizeRequired extends boolean = false,
 >(
     params: CreateIOParams<TPlatform, TContext, TAuthorizeUser, TAuthorizeRequired>,
-): PluvIO<
-    TPlatform,
-    IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferPlatformContextType<TPlatform>>,
-    TContext
-> => {
+): PluvIO<TPlatform, IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>, TContext> => {
     const { authorize, context, crdt, debug, platform } = params;
 
     return new PluvIO<
         TPlatform,
-        IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferPlatformContextType<TPlatform>>,
+        IOAuthorize<TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>,
         TContext
     >({
         authorize,

package/src/index.ts

@@ -4,7 +4,7 @@ export { AbstractPlatform } from "./AbstractPlatform";
 export type {
     AbstractPlatformConfig,
     ConvertWebSocketConfig,
-    InferPlatformContextType,
+    InferInitContextType,
     InferPlatformWebSocketType,
     InferRoomContextType,
     WebSocketRegistrationMode,