@yumerijs/core 3.0.1 → 3.0.3

package/dist/context.js

@@ -1,4 +1,3 @@
-import { Route } from './route.js';
 import path from 'path';
 /**
  * 插件上下文对象
@@ -57,10 +56,15 @@ export class Context {
      * @returns Route 实例
      */
     route(routepath) {
-        const realpath = path.join(this.childpath, routepath);
+        // `root` is a special fallback route name, not a filesystem path.
+        // URL paths must use POSIX separators even when Yumeri runs on Windows.
+        const realpath = routepath === 'root'
+            ? 'root'
+            : path.posix.join(this.childpath, routepath);
         if (this.core.routes[realpath]) {
-            this.core.logger.warn(`Plugin "${this.pluginname}" attempt to register route "${path}", but it has already been registered.`);
-            return new Route(realpath, this);
+            // Reuse the registered route so the same path can be split across
+            // multiple declarations, e.g. one GET handler and one POST handler.
+            return this.core.routes[realpath];
         }
         this.routes.push(realpath);
         return this.core.route(realpath, this);

package/dist/core.js

@@ -228,6 +228,10 @@ export class Core {
             const route = this.routes[routePath];
             const result = route.match(pathname, session.client?.headers?.host);
             if (result) {
+                const method = session.client?.req?.method ?? 'GET';
+                if (!route.hasHandler(method)) {
+                    continue;
+                }
                 try {
                     this.emit('request:start', {
                         path: pathname,
@@ -254,7 +258,7 @@ export class Core {
                         }
                         else {
                             const start = Date.now();
-                            await route.executeHandler(session, queryParams, result.pathParams, result.hostParams);
+                            await route.executeHandler(session, queryParams, result.pathParams, result.hostParams, method);
                             this.emit('route:end', {
                                 path: pathname,
                                 route: routePath,

package/dist/route.d.ts

@@ -8,6 +8,7 @@ import { Middleware } from './middleware.js';
 import { WebSocketServer } from 'ws';
 import { Context } from './context.js';
 export type RouteHandler = (session: Session, queryParams: URLSearchParams, ...pathParams: string[]) => Promise<void> | void;
+type RouteMethod = string | string[];
 /**
  * Route class using segment-based matching (no fragile capture-group-index mapping).
  * Behavior matches the SimpleRouter in the webpage:
@@ -20,7 +21,9 @@ export declare class Route {
     path: string;
     private segments;
     private paramsInfo;
-    private handler;
+    private handlers;
+    private pendingActionMethods;
+    private methodsConfigured;
     middlewares: Middleware[];
     allowedMethods: string[];
     ws: WebSocketServer | null;
@@ -38,6 +41,7 @@ export declare class Route {
      * @returns this
      */
     action(handler: RouteHandler): this;
+    action(method: RouteMethod, handler: RouteHandler): this;
     /**
      * 设置允许的host
      * @param host host列表
@@ -67,7 +71,8 @@ export declare class Route {
      * @param params 查询参数
      * @param pathParams 路由参数
      */
-    executeHandler(session: Session, params: URLSearchParams, pathParams: string[], hostParams: Record<string, string>): Promise<void>;
+    executeHandler(session: Session, params: URLSearchParams, pathParams: string[], hostParams: Record<string, string>, method?: string): Promise<void>;
+    hasHandler(method: string): boolean;
     /**
      * 设置可用方法
      * @param methods 可用方法
@@ -80,3 +85,4 @@ export declare class Route {
       */
     wsOn(event: string, handler: (...args: any[]) => void): this;
 }
+export {};

package/dist/route.js

@@ -225,7 +225,9 @@ export class Route {
     path;
     segments;
     paramsInfo;
-    handler = null;
+    handlers = {};
+    pendingActionMethods = null;
+    methodsConfigured = false;
     middlewares = [];
     allowedMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'];
     ws = null;
@@ -243,13 +245,17 @@ export class Route {
         this.segments = segments;
         this.paramsInfo = params;
     }
-    /**
-     * 设置路由处理器
-     * @param handler 路由处理器
-     * @returns this
-     */
-    action(handler) {
-        this.handler = handler;
+    action(methodOrHandler, maybeHandler) {
+        const handler = typeof methodOrHandler === 'function' ? methodOrHandler : maybeHandler;
+        if (!handler)
+            return this;
+        const methods = typeof methodOrHandler === 'function'
+            ? (this.pendingActionMethods ?? this.allowedMethods)
+            : (Array.isArray(methodOrHandler) ? methodOrHandler : [methodOrHandler]);
+        for (const method of methods) {
+            this.handlers[method.toUpperCase()] = handler;
+        }
+        this.pendingActionMethods = null;
         return this;
     }
     /**
@@ -459,18 +465,27 @@ export class Route {
      * @param params 查询参数
      * @param pathParams 路由参数
      */
-    async executeHandler(session, params, pathParams, hostParams) {
-        if (this.handler) {
-            await this.handler(session, params, ...pathParams, ...Object.values(hostParams));
+    async executeHandler(session, params, pathParams, hostParams, method) {
+        const handler = this.handlers[(method || session.client?.req?.method || 'GET').toUpperCase()];
+        if (handler) {
+            await handler(session, params, ...pathParams, ...Object.values(hostParams));
         }
     }
+    hasHandler(method) {
+        return !!this.handlers[method.toUpperCase()];
+    }
     /**
      * 设置可用方法
      * @param methods 可用方法
      * @returns this
      */
     methods(...methods) {
-        this.allowedMethods = methods;
+        const normalized = methods.map(method => method.toUpperCase());
+        this.allowedMethods = this.methodsConfigured
+            ? [...new Set([...this.allowedMethods, ...normalized])]
+            : normalized;
+        this.methodsConfigured = true;
+        this.pendingActionMethods = normalized;
         return this;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/core",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",