node-easywechat 2.10.1 → 3.0.0-alpha.2

package/dist/Core/{PKCS.js → Support/PKCS.js}

@@ -1,6 +1,4 @@
 'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PKCS7 = void 0;
 class PKCS7 {
     /**
      * 对需要加密的明文进行填充补位
@@ -41,4 +39,4 @@ class PKCS7 {
         return buf.slice(0, buf.length - pad);
     }
 }
-exports.PKCS7 = PKCS7;
+module.exports = PKCS7;

package/dist/Core/{RSA.d.ts → Support/RSA.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import crypto from 'crypto';
-export default class RSA {
+declare class RSA {
     protected publicKey: crypto.KeyObject;
     /**
      * 设置公钥
@@ -57,3 +57,4 @@ export default class RSA {
      */
     verify(signature: string, data: string, hashType: string, encoding?: BufferEncoding, padding?: number): boolean;
 }
+export = RSA;

package/dist/Core/{RSA.js → Support/RSA.js}

@@ -2,7 +2,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
 class RSA {
     constructor() {
@@ -95,5 +94,5 @@ class RSA {
         return !!isVerified;
     }
 }
-exports.default = RSA;
 ;
+module.exports = RSA;

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

@@ -0,0 +1,89 @@
+import Stream from 'stream';
+export declare const createHash: (str: string, type?: string) => any;
+export declare const createHmac: (str: string, key: string, type?: string) => any;
+/**
+ * 计算文件的 md5 值
+ * @param path 文件路径或文件可读流
+ */
+export declare const md5File: (path: string | Stream.Readable) => Promise<string>;
+export declare const getTimestamp: (datetime?: string) => number;
+export declare const buildQueryString: (data: Record<string, any>, options?: Record<string, any>) => string;
+export declare const parseQueryString: (data: string, options?: Record<string, any>) => Record<string, any>;
+export declare const randomString: (len?: number) => string;
+export declare const makeSignature: (params: object, key?: string, type?: string) => string;
+export declare const isString: (data: any) => boolean;
+export declare const isArray: (data: any) => boolean;
+export declare const isNumber: (data: any) => boolean;
+export declare const isObject: (data: any) => boolean;
+export declare const isFunction: (data: any) => boolean;
+export declare const isIpv4: (ip: string) => boolean;
+export declare const isIpv6: (ip: string) => boolean;
+export declare const isIp: (ip: string) => boolean;
+export declare const inArray: (data: any, arr: any, strict?: boolean) => boolean;
+/**
+ * 类应用混入方法
+ * @param derivedCtor 目标类
+ * @param constructors 混入类列表
+ */
+export declare const applyMixins: (derivedCtor: any, constructors: any[]) => void;
+/**
+ * 去除字符串左右的符号
+ * @param str 原字符串
+ * @param chars 要去除的符号，正则字符串，默认空白符
+ */
+export declare const trim: (str: string, chars?: string) => string;
+/**
+ * 去除字符串左边的符号
+ * @param str 原字符串
+ * @param chars 要去除的符号，正则字符串，默认空白符
+ */
+export declare const ltrim: (str: string, chars?: string) => string;
+/**
+ * 去除字符串右边的符号
+ * @param str 原字符串
+ * @param chars 要去除的符号，正则字符串，默认空白符
+ */
+export declare const rtrim: (str: string, chars?: string) => string;
+/**
+ * 将单词首字母转成大写，'hello word' => 'Hello World'
+ * @param str
+ * @returns
+ */
+export declare const strUcwords: (str: string) => string;
+/**
+ * 将单词首字母转成小写，'Hello World' => 'hello word'
+ * @param str
+ * @returns
+ */
+export declare const strLcwords: (str: string) => string;
+/**
+ * 驼峰（首字母大写），'hello word' => 'HelloWorld'
+ * @param value
+ * @returns
+ */
+export declare const strStudly: (value: string) => string;
+/**
+ * 驼峰（首字母小写），'hello word' => 'helloWorld'
+ * @param value
+ * @returns
+ */
+export declare const strCamel: (value: string) => string;
+/**
+ * 如果只有一个同名、同级节点，则不当作数组
+ * @param obj
+ * @returns
+ */
+export declare const singleItem: (obj: any) => any;
+/**
+ * 解析xml
+ * @param xml
+ * @returns
+ */
+export declare const parseXml: (xml: string) => Promise<Record<string, any>>;
+/**
+ * 构建xml
+ * @param data 对象
+ * @param rootName 根节点名，默认：'xml'
+ * @returns
+ */
+export declare const buildXml: (data: Record<string, any>, rootName?: string) => string;

package/dist/Core/{Utils.js → Support/Utils.js}

@@ -12,41 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildXml = exports.parseXml = exports.singleItem = exports.strCamel = exports.strStudly = exports.strLcwords = exports.strUcwords = exports.applyMixins = exports.inArray = exports.isIp = exports.isIpv6 = exports.isIpv4 = exports.isFunction = exports.isObject = exports.isNumber = exports.isArray = exports.isString = exports.makeSignature = exports.randomString = exports.parseQueryString = exports.buildQueryString = exports.getTimestamp = exports.md5File = exports.createHmac = exports.createHash = exports.merge = void 0;
+exports.buildXml = exports.parseXml = exports.singleItem = exports.strCamel = exports.strStudly = exports.strLcwords = exports.strUcwords = exports.rtrim = exports.ltrim = exports.trim = exports.applyMixins = exports.inArray = exports.isIp = exports.isIpv6 = exports.isIpv4 = exports.isFunction = exports.isObject = exports.isNumber = exports.isArray = exports.isString = exports.makeSignature = exports.randomString = exports.parseQueryString = exports.buildQueryString = exports.getTimestamp = exports.md5File = exports.createHmac = exports.createHash = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const qs_1 = __importDefault(require("qs"));
 const xml2js_1 = __importDefault(require("xml2js"));
 const stream_1 = __importDefault(require("stream"));
 const fs_1 = __importDefault(require("fs"));
-const merge = (target, source) => {
-    if ((0, exports.isObject)(source)) {
-        if (source.constructor !== Object) {
-            target = source;
-        }
-        else {
-            if (!target || !(0, exports.isObject)(target)) {
-                target = {};
-            }
-            Object.keys(source).map((k) => {
-                if (!target[k]) {
-                    target[k] = null;
-                }
-                target[k] = (0, exports.merge)(target[k], source[k]);
-            });
-        }
-    }
-    else if ((0, exports.isArray)(source)) {
-        if (!target || !(0, exports.isArray)(target)) {
-            target = [];
-        }
-        target = target.concat(target, source);
-    }
-    else {
-        target = source;
-    }
-    return target;
-};
-exports.merge = merge;
 const createHash = function (str, type = 'sha1') {
     return crypto_1.default.createHash(type).update(str).digest('hex');
 };
@@ -192,39 +163,100 @@ const inArray = function (data, arr, strict = false) {
     }
 };
 exports.inArray = inArray;
