@jayfong/x-server 2.111.0 → 2.113.0

package/lib/_cjs/cli/api_generator.js

@@ -258,6 +258,7 @@ class ApiGenerator {
     const isIntersection = type.isIntersection();
     const intersectionTypes = isIntersection && type.types || [];
     const isDate = valueSymbolName === 'Date';
+    const isRegExp = valueSymbolName === 'RegExp';
     const isBigIntLiteral = hasTypeFlag(_tsMorph.ts.TypeFlags.BigIntLiteral);
     const isBigInt = hasTypeFlag(_tsMorph.ts.TypeFlags.BigInt) || isBigIntLiteral;
     const isArray = valueSymbolName === 'Array' || valueSymbolName === 'ReadonlyArray';
@@ -266,7 +267,9 @@ class ApiGenerator {
     // BigInt 类型视为字符串
     isBigInt ||
     // Date 类型视为字符串
-    isDate;
+    isDate ||
+    // RegExp 类型视为字符串
+    isRegExp;
     const isNumberLiteral = hasTypeFlag(_tsMorph.ts.TypeFlags.NumberLiteral);
     const isNumber = hasTypeFlag(_tsMorph.ts.TypeFlags.Number) || isNumberLiteral;
     const isBoolean = hasTypeFlag(_tsMorph.ts.TypeFlags.Boolean) || hasTypeFlag(_tsMorph.ts.TypeFlags.BooleanLiteral);

package/lib/_cjs/core/handler.js

@@ -22,6 +22,7 @@ class Handler {
     this.options = options;
     this.requestDataSchema = void 0;
     this.requestDataSchemaVae = void 0;
+    this.requestHandle = void 0;
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
@@ -72,7 +73,7 @@ class Handler {
         }
       }
       try {
-        let res = await this.options.handle(data, ctx);
+        let res = await this.requestHandle(data, ctx);
         if (res instanceof _http_redirect.HttpRedirect) {
           ctx.redirect(res.url, res.permanently);
           return {};
@@ -188,6 +189,24 @@ class Handler {
     } else if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(_validator.yup);
     }
+    if (options.concurrency != null) {
+      if (typeof options.concurrency === 'number') {
+        this.requestHandle = (0, _vtils.asyncLimit)(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: options.concurrency
+        });
+      } else {
+        const {
+          count,
+          groupBy
+        } = options.concurrency;
+        this.requestHandle = (0, _vtils.asyncLimit)(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: count,
+          groupBy: groupBy
+        });
+      }
+    } else {
+      this.requestHandle = options.handle;
+    }
   }
   static addHook(hook) {
     this.hooks.push(hook);

package/lib/cli/api_generator.js

@@ -253,6 +253,7 @@ export class ApiGenerator {
     const isIntersection = type.isIntersection();
     const intersectionTypes = isIntersection && type.types || [];
     const isDate = valueSymbolName === 'Date';
+    const isRegExp = valueSymbolName === 'RegExp';
     const isBigIntLiteral = hasTypeFlag(ts.TypeFlags.BigIntLiteral);
     const isBigInt = hasTypeFlag(ts.TypeFlags.BigInt) || isBigIntLiteral;
     const isArray = valueSymbolName === 'Array' || valueSymbolName === 'ReadonlyArray';
@@ -261,7 +262,9 @@ export class ApiGenerator {
     // BigInt 类型视为字符串
     isBigInt ||
     // Date 类型视为字符串
-    isDate;
+    isDate ||
+    // RegExp 类型视为字符串
+    isRegExp;
     const isNumberLiteral = hasTypeFlag(ts.TypeFlags.NumberLiteral);
     const isNumber = hasTypeFlag(ts.TypeFlags.Number) || isNumberLiteral;
     const isBoolean = hasTypeFlag(ts.TypeFlags.Boolean) || hasTypeFlag(ts.TypeFlags.BooleanLiteral);

package/lib/core/handler.d.ts

@@ -6,6 +6,7 @@ export declare class Handler<TReqData extends any = void, TResData extends any =
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
     private requestDataSchema;
     readonly requestDataSchemaVae: vae.VaeSchemaOf<TReqDataRequired>;
+    private requestHandle;
     constructor(options: XHandler.Options<TReqData, TResData, TReqMethod>);
     handle: XHandler.Handle<TReqData, TResData, TReqMethod>;
     private handleHttp;

package/lib/core/handler.js

@@ -1,6 +1,6 @@
 import { HTTPError as GotHTTPError, ParseError as GotParseError, RequestError as GotRequestError, TimeoutError as GotTimeoutError } from 'got';
 import LZString from 'lz-string';
-import { base64UrlEncode, DataPacker, rot13, toSingleLineString } from 'vtils';
+import { asyncLimit, base64UrlEncode, DataPacker, rot13, toSingleLineString } from 'vtils';
 import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";
@@ -16,6 +16,7 @@ export class Handler {
     this.options = options;
     this.requestDataSchema = void 0;
     this.requestDataSchemaVae = void 0;
+    this.requestHandle = void 0;
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
@@ -66,7 +67,7 @@ export class Handler {
         }
       }
       try {
-        let res = await this.options.handle(data, ctx);
+        let res = await this.requestHandle(data, ctx);
         if (res instanceof HttpRedirect) {
           ctx.redirect(res.url, res.permanently);
           return {};
@@ -182,6 +183,24 @@ export class Handler {
     } else if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(yup);
     }
+    if (options.concurrency != null) {
+      if (typeof options.concurrency === 'number') {
+        this.requestHandle = asyncLimit(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: options.concurrency
+        });
+      } else {
+        const {
+          count,
+          groupBy
+        } = options.concurrency;
+        this.requestHandle = asyncLimit(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: count,
+          groupBy: groupBy
+        });
+      }
+    } else {
+      this.requestHandle = options.handle;
+    }
   }
   static addHook(hook) {
     this.hooks.push(hook);

package/lib/core/types.d.ts

@@ -167,6 +167,15 @@ export declare namespace XHandler {
          * @default 默认为服务的设置
          */
         useAsyncContext?: boolean;
+        /**
+         * 并发控制
+         */
+        concurrency?: number | {
+            /** 并发数量 */
+            count?: number;
+            /** 分组函数 */
+            groupBy?: (data: TReqData, ctx: Context) => string;
+        };
         /**
          * 处理器
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.111.0",
+  "version": "2.113.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -79,7 +79,7 @@
     "unplugin-macros": "^0.16.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.136.0",
+    "vtils": "^4.138.0",
     "yaml": "^2.3.1",
     "yargs": "^17.4.1"
   },