node-easywechat 3.5.6 → 3.5.8

package/CHANGELOG.md

@@ -1,6 +1,25 @@
 # CHANGELOG
 
 
+## v3.5.8 (2023-12-18)
+
+- Feat: thirdpartyCode2Session方法重命名为code2Session (#54)
+- Feat: 新增将请求响应类转换为标准http响应类的方法toHttpResponse
+
+- Fix: 修复验证器类型错误 (#58)
+- Fix: 修复验证器类型错误的问题 (#56)
+- Fix: 修复ts类型错误
+
+## v3.5.7 (2023-12-18)
+
+- Feat: 企业微信工具类增加encrypt、decrypt加解密方法 (#58)
+- Feat: 微信支付增加验证器api (#56)
+- Feat: 开放平台新增代理小程序登录接口thirdpartyCode2Session （#54）
+- Feat: 各模块增加自定义工具类的API
+
+- Fix: 修复http相关配置项无效的问题 (#59)
+- Fix: 升级ts，并修复ts类型错误 (#50)
+
 ## v3.5.6 (2023-12-17)
 
 - Fix: 修复获取代理公众号或小程序实例时，未设置配置项导致

package/dist/Core/HttpClient/HttpClient.js

@@ -99,6 +99,10 @@ class HttpClient {
             if (options.data && options.data instanceof form_data_1.default) {
                 options.headers = Object.assign(Object.assign({}, (yield 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') {
                 yield this.logger('before', options);

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

@@ -1,6 +1,7 @@
 import { AxiosResponse } from "axios";
 import { HttpClientFailureJudgeClosure, WeixinResponse } from "../../Types/global";
 import HttpClientResponseInterface from "./Contracts/HttpClientResponseInterface";
+import Response from "../Http/Response";
 declare class HttpClientResponse implements HttpClientResponseInterface {
     protected response: AxiosResponse;
     protected failureJudge: HttpClientFailureJudgeClosure;
@@ -89,5 +90,9 @@ declare class HttpClientResponse implements HttpClientResponseInterface {
     getInfo(type?: string): import("axios").InternalAxiosRequestConfig<any>;
     offsetExists(key: any): Promise<boolean>;
     offsetGet(key: any): Promise<any>;
+    /**
+     * 转换为标准的 http 响应类
+     */
+    toHttpResponse(): Response;
 }
 export = HttpClientResponse;

package/dist/Core/HttpClient/HttpClientResponse.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const fs_1 = __importDefault(require("fs"));
 const Utils_1 = require("../Support/Utils");
+const Response_1 = __importDefault(require("../Http/Response"));
 class HttpClientResponse {
     constructor(response, failureJudge = null, throwError = false) {
         this.response = response;
@@ -241,5 +242,11 @@ class HttpClientResponse {
             return (yield this.toObject())[key] || null;
         });
     }
+    /**
+     * 转换为标准的 http 响应类
+     */
+    toHttpResponse() {
+        return new Response_1.default(this.response.status, this.getHeaders(), this.toString());
+    }
 }
 module.exports = HttpClientResponse;

package/dist/Core/Mixins/HttpClientMixin.d.ts

@@ -13,10 +13,10 @@ declare class HttpClientMixin {
      */
     setHttpClient(httpClient: HttpClientInterface): this;
     /**
-     * 创建请求客户端实例
+     * 创建默认请求客户端实例
      * @returns
      */
-    protected createHttpClient(): HttpClientInterface;
+    protected createDefaultHttpClient(): HttpClientInterface;
     /**
      * 获取请求默认配置
      * @returns

package/dist/Core/Mixins/HttpClientMixin.js

@@ -13,7 +13,12 @@ class HttpClientMixin {
      */
     getHttpClient() {
         if (!this.httpClient) {
-            this.httpClient = this.createHttpClient();
+            if (typeof this['createHttpClient'] === 'function') {
+                this.httpClient = this['createHttpClient']();
+            }
+            else {
+                this.httpClient = this.createDefaultHttpClient();
+            }
         }
         return this.httpClient;
     }
@@ -27,10 +32,10 @@ class HttpClientMixin {
         return this;
     }
     /**
-     * 创建请求客户端实例
+     * 创建默认请求客户端实例
      * @returns
      */
-    createHttpClient() {
+    createDefaultHttpClient() {
         return HttpClient_1.default.create(this.getHttpClientDefaultOptions());
     }
     /**

package/dist/Core/Support/Utils.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import Crypto from 'crypto';
 import Stream from 'stream';
 export declare const createHash: (str: Crypto.BinaryLike, type?: string, target?: Crypto.BinaryToTextEncoding) => any;

package/dist/MiniApp/Application.d.ts

@@ -21,6 +21,7 @@ declare class Application implements ApplicationInterface {
     protected encryptor: Encryptor;
     protected server: Server;
     protected accessToken: AccessTokenInterface;
+    protected utils: Utils;
     getAccount(): AccountInterface;
     /**
      * 设置当前账户实例
@@ -49,6 +50,11 @@ declare class Application implements ApplicationInterface {
      * @returns
      */
     setAccessToken(accessToken: AccessTokenInterface): this;
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils: Utils): void;
     getUtils(): Utils;
     createClient(): AccessTokenAwareClient;
     /**

package/dist/MiniApp/Application.js

@@ -26,6 +26,7 @@ class Application {
         this.encryptor = null;
         this.server = null;
         this.accessToken = null;
+        this.utils = null;
         if (config instanceof ConfigInterface_1.default) {
             this.setConfig(config);
         }
@@ -106,8 +107,18 @@ class Application {
         this.accessToken = accessToken;
         return this;
     }
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils) {
+        this.utils = utils;
+    }
     getUtils() {
-        return new Utils_2.default(this);
+        if (!this.utils) {
+            this.utils = new Utils_2.default(this);
+        }
+        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) || (response.toObject()['error'] !== null && response.toObject()['error'] !== undefined); }, this.getConfig().get('http.throw', true)))

package/dist/OfficialAccount/Application.d.ts

@@ -25,6 +25,7 @@ declare class Application implements ApplicationInterface {
     protected accessToken: AccessTokenInterface;
     protected oauthFactory: OfficialAccountOAuthFactory;
     protected ticket: JsApiTicket;
+    protected utils: Utils;
     getAccount(): AccountInterface;
     /**
      * 设置当前账户实例
@@ -62,6 +63,11 @@ declare class Application implements ApplicationInterface {
      * @returns
      */
     setTicket(ticket: JsApiTicket): this;
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils: Utils): void;
     getUtils(): Utils;
     createClient(): AccessTokenAwareClient;
     /**

package/dist/OfficialAccount/Application.js

@@ -31,6 +31,7 @@ class Application {
         this.accessToken = null;
         this.oauthFactory = null;
         this.ticket = null;
+        this.utils = null;
         if (config instanceof ConfigInterface_1.default) {
             this.setConfig(config);
         }
@@ -141,8 +142,18 @@ class Application {
         this.ticket = ticket;
         return this;
     }
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils) {
+        this.utils = utils;
+    }
     getUtils() {
-        return new Utils_2.default(this);
+        if (!this.utils) {
+            this.utils = new Utils_2.default(this);
+        }
+        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)))

package/dist/OpenPlatform/Application.d.ts

@@ -8,7 +8,7 @@ import ConfigMixin from '../Core/Mixins/ConfigMixin';
 import HttpClientMixin from '../Core/Mixins/HttpClientMixin';
 import ServerRequestMixin from '../Core/Mixins/ServerRequestMixin';
 import OfficialAccountApplication from '../OfficialAccount/Application';
-import MiniAppApplication from '../MiniApp/Application';
+import MiniAppApplication from './Authorizer/MiniApp/Application';
 import { OpenPlatformConfig, OfficialAccountConfig, OfficialAccountOAuthFactory, MiniAppConfig } from '../Types/global';
 import AccountInterface from './Contracts/AccountInterface';
 import ApplicationInterface from './Contracts/ApplicationInterface';

package/dist/OpenPlatform/Application.js

@@ -25,7 +25,7 @@ const HttpClientMixin_1 = __importDefault(require("../Core/Mixins/HttpClientMixi
 const ServerRequestMixin_1 = __importDefault(require("../Core/Mixins/ServerRequestMixin"));
 const Utils_1 = require("../Core/Support/Utils");
 const Application_1 = __importDefault(require("../OfficialAccount/Application"));
-const Application_2 = __importDefault(require("../MiniApp/Application"));
+const Application_2 = __importDefault(require("./Authorizer/MiniApp/Application"));
 const Account_1 = __importDefault(require("./Account"));
 const Server_1 = __importDefault(require("./Server"));
 const VerifyTicket_1 = __importDefault(require("./VerifyTicket"));
@@ -350,7 +350,7 @@ class Application {
             config.set('aes_key', this.config.get('aes_key'));
             config.set('http', this.config.get('http'));
         }
-        let app = new Application_2.default(config);
+        const app = new Application_2.default(config, this);
         app.setAccessToken(authorizerAccessToken);
         app.setEncryptor(this.getEncryptor());
         return app;

package/dist/OpenPlatform/Authorizer/MiniApp/Application.d.ts

@@ -0,0 +1,14 @@
+import ConfigInterface from '../../../Core/Contracts/ConfigInterface';
+import BaseApplication from '../../../MiniApp/Application';
+import ComponentApplication from '../../Application';
+import { MiniAppConfig } from '../../../Types/global';
+import Utils from './Utils';
+declare class Application extends BaseApplication {
+    protected componentApp: ComponentApplication;
+    protected utils: Utils;
+    constructor(config: ConfigInterface | MiniAppConfig, componentApp: ComponentApplication);
+    getComponentApp(): ComponentApplication;
+    setUtils(utils: Utils): void;
+    getUtils(): Utils;
+}
+export = Application;

package/dist/OpenPlatform/Authorizer/MiniApp/Application.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const Application_1 = __importDefault(require("../../../MiniApp/Application"));
+const Utils_1 = __importDefault(require("./Utils"));
+class Application extends Application_1.default {
+    constructor(config, componentApp) {
+        super(config);
+        this.componentApp = null;
+        this.utils = null;
+        this.componentApp = componentApp;
+    }
+    getComponentApp() {
+        return this.componentApp;
+    }
+    setUtils(utils) {
+        this.utils = utils;
+    }
+    getUtils() {
+        if (!this.utils) {
+            this.utils = new Utils_1.default(this);
+        }
+        return this.utils;
+    }
+}
+;
+module.exports = Application;

package/dist/OpenPlatform/Authorizer/MiniApp/Utils.d.ts

@@ -0,0 +1,14 @@
+import Application from '../../Authorizer/MiniApp/Application';
+import BaseUtils from '../../../MiniApp/Utils';
+declare class Utils extends BaseUtils {
+    protected app: Application;
+    constructor(app: Application);
+    /**
+     * 代理小程序登录
+     * @see https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/login/thirdpartyCode2Session.html
+     * @param code
+     * @returns
+     */
+    code2Session(code: string): Promise<import("../../../Types/global").WeixinResponse>;
+}
+export = Utils;

package/dist/OpenPlatform/Authorizer/MiniApp/Utils.js

@@ -0,0 +1,48 @@
+"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 Utils_1 = __importDefault(require("../../../MiniApp/Utils"));
+class Utils extends Utils_1.default {
+    constructor(app) {
+        super(app);
+        this.app = null;
+        this.app = app;
+    }
+    /**
+     * 代理小程序登录
+     * @see https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/login/thirdpartyCode2Session.html
+     * @param code
+     * @returns
+     */
+    code2Session(code) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let client = this.app.getHttpClient();
+            let response = yield client.request('GET', '/sns/component/jscode2session', {
+                params: {
+                    component_access_token: yield this.app.getComponentApp().getAccessToken().getToken(),
+                    component_appid: this.app.getComponentApp().getAccount().getAppId(),
+                    appid: this.app.getAccount().getAppId(),
+                    js_code: code,
+                    grant_type: 'authorization_code',
+                }
+            });
+            let data = response.toObject();
+            if (!data['openid']) {
+                throw new Error(`code2Session error: ${JSON.stringify(data)}`);
+            }
+            return data;
+        });
+    }
+}
+;
+module.exports = Utils;

package/dist/Pay/Application.d.ts

@@ -10,6 +10,7 @@ import ApplicationInterface from './Contracts/ApplicationInterface';
 import Server from './Server';
 import Utils from './Utils';
 import Client from './Client';
+import Validator from './Validator';
 /**
  * 微信支付应用
  */
@@ -19,6 +20,8 @@ declare class Application implements ApplicationInterface {
     protected encryptor: Encryptor;
     protected server: Server;
     protected client: Client;
+    protected utils: Utils;
+    protected validator: Validator;
     getMerchant(): MerchantInterface;
     /**
      * 设置当前账户实例
@@ -33,7 +36,18 @@ declare class Application implements ApplicationInterface {
      * @returns
      */
     setServer(server: Server): this;
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils: Utils): void;
     getUtils(): Utils;
+    /**
+     * 设置验证器实例
+     * @param validator
+     */
+    setValidator(validator: Validator): void;
+    getValidator(): Validator;
     getClient(): Client;
     /**
      * 设置客户端

package/dist/Pay/Application.js

@@ -14,6 +14,7 @@ const Server_1 = __importDefault(require("./Server"));
 const Utils_2 = __importDefault(require("./Utils"));
 const Config_1 = __importDefault(require("../OfficialAccount/Config"));
 const Client_1 = __importDefault(require("./Client"));
+const Validator_1 = __importDefault(require("./Validator"));
 /**
  * 微信支付应用
  */
@@ -22,6 +23,9 @@ class Application {
         this.merchant = null;
         this.encryptor = null;
         this.server = null;
+        this.client = null;
+        this.utils = null;
+        this.validator = null;
         if (config instanceof ConfigInterface_1.default) {
             this.setConfig(config);
         }
@@ -63,8 +67,31 @@ class Application {
         this.server = server;
         return this;
     }
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils) {
+        this.utils = utils;
+    }
     getUtils() {
-        return new Utils_2.default(this.getMerchant());
+        if (!this.utils) {
+            this.utils = new Utils_2.default(this.getMerchant());
+        }
+        return this.utils;
+    }
+    /**
+     * 设置验证器实例
+     * @param validator
+     */
+    setValidator(validator) {
+        this.validator = validator;
+    }
+    getValidator() {
+        if (!this.validator) {
+            this.validator = new Validator_1.default(this.getMerchant());
+        }
+        return this.validator;
     }
     getClient() {
         if (!this.client) {

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

@@ -5,6 +5,7 @@ import ServerInterface from "../../Core/Contracts/ServerInterface";
 import ServerRequestInterface from "../../Core/Http/Contracts/ServerRequestInterface";
 import MerchantInterface from "./MerchantInterface";
 import Utils from "../Utils";
+import ValidatorInterface from "./ValidatorInterface";
 declare abstract class ApplicationInterface {
     /**
      * 获取当前账户实例
@@ -46,5 +47,10 @@ declare abstract class ApplicationInterface {
      * @returns
      */
     getUtils(): Utils;
+    /**
+     * 获取验证器实例
+     * @returns
+     */
+    getValidator(): ValidatorInterface;
 }
 export = ApplicationInterface;

package/dist/Pay/Contracts/ApplicationInterface.js

@@ -40,6 +40,11 @@ class ApplicationInterface {
      * @returns
      */
     getUtils() { return null; }
+    /**
+     * 获取验证器实例
+     * @returns
+     */
+    getValidator() { return null; }
 }
 ;
 module.exports = ApplicationInterface;

package/dist/Pay/Contracts/ValidatorInterface.d.ts

@@ -0,0 +1,8 @@
+import Request from "../../Core/Http/Request";
+declare abstract class ValidatorInterface {
+    /**
+     * 验证请求是否正确
+     */
+    validate(request: Request): boolean;
+}
+export = ValidatorInterface;

package/dist/Pay/Contracts/ValidatorInterface.js

@@ -0,0 +1,9 @@
+'use strict';
+class ValidatorInterface {
+    /**
+     * 验证请求是否正确
+     */
+    validate(request) { return true; }
+}
+;
+module.exports = ValidatorInterface;

package/dist/Pay/Utils.d.ts

@@ -1,14 +1,29 @@
+/// <reference types="node" />
 import { PayAppConfig, PayBridgeConfig, PaySdkConfig } from '../Types/global';
 import MerchantInterface from './Contracts/MerchantInterface';
 declare class Utils {
     protected merchant: MerchantInterface;
     constructor(merchant: MerchantInterface);
+    /**
+     * 加密字符串
+     * @param plaintext 原文
+     * @param encoding 密文的编码格式，默认：base64
+     * @param hashType 哈希算法，默认：sha256
+     */
+    encrypt(plaintext: string, encoding?: BufferEncoding, hashType?: string): string;
+    /**
+     * 解密字符串
+     * @param ciphertext 密文
+     * @param encoding 密文的编码格式，默认：base64
+     * @param hashType 哈希算法，默认：sha256
+     */
+    decrypt(ciphertext: string, encoding?: BufferEncoding, hashType?: string): string;
     /**
      * 创建签名（V3），并返回签名字符串
      * @param params 参数集合
      * @returns
      */
-    protected createSignature(message: string): string;
+    createSignature(message: string): string;
     /**
      * 创建签名（V2），并返回签名字符串
      * @param params 参数集合

package/dist/Pay/Utils.js

@@ -8,6 +8,28 @@ class Utils {
     constructor(merchant) {
         this.merchant = merchant;
     }
+    /**
+     * 加密字符串
+     * @param plaintext 原文
+     * @param encoding 密文的编码格式，默认：base64
+     * @param hashType 哈希算法，默认：sha256
+     */
+    encrypt(plaintext, encoding = 'base64', hashType = 'sha256') {
+        let rsa = new RSA_1.default;
+        rsa.setPublicKey(this.merchant.getCertificate().toString());
+        return rsa.encrypt(plaintext, encoding, hashType);
+    }
+    /**
+     * 解密字符串
+     * @param ciphertext 密文
+     * @param encoding 密文的编码格式，默认：base64
+     * @param hashType 哈希算法，默认：sha256
+     */
+    decrypt(ciphertext, encoding = 'base64', hashType = 'sha256') {
+        let rsa = new RSA_1.default;
+        rsa.setPrivateKey(this.merchant.getPrivateKey().toString());
+        return rsa.decrypt(ciphertext, encoding, hashType);
+    }
     /**
      * 创建签名（V3），并返回签名字符串
      * @param params 参数集合
@@ -15,7 +37,6 @@ class Utils {
      */
     createSignature(message) {
         let rsa = new RSA_1.default;
-        rsa.setPublicKey(this.merchant.getCertificate().toString());
         rsa.setPrivateKey(this.merchant.getPrivateKey().toString());
         return rsa.sign(message);
     }

package/dist/Pay/Validator.d.ts

@@ -0,0 +1,14 @@
+import ValidatorInterface from "./Contracts/ValidatorInterface";
+import MessageInterface from "../Core/Http/Contracts/MessageInterface";
+import MerchantInterface from "./Contracts/MerchantInterface";
+declare class Validator implements ValidatorInterface {
+    protected merchant: MerchantInterface;
+    static MAX_ALLOWED_CLOCK_OFFSET: number;
+    static HEADER_TIMESTAMP: string;
+    static HEADER_NONCE: string;
+    static HEADER_SERIAL: string;
+    static HEADER_SIGNATURE: string;
+    constructor(merchant: MerchantInterface);
+    validate(request: MessageInterface): boolean;
+}
+export = Validator;

package/dist/Pay/Validator.js

@@ -0,0 +1,48 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const Utils_1 = require("../Core/Support/Utils");
+const RSA_1 = __importDefault(require("../Core/Support/RSA"));
+class Validator {
+    constructor(merchant) {
+        this.merchant = merchant;
+    }
+    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 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 = 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;
+    }
+}
+Validator.MAX_ALLOWED_CLOCK_OFFSET = 300;
+Validator.HEADER_TIMESTAMP = 'Wechatpay-Timestamp';
+Validator.HEADER_NONCE = 'Wechatpay-Nonce';
+Validator.HEADER_SERIAL = 'Wechatpay-Serial';
+Validator.HEADER_SIGNATURE = 'Wechatpay-Signature';
+module.exports = Validator;

package/dist/Types/common.d.ts

@@ -0,0 +1,2 @@
+
+type Recordable<T = any> = Record<string, T>;

package/dist/Types/global.d.ts

@@ -10,6 +10,7 @@ import OpenPlatformMessage from '../OpenPlatform/Message';
 import OpenWorkMessage from '../OpenWork/Message';
 import HttpClientResponseInterface from '../Core/HttpClient/Contracts/HttpClientResponseInterface';
 import { PublicKey } from "../Core/Support/PublicKey";
+import { IAxiosRetryConfig } from 'axios-retry';
 
 /**
  * 微信接口响应数据格式
@@ -75,7 +76,7 @@ export interface HttpConfig extends AxiosRequestConfig {
    * 是否抛出异常
    * @see https://github.com/softonic/axios-retry#options
    */
-  retry?: IAxiosRetry.IAxiosRetryConfig;
+  retry?: IAxiosRetryConfig;
   // retry?: {
   //   /**
   //    * 仅以下状态码重试
@@ -318,7 +319,7 @@ export type WorkOAuthFactory = (app: WorkApplicationInterface) => ProviderInterf
 export interface ServerHandlerItem {
   hash: string;
   handler: ServerHandlerClosure;
-};
+}
 
 /**
  * 服务端普通消息类型
@@ -335,7 +336,7 @@ export type ServerEventType = 'subscribe' | 'unsubscribe' | 'SCAN' | 'LOCATION'
  * @param message 微信信息
  * @param next 下一个消息处理器
  */
-export type ServerHandlerClosure<T = Message> = (message: T extends OfficialAccountMessage | PayMessage | WorkMessage | OpenPlatformMessage | OpenWorkMessage ? T : Message, next?: ServerHandler<T>) => any;
+export type ServerHandlerClosure<T = Message> = (message: T extends OfficialAccountMessage | PayMessage | WorkMessage | OpenPlatformMessage | OpenWorkMessage ? T : Message, next?: ServerHandlerClosure<T>) => any;
 
 /**
  * HttpClient错误判定回调

package/dist/Types/shim-axios.d.ts

@@ -4,14 +4,14 @@ import axios from 'axios';
 declare module 'axios' {
 
   interface AxiosInstance {
-    <T = Recordable, R = ApiResponse<T>>(config: AxiosRequestConfig): Promise<R>;
-    request<T = Recordable, R = ApiResponse<T>>(config: AxiosRequestConfig): Promise<R>;
-    get<T = Recordable, R = ApiResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
-    delete<T = Recordable, R = ApiResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
-    head<T = Recordable, R = ApiResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
-    post<T = Recordable, R = ApiResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
-    put<T = Recordable, R = ApiResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
-    patch<T = Recordable, R = ApiResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
+    <T = Recordable, R = AxiosResponse<T>>(config: AxiosRequestConfig): Promise<R>;
+    request<T = Recordable, R = AxiosResponse<T>>(config: AxiosRequestConfig): Promise<R>;
+    get<T = Recordable, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
+    delete<T = Recordable, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
+    head<T = Recordable, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>;
+    post<T = Recordable, R = AxiosResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
+    put<T = Recordable, R = AxiosResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
+    patch<T = Recordable, R = AxiosResponse<T>>(url: string, data?: Recordable, config?: AxiosRequestConfig): Promise<R>;
   }
 
   interface AxiosRequestConfig {

package/dist/Work/Application.d.ts

@@ -25,6 +25,7 @@ declare class Application implements ApplicationInterface {
     protected accessToken: AccessTokenInterface;
     protected oauthFactory: WorkOAuthFactory;
     protected ticket: JsApiTicket;
+    protected utils: Utils;
     getAccount(): AccountInterface;
     /**
      * 设置当前账户实例
@@ -62,6 +63,11 @@ declare class Application implements ApplicationInterface {
      * @returns
      */
     setTicket(ticket: JsApiTicket): this;
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils: Utils): void;
     getUtils(): Utils;
     createClient(): AccessTokenAwareClient;
     /**

package/dist/Work/Application.js

@@ -39,6 +39,7 @@ class Application {
         this.accessToken = null;
         this.oauthFactory = null;
         this.ticket = null;
+        this.utils = null;
         if (config instanceof ConfigInterface_1.default) {
             this.setConfig(config);
         }
@@ -157,8 +158,18 @@ class Application {
         this.ticket = ticket;
         return this;
     }
+    /**
+     * 设置工具实例
+     * @param utils
+     */
+    setUtils(utils) {
+        this.utils = utils;
+    }
     getUtils() {
-        return new Utils_2.default(this);
+        if (!this.utils) {
+            this.utils = new Utils_2.default(this);
+        }
+        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)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "3.5.6",
+  "version": "3.5.8",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
@@ -22,11 +22,11 @@
     "node": ">=15.6.0"
   },
   "devDependencies": {
-    "@types/node": "^17.0.23",
+    "@types/node": "^20.10.5",
     "axios-mock-adapter": "^1.22.0",
     "mocha": "^9.2.2",
     "package-release": "^1.0.3",
-    "typescript": "^4.6.3"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "axios": "^1.6.1",

package/tsconfig.json

@@ -58,7 +58,7 @@
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     /* Advanced Options */
-    "skipLibCheck": true, /* Skip type checking of declaration files. */
+    "skipLibCheck": false, /* Skip type checking of declaration files. */
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   },
   "include": [