node-easywechat 2.6.9 → 2.7.2

package/dist/Payment/Notify/Handler.js

@@ -12,9 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const xml2js_1 = __importDefault(require("xml2js"));
 const Utils_1 = require("../../Core/Utils");
 const Response_1 = __importDefault(require("../../Core/Http/Response"));
+const AES_1 = require("../../Core/AES");
 class Handler {
     constructor(app) {
         this.SUCCESS = 'SUCCESS';
@@ -54,15 +54,7 @@ class Handler {
             if (this.sign) {
                 attributes['sign'] = Utils_1.makeSignature(attributes, yield this.app.getKey());
             }
-            let XmlBuilder = new xml2js_1.default.Builder({
-                cdata: true,
-                renderOpts: {
-                    pretty: false,
-                    indent: '',
-                    newline: '',
-                }
-            });
-            return new Response_1.default(XmlBuilder.buildObject(attributes));
+            return new Response_1.default(Buffer.from(Utils_1.buildXml(attributes)));
         });
     }
     getMessage() {
@@ -84,7 +76,7 @@ class Handler {
             if (!message[key]) {
                 return null;
             }
-            return Utils_1.AesDecrypt(message[key], Utils_1.createHash(this.app.config.key, 'md5'), '', 'AES-256-ECB');
+            return AES_1.AES.decrypt(Buffer.from(message[key], 'base64'), Utils_1.createHash(this.app.config.key, 'md5'), '', true, 'aes-256-ecb').toString();
         });
     }
     validate(message) {

package/dist/Payment/Notify/Refunded.d.ts

@@ -4,5 +4,4 @@ import { PaymentRefundedHandler } from '../../Core/Types';
 export default class RefundedHandler extends Handler {
     handle(closure: PaymentRefundedHandler): Promise<Response>;
     reqInfo(): Promise<any>;
-    parseXml(xml: string): Promise<any>;
 }

package/dist/Payment/Notify/Refunded.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Handler_1 = __importDefault(require("./Handler"));
-const xml2js_1 = __importDefault(require("xml2js"));
 const Utils_1 = require("../../Core/Utils");
 class RefundedHandler extends Handler_1.default {
     handle(closure) {
@@ -33,16 +32,7 @@ class RefundedHandler extends Handler_1.default {
     }
     reqInfo() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.parseXml(yield this.decryptMessage('req_info'));
-        });
-    }
-    parseXml(xml) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let res = yield xml2js_1.default.parseStringPromise(xml);
-            res = Utils_1.singleItem(res);
-            if (res['xml'])
-                res = res['xml'];
-            return res;
+            return yield Utils_1.parseXml(yield this.decryptMessage('req_info'));
         });
     }
 }

package/dist/Payment/Transfer/TransferClient.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseClient_1 = __importDefault(require("../Core/BaseClient"));
 const fs_1 = __importDefault(require("fs"));
