node-easywechat 2.10.1 → 2.10.2

package/CHANGELOG.md

@@ -1,8 +1,15 @@
 # CHANGELOG
 
 
+## v2.10.2 (2022-05-25)
+
+- Fix: 修复Http/Request对象传入xml时解析异常导致无法获取请求参数的问题(#27)
+
+## v2.10.1 (2022-05-21)
+
 ## v2.10.0 (2022-05-18)
 
+- Feat: 开放平台代理小程序新增申请隐私接口相关接口
 - Feat: 开放平台代理小程序新增小程序用户隐私保护指引相关接口
 - Feat: 开放平台代理小程序新增获取永久素材接口
 - Feat: 企业微信新增商品图册相关接口

package/dist/Core/Http/Request.d.ts

@@ -17,7 +17,8 @@ export default class Request implements RequestInterface {
     get(key: string): Promise<any>;
     post(key: string): Promise<any>;
     getAllGet(): object;
-    getAllPost(): object;
+    getAllPost(): Promise<object>;
+    private _parseContent;
     getContent(): Promise<Buffer>;
     getUri(): string;
     getContentType(): string;

package/dist/Core/Http/Request.js

@@ -42,22 +42,6 @@ class Request {
                     this._contentType = 'application/json';
                 }
                 else if (typeof content === 'string') {
-                    try {
-                        this._post = JSON.parse(content);
-                        this._contentType = 'application/json';
-                    }
-                    catch (e) {
-                        if (content.substr(0, 1) === '<') {
-                            (0, Utils_1.parseXml)(content).then(res => {
-                                this._post = res;
-                                this._contentType = 'text/xml';
-                            });
-                        }
-                        else {
-                            this._post = (0, Utils_1.parseQueryString)(content);
-                            this._contentType = 'application/x-www-form-urlencoded';
-                        }
-                    }
                     this._content = Buffer.from(content);
                 }
             }
@@ -120,20 +104,8 @@ class Request {
                 throw new Error('Please set request first. app.rebind(\'request\', new EasyWechat.Request(ctx.req));');
             if (this._method !== 'POST')
                 return null;
-            if (!this._content) {
-                this._content = yield this.getContent();
-            }
-            if (!this._post && this._content) {
-                let contentType = this._contentType.toLowerCase();
-                if (contentType.indexOf('application/json') > -1) {
-                    try {
-                        this._post = JSON.parse(this._content.toString());
-                    }
-                    catch (e) { }
-                }
-                else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
-                    this._post = (0, Utils_1.parseQueryString)(this._content.toString());
-                }
+            if (!this._post) {
+                yield this._parseContent();
             }
             return this._post && this._post[key] != undefined ? this._post[key] : null;
         });
@@ -144,9 +116,34 @@ class Request {
         return this._get;
     }
     getAllPost() {
-        if (!this.isValid)
-            throw new Error('Please set request first. app.rebind(\'request\', new EasyWechat.Request(ctx.req));');
-        return this._post;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isValid)
+                throw new Error('Please set request first. app.rebind(\'request\', new EasyWechat.Request(ctx.req));');
+            if (!this._post) {
+                yield this._parseContent();
+            }
+            return this._post;
+        });
+    }
+    _parseContent() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let content = (yield this.getContent()).toString();
+            try {
+                this._post = JSON.parse(content);
+                this._contentType = 'application/json';
+            }
+            catch (e) {
+                if ((content).substring(0, 1) === '<') {
+                    let res = yield (0, Utils_1.parseXml)(content);
+                    this._post = res;
+                    this._contentType = 'text/xml';
+                }
+                else {
+                    this._post = (0, Utils_1.parseQueryString)(content);
+                    this._contentType = 'application/x-www-form-urlencoded';
+                }
+            }
+        });
     }
     getContent() {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/Core/Utils.js

@@ -265,6 +265,6 @@ const buildXml = function (data, rootName = 'xml') {
             newline: '',
         }
     });
-    return XmlBuilder.buildObject(data);
+    return XmlBuilder.buildObject(data).replace(/<\?([^>]+)\?>/, '');
 };
 exports.buildXml = buildXml;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-easywechat",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "EasyWechat SDK for Node.js (NOT OFFICIAL)",
   "main": "dist/index.js",
   "scripts": {