@jayfong/x-server 1.24.1 → 1.26.0

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.26.0](https://github.com/jfWorks/x-server/compare/v1.25.0...v1.26.0) (2022-05-02)
+
+
+### Features
+
+* add SensitiveWordsService ([ee03592](https://github.com/jfWorks/x-server/commit/ee03592f5acd795b03fa65717ea276db66f453c1))
+
+## [1.25.0](https://github.com/jfWorks/x-server/compare/v1.24.2...v1.25.0) (2022-05-02)
+
+
+### Features
+
+* add FormBodyParserPlugin ([b51392c](https://github.com/jfWorks/x-server/commit/b51392c5dce6480f9f5250192f676421c6a1cad2))
+* ctx add req res ([ccd1ea0](https://github.com/jfWorks/x-server/commit/ccd1ea08f9d10e0b29ff235b1b6572b180798d8d))
+
+### [1.24.2](https://github.com/jfWorks/x-server/compare/v1.24.1...v1.24.2) (2022-05-02)
+
+
+### Bug Fixes
+
+* returnUrl? ([fb46884](https://github.com/jfWorks/x-server/commit/fb4688405c16986727be2785695e9faa6a2db386))
+* verifyNotifyData ([a4b76e3](https://github.com/jfWorks/x-server/commit/a4b76e3c63babc2f789646f932b1375a1c0a76e4))
+
 ### [1.24.1](https://github.com/jfWorks/x-server/compare/v1.24.0...v1.24.1) (2022-05-02)
 
 ## [1.24.0](https://github.com/jfWorks/x-server/compare/v1.23.0...v1.24.0) (2022-05-02)

package/lib/_cjs/core/server.js

@@ -104,7 +104,9 @@ class Server {
               headers: req.headers,
               setHeader: (k, v) => res.header(k, v),
               redirect: undefined,
-              ws: req
+              ws: req,
+              req: req,
+              res: res
             });
             return;
           }
@@ -132,7 +134,9 @@ class Server {
             headers: req.headers,
             setHeader: (k, v) => res.header(k, v),
             redirect: url => res.redirect(url),
-            ws: undefined
+            ws: undefined,
+            req: req,
+            res: res
           });
           return data;
         }

package/lib/_cjs/index.js

@@ -114,6 +114,14 @@ Object.keys(_file_parser).forEach(function (key) {
   exports[key] = _file_parser[key];
 });
 
+var _form_body_parser = require("./plugins/form_body_parser");
+
+Object.keys(_form_body_parser).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _form_body_parser[key]) return;
+  exports[key] = _form_body_parser[key];
+});
+
 var _ws_parser = require("./plugins/ws_parser");
 
 Object.keys(_ws_parser).forEach(function (key) {
@@ -202,6 +210,14 @@ Object.keys(_redis).forEach(function (key) {
   exports[key] = _redis[key];
 });
 
+var _sensitive_words = require("./services/sensitive_words");
+
+Object.keys(_sensitive_words).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _sensitive_words[key]) return;
+  exports[key] = _sensitive_words[key];
+});
+
 var _x = require("./x");
 
 Object.keys(_x).forEach(function (key) {

package/lib/_cjs/plugins/form_body_parser.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+exports.__esModule = true;
+exports.FormBodyParserPlugin = void 0;
+
+var _formbody = _interopRequireDefault(require("@fastify/formbody"));
+
+/**
+ * POST application/x-www-form-urlencoded 解析器插件
+ */
+class FormBodyParserPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
+  register(fastify) {
+    fastify.register(_formbody.default, this.options);
+  }
+
+}
+
+exports.FormBodyParserPlugin = FormBodyParserPlugin;

package/lib/_cjs/services/pay.js

@@ -15,8 +15,6 @@ var _got = _interopRequireDefault(require("got"));
 
 var _http_error = require("../core/http_error");
 
-var _x = require("../x");
-
 class PayService {
   constructor(options) {
     this.options = options;
@@ -33,18 +31,21 @@ class PayService {
       });
     }
 
-    const token = await _x.x.cache.save('x', '1h');
     const formData = new _form.default();
     formData.setMethod('get');
     formData.addField('notifyUrl', options.notifyUrl);
-    formData.addField('returnUrl', options.returnUrl);
+
+    if (options.returnUrl) {
+      formData.addField('returnUrl', options.returnUrl);
+    }
+
     formData.addField('bizContent', {
       outTradeNo: options.tradeNumber,
       productCode: 'FAST_INSTANT_TRADE_PAY',
       totalAmount: options.totalMoney,
       subject: options.goodsName,
       goodsType: '0',
-      passbackParams: token
+      passbackParams: 'alipay'
     });
     const payUrl = await this.alipaySdk.exec('alipay.trade.page.pay', {}, {
       formData: formData
@@ -55,13 +56,12 @@ class PayService {
   }
 
   async prepareWepay(options) {
-    const token = await _x.x.cache.save('x', '1h');
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
       appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
-      attach: token,
+      attach: 'wepay',
       notify_url: options.notifyUrl,
       amount: {
         total: options.totalMoney * 100,
@@ -91,19 +91,20 @@ class PayService {
     };
   }
 
-  async verifyNotifyData(data) {
-    if (!data || typeof data !== 'object') return false;
-    const token = // 微信支付
-    data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach : // 支付宝
-    data.passback_params;
-    if (!token) return false;
-    if ((await _x.x.cache.get(token)) == null) return false;
-    await _x.x.cache.remove(token);
-    return true;
+  verifyNotifyData(data) {
+    try {
+      var _this$alipaySdk;
+
+      return !!data && typeof data === 'object' && ( // 支付宝
+      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
+      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+    } catch {
+      return false;
+    }
   }
 
-  async verifyNotifyDataOrFail(data, message) {
-    if (!(await this.verifyNotifyData(data))) {
+  verifyNotifyDataOrFail(data, message) {
+    if (!this.verifyNotifyData(data)) {
       throw new _http_error.HttpError.BadRequest(message);
     }
   }

package/lib/_cjs/services/sensitive_words.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+exports.__esModule = true;
+exports.SensitiveWordsService = void 0;
+
+var _mintFilter = _interopRequireDefault(require("mint-filter"));
+
+class SensitiveWordsService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'sensitiveWords';
+    this.mint = void 0;
+  }
+
+  async filter(text) {
+    if (!this.mint) {
+      this.mint = new _mintFilter.default(this.options.words);
+    }
+
+    const res = await this.mint.filter(text, {
+      every: true,
+      replace: true,
+      words: false
+    });
+    return res.text;
+  }
+
+}
+
+exports.SensitiveWordsService = SensitiveWordsService;

package/lib/core/server.js

@@ -89,7 +89,9 @@ export class Server {
               headers: req.headers,
               setHeader: (k, v) => res.header(k, v),
               redirect: undefined,
-              ws: req
+              ws: req,
+              req: req,
+              res: res
             });
             return;
           }
@@ -117,7 +119,9 @@ export class Server {
             headers: req.headers,
             setHeader: (k, v) => res.header(k, v),
             redirect: url => res.redirect(url),
-            ws: undefined
+            ws: undefined,
+            req: req,
+            res: res
           });
           return data;
         }

package/lib/core/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { BasePlugin } from '../plugins/base';
 import { BaseService } from '../services/base';
+import { FastifyReply, FastifyRequest } from 'fastify';
 import { yup } from 'vtils/validator';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
 import type { DisposeService } from '../services/dispose';
@@ -65,6 +66,14 @@ export declare namespace XHandler {
          * WS
          */
         ws: SocketStream;
+        /**
+         * Fastify Request
+         */
+        req: FastifyRequest;
+        /**
+         * Fastify Response
+         */
+        res: FastifyReply;
     }
     type Handle<TReqData extends any = void, TResData extends any = void, TReqMethod extends Method = Method> = (
     /**

package/lib/index.d.ts

@@ -12,6 +12,7 @@ export * from './core/types';
 export * from './plugins/base';
 export * from './plugins/cors';
 export * from './plugins/file_parser';
+export * from './plugins/form_body_parser';
 export * from './plugins/ws_parser';
 export * from './plugins/xml_parser';
 export * from './services/base';
@@ -23,5 +24,6 @@ export * from './services/mail';
 export * from './services/pay';
 export * from './services/rate_limit';
 export * from './services/redis';
+export * from './services/sensitive_words';
 export * from './x';
 export * from '.x/models';

package/lib/index.js

@@ -13,6 +13,7 @@ export * from "./core/types";
 export * from "./plugins/base";
 export * from "./plugins/cors";
 export * from "./plugins/file_parser";
+export * from "./plugins/form_body_parser";
 export * from "./plugins/ws_parser";
 export * from "./plugins/xml_parser";
 export * from "./services/base";
@@ -24,6 +25,7 @@ export * from "./services/mail";
 export * from "./services/pay";
 export * from "./services/rate_limit";
 export * from "./services/redis";
+export * from "./services/sensitive_words";
 export * from "./x"; // @endindex
 // @ts-ignore
 

package/lib/plugins/form_body_parser.d.ts

@@ -0,0 +1,13 @@
+import { FormBodyPluginOptions } from '@fastify/formbody';
+import { BasePlugin } from './base';
+import { FastifyInstance } from 'fastify';
+export interface FormBodyParserPluginOptions extends FormBodyPluginOptions {
+}
+/**
+ * POST application/x-www-form-urlencoded 解析器插件
+ */
+export declare class FormBodyParserPlugin implements BasePlugin {
+    private options?;
+    constructor(options?: FormBodyParserPluginOptions);
+    register(fastify: FastifyInstance): void;
+}

package/lib/plugins/form_body_parser.js

@@ -0,0 +1,15 @@
+import FastifyFormBody from '@fastify/formbody';
+
+/**
+ * POST application/x-www-form-urlencoded 解析器插件
+ */
+export class FormBodyParserPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
+  register(fastify) {
+    fastify.register(FastifyFormBody, this.options);
+  }
+
+}

package/lib/services/pay.d.ts

@@ -33,7 +33,7 @@ export interface PayPrepareAlipayOptions {
     /** 通知地址(POST) */
     notifyUrl: string;
     /** 返回地址 */
-    returnUrl: string;
+    returnUrl?: string;
 }
 export interface PayPrepareAlipayResult {
     /** 支付地址，需跳转过去 */
@@ -69,8 +69,8 @@ export declare class PayService implements BaseService {
     constructor(options: PayOptions);
     prepareAlipay(options: PayPrepareAlipayOptions): Promise<PayPrepareAlipayResult>;
     prepareWepay(options: PayPrepareWepayOptions): Promise<PayPrepareWepayResult>;
-    verifyNotifyData(data: any): Promise<boolean>;
-    verifyNotifyDataOrFail(data: any, message?: string): Promise<void>;
+    verifyNotifyData(data: any): boolean;
+    verifyNotifyDataOrFail(data: any, message?: string): void;
     private wepaySign;
     private wepayDecrypt;
     private wepayRequest;

package/lib/services/pay.js

@@ -3,7 +3,6 @@ import AlipaySdk from 'alipay-sdk';
 import crypto from 'crypto';
 import got from 'got';
 import { HttpError } from "../core/http_error";
-import { x } from "../x";
 export class PayService {
   constructor(options) {
     this.options = options;
@@ -20,18 +19,21 @@ export class PayService {
       });
     }
 
-    const token = await x.cache.save('x', '1h');
     const formData = new AlipayFormData();
     formData.setMethod('get');
     formData.addField('notifyUrl', options.notifyUrl);
-    formData.addField('returnUrl', options.returnUrl);
+
+    if (options.returnUrl) {
+      formData.addField('returnUrl', options.returnUrl);
+    }
+
     formData.addField('bizContent', {
       outTradeNo: options.tradeNumber,
       productCode: 'FAST_INSTANT_TRADE_PAY',
       totalAmount: options.totalMoney,
       subject: options.goodsName,
       goodsType: '0',
-      passbackParams: token
+      passbackParams: 'alipay'
     });
     const payUrl = await this.alipaySdk.exec('alipay.trade.page.pay', {}, {
       formData: formData
@@ -42,13 +44,12 @@ export class PayService {
   }
 
   async prepareWepay(options) {
-    const token = await x.cache.save('x', '1h');
     const res = await this.wepayRequest('https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi', {
       appid: this.options.wepay.appId,
       mchid: this.options.wepay.merchantId,
       description: options.goodsName,
       out_trade_no: options.tradeNumber,
-      attach: token,
+      attach: 'wepay',
       notify_url: options.notifyUrl,
       amount: {
         total: options.totalMoney * 100,
@@ -78,19 +79,20 @@ export class PayService {
     };
   }
 
-  async verifyNotifyData(data) {
-    if (!data || typeof data !== 'object') return false;
-    const token = // 微信支付
-    data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach : // 支付宝
-    data.passback_params;
-    if (!token) return false;
-    if ((await x.cache.get(token)) == null) return false;
-    await x.cache.remove(token);
-    return true;
+  verifyNotifyData(data) {
+    try {
+      var _this$alipaySdk;
+
+      return !!data && typeof data === 'object' && ( // 支付宝
+      data.passback_params === 'alipay' ? !!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data)) : // 微信支付
+      data.resource ? JSON.parse(this.wepayDecrypt(data.resource)).attach === 'wepay' : false);
+    } catch {
+      return false;
+    }
   }
 
-  async verifyNotifyDataOrFail(data, message) {
-    if (!(await this.verifyNotifyData(data))) {
+  verifyNotifyDataOrFail(data, message) {
+    if (!this.verifyNotifyData(data)) {
       throw new HttpError.BadRequest(message);
     }
   }

package/lib/services/sensitive_words.d.ts

@@ -0,0 +1,16 @@
+import { BaseService } from './base';
+export interface SensitiveWordsOptions {
+    words: string[];
+}
+export declare class SensitiveWordsService implements BaseService {
+    private options;
+    serviceName: string;
+    private mint;
+    constructor(options: SensitiveWordsOptions);
+    filter(text: string): Promise<string>;
+}
+declare module '../x' {
+    interface X {
+        sensitiveWords: SensitiveWordsService;
+    }
+}

package/lib/services/sensitive_words.js

@@ -0,0 +1,22 @@
+import Mint from 'mint-filter';
+export class SensitiveWordsService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'sensitiveWords';
+    this.mint = void 0;
+  }
+
+  async filter(text) {
+    if (!this.mint) {
+      this.mint = new Mint(this.options.words);
+    }
+
+    const res = await this.mint.filter(text, {
+      every: true,
+      replace: true,
+      words: false
+    });
+    return res.text;
+  }
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.24.1",
+  "version": "1.26.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -26,6 +26,7 @@
     }
   },
   "dependencies": {
+    "@fastify/formbody": "^6.0.0",
     "@prisma/client": "^3.12.0",
     "@types/bull": "^3.15.8",
     "@types/busboy": "^0.3.2",
@@ -56,6 +57,7 @@
     "ioredis": "^4.28.5",
     "jsonwebtoken": "^8.5.1",
     "mini-svg-data-uri": "^1.4.4",
+    "mint-filter": "^3.0.1",
     "node-ssh": "^12.0.4",
     "nodemailer": "^6.7.3",
     "pino-pretty": "^7.6.1",