node-easywechat 3.0.0-beta.4 → 3.0.0-beta.5

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## v3.0.0-beta.5 (2022-06-29)
+
+- Fix: 修复服务端获取消息异常的问题
+
 ## v3.0.0-beta.4 (2022-06-24)
 
 - Feat: 请求接口数据增加 FormData 实例的支持

package/dist/Core/Http/Minxins/MessageMixin.js

@@ -63,8 +63,7 @@ class MessageMixin {
     }
     withBody(body) {
         if (Buffer.isBuffer(body)) {
-            this.content = Buffer.from('');
-            this.content.copy(body);
+            this.content = body;
         }
         else if (typeof body === 'string') {
             this.content = Buffer.from(body);

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

@@ -43,7 +43,7 @@ declare class ServerRequest implements ServerRequestInterface {
      * @param body 支持 Buffer、object对象、JSON字符串、XML字符串、QueryString格式的 body 内容字符串
      * @returns
      */
-    static createFromIncomingMessage(req: IncomingMessage, body?: Buffer | Record<string, any> | string): ServerRequest;
+    static createFromIncomingMessage(req: IncomingMessage, body?: Buffer | Record<string, any> | string): Promise<ServerRequest>;
 }
 interface ServerRequest extends MessageMixin, RequestMixin {
 }

package/dist/Core/Http/ServerRequest.js

@@ -1,4 +1,13 @@
 '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 };
 };
@@ -124,13 +133,14 @@ class ServerRequest {
      * @returns
      */
     static createFromIncomingMessage(req, body = null) {
-        let request = new ServerRequest(req.method, req.url, req.headers || {}, body, req.httpVersion, (0, url_1.parse)(req.url, true).query || {});
-        if (!body) {
-            (0, raw_body_1.default)(req).then(res => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let request = new ServerRequest(req.method, req.url, req.headers || {}, body, req.httpVersion);
+            if (!body) {
+                let res = yield (0, raw_body_1.default)(req);
                 request.withBody(res);
-            });
-        }
-        return request;
+            }
+            return request;
+        });
     }
 }
 ;

package/dist/Core/Message.js

@@ -49,7 +49,11 @@ class Message {
      */
     static createFromRequest(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            let originContent = request.getBody().toString();
+            let originContent = '';
+            let body = request.getBody();
+            if (body) {
+                originContent = body.toString();
+            }
             let attributes = {};
             if ('<' === originContent.substring(0, 1)) {
                 attributes = yield (0, Utils_1.parseXml)(originContent);

package/dist/OfficialAccount/Application.js

@@ -75,11 +75,6 @@ class Application {
     }
     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;

package/package.json

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