@jayfong/x-server 2.118.0 → 2.119.0

package/lib/_cjs/cli/api_generator.js

@@ -26,6 +26,7 @@ class ApiGenerator {
     // /user/index.ts
     // /post.ts
     // /user/list.ts
+    // category 必须从 handlers 目录结构中推导，后续会直接拼接到 URL 前缀
     this.categoryUrlRe = /^.+\/src\/handlers\/(?:index\.ts|(.*)\/index\.ts|(.*)\.ts)$/;
     this.checker = void 0;
     this.cwd = this.options.cwd || process.cwd();
@@ -36,7 +37,7 @@ class ApiGenerator {
     const handlersPath = _nodePath.default.join(this.cwd, 'node_modules/.x/handlers.ts');
     const entryFile = _nodePath.default.join(this.cwd, 'src/generated/handlers.ts');
 
-    // 仅使用 ts-morph 初始化项目
+    // 仅使用 ts-morph 初始化项目，并把运行时生成的 handlers 聚合文件注入到 Program 中
     const moProject = new _tsMorph.default.Project({
       tsConfigFilePath: tsConfigPath
     });
@@ -45,11 +46,12 @@ class ApiGenerator {
     const checker = program.getTypeChecker();
     this.checker = checker;
     const entrySourceFile = program.getSourceFile(entryFile);
+    // handlers.ts 的每个 export 对应一个分类（如 user、post）
     const moduleSymbol = checker.getSymbolAtLocation(entrySourceFile);
     const categorySymbols = checker.getExportsOfModule(moduleSymbol);
     const apiData = [];
     for (const categorySymbol of categorySymbols) {
-      // 分类的类型
+      // 分类的类型：形如 { list: defineHandler<...>, detail: defineHandler<...> }
       const categoryType = checker.getTypeOfSymbol(categorySymbol);
 
       // 处理器列表
@@ -81,7 +83,8 @@ class ApiGenerator {
         let handlerPath = [handlerSymbol.getName()];
         const handlerNode = handlerSymbol.getDeclarations()[0];
 
-        // 支持自定义 requestPath
+        // 支持自定义 requestPath，仅识别字符串字面量或字符串数组字面量
+        // 这里不会执行表达式（例如变量、模板字符串、函数调用）
         if (
         // const xx = defineHandler
         _tsMorph.ts.isVariableDeclaration(handlerNode) && handlerNode.initializer &&
@@ -116,6 +119,9 @@ class ApiGenerator {
         }
         this.debug('生成接口: %s ...', handlerUrl);
         const handlerType = checker.getTypeAtLocation(handlerNode);
+
+        // 约定 defineHandler 的泛型顺序固定为 <Request, Response, Method>
+        // 若上游定义顺序变更，这里会静默解析错误
         const [requestType, responseType, methodType] = checker.getTypeArguments(handlerType);
         const handlerCategory = (0, _vtils.pascalCase)(categoryUrl) || 'Index';
         const handlerDescription = handlerComment.description || handlerUrl.join(', ');
@@ -129,6 +135,8 @@ class ApiGenerator {
         });
         const requestDataJsonSchema = this.apiDataToJsonSchema(requestData);
         const responseDataJsonSchema = this.apiDataToJsonSchema(responseData);
+
+        // 说明文档按“首段标题 + 空行 + 详情”拆分
         const handlerDescriptionDividerIndex = handlerDescription.indexOf('\n\n');
         const apiName = handlerDescriptionDividerIndex === -1 ? handlerDescription : handlerDescription.substring(0, handlerDescriptionDividerIndex);
         const apiDesc = handlerDescriptionDividerIndex === -1 ? '' : handlerDescription.substring(handlerDescriptionDividerIndex + 2);
@@ -167,6 +175,7 @@ class ApiGenerator {
       };
     }
     const description = _tsMorph.ts.displayPartsToString(symbol.getDocumentationComment(this.checker)).trim();
+    // JSDoc tag 统一收敛到 Map，方便按 @private 这类标签做开关
     const tags = symbol.getJsDocTags().map(item => {
       return {
         label: item.name,
@@ -187,6 +196,8 @@ class ApiGenerator {
     keySymbol = type.symbol || type.aliasSymbol
   }) {
     const hasTypeFlag = (flag, _type = type) => (_type.flags & flag) === flag;
+
+    // valueSymbol 用于识别“实际值类型”，keySymbol 用于保留字段名和字段注释
     let valueSymbol = type.symbol || type.aliasSymbol;
     const keySymbolName = keySymbol?.getName() || '';
     let valueSymbolName = valueSymbol?.getName() || '';
@@ -242,8 +253,8 @@ class ApiGenerator {
       };
     }
 
-    // 联合类型
-    // 布尔、枚举也会用这表示
+    // 联合类型：布尔字面量、枚举字面量都会走到这里
+    // 处理策略：忽略 null/undefined，用第一个成员推断基础类型，同时把所有字面量收集到 enum
     const rawUnionTypes = type.isUnion() && type.types || [];
     const unionTypes = rawUnionTypes.filter(item => !hasTypeFlag(_tsMorph.ts.TypeFlags.Null, item) && !hasTypeFlag(_tsMorph.ts.TypeFlags.Undefined, item));
     const isUnion = !!unionTypes.length;
@@ -274,6 +285,8 @@ class ApiGenerator {
     const isNumber = hasTypeFlag(_tsMorph.ts.TypeFlags.Number) || isNumberLiteral;
     const isBoolean = hasTypeFlag(_tsMorph.ts.TypeFlags.Boolean) || hasTypeFlag(_tsMorph.ts.TypeFlags.BooleanLiteral);
     const isLiteral = isStringLiteral || isNumberLiteral || isBigIntLiteral;
+
+    // object 兜底：只要不是数组/基础类型，且 TypeScript 视为 Object，就按对象递归
     const isObject = !isArray && !isString && !isNumber && !isBoolean && hasTypeFlag(_tsMorph.ts.TypeFlags.Object) ||
     // 交集类型视为对象
     isIntersection;
@@ -284,6 +297,8 @@ class ApiGenerator {
     const apiChildren = isArray ? [this.getApiDto({
       type: this.checker.getTypeArguments(type)[0]
     })] : isObject ? (0, _vtils.ii)(() => {
+      // 这里使用了 TypeChecker 的内部能力来合并交集类型字段
+      // 若 TypeScript 内部 API 变化，这里是高风险点
       const childSymbols = this.checker.getAllPossiblePropertiesOfTypes(intersectionTypes.length ? intersectionTypes : [type]);
       return childSymbols.map(childSymbol => {
         const childType = this.checker.getTypeOfSymbol(childSymbol);
@@ -303,6 +318,7 @@ class ApiGenerator {
     };
   }
   apiDataToJsonSchema(apiData, jsonSchema = {}) {
+    // 递归把内部 DTO 结构映射到 JSON Schema（以 object/array/primitive 三类分支处理）
     jsonSchema.description = apiData.desc;
     if (apiData.type === 'object') {
       jsonSchema.type = 'object';
@@ -327,7 +343,10 @@ class ApiGenerator {
     for (const handle of handles) {
       for (const path of handle.path) {
         data[handle.category] = data[handle.category] || [];
-        data[handle.category].push(handle.handlerMethod === 'GET' ? {
+        data[handle.category].push(
+        // GET -> query；FILE -> form-data；其余 -> json body
+        // 此处是与 YApi 结构的协议转换层
+        handle.handlerMethod === 'GET' ? {
           method: handle.method.toUpperCase(),
           title: handle.name,
           markdown: handle.desc,
@@ -411,6 +430,7 @@ class ApiGenerator {
             tags: [handle.category],
             summary: handle.name,
             description: handle.desc,
+            // 目前统一按 application/json 输出；上传类接口未转为 multipart/form-data
             requestBody: {
               content: {
                 'application/json': {

package/lib/_cjs/cli/dev_util.js

@@ -12,7 +12,8 @@ class DevUtil {
       const tsxPkgFile = require.resolve('tsx/package.json');
       const tsxJsFile = tsxPkgFile.replace('/package.json', '/dist/cli.js');
       const tsxCjsFile = tsxPkgFile.replace('/package.json', '/dist/cli.cjs');
-      return _nodeFs.default.existsSync(tsxCjsFile) ? tsxCjsFile : tsxJsFile;
+      const tsxMjsFile = tsxPkgFile.replace('/package.json', '/dist/cli.mjs');
+      return _nodeFs.default.existsSync(tsxCjsFile) ? tsxCjsFile : _nodeFs.default.existsSync(tsxMjsFile) ? tsxMjsFile : tsxJsFile;
     }), options.file], {
       cwd: options.cwd,
       stdio: 'inherit'

package/lib/_cjs/core/define_task.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.defineSliceTask = defineSliceTask;
 exports.defineTask = defineTask;
-var _assert = _interopRequireDefault(require("assert"));
+var _nodeAssert = _interopRequireDefault(require("node:assert"));
 var _bull = _interopRequireDefault(require("bull"));
 var _vtils = require("vtils");
 var _x = require("../x");
@@ -46,7 +46,7 @@ function defineSliceTask(options) {
     const duration = addOptions?.duration != null ? (0, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.ms)(options.duration);
     const threshold = addOptions?.threshold || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
     const thresholdTimeout = addOptions?.thresholdTimeout != null ? (0, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.ms)(options.thresholdTimeout);
-    (0, _assert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
+    (0, _nodeAssert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
     const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
     const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
     const count = parseInt(res[0][1], 10) + 1;

package/lib/_cjs/core/handler.js

@@ -131,11 +131,11 @@ class Handler {
     };
     this.handleWs = async (_data, ctx) => {
       const dispose = new _dispose.DisposeService();
-      ctx.ws.socket.on('message', async payload => {
+      ctx.ws.on('message', async payload => {
         try {
           const _ = JSON.parse(payload.toString('utf8'));
           const send = data => {
-            ctx.ws.socket.send(JSON.stringify({
+            ctx.ws.send(JSON.stringify({
               id: _.id,
               data: data
             }));
@@ -172,14 +172,14 @@ class Handler {
           }
         } catch (err) {
           const _err = _http_error.HttpError.isHttpError(err) ? err : new _http_error.HttpError.InternalServerError();
-          ctx.ws.socket.send(JSON.stringify({
+          ctx.ws.send(JSON.stringify({
             statusCode: _err.statusCode,
             error: _err.name,
             message: _err.message
           }));
         }
       });
-      ctx.ws.socket.on('close', () => {
+      ctx.ws.on('close', () => {
         dispose.dispose();
       });
     };

package/lib/_cjs/core/server.js

@@ -118,7 +118,7 @@ class Server {
           url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
-          redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
+          redirect: (url, permanently) => res.redirect(url, permanently ? 301 : 302),
           ws: undefined,
           req: req,
           res: res
@@ -188,15 +188,13 @@ class Server {
     if (Array.isArray(_x2.x.env.APP_STATIC_CONTENT)) {
       const staticContent = _x2.x.env.APP_STATIC_CONTENT;
       for (const item of staticContent) {
-        if (!item.method) {
-          item.method = 'GET';
-        }
-        if (!this.fastify.hasRoute({
-          method: item.method,
+        const methods = (0, _vtils.castArray)(item.method);
+        if (!methods.some(method => this.fastify.hasRoute({
+          method,
           url: item.path
-        })) {
+        }))) {
           this.fastify.route({
-            method: item.method,
+            method: methods,
             url: item.path,
             handler: async (_req, res) => {
               if (!item.contentType && typeof item.content === 'string') {

package/lib/_cjs/plugins/compress.js

@@ -12,7 +12,7 @@ class CompressPlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(_compress.default, this.options);
+    fastify.register(_compress.default, this.options ?? {});
   }
 }
 exports.CompressPlugin = CompressPlugin;

package/lib/_cjs/plugins/cookie.js

@@ -12,7 +12,7 @@ class CookiePlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(_cookie.default, this.options);
+    fastify.register(_cookie.default, this.options ?? {});
   }
 }
 exports.CookiePlugin = CookiePlugin;

package/lib/_cjs/plugins/form_body_parser.js

@@ -12,7 +12,7 @@ class FormBodyParserPlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(_formbody.default, this.options);
+    fastify.register(_formbody.default, this.options || {});
   }
 }
 exports.FormBodyParserPlugin = FormBodyParserPlugin;

package/lib/_cjs/plugins/ws_parser.js

@@ -12,7 +12,7 @@ class WsParserPlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(_websocket.default, this.options);
+    fastify.register(_websocket.default, this.options ?? {});
   }
 }
 exports.WsParserPlugin = WsParserPlugin;

package/lib/_cjs/plugins/xml_parser.js

@@ -18,7 +18,7 @@ class XmlParserPlugin {
       ...parseOptions
     } = this.options || {};
     const xmlParser = new _fastXmlParser.XMLParser(parseOptions);
-    fastify.addContentTypeParser(contentType, (req, payload, done) => {
+    fastify.addContentTypeParser(contentType, (_req, payload, done) => {
       let body = '';
       const handleError = err => done(err);
       const handleData = data => body += data;

package/lib/_cjs/services/captcha.js

@@ -13,9 +13,9 @@ class CaptchaService {
     this.charsetMap = {
       '09': '0123456789'.split(''),
       '19': '123456789'.split(''),
-      'az': 'abcdefghijklmnopqrstuvwxyz'.split(''),
-      'AZ': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
-      'aZ': 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      az: 'abcdefghijklmnopqrstuvwxyz'.split(''),
+      AZ: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      aZ: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
       '0z': '0123456789abcdefghijklmnopqrstuvwxyz'.split(''),
       '0Z': '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
       '1z': '123456789abcdefghijklmnopqrstuvwxyz'.split(''),

package/lib/_cjs/services/dingtalk.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.DingtalkService = void 0;
-var _crypto = _interopRequireDefault(require("crypto"));
+var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
 var _got = _interopRequireDefault(require("got"));
 class DingtalkService {
   constructor(options) {
@@ -12,7 +12,7 @@ class DingtalkService {
   }
   async send(options) {
     const timestamp = Date.now();
-    const sign = _crypto.default.createHmac('sha256', this.options.secret).update(`${timestamp}\n${this.options.secret}`).digest('base64');
+    const sign = _nodeCrypto.default.createHmac('sha256', this.options.secret).update(`${timestamp}\n${this.options.secret}`).digest('base64');
     const data = {
       msgtype: 'markdown',
       markdown: {

package/lib/_cjs/services/emoji.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.EmojiService = void 0;
 // softbankOrDocomoOrAuOrGoogleToUnified
-// prettier-ignore
+// biome-ignore format: x
 const softbankOrDocomoOrAuOrGoogleToUnified = {
   "": "#️⃣",
   "󾠬": "#️⃣",

package/lib/_cjs/services/log.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.LogService = void 0;
-var _path = _interopRequireDefault(require("path"));
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _vtils = require("vtils");
 var _date = require("vtils/date");
@@ -68,7 +68,7 @@ class LogService {
   getLogFile(date) {
     const year = date.getFullYear();
     const month = date.getMonth() + 1;
-    return _path.default.join(_x.x.dataDir, `log/${year}/${month < 10 ? `0${month}` : month}.log`);
+    return _nodePath.default.join(_x.x.dataDir, `log/${year}/${month < 10 ? `0${month}` : month}.log`);
   }
   get logFile() {
     return this.getLogFile(new Date());

package/lib/_cjs/services/pay.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.PayService = void 0;
-var _crypto = _interopRequireDefault(require("crypto"));
+var _nodeCrypto = _interopRequireDefault(require("node:crypto"));
 var _alipaySdk = _interopRequireDefault(require("alipay-sdk"));
 var _form = _interopRequireDefault(require("alipay-sdk/lib/form"));
 var _got = _interopRequireDefault(require("got"));
@@ -44,9 +44,8 @@ class PayService {
     };
   }
   async prepareWepay(options) {
-    const appId = options.appId || this.options.wepay.appId;
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
-      appid: appId,
+      appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
@@ -65,7 +64,7 @@ class PayService {
       throw new Error(error);
     }
     const params = {
-      appId: appId,
+      appId: this.options.wepay.appId,
       timestamp: String(Math.round(Date.now() / 1000)),
       nonceStr: Math.random().toString().substr(2, 12),
       package: `prepay_id=${res.prepay_id}`,
@@ -145,13 +144,13 @@ class PayService {
     };
   }
   wepaySign(data) {
-    return _crypto.default.createSign('RSA-SHA256').update(data.map(v => `${v}\n`).join('')).sign(this.options.wepay.privateKey, 'base64');
+    return _nodeCrypto.default.createSign('RSA-SHA256').update(data.map(v => `${v}\n`).join('')).sign(this.options.wepay.privateKey, 'base64');
   }
   wepayDecrypt(payload) {
     const ciphertextBuffer = Buffer.from(payload.ciphertext, 'base64');
     const authTag = ciphertextBuffer.slice(ciphertextBuffer.length - 16);
     const data = ciphertextBuffer.slice(0, ciphertextBuffer.length - 16);
-    const decipherIv = _crypto.default.createDecipheriv('aes-256-gcm', this.options.wepay.secretKey, payload.nonce);
+    const decipherIv = _nodeCrypto.default.createDecipheriv('aes-256-gcm', this.options.wepay.secretKey, payload.nonce);
     decipherIv.setAuthTag(Buffer.from(authTag));
     decipherIv.setAAD(Buffer.from(payload.associated_data));
     const decryptStr = decipherIv.update(data, undefined, 'utf8');

package/lib/_cjs/services/sensitive_words.js

@@ -12,7 +12,6 @@ const toRegExp = (0, _vtils.memoize)(re => new RegExp(re.substring(1, re.length
  */
 class SensitiveWordsService {
   constructor(options) {
-    this.options = options;
     this.serviceName = 'sensitiveWords';
     this.sensitiveWords = [];
     this.sensitiveWords = (0, _vtils.uniq)(options.words.map(word => word.toLowerCase()));

package/lib/cli/api_generator.js

@@ -21,6 +21,7 @@ export class ApiGenerator {
     // /user/index.ts
     // /post.ts
     // /user/list.ts
+    // category 必须从 handlers 目录结构中推导，后续会直接拼接到 URL 前缀
     this.categoryUrlRe = /^.+\/src\/handlers\/(?:index\.ts|(.*)\/index\.ts|(.*)\.ts)$/;
     this.checker = void 0;
     this.cwd = this.options.cwd || process.cwd();
@@ -31,7 +32,7 @@ export class ApiGenerator {
     const handlersPath = path.join(this.cwd, 'node_modules/.x/handlers.ts');
     const entryFile = path.join(this.cwd, 'src/generated/handlers.ts');
 
-    // 仅使用 ts-morph 初始化项目
+    // 仅使用 ts-morph 初始化项目，并把运行时生成的 handlers 聚合文件注入到 Program 中
     const moProject = new mo.Project({
       tsConfigFilePath: tsConfigPath
     });
@@ -40,11 +41,12 @@ export class ApiGenerator {
     const checker = program.getTypeChecker();
     this.checker = checker;
     const entrySourceFile = program.getSourceFile(entryFile);
+    // handlers.ts 的每个 export 对应一个分类（如 user、post）
     const moduleSymbol = checker.getSymbolAtLocation(entrySourceFile);
     const categorySymbols = checker.getExportsOfModule(moduleSymbol);
     const apiData = [];
     for (const categorySymbol of categorySymbols) {
-      // 分类的类型
+      // 分类的类型：形如 { list: defineHandler<...>, detail: defineHandler<...> }
       const categoryType = checker.getTypeOfSymbol(categorySymbol);
 
       // 处理器列表
@@ -76,7 +78,8 @@ export class ApiGenerator {
         let handlerPath = [handlerSymbol.getName()];
         const handlerNode = handlerSymbol.getDeclarations()[0];
 
-        // 支持自定义 requestPath
+        // 支持自定义 requestPath，仅识别字符串字面量或字符串数组字面量
+        // 这里不会执行表达式（例如变量、模板字符串、函数调用）
         if (
         // const xx = defineHandler
         ts.isVariableDeclaration(handlerNode) && handlerNode.initializer &&
@@ -111,6 +114,9 @@ export class ApiGenerator {
         }
         this.debug('生成接口: %s ...', handlerUrl);
         const handlerType = checker.getTypeAtLocation(handlerNode);
+
+        // 约定 defineHandler 的泛型顺序固定为 <Request, Response, Method>
+        // 若上游定义顺序变更，这里会静默解析错误
         const [requestType, responseType, methodType] = checker.getTypeArguments(handlerType);
         const handlerCategory = pascalCase(categoryUrl) || 'Index';
         const handlerDescription = handlerComment.description || handlerUrl.join(', ');
@@ -124,6 +130,8 @@ export class ApiGenerator {
         });
         const requestDataJsonSchema = this.apiDataToJsonSchema(requestData);
         const responseDataJsonSchema = this.apiDataToJsonSchema(responseData);
+
+        // 说明文档按“首段标题 + 空行 + 详情”拆分
         const handlerDescriptionDividerIndex = handlerDescription.indexOf('\n\n');
         const apiName = handlerDescriptionDividerIndex === -1 ? handlerDescription : handlerDescription.substring(0, handlerDescriptionDividerIndex);
         const apiDesc = handlerDescriptionDividerIndex === -1 ? '' : handlerDescription.substring(handlerDescriptionDividerIndex + 2);
@@ -162,6 +170,7 @@ export class ApiGenerator {
       };
     }
     const description = ts.displayPartsToString(symbol.getDocumentationComment(this.checker)).trim();
+    // JSDoc tag 统一收敛到 Map，方便按 @private 这类标签做开关
     const tags = symbol.getJsDocTags().map(item => {
       return {
         label: item.name,
@@ -182,6 +191,8 @@ export class ApiGenerator {
     keySymbol = type.symbol || type.aliasSymbol
   }) {
     const hasTypeFlag = (flag, _type = type) => (_type.flags & flag) === flag;
+
+    // valueSymbol 用于识别“实际值类型”，keySymbol 用于保留字段名和字段注释
     let valueSymbol = type.symbol || type.aliasSymbol;
     const keySymbolName = keySymbol?.getName() || '';
     let valueSymbolName = valueSymbol?.getName() || '';
@@ -237,8 +248,8 @@ export class ApiGenerator {
       };
     }
 
-    // 联合类型
-    // 布尔、枚举也会用这表示
+    // 联合类型：布尔字面量、枚举字面量都会走到这里
+    // 处理策略：忽略 null/undefined，用第一个成员推断基础类型，同时把所有字面量收集到 enum
     const rawUnionTypes = type.isUnion() && type.types || [];
     const unionTypes = rawUnionTypes.filter(item => !hasTypeFlag(ts.TypeFlags.Null, item) && !hasTypeFlag(ts.TypeFlags.Undefined, item));
     const isUnion = !!unionTypes.length;
@@ -269,6 +280,8 @@ export class ApiGenerator {
     const isNumber = hasTypeFlag(ts.TypeFlags.Number) || isNumberLiteral;
     const isBoolean = hasTypeFlag(ts.TypeFlags.Boolean) || hasTypeFlag(ts.TypeFlags.BooleanLiteral);
     const isLiteral = isStringLiteral || isNumberLiteral || isBigIntLiteral;
+
+    // object 兜底：只要不是数组/基础类型，且 TypeScript 视为 Object，就按对象递归
     const isObject = !isArray && !isString && !isNumber && !isBoolean && hasTypeFlag(ts.TypeFlags.Object) ||
     // 交集类型视为对象
     isIntersection;
@@ -279,6 +292,8 @@ export class ApiGenerator {
     const apiChildren = isArray ? [this.getApiDto({
       type: this.checker.getTypeArguments(type)[0]
     })] : isObject ? ii(() => {
+      // 这里使用了 TypeChecker 的内部能力来合并交集类型字段
+      // 若 TypeScript 内部 API 变化，这里是高风险点
       const childSymbols = this.checker.getAllPossiblePropertiesOfTypes(intersectionTypes.length ? intersectionTypes : [type]);
       return childSymbols.map(childSymbol => {
         const childType = this.checker.getTypeOfSymbol(childSymbol);
@@ -298,6 +313,7 @@ export class ApiGenerator {
     };
   }
   apiDataToJsonSchema(apiData, jsonSchema = {}) {
+    // 递归把内部 DTO 结构映射到 JSON Schema（以 object/array/primitive 三类分支处理）
     jsonSchema.description = apiData.desc;
     if (apiData.type === 'object') {
       jsonSchema.type = 'object';
@@ -322,7 +338,10 @@ export class ApiGenerator {
     for (const handle of handles) {
       for (const path of handle.path) {
         data[handle.category] = data[handle.category] || [];
-        data[handle.category].push(handle.handlerMethod === 'GET' ? {
+        data[handle.category].push(
+        // GET -> query；FILE -> form-data；其余 -> json body
+        // 此处是与 YApi 结构的协议转换层
+        handle.handlerMethod === 'GET' ? {
           method: handle.method.toUpperCase(),
           title: handle.name,
           markdown: handle.desc,
@@ -406,6 +425,7 @@ export class ApiGenerator {
             tags: [handle.category],
             summary: handle.name,
             description: handle.desc,
+            // 目前统一按 application/json 输出；上传类接口未转为 multipart/form-data
             requestBody: {
               content: {
                 'application/json': {

package/lib/cli/dev_util.js

@@ -7,7 +7,8 @@ export class DevUtil {
       const tsxPkgFile = require.resolve('tsx/package.json');
       const tsxJsFile = tsxPkgFile.replace('/package.json', '/dist/cli.js');
       const tsxCjsFile = tsxPkgFile.replace('/package.json', '/dist/cli.cjs');
-      return fs.existsSync(tsxCjsFile) ? tsxCjsFile : tsxJsFile;
+      const tsxMjsFile = tsxPkgFile.replace('/package.json', '/dist/cli.mjs');
+      return fs.existsSync(tsxCjsFile) ? tsxCjsFile : fs.existsSync(tsxMjsFile) ? tsxMjsFile : tsxJsFile;
     }), options.file], {
       cwd: options.cwd,
       stdio: 'inherit'

package/lib/core/ctx_storage.d.ts

@@ -1,3 +1,3 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { XHandler } from './types';
+import type { XHandler } from './types';
 export declare const ctxStorage: AsyncLocalStorage<XHandler.Context>;

package/lib/core/define_bus.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'node:events';
 declare class EventBus extends EventEmitter {
     onReturnOff(event: string, listener: (...args: any[]) => any): () => any;
 }
-export declare function defineBus<T extends Record<string, any>>(): StrictEventEmitter<EventBus, T, T, "addEventListener" | "removeEventListener", "on" | "addListener" | "once" | "removeListener" | "emit" | "off" | "onReturnOff">;
+export declare function defineBus<T extends Record<string, any>>(): StrictEventEmitter<EventBus, T, T, "addEventListener" | "removeEventListener", "on" | "addListener" | "removeListener" | "once" | "emit" | "off" | "onReturnOff">;
 declare const assignmentCompatibilityHack: unique symbol;
 interface TypeRecord<T, U, V> {
     ' _emitterType'?: T;

package/lib/core/define_cron.d.ts

@@ -1,2 +1,2 @@
-import { XCron } from './types';
+import type { XCron } from './types';
 export declare function defineCron(options: XCron.Options): XCron.Cron;

package/lib/core/define_task.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import assert from 'node:assert';
 import Queue from 'bull';
 import { ms } from 'vtils';
 import { x } from "../x";

package/lib/core/get_handler_url.js

@@ -1,7 +1,7 @@
-import { createUrlQueryString } from 'vtils';
-import { x } from "../x";
 // @ts-ignore
 
+import { createUrlQueryString } from 'vtils';
+import { x } from "../x";
 export function getHandlerUrl(path, query) {
   return `${x.env.APP_URL.replace(/\/+$/, '')}${path}${query ? `?${createUrlQueryString(query)}` : ''}`;
 }

package/lib/core/handler.js

@@ -125,11 +125,11 @@ export class Handler {
     };
     this.handleWs = async (_data, ctx) => {
       const dispose = new DisposeService();
-      ctx.ws.socket.on('message', async payload => {
+      ctx.ws.on('message', async payload => {
         try {
           const _ = JSON.parse(payload.toString('utf8'));
           const send = data => {
-            ctx.ws.socket.send(JSON.stringify({
+            ctx.ws.send(JSON.stringify({
               id: _.id,
               data: data
             }));
@@ -166,14 +166,14 @@ export class Handler {
           }
         } catch (err) {
           const _err = HttpError.isHttpError(err) ? err : new HttpError.InternalServerError();
-          ctx.ws.socket.send(JSON.stringify({
+          ctx.ws.send(JSON.stringify({
             statusCode: _err.statusCode,
             error: _err.name,
             message: _err.message
           }));
         }
       });
-      ctx.ws.socket.on('close', () => {
+      ctx.ws.on('close', () => {
         dispose.dispose();
       });
     };

package/lib/core/http_method.d.ts

@@ -1,3 +1,3 @@
-import { HTTPMethods } from 'fastify';
-import { XHandler } from './types';
+import type { HTTPMethods } from 'fastify';
+import type { XHandler } from './types';
 export declare const HandlerMethodToHttpMethod: Record<XHandler.Method, HTTPMethods>;

package/lib/core/server.d.ts

@@ -1,4 +1,4 @@
-import { XServer } from './types';
+import type { XServer } from './types';
 export declare class Server {
     readonly options: XServer.Options;
     private fastify;

package/lib/core/server.js

@@ -113,7 +113,7 @@ export class Server {
           url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
-          redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
+          redirect: (url, permanently) => res.redirect(url, permanently ? 301 : 302),
           ws: undefined,
           req: req,
           res: res
@@ -183,15 +183,13 @@ export class Server {
     if (Array.isArray(x.env.APP_STATIC_CONTENT)) {
       const staticContent = x.env.APP_STATIC_CONTENT;
       for (const item of staticContent) {
-        if (!item.method) {
-          item.method = 'GET';
-        }
-        if (!this.fastify.hasRoute({
-          method: item.method,
+        const methods = castArray(item.method);
+        if (!methods.some(method => this.fastify.hasRoute({
+          method,
           url: item.path
-        })) {
+        }))) {
           this.fastify.route({
-            method: item.method,
+            method: methods,
             url: item.path,
             handler: async (_req, res) => {
               if (!item.contentType && typeof item.content === 'string') {

package/lib/core/types.d.ts

@@ -1,6 +1,5 @@
 import type { IncomingHttpHeaders } from 'node:http';
 import type { MultipartFile } from '@fastify/multipart';
-import type { SocketStream } from '@fastify/websocket';
 import type { Queue } from 'bull';
 import type { CronJob } from 'cron';
 import type { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
@@ -8,6 +7,7 @@ import type { MsValue } from 'vtils';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
 import type * as vae from 'vtils/vae';
 import type { yup } from 'vtils/validator';
+import type { WebSocket } from 'ws';
 import type { BasePlugin } from '../plugins/base';
 import type { BaseService } from '../services/base';
 import type { DisposeService } from '../services/dispose';
@@ -92,7 +92,7 @@ export declare namespace XHandler {
         /**
          * WS
          */
-        ws: SocketStream;
+        ws: WebSocket;
         /**
          * Fastify Request
          */

package/lib/plugins/base.d.ts

@@ -1,4 +1,4 @@
-import { FastifyInstance } from 'fastify';
+import type { FastifyInstance } from 'fastify';
 export interface BasePlugin {
     readonly register: (fastify: FastifyInstance<any, any, any, any, any>) => void;
 }

package/lib/plugins/compress.d.ts

@@ -1,6 +1,6 @@
-import { FastifyCompressOptions } from '@fastify/compress';
-import { FastifyInstance } from 'fastify';
-import { BasePlugin } from './base';
+import { type FastifyCompressOptions } from '@fastify/compress';
+import type { FastifyInstance } from 'fastify';
+import type { BasePlugin } from './base';
 export interface CompressPluginOptions extends FastifyCompressOptions {
 }
 /**

package/lib/plugins/compress.js

@@ -7,6 +7,6 @@ export class CompressPlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(FastifyCompress, this.options);
+    fastify.register(FastifyCompress, this.options ?? {});
   }
 }

package/lib/plugins/cookie.d.ts

@@ -1,6 +1,6 @@
-import { FastifyCookieOptions } from '@fastify/cookie';
-import { FastifyInstance } from 'fastify';
-import { BasePlugin } from './base';
+import { type FastifyCookieOptions } from '@fastify/cookie';
+import type { FastifyInstance } from 'fastify';
+import type { BasePlugin } from './base';
 export interface CookiePluginOptions extends FastifyCookieOptions {
 }
 /**

package/lib/plugins/cookie.js

@@ -7,6 +7,6 @@ export class CookiePlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(FastifyCookie, this.options);
+    fastify.register(FastifyCookie, this.options ?? {});
   }
 }

package/lib/plugins/cors.d.ts

@@ -1,7 +1,7 @@
-import { FastifyCorsOptions } from '@fastify/cors';
-import { FastifyInstance } from 'fastify';
-import { MsValue } from 'vtils';
-import { BasePlugin } from './base';
+import { type FastifyCorsOptions } from '@fastify/cors';
+import type { FastifyInstance } from 'fastify';
+import { type MsValue } from 'vtils';
+import type { BasePlugin } from './base';
 export interface CorsPluginOptions extends FastifyCorsOptions {
     /**
      * 允许的来源，支持位于开头的 * 通配符

package/lib/plugins/cors.js

@@ -1,6 +1,5 @@
 import FastifyCors from '@fastify/cors';
-import { memoize, omitStrict } from 'vtils';
-import { ms } from 'vtils';
+import { memoize, ms, omitStrict } from 'vtils';
 /**
  * CORS 支持插件
  */

package/lib/plugins/file_parser.d.ts

@@ -1,6 +1,6 @@
-import { FastifyMultipartOptions } from '@fastify/multipart';
-import { FastifyInstance } from 'fastify';
-import { BasePlugin } from './base';
+import { type FastifyMultipartOptions } from '@fastify/multipart';
+import type { FastifyInstance } from 'fastify';
+import type { BasePlugin } from './base';
 export { MultipartFile } from '@fastify/multipart';
 export interface FileParserPluginOptions extends FastifyMultipartOptions {
 }

package/lib/plugins/form_body_parser.d.ts

@@ -1,6 +1,6 @@
-import { FastifyFormbodyOptions } from '@fastify/formbody';
-import { BasePlugin } from './base';
-import { FastifyInstance } from 'fastify';
+import { type FastifyFormbodyOptions } from '@fastify/formbody';
+import type { FastifyInstance } from 'fastify';
+import type { BasePlugin } from './base';
 export interface FormBodyParserPluginOptions extends FastifyFormbodyOptions {
 }
 /**

package/lib/plugins/form_body_parser.js

@@ -7,6 +7,6 @@ export class FormBodyParserPlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(FastifyFormBody, this.options);
+    fastify.register(FastifyFormBody, this.options || {});
   }
 }

package/lib/plugins/ws_parser.d.ts

@@ -1,6 +1,6 @@
-import { WebsocketPluginOptions } from '@fastify/websocket';
-import { BasePlugin } from './base';
-import { FastifyInstance } from 'fastify';
+import { type WebsocketPluginOptions } from '@fastify/websocket';
+import type { FastifyInstance } from 'fastify';
+import type { BasePlugin } from './base';
 export interface WsParserPluginOptions extends WebsocketPluginOptions {
 }
 /**

package/lib/plugins/ws_parser.js

@@ -7,6 +7,6 @@ export class WsParserPlugin {
     this.options = options;
   }
   register(fastify) {
-    fastify.register(FastifyWebsocket, this.options);
+    fastify.register(FastifyWebsocket, this.options ?? {});
   }
 }

package/lib/plugins/xml_parser.d.ts

@@ -1,6 +1,6 @@
-import { BasePlugin } from './base';
-import { FastifyInstance } from 'fastify';
-import { X2jOptions } from 'fast-xml-parser';
+import { type X2jOptions } from 'fast-xml-parser';
+import type { FastifyInstance } from 'fastify';
+import type { BasePlugin } from './base';
 export interface XmlParserPluginOptions extends Partial<X2jOptions> {
     /**
      * 要处理的 `Content-Type`

package/lib/plugins/xml_parser.js

@@ -14,7 +14,7 @@ export class XmlParserPlugin {
       ...parseOptions
     } = this.options || {};
     const xmlParser = new XMLParser(parseOptions);
-    fastify.addContentTypeParser(contentType, (req, payload, done) => {
+    fastify.addContentTypeParser(contentType, (_req, payload, done) => {
       let body = '';
       const handleError = err => done(err);
       const handleData = data => body += data;

package/lib/services/captcha.d.ts

@@ -1,5 +1,5 @@
 import { type MsValue } from 'vtils';
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export type CaptchaServiceGenerateCharset = '09' | '19' | 'az' | 'AZ' | 'aZ' | '0z' | '0Z' | '1z' | '1Z';
 export interface CaptchaServiceGeneratePayload<T> {
     /**

package/lib/services/captcha.js

@@ -8,9 +8,9 @@ export class CaptchaService {
     this.charsetMap = {
       '09': '0123456789'.split(''),
       '19': '123456789'.split(''),
-      'az': 'abcdefghijklmnopqrstuvwxyz'.split(''),
-      'AZ': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
-      'aZ': 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      az: 'abcdefghijklmnopqrstuvwxyz'.split(''),
+      AZ: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      aZ: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
       '0z': '0123456789abcdefghijklmnopqrstuvwxyz'.split(''),
       '0Z': '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
       '1z': '123456789abcdefghijklmnopqrstuvwxyz'.split(''),

package/lib/services/crypto.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export declare class CryptoService implements BaseService {
     serviceName: string;
     /**

package/lib/services/dingtalk.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export interface DingtalkServiceOptions {
     /**
      * 访问口令。

package/lib/services/dingtalk.js

@@ -1,4 +1,4 @@
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 import got from 'got';
 export class DingtalkService {
   constructor(options) {

package/lib/services/dispose.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export interface DisposeServiceOptions {
     disposeOnExit?: boolean;
 }

package/lib/services/emoji.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export declare class EmojiService implements BaseService {
     serviceName: string;
     unify(text: string): string;

package/lib/services/emoji.js

@@ -1,5 +1,5 @@
 // softbankOrDocomoOrAuOrGoogleToUnified
-// prettier-ignore
+// biome-ignore format: x
 const softbankOrDocomoOrAuOrGoogleToUnified = {
   "": "#️⃣",
   "󾠬": "#️⃣",

package/lib/services/html.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export declare class HtmlService implements BaseService {
     serviceName: string;
     escape(html: string): string;

package/lib/services/log.d.ts

@@ -1,5 +1,5 @@
-import { Merge } from 'vtils/types';
-import { BaseService } from './base';
+import type { Merge } from 'vtils/types';
+import type { BaseService } from './base';
 export type LogServiceLevel = 'error' | 'info' | 'success';
 export type LogServiceDesc = Record<string, any> | any[];
 export type LogServiceWriter = 'file' | 'console';

package/lib/services/log.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import fs from 'fs-extra';
 import { memoize } from 'vtils';
 import { formatDate } from 'vtils/date';

package/lib/services/mail.d.ts

@@ -1,5 +1,5 @@
 import nodemailer from 'nodemailer';
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export interface MailServiceOptions {
     host: string;
     port: number;

package/lib/services/pay.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export interface PayServiceOptions {
     /** 支付宝 */
     alipay?: {
@@ -9,17 +9,17 @@ export interface PayServiceOptions {
         /** 支付宝公钥，用于对返回结果验签 */
         publicKey: string;
     };
-    /** 微信支付 */
+    /** 微信支付(APIv3)，未实现回调验签，因此验证微信支付身份块不需要关心 */
     wepay?: {
         /** 公众号 APPID */
         appId: string;
         /** 商户 ID */
         merchantId: string;
-        /** 商户应用私钥 */
+        /** 商户API证书私钥 */
         privateKey: string;
-        /** 证书序列号 */
+        /** 商户API证书序列号 */
         certificateSerialNumber: string;
-        /** 秘钥，用于解密请求平台证书、回调数据 */
+        /** 密钥，用于解密回调数据 */
         secretKey: string;
     };
 }
@@ -48,9 +48,7 @@ export interface PayServicePrepareWepayOptions {
     totalMoney: number;
     /** 通知地址(POST) */
     notifyUrl: string;
-    /** 对应公众号的 appId */
-    appId?: string;
-    /** 对应公众号用户的 openid */
+    /** 公众号用户的 openid */
     openid: string;
 }
 export interface PayServicePrepareWepayResult {

package/lib/services/pay.js

@@ -1,4 +1,4 @@
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 import AlipaySdk from 'alipay-sdk';
 import AlipayFormData from 'alipay-sdk/lib/form';
 import got from 'got';
@@ -39,9 +39,8 @@ export class PayService {
     };
   }
   async prepareWepay(options) {
-    const appId = options.appId || this.options.wepay.appId;
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
-      appid: appId,
+      appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
@@ -60,7 +59,7 @@ export class PayService {
       throw new Error(error);
     }
     const params = {
-      appId: appId,
+      appId: this.options.wepay.appId,
       timestamp: String(Math.round(Date.now() / 1000)),
       nonceStr: Math.random().toString().substr(2, 12),
       package: `prepay_id=${res.prepay_id}`,

package/lib/services/rate_limit.d.ts

@@ -1,5 +1,5 @@
-import { MsValue } from 'vtils';
-import { BaseService } from './base';
+import { type MsValue } from 'vtils';
+import type { BaseService } from './base';
 export interface RateLimitServiceLimitByCountOptions {
     key: string;
     ttl: MsValue;

package/lib/services/redis.d.ts

@@ -1,5 +1,5 @@
-import { BaseService } from './base';
-import { Redis, RedisOptions } from 'ioredis';
+import { Redis, type RedisOptions } from 'ioredis';
+import type { BaseService } from './base';
 export interface RedisServiceOptions extends RedisOptions {
 }
 export declare class RedisService extends Redis implements BaseService {

package/lib/services/sensitive_words.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export interface SensitiveWordsServiceOptions {
     /** 敏感词列表 */
     words: string[];
@@ -7,7 +7,6 @@ export interface SensitiveWordsServiceOptions {
  * 敏感词服务。
  */
 export declare class SensitiveWordsService implements BaseService {
-    private options;
     serviceName: string;
     private sensitiveWords;
     constructor(options: SensitiveWordsServiceOptions);

package/lib/services/sensitive_words.js

@@ -8,7 +8,6 @@ const toRegExp = memoize(re => new RegExp(re.substring(1, re.length - 1)), re =>
  */
 export class SensitiveWordsService {
   constructor(options) {
-    this.options = options;
     this.serviceName = 'sensitiveWords';
     this.sensitiveWords = [];
     this.sensitiveWords = uniq(options.words.map(word => word.toLowerCase()));

package/lib/services/sms.d.ts

@@ -1,4 +1,4 @@
-import { BaseService } from './base';
+import type { BaseService } from './base';
 export type SmsServiceProvider = 'tencentCloud';
 export type SmsServiceOptions = {
     provider: 'tencentCloud';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.118.0",
+  "version": "2.119.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -12,64 +12,55 @@
   "files": [
     "lib"
   ],
-  "scripts": {
-    "build": "haoma compile",
-    "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
-    "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
-    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
-    "test_api_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
-    "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
-    "up_prisma": "tpm dlx npm-check-updates '/.*prisma.*/' -i --target semver"
-  },
   "dependencies": {
-    "@jayfong/x-request": "^2.118.0",
-    "@aws-sdk/client-s3": "^3.1079.0",
-    "@aws-sdk/s3-request-presigner": "^3.1079.0",
-    "@fastify/compress": "^7.0.3",
-    "@fastify/cookie": "^9.4.0",
-    "@fastify/cors": "^8.3.0",
-    "@fastify/formbody": "^7.4.0",
-    "@fastify/multipart": "^7.7.0",
-    "@fastify/websocket": "^8.1.0",
-    "@paralleldrive/cuid2": "^3.0.4",
+    "@aws-sdk/client-s3": "^3.1166.0",
+    "@aws-sdk/s3-request-presigner": "^3.1166.0",
+    "@fastify/compress": "^9.3.0",
+    "@fastify/cookie": "^11.1.5",
+    "@fastify/cors": "^11.4.1",
+    "@fastify/formbody": "^9.0.1",
+    "@fastify/multipart": "^10.1.8",
+    "@fastify/websocket": "^11.3.7",
+    "@jayfong/x-request": "2.119.0",
+    "@paralleldrive/cuid2": "^3.3.0",
     "@prisma/adapter-mariadb": "^7.10.1",
     "@prisma/client": "^7.10.1",
     "@types/busboy": "^0.3.2",
-    "@types/http-errors": "^1.8.2",
+    "@types/http-errors": "^2.0.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/nodemailer": "^6.4.4",
-    "@types/ws": "^8.5.5",
+    "@types/ws": "^8.18.2",
     "alipay-sdk": "^3.2.0",
     "bufferutil": "^4.0.6",
-    "bull": "^4.10.4",
+    "bull": "^4.16.5",
     "chokidar": "^3.5.3",
     "comment-parser": "^1.3.1",
     "compressing": "^1.5.1",
-    "cron": "^3.1.6",
+    "cron": "^4.4.0",
     "cuid": "^2.1.8",
     "debug": "^4.3.4",
-    "esbuild": "^0.25.5",
+    "esbuild": "^0.28.2",
     "esbuild-register": "^3.6.0",
     "execa": "^5.1.1",
     "exit-hook": "^2.2.1",
     "fast-escape-html": "^1.1.0",
-    "fast-xml-parser": "^4.2.5",
-    "fastify": "^4.19.2",
+    "fast-xml-parser": "^5.12.0",
+    "fastify": "^5.12.8",
     "fs-extra": "^10.0.1",
     "globby": "^11",
     "got": "^11.8.2",
-    "http-errors": "^2.0.0",
+    "http-errors": "^2.0.1",
     "inquirer": "^12.5.0",
     "inquirer-autocomplete-standalone": "^0.8.1",
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^8.5.1",
     "lru-cache": "^10.0.0",
     "lz-string": "^1.4.4",
-    "mime": "^4.1.0",
+    "mime": "^4.1.2",
     "mini-svg-data-uri": "^1.4.4",
     "node-ssh": "^13.1.0",
     "nodemailer": "^6.7.3",
-    "pino-pretty": "^10.0.1",
+    "pino-pretty": "^13.2.0",
     "pinyin-pro": "^3.26.0",
     "pirates": "^4.0.6",
     "prisma": "^7.10.1",
@@ -80,12 +71,12 @@
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs-sms": "^4.0.681",
     "ts-morph": "^27.0.2",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.15",
     "unplugin-macros": "^0.16.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
     "vtils": "^4.138.0",
-    "yaml": "^2.3.1",
+    "yaml": "^2.9.1",
     "yargs": "^17.4.1"
   },
   "devDependencies": {
@@ -104,5 +95,15 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "mv ./node_modules/.x ./node_modules/.x2 || true && haoma compile && mv ./node_modules/.x2 ./node_modules/.x || true",
+    "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
+    "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
+    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
+    "test_api_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
+    "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
+    "up_prisma": "tpm dlx npm-check-updates '/.*prisma.*/' -i --target semver",
+    "up_fastify": "tpm dlx npm-check-updates '/.*fastify.*/' -i --target latest"
   }
-}
+}