node-easywechat 3.7.0 → 3.7.2

package/dist/MiniApp/Utils.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 };
 };
@@ -23,22 +14,20 @@ class Utils {
      * @param code
      * @returns
      */
-    codeToSession(code) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let client = this.app.getHttpClient();
-            let response = yield (yield client.request('GET', '/sns/jscode2session', {
-                params: {
-                    appid: this.app.getAccount().getAppId(),
-                    secret: this.app.getAccount().getSecret(),
-                    js_code: code,
-                    grant_type: 'authorization_code',
-                }
-            })).toObject();
-            if (!response['openid']) {
-                throw new Error(`code2Session error: ${JSON.stringify(response)}`);
+    async codeToSession(code) {
+        let client = this.app.getHttpClient();
+        let response = await (await client.request('GET', '/sns/jscode2session', {
+            params: {
+                appid: this.app.getAccount().getAppId(),
+                secret: this.app.getAccount().getSecret(),
+                js_code: code,
+                grant_type: 'authorization_code',
             }
-            return response;
-        });
+        })).toObject();
+        if (!response['openid']) {
+            throw new Error(`code2Session error: ${JSON.stringify(response)}`);
+        }
+        return response;
     }
     /**
      * 数据解密

package/dist/OfficialAccount/AccessToken.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 };
 };
@@ -49,24 +40,20 @@ class AccessToken {
         this.key = key;
         return this;
     }
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let token = '';
-            if (this.cache) {
-                token = yield this.cache.get(this.getKey());
-            }
-            if (!!token && typeof token === 'string') {
-                return token;
-            }
-            return this.refresh();
-        });
+    async getToken() {
+        let token = '';
+        if (this.cache) {
+            token = await this.cache.get(this.getKey());
+        }
+        if (!!token && typeof token === 'string') {
+            return token;
+        }
+        return this.refresh();
     }
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                access_token: yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            access_token: await this.getToken(),
+        };
     }
     refresh() {
         return this.stable ? this.getStableAccessToken() : this.getAccessToken();
@@ -75,45 +62,41 @@ class AccessToken {
      * 获取稳定版接口调用凭据
      * @param forceRefresh 是否强制刷新，默认：false
      */
-    getStableAccessToken() {
-        return __awaiter(this, arguments, void 0, function* (forceRefresh = false) {
-            let response = (yield this.httpClient.request('post', 'cgi-bin/stable_token', {
-                json: {
-                    grant_type: 'client_credential',
-                    appid: this.appId,
-                    secret: this.secret,
-                    force_refresh: forceRefresh,
-                }
-            })).toObject();
-            if (!response['access_token']) {
-                throw new Error('Failed to get stable access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['access_token'], parseInt(response['expires_in']));
+    async getStableAccessToken(forceRefresh = false) {
+        let response = (await this.httpClient.request('post', 'cgi-bin/stable_token', {
+            json: {
+                grant_type: 'client_credential',
+                appid: this.appId,
+                secret: this.secret,
+                force_refresh: forceRefresh,
             }
-            return response['access_token'];
-        });
+        })).toObject();
+        if (!response['access_token']) {
+            throw new Error('Failed to get stable access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['access_token'], parseInt(response['expires_in']));
+        }
+        return response['access_token'];
     }
     /**
      * 获取接口调用凭据
      */
-    getAccessToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('get', 'cgi-bin/token', {
-                params: {
-                    grant_type: 'client_credential',
-                    appid: this.appId,
-                    secret: this.secret,
-                }
-            })).toObject();
-            if (!response['access_token']) {
-                throw new Error('Failed to get access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['access_token'], parseInt(response['expires_in']));
+    async getAccessToken() {
+        let response = (await this.httpClient.request('get', 'cgi-bin/token', {
+            params: {
+                grant_type: 'client_credential',
+                appid: this.appId,
+                secret: this.secret,
             }
-            return response['access_token'];
-        });
+        })).toObject();
+        if (!response['access_token']) {
+            throw new Error('Failed to get access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['access_token'], parseInt(response['expires_in']));
+        }
+        return response['access_token'];
     }
 }
 module.exports = AccessToken;

package/dist/OfficialAccount/Application.js

@@ -156,7 +156,7 @@ class Application {
         return this.utils;
     }
     createClient() {
-        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken(), (response) => { var _a; return (_a = response.toObject()['errcode']) !== null && _a !== void 0 ? _a : 0; }, this.getConfig().get('http.throw', true)))
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken(), (response) => response.toObject()['errcode'] ?? 0, this.getConfig().get('http.throw', true)))
             .setPresets(this.getConfig().all());
     }
     /**

package/dist/OfficialAccount/JsApiTicket.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 };
 };
@@ -28,29 +19,27 @@ class JsApiTicket extends AccessToken_1.default {
      * 获取签名凭证jsapi_ticket
      * @returns
      */
