@pluv/io 0.33.0 → 0.34.1

package/dist/index.mjs

@@ -182,6 +182,8 @@ var AbstractPlatform = class {
     this.persistence = persistence != null ? persistence : new Persistence();
     this.pubSub = pubSub != null ? pubSub : new PubSub();
   }
+  validateConfig(config) {
+  }
   _initialize() {
     if (this._initialized) throw new Error("Platform is already initialized");
     this._initialized = true;
@@ -511,7 +513,7 @@ var IORoom = class {
       }
       this._sessions.set(pluvWs.sessionId, pluvWs);
       yield this._platform.persistence.addUser(this.id, pluvWs.sessionId, user != null ? user : {});
-      if (this._platform._registrationMode === "attached") {
+      if (this._platform._config.registrationMode === "attached") {
         const onClose = this._onClose(pluvWs).bind(this);
         const onMessage = this._onMessage(pluvWs).bind(this);
         pluvWs.addEventListener("close", onClose);
@@ -548,13 +550,7 @@ var IORoom = class {
         this._sessions.delete(pluvWs.sessionId);
       });
       const promises = quitters.map((quitter) => __async(this, null, function* () {
-        yield this._broadcast({
-          message: {
-            type: "$EXIT",
-            data: { sessionId: quitter.sessionId }
-          },
-          senderId: quitter.sessionId
-        });
+        yield this._exitWebsocket(quitter);
       }));
       yield Promise.all(promises);
     });
