node-easywechat 3.7.0 → 3.7.1

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## v3.7.1 (2024-06-07)
+
+- Fix: 调整ts编译目标版本为ES2020 (#79)
+
 ## v3.7.0 (2024-05-16)
 
 - Feat: 增加视频号模块

package/dist/Channel/Application.js

@@ -106,7 +106,7 @@ class Application {
         return this;
     }
     createClient() {
-        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken(), (response) => { var _a; return ((_a = response.toObject()['errcode']) !== null && _a !== void 0 ? _a : 0) || (response.toObject()['error'] !== null && response.toObject()['error'] !== undefined); }, this.getConfig().get('http.throw', true)))
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken(), (response) => (response.toObject()['errcode'] ?? 0) || (response.toObject()['error'] !== null && response.toObject()['error'] !== undefined), this.getConfig().get('http.throw', true)))
             .setPresets(this.getConfig().all());
     }
     /**

package/dist/Core/Cache/FileCache.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 };
 };
@@ -57,63 +48,55 @@ class FileCache {
         }
         return dataItem.data;
     }
-    get(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let content = null;
-            try {
-                let file = this.getCacheFile(id);
-                content = this.getCacheContent(file);
-            }
-            catch (e) {
-                content = null;
-            }
-            return content;
-        });
-    }
-    has(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let file = this.getCacheFile(id);
-                fs_1.default.accessSync(file, fs_1.default.constants.R_OK & fs_1.default.constants.W_OK);
-                let content = this.getCacheContent(file);
-            }
-            catch (e) {
-                return false;
-            }
-            return true;
-        });
-    }
-    set(id_1) {
-        return __awaiter(this, arguments, void 0, function* (id, data = null, lifeTime = 0) {
+    async get(id) {
+        let content = null;
+        try {
             let file = this.getCacheFile(id);
-            try {
-                let dataItem = {
-                    data,
-                    lifeTime: lifeTime > 0 ? lifeTime + (0, Utils_1.getTimestamp)() : 0
-                };
-                fs_1.default.writeFileSync(file, JSON.stringify(dataItem), {
-                    mode: this.options.fileMode,
-                    encoding: 'utf-8',
-                    flag: 'w'
-                });
-            }
-            catch (e) {
-                return false;
-            }
-            return true;
-        });
+            content = this.getCacheContent(file);
+        }
+        catch (e) {
+            content = null;
+        }
+        return content;
     }
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async has(id) {
+        try {
             let file = this.getCacheFile(id);
-            try {
-                fs_1.default.unlinkSync(file);
-            }
-            catch (e) {
-                return false;
-            }
-            return true;
-        });
+            fs_1.default.accessSync(file, fs_1.default.constants.R_OK & fs_1.default.constants.W_OK);
+            let content = this.getCacheContent(file);
+        }
+        catch (e) {
+            return false;
+        }
+        return true;
+    }
+    async set(id, data = null, lifeTime = 0) {
+        let file = this.getCacheFile(id);
+        try {
+            let dataItem = {
+                data,
+                lifeTime: lifeTime > 0 ? lifeTime + (0, Utils_1.getTimestamp)() : 0
+            };
+            fs_1.default.writeFileSync(file, JSON.stringify(dataItem), {
+                mode: this.options.fileMode,
+                encoding: 'utf-8',
+                flag: 'w'
+            });
+        }
+        catch (e) {
+            return false;
+        }
+        return true;
+    }
+    async delete(id) {
+        let file = this.getCacheFile(id);
+        try {
+            fs_1.default.unlinkSync(file);
+        }
+        catch (e) {
+            return false;
+        }
+        return true;
     }
 }
 ;

package/dist/Core/Contracts/AccessTokenInterface.js

@@ -1,28 +1,15 @@
 '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 AccessTokenInterface {
     /**
      * 获取token
      * @returns
      */
-    getToken() {
-        return __awaiter(this, void 0, void 0, function* () { return null; });
-    }
+    async getToken() { return null; }
     /**
      * 转成url参数
      * @returns
      */
-    toQuery() {
-        return __awaiter(this, void 0, void 0, function* () { return null; });
-    }
+    async toQuery() { return null; }
 }
 ;
 module.exports = AccessTokenInterface;

