@kevisual/router 0.0.46 → 0.0.48

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';
@@ -405,13 +405,14 @@ type ServerOpts<T = {}> = {
     }) => any;
     cors?: Cors$2;
     io?: boolean;
+    showConnected?: boolean;
 } & T;
 interface ServerType {
     path?: string;
     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;
@@ -428,6 +429,7 @@ interface ServerType {
     on(listener: OnListener): void;
     onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
     onWsClose(ws: WS): void;
+    sendConnected(ws: WS): void;
 }
 type OnWebSocketOptions = {
     ws: WS;
@@ -437,7 +439,7 @@ type OnWebSocketOptions = {
     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,15 +451,15 @@ type WS = {
          * 鉴权后的获取的信息
          */
         userApp?: string;
-    };
+    } & T;
 };
-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;
@@ -470,8 +472,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;
@@ -480,6 +482,7 @@ type RouterReq<T = {}> = {
         remoteAddress?: string;
         remotePort?: number;
     };
+    body?: string;
     cookies?: Record<string, string>;
 } & T;
 type RouterRes<T = {}> = {
@@ -615,8 +618,9 @@ declare class ServerBase implements ServerType {
     handle: ServerOpts['handle'];
     _callback: any;
     cors: Cors$1;
-    listeners: Listener$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,25 +648,15 @@ 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 = {
     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);
@@ -689,7 +683,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);
@@ -936,4 +930,4 @@ declare class App<U = {}> {
 }
 
 export { App, Connect, CustomError, Mini, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, ServerNode, createSchema, define, handleServer, util };
-export type { Listener$1 as Listener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, WS, WebSocketReq, WebSocketRes };
+export type { HttpListenerFun, Listener, OnListener, OnWebSocketFn, RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, RouterReq, RouterRes, Rule, Run, Schema, WS, WebSocketListenerFun, WebSocketReq, WebSocketRes };

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);
@@ -1261,9 +1263,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 +1326,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 +1350,7 @@ class ServerBase {
             const end = (data) => {
                 ws.send(JSON.stringify(data));
             };
-            listener.fun({
+            listener.func({
                 emitter: this.emitter,
                 data,
                 token,
@@ -1419,6 +1421,10 @@ class ServerBase {
             }, 5000);
         }
     }
+    async sendConnected(ws) {
+        if (this.showConnected)
+            ws.send(JSON.stringify({ type: 'connected' }));
+    }
 }
 
 function getDefaultExportFromCjs (x) {
@@ -6340,7 +6346,6 @@ var WebSocketServer = /*@__PURE__*/getDefaultExportFromCjs(websocketServerExport
 // @ts-type=ws
 class WsServerBase {
     wss;
-    listeners = [];
     listening = false;
     server;
     constructor(opts) {
@@ -6374,7 +6379,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);
             });
@@ -6539,7 +6544,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,
@@ -6548,6 +6553,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 = {
@@ -6673,10 +6683,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);
@@ -6685,7 +6712,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 || '';

package/package.json

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

package/src/index.ts

@@ -21,5 +21,14 @@ export * from './router-define.ts';
 
 
 export {
-  RouterReq, RouterRes, OnWebSocketFn, WS, WebSocketReq, WebSocketRes, Listener,
+  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, 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;
@@ -119,9 +120,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 +180,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 +203,7 @@ export class ServerBase implements ServerType {
       const end = (data: any) => {
         ws.send(JSON.stringify(data));
       }
-      (listener.fun as WebScoketListenerFun)({
+      (listener.func as WebSocketListenerFun)({
         emitter: this.emitter,
         data,
         token,
@@ -275,4 +276,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 {
@@ -40,11 +41,12 @@ export interface ServerType {
   on(listener: OnListener): void;
   onWebSocket({ ws, message, pathname, token, id }: OnWebSocketOptions): void;
   onWsClose(ws: WS): void;
+  sendConnected(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;
-export type WS = {
+export type WS<T = {}> = {
   send: (data: any) => void;
   close: (code?: number, reason?: string) => void;
   data?: {
@@ -56,16 +58,16 @@ export type WS = {
      * 鉴权后的获取的信息
      */
     userApp?: string;
-  }
+  } & T;
 }
 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 = {
@@ -79,7 +81,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;
@@ -89,6 +91,7 @@ export type RouterReq<T = {}> = {
     remoteAddress?: string;
     remotePort?: number;
   };
+  body?: string;
   cookies?: Record<string, string>;
 } & T;
 

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;
 
@@ -61,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);
       });