@kevisual/router 0.0.41 → 0.0.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -20,6 +20,7 @@
   "keywords": [],
   "author": "abearxiong",
   "license": "MIT",
+  "packageManager": "pnpm@10.26.0",
   "devDependencies": {
     "@kevisual/local-proxy": "^0.0.8",
     "@kevisual/query": "^0.0.32",
@@ -27,6 +28,7 @@
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
+    "@types/bun": "^1.3.5",
     "@types/node": "^25.0.3",
     "@types/send": "^1.2.1",
     "@types/ws": "^8.18.1",
@@ -38,6 +40,7 @@
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
@@ -96,4 +99,4 @@
       "require": "./src/*"
     }
   }
-}
+}

package/src/app.ts

@@ -1,20 +1,21 @@
 import { QueryRouter, Route, RouteContext, RouteOpts } from './route.ts';
-import { Server, ServerOpts, HandleCtx } from './server/server.ts';
-import { WsServer } from './server/ws-server.ts';
+import { ServerNode, ServerNodeOpts } from './server/server.ts';
+import { HandleCtx } from './server/server-base.ts';
+import { ServerType } from './server/server-type.ts';
 import { CustomError } from './result/error.ts';
 import { handleServer } from './server/handle-server.ts';
 import { IncomingMessage, ServerResponse } from 'http';
+import { isBun } from './utils/is-engine.ts';
+import { BunServer } from './server/server-bun.ts';
 
 type RouterHandle = (msg: { path: string;[key: string]: any }) => { code: string; data?: any; message?: string;[key: string]: any };
 type AppOptions<T = {}> = {
   router?: QueryRouter;
-  server?: Server;
+  server?: ServerType;
   /** handle msg 关联 */
   routerHandle?: RouterHandle;
   routerContext?: RouteContext<T>;
-  serverOptions?: ServerOpts;
-  io?: boolean;
-  ioOpts?: { routerHandle?: RouterHandle; routerContext?: RouteContext<T>; path?: string };
+  serverOptions?: ServerNodeOpts;
 };
 
 export type AppRouteContext<T = {}> = HandleCtx & RouteContext<T> & { app: App<T> };
