@kevisual/router 0.0.64 → 0.0.66

package/dist/opencode.d.ts

@@ -152,17 +152,28 @@ declare class Route<U = {
     addTo(router: QueryRouter | {
         add: (route: Route) => void;
         [key: string]: any;
-    }): void;
+    }, opts?: AddOpts): void;
     setData(data: any): this;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
+/**
+ * @parmas override 是否覆盖已存在的route，默认true
+ */
+type AddOpts = {
+    override?: boolean;
+};
 declare class QueryRouter {
     appId: string;
     routes: Route[];
     maxNextRoute: number;
     context?: RouteContext;
     constructor();
-    add(route: Route): void;
+    /**
+     * add route
+     * @param route
+     * @param opts
+     */
+    add(route: Route, opts?: AddOpts): void;
     /**
      * remove route by path and key
      * @param route
@@ -340,7 +351,7 @@ declare class QueryRouterServer extends QueryRouter {
     handle: any;
     constructor(opts?: QueryRouterServerOpts);
     setHandle(wrapperFn?: HandleFn, ctx?: RouteContext): void;
-    addRoute(route: Route): void;
+    addRoute(route: Route, opts?: AddOpts): void;
     Route: typeof Route;
     route(opts: RouteOpts): Route<Required<RouteContext>>;
     route(path: string, key?: string): Route<Required<RouteContext>>;
@@ -466,6 +477,12 @@ type RouterReq<T = {}> = {
     };
     body?: string;
     cookies?: Record<string, string>;
+    bun?: {
+        request: Bun.BunRequest;
+        server: Bun.Server<{}>;
+        resolve: (response: Response) => void;
+    };
+    on: (event: 'close', listener: Function) => void;
 } & T;
 type RouterRes<T = {}> = {
     statusCode: number;
@@ -477,7 +494,7 @@ type RouterRes<T = {}> = {
     setHeader: (name: string, value: string | string[]) => void;
     cookie: (name: string, value: string, options?: any) => void;
     write: (chunk: any) => void;
-    pipe: (stream: any) => void;
+    pipe: (stream: ReadableStream) => void;
     end: (data?: any) => void;
 } & T;
 
@@ -633,7 +650,7 @@ declare class App<U = {}> extends QueryRouter {
     listen(path: string, listeningListener?: () => void): void;
     listen(handle: any, backlog?: number, listeningListener?: () => void): void;
     listen(handle: any, listeningListener?: () => void): void;
-    addRoute(route: Route): void;
+    addRoute(route: Route, opts?: AddOpts): void;
     Route: typeof Route;
     route(opts: RouteOpts<AppRouteContext<U>>): Route<AppRouteContext<U>>;
     route(path: string, key?: string): Route<AppRouteContext<U>>;

package/dist/router-browser.d.ts

@@ -164,17 +164,28 @@ declare class Route<U = {
     addTo(router: QueryRouter | {
         add: (route: Route) => void;
         [key: string]: any;
-    }): void;
+    }, opts?: AddOpts): void;
     setData(data: any): this;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
+/**
+ * @parmas override 是否覆盖已存在的route，默认true
+ */
+type AddOpts = {
+    override?: boolean;
+};
 declare class QueryRouter {
     appId: string;
     routes: Route[];
     maxNextRoute: number;
     context?: RouteContext;
     constructor();
-    add(route: Route): void;
+    /**
+     * add route
+     * @param route
+     * @param opts
+     */
+    add(route: Route, opts?: AddOpts): void;
     /**
      * remove route by path and key
      * @param route
@@ -352,7 +363,7 @@ declare class QueryRouterServer extends QueryRouter {
     handle: any;
     constructor(opts?: QueryRouterServerOpts);
     setHandle(wrapperFn?: HandleFn, ctx?: RouteContext): void;
-    addRoute(route: Route): void;
+    addRoute(route: Route, opts?: AddOpts): void;
     Route: typeof Route;
     route(opts: RouteOpts): Route<Required<RouteContext>>;
     route(path: string, key?: string): Route<Required<RouteContext>>;

package/dist/router-browser.js

@@ -15033,8 +15033,8 @@ class Route {
         }
         return this;
     }
-    addTo(router) {
-        router.add(this);
+    addTo(router, opts) {
+        router.add(this, opts);
     }
     setData(data) {
         this.data = data;
@@ -15052,10 +15052,19 @@ class QueryRouter {
     constructor() {
         this.routes = [];
     }
-    add(route) {
+    /**
+     * add route
+     * @param route
+     * @param opts
+     */
+    add(route, opts) {
+        const override = opts?.override ?? true;
         const has = this.routes.findIndex((r) => r.path === route.path && r.key === route.key);
         if (has !== -1) {
-            // remove the old route
+            if (!override) {
+                return;
+            }
+            // 如果存在，且override为true，则覆盖
             this.routes.splice(has, 1);
         }
         this.routes.push(route);
@@ -15460,8 +15469,8 @@ class QueryRouterServer extends QueryRouter {
     setHandle(wrapperFn, ctx) {
         this.handle = this.getHandle(this, wrapperFn, ctx);
     }
-    addRoute(route) {
-        this.add(route);
+    addRoute(route, opts) {
+        this.add(route, opts);
     }
     Route = Route;
     route(...args) {

package/dist/router.d.ts

@@ -170,17 +170,28 @@ declare class Route<U = {
     addTo(router: QueryRouter | {
         add: (route: Route) => void;
         [key: string]: any;
-    }): void;
+    }, opts?: AddOpts): void;
     setData(data: any): this;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
+/**
+ * @parmas override 是否覆盖已存在的route，默认true
+ */
+type AddOpts = {
+    override?: boolean;
+};
 declare class QueryRouter {
     appId: string;
     routes: Route[];
     maxNextRoute: number;
     context?: RouteContext;
     constructor();
-    add(route: Route): void;
+    /**
+     * add route
+     * @param route
+     * @param opts
+     */
+    add(route: Route, opts?: AddOpts): void;
     /**
      * remove route by path and key
      * @param route
@@ -358,7 +369,7 @@ declare class QueryRouterServer extends QueryRouter {
     handle: any;
     constructor(opts?: QueryRouterServerOpts);
     setHandle(wrapperFn?: HandleFn, ctx?: RouteContext): void;
-    addRoute(route: Route): void;
+    addRoute(route: Route, opts?: AddOpts): void;
     Route: typeof Route;
     route(opts: RouteOpts): Route<Required<RouteContext>>;
     route(path: string, key?: string): Route<Required<RouteContext>>;
@@ -634,6 +645,12 @@ type RouterReq<T = {}> = {
     };
     body?: string;
     cookies?: Record<string, string>;
+    bun?: {
+        request: Bun.BunRequest;
+        server: Bun.Server<{}>;
+        resolve: (response: Response) => void;
+    };
+    on: (event: 'close', listener: Function) => void;
 } & T;
 type RouterRes<T = {}> = {
     statusCode: number;
@@ -645,7 +662,7 @@ type RouterRes<T = {}> = {
     setHeader: (name: string, value: string | string[]) => void;
     cookie: (name: string, value: string, options?: any) => void;
     write: (chunk: any) => void;
-    pipe: (stream: any) => void;
+    pipe: (stream: ReadableStream) => void;
     end: (data?: any) => void;
 } & T;
 
@@ -898,7 +915,7 @@ declare class App<U = {}> extends QueryRouter {
     listen(path: string, listeningListener?: () => void): void;
     listen(handle: any, backlog?: number, listeningListener?: () => void): void;
     listen(handle: any, listeningListener?: () => void): void;
-    addRoute(route: Route): void;
+    addRoute(route: Route, opts?: AddOpts): void;
     Route: typeof Route;
     route(opts: RouteOpts<AppRouteContext<U>>): Route<AppRouteContext<U>>;
     route(path: string, key?: string): Route<AppRouteContext<U>>;

package/dist/router.js

@@ -15057,8 +15057,8 @@ class Route {
         }
         return this;
     }
-    addTo(router) {
-        router.add(this);
+    addTo(router, opts) {
+        router.add(this, opts);
     }
     setData(data) {
         this.data = data;
@@ -15076,10 +15076,19 @@ class QueryRouter {
     constructor() {
         this.routes = [];
     }
-    add(route) {
+    /**
+     * add route
+     * @param route
+     * @param opts
+     */
+    add(route, opts) {
+        const override = opts?.override ?? true;
         const has = this.routes.findIndex((r) => r.path === route.path && r.key === route.key);
         if (has !== -1) {
-            // remove the old route
+            if (!override) {
+                return;
+            }
+            // 如果存在，且override为true，则覆盖
             this.routes.splice(has, 1);
         }
         this.routes.push(route);
@@ -15484,8 +15493,8 @@ class QueryRouterServer extends QueryRouter {
     setHandle(wrapperFn, ctx) {
         this.handle = this.getHandle(this, wrapperFn, ctx);
     }
-    addRoute(route) {
-        this.add(route);
+    addRoute(route, opts) {
+        this.add(route, opts);
     }
     Route = Route;
     route(...args) {
@@ -21467,6 +21476,7 @@ class BunServer extends ServerBase {
                 }
                 // 将 Bun 的 Request 转换为 Node.js 风格的 req/res
                 return new Promise(async (resolve) => {
+                    const reqListener = [];
                     const req = {
                         url: url.pathname + url.search,
                         method: request.method,
@@ -21476,12 +21486,29 @@ class BunServer extends ServerBase {
                             remoteAddress: request?.remoteAddress || request?.ip || clientInfo?.address || '',
                             remotePort: clientInfo?.port || 0,
                         },
-                        // @ts-ignore
+                        on: (event, listener) => {
+                            reqListener.push({ event, listener });
+                        },
                         bun: {
                             request, // 原始请求对象
                             server, // 原始服务器对象
+                            resolve
                         }
                     };
+                    const onClose = () => {
+                        reqListener.forEach(item => {
+                            if (item.event === 'close') {
+                                item.listener();
+                            }
+                        });
+                        reqListener.length = 0;
+                    };
+                    // 监听请求的取消事件
+                    if (request.signal) {
+                        request.signal.addEventListener('abort', () => {
+                            onClose();
+                        });
+                    }
                     const res = {
                         statusCode: 200,
                         headersSent: false,
@@ -21555,6 +21582,7 @@ class BunServer extends ServerBase {
                                         controller.enqueue(chunk);
                                     });
                                     stream.on('end', () => {
+                                        onClose();
                                         controller.close();
                                     });
                                     stream.on('error', (err) => {
@@ -21562,9 +21590,9 @@ class BunServer extends ServerBase {
                                     });
                                 },
                                 cancel() {
-                                    if (stream.destroy) {
-                                        stream.destroy();
-                                    }
+                                    // 只有NODE流才有destroy方法
+                                    // @ts-ignore
+                                    stream?.destroy?.();
                                 }
                             });
                             resolve(new Response(readableStream, {
@@ -21691,8 +21719,8 @@ class App extends QueryRouter {
         // @ts-ignore
         this.server.listen(...args);
     }
-    addRoute(route) {
-        super.add(route);
+    addRoute(route, opts) {
+        super.add(route, opts);
     }
     Route = Route;
     route(...args) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -28,7 +28,7 @@
     "@kevisual/local-proxy": "^0.0.8",
     "@kevisual/query": "^0.0.38",
     "@kevisual/use-config": "^1.0.28",
-    "@opencode-ai/plugin": "^1.1.44",
+    "@opencode-ai/plugin": "^1.1.47",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -102,4 +102,4 @@
       "require": "./src/modules/*"
     }
   }
-}
+}

package/src/app.ts

@@ -1,4 +1,4 @@
-import { QueryRouter, Route, RouteContext, RouteOpts } from './route.ts';
+import { AddOpts, QueryRouter, Route, RouteContext, RouteOpts } from './route.ts';
 import { ServerNode, ServerNodeOpts } from './server/server.ts';
 import { HandleCtx } from './server/server-base.ts';
 import { ServerType } from './server/server-type.ts';
@@ -64,8 +64,8 @@ export class App<U = {}> extends QueryRouter {
     // @ts-ignore
     this.server.listen(...args);
   }
-  addRoute(route: Route) {
-    super.add(route);
+  addRoute(route: Route, opts?: AddOpts) {
+    super.add(route, opts);
   }
 
   Route = Route;

package/src/route.ts

@@ -231,8 +231,8 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
     }
     return this;
   }
-  addTo(router: QueryRouter | { add: (route: Route) => void;[key: string]: any }) {
-    router.add(this);
+  addTo(router: QueryRouter | { add: (route: Route) => void;[key: string]: any }, opts?: AddOpts) {
+    router.add(this, opts);
   }
   setData(data: any) {
     this.data = data;
@@ -244,6 +244,10 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
   }
 }
 
+/**
+ * @parmas override 是否覆盖已存在的route，默认true
+ */
+export type AddOpts = { override?: boolean };
 export class QueryRouter {
   appId: string = '';
   routes: Route[];
@@ -252,11 +256,20 @@ export class QueryRouter {
   constructor() {
     this.routes = [];
   }
-
-  add(route: Route) {
+  /**
+   * add route
+   * @param route
+   * @param opts
+   */
+  add(route: Route, opts?: AddOpts) {
+    const override = opts?.override ?? true;
     const has = this.routes.findIndex((r) => r.path === route.path && r.key === route.key);
+
     if (has !== -1) {
-      // remove the old route
+      if (!override) {
+        return;
+      }
+      // 如果存在，且override为true，则覆盖
       this.routes.splice(has, 1);
     }
     this.routes.push(route);
@@ -664,8 +677,8 @@ export class QueryRouterServer extends QueryRouter {
   setHandle(wrapperFn?: HandleFn, ctx?: RouteContext) {
     this.handle = this.getHandle(this, wrapperFn, ctx);
   }
-  addRoute(route: Route) {
-    this.add(route);
+  addRoute(route: Route, opts?: AddOpts) {
+    this.add(route, opts);
   }
   Route = Route;
   route(opts: RouteOpts): Route<Required<RouteContext>>;

package/src/server/server-bun.ts

@@ -50,7 +50,7 @@ export class BunServer extends ServerBase implements ServerType {
       port,
       hostname,
       idleTimeout: 0, // 4 minutes idle timeout (max 255 seconds)
-      fetch: async (request: Bun.BunRequest, server: any) => {
+      fetch: async (request: Bun.BunRequest, server: Bun.Server<{}>) => {
         const host = request.headers.get('host') || 'localhost';
         const clientInfo = server.requestIP(request); // 返回 { address: string, port: number } 或 null
         const url = new URL(request.url, `http://${host}`);
@@ -72,6 +72,7 @@ export class BunServer extends ServerBase implements ServerType {
 
         // 将 Bun 的 Request 转换为 Node.js 风格的 req/res
         return new Promise(async (resolve) => {
+          const reqListener: { event: string; listener: Function }[] = [];
           const req: RouterReq = {
             url: url.pathname + url.search,
             method: request.method,
@@ -81,12 +82,29 @@ export class BunServer extends ServerBase implements ServerType {
               remoteAddress: request?.remoteAddress || request?.ip || clientInfo?.address || '',
               remotePort: clientInfo?.port || 0,
             },
-            // @ts-ignore
+            on: (event: string, listener: Function) => {
+              reqListener.push({ event, listener });
+            },
             bun: {
               request, // 原始请求对象
               server,  // 原始服务器对象
+              resolve
             }
           };
+          const onClose = () => {
+            reqListener.forEach(item => {
+              if (item.event === 'close') {
+                item.listener();
+              }
+            });
+            reqListener.length = 0;
+          }
+          // 监听请求的取消事件
+          if (request.signal) {
+            request.signal.addEventListener('abort', () => {
+              onClose();
+            });
+          }
 
           const res: RouterRes = {
             statusCode: 200,
@@ -143,7 +161,7 @@ export class BunServer extends ServerBase implements ServerType {
               if (callback) callback();
               return true;
             },
-            pipe(stream: any) {
+            pipe(stream: ReadableStream | NodeJS.ReadableStream) {
               this.writableEnded = true;
 
               // 如果是 ReadableStream，直接使用
@@ -164,6 +182,7 @@ export class BunServer extends ServerBase implements ServerType {
                     controller.enqueue(chunk);
                   });
                   stream.on('end', () => {
+                    onClose();
                     controller.close();
                   });
                   stream.on('error', (err: any) => {
@@ -171,9 +190,9 @@ export class BunServer extends ServerBase implements ServerType {
                   });
                 },
                 cancel() {
-                  if (stream.destroy) {
-                    stream.destroy();
-                  }
+                  // 只有NODE流才有destroy方法
+                  // @ts-ignore
+                  stream?.destroy?.();
                 }
               });
 

package/src/server/server-type.ts

@@ -104,6 +104,12 @@ export type RouterReq<T = {}> = {
   };
   body?: string;
   cookies?: Record<string, string>;
+  bun?: {
+    request: Bun.BunRequest;
+    server: Bun.Server<{}>;
+    resolve: (response: Response) => void;
+  }
+  on: (event: 'close', listener: Function) => void;
 } & T;
 
 export type RouterRes<T = {}> = {
@@ -116,6 +122,6 @@ export type RouterRes<T = {}> = {
   setHeader: (name: string, value: string | string[]) => void;
   cookie: (name: string, value: string, options?: any) => void;
   write: (chunk: any) => void;
-  pipe: (stream: any) => void;
+  pipe: (stream: ReadableStream) => void;
   end: (data?: any) => void;
 } & T;