node-easywechat 3.7.0 → 3.7.1

package/dist/OpenWork/SuiteAccessToken.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 SuiteAccessToken {
         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 {
-                suite_access_token: yield this.getToken(),
-            };
-        });
+    async toQuery() {
+        return {
+            suite_access_token: await this.getToken(),
+        };
     }
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = (yield this.httpClient.request('post', 'cgi-bin/service/get_suite_token', {
-                json: {
-                    suite_id: this.suiteId,
-                    suite_secret: this.suiteSecret,
-                    suite_ticket: yield this.suiteTicket.getTicket(),
-                }
-            })).toObject();
-            if (!response['suite_access_token']) {
-                throw new Error('Failed to get suite_access_token: ' + JSON.stringify(response));
-            }
-            if (this.cache) {
-                yield this.cache.set(this.getKey(), response['suite_access_token'], parseInt(response['expires_in']) - 100);
+    async refresh() {
+        let response = (await this.httpClient.request('post', 'cgi-bin/service/get_suite_token', {
+            json: {
+                suite_id: this.suiteId,
+                suite_secret: this.suiteSecret,
+                suite_ticket: await this.suiteTicket.getTicket(),
             }
-            return response['suite_access_token'];
-        });
+        })).toObject();
+        if (!response['suite_access_token']) {
+            throw new Error('Failed to get suite_access_token: ' + JSON.stringify(response));
+        }
+        if (this.cache) {
+            await this.cache.set(this.getKey(), response['suite_access_token'], parseInt(response['expires_in']) - 100);
+        }
+        return response['suite_access_token'];
     }
 }
 module.exports = SuiteAccessToken;

package/dist/OpenWork/SuiteTicket.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 SuiteTicket {
     constructor(suiteId, cache = null, key = null) {
         this.suiteId = suiteId;
@@ -24,25 +15,21 @@ class SuiteTicket {
         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 suite_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 suite_ticket found.');
+        }
+        return ticket;
     }
 }
 ;

package/dist/Pay/Application.js

@@ -34,9 +34,8 @@ class Application {
         }
     }
     getMerchant() {
-        var _a;
         if (!this.merchant) {
-            this.merchant = new Merchant_1.default(this.config.get('mch_id'), this.config.get('private_key'), this.config.get('certificate'), this.config.get('secret_key'), this.config.get('v2_secret_key'), (_a = this.config.get('platform_certs')) !== null && _a !== void 0 ? _a : [], this);
+            this.merchant = new Merchant_1.default(this.config.get('mch_id'), this.config.get('private_key'), this.config.get('certificate'), this.config.get('secret_key'), this.config.get('v2_secret_key'), this.config.get('platform_certs') ?? [], this);
         }
         return this.merchant;
     }

package/dist/Pay/Client.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 };
 };
