node-easywechat 3.7.2 → 3.7.4

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
 
+## v3.7.4 (2024-08-14)
+
+- Fix: 更新依赖包
+
+## v3.7.3 (2024-07-26)
+
+- Fix: 修复各模块获取服务端消息时，未能获取最新请求导致解密异常的问题。(#88)
+
 ## v3.7.2 (2024-07-22)
 
 - Fix: 补充公众号和小程序服务端缺失的获取解密消息的方法，并优化其它模块该方法的逻辑；(#86)

package/README.md

@@ -292,7 +292,7 @@ client.setLogger((...args) => {
 
 #### 缓存模块
 
-框架默认使用文件缓存读取到的 `access_token` 等值，如需要改用其他缓存方式（如：redis），请实现接口 `CacheInterface` 并通过 `app.setCacher` 方法进行模块替换。
+框架默认使用文件缓存读取到的 `access_token` 等值，如需要改用其他缓存方式（如：redis），请实现接口 `CacheInterface` 并通过 `app.setCache` 方法进行模块替换。
 
 ```js
 const { OfficialAccount, CacheInterface } = require('node-easywechat');
@@ -337,7 +337,7 @@ let app = new OfficialAccount({
 });
 
 // 替换缓存实例
-app.setCacher(new RedisCacher(new Redis));
+app.setCache(new RedisCacher(new Redis));
 ```
 
 #### 请求模块

package/dist/Core/Encryptor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 declare class Encryptor {
     protected appId: string;
     protected token: string;

package/dist/Core/Http/Contracts/MessageInterface.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 declare abstract class MessageInterface {
     /**
      * 获取 HTTP 协议版本，如：'1.1', '1.0'

package/dist/Core/Http/Minxins/MessageMixin.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 declare class MessageMixin {
     protected headers: Record<string, any>;
     protected protocal: string;

package/dist/Core/Http/ServerRequest.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { IncomingMessage } from "http";
 import ServerRequestInterface from "./Contracts/ServerRequestInterface";
 import MessageMixin from "./Minxins/MessageMixin";

package/dist/Core/Http/ServerRequest.js

@@ -26,6 +26,7 @@ class ServerRequest {
             .withProtocolVersion(version)
             .withQueryParams((0, url_1.parse)(url, true).query || {});
         if (body) {
+            this.parsedBody = {};
             this.withBody(body);
         }
     }

package/dist/Core/HttpClient/Mixins/PresetMixin.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { AxiosRequestConfig, Method } from "axios";
 import fs from "fs";
 declare class PresetMixin {

package/dist/Core/Support/AES.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { CipherGCMTypes, BinaryLike, CipherKey } from 'crypto';
 export declare class AES {
     /**

package/dist/Core/Support/PKCS.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 declare class PKCS7 {
     /**
      * 对需要加密的明文进行填充补位

package/dist/Core/Support/PrivateKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class PrivateKey {
     protected passphrase?: string;
     protected key: Buffer;

package/dist/Core/Support/PublicKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class PublicKey {
     protected certificate: Buffer;
     protected serialNo: string;

package/dist/Core/Support/RSA.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import crypto, { BinaryToTextEncoding } from 'crypto';
 declare class RSA {
     protected publicKey: crypto.KeyObject;

package/dist/Core/Support/Utils.d.ts

@@ -1,7 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import Crypto from 'crypto';
 import Stream from 'stream';
 import Fs from 'fs';

package/dist/OfficialAccount/Server.d.ts

@@ -33,7 +33,7 @@ declare class Server extends ServerInterface {
      * @returns
      */
     getRequestMessage(request?: ServerRequestInterface): Promise<Message>;
-    protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message>;
+    protected decryptRequestMessage(): ServerHandlerClosure<Message>;
     /**
      * 获取解密后的消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取

package/dist/OfficialAccount/Server.js

@@ -23,7 +23,7 @@ class Server extends ServerInterface_1.default {
         }
         let message = await this.getRequestMessage(this.request);
         if (this.encryptor && query['msg_signature']) {
-            this.prepend(this.decryptRequestMessage(query));
+            this.prepend(this.decryptRequestMessage());
         }
         let response = await this.handle(new Response_1.default(200, {}, 'success'), message);
         if (!(response instanceof Response_1.default)) {
@@ -64,8 +64,9 @@ class Server extends ServerInterface_1.default {
     getRequestMessage(request = null) {
         return Message_1.default.createFromRequest(request || this.request);
     }
-    decryptRequestMessage(query) {
+    decryptRequestMessage() {
         return async (message, next) => {
+            let query = this.request.getQueryParams();
             message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
             return next(message);
         };

package/dist/OpenPlatform/Server.d.ts

@@ -50,7 +50,7 @@ declare class Server extends ServerInterface {
      * @returns
      */
     handleThirdFastRegister(handler: ServerHandlerClosure<Message>): this;
-    protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message>;
+    protected decryptRequestMessage(): ServerHandlerClosure<Message>;
     /**
      * 获取来自微信服务器的推送消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取

package/dist/OpenPlatform/Server.js

@@ -24,7 +24,7 @@ class Server extends ServerInterface_1.default {
         }
         let message = await this.getRequestMessage(this.request);
         if (this.encryptor && query['msg_signature']) {
-            this.prepend(this.decryptRequestMessage(query));
+            this.prepend(this.decryptRequestMessage());
         }
         let response = await this.handle(new Response_1.default(200, {}, 'success'), message);
         if (!(response instanceof Response_1.default)) {
@@ -96,8 +96,9 @@ class Server extends ServerInterface_1.default {
             return message.InfoType === 'notify_third_fasteregister' ? handler(message, next) : next(message);
         });
     }
-    decryptRequestMessage(query) {
+    decryptRequestMessage() {
         return async (message, next) => {
+            let query = this.request.getQueryParams();
             message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
             return next(message);
         };

package/dist/OpenWork/Encryptor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import BaseEncryptor from '../Core/Encryptor';
 declare class Encryptor extends BaseEncryptor {
     protected corpId: string;

package/dist/OpenWork/Server.d.ts

@@ -92,7 +92,7 @@ declare class Server extends ServerInterface {
      * @returns
      */
     getRequestMessage(request?: ServerRequestInterface): Promise<Message>;
-    protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message>;
+    protected decryptRequestMessage(): ServerHandlerClosure<Message>;
     /**
      * 获取解密后的消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取

package/dist/OpenWork/Server.js

@@ -25,7 +25,7 @@ class Server extends ServerInterface_1.default {
         }
         let message = await this.getRequestMessage(this.request);
         if (this.encryptor && query['msg_signature']) {
-            this.prepend(this.decryptRequestMessage(query));
+            this.prepend(this.decryptRequestMessage());
         }
         let response = await this.handle(new Response_1.default(200, {}, 'success'), message);
         if (!(response instanceof Response_1.default)) {
@@ -176,8 +176,9 @@ class Server extends ServerInterface_1.default {
     getRequestMessage(request = null) {
         return Message_1.default.createFromRequest(request ?? this.request);
     }
-    decryptRequestMessage(query) {
+    decryptRequestMessage() {
         return async (message, next) => {
+            let query = this.request.getQueryParams();
             message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] ?? '', query['timestamp'] ?? '', query['nonce'] ?? '');
             return next(message);
         };

package/dist/OpenWork/SuiteEncryptor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import BaseEncryptor from '../Core/Encryptor';
 declare class SuiteEncryptor extends BaseEncryptor {
     protected suiteId: string;

package/dist/Pay/Client.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import fs from 'fs';
 import { Method, AxiosRequestConfig, AxiosInstance } from "axios";
 import HttpClientInterface from "../Core/HttpClient/Contracts/HttpClientInterface";

package/dist/Pay/Encryptor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { PrivateKey } from "../Core/Support/PrivateKey";
 import { PublicKey } from "../Core/Support/PublicKey";
 import RSA from "../Core/Support/RSA";

package/dist/Work/Encryptor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import BaseEncryptor from '../Core/Encryptor';
 declare class Encryptor extends BaseEncryptor {
     protected corpId: string;

package/dist/Work/Server.d.ts

@@ -79,7 +79,7 @@ declare class Server extends ServerInterface {
      */
     getRequestMessage(request?: ServerRequestInterface): Promise<Message>;
     protected validateUrl(): (message: Message, next: ServerHandlerClosure) => Promise<Response>;
-    protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure;
+    protected decryptRequestMessage(): ServerHandlerClosure;
     /**
      * 获取解密后的消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取

package/dist/Work/Server.js

@@ -23,7 +23,7 @@ class Server extends ServerInterface_1.default {
         }
         let message = await this.getRequestMessage(this.request);
         if (this.encryptor && query['msg_signature']) {
-            this.prepend(this.decryptRequestMessage(query));
+            this.prepend(this.decryptRequestMessage());
         }
         let response = await this.handle(new Response_1.default(200, {}, 'SUCCESS'), message);
         if (!(response instanceof Response_1.default)) {
@@ -151,8 +151,9 @@ class Server extends ServerInterface_1.default {
             return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
         };
     }
-    decryptRequestMessage(query) {
+    decryptRequestMessage() {
         return async (message, next) => {
+            let query = this.request.getQueryParams();
             message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] ?? '', query['timestamp'] ?? '', query['nonce'] ?? '');
             return next(message);
         };

package/dist/index.js

@@ -3,7 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.definePaymentScannedHandler = exports.definePaymentRefundedHandler = exports.definePaymentPaidHandler = exports.definePaymentAlertHandler = exports.definePaymentFailHandler = exports.defineHttpClientFailureJudgeClosure = exports.defineChannelServerHandler = exports.defineOpenWorkServerHandler = exports.defineOpenPlatformServerHandler = exports.defineWorkServerHandler = exports.defineMiniAppServerHandler = exports.defineOfficeAccountServerHandler = exports.defineLogHandler = exports.defineChannelConfig = exports.defineOpenWorkConfig = exports.defineWorkConfig = exports.defineOpenPlatformConfig = exports.definePayConfig = exports.defineMiniAppConfig = exports.defineOfficialAccountConfig = exports.FormData = exports.PrivateKey = exports.PublicKey = exports.ServerRequest = exports.CacheInterface = exports.Channel = exports.OpenWork = exports.Work = exports.OpenPlatform = exports.Pay = exports.MiniApp = exports.OfficialAccount = void 0;
+exports.FormData = exports.PrivateKey = exports.PublicKey = exports.ServerRequest = exports.CacheInterface = exports.Channel = exports.OpenWork = exports.Work = exports.OpenPlatform = exports.Pay = exports.MiniApp = exports.OfficialAccount = void 0;
+exports.defineOfficialAccountConfig = defineOfficialAccountConfig;
+exports.defineMiniAppConfig = defineMiniAppConfig;
+exports.definePayConfig = definePayConfig;
+exports.defineOpenPlatformConfig = defineOpenPlatformConfig;
+exports.defineWorkConfig = defineWorkConfig;
+exports.defineOpenWorkConfig = defineOpenWorkConfig;
+exports.defineChannelConfig = defineChannelConfig;
+exports.defineLogHandler = defineLogHandler;
+exports.defineOfficeAccountServerHandler = defineOfficeAccountServerHandler;
+exports.defineMiniAppServerHandler = defineMiniAppServerHandler;
+exports.defineWorkServerHandler = defineWorkServerHandler;
+exports.defineOpenPlatformServerHandler = defineOpenPlatformServerHandler;
+exports.defineOpenWorkServerHandler = defineOpenWorkServerHandler;
+exports.defineChannelServerHandler = defineChannelServerHandler;
+exports.defineHttpClientFailureJudgeClosure = defineHttpClientFailureJudgeClosure;
+exports.definePaymentFailHandler = definePaymentFailHandler;
+exports.definePaymentAlertHandler = definePaymentAlertHandler;
+exports.definePaymentPaidHandler = definePaymentPaidHandler;
+exports.definePaymentRefundedHandler = definePaymentRefundedHandler;
+exports.definePaymentScannedHandler = definePaymentScannedHandler;
 const Application_1 = __importDefault(require("./OfficialAccount/Application"));
 exports.OfficialAccount = Application_1.default;
 const Application_2 = __importDefault(require("./MiniApp/Application"));
@@ -35,7 +55,6 @@ Object.defineProperty(exports, "PrivateKey", { enumerable: true, get: function (
 function defineOfficialAccountConfig(config) {
     return config;
 }
-exports.defineOfficialAccountConfig = defineOfficialAccountConfig;
 /**
  * 定义小程序配置
  * @param config
@@ -43,7 +62,6 @@ exports.defineOfficialAccountConfig = defineOfficialAccountConfig;
 function defineMiniAppConfig(config) {
     return config;
 }
-exports.defineMiniAppConfig = defineMiniAppConfig;
 /**
  * 定义支付配置
  * @param config
@@ -51,7 +69,6 @@ exports.defineMiniAppConfig = defineMiniAppConfig;
 function definePayConfig(config) {
     return config;
 }
-exports.definePayConfig = definePayConfig;
 /**
  * 定义开放平台配置
  * @param config
@@ -59,7 +76,6 @@ exports.definePayConfig = definePayConfig;
 function defineOpenPlatformConfig(config) {
     return config;
 }
-exports.defineOpenPlatformConfig = defineOpenPlatformConfig;
 /**
  * 定义企业微信配置
  * @param config
@@ -67,7 +83,6 @@ exports.defineOpenPlatformConfig = defineOpenPlatformConfig;
 function defineWorkConfig(config) {
     return config;
 }
-exports.defineWorkConfig = defineWorkConfig;
 /**
  * 定义企业微信开放平台配置
  * @param config
@@ -75,7 +90,6 @@ exports.defineWorkConfig = defineWorkConfig;
 function defineOpenWorkConfig(config) {
     return config;
 }
-exports.defineOpenWorkConfig = defineOpenWorkConfig;
 /**
  * 定义视频号配置
  * @param config
@@ -83,7 +97,6 @@ exports.defineOpenWorkConfig = defineOpenWorkConfig;
 function defineChannelConfig(config) {
     return config;
 }
-exports.defineChannelConfig = defineChannelConfig;
 /**
  * 定义日志处理函数
  * @param func
@@ -91,7 +104,6 @@ exports.defineChannelConfig = defineChannelConfig;
 function defineLogHandler(func) {
     return func;
 }
-exports.defineLogHandler = defineLogHandler;
 /**
  * 定义公众号服务端消息处理函数
  * @param func
@@ -99,7 +111,6 @@ exports.defineLogHandler = defineLogHandler;
 function defineOfficeAccountServerHandler(func) {
     return func;
 }
-exports.defineOfficeAccountServerHandler = defineOfficeAccountServerHandler;
 /**
  * 定义小程序服务端消息处理函数
  * @param func
@@ -107,7 +118,6 @@ exports.defineOfficeAccountServerHandler = defineOfficeAccountServerHandler;
 function defineMiniAppServerHandler(func) {
     return func;
 }
-exports.defineMiniAppServerHandler = defineMiniAppServerHandler;
 /**
  * 定义企业微信服务端消息处理函数
  * @param func
@@ -115,7 +125,6 @@ exports.defineMiniAppServerHandler = defineMiniAppServerHandler;
 function defineWorkServerHandler(func) {
     return func;
 }
-exports.defineWorkServerHandler = defineWorkServerHandler;
 /**
  * 定义开放平台服务端消息处理函数
  * @param func
@@ -123,7 +132,6 @@ exports.defineWorkServerHandler = defineWorkServerHandler;
 function defineOpenPlatformServerHandler(func) {
     return func;
 }
-exports.defineOpenPlatformServerHandler = defineOpenPlatformServerHandler;
 /**
  * 定义企业微信开放平台服务端消息处理函数
  * @param func
@@ -131,7 +139,6 @@ exports.defineOpenPlatformServerHandler = defineOpenPlatformServerHandler;
 function defineOpenWorkServerHandler(func) {
     return func;
 }
-exports.defineOpenWorkServerHandler = defineOpenWorkServerHandler;
 /**
  * 定义视频号服务端消息处理函数
  * @param func
@@ -139,7 +146,6 @@ exports.defineOpenWorkServerHandler = defineOpenWorkServerHandler;
 function defineChannelServerHandler(func) {
     return func;
 }
-exports.defineChannelServerHandler = defineChannelServerHandler;
 /**
  * 定义HttpClient错误判定回调
  * @param func
@@ -147,7 +153,6 @@ exports.defineChannelServerHandler = defineChannelServerHandler;
 function defineHttpClientFailureJudgeClosure(func) {
     return func;
 }
-exports.defineHttpClientFailureJudgeClosure = defineHttpClientFailureJudgeClosure;
 /**
  * 定义支付通知错误处理函数
  * @param func
@@ -155,7 +160,6 @@ exports.defineHttpClientFailureJudgeClosure = defineHttpClientFailureJudgeClosur
 function definePaymentFailHandler(func) {
     return func;
 }
-exports.definePaymentFailHandler = definePaymentFailHandler;
 /**
  * 定义支付业务错误处理函数
  * @param func
@@ -163,7 +167,6 @@ exports.definePaymentFailHandler = definePaymentFailHandler;
 function definePaymentAlertHandler(func) {
     return func;
 }
-exports.definePaymentAlertHandler = definePaymentAlertHandler;
 /**
  * 定义支付结果处理回调函数
  * @param func
@@ -171,7 +174,6 @@ exports.definePaymentAlertHandler = definePaymentAlertHandler;
 function definePaymentPaidHandler(func) {
     return func;
 }
-exports.definePaymentPaidHandler = definePaymentPaidHandler;
 /**
  * 定义退款结果处理回调函数
  * @param func
@@ -179,7 +181,6 @@ exports.definePaymentPaidHandler = definePaymentPaidHandler;
 function definePaymentRefundedHandler(func) {
     return func;
 }
-exports.definePaymentRefundedHandler = definePaymentRefundedHandler;
 /**
  * 定义扫码支付结果处理回调函数
  * @param func
@@ -187,4 +188,3 @@ exports.definePaymentRefundedHandler = definePaymentRefundedHandler;
 function definePaymentScannedHandler(func) {
     return func;
 }
-exports.definePaymentScannedHandler = definePaymentScannedHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
@@ -22,19 +22,19 @@
     "node": ">=15.6.0"
   },
   "devDependencies": {
-    "@types/node": "^20.11.28",
+    "@types/node": "^20.14.15",
     "axios-mock-adapter": "^1.22.0",
     "mocha": "^9.2.2",
     "package-release": "^1.0.3",
-    "typescript": "^5.4.2"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
-    "axios": "^1.6.8",
-    "axios-retry": "^4.0.0",
+    "axios": "^1.7.4",
+    "axios-retry": "^4.5.0",
     "form-data": "^4.0.0",
     "merge": "^2.1.1",
     "node-socialite": "^1.4.1",
-    "qs": "^6.12.0",
+    "qs": "^6.13.0",
     "raw-body": "^2.5.2",
     "xml2js": "^0.6.2"
   }