@jayfong/x-server 2.12.14 → 2.12.16

package/lib/_cjs/services/pay.js

@@ -1,27 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.PayService = void 0;
-
 var _form = _interopRequireDefault(require("alipay-sdk/lib/form"));
-
 var _alipaySdk = _interopRequireDefault(require("alipay-sdk"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
-
 var _got = _interopRequireDefault(require("got"));
-
 var _http_error = require("../core/http_error");
-
 class PayService {
   constructor(options) {
     this.options = options;
     this.serviceName = 'pay';
     this.alipaySdk = void 0;
   }
-
   async prepareAlipay(options) {
     if (!this.alipaySdk) {
       this.alipaySdk = new _alipaySdk.default({
@@ -30,15 +22,12 @@ class PayService {
         alipayPublicKey: this.options.alipay.publicKey
       });
     }
-
     const formData = new _form.default();
     formData.setMethod('get');
     formData.addField('notifyUrl', options.notifyUrl);
-
     if (options.returnUrl) {
       formData.addField('returnUrl', options.returnUrl);
     }
-
     formData.addField('bizContent', {
       outTradeNo: options.tradeNumber,
       productCode: 'FAST_INSTANT_TRADE_PAY',
@@ -54,7 +43,6 @@ class PayService {
       payUrl: payUrl
     };
   }
-
   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', {
@@ -72,12 +60,10 @@ class PayService {
         openid: options.openid
       }
     });
-
     if (!res || !res.prepay_id) {
       const error = res && res.message || '支付错误';
       throw new Error(error);
     }
-
     const params = {
       appId: appId,
       timestamp: String(Math.round(Date.now() / 1000)),
@@ -91,57 +77,47 @@ class PayService {
       payParams: params
     };
   }
-
   verifyNotifyData(data) {
     try {
       if (!data || typeof data !== 'object') {
         return false;
-      } // 支付宝
-      // https://opendocs.alipay.com/open/270/105902
-
+      }
 
+      // 支付宝
+      // https://opendocs.alipay.com/open/270/105902
       if (data.passback_params === 'alipay') {
         var _this$alipaySdk;
-
         if (!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data))) {
           return false;
         }
-
         return {
           channelOrderNo: data.trade_no
         };
-      } // 微信支付
-      // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_5.shtml
-
+      }
 
+      // 微信支付
+      // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_5.shtml
       if (data.resource) {
         const params = JSON.parse(this.wepayDecrypt(data.resource));
-
         if (params.attach === 'wepay') {
           return {
             channelOrderNo: params.transaction_id
           };
         }
-
         return false;
       }
-
       return false;
     } catch {
       return false;
     }
   }
-
   verifyNotifyDataOrFail(data, message) {
     const res = this.verifyNotifyData(data);
-
     if (!res) {
       throw new _http_error.HttpError.BadRequest(message);
     }
-
     return res;
   }
-
   async getOrderInfo(payload) {
     // 微信支付
     // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_2.shtml
@@ -152,10 +128,10 @@ class PayService {
         orderNo: res.out_trade_no,
         status: res.trade_state === 'SUCCESS' ? 'success' : 'fail'
       };
-    } // 支付宝
-    // https://opendocs.alipay.com/open/028woa?scene=common&pathHash=dbf247eb
-
+    }
 
+    // 支付宝
+    // https://opendocs.alipay.com/open/028woa?scene=common&pathHash=dbf247eb
     const res = await this.alipaySdk.exec('alipay.trade.query', {
       biz_content: payload.orderNo ? {
         out_trade_no: payload.orderNo
@@ -169,25 +145,20 @@ class PayService {
       status: res.trade_status === 'TRADE_SUCCESS' || res.trade_status === 'TRADE_FINISHED' ? 'success' : 'fail'
     };
   }
-
   wepaySign(data) {
     return _crypto.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);
-
     decipherIv.setAuthTag(Buffer.from(authTag));
     decipherIv.setAAD(Buffer.from(payload.associated_data));
     const decryptStr = decipherIv.update(data, undefined, 'utf8');
     decipherIv.final();
     return decryptStr;
   }
-
   async wepayRequest(url, data) {
     const path = url.replace(/^https?:\/\/[^/]+/, '');
     const method = data == null ? 'GET' : 'POST';
@@ -218,7 +189,5 @@ class PayService {
     });
     return res;
   }
-
 }
-
 exports.PayService = PayService;

package/lib/_cjs/services/rate_limit.js

@@ -2,43 +2,31 @@
 
 exports.__esModule = true;
 exports.RateLimitService = void 0;
-
 var _http_error = require("../core/http_error");
-
 var _x = require("../x");
