@pluv/io 0.34.1 → 0.35.1

package/src/PluvProcedure.ts

@@ -4,7 +4,7 @@ import type { EventResolver, EventResolverKind, MergeEventRecords } from "./type
 
 export interface PluvProcedureConfig<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TInput extends JsonObject = {},
     TOutput extends EventRecord<string, any> = {},
@@ -17,7 +17,7 @@ export interface PluvProcedureConfig<
 
 export class PluvProcedure<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TInput extends JsonObject = {},
     TOutput extends EventRecord<string, any> = {},

package/src/PluvRouter.ts

@@ -5,14 +5,14 @@ import type { PluvIOAuthorize } from "./types";
 
 export type PluvRouterEventConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any,
     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 PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> = any,
     TContext extends Record<string, any> = {},
     TRoot extends TRouters[0]["_defs"]["events"] = {},
 > = TRouters extends [
@@ -24,7 +24,7 @@ export type MergedRouter<
 
 export class PluvRouter<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > implements IORouterLike<TEvents>

package/src/PluvServer.ts

@@ -28,7 +28,7 @@ export type InferIORoom<TServer extends PluvServer<any, any, any, any>> =
 
 export type PluvServerConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > = Partial<PluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
@@ -43,7 +43,7 @@ export type PluvServerConfig<
 
 type BaseCreateRoomOptions<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
@@ -52,7 +52,7 @@ type BaseCreateRoomOptions<
 
 export type CreateRoomOptions<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > = keyof InferRoomContextType<TPlatform> extends never
@@ -61,14 +61,14 @@ export type CreateRoomOptions<
 
 export class PluvServer<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > implements IOLike<TAuthorize, TEvents>
 {
     public readonly version: string = __PLUV_VERSION as any;
 
-    private readonly _authorize: TAuthorize | null = null;
+    private readonly _authorize: TAuthorize = null as TAuthorize;
     private readonly _baseRouter: PluvRouter<TPlatform, TAuthorize, TContext, {}> = new PluvRouter({
         $GET_OTHERS: this._procedure.sync((data, { room, session, sessions }) => {
             const currentTime = new Date().getTime();
@@ -85,7 +85,7 @@ export class PluvServer<
                     [connectionId: string]: {
                         connectionId: string;
                         room: string | null;
-                        user: JsonObject;
+                        user: JsonObject | null;
                     };
                 }>(
                     (acc, { id, presence, user }) => ({
@@ -216,6 +216,11 @@ export class PluvServer<
             context: this._context,
             events: this._router._defs.events,
             platform: this._platform,
+        } as {
+            authorize: TAuthorize;
+            context: TContext;
+            events: TEvents;
+            platform: TPlatform;
         };
     }
 
@@ -338,17 +343,15 @@ export class PluvServer<
 
         if (!secret) throw new Error("`authorize` was specified without a valid secret");
 
-        return await authorize({ platform: this._platform, secret }).encode(params);
+        return await authorize({ platform: this._platform, secret }).encode(params as JWTEncodeParams<any, TPlatform>);
     }
 
-    private _getIOAuthorize(
-        options: WebsocketRegisterConfig<TPlatform>,
-    ): ResolvedPluvIOAuthorize<any, any, any> | null {
+    private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
         if (typeof this._authorize === "function") {
             return this._authorize(options);
         }
 
-        return this._authorize as ResolvedPluvIOAuthorize<any, any, any> | null;
+        return this._authorize as ResolvedPluvIOAuthorize<any, any> | null;
     }
 
     private _getListeners(): BasePluvIOListeners<TPlatform, TAuthorize, TContext, TEvents> {

package/src/authorize.ts

@@ -15,10 +15,10 @@ export interface JWT<TUser extends BaseUser> {
     user: TUser;
 }
 
-export type JWTEncodeParams<TUser extends BaseUser, TPlatform extends AbstractPlatform> = {
+export type JWTEncodeParams<TUser extends BaseUser | null, TPlatform extends AbstractPlatform> = {
     maxAge?: number;
     room: string;
-    user: TUser;
+    user: TUser extends BaseUser ? TUser : "Error: Cannot create token without authorization!";
 } & InferInitContextType<TPlatform>;
 
 export interface AuthorizeParams {

package/src/createIO.ts

@@ -1,4 +1,3 @@
-import type { BaseUser } from "@pluv/types";
 import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import { PluvIO } from "./PluvIO";
 import type { CrdtLibraryType, PluvContext, PluvIOAuthorize } from "./types";
@@ -6,10 +5,9 @@ import type { CrdtLibraryType, PluvContext, PluvIOAuthorize } from "./types";
 export type CreateIOParams<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
     TContext extends Record<string, any> = {},
-    TAuthorizeUser extends BaseUser = BaseUser,
-    TAuthorizeRequired extends boolean = false,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = null,
 > = {
-    authorize?: PluvIOAuthorize<TPlatform, TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>;
+    authorize?: TAuthorize;
     context?: PluvContext<TPlatform, TContext>;
     crdt?: CrdtLibraryType;
     debug?: boolean;
@@ -19,28 +17,14 @@ export type CreateIOParams<
 export const createIO = <
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
     TContext extends Record<string, any> = {},
-    TAuthorizeUser extends BaseUser = BaseUser,
-    TAuthorizeRequired extends boolean = false,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = null,
 >(
-    params: CreateIOParams<TPlatform, TContext, TAuthorizeUser, TAuthorizeRequired>,
-): PluvIO<
-    TPlatform,
-    PluvIOAuthorize<TPlatform, TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>,
-    TContext
-> => {
+    params: CreateIOParams<TPlatform, TContext, TAuthorize>,
+): PluvIO<TPlatform, TAuthorize, TContext> => {
     const { authorize, context, crdt, debug, platform } = params;
 
-    return new PluvIO<
-        TPlatform,
-        PluvIOAuthorize<TPlatform, TAuthorizeUser, TAuthorizeRequired, InferInitContextType<TPlatform>>,
-        TContext
-    >({
-        authorize: authorize as PluvIOAuthorize<
-            TPlatform,
-            TAuthorizeUser,
-            TAuthorizeRequired,
-            InferInitContextType<TPlatform>
-        >,
+    return new PluvIO<TPlatform, TAuthorize, TContext>({
+        authorize,
         context,
         crdt,
         debug,

package/src/types.ts

@@ -1,6 +1,5 @@
 import type { AbstractCrdtDoc, AbstractCrdtDocFactory } from "@pluv/crdt";
 import type {
-    BaseIOAuthorize,
     BaseUser,
     EventRecord,
     IOAuthorize,
@@ -12,7 +11,6 @@ import type {
     JsonObject,
     Maybe,
     MaybePromise,
-    Spread,
     UndefinedProps,
 } from "@pluv/types";
 import type {
@@ -45,7 +43,7 @@ export type EventResolverKind = "broadcast" | "self" | "sync";
 export type EventResolver<
     TKind extends EventResolverKind = EventResolverKind,
     TPlatform extends AbstractPlatform = AbstractPlatform,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null = null,
     TContext extends Record<string, any> = {},
     TInput extends JsonObject = {},
     TOutput extends EventRecord<string, any> = {},
@@ -57,7 +55,7 @@ export type EventResolver<
 export interface EventResolverContext<
     TKind extends EventResolverKind = EventResolverKind,
     TPlatform extends AbstractPlatform = AbstractPlatform,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null = null,
     TContext extends Record<string, any> = {},
 > {
     context: TContext;
@@ -83,12 +81,11 @@ export interface WebSocketSerializedState {
     timers: WebSocketSessionTimers;
 }
 
-export type WebSocketSession<TAuthorize extends IOAuthorize<any, any, any> = BaseIOAuthorize> =
-    WebSocketSerializedState & {
-        id: string;
-        user: InferIOAuthorizeUser<TAuthorize>;
-        webSocket: AbstractWebSocket;
-    };
+export type WebSocketSession<TAuthorize extends IOAuthorize<any, any> | null = null> = WebSocketSerializedState & {
+    id: string;
+    user: InferIOAuthorizeUser<TAuthorize>;
+    webSocket: AbstractWebSocket;
+};
 
 export type MergeEventRecords<
     TEventRecords extends EventRecord<string, any>[],
@@ -119,7 +116,6 @@ export type WebSocketRegistrationMode = "attached" | "detached";
 
 export interface PlatformConfig {
     authorize: {
-        required?: boolean;
         secret?: boolean;
     };
     requireAuth?: boolean;
@@ -137,8 +133,7 @@ export interface PlatformConfig {
 export type ResolvedPluvIOAuthorize<
     TPlatform extends AbstractPlatform<any, any, any, any>,
     TUser extends BaseUser = any,
-    TRequired extends boolean = false,
-> = { user: InputZodLike<TUser>; required?: TRequired } & UndefinedProps<
+> = { user: InputZodLike<TUser> } & UndefinedProps<
     { secret?: string },
     Exclude<"secret", InferPlatformAuthorizeProperties<TPlatform>>
 >;
@@ -146,15 +141,12 @@ export type ResolvedPluvIOAuthorize<
 export type PluvIOAuthorize<
     TPlatform extends AbstractPlatform<any, any, any, any>,
     TUser extends BaseUser = any,
-    TRequired extends boolean = false,
     TContext extends Record<string, unknown> = {},
-> =
-    | ResolvedPluvIOAuthorize<TPlatform, TUser, TRequired>
-    | ((context: TContext) => ResolvedPluvIOAuthorize<TPlatform, TUser, TRequired>);
+> = ResolvedPluvIOAuthorize<TPlatform, TUser> | ((context: TContext) => ResolvedPluvIOAuthorize<TPlatform, TUser>);
 
 export type BasePluvIOListeners<
     TPlatform extends AbstractPlatform<any, any, any, any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > = {
@@ -167,7 +159,7 @@ export type BasePluvIOListeners<
 
 export type PluvIOListeners<
     TPlatform extends AbstractPlatform<any, any, any, any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > = UndefinedProps<
@@ -198,7 +190,7 @@ export type IORoomListenerEvent<TContext extends Record<string, any>> = {
 
 export type IORoomMessageEvent<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > = IORoomListenerEvent<TContext> & {
@@ -209,7 +201,7 @@ export type IORoomMessageEvent<
 
 export type IOStorageUpdatedEvent<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
 > = IORoomListenerEvent<TContext> & {
     user?: InferIOAuthorizeUser<TAuthorize>;
@@ -218,7 +210,7 @@ export type IOStorageUpdatedEvent<
 
 export type IOUserConnectedEvent<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
 > = IORoomListenerEvent<TContext> & {
     user?: InferIOAuthorizeUser<TAuthorize>;
@@ -227,7 +219,7 @@ export type IOUserConnectedEvent<
 
 export type IOUserDisconnectedEvent<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends IOAuthorize<any, InferInitContextType<TPlatform>> | null,
     TContext extends Record<string, any>,
 > = IORoomListenerEvent<TContext> & {
     user?: InferIOAuthorizeUser<TAuthorize>;

package/src/version.generated.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.34.1'
+export const version = '0.35.1'