@kevisual/router 0.0.43 → 0.0.45

package/dist/router.d.ts

@@ -1,10 +1,12 @@
-import http$1, { IncomingMessage, ServerResponse } from 'node:http';
+import * as http from 'node:http';
+import http__default, { IncomingMessage, ServerResponse } from 'node:http';
 import https from 'node:https';
 import http2 from 'node:http2';
-import * as http from 'http';
-import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
+import EventEmitter from 'node:events';
+import { EventEmitter as EventEmitter$1 } from 'events';
 import { WebSocketServer, WebSocket } from 'ws';
 import { z } from 'zod';
+import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
 import { RouteOpts as RouteOpts$1, QueryRouterServer as QueryRouterServer$1, RouteMiddleware as RouteMiddleware$1, Run as Run$1 } from '@kevisual/router';
 import { Query, DataOpts, Result } from '@kevisual/query/query';
 
@@ -383,14 +385,6 @@ declare class QueryConnect {
     }[];
 }
 
-type Listener$1 = {
-    id?: string;
-    io?: boolean;
-    path?: string;
-    fun: (...args: any[]) => Promise<void> | void;
-};
-type ListenerFun = (...args: any[]) => Promise<void> | void;
-type OnListener = Listener$1 | ListenerFun | (Listener$1 | ListenerFun)[];
 type Cors$2 = {
     /**
      * @default '*''
@@ -432,18 +426,41 @@ interface ServerType {
      * @param listener
      */
     on(listener: OnListener): void;
-    onWebSocket({ ws, message, pathname, token, id }: {
-        ws: WS;
-        message: string | Buffer;
-        pathname: string;
-        token?: string;
-        id?: string;
-    }): void;
+    onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
 }
+type OnWebSocketOptions = {
+    ws: WS;
+    message: string | Buffer;
+    pathname: string;
+    token?: string;
+    id?: string;
+};
+type OnWebSocketFn = (options: OnWebSocketOptions) => Promise<void> | void;
 type WS = {
     send: (data: any) => void;
-    close: () => void;
+    close: (code?: number, reason?: string) => void;
 };
