node-easywechat 3.7.0 → 3.7.1

package/dist/Pay/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,14 +14,12 @@ class Utils {
      * 获取加密所用的平台证书
      * @returns
      */
-    getPlatformCert() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let certs = yield this.merchant.getPlatformCerts();
-            if (!certs || Object.keys(certs).length === 0) {
-                throw new Error('Fail to get platform certs');
-            }
-            return certs[Object.keys(certs)[0]];
-        });
+    async getPlatformCert() {
+        let certs = await this.merchant.getPlatformCerts();
+        if (!certs || Object.keys(certs).length === 0) {
+            throw new Error('Fail to get platform certs');
+        }
+        return certs[Object.keys(certs)[0]];
     }
     /**
      * 获取敏感信息加密机
@@ -38,15 +27,13 @@ class Utils {
      * @param platformCert PublicKey封装过的平台证书
      * @returns
      */
-    getEncryptor() {
-        return __awaiter(this, arguments, void 0, function* (platformCert = null) {
-            if (!platformCert || !(platformCert instanceof PublicKey_1.PublicKey)) {
-                platformCert = yield this.getPlatformCert();
-            }
-            let encryptor = new Encryptor_1.default;
-            encryptor.setCerts(platformCert, this.merchant.getPrivateKey());
-            return encryptor;
-        });
+    async getEncryptor(platformCert = null) {
+        if (!platformCert || !(platformCert instanceof PublicKey_1.PublicKey)) {
+            platformCert = await this.getPlatformCert();
+        }
+        let encryptor = new Encryptor_1.default;
+        encryptor.setCerts(platformCert, this.merchant.getPrivateKey());
+        return encryptor;
     }
     /**
      * 创建签名（V3），并返回签名字符串

package/dist/Pay/Validator.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 };
 };
@@ -18,38 +9,36 @@ class Validator {
     constructor(merchant) {
         this.merchant = merchant;
     }
-    validate(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            [
-                Validator.HEADER_TIMESTAMP,
-                Validator.HEADER_NONCE,
-                Validator.HEADER_SERIAL,
-                Validator.HEADER_SIGNATURE,
-            ].forEach(key => {
-                if (!request.hasHeader(key)) {
-                    throw new Error(`Missing Header: ${key}`);
-                }
-            });
-            let timestamp = request.getHeader(Validator.HEADER_TIMESTAMP) || '';
-            let nonce = request.getHeader(Validator.HEADER_NONCE) || '';
-            let serial = request.getHeader(Validator.HEADER_SERIAL) || '';
-            let signature = request.getHeader(Validator.HEADER_SIGNATURE) || '';
-            let body = request.getBody().toString();
-            let message = `${timestamp}\n${nonce}\n${body}\n`;
-            if ((0, Utils_1.getTimestamp)() - parseInt(timestamp) > Validator.MAX_ALLOWED_CLOCK_OFFSET) {
-                throw new Error('Clock Offset Exceeded');
-            }
-            let publicKey = yield this.merchant.getPlatformCert(serial);
-            if (!publicKey) {
-                throw new Error(`No platform certs found for serial: ${serial}, please download from wechat pay and set it in merchant config with key \`platform_certs\`.`);
+    async validate(request) {
+        [
+            Validator.HEADER_TIMESTAMP,
+            Validator.HEADER_NONCE,
+            Validator.HEADER_SERIAL,
+            Validator.HEADER_SIGNATURE,
+        ].forEach(key => {
+            if (!request.hasHeader(key)) {
+                throw new Error(`Missing Header: ${key}`);
             }
-            let rsa = new RSA_1.default;
-            rsa.setPublicKey(publicKey.getValue());
-            if (false === rsa.verify(signature, message)) {
-                throw new Error('Invalid Signature');
-            }
-            return true;
         });
+        let timestamp = request.getHeader(Validator.HEADER_TIMESTAMP) || '';
+        let nonce = request.getHeader(Validator.HEADER_NONCE) || '';
+        let serial = request.getHeader(Validator.HEADER_SERIAL) || '';
+        let signature = request.getHeader(Validator.HEADER_SIGNATURE) || '';
+        let body = request.getBody().toString();
+        let message = `${timestamp}\n${nonce}\n${body}\n`;
+        if ((0, Utils_1.getTimestamp)() - parseInt(timestamp) > Validator.MAX_ALLOWED_CLOCK_OFFSET) {
+            throw new Error('Clock Offset Exceeded');
+        }
+        let publicKey = await this.merchant.getPlatformCert(serial);
+        if (!publicKey) {
+            throw new Error(`No platform certs found for serial: ${serial}, please download from wechat pay and set it in merchant config with key \`platform_certs\`.`);
+        }
+        let rsa = new RSA_1.default;
+        rsa.setPublicKey(publicKey.getValue());
+        if (false === rsa.verify(signature, message)) {
+            throw new Error('Invalid Signature');
+        }
+        return true;
     }
     validateV2(message) {
         let messageSign = (message.get('sign') + '' || '').toUpperCase();

package/dist/Work/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 };
 };
@@ -44,41 +35,35 @@ 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 __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('get', 'cgi-bin/gettoken', {
-                params: {
-                    corpid: this.corpId,
-                    corpsecret: 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 refresh() {
+        let response = (await this.httpClient.request('get', 'cgi-bin/gettoken', {
+            params: {
+                corpid: this.corpId,
+                corpsecret: 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/Work/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 };
 };
@@ -119,29 +110,27 @@ class Application {
         this.oauthFactory = oauthFactory;
         return this;
     }
-    getOAuth() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.oauthFactory) {
-                this.oauthFactory = ((app) => {
-                    return new WeWork_1.default({
-                        client_id: app.getAccount().getCorpId(),
-                        client_secret: app.getAccount().getSecret(),
-                        redirect: app.getConfig().get('oauth.redirect_url'),
-                    });
+    async getOAuth() {
+        if (!this.oauthFactory) {
+            this.oauthFactory = ((app) => {
+                return new WeWork_1.default({
+                    client_id: app.getAccount().getCorpId(),
+                    client_secret: app.getAccount().getSecret(),
+                    redirect: app.getConfig().get('oauth.redirect_url'),
                 });
-            }
-            let provider = this.oauthFactory.call(null, this);
-            if (!(provider instanceof WeWork_1.default)) {
-                throw new Error(`The factory must return a \`ProviderInterface\` instance.`);
-            }
-            provider.withApiAccessToken(yield this.getAccessToken().getToken());
-            provider.scopes(this.getConfig().get('oauth.scopes', 'snsapi_userinfo'));
-            let agent_id = parseInt(this.config.get('agent_id')) || null;
-            if (agent_id) {
-                provider.setAgentId(agent_id);
-            }
-            return provider;
-        });
+            });
+        }
+        let provider = this.oauthFactory.call(null, this);
+        if (!(provider instanceof WeWork_1.default)) {
+            throw new Error(`The factory must return a \`ProviderInterface\` instance.`);
+        }
+        provider.withApiAccessToken(await this.getAccessToken().getToken());
+        provider.scopes(this.getConfig().get('oauth.scopes', 'snsapi_userinfo'));
+        let agent_id = parseInt(this.config.get('agent_id')) || null;
+        if (agent_id) {
+            provider.setAgentId(agent_id);
+        }
+        return provider;
     }
     getTicket() {
         if (!this.ticket) {
@@ -172,7 +161,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/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的缓存名称