node-easywechat 3.7.0 → 3.7.1

package/dist/OpenPlatform/Authorizer/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 };
 };
@@ -24,24 +15,22 @@ class Utils extends Utils_1.default {
      * @param code
      * @returns
      */
-    code2Session(code) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let client = this.app.getHttpClient();
-            let response = yield client.request('GET', '/sns/component/jscode2session', {
-                params: {
-                    component_access_token: yield this.app.getComponentApp().getAccessToken().getToken(),
-                    component_appid: this.app.getComponentApp().getAccount().getAppId(),
-                    appid: this.app.getAccount().getAppId(),
-                    js_code: code,
-                    grant_type: 'authorization_code',
-                }
-            });
-            let data = response.toObject();
-            if (!data['openid']) {
-                throw new Error(`code2Session error: ${JSON.stringify(data)}`);
+    async code2Session(code) {
+        let client = this.app.getHttpClient();
+        let response = await client.request('GET', '/sns/component/jscode2session', {
+            params: {
+                component_access_token: await this.app.getComponentApp().getAccessToken().getToken(),
+                component_appid: this.app.getComponentApp().getAccount().getAppId(),
+                appid: this.app.getAccount().getAppId(),
+                js_code: code,
+                grant_type: 'authorization_code',
             }
-            return data;
         });
+        let data = response.toObject();
+        if (!data['openid']) {
+            throw new Error(`code2Session error: ${JSON.stringify(data)}`);
+        }
+        return data;
     }
 }
 ;

package/dist/OpenPlatform/AuthorizerAccessToken.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());
-    });
-};
 class AuthorizerAccessToken {
     constructor(appId, accessToken) {
         this.appId = appId;
@@ -20,17 +11,13 @@ class AuthorizerAccessToken {
     getAppId() {
         return this.appId;
     }
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.accessToken;
-        });
+    async getToken() {
+        return this.accessToken;
     }
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                'access_token': yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            'access_token': await this.getToken(),
+        };
     }
     /**
      * 转为字符串

package/dist/OpenPlatform/ComponentAccessToken.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 };
 };
@@ -45,42 +36,36 @@ class ComponentAccessToken {
         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 {
-                component_access_token: yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            component_access_token: await this.getToken(),
+        };
     }
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('post', 'cgi-bin/component/api_component_token', {
-                data: {
-                    component_appid: this.appId,
-                    component_appsecret: this.secret,
-                    component_verify_ticket: yield this.verifyTicket.getTicket(),
-                }
-            })).toObject();
-            if (!response['component_access_token']) {
-                throw new Error('Failed to get component_access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['component_access_token'], parseInt(response['expires_in']) - 100);
+    async refresh() {
+        let response = (await this.httpClient.request('post', 'cgi-bin/component/api_component_token', {
+            data: {
+                component_appid: this.appId,
+                component_appsecret: this.secret,
+                component_verify_ticket: await this.verifyTicket.getTicket(),
             }
-            return response['component_access_token'];
-        });
+        })).toObject();
+        if (!response['component_access_token']) {
+            throw new Error('Failed to get component_access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['component_access_token'], parseInt(response['expires_in']) - 100);
+        }
+        return response['component_access_token'];
     }
 }
 module.exports = ComponentAccessToken;

package/dist/OpenPlatform/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 };
 };
@@ -25,20 +16,18 @@ 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);
-            this.prepend(this.decryptRequestMessage());
-            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;
-        });
+    async serve() {
+        let echostr = this.request.getQueryParams()['echostr'] || '';
+        if (!!echostr) {
+            return new Response_1.default(200, { 'Content-Type': 'text/html' }, echostr);
+        }
+        let message = await this.getRequestMessage(this.request);
+        this.prepend(this.decryptRequestMessage());
+        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;
     }
     /**
      * 处理授权成功通知
@@ -46,10 +35,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleAuthorized(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'authorized' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'authorized' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -58,10 +45,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleUnauthorized(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'unauthorized' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'unauthorized' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -70,10 +55,8 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleAuthorizeUpdated(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'updateauthorized' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'updateauthorized' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -96,10 +79,8 @@ class Server extends ServerInterface_1.default {
         if (this.defaultVerifyTicketHandler) {
             this.withoutHandler(this.defaultVerifyTicketHandler);
         }
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'component_verify_ticket' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'component_verify_ticket' ? handler(message, next) : next(message);
         });
     }
     /**
@@ -108,18 +89,16 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleThirdFastRegister(handler) {
-        return this.with(function (message, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return message.InfoType === 'notify_third_fasteregister' ? handler(message, next) : next(message);
-            });
+        return this.with(async function (message, next) {
+            return message.InfoType === 'notify_third_fasteregister' ? handler(message, next) : next(message);
         });
     }
     decryptRequestMessage() {
         let query = this.request.getQueryParams();
-        return (message, next) => __awaiter(this, void 0, void 0, function* () {
-            yield this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
+        return async (message, next) => {
+            await this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
             return next(message);
-        });
+        };
     }
     /**
      * 获取来自微信服务器的推送消息
@@ -134,14 +113,12 @@ class Server extends ServerInterface_1.default {
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取
      * @returns
      */