package/dist/Core/Contracts/CacheInterface.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());
-    });
-};
 /**
  * 缓存接口
  */
@@ -17,17 +8,13 @@ class CacheInterface {
      * @param key 缓存名
      * @returns
      */
-    get(key) {
-        return __awaiter(this, void 0, void 0, function* () { return null; });
-    }
+    async get(key) { return null; }
     /**
      * 设置缓存
      * @param key 缓存名
      * @returns
      */
-    has(key) {
-        return __awaiter(this, void 0, void 0, function* () { return false; });
-    }
+    async has(key) { return false; }
     /**
      * 设置缓存
      * @param key 缓存名
@@ -35,17 +22,13 @@ class CacheInterface {
      * @param lifetime 过期时间，单位：秒
      * @returns
      */
-    set(key_1) {
-        return __awaiter(this, arguments, void 0, function* (key, data = null, lifetime = 0) { return false; });
-    }
+    async set(key, data = null, lifetime = 0) { return false; }
     /**
      * 删除缓存
      * @param key 缓存名
      * @returns
      */
-    delete(key) {
-        return __awaiter(this, void 0, void 0, function* () { return false; });
-    }
+    async delete(key) { return false; }
 }
 ;
 module.exports = CacheInterface;

package/dist/Core/Contracts/RefreshableAccessTokenInterface.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 };
 };
@@ -17,9 +8,7 @@ class RefreshableAccessTokenInterface extends AccessTokenInterface_1.default {
      * 刷新token
      * @returns
      */
-    refresh() {
-        return __awaiter(this, void 0, void 0, function* () { return null; });
-    }
+    async refresh() { return null; }
 }
 ;
 module.exports = RefreshableAccessTokenInterface;

package/dist/Core/Contracts/ServerInterface.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,9 +14,7 @@ class ServerInterface {
     /**
      * 处理消息
      */
-    serve() {
-        return __awaiter(this, void 0, void 0, function* () { return null; });
-    }
+    async serve() { return null; }
 }
 ;
 ;

package/dist/Core/Http/ServerRequest.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 };
 };
@@ -42,33 +33,31 @@ class ServerRequest {
      * 解析 body 内容
      * 支持 JSON字符串、XML字符串、QueryString等格式
      */
-    parseBody() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let body = this.content.toString();
-            if (body.startsWith('<xml')) {
-                let res = yield (0, Utils_1.parseXml)(body);
-                this.parsedBody = res;
-                this.headers['content-type'] = 'text/xml';
+    async parseBody() {
+        let body = this.content.toString();
+        if (body.startsWith('<xml')) {
+            let res = await (0, Utils_1.parseXml)(body);
+            this.parsedBody = res;
+            this.headers['content-type'] = 'text/xml';
+        }
+        else if (body.startsWith('{') || body.startsWith('[')) {
+            try {
+                this.parsedBody = JSON.parse(body);
+                this.headers['content-type'] = 'application/json';
             }
-            else if (body.startsWith('{') || body.startsWith('[')) {
-                try {
-                    this.parsedBody = JSON.parse(body);
-                    this.headers['content-type'] = 'application/json';
-                }
-                catch (e) {
-                    this.parsedBody = {};
-                }
+            catch (e) {
+                this.parsedBody = {};
             }
-            else {
-                try {
-                    this.parsedBody = (0, Utils_1.parseQueryString)(body);
-                    this.headers['content-type'] = 'application/x-www-form-urlencoded';
-                }
-                catch (e) {
-                    this.parsedBody = {};
-                }
+        }
+        else {
+            try {
+                this.parsedBody = (0, Utils_1.parseQueryString)(body);
+                this.headers['content-type'] = 'application/x-www-form-urlencoded';
             }
-        });
+            catch (e) {
+                this.parsedBody = {};
+            }
+        }
     }
     getServerParams() {
         return this.serverParams;
@@ -94,13 +83,11 @@ class ServerRequest {
         this.uploadedFiles = merge_1.default.recursive(true, files);
         return this;
     }
-    getParsedBody() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.parsedBody || Object.keys(this.parsedBody).length === 0) {
-                yield this.parseBody();
-            }
-            return this.parsedBody;
-        });
+    async getParsedBody() {
+        if (!this.parsedBody || Object.keys(this.parsedBody).length === 0) {
+            await this.parseBody();
+        }
+        return this.parsedBody;
     }
     withParsedBody(data) {
         this.parsedBody = merge_1.default.recursive(true, data);
@@ -135,15 +122,13 @@ class ServerRequest {
      * @param body 支持 Buffer、object对象、JSON字符串、XML字符串、QueryString格式的 body 内容字符串
      * @returns
      */
-    static createFromIncomingMessage(req_1) {
-        return __awaiter(this, arguments, void 0, function* (req, body = null) {
-            let request = new ServerRequest(req.method, req.url, req.headers || {}, body, req.httpVersion);
-            if (req.method.toUpperCase() === 'POST' && !body) {
-                let res = yield (0, raw_body_1.default)(req);
-                request.withBody(res);
-            }
-            return request;
-        });
+    static async createFromIncomingMessage(req, body = null) {
+        let request = new ServerRequest(req.method, req.url, req.headers || {}, body, req.httpVersion);
+        if (req.method.toUpperCase() === 'POST' && !body) {
+            let res = await (0, raw_body_1.default)(req);
+            request.withBody(res);
+        }
+        return request;
     }
 }
 ;

package/dist/Core/HttpClient/AccessTokenAwareClient.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 };
 };
