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

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/Application.d.ts

@@ -14,6 +14,9 @@ import AccountInterface from './Contracts/AccountInterface';
 import ApplicationInterface from './Contracts/ApplicationInterface';
 import JsApiTicket from './JsApiTicket';
 import Utils from './Utils';
+/**
+ * 公众号应用
+ */
 declare class Application implements ApplicationInterface {
     constructor(config: ConfigInterface | OfficialAccountConfig);
     protected account: AccountInterface;

package/dist/OfficialAccount/Application.js

@@ -20,6 +20,9 @@ const Account_1 = __importDefault(require("./Account"));
 const JsApiTicket_1 = __importDefault(require("./JsApiTicket"));
 const Server_1 = __importDefault(require("./Server"));
 const Utils_2 = __importDefault(require("./Utils"));
+/**
+ * 公众号应用
+ */
 class Application {
     constructor(config) {
         this.account = null;
@@ -144,8 +147,8 @@ class Application {
         return new Utils_2.default(this);
     }
     createClient() {
-        let httpClient = this.getHttpClient();
-        return new AccessTokenAwareClient_1.default(httpClient, this.getAccessToken());
+        return (new AccessTokenAwareClient_1.default(this.getHttpClient(), this.getAccessToken()))
+            .setPresets(this.getConfig().all());
     }
     /**
      * 获取请求默认配置

package/dist/OfficialAccount/Server.d.ts

@@ -3,11 +3,8 @@ import Encryptor from '../Core/Encryptor';
 import ServerInterface from '../Core/Contracts/ServerInterface';
 import Response from '../Core/Http/Response';
 import Message from './Message';
-import HandlersMixin from '../Core/Mixins/HandlersMixin';
-import DecryptXmlMessageMixin from '../Core/Mixins/DecryptXmlMessageMixin';
 import { ServerEventType, ServerHandlerClosure, ServerMessageType } from '../Types/global';
-import ResponseXmlMessageMixin from '../Core/Mixins/ResponseXmlMessageMixin';
-declare class Server implements ServerInterface {
+declare class Server extends ServerInterface {
     protected request: ServerRequestInterface;
     protected encryptor: Encryptor;
     constructor(request?: ServerRequestInterface, encryptor?: Encryptor);
@@ -38,6 +35,4 @@ declare class Server implements ServerInterface {
     getRequestMessage(request?: ServerRequestInterface): Promise<Message>;
     protected decryptRequestMessage(query: Record<string, any>): ServerHandlerClosure;
 }
-interface Server extends HandlersMixin, DecryptXmlMessageMixin, ResponseXmlMessageMixin {
-}
 export = Server;

package/dist/OfficialAccount/Server.js

@@ -11,17 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+const ServerInterface_1 = __importDefault(require("../Core/Contracts/ServerInterface"));
 const Response_1 = __importDefault(require("../Core/Http/Response"));
 const Message_1 = __importDefault(require("./Message"));
-const HandlersMixin_1 = __importDefault(require("../Core/Mixins/HandlersMixin"));
-const Utils_1 = require("../Core/Support/Utils");
-const DecryptXmlMessageMixin_1 = __importDefault(require("../Core/Mixins/DecryptXmlMessageMixin"));
-const ResponseXmlMessageMixin_1 = __importDefault(require("../Core/Mixins/ResponseXmlMessageMixin"));
-class Server {
+class Server extends ServerInterface_1.default {
     constructor(request = null, encryptor = null) {
-        this.request = null;
-        this.encryptor = null;
-        this.handlers = [];
+        super();
         this.request = request;
         this.encryptor = encryptor;
     }
@@ -91,6 +86,4 @@ class Server {
     }
 }
 ;
-;
-(0, Utils_1.applyMixins)(Server, [HandlersMixin_1.default, DecryptXmlMessageMixin_1.default, ResponseXmlMessageMixin_1.default]);
 module.exports = Server;

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/dist/Types/global.d.ts

@@ -17,6 +17,21 @@ declare module 'axios' {
   }
 }
 
+/**
+ * 微信接口响应数据格式
+ */
+export declare interface WeixinResponse extends Record<string, any> {
+  /**
+   * 错误代码
+   */
+  errcode?: string,
+
+  /**
+   * 错误信息
+   */
+  errmsg?: string,
+}
+
 /**
  * 公众号网页授权相关配置
  */
@@ -54,10 +69,25 @@ export declare interface CacheFileConfig {
   ext: string
 }
 
+/**
+ * 基础配置
+ */
+export declare interface BaseConfig {
+  /**
+   * 网络请求相关配置
+   */
+  http?: AxiosRequestConfig;
+
+  /**
+   * 文件缓存相关配置
+   */
+  file_cache?: CacheFileConfig;
+}
+
 /**
  * 公众号配置
  */
-export declare interface OfficialAccountConfig {
+export declare interface OfficialAccountConfig extends BaseConfig {
   /**
    * 公众号 app_id
    */
@@ -82,22 +112,12 @@ export declare interface OfficialAccountConfig {
    * 网页授权相关配置
    */
   oauth?: OauthConfig;
-
-  /**
-   * 网络请求相关配置
-   */
-  http?: AxiosRequestConfig;
-
-  /**
-   * 文件缓存相关配置
-   */
-  file_cache?: CacheFileConfig;
 }
 
 /**
  * 小程序配置
  */
-export declare interface MiniAppConfig {
+export declare interface MiniAppConfig extends BaseConfig {
   /**
    * 小程序 app_id
    */
@@ -117,22 +137,12 @@ export declare interface MiniAppConfig {
    * 服务端消息加解密密钥 aes_key
    */
   aes_key?: string;
-
-  /**
-   * 网络请求相关配置
-   */
-  http?: AxiosRequestConfig;
-
-  /**
-   * 文件缓存相关配置
-   */
-  file_cache?: CacheFileConfig;
 }
 
 /**
  * 微信支付配置
  */
-export declare interface PayConfig {
+export declare interface PayConfig extends BaseConfig {
   /**
    * 商户号
    */
@@ -152,22 +162,12 @@ export declare interface PayConfig {
    * v2 API密钥
    */
   v2_secret_key?: string;
-
-  /**
-   * 网络请求相关配置
-   */
-  http?: AxiosRequestConfig;
-
-  /**
-   * 文件缓存相关配置
-   */
-  file_cache?: CacheFileConfig;
 }
 
 /**
  * 开发平台配置
  */
-export declare interface OpenPlatformConfig {
+export declare interface OpenPlatformConfig extends BaseConfig {
   /**
    * 开发平台 app_id
    */
@@ -187,22 +187,12 @@ export declare interface OpenPlatformConfig {
    * 开发平台服务端消息加解密密钥 aes_key
    */
   aes_key?: string;
-
-  /**
-   * 网络请求相关配置
-   */
-  http?: AxiosRequestConfig;
-
-  /**
-   * 文件缓存相关配置
-   */
-  file_cache?: CacheFileConfig;
 }
 
 /**
  * 企业微信配置
  */
-export declare interface WorkConfig {
+export declare interface WorkConfig extends BaseConfig {
   /**
    * 企业微信 corp_id
    */
@@ -222,22 +212,12 @@ export declare interface WorkConfig {
    * 企业微信服务端消息加解密密钥 aes_key
    */
   aes_key?: string;
-
-  /**
-   * 网络请求相关配置
-   */
-  http?: AxiosRequestConfig;
-
-  /**
-   * 文件缓存相关配置
-   */
-  file_cache?: CacheFileConfig;
 }
 
 /**
  * 企业微信开放平台配置
  */
-export declare interface OpenWorkConfig {
+export declare interface OpenWorkConfig extends BaseConfig {
   /**
    * 企业微信 corp_id
    */
@@ -257,16 +237,6 @@ export declare interface OpenWorkConfig {
    * 企业微信服务端消息加解密密钥 aes_key
    */
   aes_key?: string;
-
-  /**
-   * 网络请求相关配置
-   */
-  http?: AxiosRequestConfig;
-
-  /**
-   * 文件缓存相关配置
-   */
-  file_cache?: CacheFileConfig;
 }
 
 /**
@@ -341,3 +311,12 @@ export declare type PaymentRefundedHandler = (message: Message, reqInfo: object,
  * @param alert 业务错误处理函数
  */
 export declare type PaymentScannedHandler = (message: Message, fail: PaymentFailHandler, alert: PaymentAlertHandler) => void;
+
+/**
+ * 日志处理方法
+ * @param type before：请求前，after：请求后
+ * @param options 请求选项
+ * @param usedTime 请求耗时，单位ms，仅在 type 为 after 时返回
+ * @param response 响应对象，仅在 type 为 after 时返回
+ */
+export declare type LogHandler = (type: 'before' | 'after', options: AxiosRequestConfig, usedTime?: number, response?: AxiosResponse) => void | Promise<void>;

package/dist/index.d.ts

@@ -0,0 +1,14 @@
+import { OfficialAccountConfig, MiniAppConfig, LogHandler, ServerEventType, ServerHandlerClosure } from './Types/global';
+import OfficialAccount from './OfficialAccount/Application';
+import MiniApp from './MiniApp/Application';
+import CacheInterface from './Core/Contracts/CacheInterface';
+import ServerRequest from './Core/Http/ServerRequest';
+import Message from './Core/Message';
+import FormData from 'form-data';
+export { OfficialAccount, OfficialAccountConfig, MiniApp, MiniAppConfig, CacheInterface, ServerRequest, LogHandler, ServerEventType, ServerHandlerClosure, Message, 
+/**
+ * 表单对象
+ * @see https://github.com/axios/axios#formdata
+ * @see https://github.com/form-data/form-data#readme
+ */
+FormData, };

package/dist/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormData = exports.Message = exports.ServerRequest = exports.CacheInterface = exports.MiniApp = exports.OfficialAccount = void 0;
+const Application_1 = __importDefault(require("./OfficialAccount/Application"));
+exports.OfficialAccount = Application_1.default;
+const Application_2 = __importDefault(require("./MiniApp/Application"));
+exports.MiniApp = Application_2.default;
+const CacheInterface_1 = __importDefault(require("./Core/Contracts/CacheInterface"));
+exports.CacheInterface = CacheInterface_1.default;
+const ServerRequest_1 = __importDefault(require("./Core/Http/ServerRequest"));
+exports.ServerRequest = ServerRequest_1.default;
+const Message_1 = __importDefault(require("./Core/Message"));
+exports.Message = Message_1.default;
+const form_data_1 = __importDefault(require("form-data"));
+exports.FormData = form_data_1.default;

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

@@ -0,0 +1 @@
+{"data":"mock-access_token","lifeTime":1655828727}

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

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

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

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