node-easywechat 3.7.0 → 3.7.2

package/dist/Pay/Merchant.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 AES_1 = require("../Core/Support/AES");
 const PrivateKey_1 = require("../Core/Support/PrivateKey");
 const PublicKey_1 = require("../Core/Support/PublicKey");
@@ -71,26 +62,21 @@ class Merchant {
     getCertificate() {
         return this.certificate;
     }
-    getPlatformCert(serial) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.isConfigPlatformCerts) {
-                // 如果不是通过配置文件设置的平台证书，则每次都从缓存或者接口获取证书
-                let certs = yield this.loadPlatformCerts();
-                this.setPlatformCerts(certs);
-            }
-            return (_a = this.platformCerts[serial]) !== null && _a !== void 0 ? _a : null;
-        });
+    async getPlatformCert(serial) {
+        if (!this.isConfigPlatformCerts) {
+            // 如果不是通过配置文件设置的平台证书，则每次都从缓存或者接口获取证书
+            let certs = await this.loadPlatformCerts();
+            this.setPlatformCerts(certs);
+        }
+        return this.platformCerts[serial] ?? null;
     }
-    getPlatformCerts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConfigPlatformCerts) {
-                // 如果不是通过配置文件设置的平台证书，则每次都从缓存或者接口获取证书
-                let certs = yield this.loadPlatformCerts();
-                this.setPlatformCerts(certs);
-            }
-            return this.platformCerts;
-        });
+    async getPlatformCerts() {
+        if (!this.isConfigPlatformCerts) {
+            // 如果不是通过配置文件设置的平台证书，则每次都从缓存或者接口获取证书
+            let certs = await this.loadPlatformCerts();
+            this.setPlatformCerts(certs);
+        }
+        return this.platformCerts;
     }
     setPlatformCerts(certs) {
         let newCerts = {};
@@ -116,32 +102,30 @@ class Merchant {
         this.cacheKeyPlatformCert = key;
         return this;
     }
-    loadPlatformCerts() {
-        return __awaiter(this, arguments, void 0, function* (force = false) {
-            let cacheKey = this.getPlatformCertKey();
-            let cache = this.app.getCache();
-            let certs = yield cache.get(cacheKey);
-            if (force || !certs || Object.keys(certs).length === 0) {
-                certs = {};
-                let response = yield this.app.getClient().get('/v3/certificates');
-                let data = response.toObject();
-                if (data && data.data && data.data.length > 0) {
-                    let nowTime = Math.round((new Date()).getTime() / 1000);
-                    data.data.forEach((item) => {
-                        // 跳过有效期少于1天的证书
-                        let expireTime = Math.round((new Date(item.expire_time)).getTime() / 1000) - 86400;
-                        if (expireTime < nowTime)
-                            return;
-                        let content = AES_1.AES_GCM.decrypt(item.encrypt_certificate.ciphertext, this.app.getConfig().get('secret_key'), item.encrypt_certificate.nonce, item.encrypt_certificate.associated_data).toString();
-                        certs[item.serial_no] = content;
-                    });
-                    if (Object.keys(certs).length > 0) {
-                        yield cache.set(cacheKey, certs, 36000); // 缓存10小时
-                    }
+    async loadPlatformCerts(force = false) {
+        let cacheKey = this.getPlatformCertKey();
+        let cache = this.app.getCache();
+        let certs = await cache.get(cacheKey);
+        if (force || !certs || Object.keys(certs).length === 0) {
+            certs = {};
+            let response = await this.app.getClient().get('/v3/certificates');
+            let data = response.toObject();
+            if (data && data.data && data.data.length > 0) {
+                let nowTime = Math.round((new Date()).getTime() / 1000);
+                data.data.forEach((item) => {
+                    // 跳过有效期少于1天的证书
+                    let expireTime = Math.round((new Date(item.expire_time)).getTime() / 1000) - 86400;
+                    if (expireTime < nowTime)
+                        return;
+                    let content = AES_1.AES_GCM.decrypt(item.encrypt_certificate.ciphertext, this.app.getConfig().get('secret_key'), item.encrypt_certificate.nonce, item.encrypt_certificate.associated_data).toString();
+                    certs[item.serial_no] = content;
+                });
+                if (Object.keys(certs).length > 0) {
+                    await cache.set(cacheKey, certs, 36000); // 缓存10小时
                 }
             }
-            return certs;
-        });
+        }
+        return certs;
     }
 }
 module.exports = Merchant;

package/dist/Pay/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 };
 };
@@ -26,73 +17,67 @@ class Server extends ServerInterface_1.default {
      * 服务端消息处理
      * @returns
      */
-    serve() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let message = yield this.getRequestMessage();
-            let isV2Message = message.getOriginalContents().startsWith('<xml');
-            try {
-                let defaultResponse;
-                if (isV2Message) {
-                    defaultResponse = new Response_1.default(200, {}, (0, Utils_1.buildXml)({ return_code: 'SUCCESS', return_msg: '' }));
-                }
-                else {
-                    defaultResponse = new Response_1.default(200, {}, JSON.stringify({ code: 'SUCCESS', message: '成功' }));
-                }
-                let response = yield this.handle(defaultResponse, message);
-                if (!(response instanceof Response_1.default)) {
-                    response = defaultResponse;
-                }
-                return response;
+    async serve() {
+        let message = await this.getRequestMessage();
+        let isV2Message = message.getOriginalContents().startsWith('<xml');
+        try {
+            let defaultResponse;
+            if (isV2Message) {
+                defaultResponse = new Response_1.default(200, {}, (0, Utils_1.buildXml)({ return_code: 'SUCCESS', return_msg: '' }));
             }
-            catch (e) {
-                if (isV2Message) {
-                    return new Response_1.default(200, {}, (0, Utils_1.buildXml)({ return_code: 'ERROR', return_msg: e.message }));
-                }
-                else {
-                    return new Response_1.default(200, {}, JSON.stringify({ code: 'ERROR', message: e.message }));
-                }
+            else {
+                defaultResponse = new Response_1.default(200, {}, JSON.stringify({ code: 'SUCCESS', message: '成功' }));
             }
-        });
+            let response = await this.handle(defaultResponse, message);
+            if (!(response instanceof Response_1.default)) {
+                response = defaultResponse;
+            }
+            return response;
+        }
+        catch (e) {
+            if (isV2Message) {
+                return new Response_1.default(200, {}, (0, Utils_1.buildXml)({ return_code: 'ERROR', return_msg: e.message }));
+            }
+            else {
+                return new Response_1.default(200, {}, JSON.stringify({ code: 'ERROR', message: e.message }));
+            }
+        }
     }
     /**
      * 获取来自微信服务器的推送消息
      * @param request 未设置该参数时，则从当前服务端收到的请求中获取
      * @returns
      */
-    getRequestMessage() {
-        return __awaiter(this, arguments, void 0, function* (request = null) {
-            if (!request) {
-                request = this.request;
-            }
-            let originContent = '';
-            let body = request.getBody();
-            if (body) {
-                originContent = body.toString();
-            }
-            let attributes = yield request.getParsedBody();
-            if (originContent.startsWith('<xml')) {
-                attributes = yield this.decodeXmlMessage(attributes);
-            }
-            else {
-                attributes = this.decodeJsonMessage(attributes);
-            }
-            return new Message_1.default(attributes, originContent);
-        });
+    async getRequestMessage(request = null) {
+        if (!request) {
+            request = this.request;
+        }
+        let originContent = '';
+        let body = request.getBody();
+        if (body) {
+            originContent = body.toString();
+        }
+        let attributes = await request.getParsedBody();
+        if (originContent.startsWith('<xml')) {
+            attributes = await this.decodeXmlMessage(attributes);
+        }
+        else {
+            attributes = this.decodeJsonMessage(attributes);
+        }
+        return new Message_1.default(attributes, originContent);
     }
-    decodeXmlMessage(attributes) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (attributes['req_info']) {
-                let key = this.merchant.getV2SecretKey();
-                if (!key) {
-                    throw new Error('V2 secret key is required');
-                }
-                attributes = yield (0, Utils_1.parseXml)(AES_1.AES.decrypt(attributes['req_info'], (0, Utils_1.createHash)(key, 'md5'), '', true, 'aes-256-ecb').toString());
+    async decodeXmlMessage(attributes) {
+        if (attributes['req_info']) {
+            let key = this.merchant.getV2SecretKey();
+            if (!key) {
+                throw new Error('V2 secret key is required');
             }
-            if (!attributes || Object.keys(attributes).length === 0) {
-                throw new Error('Failed to decrypt request message');
-            }
-            return attributes;
-        });
+            attributes = await (0, Utils_1.parseXml)(AES_1.AES.decrypt(attributes['req_info'], (0, Utils_1.createHash)(key, 'md5'), '', true, 'aes-256-ecb').toString());
+        }
+        if (!attributes || Object.keys(attributes).length === 0) {
+            throw new Error('Failed to decrypt request message');
+        }
+        return attributes;
     }
     decodeJsonMessage(attributes) {
         if (!attributes || Object.keys(attributes).length === 0) {
@@ -124,14 +109,14 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handlePaid(handler) {
-        this.with((message, next) => __awaiter(this, void 0, void 0, function* () {
+        this.with(async (message, next) => {
             let isV2Message = message.getOriginalContents().startsWith('<xml');
             if (isV2Message) {
                 return handler(message, next);
             }
             return message.getEventType() === 'TRANSACTION.SUCCESS' && message.trade_state === 'SUCCESS'
                 ? handler(message, next) : next(message);
-        }));
+        });
         return this;
     }
     /**
@@ -140,14 +125,14 @@ class Server extends ServerInterface_1.default {
      * @returns
      */
     handleRefunded(handler) {
-        this.with((message, next) => __awaiter(this, void 0, void 0, function* () {
+        this.with(async (message, next) => {
             let eventType = message.getEventType();
             return [
                 'REFUND.SUCCESS',
                 'REFUND.ABNORMAL',
                 'REFUND.CLOSED',
             ].findIndex(o => o === eventType) > -1 ? handler(message, next) : next(message);
-        }));
+        });
         return this;
     }
 }

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());
     }
     /**