@dangao/bun-server 1.6.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;IAmGpB;;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

@@ -3415,6 +3415,8 @@ class WebSocketGatewayRegistry {
   static instance;
   container;
   gateways = new Map;
+  staticGateways = new Map;
+  dynamicGateways = [];
   constructor() {
     this.container = ControllerRegistry.getInstance().getContainer();
   }
@@ -3424,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) {
@@ -3436,20 +3447,55 @@ 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);
+    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;
   }
   createGatewayInstance(definition) {
     return this.container.resolve(definition.gatewayClass);
@@ -3479,7 +3525,14 @@ class WebSocketGatewayRegistry {
           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 = [];
@@ -3512,29 +3565,35 @@ class WebSocketGatewayRegistry {
   }
   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;
     }
-    await 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);
   }
   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;
     }
-    await 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);
   }
   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;
     }
-    await 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

@@ -5,16 +5,35 @@ 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;
     /**
      * 动态创建网关实例（每次连接创建新实例）

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;AAO3C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAYhD,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;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;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAI7B;;;;;;OAMG;YACW,aAAa;IAiGd,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvE,aAAa,CACxB,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAC5C,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAC9C,OAAO,CAAC,IAAI,CAAC;IAUH,WAAW,CACtB,EAAE,EAAE,eAAe,CAAC,uBAAuB,CAAC,EAC5C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;CAQjB"}
+{"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/package.json

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

package/src/core/server.ts

@@ -86,6 +86,7 @@ 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 });
           }

package/src/websocket/registry.ts

@@ -16,18 +16,24 @@ interface GatewayDefinition {
     message?: string;
     close?: string;
   };
+  pattern: RegExp;
+  paramNames: string[];
+  isStatic: boolean;
 }
 
 export interface WebSocketConnectionData {
   path: string;
   query?: URLSearchParams;
   context?: Context;
+  params?: Record<string, string>;
 }
 
 export class WebSocketGatewayRegistry {
   private static instance: WebSocketGatewayRegistry;
   private readonly container: Container;
   private readonly gateways = new Map<string, GatewayDefinition>();
+  private readonly staticGateways = new Map<string, GatewayDefinition>();
+  private readonly dynamicGateways: GatewayDefinition[] = [];
 
   private constructor() {
     this.container = ControllerRegistry.getInstance().getContainer();
@@ -40,6 +46,24 @@ export class WebSocketGatewayRegistry {
     return WebSocketGatewayRegistry.instance;
   }
 
+  /**
+   * 解析路径，生成匹配模式和参数名列表
+   * @param path - 路由路径
+   * @returns 匹配模式和参数名列表
+   */
+  private parsePath(path: string): { pattern: RegExp; paramNames: string[] } {
+    const paramNames: string[] = [];
+    const patternString = path
+      .replace(/:([^/]+)/g, (_, paramName) => {
+        paramNames.push(paramName);
+        return '([^/]+)';
+      })
+      .replace(/\*/g, '.*');
+
+    const pattern = new RegExp(`^${patternString}$`);
+    return { pattern, paramNames };
+  }
+
   public register(gatewayClass: Constructor<unknown>): void {
     const metadata = getGatewayMetadata(gatewayClass);
     if (!metadata) {
@@ -55,23 +79,82 @@ export class WebSocketGatewayRegistry {
       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: GatewayDefinition = {
       path: metadata.path,
       gatewayClass,
       handlers,
-    });
+      pattern,
+      paramNames,
+      isStatic,
+    };
+
+    this.gateways.set(metadata.path, definition);
+
+    // 分别存储静态和动态路由
+    if (isStatic) {
+      this.staticGateways.set(metadata.path, definition);
+    } else {
+      this.dynamicGateways.push(definition);
+    }
   }
 
+  /**
+   * 检查是否有匹配的网关（支持动态路径匹配）
+   * @param path - 请求路径
+   * @returns 是否有匹配的网关
+   */
   public hasGateway(path: string): boolean {
-    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;
   }
 
   public clear(): void {
     this.gateways.clear();
+    this.staticGateways.clear();
+    this.dynamicGateways.length = 0;
   }
 
