node-easywechat 3.5.2 → 3.5.5

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 # CHANGELOG
 
 
+## v3.5.5 (2023-12-02)
+
+- Fix: 修复获取服务端实例时，没有获取到最新请求实例的问题 (#47)
+
+## v3.5.4 (2023-11-15)
+
+- Fix: 修复生成支付参数中，时间戳类型错误 (#45)
+- Fix: 修复计算支付签名时证书调用错误
+- Fix: 证书文件无法访问时抛出异常
+
 ## v3.5.2 (2023-11-11)
 
 - Fix: 更新依赖包

package/dist/Core/Contracts/ServerInterface.d.ts

@@ -2,6 +2,7 @@ import ResponseInterface from "../Http/Contracts/ResponseInterface";
 import DecryptXmlMessageMixin from "../Mixins/DecryptXmlMessageMixin";
 import HandlersMixin from "../Mixins/HandlersMixin";
 import ResponseXmlMessageMixin from "../Mixins/ResponseXmlMessageMixin";
+import ServerRequestMixin from "../Mixins/ServerRequestMixin";
 declare abstract class ServerInterface {
     constructor();
     /**
@@ -9,6 +10,6 @@ declare abstract class ServerInterface {
      */
     serve(): Promise<ResponseInterface>;
 }
-interface ServerInterface extends HandlersMixin, DecryptXmlMessageMixin, ResponseXmlMessageMixin {
+interface ServerInterface extends HandlersMixin, DecryptXmlMessageMixin, ResponseXmlMessageMixin, ServerRequestMixin {
 }
 export = ServerInterface;

package/dist/Core/Contracts/ServerInterface.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const DecryptXmlMessageMixin_1 = __importDefault(require("../Mixins/DecryptXmlMessageMixin"));
 const HandlersMixin_1 = __importDefault(require("../Mixins/HandlersMixin"));
 const ResponseXmlMessageMixin_1 = __importDefault(require("../Mixins/ResponseXmlMessageMixin"));
+const ServerRequestMixin_1 = __importDefault(require("../Mixins/ServerRequestMixin"));
 const Utils_1 = require("../Support/Utils");
 class ServerInterface {
     constructor() {
@@ -28,5 +29,5 @@ class ServerInterface {
 }
 ;
 ;
-(0, Utils_1.applyMixins)(ServerInterface, [HandlersMixin_1.default, DecryptXmlMessageMixin_1.default, ResponseXmlMessageMixin_1.default]);
+(0, Utils_1.applyMixins)(ServerInterface, [HandlersMixin_1.default, DecryptXmlMessageMixin_1.default, ResponseXmlMessageMixin_1.default, ServerRequestMixin_1.default]);
 module.exports = ServerInterface;

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/MiniApp/Application.js

@@ -77,6 +77,9 @@ class Application {
             }
             this.server = new Server_1.default(this.getRequest(), this.getAccount().getAesKey() ? this.getEncryptor() : null);
         }
+        else {
+            this.server.setRequest(this.getRequest());
+        }
         return this.server;
     }
     /**

package/dist/OfficialAccount/Application.js

@@ -77,6 +77,9 @@ class Application {
         if (!this.server) {
             this.server = new Server_1.default(this.getRequest(), this.getAccount().getAesKey() ? this.getEncryptor() : null);
         }
+        else {
+            this.server.setRequest(this.getRequest());
+        }
         return this.server;
     }
     /**

package/dist/OpenPlatform/Application.js

@@ -98,6 +98,9 @@ class Application {
         if (!this.server) {
             this.server = new Server_1.default(this.getAccount().getAesKey() ? this.getEncryptor() : null, this.getRequest());
         }
+        else {
+            this.server.setRequest(this.getRequest());
+        }
         return this.server;
     }
     /**

package/dist/OpenWork/Application.js

@@ -117,6 +117,9 @@ class Application {
                 return next(message);
             }));
         }
+        else {
+            this.server.setRequest(this.getRequest());
+        }
         return this.server;
     }
     /**

package/dist/Pay/Application.js

@@ -49,6 +49,9 @@ class Application {
         if (!this.server) {
             this.server = new Server_1.default(this.getMerchant(), this.getRequest());
         }
+        else {
+            this.server.setRequest(this.getRequest());
+        }
         return this.server;
     }
     /**

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/dist/Work/Application.js

@@ -85,6 +85,9 @@ class Application {
         if (!this.server) {
             this.server = new Server_1.default(this.getEncryptor(), this.getRequest());
         }
+        else {
+            this.server.setRequest(this.getRequest());
+        }
         return this.server;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.5.2",
+  "version": "3.5.5",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {