@jayfong/x-server 2.4.3 → 2.6.0

package/lib/services/pay.d.ts

@@ -64,6 +64,15 @@ export interface PayServicePrepareWepayResult {
         paySign: string;
     };
 }
+export interface PayServiceVerifyNotifyDataResult {
+    /**
+     * 渠道订单号。
+     *
+     * - 支付宝最长 `64` 位；
+     * - 微信支付最长 `32` 位。
+     */
+    channelOrderNo: string;
+}
 export declare class PayService implements BaseService {
     private options;
     serviceName: string;
@@ -71,8 +80,8 @@ export declare class PayService implements BaseService {
     constructor(options: PayServiceOptions);
     prepareAlipay(options: PayServicePrepareAlipayOptions): Promise<PayServicePrepareAlipayResult>;
     prepareWepay(options: PayServicePrepareWepayOptions): Promise<PayServicePrepareWepayResult>;
-    verifyNotifyData(data: any): boolean;
-    verifyNotifyDataOrFail(data: any, message?: string): void;
+    verifyNotifyData(data: any): false | PayServiceVerifyNotifyDataResult;
+    verifyNotifyDataOrFail(data: any, message?: string): PayServiceVerifyNotifyDataResult;
     private wepaySign;
     private wepayDecrypt;
     private wepayRequest;

package/lib/services/pay.js

@@ -82,20 +82,52 @@ export class PayService {
 
   verifyNotifyData(data) {
     try {
-      var _this$alipaySdk;
+      if (!data || typeof data !== 'object') {
+        return false;
+      } // 支付宝
+      // https://opendocs.alipay.com/open/270/105902
 
-      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);
+
+      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
+
+
+      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) {
-    if (!this.verifyNotifyData(data)) {
+    const res = this.verifyNotifyData(data);
+
+    if (!res) {
       throw new HttpError.BadRequest(message);
     }
+
+    return res;
   }
 
   wepaySign(data) {

package/lib/x.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { BaseService } from './services/base';
 import './services/dispose';
+import './services/emoji';
 import './services/log';
 export interface X {
     readonly appId: string;

package/lib/x.js

@@ -2,6 +2,7 @@ import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
 import { DisposeService } from "./services/dispose";
+import { EmojiService } from "./services/emoji";
 import { LogService } from "./services/log";
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
@@ -18,4 +19,4 @@ export const x = {
 fs.ensureDirSync(x.dataDir);
 x.register(new DisposeService({
   disposeOnExit: true
-}), new LogService());
+}), new LogService(), new EmojiService());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.4.3",
+  "version": "2.6.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -72,7 +72,7 @@
     "ts-morph": "^12.2.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.67.1",
+    "vtils": "^4.75.0",
     "yargs": "^17.4.1"
   },
   "devDependencies": {
@@ -81,6 +81,7 @@
     "@types/ioredis": "^4.28.10",
     "@types/json-schema": "^7.0.11",
     "@types/lz-string": "^1.3.34",
+    "axios": "^1.4.0",
     "eslint": "^7.32.0",
     "haoma": "^3.6.4",
     "husky": "^4.3.8",