-    getTicket() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let key = this.getKey();
-            let ticket = '';
-            if (this.cache) {
-                ticket = yield this.cache.get(key);
-            }
-            if (!!ticket && typeof ticket === 'string') {
-                return ticket;
-            }
-            let response = (yield this.httpClient.request('get', '/cgi-bin/ticket/getticket', {
-                params: {
-                    type: 'jsapi',
-                }
-            })).toObject();
-            if (!response['ticket']) {
-                throw new Error('Failed to get jssdk_ticket: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+    async getTicket() {
+        let key = this.getKey();
+        let ticket = '';
+        if (this.cache) {
+            ticket = await this.cache.get(key);
+        }
+        if (!!ticket && typeof ticket === 'string') {
+            return ticket;
+        }
+        let response = (await this.httpClient.request('get', '/cgi-bin/ticket/getticket', {
+            params: {
+                type: 'jsapi',
             }
-            return response['ticket'];
-        });
+        })).toObject();
+        if (!response['ticket']) {
+            throw new Error('Failed to get jssdk_ticket: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+        }
+        return response['ticket'];
     }
     /**
      * 获取签名配置
@@ -59,19 +48,17 @@ class JsApiTicket extends AccessToken_1.default {
      * @param timestamp 时间长，默认：当前时间
      * @returns
      */
-    configSignature(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, nonce = null, timestamp = null) {
-            nonce = nonce || (0, Utils_1.randomString)(10);
-            timestamp = timestamp || (0, Utils_1.getTimestamp)();
-            let ticket = yield this.getTicket();
-            return {
-                url,
-                nonceStr: nonce,
-                timestamp,
-                appId: this.appId,
-                signature: this.getTicketSignature(ticket, nonce, timestamp, url),
-            };
-        });
+    async configSignature(url, nonce = null, timestamp = null) {
+        nonce = nonce || (0, Utils_1.randomString)(10);
+        timestamp = timestamp || (0, Utils_1.getTimestamp)();
+        let ticket = await this.getTicket();
+        return {
+            url,
+            nonceStr: nonce,
+            timestamp,
+            appId: this.appId,
+            signature: this.getTicketSignature(ticket, nonce, timestamp, url),
+        };
     }
     getTicketSignature(ticket, nonce, timestamp, url) {
         return (0, Utils_1.createHash)(`jsapi_ticket=${ticket}&noncestr=${nonce}&timestamp=${timestamp}&url=${url}`, 'sha1');

package/dist/OfficialAccount/Server.d.ts

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

package/dist/OfficialAccount/Server.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 };
 };
@@ -24,26 +15,24 @@ class Server extends ServerInterface_1.default {
      * 服务端消息处理
      * @returns
      */
-    serve() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let echostr = this.request.getQueryParams()['echostr'] || '';
-            if (!!echostr) {
-                return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
-            }
-            let message = yield this.getRequestMessage(this.request);
-            let query = this.request.getQueryParams();
-            if (this.encryptor && query['msg_signature']) {
-                this.prepend(this.decryptRequestMessage(query));
-            }
-            let response = yield this.handle(new Response_1.default(200, {}, 'success'), message);
-            if (!(response instanceof Response_1.default)) {
-                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;
-        });
+    async serve() {
+        let query = this.request.getQueryParams();
+        let echostr = query['echostr'] || '';
+        if (!!echostr) {
+            return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
+        }
+        let message = await this.getRequestMessage(this.request);
+        if (this.encryptor && query['msg_signature']) {
+            this.prepend(this.decryptRequestMessage(query));
+        }
+        let response = await this.handle(new Response_1.default(200, {}, 'success'), message);
+        if (!(response instanceof Response_1.default)) {
+            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 = await this.transformToReply(response, message, this.encryptor, isXml);
+        }
+        return response;
     }
     /**
      * 添加普通消息处理器
@@ -52,10 +41,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     addMessageListener(type, handler) {
-        return this.withHandler(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.MsgType === type ? handler(message, next) : next(message);
-            });
+        return this.withHandler(async function (message, next) {
+            return message.MsgType === type ? handler(message, next) : next(message);
         });
     }
     /**
@@ -65,10 +52,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     addEventListener(event, handler) {
-        return this.withHandler(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === event ? handler(message, next) : next(message);
-            });
+        return this.withHandler(async function (message, next) {
+            return message.Event === event ? handler(message, next) : next(message);
         });
     }
     /**
@@ -80,12 +65,24 @@ class Server extends ServerInterface_1.default {
         return Message_1.default.createFromRequest(request || this.request);
     }
     decryptRequestMessage(query) {
-        return (message, next) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.encryptor)
-                return null;
-            yield this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
+        return async (message, next) => {
+            message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
             return next(message);
-        });
+        };
+    }
+    /**
+     * 获取解密后的消息
+     * @param request 未设置该参数时，则从当前服务端收到的请求中获取
+     * @returns
+     */
+    async getDecryptedMessage(request = null) {
+        request = request ?? this.request;
+        let message = await this.getRequestMessage(request);
+        let query = request.getQueryParams();
+        if (!this.encryptor || !query['msg_signature']) {
+            return message;
+        }
+        return await this.decryptMessage(message, this.encryptor, query['msg_signature'] ?? '', query['timestamp'] ?? '', query['nonce'] ?? '');
     }
 }
 ;

package/dist/OfficialAccount/Utils.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 };
 };
@@ -24,14 +15,12 @@ class Utils {
      * @param debug 是否开启调试模式，默认：false
      * @returns
      */
-    buildJsSdkConfig(url_1) {
-        return __awaiter(this, arguments, void 0, function* (url, jsApiList = [], openTagList = [], debug = false) {
-            return (0, merge_1.default)({
-                jsApiList,
-                openTagList,
-                debug,
-            }, yield this.app.getTicket().configSignature(url));
-        });
+    async buildJsSdkConfig(url, jsApiList = [], openTagList = [], debug = false) {
+        return (0, merge_1.default)({
+            jsApiList,
+            openTagList,
+            debug,
+        }, await this.app.getTicket().configSignature(url));
     }
 }
 ;