@jayfong/x-server 2.12.14 → 2.12.16

package/lib/services/cache.js

@@ -8,10 +8,10 @@ export class CacheService {
     this.prefix = void 0;
     this.prefix = `${x.appId}:`;
   }
-
   toRedisKey(key) {
     return `${this.prefix}${Array.isArray(key) ? key.join('_') : String(key)}`;
   }
+
   /**
    * 设置缓存内容。对象类内容尽量避免使用，以免造成问题。
    *
@@ -20,68 +20,59 @@ export class CacheService {
    * @param ttl 缓存时间
    * @returns 返回设置的缓存内容
    */
-
-
   async set(key, value, ttl = this.options.ttl) {
     const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
-
     if (redisTtl) {
       const redisKey = this.toRedisKey(key);
       const redisValue = JSON.stringify(value);
-      await x.redis.set(redisKey, redisValue, // 毫秒
+      await x.redis.set(redisKey, redisValue,
+      // 毫秒
       'PX', ms(redisTtl));
     }
-
     return value;
   }
+
   /**
    * 存储值然后返回其对应的键，该键 URL 友好。
    *
    * @param value 值
    * @param ttl 存活时间
    */
-
-
   async save(value, ttl = this.options.ttl) {
     const key = `X__${cuid()}`;
     await this.set(key, typeof value === 'function' ? await value(key) : value, ttl);
     return key;
   }
+
   /**
    * 获取缓存内容。
    *
    * @param key 键
    * @returns 返回获取到的缓存内容
    */
-
-
   async get(key) {
     const redisKey = this.toRedisKey(key);
     const gotValue = await x.redis.get(redisKey);
-
     if (gotValue) {
       try {
         return JSON.parse(gotValue);
       } catch {}
     }
-
     return null;
   }
+
   /**
    * 获取多个缓存内容。
    *
    * @param keys 键
    * @returns 返回获取到的缓存内容
    */
-
-
   async getMany(...keys) {
     const redisKeys = keys.map(key => this.toRedisKey(key));
     if (!redisKeys.length) return [];
     const gotValues = await x.redis.mget(...redisKeys);
     return gotValues.map(value => {
       if (value == null) return null;
-
       try {
         return JSON.parse(value);
       } catch {
@@ -89,18 +80,18 @@ export class CacheService {
       }
     });
   }
+
   /**
    * 获取距离过期时间的毫秒数（未设置过期时间返回-1，键不存在返回-2）。
    *
    * @param key 键
    * @returns 返回距离过期时间的毫秒数
    */
-
-
   async ttl(key) {
     const redisKey = this.toRedisKey(key);
     return x.redis.pttl(redisKey);
   }
+
   /**
    * 缓存内容。
    *
@@ -109,30 +100,23 @@ export class CacheService {
    * @param ttl 缓存时间
    * @returns 返回获取到的内容
    */
-
-
   async remember(key, action, ttl = this.options.ttl) {
     let value = await this.get(key);
-
     if (value === null) {
       value = await action();
       await this.set(key, value, ttl);
     }
-
     return value;
   }
-
   async rememberMany(raws, key, action, ttl = this.options.ttl) {
     const keys = raws.map(key);
     const values = await this.getMany(...keys);
     const shouldUpdateIndexes = [];
-
     for (let i = 0, len = values.length; i < len; i++) {
       if (values[i] === null) {
         shouldUpdateIndexes.push(i);
       }
     }
-
     if (shouldUpdateIndexes.length) {
       const nextValues = await action(shouldUpdateIndexes.map(i => raws[i]));
       await Promise.all(nextValues.map(async (nextValue, index) => {
@@ -140,123 +124,105 @@ export class CacheService {
         await this.set(keys[shouldUpdateIndexes[index]], nextValue, ttl);
       }));
     }
-
     return values;
   }
+
   /**
    * 自增。
    *
    * @param key 键
    * @param increment 增量
    */
-
-
   async increase(key, increment = 1) {
     const redisKey = this.toRedisKey(key);
     return x.redis.incrby(redisKey, increment);
   }
+
   /**
    * 自减。
    *
    * @param key 键
    * @param decrement 减量
    */
-
-
   async decrease(key, decrement = 1) {
     return this.increase(key, -decrement);
   }
+
   /**
    * 新增元素。
    *
    * @param key 键
    * @param values 元素列表
    */
-
-
   async push(key, ...values) {
     const redisKey = this.toRedisKey(key);
     return x.redis.rpush(redisKey, ...values.map(value => JSON.stringify(value)));
   }
+
   /**
    * 从头部弹出元素并返回。
    *
    * @param key 键
    * @param count 弹出元素个数
    */
-
-
   async shift(key, count = 1) {
     const redisKey = this.toRedisKey(key);
     const res = [];
-
     for (let i = 0; i < count; i++) {
       const item = await x.redis.lpop(redisKey);
-
       if (item) {
         res.push(JSON.parse(item));
       } else {
         break;
       }
     }
-
     return res;
   }
+
   /**
    * 删除缓存。
    *
    * @param keys 键列表
    */
-
-
   async remove(...keys) {
     if (!keys.length) {
       return 0;
     }
-
     return x.redis.del(...keys.map(key => this.toRedisKey(key)));
   }
+
   /**
    * 清空全部缓存。
    */
-
-
   async clearAll() {
     const keys = await x.redis.keys(`${this.prefix}*`);
-
     if (keys.length) {
       return x.redis.del(...keys);
     }
-
     return 0;
   }
+
   /**
    * 清空指定前缀的缓存。
    */
-
-
   async clear(...prefixes) {
     if (!prefixes.length) {
       return 0;
     }
-
     const keys = (await Promise.all(prefixes.map(prefix => x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
-
     if (keys.length) {
       return x.redis.del(...keys);
     }
-
     return 0;
   }
+
   /**
    * 派生出一个指定类型的缓存服务。
    */
-
-
   fork(options) {
-    return options ? new CacheService({ ...this.options,
+    return options ? new CacheService({
+      ...this.options,
       ...options
     }) : this;
   }
-
 }

package/lib/services/captcha.js

@@ -6,7 +6,6 @@ export class CaptchaService {
     this.options = options;
     this.serviceName = 'captcha';
   }
-
   async generate(scene) {
     const code = Math.random().toString().slice(0 - this.options.size);
     const token = await x.cache.save({
@@ -18,7 +17,6 @@ export class CaptchaService {
       code: code
     };
   }
-
   async generateDataUrl(scene) {
     const {
       text: code,
@@ -37,20 +35,15 @@ export class CaptchaService {
       dataUrl: dataUrl
     };
   }
-
   async verify(options) {
     if (options.code.length !== this.options.size) {
       return false;
     }
-
     const expected = await x.cache.get(options.token);
-
     if (expected == null) {
       return false;
     }
-
     await x.cache.remove(options.token);
     return expected.scene === options.scene && options.code.toLowerCase() === expected.code.toLowerCase();
   }
-
 }

package/lib/services/dingtalk.js

@@ -5,7 +5,6 @@ export class DingtalkService {
     this.options = options;
     this.serviceName = 'dingtalk';
   }
-
   async send(options) {
     const timestamp = Date.now();
     const sign = crypto.createHmac('sha256', this.options.secret).update(`${timestamp}\n${this.options.secret}`).digest('base64');
@@ -20,16 +19,13 @@ export class DingtalkService {
         isAtAll: options.at === 'all'
       }
     };
-
     if (!data.at.isAtAll && data.at.atMobiles.length) {
       const atMobiles = data.at.atMobiles.filter(mobile => !data.markdown.text.includes(`@${mobile}`));
-
       if (atMobiles.length) {
         const atMobilesText = atMobiles.map(mobile => `@${mobile}`).join(' ');
         data.markdown.text += `<!-- ${atMobilesText} -->`;
       }
     }
-
     const {
       body
     } = await got.post('https://oapi.dingtalk.com/robot/send', {
@@ -41,12 +37,9 @@ export class DingtalkService {
       },
       json: data
     });
-
     if (body.errcode !== 0) {
       throw new Error(body.errmsg);
     }
-
     return body;
   }
-
 }

package/lib/services/dispose.js

@@ -2,22 +2,17 @@ import onExit from 'exit-hook';
 export class DisposeService {
   constructor(options) {
     var _this$options;
-
     this.options = options;
     this.serviceName = 'dispose';
     this.disposes = [];
-
     if ((_this$options = this.options) != null && _this$options.disposeOnExit) {
       onExit(() => this.dispose());
     }
   }
-
   add(fn) {
     this.disposes.push(fn);
   }
-
   dispose() {
     return Promise.all(this.disposes.map(dispose => dispose()));
   }
-
 }

package/lib/services/emoji.js

@@ -2015,16 +2015,15 @@ const softbankOrDocomoOrAuOrGoogleToUnified = {
   "󾬫": "㊙️",
   "": "㊙️",
   "": "㊙️"
-}; // softbankOrDocomoOrAuOrGoogleToUnified
+};
+// softbankOrDocomoOrAuOrGoogleToUnified
 
 const softbankOrDocomoOrGoogleRegExp = new RegExp(Object.keys(softbankOrDocomoOrAuOrGoogleToUnified).join('|'), 'g');
 export class EmojiService {
   constructor() {
     this.serviceName = 'emoji';
   }
-
   unify(text) {
     return text.replace(softbankOrDocomoOrGoogleRegExp, v => softbankOrDocomoOrAuOrGoogleToUnified[v]);
   }
-
 }

package/lib/services/jwt.js

@@ -8,29 +8,23 @@ export class JwtService {
     this.options = options;
     this.serviceName = 'jwt';
     this.cache = void 0;
-
     if (options.cache) {
       this.cache = new LRUCache(options.cache);
     }
   }
-
   sign(payload, ttl = this.options.ttl) {
     const token = jwt.sign(payload, this.options.secret, {
       expiresIn: ms(ttl, true)
     });
-
     if (this.cache) {
       this.cache.set(token, payload, {
         ttl: ms(ttl)
       });
     }
-
     return token;
   }
-
   async verify(token) {
     var _this$options$onVerif, _this$options;
-
     const data = await new Promise((resolve, reject) => {
       if (this.cache && this.cache.has(token)) {
         resolve(this.cache.get(token));
@@ -46,7 +40,6 @@ export class JwtService {
                 ttl: differenceInMilliseconds(fromUnixTime(data.exp), new Date())
               });
             }
-
             resolve(data);
           }
         });
@@ -55,21 +48,15 @@ export class JwtService {
     await ((_this$options$onVerif = (_this$options = this.options).onVerify) == null ? void 0 : _this$options$onVerif.call(_this$options, data));
     return data;
   }
-
   async verifyFromHttpHeaders(headers) {
     const authorization = headers.authorization || headers['sec-websocket-protocol'] && `Bearer ${headers['sec-websocket-protocol']}` || '';
-
     if (!authorization) {
       throw new HttpError.Unauthorized('header');
     }
-
     const [scheme, token] = authorization.split(' ');
-
     if (scheme.toLowerCase() !== 'bearer') {
       throw new HttpError.Unauthorized('bearer');
     }
-
     return this.verify(token);
   }
-
 }

package/lib/services/log.js

@@ -14,17 +14,14 @@ export class LogService {
       });
     }, logFile => logFile);
   }