@@ -22,7 +13,6 @@ const LegacySignature_1 = __importDefault(require("./LegacySignature"));
 const form_data_1 = __importDefault(require("form-data"));
 class Client {
     constructor(merchant, client, defaultOptions = {}) {
-        var _a;
         this.merchant = merchant;
         this.throw = true;
         this.client = null;
@@ -39,7 +29,7 @@ class Client {
             '/hk/v3/',
             '/global/v3/',
         ];
-        this.throw = !!((_a = defaultOptions['throw']) !== null && _a !== void 0 ? _a : true);
+        this.throw = !!(defaultOptions['throw'] ?? true);
         this.defaultOptions = merge_1.default.recursive(true, this.defaultOptions, defaultOptions);
         this.client = client || HttpClient_1.default.create();
     }
@@ -54,51 +44,49 @@ class Client {
         this.client.setLogger(logger);
         return this;
     }
-    request(method_1, url_1) {
-        return __awaiter(this, arguments, void 0, function* (method, url, payload = {}) {
-            if (!payload.headers)
-                payload.headers = {};
-            if (!payload.headers['user-agent'] && !payload.headers['User-Agent']) {
-                payload.headers['user-agent'] = (0, Utils_1.createUserAgent)();
-            }
-            if (this.isV3Request(url) && !payload.headers['authorization']) {
-                if (typeof payload.json !== 'undefined') {
-                    if (typeof payload.json === 'object') {
-                        payload.data = JSON.stringify(payload.json);
-                    }
-                    else if (typeof payload.json === 'string') {
-                        payload.data = payload.json;
-                    }
-                    delete payload.json;
+    async request(method, url, payload = {}) {
+        if (!payload.headers)
+            payload.headers = {};
+        if (!payload.headers['user-agent'] && !payload.headers['User-Agent']) {
+            payload.headers['user-agent'] = (0, Utils_1.createUserAgent)();
+        }
+        if (this.isV3Request(url) && !payload.headers['authorization']) {
+            if (typeof payload.json !== 'undefined') {
+                if (typeof payload.json === 'object') {
+                    payload.data = JSON.stringify(payload.json);
                 }
-                payload.headers['authorization'] = this.createSignature(method, url, payload);
-            }
-            else {
-                if (typeof payload.xml !== 'undefined') {
-                    if (typeof payload.xml === 'object') {
-                        payload.xml = (0, Utils_1.buildXml)(this.attachLegacySignature(payload.xml));
-                    }
-                    if (typeof payload.xml !== 'string') {
-                        throw new Error('The `xml` option must be a string or object.');
-                    }
-                    payload.data = payload.xml;
-                    delete payload.xml;
+                else if (typeof payload.json === 'string') {
+                    payload.data = payload.json;
                 }
-                if (payload.data && typeof payload.data === 'object') {
-                    payload.data = (0, Utils_1.buildXml)(this.attachLegacySignature(payload.data));
+                delete payload.json;
+            }
+            payload.headers['authorization'] = this.createSignature(method, url, payload);
+        }
+        else {
+            if (typeof payload.xml !== 'undefined') {
+                if (typeof payload.xml === 'object') {
+                    payload.xml = (0, Utils_1.buildXml)(this.attachLegacySignature(payload.xml));
                 }
-                if (!payload.headers['content-type'] && !payload.headers['Content-Type']) {
-                    payload.headers['content-type'] = 'text/xml';
+                if (typeof payload.xml !== 'string') {
+                    throw new Error('The `xml` option must be a string or object.');
                 }
+                payload.data = payload.xml;
+                delete payload.xml;
             }
-            if (this.prependData && Object.keys(this.prependData).length > 0) {
-                payload.data = Object.assign(Object.assign({}, this.prependData), payload.data);
+            if (payload.data && typeof payload.data === 'object') {
+                payload.data = (0, Utils_1.buildXml)(this.attachLegacySignature(payload.data));
             }
-            if (this.prependHeaders && Object.keys(this.prependHeaders).length > 0) {
-                payload.headers = Object.assign(Object.assign({}, this.prependHeaders), payload.headers);
+            if (!payload.headers['content-type'] && !payload.headers['Content-Type']) {
+                payload.headers['content-type'] = 'text/xml';
             }
-            return this.client.request(method, (0, Utils_1.ltrim)(url, '\\/+'), payload);
-        });
+        }
+        if (this.prependData && Object.keys(this.prependData).length > 0) {
+            payload.data = { ...this.prependData, ...payload.data };
+        }
+        if (this.prependHeaders && Object.keys(this.prependHeaders).length > 0) {
+            payload.headers = { ...this.prependHeaders, ...payload.headers };
+        }
+        return this.client.request(method, (0, Utils_1.ltrim)(url, '\\/+'), payload);
     }
     /**
      * 文件上传
@@ -109,35 +97,33 @@ class Client {
      * @param filename 文件名，必须以 .jpg、.bmp、.png 为后缀
      * @returns
      */
-    uploadMedia(uri_1, file_1) {
-        return __awaiter(this, arguments, void 0, function* (uri, file, meta = null, filename = null) {
-            if (typeof file === 'string') {
-                file = fs_1.default.readFileSync(file);
-            }
-            else if (typeof file !== 'string' && !Buffer.isBuffer(file)) {
-                file = yield (0, Utils_1.streamToBuffer)(file);
-            }
-            filename = filename !== null && filename !== void 0 ? filename : 'file.jpg';
-            if (!meta) {
-                meta = {
-                    filename: filename,
-                    sha256: yield (0, Utils_1.createHash)(file, 'sha256'),
-                };
+    async uploadMedia(uri, file, meta = null, filename = null) {
+        if (typeof file === 'string') {
+            file = fs_1.default.readFileSync(file);
+        }
+        else if (typeof file !== 'string' && !Buffer.isBuffer(file)) {
+            file = await (0, Utils_1.streamToBuffer)(file);
+        }
+        filename = filename ?? 'file.jpg';
+        if (!meta) {
+            meta = {
+                filename: filename,
+                sha256: await (0, Utils_1.createHash)(file, 'sha256'),
+            };
+        }
+        let metaJson = JSON.stringify(meta);
+        let formData = new form_data_1.default();
+        formData.append('file', file, filename);
+        formData.append('meta', metaJson, {
+            contentType: 'application/json',
+        });
+        return this.client.request('POST', (0, Utils_1.ltrim)(uri, '\\/+'), {
+            formData,
+            headers: {
+                'authorization': this.createSignature('POST', uri, {
+                    data: metaJson,
+                }),
             }
-            let metaJson = JSON.stringify(meta);
-            let formData = new form_data_1.default();
-            formData.append('file', file, filename);
-            formData.append('meta', metaJson, {
-                contentType: 'application/json',
-            });
-            return this.client.request('POST', (0, Utils_1.ltrim)(uri, '\\/+'), {
-                formData,
-                headers: {
-                    'authorization': this.createSignature('POST', uri, {
-                        data: metaJson,
-                    }),
-                }
-            });
         });
     }
     /**

package/dist/Pay/LegacySignature.js

@@ -14,12 +14,11 @@ class LegacySignature {
      * @returns
      */
     sign(params) {
-        var _a, _b;
         let nonce = (0, Utils_1.randomString)();
         let attributes = (0, merge_1.default)(true, {
             nonce_str: nonce,
-            sub_mch_id: (_a = params['sub_mch_id']) !== null && _a !== void 0 ? _a : null,
-            sub_appid: (_b = params['sub_appid']) !== null && _b !== void 0 ? _b : null,
+            sub_mch_id: params['sub_mch_id'] ?? null,
+            sub_appid: params['sub_appid'] ?? null,
         }, params);
         let signString = '';
         let sparator = '';

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;
     }
 }