-
 class RateLimitService {
   constructor() {
     this.serviceName = 'rateLimit';
   }
-
   async limitByCount(options) {
     const cacheKey = `rateLimit_${options.key}`;
     const remainingCount = await _x.x.cache.get(cacheKey);
-
     if (remainingCount == null) {
       await _x.x.cache.set(cacheKey, options.count, options.ttl);
       return options.count;
     }
-
     if (remainingCount === 0) {
       return 0;
     }
-
     await _x.x.cache.decrease(cacheKey);
     return remainingCount - 1;
   }
-
   async limitByCountOrFail(options) {
     const count = await this.limitByCount(options);
-
     if (count === 0) {
       throw new _http_error.HttpError.Forbidden(options.message);
     }
-
     return count;
   }
-
 }
-
 exports.RateLimitService = RateLimitService;

package/lib/_cjs/services/redis.js

@@ -2,15 +2,11 @@
 
 exports.__esModule = true;
 exports.RedisService = void 0;
-
 var _ioredis = require("ioredis");
-
 class RedisService extends _ioredis.Redis {
   constructor(...args) {
     super(...args);
     this.serviceName = 'redis';
   }
-
 }
-
 exports.RedisService = RedisService;

package/lib/_cjs/services/request.js

@@ -5,22 +5,17 @@ var _exportNames = {
   RequestService: true
 };
 exports.RequestService = void 0;
-
 var _xRequest = require("@jayfong/x-request");
-
 Object.keys(_xRequest).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _xRequest[key]) return;
   exports[key] = _xRequest[key];
 });
-
 class RequestService extends _xRequest.XRequest {
   constructor(...args) {
     super(...args);
     this.serviceName = 'request';
   }
-
 }
-
 exports.RequestService = RequestService;

package/lib/_cjs/services/sensitive_words.js

@@ -1,14 +1,10 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.SensitiveWordsService = void 0;
-
 var _mintFilter = _interopRequireDefault(require("mint-filter"));
-
 var _vtils = require("vtils");
-
 /**
  * 敏感词服务。
  */
@@ -18,30 +14,32 @@ class SensitiveWordsService {
     this.serviceName = 'sensitiveWords';
     this.mint = void 0;
   }
+
   /**
    * 文本转换。
    */
