node-easywechat 3.0.0-alpha.1 → 3.0.0-alpha.2

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG
 
 
+## v3.0.0-alpha.2 (2022-06-08)
+
+- Perf: 优化消息对象的提示信息
+
+- Refactor: 简化构造函数的写法
+
 ## v3.0.0-alpha.1 (2022-04-16)
 
 - Feat: 新增框架架构和公众号模块

package/dist/Core/Config.d.ts

@@ -3,7 +3,7 @@ import ConfigInterface from "./Contracts/ConfigInterface";
 declare class Config implements ConfigInterface {
     protected items: OfficialAccountConfig | MiniAppConfig | PayConfig | OpenPlatformConfig | WorkConfig | OpenWorkConfig;
     protected requiredKeys: string[];
-    constructor(items: OfficialAccountConfig | MiniAppConfig | PayConfig | OpenPlatformConfig | WorkConfig | OpenWorkConfig);
+    constructor(items?: OfficialAccountConfig | MiniAppConfig | PayConfig | OpenPlatformConfig | WorkConfig | OpenWorkConfig);
     /**
      * 检查是否有配置项缺失
      * @returns

package/dist/Core/Config.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const merge_1 = __importDefault(require("merge"));
 const Obj_1 = __importDefault(require("./Support/Obj"));
 class Config {
-    constructor(items) {
-        this.items = {};
+    constructor(items = {}) {
+        this.items = items;
         this.requiredKeys = [];
         this.items = merge_1.default.recursive(true, items);
         this.checkMissingKeys();

package/dist/Core/Encryptor.d.ts

@@ -2,10 +2,10 @@
 declare class Encryptor {
     protected appId: string;
     protected token: string;
-    protected aesKey: Buffer;
-    protected blockSize: number;
+    protected aesKey: string | Buffer;
     protected receiveId: string;
-    constructor(appId: string, token: string, aesKey: string, receiveId?: string);
+    protected blockSize: number;
+    constructor(appId?: string, token?: string, aesKey?: string | Buffer, receiveId?: string);
     /**
      * 获取配置的token
      * @returns

package/dist/Core/Encryptor.js

@@ -7,16 +7,15 @@ const Utils_1 = require("./Support/Utils");
 const AES_1 = require("./Support/AES");
 const PKCS_1 = __importDefault(require("./Support/PKCS"));
 class Encryptor {
-    constructor(appId, token, aesKey, receiveId = null) {
-        this.appId = null;
-        this.token = null;
-        this.aesKey = null;
-        this.blockSize = 32;
-        this.receiveId = null;
+    constructor(appId = null, token = null, aesKey = null, receiveId = null) {
         this.appId = appId;
         this.token = token;
+        this.aesKey = aesKey;
         this.receiveId = receiveId;
-        this.aesKey = Buffer.from(aesKey + '=', 'base64');
+        this.blockSize = 32;
+        if (typeof this.aesKey === 'string') {
+            this.aesKey = Buffer.from(this.aesKey + '=', 'base64');
+        }
     }
     /**
      * 获取配置的token

package/dist/Core/HttpClient/HttpClient.js

@@ -17,9 +17,6 @@ const HttpClientResponse_1 = __importDefault(require("./HttpClientResponse"));
 const Utils_1 = require("../Support/Utils");
 class HttpClient {
     constructor(axios, failureJudge = null, throwError = false) {
-        this.axios = null;
-        this.failureJudge = null;
-        this.throwError = true;
         this.axios = axios;
         this.failureJudge = failureJudge;
         this.throwError = throwError;

package/dist/Core/HttpClient/HttpClientResponse.d.ts

@@ -53,6 +53,12 @@ declare class HttpClientResponse implements HttpClientResponseInterface {
      * @returns
      */
     toDataUrl(): string;
+    /**
+     * 判断 content-type 是否指定类型
+     * @param type
+     * @returns
+     */
+    is(type: 'json' | 'xml' | 'html' | 'image' | 'audio' | 'video' | 'text'): boolean;
     /**
      * 判断header是否存在
      * @param key

package/dist/Core/HttpClient/HttpClientResponse.js

@@ -16,9 +16,6 @@ const merge_1 = __importDefault(require("merge"));
 const Utils_1 = require("../Support/Utils");
 class HttpClientResponse {
     constructor(response, failureJudge = null, throwError = true) {
-        this.response = null;
-        this.failureJudge = null;
-        this.throwError = false;
         this.response = response;
         this.failureJudge = failureJudge;
         this.throwError = throwError;
@@ -47,7 +44,7 @@ class HttpClientResponse {
      * @returns
      */
     isFailed() {
-        if (this.failureJudge) {
+        if (this.is('text') && this.failureJudge) {
             return this.failureJudge(this);
         }
         try {
@@ -121,6 +118,41 @@ class HttpClientResponse {
     toDataUrl() {
         return 'data:' + this.getHeader('content-type') + ';base64,' + this.response.data;
     }
+    /**
+     * 判断 content-type 是否指定类型
+     * @param type
+     * @returns
+     */
+    is(type) {
+        let contentType = this.getHeader('content-type');
+        let res = false;
+        switch (type.toLowerCase()) {
+            case 'json':
+                res = contentType.indexOf('/json') > -1;
+                break;
+            case 'xml':
+                res = contentType.indexOf('/xml') > -1;
+                break;
+            case 'html':
+                res = contentType.indexOf('/html') > -1;
+                break;
+            case 'image':
+                res = contentType.indexOf('image/') > -1;
+                break;
+            case 'audio':
+                res = contentType.indexOf('audio/') > -1;
+                break;
+            case 'video':
+                res = contentType.indexOf('video/') > -1;
+                break;
+            case 'text':
+                res = contentType.indexOf('text/') > -1
+                    || contentType.indexOf('/json') > -1
+                    || contentType.indexOf('/xml') > -1;
+                break;
+        }
+        return res;
+    }
     /**
      * 判断header是否存在
      * @param key

package/dist/Core/Message.d.ts

@@ -1,6 +1,9 @@
 import ServerRequestInterface from "./Http/Contracts/ServerRequestInterface";
 import HasAttributesMixin from "./Mixins/HasAttributesMixin";
 declare class Message {
+    /**
+     * 原始消息内容
+     */
     protected originContent: string;
     constructor(attributes: Record<string, any>, originContent?: string);
     /**
@@ -9,7 +12,15 @@ declare class Message {
      * @returns
      */
     static createFromRequest(request: ServerRequestInterface): Promise<Message>;
+    /**
+     * 获取原始消息内容
+     * @returns
+     */
     getOriginalContents(): string;
+    /**
+     * 转为字符串
+     * @returns
+     */
     toString(): string;
 }
 interface Message extends HasAttributesMixin {

package/dist/Core/Message.js

@@ -15,6 +15,9 @@ const HasAttributesMixin_1 = __importDefault(require("./Mixins/HasAttributesMixi
 const Utils_1 = require("./Support/Utils");
 class Message {
     constructor(attributes, originContent = '') {
+        /**
+         * 原始消息内容
+         */
         this.originContent = '';
         this.attributes = attributes;
         this.originContent = originContent;
@@ -61,9 +64,17 @@ class Message {
             return new Message(attributes, originContent);
         });
     }
+    /**
+     * 获取原始消息内容
+     * @returns
+     */
     getOriginalContents() {
         return this.originContent;
     }
+    /**
+     * 转为字符串
+     * @returns
+     */
     toString() {
         return this.toJson();
     }

package/dist/MiniApp/AccessToken.d.ts

@@ -0,0 +1,4 @@
+import BaseAccessToken from "../OfficialAccount/AccessToken";
+declare class AccessToken extends BaseAccessToken {
+}
+export = AccessToken;

package/dist/MiniApp/AccessToken.js

@@ -0,0 +1,8 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const AccessToken_1 = __importDefault(require("../OfficialAccount/AccessToken"));
+class AccessToken extends AccessToken_1.default {
+}
+module.exports = AccessToken;

package/dist/MiniApp/Account.d.ts

@@ -0,0 +1,4 @@
+import BaseAccount from "../OfficialAccount/Account";
+declare class Account extends BaseAccount {
+}
+export = Account;

package/dist/MiniApp/Account.js

@@ -0,0 +1,8 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const Account_1 = __importDefault(require("../OfficialAccount/Account"));
+class Account extends Account_1.default {
+}
+module.exports = Account;

package/dist/MiniApp/Application.d.ts

@@ -0,0 +1,59 @@
+import AccessTokenInterface from '../Core/Contracts/AccessTokenInterface';
+import ConfigInterface from '../Core/Contracts/ConfigInterface';
+import ServerInterface from '../Core/Contracts/ServerInterface';
+import Encryptor from '../Core/Encryptor';
+import AccessTokenAwareClient from '../Core/HttpClient/AccessTokenAwareClient';
+import CacheMixin from '../Core/Mixins/CacheMixin';
+import ClientMixin from '../Core/Mixins/ClientMixin';
+import ConfigMixin from '../Core/Mixins/ConfigMixin';
+import HttpClientMixin from '../Core/Mixins/HttpClientMixin';
+import ServerRequestMixin from '../Core/Mixins/ServerRequestMixin';
+import { MiniAppConfig } from '../Types/global';
+import AccountInterface from './Contracts/AccountInterface';
+import ApplicationInterface from './Contracts/ApplicationInterface';
+import Utils from './Utils';
+declare class Application implements ApplicationInterface {
+    constructor(config: ConfigInterface | MiniAppConfig);
+    protected account: AccountInterface;
+    protected encryptor: Encryptor;
+    protected server: ServerInterface;
+    protected accessToken: AccessTokenInterface;
+    getAccount(): AccountInterface;
+    /**
+     * 设置当前账户实例
+     * @param account
+     * @returns
+     */
+    setAccount(account: AccountInterface): this;
+    getEncryptor(): Encryptor;
+    /**
+     * 设置加密机实例
+     * @param encryptor
+     * @returns
+     */
+    setEncryptor(encryptor: Encryptor): this;
+    getServer(): ServerInterface;
+    /**
+     * 设置服务端实例
+     * @param server
+     * @returns
+     */
+    setServer(server: ServerInterface): this;
+    getAccessToken(): AccessTokenInterface;
+    /**
+     * 设置AccessToken实例
+     * @param accessToken
+     * @returns
+     */
+    setAccessToken(accessToken: AccessTokenInterface): this;
+    getUtils(): Utils;
+    createClient(): AccessTokenAwareClient;
+    /**
+     * 获取请求默认配置
+     * @returns
+     */
+    protected getHttpClientDefaultOptions(): Record<string, any>;
+}
+interface Application extends ConfigMixin, CacheMixin, ClientMixin, ServerRequestMixin, HttpClientMixin {
+}
+export = Application;

package/dist/MiniApp/Application.js

@@ -0,0 +1,123 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const merge_1 = __importDefault(require("merge"));
+const ConfigInterface_1 = __importDefault(require("../Core/Contracts/ConfigInterface"));
+const Encryptor_1 = __importDefault(require("../Core/Encryptor"));
+const AccessTokenAwareClient_1 = __importDefault(require("../Core/HttpClient/AccessTokenAwareClient"));
+const CacheMixin_1 = __importDefault(require("../Core/Mixins/CacheMixin"));
+const ClientMixin_1 = __importDefault(require("../Core/Mixins/ClientMixin"));
+const ConfigMixin_1 = __importDefault(require("../Core/Mixins/ConfigMixin"));
+const HttpClientMixin_1 = __importDefault(require("../Core/Mixins/HttpClientMixin"));
+const ServerRequestMixin_1 = __importDefault(require("../Core/Mixins/ServerRequestMixin"));
+const Utils_1 = require("../Core/Support/Utils");
+const AccessToken_1 = __importDefault(require("./AccessToken"));
+const Account_1 = __importDefault(require("./Account"));
+const Server_1 = __importDefault(require("./Server"));
+const Utils_2 = __importDefault(require("./Utils"));
+const Config_1 = __importDefault(require("../OfficialAccount/Config"));
+class Application {
+    constructor(config) {
+        this.account = null;
+        this.encryptor = null;
+        this.server = null;
+        this.accessToken = null;
+        if (config instanceof ConfigInterface_1.default) {
+            this.setConfig(config);
+        }
+        else {
+            this.setConfig(new Config_1.default(config));
+        }
+    }
+    getAccount() {
+        if (!this.account) {
+            this.account = new Account_1.default(this.config.get('app_id'), this.config.get('secret'), this.config.get('token'), this.config.get('aes_key'));
+        }
+        return this.account;
+    }
+    /**
+     * 设置当前账户实例
+     * @param account
+     * @returns
+     */
+    setAccount(account) {
+        this.account = account;
+        return this;
+    }
+    getEncryptor() {
+        if (!this.encryptor) {
+            let token = this.getAccount().getToken();
+            let aesKey = this.getAccount().getAesKey();
+            if (!token || !aesKey) {
+                throw new Error('token or aes_key cannot be empty.');
+            }
+            this.encryptor = new Encryptor_1.default(this.getAccount().getAppId(), token, aesKey, this.getAccount().getAppId());
+        }
+        return this.encryptor;
+    }
+    /**
+     * 设置加密机实例
+     * @param encryptor
+     * @returns
+     */
+    setEncryptor(encryptor) {
+        this.encryptor = encryptor;
+        return this;
+    }
+    getServer() {
+        if (!this.server) {
+            let token = this.getAccount().getToken();
+            let aesKey = this.getAccount().getAesKey();
+            if (!token || !aesKey) {
+                throw new Error('token or aes_key cannot be empty.');
+            }
+            this.server = new Server_1.default(this.getRequest(), this.getAccount().getAesKey() ? this.getEncryptor() : null);
+        }
+        return this.server;
+    }
+    /**
+     * 设置服务端实例
+     * @param server
+     * @returns
+     */
+    setServer(server) {
+        this.server = server;
+        return this;
+    }
+    getAccessToken() {
+        if (!this.accessToken) {
+            this.accessToken = new AccessToken_1.default(this.getAccount().getAppId(), this.getAccount().getSecret(), null, this.getCache(), this.getHttpClient());
+        }
+        return this.accessToken;
+    }
+    /**
+     * 设置AccessToken实例
+     * @param accessToken
+     * @returns
+     */
+    setAccessToken(accessToken) {
+        this.accessToken = accessToken;
+        return this;
+    }
+    getUtils() {
+        return new Utils_2.default(this);
+    }
+    createClient() {
+        let httpClient = this.getHttpClient();
+        return new AccessTokenAwareClient_1.default(httpClient, this.getAccessToken());
+    }
+    /**
+     * 获取请求默认配置
+     * @returns
+     */
+    getHttpClientDefaultOptions() {
+        return (0, merge_1.default)(true, {
+            baseURL: 'https://api.weixin.qq.com/',
+        }, this.getConfig().get('http'));
+    }
+}
+;
+;
+(0, Utils_1.applyMixins)(Application, [ConfigMixin_1.default, CacheMixin_1.default, ClientMixin_1.default, ServerRequestMixin_1.default, HttpClientMixin_1.default]);
+module.exports = Application;

package/dist/MiniApp/Contracts/AccountInterface.d.ts

@@ -0,0 +1,23 @@
+declare abstract class AccountInterface {
+    /**
+     * 获取appid
+     * @returns
+     */
+    getAppId(): string;
+    /**
+     * 获取secret
+     * @returns
+     */
+    getSecret(): string;
+    /**
+     * 获取token
+     * @returns
+     */
+    getToken(): string;
+    /**
+     * 获取aesKey
+     * @returns
+     */
+    getAesKey(): string;
+}
+export = AccountInterface;

package/dist/MiniApp/Contracts/AccountInterface.js

@@ -0,0 +1,25 @@
+'use strict';
+class AccountInterface {
+    /**
+     * 获取appid
+     * @returns
+     */
+    getAppId() { return null; }
+    /**
+     * 获取secret
+     * @returns
+     */
+    getSecret() { return null; }
+    /**
+     * 获取token
+     * @returns
+     */
+    getToken() { return null; }
+    /**
+     * 获取aesKey
+     * @returns
+     */
+    getAesKey() { return null; }
+}
+;
+module.exports = AccountInterface;

package/dist/MiniApp/Contracts/ApplicationInterface.d.ts

@@ -0,0 +1,68 @@
+import AccessTokenInterface from "../../Core/Contracts/AccessTokenInterface";
+import CacheInterface from "../../Core/Contracts/CacheInterface";
+import ConfigInterface from "../../Core/Contracts/ConfigInterface";
+import AccessTokenAwareClient from "../../Core/HttpClient/AccessTokenAwareClient";
+import HttpClientInterface from "../../Core/HttpClient/Contracts/HttpClientInterface";
+import ServerInterface from "../../Core/Contracts/ServerInterface";
+import ServerRequestInterface from "../../Core/Http/Contracts/ServerRequestInterface";
+import Encryptor from "../../Core/Encryptor";
+import AccountInterface from "./AccountInterface";
+import Utils from "../Utils";
+declare abstract class ApplicationInterface {
+    /**
+     * 获取当前账户实例
+     * @returns
+     */
+    getAccount(): AccountInterface;
+    /**
+     * 获取加密机实例
+     * @returns
+     */
+    getEncryptor(): Encryptor;
+    /**
+     * 获取服务端实例
+     * @returns
+     */
+    getServer(): ServerInterface;
+    /**
+     * 获取当前请求实例
+     * @returns
+     */
+    getRequest(): ServerRequestInterface;
+    /**
+     * 获取客户端实例
+     * @returns
+     */
+    getClient(): AccessTokenAwareClient;
+    /**
+     * 创建客户端实例
+     * @returns
+     */
+    createClient(): AccessTokenAwareClient;
+    /**
+     * 获取网络请求客户端实例
+     * @returns
+     */
+    getHttpClient(): HttpClientInterface;
+    /**
+     * 获取配置信息实例
+     * @returns
+     */
+    getConfig(): ConfigInterface;
+    /**
+     * 获取AccessToken实例
+     * @returns
+     */
+    getAccessToken(): AccessTokenInterface;
+    /**
+     * 获取缓存实例
+     * @returns
+     */
+    getCache(): CacheInterface;
+    /**
+     * 获取工具实例
+     * @returns
+     */
+    getUtils(): Utils;
+}
+export = ApplicationInterface;

package/dist/MiniApp/Contracts/ApplicationInterface.js

@@ -0,0 +1,60 @@
+'use strict';
+class ApplicationInterface {
+    /**
+     * 获取当前账户实例
+     * @returns
+     */
+    getAccount() { return null; }
+    /**
+     * 获取加密机实例
+     * @returns
+     */
+    getEncryptor() { return null; }
+    /**
+     * 获取服务端实例
+     * @returns
+     */
+    getServer() { return null; }
+    /**
+     * 获取当前请求实例
+     * @returns
+     */
+    getRequest() { return null; }
+    /**
+     * 获取客户端实例
+     * @returns
+     */
+    getClient() { return null; }
+    /**
+     * 创建客户端实例
+     * @returns
+     */
+    createClient() { return null; }
+    /**
+     * 获取网络请求客户端实例
+     * @returns
+     */
+    getHttpClient() { return null; }
+    /**
+     * 获取配置信息实例
+     * @returns
+     */
+    getConfig() { return null; }
+    /**
+     * 获取AccessToken实例
+     * @returns
+     */
+    getAccessToken() { return null; }
+    /**
+     * 获取缓存实例
+     * @returns
+     */
+    getCache() { return null; }
+    /**
+     * 获取工具实例
+     * @returns
+     */
+    getUtils() { return null; }
+}
+;
+module.exports = ApplicationInterface;

package/dist/MiniApp/Decryptor.d.ts

@@ -0,0 +1,4 @@
+declare class Decryptor {
+    static decrypt(sessionKey: string, iv: string, ciphertext: string): object;
+}
+export = Decryptor;

package/dist/MiniApp/Decryptor.js

@@ -0,0 +1,20 @@
+'use strict';
+const AES_1 = require("../Core/Support/AES");
+class Decryptor {
+    static decrypt(sessionKey, iv, ciphertext) {
+        let decrypted = null;
+        try {
+            // 解密
+            decrypted = AES_1.AES.decrypt(Buffer.from(ciphertext, 'base64'), Buffer.from(sessionKey, 'base64'), Buffer.from(iv, 'base64'), true, 'aes-128-cbc').toString('utf8');
+            decrypted = JSON.parse(decrypted);
+            if (!decrypted || typeof decrypted !== 'object') {
+                throw new Error('The given payload is invalid.');
+            }
+        }
+        catch (e) {
+            throw new Error(`Fail to decrypt data: ${e.message}`);
+        }
+        return decrypted;
+    }
+}
+module.exports = Decryptor;

package/dist/MiniApp/Server.d.ts

@@ -0,0 +1,4 @@
+import BaseServer from '../OfficialAccount/Server';
+declare class Server extends BaseServer {
+}
+export = Server;

package/dist/MiniApp/Server.js

@@ -0,0 +1,9 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const Server_1 = __importDefault(require("../OfficialAccount/Server"));
+class Server extends Server_1.default {
+}
+;
+module.exports = Server;

package/dist/MiniApp/Utils.d.ts

@@ -0,0 +1,22 @@
+import Application from './Application';
+declare class Utils {
+    protected app: Application;
+    constructor(app: Application);
+    /**
+     * 登录凭证校验
+     * @see https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/login/auth.code2Session.html
+     * @param code
+     * @returns
+     */
+    codeToSession(code: string): Promise<Record<string, any>>;
+    /**
+     * 数据解密
+     * @see https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/signature.html#加密数据解密算法
+     * @param sessionKey
+     * @param iv
+     * @param ciphertext
+     * @returns
+     */
+    decryptSession(sessionKey: string, iv: string, ciphertext: string): object;
+}
+export = Utils;

package/dist/MiniApp/Utils.js

@@ -0,0 +1,56 @@
+'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 };
+};
+const Decryptor_1 = __importDefault(require("./Decryptor"));
+class Utils {
+    constructor(app) {
+        this.app = null;
+        this.app = app;
+    }
+    /**
+     * 登录凭证校验
+     * @see https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/login/auth.code2Session.html
+     * @param code
+     * @returns
+     */
+    codeToSession(code) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let client = this.app.getHttpClient();
+            let response = yield (yield client.request('GET', '/sns/jscode2session', {
+                params: {
+                    appid: this.app.getAccount().getAppId(),
+                    secret: this.app.getAccount().getSecret(),
+                    js_code: code,
+                    grant_type: 'authorization_code',
+                }
+            })).toObject();
+            if (!response['openid']) {
+                throw new Error(`code2Session error: ${JSON.stringify(response)}`);
+            }
+            return response;
+        });
+    }
+    /**
+     * 数据解密
+     * @see https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/signature.html#加密数据解密算法
+     * @param sessionKey
+     * @param iv
+     * @param ciphertext
+     * @returns
+     */
+    decryptSession(sessionKey, iv, ciphertext) {
+        return Decryptor_1.default.decrypt(sessionKey, iv, ciphertext);
+    }
+}
+;
+module.exports = Utils;

package/dist/OfficialAccount/AccessToken.js

@@ -15,18 +15,19 @@ const HttpClient_1 = __importDefault(require("../Core/HttpClient/HttpClient"));
 const FileCache_1 = __importDefault(require("../Core/Cache/FileCache"));
 class AccessToken {
     constructor(appId, secret, key = null, cache = null, httpClient = null) {
-        this.appId = null;
-        this.secret = null;
-        this.key = null;
-        this.cache = null;
-        this.httpClient = null;
         this.appId = appId;
         this.secret = secret;
         this.key = key;
-        this.cache = cache || new FileCache_1.default();
-        this.httpClient = httpClient || HttpClient_1.default.create({
-            baseURL: 'https://api.weixin.qq.com/',
-        });
+        this.cache = cache;
+        this.httpClient = httpClient;
+        if (!this.cache) {
+            this.cache = new FileCache_1.default();
+        }
+        if (!this.httpClient) {
+            this.httpClient = HttpClient_1.default.create({
+                baseURL: 'https://api.weixin.qq.com/',
+            });
+        }
     }
     /**
      * 获取access_token的缓存名称

package/dist/OfficialAccount/Account.js

@@ -1,10 +1,6 @@
 'use strict';
 class Account {
     constructor(appId, secret, token = null, aesKey = null) {
-        this.appId = null;
-        this.secret = null;
-        this.token = null;
-        this.aesKey = null;
         this.appId = appId;
         this.secret = secret;
         this.token = token;

package/dist/OfficialAccount/Server.js

@@ -19,11 +19,9 @@ const DecryptXmlMessageMixin_1 = __importDefault(require("../Core/Mixins/Decrypt
 const ResponseXmlMessageMixin_1 = __importDefault(require("../Core/Mixins/ResponseXmlMessageMixin"));
 class Server {
     constructor(request = null, encryptor = null) {
-        this.request = null;
-        this.encryptor = null;
-        this.handlers = [];
         this.request = request;
         this.encryptor = encryptor;
+        this.handlers = [];
     }
     /**
      * 服务端消息处理

package/dist/OfficialAccount/Utils.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const merge_1 = __importDefault(require("merge"));
 class Utils {
     constructor(app) {
-        this.app = null;
         this.app = app;
     }
     buildJsSdkConfig(url, jsApiList = [], openTagList = [], debug = false) {

package/official_account.access_token.mock-access_token-appid.cache

@@ -1 +1 @@
-{"data":"mock-access_token","lifeTime":1650099715}
+{"data":"mock-access_token","lifeTime":1654698919}

package/official_account.jsapi_ticket.mock-ticket-appid.cache

@@ -1 +1 @@
-{"data":"mock-ticket","lifeTime":1650105415}
+{"data":"mock-ticket","lifeTime":1654704619}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {