node-easywechat 3.0.0-beta.3 → 3.0.0

package/dist/Pay/Utils.js

@@ -0,0 +1,142 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const RSA_1 = __importDefault(require("../Core/Support/RSA"));
+const Utils_1 = require("../Core/Support/Utils");
+class Utils {
+    constructor(merchant) {
+        this.merchant = merchant;
+    }
+    /**
+     * 创建签名（V3），并返回签名字符串
+     * @param params 参数集合
+     * @returns
+     */
+    createSignature(message) {
+        let rsa = new RSA_1.default;
+        rsa.setPublicKey(this.merchant.getCertificate().toString());
+        rsa.setPrivateKey(this.merchant.getPrivateKey().toString());
+        return rsa.sign(message);
+    }
+    /**
+     * 创建签名（V2），并返回签名字符串
+     * @param params 参数集合
+     * @returns
+     */
+    createV2Signature(params) {
+        let signString = '';
+        let sparator = '';
+        let keys = Object.keys(params);
+        keys = keys.sort();
+        for (let i = 0; i < keys.length; i++) {
+            if (keys[i] == 'sign' || keys[i] == 'paySign' || typeof params[keys[i]] === undefined || params[keys[i]] === null)
+                continue;
+            signString += sparator + keys[i] + '=' + params[keys[i]];
+            sparator = '&';
+        }
+        let key = this.merchant.getV2SecretKey();
+        if (!key) {
+            throw new Error('Missing V2 API key.');
+        }
+        signString += '&key=' + key;
+        let sign = '';
+        let type = params['signType'] ? (params['signType'] + '').toLowerCase() : 'md5';
+        switch (type) {
+            case 'sha1':
+            case 'md5':
+                sign = (0, Utils_1.createHash)(signString, type);
+                break;
+            case 'hmac-sha256':
+            case 'hmac_sha256':
+                type = type.replace(/^hmac[\-|_]/i, '');
+                sign = (0, Utils_1.createHmac)(signString, key, type);
+                break;
+        }
+        if (!sign) {
+            throw new Error('Failed to sign the request.');
+        }
+        return (sign + '').toUpperCase();
+    }
+    /**
+     * 构建JSBridge支付参数
+     * @see [v3文档](https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_1_4.shtml)
+     * @see [v2文档](https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
+     * @param prepayId 下单接口返回的prepay_id
+     * @param appId 应用id
+     * @param signType v3仅支持RSA，V2支持MD5、HMAC-SHA256
+     * @returns
+     */
+    buildBridgeConfig(prepayId, appId, signType = 'RSA') {
+        let params = {
+            appId,
+            timeStamp: (0, Utils_1.getTimestamp)(),
+            nonceStr: (0, Utils_1.randomString)(),
+            package: 'prepay_id=' + prepayId,
+            signType,
+            paySign: '',
+        };
+        // v2
+        if (signType != 'RSA') {
+            params.paySign = this.createV2Signature(params);
+        }
+        // v3
+        else {
+            let message = `${params.appId}\n${params.timeStamp}\n${params.nonceStr}\n${params.package}\n`;
+            params.paySign = this.createSignature(message);
+        }
+        return params;
+    }
+    /**
+     * 构建JS-SDK支付参数
+     * @see https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#58
+     * @param prepayId 下单接口返回的prepay_id
+     * @param appId 应用id
+     * @param signType v3仅支持RSA，V2支持MD5、HMAC-SHA256
+     */
+    buildSdkConfig(prepayId, appId, signType = 'RSA') {
+        let config = this.buildBridgeConfig(prepayId, appId, signType);
+        return {
+            appId: config.appId,
+            timestamp: config.timeStamp,
+            nonceStr: config.nonceStr,
+            package: config.package,
+            signType: config.signType,
+            paySign: config.paySign,
+        };
+    }
+    /**
+     * 构建小程序支付参数
+     * @see https://developers.weixin.qq.com/miniprogram/dev/api/payment/wx.requestPayment.html
+     * @param prepayId 下单接口返回的prepay_id
+     * @param appId 应用id
+     * @param signType v3仅支持RSA，V2支持MD5、HMAC-SHA256
+     * @returns
+     */
+    buildMiniAppConfig(prepayId, appId, signType = 'RSA') {
+        return this.buildBridgeConfig(prepayId, appId, signType);
+    }
+    /**
+     * 构建App支付参数
+     * @see https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_2_4.shtml
+     * @param prepayId 下单接口返回的prepay_id
+     * @param appId 应用id
+     * @returns
+     */
+    buildAppConfig(prepayId, appId) {
+        let params = {
+            appId,
+            partnerid: this.merchant.getMerchantId(),
+            prepayid: prepayId,
+            nonceStr: (0, Utils_1.randomString)(),
+            timestamp: (0, Utils_1.getTimestamp)(),
+            package: 'Sign=WXPay',
+            sign: '',
+        };
+        let message = `${params.appId}\n${params.timestamp}\n${params.nonceStr}\n${params.prepayid}\n`;
+        params.sign = this.createSignature(message);
+        return params;
+    }
+}
+;
+module.exports = Utils;

package/dist/Types/global.d.ts

@@ -3,6 +3,7 @@ import ProviderInterface from 'node-socialite/dist/Core/ProviderInterface';
 import OfficialAccountApplicationInterface from '../OfficialAccount/Contracts/ApplicationInterface';
 import Message from '../Core/Message';
 import HttpClientResponseInterface from '../Core/HttpClient/Contracts/HttpClientResponseInterface';