-
   getLogFile(date) {
     const year = date.getFullYear();
     const month = date.getMonth() + 1;
     return path.join(x.dataDir, `log/${year}/${month < 10 ? `0${month}` : month}.log`);
   }
-
   get logFile() {
     return this.getLogFile(new Date());
   }
-
   parseLogLineText(text) {
     const [time, level, title, ...desc] = text.split(this.separator);
     return {
@@ -38,11 +35,9 @@ export class LogService {
       }, {})
     };
   }
-
   log(payload) {
     this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...Object.keys(payload.desc || {}).map(key => `${key}:${payload.desc[key]}`)].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
   }
-
   info(title, desc) {
     this.log({
       level: 'info',
@@ -50,7 +45,6 @@ export class LogService {
       desc
     });
   }
-
   success(title, desc) {
     this.log({
       level: 'success',
@@ -58,7 +52,6 @@ export class LogService {
       desc
     });
   }
-
   error(title, desc) {
     this.log({
       level: 'error',
@@ -66,5 +59,4 @@ export class LogService {
       desc
     });
   }
-
 }

package/lib/services/mail.js

@@ -6,7 +6,6 @@ export class MailService {
     this.serviceName = 'mail';
     this.transporter = void 0;
   }
-
   async send(options) {
     if (!this.transporter) {
       this.transporter = nodemailer.createTransport({
@@ -21,8 +20,6 @@ export class MailService {
       await this.transporter.verify();
       x.dispose.add(() => this.transporter.close());
     }
-
     return this.transporter.sendMail(options);
   }
-
 }

package/lib/services/pay.js

@@ -9,7 +9,6 @@ export class PayService {
     this.serviceName = 'pay';
     this.alipaySdk = void 0;
   }
-
   async prepareAlipay(options) {
     if (!this.alipaySdk) {
       this.alipaySdk = new AlipaySdk({
@@ -18,15 +17,12 @@ export class PayService {
         alipayPublicKey: this.options.alipay.publicKey
       });
     }
-
     const formData = new AlipayFormData();
     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',
@@ -42,7 +38,6 @@ export 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', {
@@ -60,12 +55,10 @@ export 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)),
@@ -79,57 +72,47 @@ export 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 HttpError.BadRequest(message);
     }
-
     return res;
   }
-
   async getOrderInfo(payload) {
     // 微信支付
     // https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_2.shtml
@@ -140,10 +123,10 @@ export 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
@@ -157,11 +140,9 @@ export class PayService {
       status: res.trade_status === 'TRADE_SUCCESS' || res.trade_status === 'TRADE_FINISHED' ? 'success' : 'fail'
     };
   }
-
   wepaySign(data) {
     return crypto.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);
@@ -173,7 +154,6 @@ export class PayService {
     decipherIv.final();
     return decryptStr;
   }
-
   async wepayRequest(url, data) {
     const path = url.replace(/^https?:\/\/[^/]+/, '');
     const method = data == null ? 'GET' : 'POST';
@@ -204,5 +184,4 @@ export class PayService {
     });
     return res;
   }
-
 }

package/lib/services/rate_limit.js

@@ -4,32 +4,24 @@ export class RateLimitService {
   constructor() {
     this.serviceName = 'rateLimit';
   }
-
   async limitByCount(options) {
     const cacheKey = `rateLimit_${options.key}`;
     const remainingCount = await x.cache.get(cacheKey);
-
     if (remainingCount == null) {
       await x.cache.set(cacheKey, options.count, options.ttl);
       return options.count;
     }
-
     if (remainingCount === 0) {
       return 0;
     }
-
     await x.cache.decrease(cacheKey);
     return remainingCount - 1;
   }
-
   async limitByCountOrFail(options) {
     const count = await this.limitByCount(options);
-
     if (count === 0) {
       throw new HttpError.Forbidden(options.message);
     }
-
     return count;
   }
-
 }

package/lib/services/redis.js

@@ -4,5 +4,4 @@ export class RedisService extends Redis {
     super(...args);
     this.serviceName = 'redis';
   }
-
 }

package/lib/services/request.js

@@ -5,5 +5,4 @@ export class RequestService extends XRequest {
     super(...args);
     this.serviceName = 'request';
   }
-
 }