+type Listener$1 = {
+    id?: string;
+    io?: boolean;
+    path?: string;
+    fun: WebScoketListenerFun | HttpListenerFun;
+};
+type WebScoketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
+type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
+type WebSocketReq = {
+    emitter?: EventEmitter;
+    ws: WS;
+    data: any;
+    pathname?: string;
+    token?: string;
+    id?: string;
+};
+type WebSocketRes = {
+    end: (data: any) => void;
+};
+type ListenerFun = WebScoketListenerFun | HttpListenerFun;
+type OnListener = Listener$1 | ListenerFun | (Listener$1 | ListenerFun)[];
 type RouterReq<T = {}> = {
     url: string;
     method: string;
@@ -588,6 +605,7 @@ declare class ServerBase implements ServerType {
     _callback: any;
     cors: Cors$1;
     listeners: Listener$1[];
+    emitter: EventEmitter$1<any>;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -613,13 +631,7 @@ declare class ServerBase implements ServerType {
      */
     createCallback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     on(listener: OnListener): void;
-    onWebSocket({ ws, message, pathname, token, id }: {
-        ws: any;
-        message: any;
-        pathname: any;
-        token: any;
-        id: any;
-    }): Promise<void>;
+    onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): Promise<void>;
 }
 
 type WsServerBaseOpts = {
@@ -661,7 +673,7 @@ type ServerNodeOpts = ServerOpts<{
     httpsCert?: string;
 }>;
 declare class ServerNode extends ServerBase implements ServerType {
-    _server: http$1.Server | https.Server | http2.Http2SecureServer;
+    _server: http__default.Server | https.Server | http2.Http2SecureServer;
     _callback: any;
     cors: Cors;
     private httpType;
@@ -670,7 +682,7 @@ declare class ServerNode extends ServerBase implements ServerType {
     io: WsServer | undefined;
     constructor(opts?: ServerNodeOpts);
     customListen(...args: any[]): void;
-    createServer(): http$1.Server<typeof http$1.IncomingMessage, typeof http$1.ServerResponse> | http2.Http2SecureServer<typeof http$1.IncomingMessage, typeof http$1.ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
+    createServer(): http__default.Server<typeof http__default.IncomingMessage, typeof http__default.ServerResponse> | http2.Http2SecureServer<typeof http__default.IncomingMessage, typeof http__default.ServerResponse, typeof http2.Http2ServerRequest, typeof http2.Http2ServerResponse>;
 }
 
 /**
@@ -912,4 +924,4 @@ declare class App<U = {}> {
 }
 
 export { App, Connect, CustomError, Mini, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, ServerNode, createSchema, define, handleServer, util };
-export type { RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema };
+export type { OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema };

package/dist/router.js

@@ -3,7 +3,7 @@ import require$$2 from 'node:http';
 import require$$1$1 from 'node:https';
 import http2 from 'node:http2';
 import url from 'node:url';
-import require$$0$3 from 'node:events';
+import require$$0$3, { EventEmitter } from 'node:events';
 import require$$3 from 'node:net';
 import require$$4 from 'node:tls';
 import require$$0$2 from 'node:stream';
@@ -1214,6 +1214,7 @@ class ServerBase {
     _callback;
     cors;
     listeners = [];
+    emitter = new EventEmitter();
     constructor(opts) {
         this.path = opts?.path || '/api/router';
         this.handle = opts?.handle;
@@ -1348,6 +1349,7 @@ class ServerBase {
                 ws.send(JSON.stringify(data));
             };
             listener.fun({
+                emitter: this.emitter,
                 data,
                 token,
                 id,
@@ -6662,7 +6664,7 @@ class BunServer extends ServerBase {
             },
             websocket: {
                 open: (ws) => {
-                    ws.send('connected');
+                    ws.send(JSON.stringify({ type: 'connected' }));
                 },
                 message: async (ws, message) => {
                     const pathname = ws.data.pathname || '';
@@ -6672,6 +6674,15 @@ class BunServer extends ServerBase {
                 },
                 close: (ws) => {
                     // WebSocket 连接关闭
+                    const id = ws?.data?.id || '';
+                    if (id) {
+                        this.emitter.emit('close--' + id, { type: 'close', ws, id });
+                        setTimeout(() => {
+                            // 关闭后 5 秒清理监听器, 避免内存泄漏， 理论上原本的自己就应该被清理掉了，这里是保险起见
+                            this.emitter.removeAllListeners('close--' + id);
+                            this.emitter.removeAllListeners(id);
+                        }, 5000);
+                    }
                 },
             },
         });
@@ -11158,7 +11169,7 @@ class App {
         }
         this.server.on({
             id: 'app-request-listener',
-            fun: fn
+            fun: fn,
         });
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/app.ts

@@ -134,7 +134,7 @@ export class App<U = {}> {
     }
     this.server.on({
       id: 'app-request-listener',
-      fun: fn
+      fun: fn as any,
     });
   }
 }

package/src/index.ts

@@ -20,4 +20,4 @@ export { App } from './app.ts';
 export * from './router-define.ts';
 
 
-export { RouterReq, RouterRes } from './server/server-type.ts';
+export { RouterReq, RouterRes, OnWebSocketFn } from './server/server-type.ts';

package/src/server/server-base.ts

@@ -1,9 +1,9 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { handleServer } from './handle-server.ts';
 import * as cookie from './cookie.ts';
-import { ServerType, Listener, OnListener, ServerOpts } from './server-type.ts';
+import { ServerType, Listener, OnListener, ServerOpts, OnWebSocketOptions, OnWebSocketFn, WebScoketListenerFun, ListenerFun, HttpListenerFun } from './server-type.ts';
 import { parseIfJson } from '../utils/parse.ts';
-
+import { EventEmitter } from 'events';
 type CookieFn = (name: string, value: string, options?: cookie.SerializeOptions, end?: boolean) => void;
 
 export type HandleCtx = {
@@ -63,6 +63,7 @@ export class ServerBase implements ServerType {
   _callback: any;
   cors: Cors;
   listeners: Listener[] = [];
+  emitter = new EventEmitter();
   constructor(opts?: ServerOpts) {
     this.path = opts?.path || '/api/router';
     this.handle = opts?.handle;
@@ -118,7 +119,7 @@ export class ServerBase implements ServerType {
       }
       const listeners = that.listeners || [];
       for (const item of listeners) {
-        const fun = item.fun;
+        const fun = item.fun as any;
         if (typeof fun === 'function' && !item.io) {
           await fun(req, res);
         }
@@ -193,7 +194,7 @@ export class ServerBase implements ServerType {
       this.listeners.push(listener);
     }
   }
-  async onWebSocket({ ws, message, pathname, token, id }) {
+  async onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions) {
     const listener = this.listeners.find((item) => item.path === pathname && item.io);
     const data: any = parseIfJson(message);
 
@@ -201,7 +202,8 @@ export class ServerBase implements ServerType {
       const end = (data: any) => {
         ws.send(JSON.stringify(data));
       }
-      listener.fun({
+      (listener.fun as WebScoketListenerFun)({
+        emitter: this.emitter,
         data,
         token,
         id,

package/src/server/server-bun.ts

@@ -223,7 +223,7 @@ export class BunServer extends ServerBase implements ServerType {
       },
       websocket: {
         open: (ws: any) => {
-          ws.send('connected');
+          ws.send(JSON.stringify({ type: 'connected' }));
         },
         message: async (ws: any, message: string | Buffer) => {
           const pathname = ws.data.pathname || '';
@@ -233,6 +233,15 @@ export class BunServer extends ServerBase implements ServerType {
         },
         close: (ws: any) => {
           // WebSocket 连接关闭
+          const id = ws?.data?.id || '';
+          if (id) {
+            this.emitter.emit('close--' + id, { type: 'close', ws, id });
+            setTimeout(() => {
+              // 关闭后 5 秒清理监听器, 避免内存泄漏， 理论上原本的自己就应该被清理掉了，这里是保险起见
+              this.emitter.removeAllListeners('close--' + id);
+              this.emitter.removeAllListeners(id);
+            }, 5000);
+          }
         },
       },
     });

package/src/server/server-type.ts

@@ -1,13 +1,7 @@
-import * as http from 'http';
+import EventEmitter from 'node:events';
+import * as http from 'node:http';
+
 
-export type Listener = {
-  id?: string;
-  io?: boolean;
-  path?: string;
-  fun: (...args: any[]) => Promise<void> | void;
-}
-export type ListenerFun = (...args: any[]) => Promise<void> | void;
-export type OnListener = Listener | ListenerFun | (Listener | ListenerFun)[];
 export type Cors = {
   /**
    * @default '*''
@@ -44,14 +38,38 @@ export interface ServerType {
    * @param listener
    */
   on(listener: OnListener): void;
-  onWebSocket({ ws, message, pathname, token, id }: { ws: WS; message: string | Buffer; pathname: string, token?: string, id?: string }): void;
+  onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
 }
 
+export type OnWebSocketOptions = { ws: WS; message: string | Buffer; pathname: string, token?: string, id?: string }
+export type OnWebSocketFn = (options: OnWebSocketOptions) => Promise<void> | void;
 type WS = {
   send: (data: any) => void;
-  close: () => void;
+  close: (code?: number, reason?: string) => void;
 }
+export type Listener = {
+  id?: string;
+  io?: boolean;
+  path?: string;
+  fun: WebScoketListenerFun | HttpListenerFun;
+}
+
+export type WebScoketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
+export type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
 
+export type WebSocketReq = {
+  emitter?: EventEmitter;
+  ws: WS;
+  data: any;
+  pathname?: string;
+  token?: string;
+  id?: string;
+}
+export type WebSocketRes = {
+  end: (data: any) => void;
+}
+export type ListenerFun = WebScoketListenerFun | HttpListenerFun;;
+export type OnListener = Listener | ListenerFun | (Listener | ListenerFun)[];
 export type RouterReq<T = {}> = {
   url: string;
   method: string;