node-easywechat 3.6.2 → 3.7.0

package/dist/Core/Mixins/{DecryptXmlMessageMixin.d.ts → DecryptMessageMixin.d.ts}

@@ -1,6 +1,6 @@
 import Encryptor from "../Encryptor";
 import Message from "../Message";
-declare class DecryptXmlMessageMixin {
+declare class DecryptMessageMixin {
     /**
      * 解密消息
      * @returns
@@ -8,4 +8,4 @@ declare class DecryptXmlMessageMixin {
     decryptMessage(message: Message, encryptor: Encryptor, signature: string, timestamp: number, nonce: string): Promise<Message>;
     protected validateSignature(token: string, ciphertext: string, signature: string, timestamp: number, nonce: string): void;
 }
-export = DecryptXmlMessageMixin;
+export = DecryptMessageMixin;

package/dist/Core/Mixins/{DecryptXmlMessageMixin.js → DecryptMessageMixin.js}

@@ -9,16 +9,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const Utils_1 = require("../Support/Utils");
-class DecryptXmlMessageMixin {
+class DecryptMessageMixin {
     /**
      * 解密消息
      * @returns
      */
     decryptMessage(message, encryptor, signature, timestamp, nonce) {
         return __awaiter(this, void 0, void 0, function* () {
-            let ciphertext = message['Encrypt'];
+            const ciphertext = message['Encrypt'];
             this.validateSignature(encryptor.getToken(), ciphertext, signature, timestamp, nonce);
-            let attributes = yield (0, Utils_1.parseXml)(encryptor.decrypt(ciphertext, signature, nonce, timestamp));
+            const plaintext = encryptor.decrypt(ciphertext, signature, nonce, timestamp);
+            let attributes;
+            if (plaintext.substring(0, 1) === '<') {
+                attributes = yield (0, Utils_1.parseXml)(plaintext);
+            }
+            else {
+                attributes = JSON.parse(plaintext);
+            }
             message.merge(attributes);
             return message;
         });
@@ -35,4 +42,4 @@ class DecryptXmlMessageMixin {
     }
 }
 ;
-module.exports = DecryptXmlMessageMixin;
+module.exports = DecryptMessageMixin;

package/dist/Core/Mixins/HandlersMixin.d.ts

@@ -20,33 +20,33 @@ declare class HandlersMixin {
      */
     protected getHandlerHash(handler: ServerHandlerClosure<Message>): string;
     /**
-     * @alias withHandler()
+     * 从后添加处理器
+     * @param handler
      */
     with(handler: ServerHandlerClosure<Message>): this;
     /**
-     * 从最后添加处理器
+     * 从后添加处理器
      * @param handler
-     * @returns
      */
     withHandler(handler: ServerHandlerClosure<Message>): this;
     /**
-     * @alias prependHandler()
+     * 从前添加处理器
+     * @param handler
      */
     prepend(handler: ServerHandlerClosure<Message>): this;
     /**
-     * 从最前添加处理器
+     * 从前添加处理器
      * @param handler
-     * @returns
      */
     prependHandler(handler: ServerHandlerClosure<Message>): this;
     /**
-     * @alias withoutHandler()
+     * 删除处理器
+     * @param handler
      */
     without(handler: ServerHandlerClosure<Message>): this;
     /**
      * 删除处理器
      * @param handler
-     * @returns
      */
     withoutHandler(handler: ServerHandlerClosure<Message>): this;
     /**

package/dist/Core/Mixins/HandlersMixin.js

@@ -40,37 +40,38 @@ class HandlersMixin {
         return (0, Utils_1.createHash)(handler.toString(), 'md5');
     }
     /**
-     * @alias withHandler()
+     * 从后添加处理器
+     * @param handler
      */
     with(handler) {
         return this.withHandler(handler);
     }
     /**
-     * 从最后添加处理器
+     * 从后添加处理器
      * @param handler
-     * @returns
      */
     withHandler(handler) {
         this.handlers.push(this.createHandlerItem(handler));
         return this;
     }
     /**
-     * @alias prependHandler()
+     * 从前添加处理器
+     * @param handler
      */
     prepend(handler) {
         return this.prependHandler(handler);
     }
     /**
-     * 从最前添加处理器
+     * 从前添加处理器
      * @param handler
-     * @returns
      */
     prependHandler(handler) {
         this.handlers.unshift(this.createHandlerItem(handler));
         return this;
     }
     /**
-     * @alias withoutHandler()
+     * 删除处理器
+     * @param handler
      */
     without(handler) {
         return this.withoutHandler(handler);
@@ -78,7 +79,6 @@ class HandlersMixin {
     /**
      * 删除处理器
      * @param handler
-     * @returns
      */
     withoutHandler(handler) {
         let index = this.indexOf(handler);

package/dist/Core/Mixins/{ResponseXmlMessageMixin.d.ts → ResponseMessageMixin.d.ts}

@@ -1,13 +1,14 @@
 import Encryptor from "../Encryptor";
 import ResponseInterface from "../Http/Contracts/ResponseInterface";
 import Message from "../Message";
-declare class ResponseXmlMessageMixin {
+declare class ResponseMessageMixin {
     /**
      * 转化为回复消息
      * @returns
      */
-    transformToReply(response: any, message: Message, encryptor?: Encryptor): Promise<ResponseInterface>;
+    transformToReply(response: any, message: Message, encryptor?: Encryptor, isXml?: boolean): Promise<ResponseInterface>;
     protected normalizeResponse(response: any): Promise<Record<string, any>>;
     protected createXmlResponse(attributes: Record<string, any>, encryptor?: Encryptor): ResponseInterface;
+    protected createJsonResponse(attributes: Record<string, any>, encryptor?: Encryptor): ResponseInterface;
 }
-export = ResponseXmlMessageMixin;
+export = ResponseMessageMixin;

package/dist/Core/Mixins/{ResponseXmlMessageMixin.js → ResponseMessageMixin.js}

@@ -14,13 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const merge_1 = __importDefault(require("merge"));
 const Response_1 = __importDefault(require("../Http/Response"));
 const Utils_1 = require("../Support/Utils");
-class ResponseXmlMessageMixin {
+class ResponseMessageMixin {
     /**
      * 转化为回复消息
      * @returns
      */
     transformToReply(response_1, message_1) {
-        return __awaiter(this, arguments, void 0, function* (response, message, encryptor = null) {
+        return __awaiter(this, arguments, void 0, function* (response, message, encryptor = null, isXml = true) {
             if (!response || response === true) {
                 return new Response_1.default(200, {}, 'success');
             }
@@ -29,7 +29,12 @@ class ResponseXmlMessageMixin {
                 FromUserName: message['ToUserName'],
                 CreateTime: (0, Utils_1.getTimestamp)(),
             }, yield this.normalizeResponse(response));
-            return this.createXmlResponse(attributes, encryptor);
+            if (isXml) {
+                return this.createXmlResponse(attributes, encryptor);
+            }
+            else {
+                return this.createJsonResponse(attributes, encryptor);
+            }
         });
     }
     normalizeResponse(response) {
@@ -55,9 +60,15 @@ class ResponseXmlMessageMixin {
     createXmlResponse(attributes, encryptor = null) {
         let xml = (0, Utils_1.buildXml)(attributes);
         return new Response_1.default(200, {
-            'Content-Type': 'application/xml'
+            'Content-Type': 'text/xml'
         }, encryptor ? encryptor.encrypt(xml) : xml);
     }
+    createJsonResponse(attributes, encryptor = null) {
+        let json = JSON.stringify(attributes);
+        return new Response_1.default(200, {
+            'Content-Type': 'application/json'
+        }, encryptor ? encryptor.encrypt(json) : json);
+    }
 }
 ;
-module.exports = ResponseXmlMessageMixin;
+module.exports = ResponseMessageMixin;

package/dist/OfficialAccount/Server.d.ts

@@ -36,11 +36,35 @@ declare class Server extends ServerInterface {
     protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure<Message>;
 }
 interface Server {
+    /**
+     * 从后添加处理器
+     * @param handler
+     */
     with(next: ServerHandlerClosure<Message>): this;
+    /**
+     * 从后添加处理器
+     * @param handler
+     */
     withHandler(next: ServerHandlerClosure<Message>): this;
+    /**
+     * 从前添加处理器
+     * @param handler
+     */
     prepend(next: ServerHandlerClosure<Message>): this;
+    /**
+     * 从前添加处理器
+     * @param handler
+     */
     prependHandler(next: ServerHandlerClosure<Message>): this;
+    /**
+     * 删除处理器
+     * @param handler
+     */
     without(next: ServerHandlerClosure<Message>): this;
+    /**
+     * 删除处理器
+     * @param handler
+     */
     withoutHandler(next: ServerHandlerClosure<Message>): this;
 }
 export = Server;

package/dist/OfficialAccount/Server.js

@@ -37,7 +37,10 @@ class Server extends ServerInterface_1.default {
             }
             let response = yield this.handle(new Response_1.default(200, {}, 'success'), message);
             if (!(response instanceof Response_1.default)) {
-                response = yield this.transformToReply(response, message, this.encryptor);
+                const contentType = this.request.getHeader('content-type');
+                const contentBody = this.request.getBody().toString();
+                const isXml = (contentType && contentType.indexOf('xml') > -1) || contentBody.substring(0, 1) === '<';
+                response = yield this.transformToReply(response, message, this.encryptor, isXml);
             }
             return response;
         });

package/dist/Pay/Client.js

@@ -62,10 +62,19 @@ class Client {
                 payload.headers['user-agent'] = (0, Utils_1.createUserAgent)();
             }
             if (this.isV3Request(url) && !payload.headers['authorization']) {
+                if (typeof payload.json !== 'undefined') {
+                    if (typeof payload.json === 'object') {
+                        payload.data = JSON.stringify(payload.json);
+                    }
+                    else if (typeof payload.json === 'string') {
+                        payload.data = payload.json;
+                    }
+                    delete payload.json;
+                }
                 payload.headers['authorization'] = this.createSignature(method, url, payload);
             }
             else {
-                if (payload.xml) {
+                if (typeof payload.xml !== 'undefined') {
                     if (typeof payload.xml === 'object') {
                         payload.xml = (0, Utils_1.buildXml)(this.attachLegacySignature(payload.xml));
                     }

package/dist/Types/global.d.ts

@@ -481,3 +481,34 @@ export interface PayAppConfig {
    */
   sign: string;
 }
+
+/**
+ * 视频号配置
+ */
+export interface ChannelConfig extends BaseConfig {
+  /**
+   * 视频号 app_id
+   */
+  app_id?: string;
+
+  /**
+   * 视频号 secret
+   */
+  secret?: string;
+
+  /**
+   * 服务端接口验证 token
+   */
+  token?: string;
+
+  /**
+   * 服务端消息加解密密钥 aes_key
+   */
+  aes_key?: string;
+
+  /**
+   * 是否使用稳定版接口调用凭据，默认：false
+   * @see https://developers.weixin.qq.com/doc/channels/API/basics/getStableAccessToken.html
+   */
+  use_stable_access_token?: boolean;
+}

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import { OfficialAccountConfig, MiniAppConfig, LogHandler, ServerEventType, ServerHandlerClosure, PayConfig, OpenPlatformConfig, WorkConfig, OpenWorkConfig, HttpClientFailureJudgeClosure, PaymentFailHandler, PaymentAlertHandler, PaymentPaidHandler, PaymentRefundedHandler, PaymentScannedHandler } from './Types/global';
+import { OfficialAccountConfig, MiniAppConfig, LogHandler, ServerEventType, ServerHandlerClosure, PayConfig, OpenPlatformConfig, WorkConfig, OpenWorkConfig, ChannelConfig, HttpClientFailureJudgeClosure, PaymentFailHandler, PaymentAlertHandler, PaymentPaidHandler, PaymentRefundedHandler, PaymentScannedHandler } from './Types/global';
 import OfficialAccount from './OfficialAccount/Application';
 import MiniApp from './MiniApp/Application';
 import Pay from './Pay/Application';
 import OpenPlatform from './OpenPlatform/Application';
 import Work from './Work/Application';
 import OpenWork from './OpenWork/Application';
+import Channel from './Channel/Application';
 import CacheInterface from './Core/Contracts/CacheInterface';
 import ServerRequest from './Core/Http/ServerRequest';
 import FormData from 'form-data';
@@ -12,9 +13,10 @@ import OfficialAccountMessage from './OfficialAccount/Message';
 import WorkMessage from './Work/Message';
 import OpenPlatformMessage from './OpenPlatform/Message';
 import OpenWorkMessage from './OpenWork/Message';
+import ChannelMessage from './Channel/Message';
 import { PublicKey } from './Core/Support/PublicKey';
 import { PrivateKey } from './Core/Support/PrivateKey';
-export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, Pay, PayConfig, OpenPlatform, OpenPlatformConfig, Work, WorkConfig, OpenWork, OpenWorkConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, PublicKey, PrivateKey, 
+export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, Pay, PayConfig, OpenPlatform, OpenPlatformConfig, Work, WorkConfig, OpenWork, OpenWorkConfig, Channel, ChannelConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, PublicKey, PrivateKey, 
 /**
  * 表单对象
  * @see https://github.com/axios/axios#formdata
@@ -51,6 +53,11 @@ export declare function defineWorkConfig(config: WorkConfig): WorkConfig;
  * @param config
  */
 export declare function defineOpenWorkConfig(config: OpenWorkConfig): OpenWorkConfig;
+/**
+ * 定义视频号配置
+ * @param config
+ */
+export declare function defineChannelConfig(config: ChannelConfig): ChannelConfig;
 /**
  * 定义日志处理函数
  * @param func
@@ -81,6 +88,11 @@ export declare function defineOpenPlatformServerHandler(func: ServerHandlerClosu
  * @param func
  */
 export declare function defineOpenWorkServerHandler(func: ServerHandlerClosure<OpenWorkMessage>): ServerHandlerClosure<OpenWorkMessage>;
+/**
+ * 定义视频号服务端消息处理函数
+ * @param func
+ */
+export declare function defineChannelServerHandler(func: ServerHandlerClosure<ChannelMessage>): ServerHandlerClosure<ChannelMessage>;
 /**
  * 定义HttpClient错误判定回调
  * @param func

package/dist/index.js

@@ -3,7 +3,7 @@ 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.defineOpenWorkServerHandler = exports.defineOpenPlatformServerHandler = exports.defineWorkServerHandler = exports.defineMiniAppServerHandler = exports.defineOfficeAccountServerHandler = exports.defineLogHandler = exports.defineOpenWorkConfig = exports.defineWorkConfig = exports.defineOpenPlatformConfig = exports.definePayConfig = exports.defineMiniAppConfig = exports.defineOfficialAccountConfig = exports.FormData = exports.PrivateKey = exports.PublicKey = exports.ServerRequest = exports.CacheInterface = exports.OpenWork = exports.Work = exports.OpenPlatform = exports.Pay = exports.MiniApp = exports.OfficialAccount = void 0;
+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;
 const Application_1 = __importDefault(require("./OfficialAccount/Application"));
 exports.OfficialAccount = Application_1.default;
 const Application_2 = __importDefault(require("./MiniApp/Application"));
@@ -16,6 +16,8 @@ const Application_5 = __importDefault(require("./Work/Application"));
 exports.Work = Application_5.default;
 const Application_6 = __importDefault(require("./OpenWork/Application"));
 exports.OpenWork = Application_6.default;
+const Application_7 = __importDefault(require("./Channel/Application"));
+exports.Channel = Application_7.default;
 const CacheInterface_1 = __importDefault(require("./Core/Contracts/CacheInterface"));
 exports.CacheInterface = CacheInterface_1.default;
 const ServerRequest_1 = __importDefault(require("./Core/Http/ServerRequest"));
@@ -74,6 +76,14 @@ function defineOpenWorkConfig(config) {
     return config;
 }
 exports.defineOpenWorkConfig = defineOpenWorkConfig;
+/**
+ * 定义视频号配置
+ * @param config
+ */
+function defineChannelConfig(config) {
+    return config;
+}
+exports.defineChannelConfig = defineChannelConfig;
 /**
  * 定义日志处理函数
  * @param func
@@ -122,6 +132,14 @@ function defineOpenWorkServerHandler(func) {
     return func;
 }
 exports.defineOpenWorkServerHandler = defineOpenWorkServerHandler;
+/**
+ * 定义视频号服务端消息处理函数
+ * @param func
+ */
+function defineChannelServerHandler(func) {
+    return func;
+}
+exports.defineChannelServerHandler = defineChannelServerHandler;
 /**
  * 定义HttpClient错误判定回调
  * @param func

package/package.json

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