@dangao/bun-server 1.5.0 → 1.7.0

package/dist/core/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/core/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1D;;OAEG;IACH,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAE7C;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,CAAkC;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAa;gBAElB,OAAO,EAAE,aAAa;IAIzC;;OAEG;IACI,KAAK,IAAI,IAAI;IA2FpB;;OAEG;IACI,IAAI,IAAI,IAAI;IAWnB;;;;;OAKG;IACU,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C9D;;OAEG;IACI,iBAAiB,IAAI,MAAM;IAIlC;;OAEG;IACI,mBAAmB,IAAI,OAAO;IAIrC;;;OAGG;IACI,SAAS,IAAI,MAAM,CAAC,uBAAuB,CAAC,GAAG,SAAS;IAI/D;;;OAGG;IACI,SAAS,IAAI,OAAO;IAI3B;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS;CAGzC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/core/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1D;;OAEG;IACH,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAE7C;;;OAGG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,CAAkC;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAa;gBAElB,OAAO,EAAE,aAAa;IAIzC;;OAEG;IACI,KAAK,IAAI,IAAI;IAoGpB;;OAEG;IACI,IAAI,IAAI,IAAI;IAWnB;;;;;OAKG;IACU,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C9D;;OAEG;IACI,iBAAiB,IAAI,MAAM;IAIlC;;OAEG;IACI,mBAAmB,IAAI,OAAO;IAIrC;;;OAGG;IACI,SAAS,IAAI,MAAM,CAAC,uBAAuB,CAAC,GAAG,SAAS;IAI/D;;;OAGG;IACI,SAAS,IAAI,OAAO;IAI3B;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS;CAGzC"}

package/dist/index.js