@@ -38,14 +29,12 @@ class AccessTokenAwareClient {
         this.client.setLogger(logger);
         return this;
     }
-    request(method_1, url_1) {
-        return __awaiter(this, arguments, void 0, function* (method, url, payload = {}) {
-            if (this.accessToken) {
-                payload.params = (0, merge_1.default)(true, payload.params || {}, yield this.accessToken.toQuery());
-            }
-            let options = this.mergeThenResetPrepends(payload, method);
-            return this.client.request(method, (0, Utils_1.ltrim)(url, '\\/+'), options);
-        });
+    async request(method, url, payload = {}) {
+        if (this.accessToken) {
+            payload.params = (0, merge_1.default)(true, payload.params || {}, await this.accessToken.toQuery());
+        }
+        let options = this.mergeThenResetPrepends(payload, method);
+        return this.client.request(method, (0, Utils_1.ltrim)(url, '\\/+'), options);
     }
 }
 ;

package/dist/Core/HttpClient/Contracts/HttpClientInterface.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 HttpClientInterface {
     /**
      * 获取axios实例
@@ -31,9 +22,7 @@ class HttpClientInterface {
     /**
      * 发起http请求
      */
-    request(method, url, payload) {
-        return __awaiter(this, void 0, void 0, function* () { return null; });
-    }
+    async request(method, url, payload) { return null; }
 }
 ;
 module.exports = HttpClientInterface;

package/dist/Core/HttpClient/HttpClient.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 };
 };
@@ -34,88 +25,86 @@ class HttpClient {
         this.failureJudge = closure;
         return this;
     }
