node-easywechat 3.7.0 → 3.7.2

package/dist/Work/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 };
 };
@@ -32,25 +23,23 @@ 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/get_jsapi_ticket', {})).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']));
-            }
-            return response['ticket'];
-        });
+    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/get_jsapi_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
      */
-    createConfigSignature(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.corpId,
-                signature: this.getTicketSignature(ticket, nonce, timestamp, url),
-            };
-        });
+    async createConfigSignature(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.corpId,
+            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');
@@ -84,49 +71,45 @@ class JsApiTicket extends AccessToken_1.default {
      * @param timestamp 时间长，默认：当前时间
      * @returns
      */
-    createAgentConfigSignature(agentId_1, url_1) {
-        return __awaiter(this, arguments, void 0, function* (agentId, url, nonce = null, timestamp = null) {
-            nonce = nonce || (0, Utils_1.randomString)(10);
-            timestamp = timestamp || (0, Utils_1.getTimestamp)();
-            let ticket = yield this.getTicket();
-            return {
-                corpid: this.corpId,
-                agentid: agentId,
-                url,
-                nonceStr: nonce,
-                timestamp,
-                signature: this.getTicketSignature(ticket, nonce, timestamp, url),
-            };
-        });
+    async createAgentConfigSignature(agentId, url, nonce = null, timestamp = null) {
+        nonce = nonce || (0, Utils_1.randomString)(10);
+        timestamp = timestamp || (0, Utils_1.getTimestamp)();
+        let ticket = await this.getTicket();
+        return {
+            corpid: this.corpId,
+            agentid: agentId,
+            url,
+            nonceStr: nonce,
+            timestamp,
+            signature: this.getTicketSignature(ticket, nonce, timestamp, url),
+        };
     }
     /**
      * 获取代理应用的签名凭证jsapi_ticket
      * @param agentId 代理应用的id
      * @returns
      */
-    getAgentTicket(agentId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let key = this.getAgentKey(agentId);
-            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/get', {
-                params: {
-                    type: 'agent_config',
-                }
-            })).toObject();
-            if (!response['ticket']) {
-                throw new Error('Failed to get jssdk agentTicket: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+    async getAgentTicket(agentId) {
+        let key = this.getAgentKey(agentId);
+        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/get', {
+            params: {
+                type: 'agent_config',
             }
-            return response['ticket'];
-        });
+        })).toObject();
+        if (!response['ticket']) {
+            throw new Error('Failed to get jssdk agentTicket: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(key, response['ticket'], parseInt(response['expires_in']));
+        }
+        return response['ticket'];
     }
     /**
      * 获取代理应用的jsapi_ticket的缓存名称

package/dist/Work/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,32 +15,29 @@ class Server extends ServerInterface_1.default {
      * 服务端消息处理
      * @returns
      */
