@jayfong/x-server 2.52.1 → 2.53.0

package/lib/_cjs/core/define_handler.js

@@ -38,4 +38,11 @@ defineHandler.XML = options => {
     requestMethod: 'XML'
   });
   return handler;
+};
+defineHandler.ANY = options => {
+  const handler = new _handler.Handler({
+    ...options,
+    requestMethod: 'ANY'
+  });
+  return handler;
 };

package/lib/_cjs/core/handler.js

@@ -31,6 +31,10 @@ class Handler {
       return this.handleHttp(data, ctx);
     };
     this.handleHttp = async (data, ctx) => {
+      // 请求数据解析
+      if (this.options.parseRequestData) {
+        data = await this.options.parseRequestData(data, ctx);
+      }
       // 请求数据验证
       // vae
       if (this.requestDataSchemaVae) {
@@ -45,7 +49,6 @@ class Handler {
           data = res.data;
         } else {
           throw new _http_error.HttpError.BadRequest(
-          // TODO: 暂时兼容编译bug
           // @ts-ignore
           res.issues[0].message);
         }

package/lib/_cjs/core/http_method.js

@@ -7,5 +7,6 @@ const HandlerMethodToHttpMethod = exports.HandlerMethodToHttpMethod = {
   POST: 'POST',
   FILE: 'POST',
   WS: 'GET',
-  XML: 'POST'
+  XML: 'POST',
+  ANY: 'POST'
 };

package/lib/_cjs/core/server.js

@@ -104,7 +104,7 @@ class Server {
             return res;
           }, {});
         }
-        const data = await item.handler.handle({
+        const data = await item.handler.handle(handlerMethod === 'ANY' ? {} : {
           // @ts-ignore
           ...req.params,
           // @ts-ignore
@@ -113,7 +113,7 @@ class Server {
           ...req.body,
           ...files
         }, {
-          url: url,
+          url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
           redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
@@ -129,7 +129,7 @@ class Server {
         const isWS = handlerMethod === 'WS';
         const serverMethod = isWS ? 'GET' : _http_method.HandlerMethodToHttpMethod[handlerMethod];
         fastify.route({
-          method: serverMethod,
+          method: handlerMethod === 'ANY' ? ['GET', 'HEAD', 'TRACE', 'DELETE', 'OPTIONS', 'PATCH', 'PUT', 'POST'] : serverMethod,
           url: item.path,
           constraints: handlerOptions.requestHost ? {
             host: handlerOptions.requestHost

package/lib/core/define_handler.d.ts

@@ -13,4 +13,5 @@ export declare namespace defineHandler {
         response: TReqData[K][1];
     }; }, void, "WS">;
     var XML: <TReqData extends unknown = void, TResData extends unknown = void>(options: XHandler.Options<TReqData, TResData, "XML">) => Handler<TReqData, TResData, "XML">;
+    var ANY: <TReqData extends unknown = void, TResData extends unknown = void>(options: XHandler.Options<TReqData, TResData, "ANY">) => Handler<TReqData, TResData, "ANY">;
 }

package/lib/core/define_handler.js

@@ -34,4 +34,11 @@ defineHandler.XML = options => {
     requestMethod: 'XML'
   });
   return handler;
+};
+defineHandler.ANY = options => {
+  const handler = new Handler({
+    ...options,
+    requestMethod: 'ANY'
+  });
+  return handler;
 };

package/lib/core/handler.js

@@ -25,6 +25,10 @@ export class Handler {
       return this.handleHttp(data, ctx);
     };
     this.handleHttp = async (data, ctx) => {
+      // 请求数据解析
+      if (this.options.parseRequestData) {
+        data = await this.options.parseRequestData(data, ctx);
+      }
       // 请求数据验证
       // vae
       if (this.requestDataSchemaVae) {
@@ -39,7 +43,6 @@ export class Handler {
           data = res.data;
         } else {
           throw new HttpError.BadRequest(
-          // TODO: 暂时兼容编译bug
           // @ts-ignore
           res.issues[0].message);
         }

package/lib/core/http_method.js

@@ -3,5 +3,6 @@ export const HandlerMethodToHttpMethod = {
   POST: 'POST',
   FILE: 'POST',
   WS: 'GET',
-  XML: 'POST'
+  XML: 'POST',
+  ANY: 'POST'
 };

package/lib/core/server.js

@@ -98,7 +98,7 @@ export class Server {
             return res;
           }, {});
         }
-        const data = await item.handler.handle({
+        const data = await item.handler.handle(handlerMethod === 'ANY' ? {} : {
           // @ts-ignore
           ...req.params,
           // @ts-ignore
@@ -107,7 +107,7 @@ export class Server {
           ...req.body,
           ...files
         }, {
-          url: url,
+          url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
           redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
@@ -123,7 +123,7 @@ export class Server {
         const isWS = handlerMethod === 'WS';
         const serverMethod = isWS ? 'GET' : HandlerMethodToHttpMethod[handlerMethod];
         fastify.route({
-          method: serverMethod,
+          method: handlerMethod === 'ANY' ? ['GET', 'HEAD', 'TRACE', 'DELETE', 'OPTIONS', 'PATCH', 'PUT', 'POST'] : serverMethod,
           url: item.path,
           constraints: handlerOptions.requestHost ? {
             host: handlerOptions.requestHost

package/lib/core/types.d.ts

@@ -59,7 +59,7 @@ export declare namespace XServer {
     }
 }
 export declare namespace XHandler {
-    type Method = 'GET' | 'POST' | 'FILE' | 'WS' | 'XML';
+    type Method = 'GET' | 'POST' | 'FILE' | 'WS' | 'XML' | 'ANY';
     interface ExtraContext {
     }
     interface Context extends ExtraContext {
@@ -125,6 +125,10 @@ export declare namespace XHandler {
          * 请求路径
          */
         requestPath?: OneOrMore<string>;
+        /**
+         * 解析请求数据
+         */
+        parseRequestData?: (data: any, ctx: Context) => any;
         /**
          * 是否打包返回数据
          *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.52.1",
+  "version": "2.53.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",