-const node_rsa_1 = __importDefault(require("node-rsa"));
+const RSA_1 = __importDefault(require("../../Core/RSA"));
 const Utils_1 = require("../../Core/Utils");
 class TransferClient extends BaseClient_1.default {
     /**
@@ -67,8 +67,9 @@ class TransferClient extends BaseClient_1.default {
                 throw new Error(`${key} is required.`);
             }
         });
-        let publicKey = fs_1.default.readFileSync(this.app.config.rsa_public_key_path).toString();
-        let rsa = new node_rsa_1.default(publicKey);
+        let publicKey = fs_1.default.readFileSync(this.app.config.rsa_public_key_path);
+        let rsa = new RSA_1.default;
+        rsa.setPublicKey(publicKey);
         params['enc_bank_no'] = rsa.encrypt(params['enc_bank_no'], 'hex');
         params['enc_true_name'] = rsa.encrypt(params['enc_true_name'], 'hex');
         return this.safeRequest('mmpaymkttransfers/pay_bank', params);

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import MiniProgram from './MiniProgram/Application';
 import OpenPlatform from './OpenPlatform/Application';
 import Payment from './Payment/Application';
 import Work from './Work/Application';
+import MicroMerchant from './MicroMerchant/Application';
 import CacheInterface from './Core/Contracts/CacheInterface';
 import FinallResult from './Core/Decorators/FinallResult';
 import TerminateResult from './Core/Decorators/TerminateResult';
@@ -23,6 +24,7 @@ declare function getInstance(service: 'MiniProgram', config?: EasyWechatConfig):
 declare function getInstance(service: 'OpenPlatform', config?: EasyWechatConfig): OpenPlatform;
 declare function getInstance(service: 'Payment', config?: EasyWechatConfig): Payment;
 declare function getInstance(service: 'Work', config?: EasyWechatConfig): Work;
+declare function getInstance(service: 'MicroMerchant', config?: EasyWechatConfig): MicroMerchant;
 declare class EasyWechat {
     /**
      * 实例工厂
@@ -52,6 +54,10 @@ declare class EasyWechat {
          * 企业微信类
          */
         Work: typeof Work;
+        /**
+         * 小微商户类
+         */
+        MicroMerchant: typeof MicroMerchant;
         /**
          * 通用获取实例方法
          * @param service 服务名称，可选值：'BaseService' | 'OfficialAccount' | 'MiniProgram' | 'OpenPlatform' | 'Payment'

package/dist/index.js

@@ -28,6 +28,7 @@ const Application_3 = __importDefault(require("./MiniProgram/Application"));
 const Application_4 = __importDefault(require("./OpenPlatform/Application"));
 const Application_5 = __importDefault(require("./Payment/Application"));
 const Application_6 = __importDefault(require("./Work/Application"));
+const Application_7 = __importDefault(require("./MicroMerchant/Application"));
 const CacheInterface_1 = __importDefault(require("./Core/Contracts/CacheInterface"));
 const FinallResult_1 = __importDefault(require("./Core/Decorators/FinallResult"));
 const TerminateResult_1 = __importDefault(require("./Core/Decorators/TerminateResult"));
@@ -63,6 +64,7 @@ class EasyWechat {
             OpenPlatform: Application_4.default,
             Payment: Application_5.default,
             Work: Application_6.default,
+            MicroMerchant: Application_7.default,
             getInstance: getInstance,
         };
         this.CacheInterface = CacheInterface_1.default;

package/node-easywechat.file_cache.easywechat.kernel.access_token.8a9684b45da7de42a06a70ba01a7005a.cache

@@ -1 +1 @@
-{"data":{"errcode":0,"errmsg":"ok","access_token":"moke-token","expires_in":7200},"lifeTime":1627580367}
+{"data":{"errcode":0,"errmsg":"ok","access_token":"moke-token","expires_in":7200},"lifeTime":1633062831}

package/node-easywechat.file_cache.easywechat.kernel.access_token.c3d06edaf326aad75d32f31348df787a.cache

@@ -1 +1 @@
-{"data":{"errcode":0,"errmsg":"ok"},"lifeTime":1627580367}
+{"data":{"errcode":0,"errmsg":"ok"},"lifeTime":1633062831}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "node-easywechat",
-  "version": "2.6.9",
+  "version": "2.7.2",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {
-    "build": "rm -rf dist && node_modules/.bin/tsc",
-    "test": "mocha ./test/**/*.js"
+    "build": "rm -rf dist && npx tsc",
+    "docs": "rm -rf doc && npx typedoc --out docs --plugin typedoc-plugin-markdown ./src/",
+    "test": "npx mocha ./test/**/*.js"
   },
   "repository": {
     "type": "git",
@@ -21,14 +22,15 @@
     "@types/node": "^12.12.7",
     "mocha": "^8.3.0",
     "sinon": "^9.2.4",
+    "typedoc": "^0.21.5",
+    "typedoc-plugin-markdown": "^3.10.4",
     "typescript": "^4.2.3"
   },
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "form-data": "^4.0.0",
-    "node-rsa": "^1.1.1",
-    "node-socialite": "^1.2.3",
-    "qs": "^6.9.6",
+    "node-socialite": "^1.2.4",
+    "qs": "^6.10.1",
     "raw-body": "^2.4.1",
     "xml2js": "^0.4.23"
   }