-    serve() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            let query = this.request.getQueryParams();
-            if (!!query['echostr']) {
-                let echostr = this.encryptor.decrypt(query['echostr'], (_a = query['msg_signature']) !== null && _a !== void 0 ? _a : '', (_b = query['nonce']) !== null && _b !== void 0 ? _b : '', (_c = query['timestamp']) !== null && _c !== void 0 ? _c : '');
-                return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
-            }
-            let message = yield this.getRequestMessage(this.request);
+    async serve() {
+        let query = this.request.getQueryParams();
+        if (!!query['echostr']) {
+            let echostr = this.encryptor.decrypt(query['echostr'], query['msg_signature'] ?? '', query['nonce'] ?? '', query['timestamp'] ?? '');
+            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 = yield this.handle(new Response_1.default(200, {}, 'SUCCESS'), message);
-            if (!(response instanceof Response_1.default)) {
-                response = yield this.transformToReply(response, message, this.encryptor);
-            }
-            return response;
-        });
+        }
+        let response = await this.handle(new Response_1.default(200, {}, 'SUCCESS'), message);
+        if (!(response instanceof Response_1.default)) {
+            response = await this.transformToReply(response, message, this.encryptor);
+        }
+        return response;
     }
     /**
      * 设置联系人变化的消息处理器
      * @param handler
      */
     handleContactChanged(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -57,10 +45,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handleUserTagUpdated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'update_tag' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'update_tag' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -68,10 +54,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handleUserCreated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'create_user' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'create_user' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -79,10 +63,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handleUserUpdated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'update_user' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'update_user' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -90,10 +72,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handleUserDeleted(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'delete_user' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'delete_user' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -101,10 +81,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handlePartyCreated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'create_party' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'create_party' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -112,10 +90,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handlePartyUpdated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'update_party' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'update_party' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -123,10 +99,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handlePartyDeleted(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'change_contact' && message.ChangeType === 'delete_party' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'change_contact' && message.ChangeType === 'delete_party' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -134,10 +108,8 @@ class Server extends ServerInterface_1.default {
      * @param handler
      */
     handleBatchJobsFinished(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.Event === 'batch_job_result' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.Event === 'batch_job_result' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -147,10 +119,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);
         });
     }
     /**
@@ -160,10 +130,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);
         });
     }
     /**
@@ -172,40 +140,36 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     getRequestMessage(request = null) {
-        return Message_1.default.createFromRequest(request !== null && request !== void 0 ? request : this.request);
+        return Message_1.default.createFromRequest(request ?? this.request);
     }
     validateUrl() {
-        return (message, next) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+        return async (message, next) => {
             let query = this.request.getQueryParams();
             if (!this.encryptor)
                 return null;
-            let echostr = this.encryptor.decrypt(query['echostr'], (_a = query['msg_signature']) !== null && _a !== void 0 ? _a : '', (_b = query['timestamp']) !== null && _b !== void 0 ? _b : '', (_c = query['nonce']) !== null && _c !== void 0 ? _c : '');
+            let echostr = this.encryptor.decrypt(query['echostr'], query['msg_signature'] ?? '', query['timestamp'] ?? '', query['nonce'] ?? '');
             return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
-        });
+        };
     }
     decryptRequestMessage(query) {
-        return (message, next) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            if (!this.encryptor)
-                return null;
-            yield this.decryptMessage(message, this.encryptor, (_a = query['msg_signature']) !== null && _a !== void 0 ? _a : '', (_b = query['timestamp']) !== null && _b !== void 0 ? _b : '', (_c = query['nonce']) !== null && _c !== void 0 ? _c : '');
+        return async (message, next) => {
+            message = await this.decryptMessage(message, this.encryptor, query['msg_signature'] ?? '', query['timestamp'] ?? '', query['nonce'] ?? '');
             return next(message);
-        });
+        };
     }
     /**
      * 获取解密后的消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取
      * @returns
      */
-    getDecryptedMessage() {
-        return __awaiter(this, arguments, void 0, function* (request = null) {
-            var _a, _b, _c;
-            request = request !== null && request !== void 0 ? request : this.request;
-            let message = yield this.getRequestMessage(request);
-            let query = request.getQueryParams();
-            return yield this.decryptMessage(message, this.encryptor, (_a = query['msg_signature']) !== null && _a !== void 0 ? _a : '', (_b = query['timestamp']) !== null && _b !== void 0 ? _b : '', (_c = query['nonce']) !== null && _c !== void 0 ? _c : '');
-        });
+    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/Work/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().createConfigSignature(url));
-        });
+    async buildJsSdkConfig(url, jsApiList = [], openTagList = [], debug = false) {
+        return (0, merge_1.default)({
+            jsApiList,
+            openTagList,
+            debug,
+        }, await this.app.getTicket().createConfigSignature(url));
     }
     /**
      * 构建代理应用的jssdk配置
@@ -42,14 +31,12 @@ class Utils {
      * @param debug 是否开启调试模式，默认：false
      * @returns
      */
-    buildJsSdkAgentConfig(agentId_1, url_1) {
-        return __awaiter(this, arguments, void 0, function* (agentId, url, jsApiList = [], openTagList = [], debug = false) {
-            return (0, merge_1.default)({
-                jsApiList,
-                openTagList,
-                debug,
-            }, yield this.app.getTicket().createAgentConfigSignature(agentId, url));
-        });
+    async buildJsSdkAgentConfig(agentId, url, jsApiList = [], openTagList = [], debug = false) {
+        return (0, merge_1.default)({
+            jsApiList,
+            openTagList,
+            debug,
+        }, await this.app.getTicket().createAgentConfigSignature(agentId, url));
     }
 }
 ;

package/package.json

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

package/tsconfig.json

@@ -3,8 +3,8 @@
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "target": "ES2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "node16", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     // "lib": [],                             /* Specify library files to be included in the compilation. */
     "allowJs": true, /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */