node-easywechat 3.6.3 → 3.7.1

package/dist/Core/HttpClient/HttpClientResponse.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -35,46 +26,44 @@ class HttpClientResponse {
      * @param throwError
      * @returns
      */
-    parseContent() {
-        return __awaiter(this, arguments, void 0, function* (throwError = false) {
-            throwError = throwError !== null && throwError !== void 0 ? throwError : this.throwError;
-            let content = this.response.data;
-            if (!content) {
-                if (throwError) {
-                    throw new Error('Response body is empty.');
-                }
-                return;
+    async parseContent(throwError = false) {
+        throwError = throwError ?? this.throwError;
+        let content = this.response.data;
+        if (!content) {
+            if (throwError) {
+                throw new Error('Response body is empty.');
+            }
+            return;
+        }
+        if (typeof content === 'string') {
+            if (this.is('xml') || content.indexOf('<xml>') > -1) {
+                this.parsedContent = await (0, Utils_1.parseXml)(content);
             }
-            if (typeof content === 'string') {
-                if (this.is('xml') || content.indexOf('<xml>') > -1) {
-                    this.parsedContent = yield (0, Utils_1.parseXml)(content);
+            else if (this.is('json')) {
+                try {
+                    this.parsedContent = JSON.parse(content);
                 }
-                else if (this.is('json')) {
-                    try {
-                        this.parsedContent = JSON.parse(content);
-                    }
-                    catch (e) {
-                        if (throwError) {
-                            throw new Error('Fail to parse JSON content.');
-                        }
+                catch (e) {
+                    if (throwError) {
+                        throw new Error('Fail to parse JSON content.');
                     }
                 }
-                else {
-                    try {
-                        this.parsedContent = (0, Utils_1.parseQueryString)(content);
-                    }
-                    catch (e) {
-                        if (throwError) {
-                            throw new Error('Fail to parse QueryString content.');
-                        }
-                        this.parsedContent = {};
+            }
+            else {
+                try {
+                    this.parsedContent = (0, Utils_1.parseQueryString)(content);
+                }
+                catch (e) {
+                    if (throwError) {
+                        throw new Error('Fail to parse QueryString content.');
                     }
+                    this.parsedContent = {};
                 }
             }
-            else if (!Buffer.isBuffer(content)) {
-                this.parsedContent = content;
-            }
-        });
+        }
+        else if (!Buffer.isBuffer(content)) {
+            this.parsedContent = content;
+        }
     }
     withThrowError(throwError) {
         this.throwError = throwError;
@@ -232,15 +221,11 @@ class HttpClientResponse {
     getInfo(type) {
         return this.response.config;
     }
-    offsetExists(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Object.keys(yield this.toObject()).findIndex(o => o === key) > -1;
-        });
+    async offsetExists(key) {
+        return Object.keys(await this.toObject()).findIndex(o => o === key) > -1;
     }
-    offsetGet(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.toObject())[key] || null;
-        });
+    async offsetGet(key) {
+        return (await this.toObject())[key] || null;
     }
     /**
      * 转换为标准的 http 响应类

package/dist/Core/HttpClient/Mixins/HttpClientMethodsMixin.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,10 +11,8 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    get(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, payload = {}) {
-            return this.request('get', url, payload);
-        });
+    async get(url, payload = {}) {
+        return this.request('get', url, payload);
     }
     /**
      * 发送post请求
@@ -31,10 +20,8 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    post(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, payload = {}) {
-            return this.request('post', url, payload);
-        });
+    async post(url, payload = {}) {
+        return this.request('post', url, payload);
     }
     /**
      * 发送patch请求
@@ -42,10 +29,8 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    patch(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, payload = {}) {
-            return this.request('patch', url, payload);
-        });
+    async patch(url, payload = {}) {
+        return this.request('patch', url, payload);
     }
     /**
      * 发送put请求
@@ -53,10 +38,8 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    put(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, payload = {}) {
-            return this.request('put', url, payload);
-        });
+    async put(url, payload = {}) {
+        return this.request('put', url, payload);
     }
     /**
      * 发送delete请求
@@ -64,10 +47,8 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    delete(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, payload = {}) {
-            return this.request('delete', url, payload);
-        });
+    async delete(url, payload = {}) {
+        return this.request('delete', url, payload);
     }
     /**
      * 发送post请求（JSON数据）
@@ -76,16 +57,14 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    postJson(url_1, data_1) {
-        return __awaiter(this, arguments, void 0, function* (url, data, payload = {}) {
-            if (!payload)
-                payload = {};
-            if (!payload['headers'])
-                payload['headers'] = {};
-            payload['headers']['Content-Type'] = 'application/json';
-            payload.json = merge_1.default.recursive({}, data);
-            return this.request('post', url, payload);
-        });
+    async postJson(url, data, payload = {}) {
+        if (!payload)
+            payload = {};
+        if (!payload['headers'])
+            payload['headers'] = {};
+        payload['headers']['Content-Type'] = 'application/json';
+        payload.json = merge_1.default.recursive({}, data);
+        return this.request('post', url, payload);
     }
     /**
      * 发送patch请求（JSON数据）
@@ -94,16 +73,14 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    patchJson(url_1, data_1) {
-        return __awaiter(this, arguments, void 0, function* (url, data, payload = {}) {
-            if (!payload)
-                payload = {};
-            if (!payload['headers'])
-                payload['headers'] = {};
-            payload['headers']['Content-Type'] = 'application/json';
-            payload.json = merge_1.default.recursive({}, data);
-            return this.request('patch', url, payload);
-        });
+    async patchJson(url, data, payload = {}) {
+        if (!payload)
+            payload = {};
+        if (!payload['headers'])
+            payload['headers'] = {};
+        payload['headers']['Content-Type'] = 'application/json';
+        payload.json = merge_1.default.recursive({}, data);
+        return this.request('patch', url, payload);
     }
     /**
      * 发送post请求（XML数据）
@@ -112,16 +89,14 @@ class HttpClientMethodsMixin extends HttpClientInterface_1.default {
      * @param payload axios配置项
      * @returns
      */
-    postXml(url_1, data_1) {
-        return __awaiter(this, arguments, void 0, function* (url, data, payload = {}) {
-            if (!payload)
-                payload = {};
-            if (!payload['headers'])
-                payload['headers'] = {};
-            payload['headers']['Content-Type'] = 'text/xml';
-            payload.xml = typeof data === 'object' ? merge_1.default.recursive({}, data) : data;
-            return this.request('post', url, payload);
-        });
+    async postXml(url, data, payload = {}) {
+        if (!payload)
+            payload = {};
+        if (!payload['headers'])
+            payload['headers'] = {};
+        payload['headers']['Content-Type'] = 'text/xml';
+        payload.xml = typeof data === 'object' ? merge_1.default.recursive({}, data) : data;
+        return this.request('post', url, payload);
     }
 }
 module.exports = HttpClientMethodsMixin;

package/dist/Core/HttpClient/Mixins/PresetMixin.js

@@ -64,15 +64,13 @@ class PresetMixin {
     with(key, value = null) {
         if (Array.isArray(key)) {
             key.map((k) => {
-                var _a;
-                this.with(k, (_a = this.presets[k]) !== null && _a !== void 0 ? _a : null);
+                this.with(k, this.presets[k] ?? null);
             });
             return this;
         }
         else if (typeof key === 'object') {
             key.map((v, k) => {
-                var _a;
-                this.with(k, (_a = v !== null && v !== void 0 ? v : this.presets[k]) !== null && _a !== void 0 ? _a : null);
+                this.with(k, v ?? this.presets[k] ?? null);
             });
             return this;
         }
@@ -145,27 +143,26 @@ class PresetMixin {
      * @returns
      */
     mergeThenResetPrepends(payload, method = 'get') {
-        var _a, _b, _c, _d;
         let field = method.toLowerCase() === 'get' ? 'params' : 'data';
-        let options = Object.assign({}, payload);
+        let options = { ...payload };
         if (!options.headers)
             options.headers = {};
         if (!options.formData)
             options.formData = {};
-        if (((_b = (_a = options.headers['Content-Type']) !== null && _a !== void 0 ? _a : options.headers['content-type']) !== null && _b !== void 0 ? _b : null) === 'application/json' || !!options.json) {
+        if ((options.headers['Content-Type'] ?? options.headers['content-type'] ?? null) === 'application/json' || !!options.json) {
             field = 'json';
         }
-        if (((_d = (_c = options.headers['Content-Type']) !== null && _c !== void 0 ? _c : options.headers['content-type']) !== null && _d !== void 0 ? _d : null) === 'text/xml' || !!options.xml) {
+        if ((options.headers['Content-Type'] ?? options.headers['content-type'] ?? null) === 'text/xml' || !!options.xml) {
             field = 'xml';
         }
         if (this.prependData && Object.keys(this.prependData).length > 0) {
-            options[field] = Object.assign(Object.assign({}, this.prependData), options[field]);
+            options[field] = { ...this.prependData, ...options[field] };
         }
         if (this.prependHeaders && Object.keys(this.prependHeaders).length > 0) {
-            options.headers = Object.assign(Object.assign({}, this.prependHeaders), options.headers);
+            options.headers = { ...this.prependHeaders, ...options.headers };
         }
         if (this.prependFiles && Object.keys(this.prependFiles).length > 0) {
-            options.formData = Object.assign(Object.assign({}, this.prependFiles), options.formData);
+            options.formData = { ...this.prependFiles, ...options.formData };
         }
         this.prependData = {};
         this.prependHeaders = {};

package/dist/Core/Message.js

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -51,29 +42,27 @@ class Message {
      * @param request
      * @returns
      */
-    static createFromRequest(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let originContent = '';
-            let body = request.getBody();
-            if (body) {
-                originContent = body.toString();
-            }
-            let attributes = {};
-            if ('<' === originContent.substring(0, 1)) {
-                attributes = yield (0, Utils_1.parseXml)(originContent);
-            }
-            else {
-                // Handle JSON format.
-                try {
-                    attributes = JSON.parse(originContent);
-                }
-                catch (e) { }
-            }
-            if (Object.keys(attributes).length === 0) {
-                throw new Error('Failed to decode request contents.');
+    static async createFromRequest(request) {
+        let originContent = '';
+        let body = request.getBody();
+        if (body) {
+            originContent = body.toString();
+        }
+        let attributes = {};
+        if ('<' === originContent.substring(0, 1)) {
+            attributes = await (0, Utils_1.parseXml)(originContent);
+        }
+        else {
+            // Handle JSON format.
+            try {
+                attributes = JSON.parse(originContent);
             }
-            return new Message(attributes, originContent);
-        });
+            catch (e) { }
+        }
+        if (Object.keys(attributes).length === 0) {
+            throw new Error('Failed to decode request contents.');
+        }
+        return new Message(attributes, originContent);
     }
     /**
      * 获取原始消息内容

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/DecryptMessageMixin.js

@@ -0,0 +1,34 @@
+'use strict';
+const Utils_1 = require("../Support/Utils");
+class DecryptMessageMixin {
+    /**
+     * 解密消息
+     * @returns
+     */
+    async decryptMessage(message, encryptor, signature, timestamp, nonce) {
+        const ciphertext = message['Encrypt'];
+        this.validateSignature(encryptor.getToken(), ciphertext, signature, timestamp, nonce);
+        const plaintext = encryptor.decrypt(ciphertext, signature, nonce, timestamp);
+        let attributes;
+        if (plaintext.substring(0, 1) === '<') {
+            attributes = await (0, Utils_1.parseXml)(plaintext);
+        }
+        else {
+            attributes = JSON.parse(plaintext);
+        }
+        message.merge(attributes);
+        return message;
+    }
+    validateSignature(token, ciphertext, signature, timestamp, nonce) {
+        if (!signature) {
+            throw new Error('Request signature must not be empty.');
+        }
+        let params = [token, timestamp, nonce, ciphertext];
+        params.sort();
+        if (signature !== (0, Utils_1.createHash)(params.join(''), 'sha1')) {
+            throw new Error('Invalid request signature.');
+        }
+    }
+}
+;
+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

@@ -1,13 +1,4 @@
 'use strict';
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 const Utils_1 = require("../Support/Utils");
 class HandlersMixin {
     constructor() {
@@ -40,37 +31,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 +70,6 @@ class HandlersMixin {
     /**
      * 删除处理器
      * @param handler
-     * @returns
      */
     withoutHandler(handler) {
         let index = this.indexOf(handler);
@@ -126,29 +117,25 @@ class HandlersMixin {
      * @param payload
      * @returns
      */
-    handle(result, payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 默认返回值处理函数
-            let resultClosure = (p) => __awaiter(this, void 0, void 0, function* () { return result; });
-            if (typeof result === 'function') {
-                resultClosure = result;
+    async handle(result, payload) {
+        // 默认返回值处理函数
+        let resultClosure = async (p) => { return result; };
+        if (typeof result === 'function') {
+            resultClosure = result;
+        }
+        let handlers = [...this.handlers];
+        const nextClosure = async function (p) {
+            if (handlers.length > 0) {
+                let item = handlers.shift();
+                let closureRes = await item.handler(p, nextClosure);
+                if (closureRes)
+                    return closureRes;
             }
-            let handlers = [...this.handlers];
-            const nextClosure = function (p) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    if (handlers.length > 0) {
-                        let item = handlers.shift();
-                        let closureRes = yield item.handler(p, nextClosure);
-                        if (closureRes)
-                            return closureRes;
-                    }
-                    // 处理器无返回值则返回默认的返回值
-                    return yield resultClosure(p);
-                });
-            };
-            // 开始处理
-            return yield nextClosure(payload);
-        });
+            // 处理器无返回值则返回默认的返回值
+            return await resultClosure(p);
+        };
+        // 开始处理
+        return await nextClosure(payload);
     }
     /**
      * 判断处理器是否已存在

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;