fix: EventKey map types

package.json

@@ -41,7 +41,8 @@
     "dev": "nodemon",
     "test": "tsx test/index.ts",
     "docs:dev": "pnpm -C docs run dev",
-    "docs:build": "pnpm -C docs run build"
+    "docs:build": "pnpm -C docs run build",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "isomorphic-ws": "^5.0.0",

src/Interfaces.ts

@@ -492,21 +492,31 @@ export interface NoticeHandler {
 
 // =====================================================================================
 
-export type AllHandlers = SocketHandler &
+export type AllHandlers = |
+  SocketHandler &
   ApiHandler &
   MessageHandler &
   MessageSentHandler &
   MetaEventHandler &
   RequestHandler &
   NoticeHandler
 
-export type WSReceiveHandler = MessageHandler &
+
+export type WSReceiveHandler = |
+  MessageHandler &
   MessageSentHandler &
   MetaEventHandler &
   RequestHandler &
   NoticeHandler
 
-export type EventHandle<T extends keyof AllHandlers> = (context: AllHandlers[T]) => any
+export type EventKey = keyof AllHandlers
+export type HandlerResMap = {
+  [K in EventKey]: AllHandlers[K]
+}
+export type EventHandleMap = {
+  [K in EventKey]: (context: HandlerResMap[K]) => void
+}
+
 
 // =====================================================================================
 

src/NCEventBus.ts

@@ -1,6 +1,8 @@
 import {
+  EventHandleMap,
+  EventKey,
+  HandlerResMap,
   type AllHandlers,
-  type EventHandle,
   type MessageHandler,
   type MessageSentHandler,
   type MetaEventHandler,
@@ -10,22 +12,22 @@ import {
 } from './Interfaces.js'
 import { logger } from './Utils.js'
 
-export class NCEventBus<const T extends keyof AllHandlers> {
-  #events: Map<T, EventHandle<T>[]> = new Map()
+export class NCEventBus {
+  #events = new Map<EventKey, EventHandleMap[EventKey][]>()
   debug: boolean
 
   constructor(debug = false) {
     this.debug = debug
   }
 
-  on(event: T, handler: EventHandle<T>) {
+  on<T extends EventKey>(event: T, handler: EventHandleMap[T]) {
     const handlers = this.#events.get(event) ?? []
     handlers.push(handler)
     this.#events.set(event, handlers)
     return this
   }
 
-  off(event: T, handler: EventHandle<T>) {
+  off<T extends EventKey>(event: T, handler: EventHandleMap[T]) {
     const handlers = this.#events.get(event) ?? []
     const index = handlers.indexOf(handler)
     if (index >= 0) {
@@ -35,24 +37,25 @@ export class NCEventBus<const T extends keyof AllHandlers> {
     return this
   }
 
-  once(event: T, handler: EventHandle<T>) {
-    this.on(event, (context) => {
+  once<T extends EventKey>(event: T, handler: EventHandleMap[T]) {
+    const onceHandler = (context: HandlerResMap[T]) => {
       handler(context)
-      this.off(event, handler)
-    })
+      this.off(event, onceHandler as EventHandleMap[T])
+    }
+    this.on(event, onceHandler as EventHandleMap[T])
     return this
   }
 
-  emit(type: T, context: AllHandlers[T]): this {
-    const handlers = this.#events.get(type) ?? []
+  emit<T extends EventKey>(type: T, context: HandlerResMap[T]): this {
+    const handlers = this.#events.get(type) as EventHandleMap[T][] ?? []
 
     for (const handler of handlers) {
       handler(context)
     }
 
     // 触发总类
     const indexOf = type.lastIndexOf('.')
-    if (indexOf > 0) return this.emit(type.slice(0, indexOf) as T, context)
+    if (indexOf > 0) return this.emit(type.slice(0, indexOf) as EventKey, context)
 
     return this
   }

src/NCWebsocketApi.ts

@@ -1,4 +1,4 @@
-import { WSSendParam } from './Interfaces.js'
+import { EventKey, WSSendParam } from './Interfaces.js'
 import { NCWebsocketBase } from './NCWebsocketBase.js'
 
 export class NCWebsocketApi extends NCWebsocketBase {

src/NCWebsocketBase.ts

@@ -3,7 +3,8 @@ import { nanoid } from 'nanoid'
 import type {
   AllHandlers,
   APIRequest,
-  EventHandle,
+  EventHandleMap,
+  EventKey,
   NCWebsocketOptions,
   ResponseHandler,
   WSReconnection,
@@ -254,8 +255,8 @@ export class NCWebsocketBase {
    * @param event
    * @param handle
    */
-  on<T extends keyof AllHandlers>(event: T, handle: EventHandle<T>) {
-    this.#eventBus.on(event, handle)
+  on<T extends EventKey>(event: T, handle: EventHandleMap[T]) {
+    this.#eventBus.on<T>(event, handle)
     return this
   }
 
@@ -264,7 +265,7 @@ export class NCWebsocketBase {
    * @param event
    * @param handle
    */
-  once<T extends keyof AllHandlers>(event: T, handle: EventHandle<T>) {
+  once<T extends EventKey>(event: T, handle: EventHandleMap[T]) {
     this.#eventBus.once(event, handle)
     return this
   }
@@ -274,7 +275,7 @@ export class NCWebsocketBase {
    * @param event
    * @param handle
    */
-  off<T extends keyof AllHandlers>(event: T, handle: EventHandle<T>) {
+  off<T extends keyof AllHandlers>(event: T, handle: EventHandleMap[T]) {
     this.#eventBus.off(event, handle)
     return this
   }