@kevisual/router 0.0.47 → 0.0.49

package/dist/router.d.ts

@@ -405,6 +405,7 @@ type ServerOpts<T = {}> = {
     }) => any;
     cors?: Cors$2;
     io?: boolean;
+    showConnected?: boolean;
 } & T;
 interface ServerType {
     path?: string;
@@ -427,17 +428,18 @@ interface ServerType {
      */
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
-    onWsClose(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;
     id?: string;
 };
 type OnWebSocketFn = (options: OnWebSocketOptions) => Promise<void> | void;
-type WS = {
+type WS<T = {}> = {
     send: (data: any) => void;
     close: (code?: number, reason?: string) => void;
     data?: {
@@ -449,20 +451,25 @@ type WS = {
          * 鉴权后的获取的信息
          */
         userApp?: string;
-    };
+    } & T;
 };
 type Listener = {
     id?: string;
     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;
@@ -480,6 +487,7 @@ type RouterReq<T = {}> = {
         remoteAddress?: string;
         remotePort?: number;
     };
+    body?: string;
     cookies?: Record<string, string>;
 } & T;
 type RouterRes<T = {}> = {
@@ -617,6 +625,7 @@ declare class ServerBase implements ServerType {
     cors: Cors$1;
     listeners: Listener[];
     emitter: EventEmitter$1<any>;
+    showConnected: boolean;
     constructor(opts?: ServerOpts);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
     listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -644,6 +653,7 @@ declare class ServerBase implements ServerType {
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): Promise<void>;
     onWsClose(ws: WS): Promise<void>;
+    sendConnected(ws: WS): Promise<void>;
 }
 
 type WsServerBaseOpts = {

package/dist/router.js

@@ -1215,10 +1215,12 @@ class ServerBase {
     cors;
     listeners = [];
     emitter = new EventEmitter();
+    showConnected = true;
     constructor(opts) {
         this.path = opts?.path || '/api/router';
         this.handle = opts?.handle;
         this.cors = opts?.cors;
+        this.showConnected = opts?.showConnected !== false;
     }
     listen(...args) {
         this.customListen(...args);
@@ -1323,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);
@@ -1343,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') {
@@ -1419,6 +1430,10 @@ class ServerBase {
             }, 5000);
         }
     }
+    async sendConnected(ws) {
+        if (this.showConnected)
+            ws.send(JSON.stringify({ type: 'connected' }));
+    }
 }
 
 function getDefaultExportFromCjs (x) {
@@ -6373,7 +6388,7 @@ class WsServerBase {
             ws.on('message', async (message) => {
                 await this.server.onWebSocket({ ws, message, pathname, token, id });
             });
-            ws.send(JSON.stringify({ type: 'connected' }));
+            this.server.sendConnected(ws);
             this.wss.on('close', () => {
                 this.server.onWsClose(ws);
             });
@@ -6538,7 +6553,7 @@ class BunServer extends ServerBase {
                     return new Response('WebSocket upgrade failed', { status: 400 });
                 }
                 // 将 Bun 的 Request 转换为 Node.js 风格的 req/res
-                return new Promise((resolve) => {
+                return new Promise(async (resolve) => {
                     const req = {
                         url: url.pathname + url.search,
                         method: request.method,
@@ -6547,6 +6562,11 @@ class BunServer extends ServerBase {
                             // @ts-ignore
                             remoteAddress: request?.remoteAddress || request?.ip || clientInfo?.address || '',
                             remotePort: clientInfo?.port || 0,
+                        },
+                        // @ts-ignore
+                        bun: {
+                            request, // 原始请求对象
+                            server, // 原始服务器对象
                         }
                     };
                     const res = {
@@ -6672,10 +6692,27 @@ class BunServer extends ServerBase {
                     };
                     // 处理请求体
                     if (request.method !== 'GET' && request.method !== 'HEAD') {
-                        request.text().then((body) => {
-                            req.body = body;
+                        const contentType = request.headers.get('content-type') || '';
+                        if (contentType.includes('application/json')) {
+                            const text = await request.text();
+                            req.body = text;
                             requestCallback(req, res);
-                        });
+                            return;
+                        }
+                        else if (contentType.includes('application/x-www-form-urlencoded')) {
+                            const formData = await request.formData();
+                            const body = {};
+                            for (const [key, value] of formData.entries()) {
+                                body[key] = value;
+                            }
+                            req.body = JSON.stringify(body);
+                            requestCallback(req, res);
+                            return;
+                        }
+                        else {
+                            requestCallback(req, res);
+                            return;
+                        }
                     }
                     else {
                         requestCallback(req, res);
@@ -6684,7 +6721,7 @@ class BunServer extends ServerBase {
             },
             websocket: {
                 open: (ws) => {
-                    ws.send(JSON.stringify({ type: 'connected' }));
+                    this.sendConnected(ws);
                 },
                 message: async (ws, message) => {
                     const pathname = ws.data.pathname || '';
@@ -11181,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.47",
+  "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

@@ -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, WS } from './server-type.ts';
+import { ServerType, Listener, OnListener, ServerOpts, OnWebSocketOptions, OnWebSocketFn, WebSocketListenerFun, 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;
@@ -64,11 +64,12 @@ export class ServerBase implements ServerType {
   cors: Cors;
   listeners: Listener[] = [];
   emitter = new EventEmitter();
+  showConnected = true;
   constructor(opts?: ServerOpts) {
     this.path = opts?.path || '/api/router';
     this.handle = opts?.handle;
     this.cors = opts?.cors;
-
+    this.showConnected = opts?.showConnected !== false;
   }
   listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
   listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -178,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);
         }
@@ -196,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));
       }
-      (listener.func as WebScoketListenerFun)({
+      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') {
@@ -275,4 +284,8 @@ export class ServerBase implements ServerType {
       }, 5000);
     }
   }
+  async sendConnected(ws: WS) {
+    if (this.showConnected)
+      ws.send(JSON.stringify({ type: 'connected' }));
+  }
 }

package/src/server/server-bun.ts

@@ -71,7 +71,7 @@ export class BunServer extends ServerBase implements ServerType {
         }
 
         // 将 Bun 的 Request 转换为 Node.js 风格的 req/res
-        return new Promise((resolve) => {
+        return new Promise(async (resolve) => {
           const req: RouterReq = {
             url: url.pathname + url.search,
             method: request.method,
@@ -80,6 +80,11 @@ export class BunServer extends ServerBase implements ServerType {
               // @ts-ignore
               remoteAddress: request?.remoteAddress || request?.ip || clientInfo?.address || '',
               remotePort: clientInfo?.port || 0,
+            },
+            // @ts-ignore
+            bun: {
+              request, // 原始请求对象
+              server,  // 原始服务器对象
             }
           };
 
@@ -212,10 +217,25 @@ export class BunServer extends ServerBase implements ServerType {
           };
           // 处理请求体
           if (request.method !== 'GET' && request.method !== 'HEAD') {
-            request.text().then((body) => {
-              (req as any).body = body;
+            const contentType = request.headers.get('content-type') || '';
+            if (contentType.includes('application/json')) {
+              const text = await request.text();
+              req.body = text;
               requestCallback(req, res);
-            });
+              return;
+            } else if (contentType.includes('application/x-www-form-urlencoded')) {
+              const formData = await request.formData();
+              const body: Record<string, any> = {};
+              for (const [key, value] of formData.entries()) {
+                body[key] = value;
+              }
+              req.body = JSON.stringify(body);
+              requestCallback(req, res);
+              return;
+            } else {
+              requestCallback(req, res);
+              return;
+            }
           } else {
             requestCallback(req, res);
           }
@@ -223,7 +243,7 @@ export class BunServer extends ServerBase implements ServerType {
       },
       websocket: {
         open: (ws: any) => {
-          ws.send(JSON.stringify({ type: 'connected' }));
+          this.sendConnected(ws);
         },
         message: async (ws: any, message: string | Buffer) => {
           const pathname = ws.data.pathname || '';

package/src/server/server-type.ts

@@ -16,6 +16,7 @@ export type ServerOpts<T = {}> = {
   handle?: (msg?: { path: string; key?: string;[key: string]: any }, ctx?: { req: http.IncomingMessage; res: http.ServerResponse }) => any;
   cors?: Cors;
   io?: boolean;
+  showConnected?: boolean;
 } & T;
 
 export interface ServerType {
@@ -39,12 +40,19 @@ export interface ServerType {
    */
   on(listener: OnListener): void;
   onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
-  onWsClose(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 = {
+export type WS<T = {}> = {
   send: (data: any) => void;
   close: (code?: number, reason?: string) => void;
   data?: {
@@ -56,22 +64,27 @@ export type WS = {
      * 鉴权后的获取的信息
      */
     userApp?: string;
-  }
+  } & T;
 }
 export type Listener = {
   id?: string;
   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;
@@ -89,6 +102,7 @@ export type RouterReq<T = {}> = {
     remoteAddress?: string;
     remotePort?: number;
   };
+  body?: string;
   cookies?: Record<string, string>;
 } & T;
 

package/src/server/ws-server.ts

@@ -60,7 +60,7 @@ export class WsServerBase {
       ws.on('message', async (message: string | Buffer) => {
         await this.server.onWebSocket({ ws, message, pathname, token, id });
       });
-      ws.send(JSON.stringify({ type: 'connected' }));
+      this.server.sendConnected(ws);
       this.wss.on('close', () => {
         this.server.onWsClose(ws);
       });

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 };