-  private getGateway(path: string): GatewayDefinition | undefined {
-    return this.gateways.get(path);
+  /**
+   * 获取匹配的网关（支持动态路径匹配）
+   * @param path - 请求路径
+   * @returns 匹配的网关定义和路径参数
+   */
+  private getGateway(path: string): { definition: GatewayDefinition; params: Record<string, string> } | undefined {
+    // 先检查静态路由
+    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: Record<string, string> = {};
+        for (let i = 0; i < gateway.paramNames.length; i++) {
+          params[gateway.paramNames[i]] = match[i + 1] ?? '';
+        }
+        return { definition: gateway, params };
+      }
+    }
+
+    return undefined;
   }
 
   /**
@@ -129,7 +212,16 @@ export class WebSocketGatewayRegistry {
           headers: new Headers(),
         });
         context = new Context(request);
+        // 设置路径参数到 Context
+        if (ws.data.params) {
+          context.params = ws.data.params;
+        }
         ws.data.context = context;
+      } else {
+        // 如果 Context 已存在，更新路径参数
+        if (ws.data.params) {
+          context.params = ws.data.params;
+        }
       }
 
       // 使用 ParamBinder 绑定参数
@@ -189,12 +281,16 @@ export class WebSocketGatewayRegistry {
 
   public async handleOpen(ws: ServerWebSocket<WebSocketConnectionData>): Promise<void> {
     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;
     }
-    await this.invokeHandler(ws, definition, definition.handlers.open);
+    // 保存路径参数到 WebSocket 连接数据
+    if (match.params && Object.keys(match.params).length > 0) {
+      ws.data.params = match.params;
+    }
+    await this.invokeHandler(ws, match.definition, match.definition.handlers.open);
   }
 
   public async handleMessage(
@@ -202,12 +298,16 @@ export class WebSocketGatewayRegistry {
     message: string | ArrayBuffer | ArrayBufferView,
   ): Promise<void> {
     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;
     }
-    await this.invokeHandler(ws, definition, definition.handlers.message, message);
+    // 保存路径参数到 WebSocket 连接数据（如果还没有）
+    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);
   }
 
   public async handleClose(
@@ -216,11 +316,11 @@ export class WebSocketGatewayRegistry {
     reason: string,
   ): Promise<void> {
     const path = ws.data?.path;
-    const definition = path ? this.getGateway(path) : undefined;
-    if (!definition) {
+    const match = path ? this.getGateway(path) : undefined;
+    if (!match) {
       return;
     }
-    await this.invokeHandler(ws, definition, definition.handlers.close, code, reason);
+    await this.invokeHandler(ws, match.definition, match.definition.handlers.close, code, reason);
   }
 }
 

package/tests/websocket/gateway.test.ts

@@ -5,7 +5,7 @@ import { WebSocketGateway, OnOpen, OnMessage, OnClose } from '../../src/websocke
 import { WebSocketGatewayRegistry } from '../../src/websocket/registry';
 import { ControllerRegistry } from '../../src/controller/controller';
 import { Application } from '../../src/core/application';
-import { Query, Context } from '../../src/controller/decorators';
+import { Query, Context, Param } from '../../src/controller/decorators';
 import { getTestPort } from '../utils/test-port';
 import type { WebSocketConnectionData } from '../../src/websocket/registry';
 import type { Context as RequestContext } from '../../src/core/context';
@@ -1087,6 +1087,212 @@ describe('WebSocket Gateway Integration', () => {
 
     ws.close();
   });
+
+  test('should support dynamic path matching with path parameters', async () => {
+    @WebSocketGateway('/ws/rooms/:roomId')
+    class DynamicPathGateway {
+      public static connected = false;
+      public static roomIds: string[] = [];
+      public static params: Record<string, string>[] = [];
+
+      @OnOpen
+      public handleOpen(ws: ServerWebSocket<WebSocketConnectionData>): void {
+        DynamicPathGateway.connected = true;
+        const roomId = ws.data?.params?.roomId;
+        if (roomId) {
+          DynamicPathGateway.roomIds.push(roomId);
+          DynamicPathGateway.params.push(ws.data.params || {});
+        }
+      }
+
+      @OnMessage
+      public handleMessage(
+        ws: ServerWebSocket<WebSocketConnectionData>,
+        message: string,
+      ): void {
+        const roomId = ws.data?.params?.roomId;
+        if (roomId) {
+          ws.send(`Room ${roomId}: ${message}`);
+        }
+      }
+    }
+
+    app.registerWebSocketGateway(DynamicPathGateway);
+    await app.listen();
+
+    const registry = WebSocketGatewayRegistry.getInstance();
+
+    // 验证动态路径匹配
+    expect(registry.hasGateway('/ws/rooms/123')).toBe(true);
+    expect(registry.hasGateway('/ws/rooms/abc')).toBe(true);
+    expect(registry.hasGateway('/ws/rooms/room-xyz')).toBe(true);
+    // 不匹配的路径
+    expect(registry.hasGateway('/ws/rooms')).toBe(false);
+    expect(registry.hasGateway('/ws/rooms/123/users')).toBe(false);
+
+    // 测试访问动态路径
+    const roomId1 = 'room-123';
+    const ws1 = new WebSocket(`ws://localhost:${port}/ws/rooms/${roomId1}`);
+
+    await new Promise<void>((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        reject(new Error('WebSocket connection timeout'));
+      }, 2000);
+
+      ws1.onopen = () => {
+        clearTimeout(timeout);
+        resolve();
+      };
+
+      ws1.onerror = (error) => {
+        clearTimeout(timeout);
+        reject(error);
+      };
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 200));
+    expect(DynamicPathGateway.connected).toBe(true);
+    expect(DynamicPathGateway.roomIds).toContain(roomId1);
+    expect(DynamicPathGateway.params[0]?.roomId).toBe(roomId1);
+
+    // 测试另一个房间 ID
+    const roomId2 = 'room-456';
+    const ws2 = new WebSocket(`ws://localhost:${port}/ws/rooms/${roomId2}`);
+
+    await new Promise<void>((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        reject(new Error('WebSocket connection timeout'));
+      }, 2000);
+
+      ws2.onopen = () => {
+        clearTimeout(timeout);
+        resolve();
+      };
+
+      ws2.onerror = (error) => {
+        clearTimeout(timeout);
+        reject(error);
+      };
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 200));
+    expect(DynamicPathGateway.roomIds).toContain(roomId2);
+    expect(DynamicPathGateway.params.some((p) => p.roomId === roomId2)).toBe(true);
+
+    ws1.close();
+    ws2.close();
+  });
+
+  test('should support multiple path parameters', async () => {
+    @WebSocketGateway('/ws/users/:userId/rooms/:roomId')
+    class MultiParamGateway {
+      public static connections: Array<{
+        userId: string;
+        roomId: string;
+      }> = [];
+
+      @OnOpen
+      public handleOpen(ws: ServerWebSocket<WebSocketConnectionData>): void {
+        const params = ws.data?.params || {};
+        MultiParamGateway.connections.push({
+          userId: params.userId || '',
+          roomId: params.roomId || '',
+        });
+      }
+    }
+
+    app.registerWebSocketGateway(MultiParamGateway);
+    await app.listen();
+
+    const registry = WebSocketGatewayRegistry.getInstance();
+
+    // 验证多参数路径匹配
+    expect(registry.hasGateway('/ws/users/user1/rooms/room1')).toBe(true);
+    expect(registry.hasGateway('/ws/users/user2/rooms/room2')).toBe(true);
+
+    const userId = 'user-123';
+    const roomId = 'room-456';
+    const ws = new WebSocket(
+      `ws://localhost:${port}/ws/users/${userId}/rooms/${roomId}`,
+    );
+
+    await new Promise<void>((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        reject(new Error('WebSocket connection timeout'));
+      }, 2000);
+
+      ws.onopen = () => {
+        clearTimeout(timeout);
+        resolve();
+      };
+
+      ws.onerror = (error) => {
+        clearTimeout(timeout);
+        reject(error);
+      };
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 200));
+
+    // 验证路径参数被正确提取
+    expect(MultiParamGateway.connections.length).toBeGreaterThan(0);
+    const connection = MultiParamGateway.connections[0];
+    expect(connection.userId).toBe(userId);
+    expect(connection.roomId).toBe(roomId);
+
+    ws.close();
+  });
+
+  test('should support @Param decorator with dynamic path parameters', async () => {
+    @WebSocketGateway('/ws/param-test/:id')
+    class ParamDecoratorGateway {
+      public static receivedIds: string[] = [];
+      public static paramValues: string[] = [];
+
+      @OnMessage
+      public handleMessage(
+        _ws: ServerWebSocket<WebSocketConnectionData>,
+        message: string,
+        @Param('id') id: string,
+      ): void {
+        ParamDecoratorGateway.receivedIds.push(message);
+        ParamDecoratorGateway.paramValues.push(id);
+      }
+    }
+
+    app.registerWebSocketGateway(ParamDecoratorGateway);
+    await app.listen();
+
+    const testId = 'test-123';
+    const ws = new WebSocket(`ws://localhost:${port}/ws/param-test/${testId}`);
+
+    await new Promise<void>((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        reject(new Error('WebSocket connection timeout'));
+      }, 2000);
+
+      ws.onopen = () => {
+        clearTimeout(timeout);
+        resolve();
+      };
+
+      ws.onerror = (error) => {
+        clearTimeout(timeout);
+        reject(error);
+      };
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    ws.send('test-message');
+    await new Promise((resolve) => setTimeout(resolve, 200));
+
+    // 验证消息被接收
+    expect(ParamDecoratorGateway.receivedIds).toContain('test-message');
+    // 验证 @Param 装饰器正确提取了路径参数
+    expect(ParamDecoratorGateway.paramValues).toContain(testId);
+
+    ws.close();
+  });
 });