@@ -582,7 +578,7 @@ var IORoom = class {
     });
   }
   _ensureDetached() {
-    if (this._platform._registrationMode === "detached") return;
+    if (this._platform._config.registrationMode === "detached") return;
     throw new Error("Platform must use detached mode");
   }
   _exitWebsocket(webSocket) {
@@ -627,6 +623,7 @@ var IORoom = class {
       const ioAuthorize = this._getIOAuthorize(options);
       if (!ioAuthorize) return null;
       if (!token) return null;
+      if (!ioAuthorize.secret) throw new Error("`authorize` was specified without a valid secret");
       const payload = yield authorize({
         platform: this._platform,
         secret: ioAuthorize.secret
@@ -753,13 +750,7 @@ var IORoom = class {
       this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${webSocket.sessionId}`);
       this._sessions.delete(webSocket.sessionId);
       this._platform.persistence.deleteUser(this.id, webSocket.sessionId).finally(() => __async(this, null, function* () {
-        yield this._broadcast({
-          message: {
-            type: "$EXIT",
-            data: { sessionId: webSocket.sessionId }
-          },
-          senderId: webSocket.sessionId
-        });
+        yield this._exitWebsocket(webSocket);
         const size = this.getSize();
         this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
         this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
@@ -960,7 +951,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.33.0";
+var version = "0.34.1";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1064,14 +1055,11 @@ var PluvServer = class {
       crdt = noop2,
       debug = false,
       getInitialStorage,
-      onRoomDeleted,
-      onRoomMessage,
-      onStorageUpdated,
-      onUserConnected,
-      onUserDisconnected,
       platform,
       router = new PluvRouter({})
     } = options;
+    const { onRoomDeleted, onRoomMessage, onStorageUpdated, onUserConnected, onUserDisconnected } = options;
+    platform.validateConfig(options);
     this._crdt = crdt;
     this._debug = debug;
     this._platform = platform;
@@ -1087,6 +1075,10 @@ var PluvServer = class {
       onUserDisconnected: (event) => onUserDisconnected == null ? void 0 : onUserDisconnected(event)
     };
   }
+  get fetch() {
+    if (!this._platform._fetch) throw new Error(`\`${this._platform._name}\` does not support \`fetch\``);
+    return this._platform._fetch;
+  }
   /**
    * @ignore
    * @readonly
@@ -1106,6 +1098,9 @@ var PluvServer = class {
   createRoom(room, ...options) {
     var _a, _c;
     const _b = (_a = options[0]) != null ? _a : {}, { _meta, debug, onDestroy, onMessage } = _b, platformRoomContext = __objRest(_b, ["_meta", "debug", "onDestroy", "onMessage"]);
+    if (this._platform._config.handleMode !== "io") {
+      throw new Error(`\`createRoom' is unsupported for \`${this._platform._name}\``);
+    }
     if (!/^[a-z0-9]+[a-z0-9\-_]+[a-z0-9]+$/i.test(room)) throw new Error("Unsupported room name");
     const roomContext = platformRoomContext;
     const context = typeof this._context === "function" ? this._context(roomContext) : this._context;
@@ -1140,17 +1135,23 @@ var PluvServer = class {
   }
   createToken(params) {
     return __async(this, null, function* () {
+      var _a;
       if (!this._authorize) {
         throw new Error("IO does not specify authorize during initialization.");
       }
-      const ioAuthorize = typeof this._authorize === "function" ? this._authorize(params) : this._authorize;
-      const secret = ioAuthorize.secret;
-      return yield authorize({
-        platform: this._platform,
-        secret
-      }).encode(params);
+      if (this._platform._createToken) return yield this._platform._createToken(params);
+      const ioAuthorize = this._getIOAuthorize(params);
+      const secret = (_a = ioAuthorize == null ? void 0 : ioAuthorize.secret) != null ? _a : null;
+      if (!secret) throw new Error("`authorize` was specified without a valid secret");
+      return yield authorize({ platform: this._platform, secret }).encode(params);
     });
   }
+  _getIOAuthorize(options) {
+    if (typeof this._authorize === "function") {
+      return this._authorize(options);
+    }
+    return this._authorize;
+  }
   _getListeners() {
     return this._listeners;
   }
@@ -1177,13 +1178,12 @@ var PluvIO = class {
   }
   createToken(params) {
     return __async(this, null, function* () {
+      var _a;
       if (!this._authorize) throw new Error("IO does not specify authorize during initialization.");
-      const ioAuthorize = typeof this._authorize === "function" ? this._authorize(params) : this._authorize;
-      const secret = ioAuthorize.secret;
-      return yield authorize({
-        platform: this._platform,
-        secret
-      }).encode(params);
+      const ioAuthorize = this._getIOAuthorize(params);
+      const secret = (_a = ioAuthorize == null ? void 0 : ioAuthorize.secret) != null ? _a : null;
+      if (!secret) throw new Error("`authorize` was specified without a valid secret");
+      return yield authorize({ platform: this._platform, secret }).encode(params);
     });
   }
   mergeRouters(...routers) {
@@ -1202,6 +1202,12 @@ var PluvIO = class {
       platform: this._platform
     }));
   }
+  _getIOAuthorize(options) {
+    if (typeof this._authorize === "function") {
+      return this._authorize(options);
+    }
+    return this._authorize;
+  }
 };
 
 // src/createIO.ts

package/package.json

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

package/src/AbstractPlatform.ts

@@ -1,11 +1,10 @@
 import type { AbstractPersistence } from "./AbstractPersistence";
 import type { AbstractPubSub } from "./AbstractPubSub";
 import type { AbstractWebSocket, InferWebSocketSource } from "./AbstractWebSocket";
+import type { JWTEncodeParams } from "./authorize";
 import { Persistence } from "./Persistence";
 import { PubSub } from "./PubSub";
-import type { WebSocketSerializedState } from "./types";
-
-export type WebSocketRegistrationMode = "attached" | "detached";
+import type { PlatformConfig, WebSocketSerializedState } from "./types";
 
 export type InferPlatformWebSocketType<TPlatform extends AbstractPlatform> =
     TPlatform extends AbstractPlatform<infer IAbstractWebSocket> ? IAbstractWebSocket : never;
@@ -33,6 +32,7 @@ export abstract class AbstractPlatform<
     TWebSocket extends AbstractWebSocket = AbstractWebSocket,
     TInitContext extends Record<string, any> = {},
     TRoomContext extends Record<string, any> = {},
+    TConfig extends PlatformConfig = PlatformConfig,
 > {
     protected readonly _initContext: TInitContext | undefined;
     protected readonly _roomContext: TRoomContext | undefined;
@@ -42,7 +42,10 @@ export abstract class AbstractPlatform<
     public persistence: AbstractPersistence;
     public pubSub: AbstractPubSub;
 
-    public abstract readonly _registrationMode: WebSocketRegistrationMode;
+    public readonly _createToken?: (params: JWTEncodeParams<any, any>) => Promise<string>;
+    public _fetch?: (req: any) => Promise<any>;
+    public abstract readonly _config: TConfig;
+    public abstract readonly _name: string;
 
     constructor(config: AbstractPlatformConfig<TRoomContext> = {}) {
         const { context, persistence, pubSub } = config;
@@ -77,6 +80,8 @@ export abstract class AbstractPlatform<
 
     public abstract setSerializedState(webSocket: AbstractWebSocket, state: WebSocketSerializedState): void;
 
+    public validateConfig(config: any): void {}
+
     protected _initialize(): this {
         if (this._initialized) throw new Error("Platform is already initialized");
 

package/src/IORoom.ts

@@ -1,10 +1,8 @@
 import type { AbstractCrdtDoc, AbstractCrdtDocFactory } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 import type {
-    BaseIOAuthorize,
     BaseIOEventRecord,
     EventMessage,
-    IOAuthorize,
     IOEventMessage,
     IOLike,
     Id,
@@ -13,7 +11,6 @@ import type {
     InferIOAuthorize,
     InferIOAuthorizeUser,
     InferIOInput,
-    InputZodLike,
     JsonObject,
     Maybe,
 } from "@pluv/types";
@@ -24,16 +21,20 @@ import type {
     InferPlatformWebSocketSource,
     InferRoomContextType,
 } from "./AbstractPlatform";
-import { AbstractCloseEvent, AbstractErrorEvent, AbstractMessageEvent, AbstractWebSocket } from "./AbstractWebSocket";
+import type { AbstractCloseEvent, AbstractErrorEvent, AbstractMessageEvent } from "./AbstractWebSocket";
+import { AbstractWebSocket } from "./AbstractWebSocket";
 import type { PluvRouter, PluvRouterEventConfig } from "./PluvRouter";
 import { authorize } from "./authorize";
 import { PING_TIMEOUT_MS } from "./constants";
 import type {
     EventResolverContext,
+    EventResolverKind,
     IORoomListenerEvent,
     IORoomMessageEvent,
     IOUserConnectedEvent,
     IOUserDisconnectedEvent,
+    PluvIOAuthorize,
+    ResolvedPluvIOAuthorize,
     WebSocketSession,
     WebSocketType,
 } from "./types";
@@ -49,7 +50,7 @@ interface BroadcastParams<TIO extends IORoom<any, any, any, any>> {
 
 export interface IORoomListeners<
     TPlatform extends AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>>,
     TContext extends Record<string, any>,
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext>,
 > {
@@ -68,7 +69,7 @@ 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, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > = Partial<IORoomListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
@@ -92,7 +93,7 @@ export type WebsocketRegisterConfig<TPlatform extends AbstractPlatform<any> = Ab
 
 export class IORoom<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > implements IOLike<TAuthorize, TEvents>
@@ -320,7 +321,7 @@ export class IORoom<
 
         await this._platform.persistence.addUser(this.id, pluvWs.sessionId, user ?? {});
 
-        if (this._platform._registrationMode === "attached") {
+        if (this._platform._config.registrationMode === "attached") {
             const onClose = this._onClose(pluvWs).bind(this);
             const onMessage = this._onMessage(pluvWs).bind(this);
 
@@ -364,13 +365,7 @@ export class IORoom<
         });
 
         const promises = quitters.map(async (quitter) => {
-            await this._broadcast({
-                message: {
-                    type: "$EXIT",
-                    data: { sessionId: quitter.sessionId },
-                },
-                senderId: quitter.sessionId,
-            });
+            await this._exitWebsocket(quitter);
         });
 
         await Promise.all(promises);
@@ -400,7 +395,7 @@ export class IORoom<
     }
 
     private _ensureDetached(): void {
-        if (this._platform._registrationMode === "detached") return;
+        if (this._platform._config.registrationMode === "detached") return;
 
         throw new Error("Platform must use detached mode");
     }
@@ -456,6 +451,8 @@ export class IORoom<
         if (!ioAuthorize) return null as InferIOAuthorizeUser<InferIOAuthorize<this>>;
         if (!token) return null as InferIOAuthorizeUser<InferIOAuthorize<this>>;
 
+        if (!ioAuthorize.secret) throw new Error("`authorize` was specified without a valid secret");
+
         const payload = await authorize({
             platform: this._platform,
             secret: ioAuthorize.secret,
@@ -494,16 +491,14 @@ export class IORoom<
         return doc;
     }
 
-    private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>) {
+    private _getIOAuthorize(
+        options: WebsocketRegisterConfig<TPlatform>,
+    ): ResolvedPluvIOAuthorize<any, any, any> | null {
         if (typeof this._authorize === "function") {
             return this._authorize(options);
         }
 
-        return this._authorize as {
-            required: any;
-            secret: string;
-            user: InputZodLike<any>;
-        } | null;
+        return this._authorize as ResolvedPluvIOAuthorize<any, any, any> | null;
     }
 
     private _getProcedure(
@@ -619,13 +614,7 @@ export class IORoom<
             this._sessions.delete(webSocket.sessionId);
 
             this._platform.persistence.deleteUser(this.id, webSocket.sessionId).finally(async () => {
-                await this._broadcast({
-                    message: {
-                        type: "$EXIT",
-                        data: { sessionId: webSocket.sessionId },
-                    },
-                    senderId: webSocket.sessionId,
-                });
+                await this._exitWebsocket(webSocket);
 
                 const size = this.getSize();
 
@@ -656,7 +645,7 @@ export class IORoom<
             ]);
 
             const doc = await this._doc;
-            const eventContext: EventResolverContext<TPlatform, TAuthorize, TContext> = {
+            const eventContext: EventResolverContext<EventResolverKind, TPlatform, TAuthorize, TContext> = {
                 context: this._context,
                 doc,
                 room: this.id,
@@ -841,7 +830,7 @@ export class IORoom<
         if (!sender) return;
 
         const doc = await this._doc;
-        const context: EventResolverContext<TPlatform, TAuthorize, TContext> = {
+        const context: EventResolverContext<"sync", TPlatform, TAuthorize, TContext> = {
             context: this._context,
             doc,
             room: this.id,

package/src/PluvIO.ts

@@ -1,6 +1,6 @@
 import type { AbstractCrdtDocFactory } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
-import type { BaseIOAuthorize, IOAuthorize, InferIOAuthorizeUser } from "@pluv/types";
+import type { IOAuthorize, InferIOAuthorizeUser, InputZodLike } from "@pluv/types";
 import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
 import { PluvProcedure } from "./PluvProcedure";
 import type { MergedRouter, PluvRouterEventConfig } from "./PluvRouter";
@@ -8,24 +8,34 @@ import { PluvRouter } from "./PluvRouter";
 import { PluvServer } from "./PluvServer";
 import type { JWTEncodeParams } from "./authorize";
 import { authorize } from "./authorize";
-import type { CrdtLibraryType, GetInitialStorageFn, PluvContext, PluvIOListeners } from "./types";
+import type {
+    CrdtLibraryType,
+    GetInitialStorageFn,
+    InferPlatformConfig,
+    PluvContext,
+    PluvIOAuthorize,
+    PluvIOListeners,
+    ResolvedPluvIOAuthorize,
+} from "./types";
 import { __PLUV_VERSION } from "./version";
+import { WebsocketRegisterConfig } from "./IORoom";
 
 export type PluvIOConfig<
     TPlatform extends AbstractPlatform<any>,
     TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>>,
     TContext extends Record<string, any>,
 > = {
-    authorize?: TAuthorize;
     context?: PluvContext<TPlatform, TContext>;
     crdt?: CrdtLibraryType;
     debug?: boolean;
     platform: TPlatform;
-};
+} & (InferPlatformConfig<TPlatform>["requireAuth"] extends true
+    ? { authorize: TAuthorize }
+    : { authorize?: TAuthorize });
 
 export type ServerConfig<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
     TContext extends Record<string, any> = {},
     TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {},
 > = Partial<PluvIOListeners<TPlatform, TAuthorize, TContext, TEvents>> & {
@@ -35,7 +45,7 @@ export type ServerConfig<
 
 export class PluvIO<
     TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>,
-    TAuthorize extends IOAuthorize<any, any, InferInitContextType<TPlatform>> = BaseIOAuthorize,
+    TAuthorize extends PluvIOAuthorize<TPlatform, any, any, InferInitContextType<TPlatform>> = any,
     TContext extends Record<string, any> = {},
 > {
     public readonly version: string = __PLUV_VERSION as any;
@@ -64,15 +74,12 @@ export class PluvIO<
     public async createToken(params: JWTEncodeParams<InferIOAuthorizeUser<TAuthorize>, TPlatform>): Promise<string> {
         if (!this._authorize) throw new Error("IO does not specify authorize during initialization.");
 
-        const ioAuthorize =
-            typeof this._authorize === "function" ? this._authorize(params) : (this._authorize as { secret: string });
+        const ioAuthorize = this._getIOAuthorize(params);
+        const secret = ioAuthorize?.secret ?? null;
 
-        const secret = ioAuthorize.secret;
+        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);
     }
 
     public mergeRouters<TRouters extends PluvRouter<TPlatform, TAuthorize, TContext, any>[]>(
@@ -99,4 +106,14 @@ export class PluvIO<
             platform: this._platform,
         });
     }
+
+    private _getIOAuthorize(
+        options: WebsocketRegisterConfig<TPlatform>,
+    ): ResolvedPluvIOAuthorize<any, any, any> | null {
+        if (typeof this._authorize === "function") {
+            return this._authorize(options);
+        }
+
+        return this._authorize as ResolvedPluvIOAuthorize<any, any, any> | null;
+    }
 }

package/src/PluvProcedure.ts

@@ -1,6 +1,6 @@
 import type { EventRecord, IOAuthorize, InputZodLike, JsonObject, ProcedureLike } from "@pluv/types";
 import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
-import type { EventResolver, MergeEventRecords } from "./types";
+import type { EventResolver, EventResolverKind, MergeEventRecords } from "./types";
 
 export interface PluvProcedureConfig<
     TPlatform extends AbstractPlatform<any>,
@@ -9,10 +9,10 @@ export interface PluvProcedureConfig<
     TInput extends JsonObject = {},
     TOutput extends EventRecord<string, any> = {},
 > {
-    broadcast?: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
+    broadcast?: EventResolver<"broadcast", TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
     input?: InputZodLike<TInput>;
-    self?: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
-    sync?: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
+    self?: EventResolver<"self", TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
+    sync?: EventResolver<"sync", TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null;
 }
 
 export class PluvProcedure<
@@ -23,10 +23,11 @@ export class PluvProcedure<
     TOutput extends EventRecord<string, any> = {},
     TFilled extends "input" | "broadcast" | "self" | "sync" | "" = "",
 > {
-    private _broadcast: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
+    private _broadcast: EventResolver<"broadcast", TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null =
+        null;
     private _input: InputZodLike<TInput> | null = null;
-    private _self: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
-    private _sync: EventResolver<TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
+    private _self: EventResolver<"self", TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
+    private _sync: EventResolver<"sync", TPlatform, TAuthorize, TContext, TInput, Partial<TOutput>> | null = null;
 
     public get config(): ProcedureLike<TInput, TOutput>["config"] {
         return {
@@ -48,7 +49,7 @@ export class PluvProcedure<
     }
 
     public broadcast<TResult extends EventRecord<string, any> = {}>(
-        resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>,
+        resolver: EventResolver<"broadcast", TPlatform, TAuthorize, TContext, TInput, TResult>,
     ): Omit<
         PluvProcedure<
             TPlatform,
@@ -84,7 +85,7 @@ export class PluvProcedure<
     }
 
     public self<TResult extends EventRecord<string, any> = {}>(
-        resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>,
+        resolver: EventResolver<"self", TPlatform, TAuthorize, TContext, TInput, TResult>,
     ): Omit<
         PluvProcedure<
             TPlatform,
@@ -114,7 +115,7 @@ export class PluvProcedure<
     }
 
     public sync<TResult extends EventRecord<string, any> = {}>(
-        resolver: EventResolver<TPlatform, TAuthorize, TContext, TInput, TResult>,
+        resolver: EventResolver<"sync", TPlatform, TAuthorize, TContext, TInput, TResult>,
     ): Omit<
         PluvProcedure<
             TPlatform,
@@ -143,7 +144,7 @@ export class PluvProcedure<
         });
     }
 
-    private _resolver(): EventResolver<TPlatform, TAuthorize, TContext, TInput, TOutput> {
+    private _resolver(): EventResolver<EventResolverKind, TPlatform, TAuthorize, TContext, TInput, TOutput> {
         return (data, context) => {
             return {
                 ...this._broadcast?.(data, context),

package/src/PluvRouter.ts

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