-    request(method_1, url_1) {
-        return __awaiter(this, arguments, void 0, function* (method, url, payload = {}) {
-            let options = Object.assign({}, payload);
-            if (!options.headers)
-                options.headers = {};
-            options.method = method;
-            options.url = url;
-            if (options['xml'] !== undefined) {
-                let xml = '';
-                if (typeof options['xml'] === 'object') {
-                    xml = (0, Utils_1.buildXml)(options['xml']);
-                }
-                else if (typeof options['xml'] === 'string') {
-                    xml = options['xml'];
-                }
-                else {
-                    throw new Error('The type of `xml` must be string or object.');
-                }
-                if (!options.headers['Content-Type'] && !options.headers['content-type']) {
-                    options.headers['content-type'] = 'text/xml';
-                }
-                options.data = xml;
-                options['xml'] = undefined;
-                delete options['xml'];
+    async request(method, url, payload = {}) {
+        let options = { ...payload };
+        if (!options.headers)
+            options.headers = {};
+        options.method = method;
+        options.url = url;
+        if (options['xml'] !== undefined) {
+            let xml = '';
+            if (typeof options['xml'] === 'object') {
+                xml = (0, Utils_1.buildXml)(options['xml']);
             }
-            if (options['json'] !== undefined) {
-                let json = '';
-                if (typeof options['json'] === 'object') {
-                    json = JSON.stringify(options['json']);
-                }
-                else if (typeof options['json'] === 'string') {
-                    json = options['json'];
-                }
-                else {
-                    throw new Error('The type of `json` must be string or object.');
-                }
-                if (!options.headers['Content-Type'] && !options.headers['content-type']) {
-                    options.headers['content-type'] = 'application/json';
-                }
-                options.data = json;
-                options['json'] = undefined;
-                delete options['json'];
+            else if (typeof options['xml'] === 'string') {
+                xml = options['xml'];
             }
-            if (options['formData'] && Object.keys(options['formData']).length > 0) {
-                let formData = new form_data_1.default();
-                if (options['formData'] instanceof form_data_1.default) {
-                    formData = options['formData'];
-                }
-                else {
-                    for (let key in options['formData']) {
-                        formData.append(key, options['formData'][key]);
-                    }
-                }
-                if (options.data)
-                    for (let key in options.data) {
-                        formData.append(key, options.data[key]);
-                    }
-                options.data = formData;
-                options['formData'] = undefined;
-                delete options['formData'];
+            else {
+                throw new Error('The type of `xml` must be string or object.');
             }
-            // 如果 data 是 FormData 对象，则从中提取 headers
-            if (options.data && options.data instanceof form_data_1.default) {
-                options.headers = Object.assign(Object.assign({}, (yield this.getFormDataHeaders(options.data))), options.headers);
+            if (!options.headers['Content-Type'] && !options.headers['content-type']) {
+                options.headers['content-type'] = 'text/xml';
             }
-            // 是否抛出异常
-            options.validateStatus = (status) => {
-                return this.throwError ? status >= 200 && status < 300 : true;
-            };
-            let starttime = Date.now();
-            if (typeof this.logger === 'function') {
-                yield this.logger('before', options);
+            options.data = xml;
+            options['xml'] = undefined;
+            delete options['xml'];
+        }
+        if (options['json'] !== undefined) {
+            let json = '';
+            if (typeof options['json'] === 'object') {
+                json = JSON.stringify(options['json']);
             }
-            let response = yield this.axios.request(options);
-            if (typeof this.logger === 'function') {
-                let usedTime = Date.now() - starttime;
-                yield this.logger('after', options, usedTime, response);
+            else if (typeof options['json'] === 'string') {
+                json = options['json'];
             }
-            let resp = new HttpClientResponse_1.default(response, this.failureJudge, this.throwError);
-            yield resp.parseContent(this.throwError);
-            return resp;
-        });
+            else {
+                throw new Error('The type of `json` must be string or object.');
+            }
+            if (!options.headers['Content-Type'] && !options.headers['content-type']) {
+                options.headers['content-type'] = 'application/json';
+            }
+            options.data = json;
+            options['json'] = undefined;
+            delete options['json'];
+        }
+        if (options['formData'] && Object.keys(options['formData']).length > 0) {
+            let formData = new form_data_1.default();
+            if (options['formData'] instanceof form_data_1.default) {
+                formData = options['formData'];
+            }
+            else {
+                for (let key in options['formData']) {
+                    formData.append(key, options['formData'][key]);
+                }
+            }
+            if (options.data)
+                for (let key in options.data) {
+                    formData.append(key, options.data[key]);
+                }
+            options.data = formData;
+            options['formData'] = undefined;
+            delete options['formData'];
+        }
+        // 如果 data 是 FormData 对象，则从中提取 headers
+        if (options.data && options.data instanceof form_data_1.default) {
+            options.headers = { ...(await this.getFormDataHeaders(options.data)), ...options.headers };
+        }
+        // 是否抛出异常
+        options.validateStatus = (status) => {
+            return this.throwError ? status >= 200 && status < 300 : true;
+        };
+        let starttime = Date.now();
+        if (typeof this.logger === 'function') {
+            await this.logger('before', options);
+        }
+        let response = await this.axios.request(options);
+        if (typeof this.logger === 'function') {
+            let usedTime = Date.now() - starttime;
+            await this.logger('after', options, usedTime, response);
+        }
+        let resp = new HttpClientResponse_1.default(response, this.failureJudge, this.throwError);
+        await resp.parseContent(this.throwError);
+        return resp;
     }
     getInstance() {
         return this.axios;