@jayfong/x-server 2.12.7 → 2.12.15

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

@@ -1,306 +1,21 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
-exports.RequestService = exports.RequestFormUrlencoded = exports.RequestFormStream = exports.RequestFormFile = exports.RequestFormData = void 0;
-
-var _assert = _interopRequireDefault(require("assert"));
-
-var _formData = _interopRequireDefault(require("form-data"));
-
-var _formstream = _interopRequireDefault(require("formstream"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _got = _interopRequireDefault(require("got"));
-
-var _vtils = require("vtils");
-
-var _proxyAgent = require("proxy-agent");
-
-var _stream = require("stream");
-
-class RequestFormUrlencoded extends URLSearchParams {}
-
-exports.RequestFormUrlencoded = RequestFormUrlencoded;
-
-class RequestFormData extends _formData.default {
-  constructor(cbOrObject) {
-    super();
-
-    if (cbOrObject) {
-      if (typeof cbOrObject === 'function') {
-        cbOrObject(this);
-      } else {
-        Object.keys(cbOrObject).forEach(key => {
-          const value = cbOrObject[key];
-
-          if (value instanceof RequestFormFile) {
-            var _value$options, _value$options2;
-
-            this.append(key, typeof value.file === 'string' ? _fs.default.createReadStream(value.file) : value.file, {
-              filename: (_value$options = value.options) == null ? void 0 : _value$options.name,
-              contentType: (_value$options2 = value.options) == null ? void 0 : _value$options2.type
-            });
-          } else {
-            this.append(key, value);
-          }
-        });
-      }
-    }
-  }
-
-}
-
-exports.RequestFormData = RequestFormData;
-
-class RequestFormStream extends _formstream.default {
-  constructor(cbOrObject) {
-    super();
-
-    if (cbOrObject) {
-      if (typeof cbOrObject === 'function') {
-        cbOrObject(this);
-      } else {
-        Object.keys(cbOrObject).forEach(key => {
-          const value = cbOrObject[key];
-
-          if (value instanceof RequestFormFile) {
-            if (typeof value.file === 'string') {
-              var _value$options3;
-
-              this.file(key, value.file, (_value$options3 = value.options) == null ? void 0 : _value$options3.name);
-            } else if (Buffer.isBuffer(value.file)) {
-              this.buffer(key, value.file, value.options.name, value.options.type);
-            } else if (value.file instanceof _stream.Readable) {
-              this.stream(key, value.file, value.options.name, value.options.type);
-            }
-          } else {
-            this.field(key, value);
-          }
-        });
-      }
-    }
-  }
-
-}
-
-exports.RequestFormStream = RequestFormStream;
-
-class RequestFormFile {
-  constructor(file, options) {
-    this.file = file;
-    this.options = options;
-
-    if (Buffer.isBuffer(file) || file instanceof _stream.Readable) {
-      (0, _assert.default)(options == null ? void 0 : options.name, 'options.name is required');
-    }
-  }
-
-}
-
-exports.RequestFormFile = RequestFormFile;
-
-class RequestService {
-  static getGotOptions(options, responseType) {
-    var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
-
-    const gotOptions = {
-      url: options.url,
-      responseType: responseType === 'stream' ? undefined : responseType,
-      https: {
-        rejectUnauthorized: false
-      },
-      isStream: responseType === 'stream'
-    };
-
-    if (options.headers) {
-      gotOptions.headers = options.headers;
-    }
-
-    if (options.followRedirect != null) {
-      gotOptions.followRedirect = options.followRedirect;
-    }
-
-    if (options.timeoutMs) {
-      gotOptions.timeout = options.timeoutMs;
-    }
-
-    if (options.proxyUrl) {
-      const proxyAgent = new _proxyAgent.ProxyAgent({
-        getProxyForUrl: () => options.proxyUrl
-      });
-      gotOptions.agent = {
-        http: proxyAgent,
-        https: proxyAgent,
-        http2: proxyAgent
-      };
-    }
-
-    if (options.cookieJar) {
-      gotOptions.cookieJar = options.cookieJar;
-    } // 头处理
-
-
-    gotOptions.headers = (0, _vtils.mapKeys)(gotOptions.headers || {}, (v, k) => k.toLowerCase());
-    (_gotOptions$headers$_ = (_gotOptions$headers = gotOptions.headers)[_userAgent = 'user-agent']) != null ? _gotOptions$headers$_ : _gotOptions$headers[_userAgent] = (_options$userAgent = options.userAgent) != null ? _options$userAgent : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36';
-
-    if (options.autoReferer && gotOptions.headers['referer'] == null) {
-      gotOptions.headers['referer'] = options.url;
-    }
-
-    return gotOptions;
-  }
-
-  static getRaw(options, responseType) {
-    let url = options.url;
-
-    if (options.data) {
-      const _url = new URL(url);
-
-      Object.keys(options.data).forEach(key => {
-        _url.searchParams.set(key, options.data[key]);
-      });
-      url = _url.toString();
-    }
-
-    options.url = url;
-    const res = (0, _got.default)({
-      method: 'GET',
-      ...this.getGotOptions(options, responseType || 'buffer')
-    });
-
-    if (responseType === 'stream') {
-      return res;
-    }
-
-    return res.then(res => ({
-      status: res.statusCode,
-      headers: res.headers,
-      data: res.body
-    }));
-  }
-
-  static postRaw(options, responseType) {
-    const gotOptions = this.getGotOptions(options, responseType || 'buffer');
-
-    if (responseType === 'stream' && options.data instanceof _formstream.default) {
-      gotOptions.headers = options.data.headers(gotOptions.headers);
-    }
-
-    const res = (0, _got.default)({
-      method: 'POST',
-      ...(options.data == null ? {
-        body: ''
-      } : options.data instanceof _formData.default ? {
-        body: options.data
-      } : options.data instanceof URLSearchParams ? {
-        form: options.data
-      } : options.data instanceof _formstream.default ? {} : {
-        json: options.data
-      }),
-      ...gotOptions
-    });
-
-    if (responseType === 'stream' && options.data instanceof _formstream.default) {
-      options.data.pipe(res);
-    }
-
-    if (responseType === 'stream') {
-      return res;
-    }
-
-    return res.then(res => ({
-      status: res.statusCode,
-      headers: res.headers,
-      data: res.body
-    }));
-  }
-
-  static async getText(options) {
-    return this.getRaw(options, 'text');
-  }
-
-  static async postText(options) {
-    return this.postRaw(options, 'text');
-  }
-
-  static async get(options) {
-    return this.getRaw(options, 'json');
-  }
-
-  static async post(options) {
-    return this.postRaw(options, 'json');
-  }
-
-  static getStream(options) {
-    return this.getRaw(options, 'stream');
-  }
-
-  static postStream(options) {
-    return this.postRaw(options, 'stream');
-  }
-
-  static isTimeoutError(err) {
-    return err instanceof _got.default.TimeoutError;
-  }
-
-  constructor(options) {
-    this.options = options;
+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';
   }
-
-  getRaw(options, responseType) {
-    var _this$options;
-
-    return RequestService.getRaw({ ...this.options,
-      ...options,
-      headers: { ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
-        ...options.headers
-      }
-    }, responseType);
-  }
-
-  postRaw(options, responseType) {
-    var _this$options2;
-
-    return RequestService.postRaw({ ...this.options,
-      ...options,
-      headers: { ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
-        ...options.headers
-      }
-    }, responseType);
-  }
-
-  async getText(options) {
-    return this.getRaw(options, 'text');
-  }
-
-  async postText(options) {
-    return this.postRaw(options, 'text');
-  }
-
-  async get(options) {
-    return this.getRaw(options, 'json');
-  }
-
-  async post(options) {
-    return this.postRaw(options, 'json');
-  }
-
-  getStream(options) {
-    return this.getRaw(options, 'stream');
-  }
-
-  postStream(options) {
-    return this.postRaw(options, 'stream');
-  }
-
-  isTimeoutError(err) {
-    return RequestService.isTimeoutError(err);
-  }
-
 }
-
 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());