@kevisual/router 0.0.45 → 0.0.47

package/dist/router.d.ts

@@ -4,7 +4,7 @@ import https from 'node:https';
 import http2 from 'node:http2';
 import EventEmitter from 'node:events';
 import { EventEmitter as EventEmitter$1 } from 'events';
-import { WebSocketServer, WebSocket } from 'ws';
+import { WebSocketServer } 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';
@@ -411,7 +411,7 @@ interface ServerType {
     server?: any;
     handle: ServerOpts['handle'];
     setHandle(handle?: any): void;
-    listeners: Listener$1[];
+    listeners: Listener[];
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
     listen(port: number, backlog?: number, listeningListener?: () => void): void;
@@ -427,6 +427,7 @@ interface ServerType {
      */
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
+    onWsClose(ws: WS): void;
 }
 type OnWebSocketOptions = {
     ws: WS;
@@ -439,14 +440,24 @@ type OnWebSocketFn = (options: OnWebSocketOptions) => Promise<void> | void;
 type WS = {
     send: (data: any) => void;
     close: (code?: number, reason?: string) => void;
+    data?: {
+        url: URL;
+        pathname: string;
+        token?: string;
+        id?: string;
+        /**
+         * 鉴权后的获取的信息
+         */
+        userApp?: string;
+    };
 };
-type Listener$1 = {
+type Listener = {
     id?: string;
     io?: boolean;
     path?: string;
-    fun: WebScoketListenerFun | HttpListenerFun;
+    func: WebSocketListenerFun | HttpListenerFun;
 };
-type WebScoketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
+type WebSocketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
 type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
 type WebSocketReq = {
     emitter?: EventEmitter;
@@ -459,8 +470,8 @@ type WebSocketReq = {
 type WebSocketRes = {
     end: (data: any) => void;
 };
-type ListenerFun = WebScoketListenerFun | HttpListenerFun;
-type OnListener = Listener$1 | ListenerFun | (Listener$1 | ListenerFun)[];
+type ListenerFun = WebSocketListenerFun | HttpListenerFun;
+type OnListener = Listener | ListenerFun | (Listener | ListenerFun)[];
 type RouterReq<T = {}> = {
     url: string;
     method: string;
@@ -604,7 +615,7 @@ declare class ServerBase implements ServerType {
     handle: ServerOpts['handle'];
     _callback: any;
     cors: Cors$1;
-    listeners: Listener$1[];
+    listeners: Listener[];
     emitter: EventEmitter$1<any>;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
@@ -632,25 +643,15 @@ declare class ServerBase implements ServerType {
     createCallback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): Promise<void>;
+    onWsClose(ws: WS): Promise<void>;
 }
 
 type WsServerBaseOpts = {
     wss?: WebSocketServer | null;
     path?: string;
 };
-type ListenerFn = (message: {
-    data: Record<string, any>;
-    ws: WebSocket;
-    end: (data: any) => any;
-}) => Promise<any>;
-type Listener<T = 'router' | 'chat' | 'ai'> = {
-    type: T;
-    path?: string;
-    listener: ListenerFn;
-};
 declare class WsServerBase {
     wss: WebSocketServer | null;
-    listeners: Listener[];
     listening: boolean;
     server: ServerType;
     constructor(opts: WsServerBaseOpts);
@@ -677,7 +678,7 @@ declare class ServerNode extends ServerBase implements ServerType {
     _callback: any;
     cors: Cors;
     private httpType;
-    listeners: Listener$1[];
+    listeners: Listener[];
     private options;
     io: WsServer | undefined;
     constructor(opts?: ServerNodeOpts);
@@ -924,4 +925,4 @@ declare class App<U = {}> {
 }
 
 export { App, Connect, CustomError, Mini, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, ServerNode, createSchema, define, handleServer, util };
-export type { OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema };
+export type { HttpListenerFun, Listener, OnListener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, WS, WebSocketListenerFun, WebSocketReq, WebSocketRes };

package/dist/router.js

@@ -1261,9 +1261,9 @@ class ServerBase {
             }
             const listeners = that.listeners || [];
             for (const item of listeners) {
-                const fun = item.fun;
-                if (typeof fun === 'function' && !item.io) {
-                    await fun(req, res);
+                const func = item.func;
+                if (typeof func === 'function' && !item.io) {
+                    await func(req, res);
                 }
             }
             if (res.headersSent) {
@@ -1324,13 +1324,13 @@ class ServerBase {
     on(listener) {
         this.listeners = [];
         if (typeof listener === 'function') {
-            this.listeners.push({ fun: listener });
+            this.listeners.push({ func: listener });
             return;
         }
         if (Array.isArray(listener)) {
             for (const item of listener) {
                 if (typeof item === 'function') {
-                    this.listeners.push({ fun: item });
+                    this.listeners.push({ func: item });
                 }
                 else {
                     this.listeners.push(item);
@@ -1348,7 +1348,7 @@ class ServerBase {
             const end = (data) => {
                 ws.send(JSON.stringify(data));
             };
-            listener.fun({
+            listener.func({
                 emitter: this.emitter,
                 data,
                 token,
@@ -1408,6 +1408,17 @@ class ServerBase {
             end({ code: 500, message: `${type} server is error` });
         }
     }
+    async onWsClose(ws) {
+        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);
+        }
+    }
 }
 
 function getDefaultExportFromCjs (x) {
@@ -6329,7 +6340,6 @@ var WebSocketServer = /*@__PURE__*/getDefaultExportFromCjs(websocketServerExport
 // @ts-type=ws
 class WsServerBase {
     wss;
-    listeners = [];
     listening = false;
     server;
     constructor(opts) {
@@ -6353,10 +6363,20 @@ class WsServerBase {
             const pathname = url.pathname;
             const token = url.searchParams.get('token') || '';
             const id = url.searchParams.get('id') || '';
+            // @ts-ignore
+            ws.data = {
+                url: url,
+                pathname,
+                token,
+                id,
+            };
             ws.on('message', async (message) => {
                 await this.server.onWebSocket({ ws, message, pathname, token, id });
             });
-            ws.send('connected');
+            ws.send(JSON.stringify({ type: 'connected' }));
+            this.wss.on('close', () => {
+                this.server.onWsClose(ws);
+            });
         });
     }
 }
@@ -6674,15 +6694,7 @@ 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);
-                    }
+                    this.onWsClose(ws);
                 },
             },
         });

package/package.json

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

package/src/index.ts

@@ -20,4 +20,15 @@ export { App } from './app.ts';
 export * from './router-define.ts';
 
 
-export { RouterReq, RouterRes, OnWebSocketFn } from './server/server-type.ts';
+export {
+  RouterReq,
+  RouterRes,
+  OnWebSocketFn,
+  WS,
+  WebSocketReq,
+  WebSocketRes,
+  Listener,
+  WebSocketListenerFun,
+  HttpListenerFun,
+  OnListener,
+} from './server/server-type.ts';

package/src/server/server-base.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { handleServer } from './handle-server.ts';
 import * as cookie from './cookie.ts';
-import { ServerType, Listener, OnListener, ServerOpts, OnWebSocketOptions, OnWebSocketFn, WebScoketListenerFun, ListenerFun, HttpListenerFun } from './server-type.ts';
+import { ServerType, Listener, OnListener, ServerOpts, OnWebSocketOptions, OnWebSocketFn, WebScoketListenerFun, ListenerFun, HttpListenerFun, WS } 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;
@@ -119,9 +119,9 @@ export class ServerBase implements ServerType {
       }
       const listeners = that.listeners || [];
       for (const item of listeners) {
-        const fun = item.fun as any;
-        if (typeof fun === 'function' && !item.io) {
-          await fun(req, res);
+        const func = item.func as any;
+        if (typeof func === 'function' && !item.io) {
+          await func(req, res);
         }
       }
       if (res.headersSent) {
@@ -179,13 +179,13 @@ export class ServerBase implements ServerType {
   on(listener: OnListener) {
     this.listeners = [];
     if (typeof listener === 'function') {
-      this.listeners.push({ fun: listener });
+      this.listeners.push({ func: listener });
       return;
     }
     if (Array.isArray(listener)) {
       for (const item of listener) {
         if (typeof item === 'function') {
-          this.listeners.push({ fun: item });
+          this.listeners.push({ func: item });
         } else {
           this.listeners.push(item);
         }
@@ -202,7 +202,7 @@ export class ServerBase implements ServerType {
       const end = (data: any) => {
         ws.send(JSON.stringify(data));
       }
-      (listener.fun as WebScoketListenerFun)({
+      (listener.func as WebScoketListenerFun)({
         emitter: this.emitter,
         data,
         token,
@@ -264,4 +264,15 @@ export class ServerBase implements ServerType {
       end({ code: 500, message: `${type} server is error` });
     }
   }
+  async onWsClose(ws: WS) {
+    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-bun.ts

@@ -233,15 +233,7 @@ 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);
-          }
+          this.onWsClose(ws);
         },
       },
     });

package/src/server/server-type.ts

@@ -39,22 +39,33 @@ export interface ServerType {
    */
   on(listener: OnListener): void;
   onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
+  onWsClose(ws: WS): 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 = {
+export type WS = {
   send: (data: any) => void;
   close: (code?: number, reason?: string) => void;
+  data?: {
+    url: URL;
+    pathname: string;
+    token?: string;
+    id?: string;
+    /**
+     * 鉴权后的获取的信息
+     */
+    userApp?: string;
+  }
 }
 export type Listener = {
   id?: string;
   io?: boolean;
   path?: string;
-  fun: WebScoketListenerFun | HttpListenerFun;
+  func: WebSocketListenerFun | HttpListenerFun;
 }
 
-export type WebScoketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
+export type WebSocketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
 export type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
 
 export type WebSocketReq = {
@@ -68,7 +79,7 @@ export type WebSocketReq = {
 export type WebSocketRes = {
   end: (data: any) => void;
 }
-export type ListenerFun = WebScoketListenerFun | HttpListenerFun;;
+export type ListenerFun = WebSocketListenerFun | HttpListenerFun;;
 export type OnListener = Listener | ListenerFun | (Listener | ListenerFun)[];
 export type RouterReq<T = {}> = {
   url: string;

package/src/server/ws-server.ts

@@ -24,7 +24,6 @@ export type Listener<T = 'router' | 'chat' | 'ai'> = {
 
 export class WsServerBase {
   wss: WebSocketServer | null;
-  listeners: Listener[] = [];
   listening: boolean = false;
   server: ServerType;
 
@@ -51,11 +50,22 @@ export class WsServerBase {
       const pathname = url.pathname;
       const token = url.searchParams.get('token') || '';
       const id = url.searchParams.get('id') || '';
+      // @ts-ignore
+      ws.data = {
+        url: url,
+        pathname,
+        token,
+        id,
+      }
       ws.on('message', async (message: string | Buffer) => {
         await this.server.onWebSocket({ ws, message, pathname, token, id });
       });
-      ws.send('connected');
+      ws.send(JSON.stringify({ type: 'connected' }));
+      this.wss.on('close', () => {
+        this.server.onWsClose(ws);
+      });
     });
+
   }
 }
 // TODO: ws handle and path and routerContext