+import { PublicKey } from "../Core/Support/PublicKey";
 
 declare module 'axios' {
   export interface AxiosRequestConfig {
@@ -14,6 +15,10 @@ declare module 'axios' {
      * 要发送的json数据，会自动解析并赋值到data属性，同时设置content-type=application/json
      */
     json?: string | Record<string, any>;
+    /**
+     * 要发送的FormData数据，会自动解析并赋值到data属性，同时设置根据内容提取headers
+     */
+    formData?: Record<string, any>;
   }
 }
 
@@ -149,10 +154,24 @@ export declare interface PayConfig extends BaseConfig {
   mch_id?: string;
 
   /**
-   * pfx 证书路径（敏感接口（如退款、发送红包等）需要）
+   * 商户证书路径
    */
   certificate?: string;
 
+  /**
+   * 商户证书私钥路径
+   */
+  private_key?: string;
+
+  /**
+   * 平台证书（v3接口需要）
+   *
+   * 支持路径列表或者PublicKey对象列表或者，以serial_no为key，证书内容或PublicKey对象为value的对象
+   *
+   * 下载工具：https://github.com/wechatpay-apiv3/CertificateDownloader
+   */
+  platform_certs?: string[] | PublicKey[] | Record<string, string | PublicKey>;
+
   /**
    * v3 API密钥
    */
@@ -320,3 +339,97 @@ export declare type PaymentScannedHandler = (message: Message, fail: PaymentFail
  * @param response 响应对象，仅在 type 为 after 时返回
  */
 export declare type LogHandler = (type: 'before' | 'after', options: AxiosRequestConfig, usedTime?: number, response?: AxiosResponse) => void | Promise<void>;
+
+/**
+ * 支付参数 JsBridge
+ */
+export declare interface PayBridgeConfig {
+  /**
+   * 应用id
+   */
+  appId: string;
+  /**
+   * 时间戳
+   */
+  timeStamp: number;
+  /**
+   * 随机字符串
+   */
+  nonceStr: string;
+  /**
+   * 订单详情扩展字符串
+   */
+  package: string;
+  /**
+   * 签名方式
+   */
+  signType: string;
+  /**
+   * 签名
+   */
+  paySign: string;
+}
+
+/**
+ * 支付参数 JsSdk
+ */
+export declare interface PaySdkConfig {
+  /**
+   * 应用id
+   */
+  appId: string;
+  /**
+   * 时间戳
+   */
+  timestamp: number;
+  /**
+   * 随机字符串
+   */
+  nonceStr: string;
+  /**
+   * 订单详情扩展字符串
+   */
+  package: string;
+  /**
+   * 签名方式
+   */
+  signType: string;
+  /**
+   * 签名
+   */
+  paySign: string;
+}
+
+/**
+ * 支付参数 App
+ */
+export declare interface PayAppConfig {
+  /**
+   * 应用id
+   */
+  appId: string;
+  /**
+   * 商户id
+   */
+  partnerid: string;
+  /**
+   * 预支付交易会话ID
+   */
+  prepayid: string;
+  /**
+   * 订单详情扩展字符串
+   */
+  package: string;
+  /**
+   * 随机字符串
+   */
+  nonceStr: string;
+  /**
+   * 时间戳
+   */
+  timestamp: number;
+  /**
+   * 签名
+   */
+  sign: string;
+}

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { OfficialAccountConfig, MiniAppConfig, LogHandler, ServerEventType, ServerHandlerClosure } from './Types/global';
+import { OfficialAccountConfig, MiniAppConfig, LogHandler, ServerEventType, ServerHandlerClosure, PayConfig } from './Types/global';
 import OfficialAccount from './OfficialAccount/Application';
 import MiniApp from './MiniApp/Application';
+import Pay from './Pay/Application';
 import CacheInterface from './Core/Contracts/CacheInterface';
 import ServerRequest from './Core/Http/ServerRequest';
-import Message from './Core/Message';
 import FormData from 'form-data';
-export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, Message, 
+export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, Pay, PayConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, 
 /**
  * 表单对象
  * @see https://github.com/axios/axios#formdata

package/dist/index.js

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormData = exports.Message = exports.ServerRequest = exports.CacheInterface = exports.MiniApp = exports.OfficialAccount = void 0;
+exports.FormData = exports.ServerRequest = exports.CacheInterface = exports.Pay = exports.MiniApp = exports.OfficialAccount = void 0;
 const Application_1 = __importDefault(require("./OfficialAccount/Application"));
 exports.OfficialAccount = Application_1.default;
 const Application_2 = __importDefault(require("./MiniApp/Application"));
 exports.MiniApp = Application_2.default;
+const Application_3 = __importDefault(require("./Pay/Application"));
+exports.Pay = Application_3.default;
 const CacheInterface_1 = __importDefault(require("./Core/Contracts/CacheInterface"));
 exports.CacheInterface = CacheInterface_1.default;
 const ServerRequest_1 = __importDefault(require("./Core/Http/ServerRequest"));
 exports.ServerRequest = ServerRequest_1.default;
-const Message_1 = __importDefault(require("./Core/Message"));
-exports.Message = Message_1.default;
 const form_data_1 = __importDefault(require("form-data"));
 exports.FormData = form_data_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^17.0.23",
-    "axios-mock-adapter": "^1.20.0",
+    "axios-mock-adapter": "^1.21.1",
     "mocha": "^9.2.2",
     "package-release": "^1.0.2",
     "typescript": "^4.6.3"