-    getDecryptedMessage() {
-        return __awaiter(this, arguments, void 0, function* (request = null) {
-            if (!request)
-                request = this.request;
-            let message = yield Message_1.default.createFromRequest(request);
-            let query = request.getQueryParams();
-            return this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
-        });
+    async getDecryptedMessage(request = null) {
+        if (!request)
+            request = this.request;
+        let message = await Message_1.default.createFromRequest(request);
+        let query = request.getQueryParams();
+        return this.decryptMessage(message, this.encryptor, query['msg_signature'] || '', query['timestamp'] || '', query['nonce'] || '');
     }
 }
 ;

package/dist/OpenPlatform/VerifyTicket.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());
-    });
-};
 class VerifyTicket {
     constructor(appId, key = null, cache = null) {
         this.appId = appId;
@@ -24,25 +15,21 @@ class VerifyTicket {
         this.key = key;
         return this;
     }
-    setTicket(ticket) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), ticket, 6000);
-            }
-            return this;
-        });
+    async setTicket(ticket) {
+        if (this.cache) {
+            await this.cache.set(this.getKey(), ticket, 6000);
+        }
+        return this;
     }
-    getTicket() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ticket = '';
-            if (this.cache) {
-                ticket = yield this.cache.get(this.getKey());
-            }
-            if (!ticket || typeof ticket != 'string') {
-                throw new Error('No component_verify_ticket found.');
-            }
-            return ticket;
-        });
+    async getTicket() {
+        let ticket = '';
+        if (this.cache) {
+            ticket = await this.cache.get(this.getKey());
+        }
+        if (!ticket || typeof ticket != 'string') {
+            throw new Error('No component_verify_ticket found.');
+        }
+        return ticket;
     }
 }
 ;

package/dist/OpenWork/Application.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 };
 };
@@ -110,12 +101,12 @@ class Application {
     getServer() {
         if (!this.server) {
             this.server = new Server_1.default(this.getSuiteEncryptor(), this.getEncryptor(), this.getRequest());
-            this.server.withDefaultSuiteTicketHandler((message, next) => __awaiter(this, void 0, void 0, function* () {
+            this.server.withDefaultSuiteTicketHandler(async (message, next) => {
                 if (message.SuiteId === this.getAccount().getSuiteId()) {
-                    yield this.getSuiteTicket().setTicket(message.SuiteTicket);
+                    await this.getSuiteTicket().setTicket(message.SuiteTicket);
                 }
                 return next(message);
-            }));
+            });
         }
         else {
             this.server.setRequest(this.getRequest());
@@ -184,24 +175,22 @@ class Application {
      * @param suiteAccessToken
      * @returns
      */
-    getAuthorization(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            let response = (yield this.getClient().request('post', 'cgi-bin/service/get_auth_info', {
-                params: {
-                    suite_access_token: yield suiteAccessToken.getToken(),
-                },
-                json: {
-                    auth_corpid: corpId,
-                    permanent_code: permanentCode,
-                }
-            })).toObject();
-            if (!response['auth_corp_info']) {
-                throw new Error('Failed to get auth_corp_info: ' + JSON.stringify(response));
+    async getAuthorization(corpId, permanentCode, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        let response = (await this.getClient().request('post', 'cgi-bin/service/get_auth_info', {
+            params: {
+                suite_access_token: await suiteAccessToken.getToken(),
+            },
+            json: {
+                auth_corpid: corpId,
+                permanent_code: permanentCode,
             }
-            return new Authorization_1.default(response);
-        });
+        })).toObject();
+        if (!response['auth_corp_info']) {
+            throw new Error('Failed to get auth_corp_info: ' + JSON.stringify(response));
+        }
+        return new Authorization_1.default(response);
     }
     /**
      * 获取预授权码
@@ -209,20 +198,18 @@ class Application {
      * @param suiteAccessToken
      * @returns
      */
-    createPreAuthorizationCode() {
-        return __awaiter(this, arguments, void 0, function* (suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            let response = (yield this.getClient().request('get', 'cgi-bin/service/get_pre_auth_code', {
-                params: {
-                    suite_access_token: yield suiteAccessToken.getToken(),
-                }
-            })).toObject();
-            if (!response['pre_auth_code']) {
-                throw new Error('Failed to get pre_auth_code: ' + JSON.stringify(response));
+    async createPreAuthorizationCode(suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        let response = (await this.getClient().request('get', 'cgi-bin/service/get_pre_auth_code', {
+            params: {
+                suite_access_token: await suiteAccessToken.getToken(),
             }
-            return response;
-        });
+        })).toObject();
+        if (!response['pre_auth_code']) {
+            throw new Error('Failed to get pre_auth_code: ' + JSON.stringify(response));
+        }
+        return response;
     }
     /**
      * 获取企业授权令牌
@@ -231,55 +218,45 @@ class Application {
      * @param suiteAccessToken
      * @returns
      */
-    getAuthorizerAccessToken(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            return new AuthorizerAccessToken_1.default(corpId, permanentCode, suiteAccessToken, null, this.getCache(), this.getHttpClient());
-        });
+    async getAuthorizerAccessToken(corpId, permanentCode, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        return new AuthorizerAccessToken_1.default(corpId, permanentCode, suiteAccessToken, null, this.getCache(), this.getHttpClient());
     }
     createClient() {
-        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getProviderAccessToken(), (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.getProviderAccessToken(), (response) => response.toObject()['errcode'] ?? 0, this.getConfig().get('http.throw', true)))
             .setPresets(this.getConfig().all());
     }
-    getAuthorizerClient(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            return (new AccessTokenAwareClient_1.default(this.getHttpClient(), yield this.getAuthorizerAccessToken(corpId, permanentCode, suiteAccessToken), (response) => { var _a; return (_a = response.toObject()['errcode']) !== null && _a !== void 0 ? _a : 0; }, this.getConfig().get('http.throw', true)))
-                .setPresets(this.getConfig().all());
-        });
+    async getAuthorizerClient(corpId, permanentCode, suiteAccessToken = null) {
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), await this.getAuthorizerAccessToken(corpId, permanentCode, suiteAccessToken), (response) => response.toObject()['errcode'] ?? 0, this.getConfig().get('http.throw', true)))
+            .setPresets(this.getConfig().all());
     }