-const applyMixins = function (derivedCtor, baseCtors) {
-    baseCtors.forEach(baseCtor => {
-        Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
-            derivedCtor.prototype[name] = baseCtor.prototype[name];
+/**
+ * 类应用混入方法
+ * @param derivedCtor 目标类
+ * @param constructors 混入类列表
+ */
+const applyMixins = function (derivedCtor, constructors) {
+    constructors.forEach((baseCtor) => {
+        Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
+            // 构造函数或目标类已有的方法，则以目标类的为准
+            if (name === 'constructor' || typeof derivedCtor.prototype[name] !== 'undefined')
+                return;
+            Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
         });
     });
 };
 exports.applyMixins = applyMixins;
-// 将单词首字母转成大写，'hello word' => 'Hello World'
+/**
+ * 去除字符串左右的符号
+ * @param str 原字符串
+ * @param chars 要去除的符号，正则字符串，默认空白符
+ */
+const trim = (str, chars = '\\s+') => {
+    if (!str || !(0, exports.isString)(str))
+        return '';
+    return str.replace(new RegExp('^' + chars + '|' + chars + '$', 'gm'), '');
+};
+exports.trim = trim;
+/**
+ * 去除字符串左边的符号
+ * @param str 原字符串
+ * @param chars 要去除的符号，正则字符串，默认空白符
+ */
+const ltrim = (str, chars = '\\s+') => {
+    if (!str || !(0, exports.isString)(str))
+        return '';
+    return str.replace(new RegExp('^' + chars, 'gm'), '');
+};
+exports.ltrim = ltrim;
+/**
+ * 去除字符串右边的符号
+ * @param str 原字符串
+ * @param chars 要去除的符号，正则字符串，默认空白符
+ */
+const rtrim = (str, chars = '\\s+') => {
+    if (!str || !(0, exports.isString)(str))
+        return '';
+    return str.replace(new RegExp(chars + '$', 'gm'), '');
+};
+exports.rtrim = rtrim;
+/**
+ * 将单词首字母转成大写，'hello word' => 'Hello World'
+ * @param str
+ * @returns
+ */
 const strUcwords = function (str) {
     return str.replace(/\b[a-z]/gi, function (letter) {
         return letter.toUpperCase();
     });
 };
 exports.strUcwords = strUcwords;
-// 将单词首字母转成小写，'Hello World' => 'hello word'
+/**
+ * 将单词首字母转成小写，'Hello World' => 'hello word'
+ * @param str
+ * @returns
+ */
 const strLcwords = function (str) {
     return str.replace(/\b[a-z]/gi, function (letter) {
         return letter.toLowerCase();
     });
 };
 exports.strLcwords = strLcwords;
-// 驼峰（首字母大写），'hello word' => 'HelloWorld'
+/**
+ * 驼峰（首字母大写），'hello word' => 'HelloWorld'
+ * @param value
+ * @returns
+ */
 const strStudly = function (value) {
     return (0, exports.strUcwords)(value.replace(/[\-|\_]/gi, ' ')).replace(/\s/gi, '');
 };
 exports.strStudly = strStudly;
-// 驼峰（首字母小写），'hello word' => 'helloWorld'
+/**
+ * 驼峰（首字母小写），'hello word' => 'helloWorld'
+ * @param value
+ * @returns
+ */
 const strCamel = function (value) {
     return (0, exports.strLcwords)((0, exports.strStudly)(value));
 };
 exports.strCamel = strCamel;
-// 如果只有一个同名、同级节点，则不当作数组
+/**
+ * 如果只有一个同名、同级节点，则不当作数组
+ * @param obj
+ * @returns
+ */
 const singleItem = function (obj) {
     if (typeof obj == 'object') {
         if (typeof obj.length != 'undefined') {
@@ -245,6 +277,11 @@ const singleItem = function (obj) {
     return obj;
 };
 exports.singleItem = singleItem;
+/**
+ * 解析xml
+ * @param xml
+ * @returns
+ */
 const parseXml = function (xml) {
     return __awaiter(this, void 0, void 0, function* () {
         let res = yield xml2js_1.default.parseStringPromise(xml);
@@ -255,9 +292,16 @@ const parseXml = function (xml) {
     });
 };
 exports.parseXml = parseXml;
+/**
+ * 构建xml
+ * @param data 对象
+ * @param rootName 根节点名，默认：'xml'
+ * @returns
+ */
 const buildXml = function (data, rootName = 'xml') {
     let XmlBuilder = new xml2js_1.default.Builder({
         cdata: true,
+        xmldec: null,
         rootName,
         renderOpts: {
             pretty: false,
@@ -265,6 +309,6 @@ const buildXml = function (data, rootName = 'xml') {
             newline: '',
         }
     });
-    return XmlBuilder.buildObject(data);
+    return XmlBuilder.buildObject(data).replace('<?xml version="1.0"?>', '');
 };
 exports.buildXml = buildXml;

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;