@kevisual/router 0.0.44 → 0.0.46

package/dist/router.d.ts

@@ -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,6 +440,16 @@ 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 = {
     id?: string;
@@ -632,6 +643,7 @@ 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 = {
@@ -924,4 +936,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 { Listener$1 as Listener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, WS, WebSocketReq, WebSocketRes };

package/dist/router.js

@@ -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) {
@@ -6353,10 +6364,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);
+            });
         });
     }
 }
@@ -6664,7 +6685,7 @@ class BunServer extends ServerBase {
             },
             websocket: {
                 open: (ws) => {
-                    ws.send({ type: 'connected' });
+                    ws.send(JSON.stringify({ type: 'connected' }));
                 },
                 message: async (ws, message) => {
                     const pathname = ws.data.pathname || '';
@@ -6674,14 +6695,7 @@ class BunServer extends ServerBase {
                 },
                 close: (ws) => {
                     // WebSocket 连接关闭
-                    const id = ws?.data?.id || '';
-                    if (id) {
-                        this.emitter.emit(id, { type: 'close', ws, id });
-                        setTimeout(() => {
-                            // 关闭后 5 秒清理监听器, 避免内存泄漏， 理论上原本的自己就应该被清理掉了，这里是保险起见
-                            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.44",
+  "version": "0.0.46",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/index.ts

@@ -20,4 +20,6 @@ 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,
+} 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;
@@ -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

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

package/src/server/server-type.ts

@@ -39,13 +39,24 @@ 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;

package/src/server/ws-server.ts

@@ -51,11 +51,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