@@ -25,18 +26,22 @@ export type AppRouteContext<T = {}> = HandleCtx & RouteContext<T> & { app: App<T
  */
 export class App<U = {}> {
   router: QueryRouter;
-  server: Server;
-  io: WsServer;
+  server: ServerType;
   constructor(opts?: AppOptions<U>) {
     const router = opts?.router || new QueryRouter();
-    const server = opts?.server || new Server(opts?.serverOptions || {});
+    let server = opts?.server;
+    if (!server) {
+      const serverOptions = opts?.serverOptions || {};
+      if (!isBun) {
+        server = new ServerNode(serverOptions)
+      } else {
+        server = new BunServer(serverOptions)
+      }
+    }
     server.setHandle(router.getHandle(router, opts?.routerHandle, opts?.routerContext));
     router.setContext({ needSerialize: true, ...opts?.routerContext });
     this.router = router;
     this.server = server;
-    if (opts?.io) {
-      this.io = new WsServer(server, opts?.ioOpts);
-    }
   }
   listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): void;
   listen(port: number, hostname?: string, listeningListener?: () => void): void;
@@ -49,9 +54,6 @@ export class App<U = {}> {
   listen(...args: any[]) {
     // @ts-ignore
     this.server.listen(...args);
-    if (this.io) {
-      this.io.listen();
-    }
   }
   use(path: string, fn: (ctx: any) => any, opts?: RouteOpts) {
     const route = new Route(path, '', opts);
@@ -130,7 +132,10 @@ export class App<U = {}> {
     if (!this.server) {
       throw new Error('Server is not initialized');
     }
-    this.server.on(fn);
+    this.server.on({
+      id: 'app-request-listener',
+      fun: fn
+    });
   }
 }
 

package/src/index.ts

@@ -5,7 +5,7 @@ export type { RouteContext, RouteOpts, RouteMiddleware } from './route.ts';
 
 export type { Run } from './route.ts';
 
-export { Server, handleServer } from './server/index.ts';
+export { ServerNode, handleServer } from './server/index.ts';
 /**
  * 自定义错误
  */
@@ -13,8 +13,11 @@ export { CustomError } from './result/error.ts';
 
 export { createSchema } from './validator/index.ts';
 
-export type { Rule, Schema,  } from './validator/index.ts';
+export type { Rule, Schema, } from './validator/index.ts';
 
 export { App } from './app.ts';
 
 export * from './router-define.ts';
+
+
+export { RouterReq, RouterRes } from './server/server-type.ts';

package/src/router-simple.ts

@@ -62,6 +62,7 @@ export class SimpleRouter {
   }
   isSse(req: Req) {
     const { headers } = req;
+    if (!headers) return false;
     if (headers['accept'] && headers['accept'].includes('text/event-stream')) {
       return true;
     }

package/src/server/handle-server.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { parseBody } from './parse-body.ts';
 import url from 'node:url';
-import { createHandleCtx } from './server.ts';
+import { createHandleCtx } from './server-base.ts';
 
 /**
  * get params and body

package/src/server/index.ts

@@ -1,2 +1,3 @@
-export { Server } from './server.ts';
+export { ServerNode } from './server.ts';
+export { BunServer } from './server-bun.ts';
 export { handleServer } from './handle-server.ts';

package/src/server/parse-body.ts

@@ -1,7 +1,49 @@
 import type { IncomingMessage } from 'node:http';
 import url from 'node:url';
-
+import { isBun } from '../utils/is-engine.ts';
 export const parseBody = async <T = Record<string, any>>(req: IncomingMessage) => {
+  const resolveBody = (body: string) => {
+    // 获取 Content-Type 头信息
+    const contentType = req.headers['content-type'] || '';
+    const resolve = (data: T) => {
+      return data;
+    }
+    // 处理 application/json
+    if (contentType.includes('application/json')) {
+      return resolve(JSON.parse(body) as T);
+    }
+    // 处理 application/x-www-form-urlencoded
+    if (contentType.includes('application/x-www-form-urlencoded')) {
+      const formData = new URLSearchParams(body);
+      const result: Record<string, any> = {};
+
+      formData.forEach((value, key) => {
+        // 尝试将值解析为 JSON，如果失败则保留原始字符串
+        try {
+          result[key] = JSON.parse(value);
+        } catch {
+          result[key] = value;
+        }
+      });
+
+      return resolve(result as T);
+    }
+
+    // 默认尝试 JSON 解析
+    try {
+      return resolve(JSON.parse(body) as T);
+    } catch {
+      return resolve({} as T);
+    }
+  }
+  if (isBun) {
+    // @ts-ignore
+    const body = req.body;
+    if (body) {
+      return resolveBody(body)
+    }
+    return {} as T;
+  }
   return new Promise<T>((resolve, reject) => {
     const arr: any[] = [];
     req.on('data', (chunk) => {
@@ -10,39 +52,8 @@ export const parseBody = async <T = Record<string, any>>(req: IncomingMessage) =
     req.on('end', () => {
       try {
         const body = Buffer.concat(arr).toString();
+        resolve(resolveBody(body));
 
-        // 获取 Content-Type 头信息
-        const contentType = req.headers['content-type'] || '';
-
-        // 处理 application/json
-        if (contentType.includes('application/json')) {
-          resolve(JSON.parse(body) as T);
-          return;
-        }
-        // 处理 application/x-www-form-urlencoded
-        if (contentType.includes('application/x-www-form-urlencoded')) {
-          const formData = new URLSearchParams(body);
-          const result: Record<string, any> = {};
-
-          formData.forEach((value, key) => {
-            // 尝试将值解析为 JSON，如果失败则保留原始字符串
-            try {
-              result[key] = JSON.parse(value);
-            } catch {
-              result[key] = value;
-            }
-          });
-
-          resolve(result as T);
-          return;
-        }
-
-        // 默认尝试 JSON 解析
-        try {
-          resolve(JSON.parse(body) as T);
-        } catch {
-          resolve({} as T);
-        }
       } catch (e) {
         resolve({} as T);
       }

package/src/server/server-base.ts

@@ -0,0 +1,265 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { handleServer } from './handle-server.ts';
+import * as cookie from './cookie.ts';
+import { ServerType, Listener, OnListener, ServerOpts } from './server-type.ts';
+import { parseIfJson } from '../utils/parse.ts';
+
+type CookieFn = (name: string, value: string, options?: cookie.SerializeOptions, end?: boolean) => void;
+
+export type HandleCtx = {
+  req: IncomingMessage & { cookies: Record<string, string> };
+  res: ServerResponse & {
+    /**
+     * cookie 函数， end 参数用于设置是否立即设置到响应头，设置了后面的cookie再设置会覆盖前面的
+     */
+    cookie: CookieFn; //
+  };
+};
+// 实现函数
+export function createHandleCtx(req: IncomingMessage, res: ServerResponse): HandleCtx {
+  // 用于存储所有的 Set-Cookie 字符串
+  const cookies: string[] = [];
+  let handReq = req as HandleCtx['req'];
+  let handRes = res as HandleCtx['res'];
+  // 扩展 res.cookie 方法
+  const cookieFn: CookieFn = (name, value, options = {}, end = true) => {
+    // 序列化新的 Cookie
+    const serializedCookie = cookie.serialize(name, value, options);
+    cookies.push(serializedCookie); // 将新的 Cookie 添加到数组
+    if (end) {
+      // 如果设置了 end 参数，则立即设置到响应头
+      res.setHeader('Set-Cookie', cookies);
+    }
+  };
+  // 解析请求中的现有 Cookie
+  const parsedCookies = cookie.parse(req.headers.cookie || '');
+  handReq.cookies = parsedCookies;
+  handRes.cookie = cookieFn;
+  // 返回扩展的上下文
+  return {
+    req: handReq,
+    res: handRes,
+  };
+}
+export type Cors = {
+  /**
+   * @default '*''
+   */
+  origin?: string | undefined;
+};
+
+export const resultError = (error: string, code = 500) => {
+  const r = {
+    code: code,
+    message: error,
+  };
+  return JSON.stringify(r);
+};
+
+export class ServerBase implements ServerType {
+  path = '/api/router';
+  _server: any;
+  handle: ServerOpts['handle'];
+  _callback: any;
+  cors: Cors;
+  listeners: Listener[] = [];
+  constructor(opts?: ServerOpts) {
+    this.path = opts?.path || '/api/router';
+    this.handle = opts?.handle;
+    this.cors = opts?.cors;
+
+  }
+  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;
+  listen(port: number, listeningListener?: () => void): void;
+  listen(path: string, backlog?: number, listeningListener?: () => void): void;
+  listen(path: string, listeningListener?: () => void): void;
+  listen(handle: any, backlog?: number, listeningListener?: () => void): void;
+  listen(handle: any, listeningListener?: () => void): void;
+  listen(...args: any[]) {
+    this.customListen(...args);
+  }
+  /**
+   * child class can custom listen method
+   * @param args 
+   */
+  customListen(...args: any[]) {
+    console.error('Please use createServer to create server instance');
+  }
+  get handleServer() {
+    return this._callback;
+  }
+  set handleServer(fn: any) {
+    this._callback = fn;
+  }
+  get callback() {
+    return this._callback || this.createCallback();
+  }
+  get server() {
+    return this._server;
+  }
+  setHandle(handle?: any) {
+    this.handle = handle;
+  }
+  /**
+   * get callback
+   * @returns
+   */
+  createCallback() {
+    const path = this.path;
+    const handle = this.handle;
+    const cors = this.cors;
+    const that = this;
+    const _callback = async (req: IncomingMessage, res: ServerResponse) => {
+      // only handle /api/router
+      if (req.url === '/favicon.ico') {
+        return;
+      }
+      const listeners = that.listeners || [];
+      for (const item of listeners) {
+        const fun = item.fun;
+        if (typeof fun === 'function' && !item.io) {
+          await fun(req, res);
+        }
+      }
+      if (res.headersSent) {
+        // 程序已经在其他地方响应了
+        return;
+      }
+      if (!req.url.startsWith(path)) {
+        // 判断不是当前路径的请求，交给其他监听处理
+        return;
+      }
+      if (cors) {
+        res.setHeader('Access-Control-Allow-Origin', cors?.origin || '*'); // 允许所有域名的请求访问，可以根据需要设置具体的域名
+        res.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization');
+        res.setHeader('Access-Control-Allow-Methods', 'GET, POST');
+        if (req.method === 'OPTIONS') {
+          res.end();
+          return;
+        }
+      }
+      const url = req.url;
+      if (!url.startsWith(path)) {
+        res.end(resultError(`not path:[${path}]`));
+        return;
+      }
+      const messages = await handleServer(req, res);
+      if (!handle) {
+        res.end(resultError('no handle'));
+        return;
+      }
+      try {
+        const end = await handle(messages as any, { req, res });
+        if (res.writableEnded) {
+          // 如果响应已经结束，则不进行任何操作
+          return;
+        }
+        res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        if (typeof end === 'string') {
+          res.end(end);
+        } else {
+          res.end(JSON.stringify(end));
+        }
+      } catch (e) {
+        console.error(e);
+        res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        if (e.code && typeof e.code === 'number') {
+          res.end(resultError(e.message || `Router Server error`, e.code));
+        } else {
+          res.end(resultError('Router Server error'));
+        }
+      }
+    };
+    this._callback = _callback;
+    return _callback;
+  }
+  on(listener: OnListener) {
+    this.listeners = [];
+    if (typeof listener === 'function') {
+      this.listeners.push({ fun: listener });
+      return;
+    }
+    if (Array.isArray(listener)) {
+      for (const item of listener) {
+        if (typeof item === 'function') {
+          this.listeners.push({ fun: item });
+        } else {
+          this.listeners.push(item);
+        }
+      }
+    } else {
+      this.listeners.push(listener);
+    }
+  }
+  async onWebSocket({ ws, message, pathname, token, id }) {
+    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.fun({
+        data,
+        token,
+        id,
+        ws,
+      }, { end });
+      return;
+    }
+
+    if (typeof data === 'string') {
+      const cleanMessage = data.trim().replace(/^["']|["']$/g, '');
+      if (cleanMessage === 'close') {
+        ws.close();
+        return;
+      }
+      if (cleanMessage === 'ping') {
+        ws.send('pong');
+        return;
+      }
+    }
+
+    const { type, data: typeData, ...rest } = data;
+    if (!type) {
+      ws.send(JSON.stringify({ code: 500, message: 'type is required' }));
+      return;
+    }
+
+    const res = {
+      type,
+      data: {} as any,
+      ...rest,
+    };
+    const end = (data: any, all?: Record<string, any>) => {
+      const result = {
+        ...res,
+        data,
+        ...all,
+      };
+      ws.send(JSON.stringify(result));
+    };
+
+
+    // 调用 handle 处理消息
+    if (type === 'router' && this.handle) {
+      try {
+        const result = await this.handle(typeData as any);
+        end(result);
+      } catch (e: any) {
+        if (e.code && typeof e.code === 'number') {
+          end({
+            code: e.code,
+            message: e.message,
+          });
+        } else {
+          end({ code: 500, message: 'Router Server error' });
+        }
+      }
+    } else {
+      end({ code: 500, message: `${type} server is error` });
+    }
+  }
+}