-    getJsApiTicket(corpId_1, permanentCode_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, permanentCode, suiteAccessToken = null) {
-            return new JsApiTicket_1.default(corpId, null, this.getCache(), yield this.getAuthorizerClient(corpId, permanentCode, suiteAccessToken));
-        });
+    async getJsApiTicket(corpId, permanentCode, suiteAccessToken = null) {
+        return new JsApiTicket_1.default(corpId, null, this.getCache(), await this.getAuthorizerClient(corpId, permanentCode, suiteAccessToken));
     }
-    getOAuth(suiteId_1) {
-        return __awaiter(this, arguments, void 0, function* (suiteId, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            return (new OpenWeWork_1.default({
-                client_id: suiteId,
-                client_secret: '',
-                redirect: this.getConfig().get('oauth.redirect_url'),
-            }))
-                .withSuiteTicket(yield this.getSuiteTicket().getTicket())
-                .withSuiteAccessToken(yield suiteAccessToken.getToken())
-                .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
-        });
+    async getOAuth(suiteId, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        return (new OpenWeWork_1.default({
+            client_id: suiteId,
+            client_secret: '',
+            redirect: this.getConfig().get('oauth.redirect_url'),
+        }))
+            .withSuiteTicket(await this.getSuiteTicket().getTicket())
+            .withSuiteAccessToken(await suiteAccessToken.getToken())
+            .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
     }
-    getCorpOAuth(corpId_1) {
-        return __awaiter(this, arguments, void 0, function* (corpId, suiteAccessToken = null) {
-            if (!suiteAccessToken)
-                suiteAccessToken = this.getSuiteAccessToken();
-            return (new OpenWeWork_1.default({
-                client_id: corpId,
-                client_secret: '',
-                redirect: this.getConfig().get('oauth.redirect_url'),
-            }))
-                .withSuiteTicket(yield this.getSuiteTicket().getTicket())
-                .withSuiteAccessToken(yield suiteAccessToken.getToken())
-                .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
-        });
+    async getCorpOAuth(corpId, suiteAccessToken = null) {
+        if (!suiteAccessToken)
+            suiteAccessToken = this.getSuiteAccessToken();
+        return (new OpenWeWork_1.default({
+            client_id: corpId,
+            client_secret: '',
+            redirect: this.getConfig().get('oauth.redirect_url'),
+        }))
+            .withSuiteTicket(await this.getSuiteTicket().getTicket())
+            .withSuiteAccessToken(await suiteAccessToken.getToken())
+            .scopes(this.getConfig().get('oauth.scopes', 'snsapi_base'));
     }
     /**
      * 获取请求默认配置