@kevisual/router 0.0.48 → 0.0.49

package/dist/router.d.ts

@@ -428,11 +428,11 @@ interface ServerType {
      */
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
-    onWsClose(ws: WS): void;
-    sendConnected(ws: WS): void;
+    onWsClose<T = {}>(ws: WS<T>): void;
+    sendConnected<T = {}>(ws: WS<T>): void;
 }
-type OnWebSocketOptions = {
-    ws: WS;
+type OnWebSocketOptions<T = {}> = {
+    ws: WS<T>;
     message: string | Buffer;
     pathname: string;
     token?: string;
@@ -458,13 +458,18 @@ type Listener = {
     io?: boolean;
     path?: string;
     func: WebSocketListenerFun | HttpListenerFun;
+    /**
+   * @description 是否默认解析为 JSON，如果为 true，则 message 会被 JSON.parse 处理，默认是 true
+   */
+    json?: boolean;
 };
 type WebSocketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
 type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
-type WebSocketReq = {
+type WebSocketReq<T = {}, U = Record<string, any>> = {
     emitter?: EventEmitter;
-    ws: WS;
-    data: any;
+    ws: WS<T>;
+    data?: U;
+    message?: string | Buffer;
     pathname?: string;
     token?: string;
     id?: string;

package/dist/router.js

@@ -1325,14 +1325,15 @@ class ServerBase {
     }
     on(listener) {
         this.listeners = [];
+        const randomId = Math.random().toString(36).substring(2, 15);
         if (typeof listener === 'function') {
-            this.listeners.push({ func: listener });
+            this.listeners.push({ func: listener, id: 'all-' + randomId });
             return;
         }
         if (Array.isArray(listener)) {
             for (const item of listener) {
                 if (typeof item === 'function') {
-                    this.listeners.push({ func: item });
+                    this.listeners.push({ func: item, id: 'all-' + randomId });
                 }
                 else {
                     this.listeners.push(item);
@@ -1345,20 +1346,28 @@ class ServerBase {
     }
     async onWebSocket({ ws, message, pathname, token, id }) {
         const listener = this.listeners.find((item) => item.path === pathname && item.io);
-        const data = parseIfJson(message);
         if (listener) {
             const end = (data) => {
                 ws.send(JSON.stringify(data));
             };
+            let data = {};
+            const isJson = listener.json !== false;
+            if (isJson) {
+                data = parseIfJson(message);
+            }
             listener.func({
                 emitter: this.emitter,
                 data,
                 token,
+                message,
+                pathname,
                 id,
                 ws,
             }, { end });
             return;
         }
+        // 默认处理方案，直接调用 handle 方法
+        const data = parseIfJson(message);
         if (typeof data === 'string') {
             const cleanMessage = data.trim().replace(/^["']|["']$/g, '');
             if (cleanMessage === 'close') {
@@ -11209,7 +11218,7 @@ class App {
         }
         this.server.on({
             id: 'app-request-listener',
-            fun: fn,
+            func: fn,
         });
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -84,11 +84,6 @@
       "require": "./dist/router-define.js",
       "types": "./dist/router-define.d.ts"
     },
-    "./simple-lib": {
-      "import": "./dist/router-simple-lib.js",
-      "require": "./dist/router-simple-lib.js",
-      "types": "./dist/router-simple-lib.d.ts"
-    },
     "./mod.ts": {
       "import": "./mod.ts",
       "require": "./mod.ts",

package/src/app.ts

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

package/src/server/server-base.ts

@@ -179,14 +179,15 @@ export class ServerBase implements ServerType {
   }
   on(listener: OnListener) {
     this.listeners = [];
+    const randomId = Math.random().toString(36).substring(2, 15);
     if (typeof listener === 'function') {
-      this.listeners.push({ func: listener });
+      this.listeners.push({ func: listener, id: 'all-' + randomId });
       return;
     }
     if (Array.isArray(listener)) {
       for (const item of listener) {
         if (typeof item === 'function') {
-          this.listeners.push({ func: item });
+          this.listeners.push({ func: item, id: 'all-' + randomId });
         } else {
           this.listeners.push(item);
         }
@@ -197,22 +198,29 @@ export class ServerBase implements ServerType {
   }
   async onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions) {
     const listener = this.listeners.find((item) => item.path === pathname && item.io);
-    const data: any = parseIfJson(message);
 
     if (listener) {
       const end = (data: any) => {
         ws.send(JSON.stringify(data));
       }
+      let data: any = {};
+      const isJson = listener.json !== false;
+      if (isJson) {
+        data = parseIfJson(message);
+      }
       (listener.func as WebSocketListenerFun)({
         emitter: this.emitter,
         data,
         token,
+        message,
+        pathname,
         id,
         ws,
       }, { end });
       return;
     }
-
+    // 默认处理方案，直接调用 handle 方法
+    const data: any = parseIfJson(message);
     if (typeof data === 'string') {
       const cleanMessage = data.trim().replace(/^["']|["']$/g, '');
       if (cleanMessage === 'close') {

package/src/server/server-type.ts

@@ -40,11 +40,17 @@ export interface ServerType {
    */
   on(listener: OnListener): void;
   onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
-  onWsClose(ws: WS): void;
-  sendConnected(ws: WS): void;
+  onWsClose<T = {}>(ws: WS<T>): void;
+  sendConnected<T = {}>(ws: WS<T>): void;
 }
 
-export type OnWebSocketOptions = { ws: WS; message: string | Buffer; pathname: string, token?: string, id?: string }
+export type OnWebSocketOptions<T = {}> = {
+  ws: WS<T>;
+  message: string | Buffer;
+  pathname: string,
+  token?: string,
+  id?: string,
+}
 export type OnWebSocketFn = (options: OnWebSocketOptions) => Promise<void> | void;
 export type WS<T = {}> = {
   send: (data: any) => void;
@@ -65,15 +71,20 @@ export type Listener = {
   io?: boolean;
   path?: string;
   func: WebSocketListenerFun | HttpListenerFun;
+  /**
+ * @description 是否默认解析为 JSON，如果为 true，则 message 会被 JSON.parse 处理，默认是 true
+ */
+  json?: boolean,
 }
 
 export type WebSocketListenerFun = (req: WebSocketReq, res: WebSocketRes) => Promise<void> | void;
 export type HttpListenerFun = (req: RouterReq, res: RouterRes) => Promise<void> | void;
 
-export type WebSocketReq = {
+export type WebSocketReq<T = {}, U = Record<string, any>> = {
   emitter?: EventEmitter;
-  ws: WS;
-  data: any;
+  ws: WS<T>;
+  data?: U;
+  message?: string | Buffer;
   pathname?: string;
   token?: string;
   id?: string;

package/dist/router-simple-lib.d.ts

@@ -1,3 +0,0 @@
-declare const parseXml: (req: any) => Promise<any>;
-
-export { parseXml };

package/dist/router-simple-lib.js

@@ -1,35 +0,0 @@
-import xml2js from 'xml2js';
-
-const parseXml = async (req) => {
-    return await new Promise((resolve) => {
-        // 读取请求数据
-        let data = '';
-        req.setEncoding('utf8');
-        // 监听data事件，接收数据片段
-        req.on('data', (chunk) => {
-            data += chunk;
-        });
-        // 当请求结束时处理数据
-        req.on('end', () => {
-            try {
-                // 使用xml2js解析XML
-                xml2js.parseString(data, function (err, result) {
-                    if (err) {
-                        console.error('XML解析错误:', err);
-                        resolve(null);
-                    }
-                    else {
-                        const jsonString = JSON.stringify(result);
-                        resolve(jsonString);
-                    }
-                });
-            }
-            catch (error) {
-                console.error('处理请求时出错:', error);
-                resolve(null);
-            }
-        });
-    });
-};
-
-export { parseXml };