node-easywechat 3.5.4 → 3.5.6

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 # CHANGELOG
 
 
+## v3.5.6 (2023-12-17)
+
+- Fix: 修复获取代理公众号或小程序实例时，未设置配置项导致
+- Fix: 修复响应结果类型判断异常导致结果解析错误的问题
+- Fix: 修复开放平台服务端未自动处理ComponentVerifyTicket的问题
+
+## v3.5.5 (2023-12-02)
+
+- Fix: 修复获取服务端实例时，没有获取到最新请求实例的问题 (#47)
+
 ## v3.5.4 (2023-11-15)
 
 - Fix: 修复生成支付参数中，时间戳类型错误 (#45)

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/Http/ServerRequest.d.ts

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

package/dist/Core/HttpClient/HttpClientResponse.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const fs_1 = __importDefault(require("fs"));
-const merge_1 = __importDefault(require("merge"));
 const Utils_1 = require("../Support/Utils");
 class HttpClientResponse {
     constructor(response, failureJudge = null, throwError = false) {
@@ -46,7 +45,7 @@ class HttpClientResponse {
                 return;
             }
             if (typeof content === 'string') {
-                if (this.is('xml') && content.indexOf('<xml>') > -1) {
+                if (this.is('xml') || content.indexOf('<xml>') > -1) {
                     this.parsedContent = yield (0, Utils_1.parseXml)(content);
                 }
                 else if (this.is('json')) {
@@ -59,7 +58,7 @@ class HttpClientResponse {
                         }
                     }
                 }
-                else if (this.is('text')) {
+                else {
                     try {
                         this.parsedContent = (0, Utils_1.parseQueryString)(content);
                     }
@@ -67,6 +66,7 @@ class HttpClientResponse {
                         if (throwError) {
                             throw new Error('Fail to parse QueryString content.');
                         }
+                        this.parsedContent = {};
                     }
                 }
             }
@@ -216,13 +216,12 @@ class HttpClientResponse {
         return this.response.status;
     }
     getHeaders(throwError) {
-        let headers = merge_1.default.recursive(true, this.response.headers);
         for (let key in this.response.headers) {
             if (key !== key.toLowerCase()) {
                 this.response.headers[key.toLowerCase()] = this.response.headers[key];
             }
         }
-        return headers;
+        return this.response.headers;
     }
     getContent(throwError) {
         return this.response.data;

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

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

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

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

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,18 @@ 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());
+        }
+        if (this.server instanceof Server_1.default) {
+            this.server.withDefaultVerifyTicketHandler((message, next) => {
+                const ticket = this.getVerifyTicket();
+                if (typeof ticket.setTicket === 'function') {
+                    ticket.setTicket(message.get('ComponentVerifyTicket'));
+                }
+                return next(message);
+            });
+        }
         return this.server;
     }
     /**
@@ -233,7 +245,7 @@ class Application {
      * @param config
      * @returns
      */
-    getOfficialAccountWithRefreshToken(appId, refreshToken, config = null) {
+    getOfficialAccountWithRefreshToken(appId, refreshToken, config = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.getOfficialAccountWithAccessToken(appId, yield this.getAuthorizerAccessToken(appId, refreshToken), config);
         });
@@ -245,7 +257,7 @@ class Application {
      * @param config
      * @returns
      */
-    getOfficialAccountWithAccessToken(appId, accessToken, config = null) {
+    getOfficialAccountWithAccessToken(appId, accessToken, config = {}) {
         return this.getOfficialAccount(new AuthorizerAccessToken_1.default(appId, accessToken), config);
     }
     /**
@@ -254,8 +266,10 @@ class Application {
      * @param config
      * @returns
      */
-    getOfficialAccount(authorizerAccessToken, config = null) {
+    getOfficialAccount(authorizerAccessToken, config = {}) {
         if (!(config instanceof ConfigInterface_1.default)) {
+            if (typeof config !== 'object' || config === null)
+                config = {};
             config.app_id = authorizerAccessToken.getAppId();
             config.token = this.config.get('token');
             config.aes_key = this.config.get('aes_key');
@@ -299,7 +313,7 @@ class Application {
      * @param config
      * @returns
      */
-    getMiniAppWithRefreshToken(appId, refreshToken, config = null) {
+    getMiniAppWithRefreshToken(appId, refreshToken, config = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.getMiniAppWithAccessToken(appId, yield this.getAuthorizerAccessToken(appId, refreshToken), config);
         });
@@ -311,7 +325,7 @@ class Application {
      * @param config
      * @returns
      */
-    getMiniAppWithAccessToken(appId, accessToken, config = null) {
+    getMiniAppWithAccessToken(appId, accessToken, config = {}) {
         return this.getMiniApp(new AuthorizerAccessToken_1.default(appId, accessToken), config);
     }
     /**
@@ -320,8 +334,10 @@ class Application {
      * @param config
      * @returns
      */
-    getMiniApp(authorizerAccessToken, config = null) {
+    getMiniApp(authorizerAccessToken, config = {}) {
         if (!(config instanceof ConfigInterface_1.default)) {
+            if (typeof config !== 'object' || config === null)
+                config = {};
             config.app_id = authorizerAccessToken.getAppId();
             config.token = this.config.get('token');
             config.aes_key = this.config.get('aes_key');

package/dist/OpenPlatform/Server.js

@@ -82,8 +82,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     withDefaultVerifyTicketHandler(handler) {
-        this.defaultVerifyTicketHandler = () => {
-            return handler.call(this, arguments);
+        this.defaultVerifyTicketHandler = function () {
+            return handler.apply(this, arguments);
         };
         this.handleVerifyTicketRefreshed(this.defaultVerifyTicketHandler);
     }

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/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.4",
+  "version": "3.5.6",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.23",
-    "axios-mock-adapter": "^1.21.1",
+    "axios-mock-adapter": "^1.22.0",
     "mocha": "^9.2.2",
     "package-release": "^1.0.3",
     "typescript": "^4.6.3"