node-easywechat 3.5.1 → 3.5.4

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 # CHANGELOG
 
 
+## v3.5.4 (2023-11-15)
+
+- Fix: 修复生成支付参数中，时间戳类型错误 (#45)
+- Fix: 修复计算支付签名时证书调用错误
+- Fix: 证书文件无法访问时抛出异常
+
+## v3.5.2 (2023-11-11)
+
+- Fix: 更新依赖包
+
 ## v3.5.1 (2023-09-04)
 
 - Fix: 调整公众号、小程序access_token默认缓存名称的配置方式

package/dist/Core/HttpClient/HttpClientResponse.d.ts

@@ -86,7 +86,7 @@ declare class HttpClientResponse implements HttpClientResponseInterface {
     getHeaders(throwError?: boolean): Record<string, any>;
     getContent(throwError?: boolean): any;
     cancel(): void;
-    getInfo(type?: string): import("axios").AxiosRequestConfig<any>;
+    getInfo(type?: string): import("axios").InternalAxiosRequestConfig<any>;
     offsetExists(key: any): Promise<boolean>;
     offsetGet(key: any): Promise<any>;
 }

package/dist/Core/Support/PrivateKey.js

@@ -11,6 +11,9 @@ class PrivateKey {
         if (fs_1.default.existsSync(key)) {
             this.key = fs_1.default.readFileSync(key) || Buffer.from('');
         }
+        else {
+            throw new Error('Fail to read PrivateKey file');
+        }
     }
     /**
      * 获取私钥内容

package/dist/Core/Support/PublicKey.js

@@ -11,6 +11,9 @@ class PublicKey {
         if (fs_1.default.existsSync(certificate)) {
             this.certificate = fs_1.default.readFileSync(certificate) || Buffer.from('');
         }
+        else {
+            throw new Error('Fail to read PublicKey file');
+        }
     }
     /**
      * 获取公钥的序列号

package/dist/Pay/Signature.js

@@ -36,8 +36,8 @@ class Signature {
         }
         let signString = `${method.toUpperCase()}\n${pathname}\n${timestamp}\n${nonce}\n${body}\n`;
         let rsa = new RSA_1.default;
-        rsa.setPublicKey(this.merchant.getCertificate().getValue());
-        rsa.setPrivateKey(this.merchant.getPrivateKey().getKey());
+        rsa.setPublicKey(this.merchant.getCertificate().toString());
+        rsa.setPrivateKey(this.merchant.getPrivateKey().toString());
         let sign = rsa.sign(signString);
         return `WECHATPAY2-SHA256-RSA2048 mchid="${this.merchant.getMerchantId()}",nonce_str="${nonce}",timestamp="${timestamp}",serial_no="${this.merchant.getCertificate().getSerialNo()}",signature="${sign}"`;
     }

package/dist/Pay/Utils.d.ts

@@ -24,7 +24,7 @@ declare class Utils {
      * @param signType v3仅支持RSA，V2支持MD5、HMAC-SHA256
      * @returns
      */
-    buildBridgeConfig(prepayId: string, appId: string, signType?: string): PayBridgeConfig;
+    buildBridgeConfig(prepayId: string, appId: string, signType?: 'RSA' | 'MD5' | 'HMAC-SHA256'): PayBridgeConfig;
     /**
      * 构建JS-SDK支付参数
      * @see https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#58
@@ -32,7 +32,7 @@ declare class Utils {
      * @param appId 应用id
      * @param signType v3仅支持RSA，V2支持MD5、HMAC-SHA256
      */
-    buildSdkConfig(prepayId: string, appId: string, signType?: string): PaySdkConfig;
+    buildSdkConfig(prepayId: string, appId: string, signType?: 'RSA' | 'MD5' | 'HMAC-SHA256'): PaySdkConfig;
     /**
      * 构建小程序支付参数
      * @see https://developers.weixin.qq.com/miniprogram/dev/api/payment/wx.requestPayment.html
@@ -41,7 +41,7 @@ declare class Utils {
      * @param signType v3仅支持RSA，V2支持MD5、HMAC-SHA256
      * @returns
      */
-    buildMiniAppConfig(prepayId: string, appId: string, signType?: string): PayBridgeConfig;
+    buildMiniAppConfig(prepayId: string, appId: string, signType?: 'RSA' | 'MD5' | 'HMAC-SHA256'): PayBridgeConfig;
     /**
      * 构建App支付参数
      * @see https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_2_4.shtml

package/dist/Pay/Utils.js

@@ -70,7 +70,7 @@ class Utils {
     buildBridgeConfig(prepayId, appId, signType = 'RSA') {
         let params = {
             appId,
-            timeStamp: (0, Utils_1.getTimestamp)(),
+            timeStamp: '' + (0, Utils_1.getTimestamp)(),
             nonceStr: (0, Utils_1.randomString)(),
             package: 'prepay_id=' + prepayId,
             signType,
@@ -129,7 +129,7 @@ class Utils {
             partnerid: this.merchant.getMerchantId(),
             prepayid: prepayId,
             nonceStr: (0, Utils_1.randomString)(),
-            timestamp: (0, Utils_1.getTimestamp)(),
+            timestamp: '' + (0, Utils_1.getTimestamp)(),
             package: 'Sign=WXPay',
             sign: '',
         };

package/dist/Types/global.d.ts

@@ -398,7 +398,7 @@ export interface PayBridgeConfig {
   /**
    * 时间戳
    */
-  timeStamp: number;
+  timeStamp: string;
   /**
    * 随机字符串
    */
@@ -428,7 +428,7 @@ export interface PaySdkConfig {
   /**
    * 时间戳
    */
-  timestamp: number;
+  timestamp: string;
   /**
    * 随机字符串
    */
@@ -474,7 +474,7 @@ export interface PayAppConfig {
   /**
    * 时间戳
    */
-  timestamp: number;
+  timestamp: string;
   /**
    * 签名
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.5.1",
+  "version": "3.5.4",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
@@ -29,13 +29,13 @@
     "typescript": "^4.6.3"
   },
   "dependencies": {
-    "axios": "^0.26.1",
-    "axios-retry": "^3.3.1",
+    "axios": "^1.6.1",
+    "axios-retry": "^3.8.1",
     "form-data": "^4.0.0",
     "merge": "^2.1.1",
-    "node-socialite": "^1.3.2",
-    "qs": "^6.10.3",
-    "raw-body": "^2.5.1",
-    "xml2js": "^0.5.0"
+    "node-socialite": "^1.4.1",
+    "qs": "^6.11.2",
+    "raw-body": "^2.5.2",
+    "xml2js": "^0.6.2"
   }
 }