@@ -3264,8 +3264,14 @@ class BunServer {
           if (!this.options.websocketRegistry.hasGateway(url.pathname)) {
             return new Response("WebSocket gateway not found", { status: 404 });
           }
+          const context2 = new Context(request);
+          const queryParams = new URLSearchParams(url.searchParams);
           const upgraded = server.upgrade(request, {
-            data: { path: url.pathname }
+            data: {
+              path: url.pathname,
+              query: queryParams,
+              context: context2
+            }
           });
           if (upgraded) {
             return;
@@ -3291,14 +3297,14 @@ class BunServer {
         return responsePromise;
       },
       websocket: {
-        open: (ws) => {
-          this.options.websocketRegistry?.handleOpen(ws);
+        open: async (ws) => {
+          await this.options.websocketRegistry?.handleOpen(ws);
         },
-        message: (ws, message) => {
-          this.options.websocketRegistry?.handleMessage(ws, message);
+        message: async (ws, message) => {
+          await this.options.websocketRegistry?.handleMessage(ws, message);
         },
-        close: (ws, code, reason) => {
-          this.options.websocketRegistry?.handleClose(ws, code, reason);
+        close: async (ws, code, reason) => {
+          await this.options.websocketRegistry?.handleClose(ws, code, reason);
         }
       }
     });
@@ -3403,10 +3409,14 @@ function getHandlerMetadata(target) {
 }
 
 // src/websocket/registry.ts
+init_param_binder();
+init_decorators2();
 class WebSocketGatewayRegistry {
   static instance;
   container;
   gateways = new Map;
+  staticGateways = new Map;
+  dynamicGateways = [];
   constructor() {
     this.container = ControllerRegistry.getInstance().getContainer();
   }
@@ -3416,6 +3426,15 @@ class WebSocketGatewayRegistry {
     }
     return WebSocketGatewayRegistry.instance;
   }
+  parsePath(path) {
+    const paramNames = [];
+    const patternString = path.replace(/:([^/]+)/g, (_, paramName) => {
+      paramNames.push(paramName);
+      return "([^/]+)";
+    }).replace(/\*/g, ".*");
+    const pattern = new RegExp(`^${patternString}$`);
+    return { pattern, paramNames };
+  }
   register(gatewayClass) {
     const metadata = getGatewayMetadata(gatewayClass);
     if (!metadata) {
@@ -3428,62 +3447,153 @@ class WebSocketGatewayRegistry {
     if (!this.container.isRegistered(gatewayClass)) {
       this.container.register(gatewayClass);
     }
-    this.gateways.set(metadata.path, {
+    const { pattern, paramNames } = this.parsePath(metadata.path);
+    const isStatic = !metadata.path.includes(":") && !metadata.path.includes("*");
+    const definition = {
       path: metadata.path,
       gatewayClass,
-      handlers
-    });
+      handlers,
+      pattern,
+      paramNames,
+      isStatic
+    };
+    this.gateways.set(metadata.path, definition);
+    if (isStatic) {
+      this.staticGateways.set(metadata.path, definition);
+    } else {
+      this.dynamicGateways.push(definition);
+    }
   }
   hasGateway(path) {
-    return this.gateways.has(path);
+    if (this.staticGateways.has(path)) {
+      return true;
+    }
+    for (const gateway of this.dynamicGateways) {
+      if (gateway.pattern.test(path)) {
+        return true;
+      }
+    }
+    return false;
   }
   clear() {
     this.gateways.clear();
+    this.staticGateways.clear();
+    this.dynamicGateways.length = 0;
   }
   getGateway(path) {
-    return this.gateways.get(path);
-  }
-  getGatewayInstance(definition) {
-    if (!definition.instance) {
-      definition.instance = this.container.resolve(definition.gatewayClass);
+    const staticGateway = this.staticGateways.get(path);
+    if (staticGateway) {
+      return { definition: staticGateway, params: {} };
+    }
+    for (const gateway of this.dynamicGateways) {
+      const match = path.match(gateway.pattern);
+      if (match) {
+        const params = {};
+        for (let i = 0;i < gateway.paramNames.length; i++) {
+          params[gateway.paramNames[i]] = match[i + 1] ?? "";
+        }
+        return { definition: gateway, params };
+      }
     }
-    return definition.instance;
+    return;
+  }
+  createGatewayInstance(definition) {
+    return this.container.resolve(definition.gatewayClass);
   }
-  invokeHandler(ws, definition, handlerName, ...args) {
+  async invokeHandler(ws, definition, handlerName, ...args) {
     if (!handlerName) {
       return;
     }
-    const instance = this.getGatewayInstance(definition);
+    const instance = this.createGatewayInstance(definition);
     const handler = instance[handlerName];
-    if (typeof handler === "function") {
+    if (typeof handler !== "function") {
+      return;
+    }
+    const prototype = definition.gatewayClass.prototype;
+    const paramMetadata = getParamMetadata(prototype, handlerName);
+    if (paramMetadata.length > 0) {
+      let context = ws.data?.context;
+      if (!context) {
+        const url = new URL(ws.data.path || "/", "http://localhost");
+        if (ws.data.query) {
+          ws.data.query.forEach((value, key) => {
+            url.searchParams.set(key, value);
+          });
+        }
+        const request = new Request(url.toString(), {
+          method: "GET",
+          headers: new Headers
+        });
+        context = new Context(request);
+        if (ws.data.params) {
+          context.params = ws.data.params;
+        }
+        ws.data.context = context;
+      } else {
+        if (ws.data.params) {
+          context.params = ws.data.params;
+        }
+      }
+      const boundParams = await ParamBinder.bind(prototype, handlerName, context, this.container);
+      const finalArgs = [];
+      const maxParamIndex = paramMetadata.length > 0 ? Math.max(...paramMetadata.map((m) => m.index)) : -1;
+      const totalParamCount = Math.max(maxParamIndex + 1, args.length + 1);
+      for (let i = 0;i < totalParamCount; i++) {
+        const meta = paramMetadata.find((m) => m.index === i);
+        if (meta) {
+          finalArgs[i] = boundParams[i];
+        } else if (i === 0) {
+          finalArgs[i] = ws;
+        } else {
+          const argIndex = i - 1;
+          if (argIndex < args.length) {
+            finalArgs[i] = args[argIndex];
+          } else {
+            finalArgs[i] = undefined;
+          }
+        }
+      }
+      if (args.length > maxParamIndex) {
+        for (let i = maxParamIndex + 1;i < args.length; i++) {
+          finalArgs.push(args[i]);
+        }
+      }
+      handler.apply(instance, finalArgs);
+    } else {
       handler.apply(instance, [ws, ...args]);
     }
   }
-  handleOpen(ws) {
+  async handleOpen(ws) {
     const path = ws.data?.path;
-    const definition = path ? this.getGateway(path) : undefined;
-    if (!definition) {
+    const match = path ? this.getGateway(path) : undefined;
+    if (!match) {
       ws.close(1008, "Gateway not found");
       return;
     }
-    this.invokeHandler(ws, definition, definition.handlers.open);
+    if (match.params && Object.keys(match.params).length > 0) {
+      ws.data.params = match.params;
+    }
+    await this.invokeHandler(ws, match.definition, match.definition.handlers.open);
   }
-  handleMessage(ws, message) {
+  async handleMessage(ws, message) {
     const path = ws.data?.path;
-    const definition = path ? this.getGateway(path) : undefined;
-    if (!definition) {
+    const match = path ? this.getGateway(path) : undefined;
+    if (!match) {
       ws.close(1008, "Gateway not found");
       return;
     }
-    this.invokeHandler(ws, definition, definition.handlers.message, message);
+    if (match.params && Object.keys(match.params).length > 0 && !ws.data.params) {
+      ws.data.params = match.params;
+    }
+    await this.invokeHandler(ws, match.definition, match.definition.handlers.message, message);
   }
-  handleClose(ws, code, reason) {
+  async handleClose(ws, code, reason) {
     const path = ws.data?.path;
-    const definition = path ? this.getGateway(path) : undefined;
-    if (!definition) {
+    const match = path ? this.getGateway(path) : undefined;
+    if (!match) {
       return;
     }
-    this.invokeHandler(ws, definition, definition.handlers.close, code, reason);
+    await this.invokeHandler(ws, match.definition, match.definition.handlers.close, code, reason);
   }
 }
 

package/dist/websocket/registry.d.ts

@@ -1,22 +1,56 @@
 import type { ServerWebSocket } from 'bun';
+import { Context } from '../core/context';
 import type { Constructor } from '@/core/types';
 export interface WebSocketConnectionData {
     path: string;
+    query?: URLSearchParams;
+    context?: Context;
+    params?: Record<string, string>;
 }
 export declare class WebSocketGatewayRegistry {
     private static instance;
     private readonly container;
     private readonly gateways;
+    private readonly staticGateways;
+    private readonly dynamicGateways;
     private constructor();
     static getInstance(): WebSocketGatewayRegistry;
+    /**
+     * 解析路径，生成匹配模式和参数名列表
+     * @param path - 路由路径
+     * @returns 匹配模式和参数名列表
+     */
+    private parsePath;
     register(gatewayClass: Constructor<unknown>): void;
+    /**
+     * 检查是否有匹配的网关（支持动态路径匹配）
+     * @param path - 请求路径
+     * @returns 是否有匹配的网关
+     */
     hasGateway(path: string): boolean;
     clear(): void;
+    /**
+     * 获取匹配的网关（支持动态路径匹配）
+     * @param path - 请求路径
+     * @returns 匹配的网关定义和路径参数
+     */
     private getGateway;
-    private getGatewayInstance;
+    /**
+     * 动态创建网关实例（每次连接创建新实例）
+     * @param definition - 网关定义
+     * @returns 网关实例
+     */
+    private createGatewayInstance;
+    /**
+     * 调用处理器，支持参数绑定
+     * @param ws - WebSocket 连接
+     * @param definition - 网关定义
+     * @param handlerName - 处理器方法名
+     * @param args - 原始参数（message, code, reason 等，不包括 ws）
+     */
     private invokeHandler;
-    handleOpen(ws: ServerWebSocket<WebSocketConnectionData>): void;
-    handleMessage(ws: ServerWebSocket<WebSocketConnectionData>, message: string | ArrayBuffer | ArrayBufferView): void;
-    handleClose(ws: ServerWebSocket<WebSocketConnectionData>, code: number, reason: string): void;
+    handleOpen(ws: ServerWebSocket<WebSocketConnectionData>): Promise<void>;
+    handleMessage(ws: ServerWebSocket<WebSocketConnectionData>, message: string | ArrayBuffer | ArrayBufferView): Promise<void>;
+    handleClose(ws: ServerWebSocket<WebSocketConnectionData>, code: number, reason: string): Promise<void>;
 }
 //# sourceMappingURL=registry.d.ts.map

package/dist/websocket/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/websocket/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAK3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAa/C,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IAEjE,OAAO;WAIO,WAAW,IAAI,wBAAwB;IAO9C,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI;IAsBlD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC,KAAK,IAAI,IAAI;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,aAAa;IAgBd,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,IAAI;IAU9D,aAAa,CAClB,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAC5C,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAC9C,IAAI;IAUA,WAAW,CAChB,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAC5C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,IAAI;CAQR"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/websocket/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAO3C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAehD,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IACjE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwC;IACvE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2B;IAE3D,OAAO;WAIO,WAAW,IAAI,wBAAwB;IAOrD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAaV,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI;IAsCzD;;;;OAIG;IACI,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAgBjC,KAAK,IAAI,IAAI;IAMpB;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAuBlB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAI7B;;;;;;OAMG;YACW,aAAa;IA0Gd,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcvE,aAAa,CACxB,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAC5C,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAC9C,OAAO,CAAC,IAAI,CAAC;IAcH,WAAW,CACtB,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAC5C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;CAQjB"}

package/docs/zh/guide.md

@@ -6,7 +6,7 @@
 
 ```ts
 import "reflect-metadata";
-import { Application } from "../src";
+import { Application } from "@dangao/bun-server";
 
 const app = new Application({ port: 3000 });
 app.listen();
@@ -26,7 +26,7 @@ import {
   Injectable,
   Param,
   POST,
-} from "../src";
+} from "@dangao/bun-server";
 
 @Injectable()
 class UserService {
@@ -64,7 +64,7 @@ app.listen();
 ## 3. 使用中间件
 
 ```ts
-import { createCorsMiddleware, createLoggerMiddleware } from "../src";
+import { createCorsMiddleware, createLoggerMiddleware } from "@dangao/bun-server";
 
 const app = new Application();
 app.use(createLoggerMiddleware({ prefix: "[Example]" }));
@@ -74,7 +74,7 @@ app.use(createCorsMiddleware({ origin: "*" }));
 `@UseMiddleware()` 可作用于单个控制器或方法：
 
 ```ts
-import { UseMiddleware } from '../src';
+import { UseMiddleware } from "@dangao/bun-server";
 
 const auth = async (ctx, next) => {
   if (ctx.getHeader('authorization') !== 'token') {
@@ -92,7 +92,7 @@ class SecureController { ... }
 ## 4. 参数验证
 
 ```ts
-import { Validate, IsEmail, MinLength } from '../src';
+import { Validate, IsEmail, MinLength } from "@dangao/bun-server";
 
 @POST('/register')
 public register(
@@ -108,32 +108,37 @@ public register(
 ## 5. WebSocket 网关
 
 ```ts
-import { OnMessage, WebSocketGateway } from "../src";
+import { OnMessage, WebSocketGateway } from "@dangao/bun-server";
+import type { ServerWebSocket } from "bun";
 
-@WebSocketGateway("/ws/chat")
+@WebSocketGateway("/ws")
 class ChatGateway {
   @OnMessage
-  public onMessage(ws, message: string) {
-    ws.send(`echo: ${message}`);
+  public handleMessage(ws: ServerWebSocket, message: string) {
+    ws.send(`Echo: ${message}`);
   }
 }
 
+const app = new Application({ port: 3000 });
 app.registerWebSocketGateway(ChatGateway);
+app.listen();
 ```
 
 ## 6. 文件上传与静态资源
 
 ```ts
-import { createFileUploadMiddleware, createStaticFileMiddleware } from "../src";
+import {
+  createFileUploadMiddleware,
+  createStaticFileMiddleware,
+} from "@dangao/bun-server";
 
+const app = new Application({ port: 3000 });
+
+// File upload
 app.use(createFileUploadMiddleware({ maxSize: 5 * 1024 * 1024 }));
-app.use(
-  createStaticFileMiddleware({
-    root: "./public",
-    prefix: "/assets",
-    enableCache: true,
-  }),
-);
+
+// Static files
+app.use(createStaticFileMiddleware({ root: "./public", prefix: "/assets" }));
 ```
 
 上传后的文件可在 `context.body.files` 中读取；静态资源请求会自动设置
@@ -142,7 +147,7 @@ Content-Type 与缓存头。
 ## 7. 错误处理与自定义过滤器
 
 ```ts
-import { ExceptionFilterRegistry, HttpException } from "../src";
+import { ExceptionFilterRegistry, HttpException } from "@dangao/bun-server";
 
 ExceptionFilterRegistry.getInstance().register({
   catch(error, context) {

package/docs/zh/migration.md

@@ -63,9 +63,15 @@
 
 - 将原本在 `Bun.serve({ websocket })` 中手写的逻辑迁移到 `@WebSocketGateway`：
   ```ts
-  @WebSocketGateway('/ws/chat')
+  import { OnMessage, WebSocketGateway } from "@dangao/bun-server";
+  import type { ServerWebSocket } from "bun";
+
+  @WebSocketGateway('/ws')
   class ChatGateway {
-    @OnMessage onMessage(ws, msg) { ws.send(msg); }
+    @OnMessage
+    public handleMessage(ws: ServerWebSocket, message: string) {
+      ws.send(`Echo: ${message}`);
+    }
   }
   app.registerWebSocketGateway(ChatGateway);
   ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dangao/bun-server",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/core/server.ts

@@ -86,11 +86,20 @@ export class BunServer {
           upgradeHeader.toLowerCase() === "websocket"
         ) {
           const url = new URL(request.url);
+          // 检查是否有匹配的网关（支持动态路径匹配）
           if (!this.options.websocketRegistry.hasGateway(url.pathname)) {
             return new Response("WebSocket gateway not found", { status: 404 });
           }
+          // 创建 Context 以便在 WebSocket 处理器中使用
+          const context = new Context(request);
+          // 创建 Bun 兼容的 URLSearchParams（需要 toJSON 方法）
+          const queryParams = new URLSearchParams(url.searchParams);
           const upgraded = server.upgrade(request, {
-            data: { path: url.pathname },
+            data: {
+              path: url.pathname,
+              query: queryParams,
+              context,
+            },
           });
           if (upgraded) {
             return undefined;
@@ -128,14 +137,14 @@ export class BunServer {
         return responsePromise;
       },
       websocket: {
-        open: (ws) => {
-          this.options.websocketRegistry?.handleOpen(ws);
+        open: async (ws) => {
+          await this.options.websocketRegistry?.handleOpen(ws);
         },
-        message: (ws, message) => {
-          this.options.websocketRegistry?.handleMessage(ws, message);
+        message: async (ws, message) => {
+          await this.options.websocketRegistry?.handleMessage(ws, message);
         },
-        close: (ws, code, reason) => {
-          this.options.websocketRegistry?.handleClose(ws, code, reason);
+        close: async (ws, code, reason) => {
+          await this.options.websocketRegistry?.handleClose(ws, code, reason);
         },
       },
     });