-
-
   transform(text) {
-    return (// 移除空白字符
-      (0, _vtils.removeBlankChars)( // 移除非单词字符
-      (0, _vtils.removeNonWordChars)( // 全角转半角
-      (0, _vtils.toHalfWidthString)(text))) // 转小写
-      .toLowerCase() // 叠词归一
+    return (
+      // 移除空白字符
+      (0, _vtils.removeBlankChars)(
+      // 移除非单词字符
+      (0, _vtils.removeNonWordChars)(
+      // 全角转半角
+      (0, _vtils.toHalfWidthString)(text)))
+      // 转小写
+      .toLowerCase()
+      // 叠词归一
       .replace(/(.)\1+/g, '$1')
     );
   }
+
   /**
    * 处理文本，敏感词将被替换为 * 号。
    */
-
-
   async process(text) {
     if (!this.mint) {
       this.mint = new _mintFilter.default(this.options.words);
     }
-
     const res = await this.mint.filter(this.transform(text), {
       every: true,
       replace: true,
@@ -49,16 +47,14 @@ class SensitiveWordsService {
     });
     return res.text;
   }
+
   /**
    * 验证文本是否包含敏感词。
    */
-
-
   async validate(text, every) {
     if (!this.mint) {
       this.mint = new _mintFilter.default(this.options.words);
     }
-
     const res = await this.mint.filter(this.transform(text), {
       replace: false,
       every: !!every,
@@ -69,7 +65,5 @@ class SensitiveWordsService {
       words: res.words
     };
   }
-
 }
-
 exports.SensitiveWordsService = SensitiveWordsService;

package/lib/_cjs/x.js

@@ -1,24 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.x = void 0;
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _os = _interopRequireDefault(require("os"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _dispose = require("./services/dispose");
-
 var _emoji = require("./services/emoji");
-
 var _log = require("./services/log");
-
 var _request = require("./services/request");
-
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 const x = {
   appId: env.APP_ID,
@@ -32,9 +23,7 @@ const x = {
   }
 };
 exports.x = x;
-
 _fsExtra.default.ensureDirSync(x.dataDir);
-
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
 }), new _log.LogService(), new _emoji.EmojiService(), new _request.RequestService());

package/lib/cli/api_generator.js

@@ -9,17 +9,15 @@ export class ApiGenerator {
   constructor() {
     this.debug = createDebug('api');
     this.cwd = process.cwd();
+    // cwd = '/Users/admin/Documents/jfWorks/x-server-test'
     this.project = void 0;
   }
-
   getTypeBySymbol(symbol) {
     return symbol.getTypeAtLocation(symbol.getDeclarations()[0] || symbol.getValueDeclarationOrThrow());
   }
-
   getComment(declaration) {
     var _declaration$getLeadi;
-
-    const text = ((declaration == null ? void 0 : (_declaration$getLeadi = declaration.getLeadingCommentRanges()[0]) == null ? void 0 : _declaration$getLeadi.getText()) || '').trim();
+    const text = ((declaration == null || (_declaration$getLeadi = declaration.getLeadingCommentRanges()[0]) == null ? void 0 : _declaration$getLeadi.getText()) || '').trim();
     const comment = parseComment.parse(text)[0];
     const description = (comment == null ? void 0 : comment.description) || '';
     const tags = new Map();
@@ -32,16 +30,12 @@ export class ApiGenerator {
       tags: tags
     };
   }
-
   getCommentBySymbol(symbol) {
     var _this$getComment;
-
     return ((_this$getComment = this.getComment(symbol.getDeclarations()[0])) == null ? void 0 : _this$getComment.description) || '';
   }
-
   typeToApiData(type, _symbol) {
     var _type$getSymbol, _type$getSymbol2, _type$getSymbol3;
-
     // ws
     if (((_type$getSymbol = type.getSymbol()) == null ? void 0 : _type$getSymbol.getName()) === 'SocketStream') {
       return {
@@ -52,12 +46,11 @@ export class ApiGenerator {
         children: [],
         enum: []
       };
-    } // XFile
-
+    }
 
+    // XFile
     if (((_type$getSymbol2 = type.getSymbol()) == null ? void 0 : _type$getSymbol2.getName()) === 'MultipartFile') {
       const symbol = _symbol || type.getSymbol();
-
       return {
         name: 'file',
         desc: symbol && this.getCommentBySymbol(symbol) || '',
@@ -67,25 +60,22 @@ export class ApiGenerator {
         enum: []
       };
     }
-
     let isRequired = true;
     let isUnion = type.isUnion();
     const unionTypes = isUnion ? type.getUnionTypes().filter(item => !item.isBooleanLiteral() && !item.isNull() && !item.isUndefined()) : [];
     isUnion = !!unionTypes.length;
-
     if (isUnion) {
       if (unionTypes.length === 1 && !unionTypes[0].isLiteral()) {
         isUnion = false;
-      } // 兼容 prisma 生成的类型用 null 表示可选
-
-
-      isRequired = unionTypes.length === type.getUnionTypes().length; // 必须用 getBaseTypeOfLiteralType 获取枚举字面量的原始类型
-
+      }
+      // 兼容 prisma 生成的类型用 null 表示可选
+      isRequired = unionTypes.length === type.getUnionTypes().length;
+      // 必须用 getBaseTypeOfLiteralType 获取枚举字面量的原始类型
       type = unionTypes[0].getBaseTypeOfLiteralType();
     }
-
     const isEnum = type.isEnum();
-    const enumData = isEnum ? // @ts-ignore
+    const enumData = isEnum ?
+    // @ts-ignore
     type.compilerType.types.reduce((res, item) => {
       res[item.getSymbol().getName()] = item.value;
       return res;
@@ -98,11 +88,10 @@ export class ApiGenerator {
     const isString = isEnum ? typeof enumValues[0] === 'string' : type.isString() || ['Date'].includes(((_type$getSymbol3 = type.getSymbol()) == null ? void 0 : _type$getSymbol3.getName()) || '');
     const isNumber = isEnum ? typeof enumValues[0] === 'number' : type.isNumber();
     const isBoolean = type.isBoolean() || type.isUnion() && type.getUnionTypes().some(item => item.isBooleanLiteral()) && type.getUnionTypes().every(item => item.isBooleanLiteral() || item.isNull() || item.isUndefined());
-    const isObject = !isArray && !isString && !isNumber && !isBoolean && type.isObject() || // 将交集类型视为对象
+    const isObject = !isArray && !isString && !isNumber && !isBoolean && type.isObject() ||
+    // 将交集类型视为对象
     isIntersection;
-
     const symbol = _symbol || type.getSymbol();
-
     const apiName = (symbol == null ? void 0 : symbol.getName()) || '__type';
     const apiDesc = [symbol && this.getCommentBySymbol(symbol), isEnum && `枚举：${enumKeys.map((key, index) => `${key}->${enumValues[index]}`).join('; ')}`].filter(Boolean).join('\n');
     const apiEnum = isUnion ? unionTypes.map(t => t.getLiteralValue()) : isEnum ? enumValues : [];
@@ -113,20 +102,21 @@ export class ApiGenerator {
       const compilerFactory = context.compilerFactory;
       const rawChecker = type.compilerType.checker;
       let symbols = [];
-
       if (intersectionTypes) {
         // https://github.com/microsoft/TypeScript/issues/38184
-        symbols = rawChecker.getAllPossiblePropertiesOfTypes(intersectionTypes.map(item => item.compilerType)) // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
+        symbols = rawChecker.getAllPossiblePropertiesOfTypes(intersectionTypes.map(item => item.compilerType))
+        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
         .map(symbol => compilerFactory.getSymbol(symbol));
       } else {
         // symbols = type.getApparentProperties()
         // https://github.com/microsoft/TypeScript/issues/38184
-        symbols = rawChecker.getAllPossiblePropertiesOfTypes([type.compilerType]) // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
+        symbols = rawChecker.getAllPossiblePropertiesOfTypes([type.compilerType])
+        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
         .map(symbol => compilerFactory.getSymbol(symbol));
       }
-
       return symbols.map(symbol => {
-        return this.typeToApiData(!symbol.compilerSymbol.declarations ? // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
+        return this.typeToApiData(!symbol.compilerSymbol.declarations ?
+        // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
         compilerFactory.getType(symbol.compilerSymbol.type) : this.getTypeBySymbol(symbol), symbol);
       });
     }) : [];
@@ -139,10 +129,8 @@ export class ApiGenerator {
       children: apiChildren
     };
   }
-
   apiDataToJsonSchema(apiData, jsonSchema = {}) {
     jsonSchema.description = apiData.desc;
-
     if (apiData.type === 'object') {
       jsonSchema.type = 'object';
       jsonSchema.properties = apiData.children.reduce((res, item) => {
@@ -156,18 +144,14 @@ export class ApiGenerator {
       jsonSchema.items = apiData.children.map(item => this.apiDataToJsonSchema(item))[0];
     } else {
       jsonSchema.type = apiData.type;
-
       if (apiData.enum.length) {
         jsonSchema.enum = apiData.enum;
       }
     }
-
     return jsonSchema;
   }
-
   genYApiData(handles) {
     const data = {};
-
     for (const handle of handles) {
       data[handle.category] = data[handle.category] || [];
       data[handle.category].push(handle.handlerMethod === 'GET' ? {
@@ -221,14 +205,12 @@ export class ApiGenerator {
         res_body: JSON.stringify(handle.responseDataJsonSchema)
       });
     }
-
     return Object.keys(data).map(cat => ({
       name: cat,
       desc: cat,
       list: data[cat]
     }));
   }
-
   async generate() {
     this.debug('启动项目...');
     this.project = new ts.Project({
@@ -240,11 +222,9 @@ export class ApiGenerator {
     const handlerGroup = sourceFile.getExportSymbols();
     const handles = [];
     this.debug('生成API文档...');
-
     for (const handlerList of handlerGroup) {
       const handlerListSourceFile = this.getTypeBySymbol(handlerList).getProperties()[0].getDeclarations()[0].getSourceFile();
       const basePath = `/${handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1].replace(/(^|\/)index$/, '/').split('/').map(v => snakeCase(v)).join('/')}/`.replace(/\/{2,}/g, '/');
-
       for (const handler of handlerListSourceFile.getVariableStatements().filter(item => item.isExported())) {
         // 重要：这一步必须，先调一遍 getText 获取看到的对象，后续对于复杂定义才不会报错
         handler.getDeclarations().forEach(exp => {
@@ -255,12 +235,10 @@ export class ApiGenerator {
         this.debug('生成接口: %s ...', handlerPath);
         const [requestType, responseType, methodType] = handlerExp.getType().getTypeArguments();
         const handlerComment = this.getComment(handlerExp.getParent().getParent());
-
         if (handlerComment.tags.has('private')) {
           this.debug('跳过生成接口: %s', `${handlerPath}`);
           continue;
         }
-
         const handlerCategory = pascalCase(basePath) || 'Index';
         const handlerName = handlerComment.description || handlerPath;
         const handlerMethod = methodType.getLiteralValueOrThrow();
@@ -282,7 +260,6 @@ export class ApiGenerator {
         });
       }
     }
-
     this.debug('写入文件...');
     await Promise.all([fs.outputJSON(path.join(this.cwd, 'temp/api.json'), handles, {
       spaces: 2
@@ -290,5 +267,6 @@ export class ApiGenerator {
       spaces: 2
     })]);
   }
+}
 
-} // new ApiGenerator().generate()
+// new ApiGenerator().generate()