node-easywechat 2.6.10 → 2.8.0

package/dist/Core/Http/Request.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const url_1 = __importDefault(require("url"));
 const Utils_1 = require("../Utils");
 const raw_body_1 = __importDefault(require("raw-body"));
-const xml2js_1 = __importDefault(require("xml2js"));
 class Request {
     constructor(req = null, content = null) {
         this._req = null;
@@ -42,17 +41,14 @@ class Request {
                     this._content = Buffer.from(JSON.stringify(content));
                     this._contentType = 'application/json';
                 }
-                else if (Utils_1.isString(content)) {
+                else if (typeof content === 'string') {
                     try {
                         this._post = JSON.parse(content);
                         this._contentType = 'application/json';
                     }
                     catch (e) {
                         if (content.substr(0, 1) === '<') {
-                            xml2js_1.default.parseString(content, (err, res) => {
-                                res = Utils_1.singleItem(res);
-                                if (res['xml'])
-                                    res = res['xml'];
+                            Utils_1.parseXml(content).then(res => {
                                 this._post = res;
                                 this._contentType = 'text/xml';
                             });

package/dist/Core/Messages/Message.js

@@ -1,10 +1,6 @@
 'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
-const xml2js_1 = __importDefault(require("xml2js"));
 const Utils_1 = require("../Utils");
 class Message {
     constructor(attributes = {}) {
@@ -21,21 +17,11 @@ class Message {
         this.type = type;
     }
     transformToXml(appends = {}, returnAsObject = false) {
-        let data = {
-            xml: Utils_1.merge(Utils_1.merge({ MsgType: this.getType() }, this.toXmlArray()), appends)
-        };
+        let data = Utils_1.merge(Utils_1.merge({ MsgType: this.getType() }, this.toXmlArray()), appends);
         if (returnAsObject) {
             return data;
         }
-        let XmlBuilder = new xml2js_1.default.Builder({
-            cdata: true,
-            renderOpts: {
-                pretty: false,
-                indent: '',
-                newline: '',
-            }
-        });
-        return XmlBuilder.buildObject(data);
+        return Utils_1.buildXml(data);
     }
     toXmlArray() {
         throw new Error(`Class "${this.constructor.name}" cannot support transform to XML message.`);

package/dist/Core/PKCS.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+export declare class PKCS7 {
+    /**
+     * 对需要加密的明文进行填充补位
+     * @param text 需要进行填充补位操作的明文
+     * @param blockSize 补位大小，默认：32
+     */
+    static pad(text: string | Buffer, blockSize?: number): Buffer;
+    /**
+     * 删除解密后明文的补位字符
+     * @param text 解密后的明文
+     * @param blockSize 补位大小，默认：32
+     */
+    static unpad(text: string | Buffer, blockSize?: number): Buffer;
+}

package/dist/Core/PKCS.js

@@ -0,0 +1,44 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PKCS7 = void 0;
+class PKCS7 {
+    /**
+     * 对需要加密的明文进行填充补位
+     * @param text 需要进行填充补位操作的明文
+     * @param blockSize 补位大小，默认：32
+     */
+    static pad(text, blockSize = 32) {
+        let buf = null;
+        if (Buffer.isBuffer(text)) {
+            buf = text;
+        }
+        else {
+            buf = Buffer.from(text);
+        }
+        //计算需要填充的位数
+        let amountToPad = blockSize - (buf.length % blockSize);
+        let result = Buffer.alloc(amountToPad);
+        result.fill(amountToPad);
+        return Buffer.concat([buf, result]);
+    }
+    /**
+     * 删除解密后明文的补位字符
+     * @param text 解密后的明文
+     * @param blockSize 补位大小，默认：32
+     */
+    static unpad(text, blockSize = 32) {
+        let buf = null;
+        if (Buffer.isBuffer(text)) {
+            buf = text;
+        }
+        else {
+            buf = Buffer.from(text);
+        }
+        var pad = buf[buf.length - 1];
+        if (pad < 1 || pad > blockSize) {
+            pad = 0;
+        }
+        return buf.slice(0, buf.length - pad);
+    }
+}
+exports.PKCS7 = PKCS7;

package/dist/Core/RSA.d.ts

@@ -0,0 +1,59 @@
+/// <reference types="node" />
+import crypto from 'crypto';
+export default class RSA {
+    protected publicKey: crypto.KeyObject;
+    /**
+     * 设置公钥
+     * @param key 公钥内容
+     */
+    setPublicKey(key: string | crypto.KeyObject | Buffer | crypto.PublicKeyInput): void;
+    protected privateKey: crypto.KeyObject;
+    /**
+     * 设置私钥
+     * @param key 私钥内容
+     */
+    setPrivateKey(key: string | Buffer | crypto.PrivateKeyInput): void;
+    /**
+     * 生成密钥对
+     * @param options 密钥选项
+     * @returns
+     */
+    static keyPair(options: crypto.RSAKeyPairKeyObjectOptions): crypto.KeyPairKeyObjectResult;
+    /**
+     * 加密
+     * @param plaintext 待加密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    encrypt(plaintext: string, encoding?: BufferEncoding, hashType?: string, padding?: number): string;
+    /**
+     * 解密
+     * @param ciphertext 待解密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    decrypt(ciphertext: string, encoding?: BufferEncoding, hashType?: string, padding?: number): string;
+    /**
+     * 计算签名
+     * @param data 待解密文本
+     * @param hashType 哈希方式，默认：'sha256'
+     * @param encoding 编码，默认：'base64'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
+     * @returns
+     */
+    sign(data: string, hashType?: string, encoding?: BufferEncoding, padding?: number): string;
+    /**
+     * 验证签名
+     * @param signature 待验证签名字符串
+     * @param data 待解密文本
+     * @param hashType 哈希方式，默认：'sha256'
+     * @param encoding 编码，默认：'base64'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
+     * @returns
+     */
+    verify(signature: string, data: string, hashType: string, encoding?: BufferEncoding, padding?: number): boolean;
+}

package/dist/Core/RSA.js

@@ -0,0 +1,99 @@
+'use strict';
+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() {
+        this.publicKey = null;
+        this.privateKey = null;
+    }
+    /**
+     * 设置公钥
+     * @param key 公钥内容
+     */
+    setPublicKey(key) {
+        this.publicKey = crypto_1.default.createPublicKey(key);
+    }
+    /**
+     * 设置私钥
+     * @param key 私钥内容
+     */
+    setPrivateKey(key) {
+        this.privateKey = crypto_1.default.createPrivateKey(key);
+    }
+    /**
+     * 生成密钥对
+     * @param options 密钥选项
+     * @returns
+     */
+    static keyPair(options) {
+        return crypto_1.default.generateKeyPairSync('rsa', options);
+    }
+    /**
+     * 加密
+     * @param plaintext 待加密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    encrypt(plaintext, encoding = 'base64', hashType = 'sha1', padding = crypto_1.default.constants.RSA_PKCS1_OAEP_PADDING) {
+        let encryptedData = crypto_1.default.publicEncrypt({
+            key: this.publicKey,
+            padding,
+            oaepHash: hashType,
+        }, Buffer.from(plaintext));
+        return encryptedData.toString(encoding);
+    }
+    /**
+     * 解密
+     * @param ciphertext 待解密文本
+     * @param encoding 编码，默认：'base64'
+     * @param hashType 哈希方式，默认：'sha1'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_OAEP_PADDING
+     * @returns
+     */
+    decrypt(ciphertext, encoding = 'base64', hashType = 'sha1', padding = crypto_1.default.constants.RSA_PKCS1_OAEP_PADDING) {
+        let decryptedData = crypto_1.default.privateDecrypt({
+            key: this.privateKey,
+            padding,
+            oaepHash: hashType,
+        }, Buffer.from(ciphertext, encoding));
+        return decryptedData.toString();
+    }
+    /**
+     * 计算签名
+     * @param data 待解密文本
+     * @param hashType 哈希方式，默认：'sha256'
+     * @param encoding 编码，默认：'base64'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
+     * @returns
+     */
+    sign(data, hashType = 'sha256', encoding = 'base64', padding = crypto_1.default.constants.RSA_PKCS1_PSS_PADDING) {
+        let signature = crypto_1.default.sign(hashType, Buffer.from(data), {
+            key: this.privateKey,
+            padding,
+        });
+        return signature.toString(encoding);
+    }
+    /**
+     * 验证签名
+     * @param signature 待验证签名字符串
+     * @param data 待解密文本
+     * @param hashType 哈希方式，默认：'sha256'
+     * @param encoding 编码，默认：'base64'
+     * @param padding 补位方式，默认：crypto.constants.RSA_PKCS1_PSS_PADDING
+     * @returns
+     */
+    verify(signature, data, hashType, encoding = 'base64', padding = crypto_1.default.constants.RSA_PKCS1_PSS_PADDING) {
+        let isVerified = crypto_1.default.verify(hashType, Buffer.from(data), {
+            key: this.publicKey,
+            padding,
+        }, Buffer.from(signature, encoding));
+        return !!isVerified;
+    }
+}
+exports.default = RSA;
+;

package/dist/Core/ServerGuard.d.ts

@@ -27,6 +27,7 @@ export default class ServerGuard {
      * @param condition EasyWechat.Messages.Message.xxx，用于处理特定消息类型，默认：* 表示全部
      */
     push(handler: ServerHandler, condition?: string): void;
+    setHandlers(handlers?: ServerHandlers): void;
     protected dispatch(event: string, payload: any): Promise<any>;
     protected notify(event: string, payload: any): Promise<any>;
     protected _callHandler(handler: ServerHandler, payload: any): Promise<any>;
@@ -49,6 +50,5 @@ export default class ServerGuard {
      */
     getMessage(): Promise<object>;
     protected parseMessage(content: string): Promise<any>;
-    protected parseXmlMessage(xml: any): Promise<any>;
     protected decryptMessage(message: object): Promise<string>;
 }

package/dist/Core/ServerGuard.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Response_1 = __importDefault(require("./Http/Response"));
 const Messages_1 = require("./Messages");
 const Utils_1 = require("./Utils");
-const xml2js_1 = __importDefault(require("xml2js"));
 const FinallResult_1 = __importDefault(require("./Decorators/FinallResult"));
 const TerminateResult_1 = __importDefault(require("./Decorators/TerminateResult"));
 class ServerGuard {
@@ -52,6 +51,9 @@ class ServerGuard {
         }
         this.handlers[condition].push(handler);
     }
+    setHandlers(handlers = {}) {
+        this.handlers = handlers;
+    }
     dispatch(event, payload) {
         return this.notify(event, payload);
     }
@@ -190,15 +192,7 @@ class ServerGuard {
             let res = message.transformToXml(prepends);
             if (yield this.isSafeMode()) {
                 this.app['log']('Messages safe mode is enabled.');
-                let XmlBuilder = new xml2js_1.default.Builder({
-                    cdata: true,
-                    renderOpts: {
-                        pretty: false,
-                        indent: '',
-                        newline: '',
-                    }
-                });
-                return XmlBuilder.buildObject(this.app['encryptor'].encrypt(res));
+                return this.app['encryptor'].encrypt(res);
             }
             return res;
         });
@@ -253,7 +247,7 @@ class ServerGuard {
                     return {};
                 }
                 else if (0 === content.indexOf('<')) {
-                    content = yield this.parseXmlMessage(content);
+                    content = yield Utils_1.parseXml(content);
                 }
                 else {
                     // Handle JSON format.
@@ -269,28 +263,6 @@ class ServerGuard {
             }
         });
     }
-    parseXmlMessage(xml) {
-        return new Promise((resolve, reject) => {
-            xml2js_1.default.parseString(xml, (err, result) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    let message;
-                    if (result && result.xml) {
-                        message = {};
-                        for (let k in result.xml) {
-                            message[k] = result.xml[k][0];
-                        }
-                    }
-                    resolve(message);
-                }
-            });
-        })
-            .catch((err) => {
-            this.app['log']('server.parseMessage()', err);
-        });
-    }
     decryptMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.app['encryptor'].decrypt(message['Encrypt'], yield this.app['request'].get('msg_signature'), yield this.app['request'].get('nonce'), yield this.app['request'].get('timestamp'));

package/dist/Core/Types.d.ts

@@ -79,7 +79,7 @@ export declare interface EasyWechatConfig {
     oauth?: EasyWechatConfigOauth;
     /**
      * 微信支付签名密钥
-     * @scope Payment
+     * @scope Payment | MicroMerchant
      */
     key?: string;
     /**
@@ -89,17 +89,17 @@ export declare interface EasyWechatConfig {
     sub_appid?: string;
     /**
      * 商户号
-     * @scope Payment
+     * @scope Payment | MicroMerchant
      */
     mch_id?: string;
     /**
      * 子商户号
-     * @scope Payment
+     * @scope Payment | MicroMerchant
      */
     sub_mch_id?: string;
     /**
      * pfx 证书路径（敏感接口（如退款、发送红包等）需要）
-     * @scope Payment
+     * @scope Payment | MicroMerchant
      */
     cert_path?: string;
     /**
@@ -122,6 +122,26 @@ export declare interface EasyWechatConfig {
      * @scope Payment
      */
     sandbox?: boolean;
+    /**
+     * 获取证书接口获取到的平台证书序列号
+     * @scope MicroMerchant
+     */
+    serial_no?: string;
+    /**
+     * 获取证书接口获取到的证书内容
+     * @scope MicroMerchant
+     */
+    certificate?: string;
+    /**
+     * 服务商的公众账号 ID
+     * @scope MicroMerchant
+     */
+    appid?: string;
+    /**
+     * APIv3 密钥
+     * @scope MicroMerchant
+     */
+    apiv3_key?: string;
     /**
      * 刷新token
      * @scope OpenPlatform

package/dist/Core/Utils.d.ts

@@ -1,6 +1,12 @@
+import Stream from 'stream';
 export declare const merge: (target: any, source: any) => any;
 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: object, options?: object) => string;
 export declare const parseQueryString: (data: string, options?: object) => object;
@@ -21,5 +27,5 @@ export declare const strLcwords: (str: string) => string;
 export declare const strStudly: (value: string) => string;
 export declare const strCamel: (value: string) => string;
 export declare const singleItem: (obj: any) => any;
-export declare const AesDecrypt: (ciphertext: any, key: any, iv?: string, method?: string) => string;
-export declare const AesEncrypt: (data: any, key: any, iv?: string, method?: string) => string;
+export declare const parseXml: (xml: string) => Promise<any>;
+export declare const buildXml: (data: object, rootName?: string) => string;

package/dist/Core/Utils.js

@@ -1,11 +1,23 @@
 '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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AesEncrypt = exports.AesDecrypt = 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.createHmac = exports.createHash = exports.merge = void 0;
+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;
 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 (exports.isObject(source)) {
         if (source.constructor !== Object) {
@@ -43,6 +55,31 @@ const createHmac = function (str, key, type = 'sha256') {
     return crypto_1.default.createHmac(type, key).update(str).digest('hex');
 };
 exports.createHmac = createHmac;
+/**
+ * 计算文件的 md5 值
+ * @param path 文件路径或文件可读流
+ */
+const md5File = function (path) {
+    return new Promise((reslove, reject) => {
+        let stream;
+        if (exports.isString(path)) {
+            stream = fs_1.default.createReadStream(path);
+        }
+        else {
+            stream = new stream_1.default.PassThrough();
+            path.pipe(stream);
+        }
+        let md5sum = crypto_1.default.createHash('md5');
+        stream.on('data', function (chunk) {
+            md5sum.update(chunk);
+        });
+        stream.on('end', function () {
+            let str = md5sum.digest('hex').toUpperCase();
+            reslove(str);
+        });
+    });
+};
+exports.md5File = md5File;
 const getTimestamp = function (datetime = null) {
     let time;
     try {
@@ -208,22 +245,26 @@ const singleItem = function (obj) {
     return obj;
 };
 exports.singleItem = singleItem;
-const AesDecrypt = function (ciphertext, key, iv = '', method = 'AES-256-ECB') {
-    iv = iv || '';
-    var decipher = crypto_1.default.createDecipheriv(method, key, iv);
-    decipher.setAutoPadding(true);
-    var plaintext = decipher.update(ciphertext, 'base64', 'utf8');
-    plaintext += decipher.final('utf8');
-    return plaintext;
-};
-exports.AesDecrypt = AesDecrypt;
-const AesEncrypt = function (data, key, iv = '', method = 'AES-256-ECB') {
-    iv = iv || '';
-    var chunks = [];
-    var cipher = crypto_1.default.createCipheriv(method, key, iv);
-    cipher.setAutoPadding(true);
-    chunks.push(cipher.update(data, 'utf8', 'base64'));
-    chunks.push(cipher.final('base64'));
-    return chunks.join('');
-};
-exports.AesEncrypt = AesEncrypt;
+const parseXml = function (xml) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let res = yield xml2js_1.default.parseStringPromise(xml);
+        res = exports.singleItem(res);
+        if (res['xml'])
+            res = res['xml'];
+        return res;
+    });
+};
+exports.parseXml = parseXml;
+const buildXml = function (data, rootName = 'xml') {
+    let XmlBuilder = new xml2js_1.default.Builder({
+        cdata: true,
+        rootName,
+        renderOpts: {
+            pretty: false,
+            indent: '',
+            newline: '',
+        }
+    });
+    return XmlBuilder.buildObject(data);
+};
+exports.buildXml = buildXml;

package/dist/MicroMerchant/Application.d.ts

@@ -0,0 +1,27 @@
+import BaseApplication from '../Core/BaseApplication';
+import { EasyWechatConfig } from '../Core/Types';
+import MicroMerchantBase from './Base/MicroMerchantBase';
+import CertficatesClient from './Certficates/CertficatesClient';
+import MediaClient from './Media/MediaClient';
+import MerchantConfigClient from './MerchantConfig/MerchantConfigClient';
+import MeterialClient from './Meterial/MeterialClient';
+import WithdrawClient from './Withdraw/WithdrawClient';
+export default class MicroMerchant extends BaseApplication {
+    protected defaultConfig: EasyWechatConfig;
+    base: MicroMerchantBase;
+    certficates: CertficatesClient;
+    media: MediaClient;
+    merchantConfig: MerchantConfigClient;
+    material: MeterialClient;
+    withdraw: WithdrawClient;
+    constructor(config?: EasyWechatConfig, prepends?: Object, id?: String);
+    registerProviders(): void;
+    getKey(): string;
+    setSubMchId(subMchId: string, appId?: string): this;
+    setCertificate(certificate: string, serialNo?: string): this;
+    verifySignature(data: object): boolean;
+    submitApplication(): Promise<any>;
+    getStatus(): Promise<any>;
+    upgrade(): Promise<any>;
+    getUpgradeStatus(): Promise<any>;
+}