cgserver 9.0.2 → 9.0.4

package/README.md

@@ -1,3 +1,9 @@
+9.0.4
+1、rpc回复指定发送的消息的位置不正确的bug
+9.0.3
+1、request添加rawBody接口，方便获取原始body字符串
+2、v4替换uuidv4(官方弃用，现有接口不影响)
+3、增强rpc的提示
 9.0.2
 1、修复uuid问题
 9.0.0

package/dist/lib/Framework/Core/Core.js

@@ -8,7 +8,7 @@ const crypto = require("crypto");
 const Log_1 = require("../Logic/Log");
 const CryptoJS = require("crypto-js");
 const ec_key_1 = require("ec-key");
-const uuidv4_1 = require("uuidv4");
+const uuid_1 = require("uuid");
 /**
  * 常用的工具函数类
  */
@@ -577,6 +577,11 @@ class core {
         }
         return str;
     }
+    /**
+     * 暂停多少毫秒
+     * @param milliseconds 毫秒
+     * @returns
+     */
     static sleep(milliseconds) {
         return new Promise((resolve) => {
             setTimeout(() => {
@@ -654,7 +659,7 @@ class core {
         return dtext;
     }
     static getUuid() {
-        let id = (0, uuidv4_1.uuid)();
+        let id = (0, uuid_1.v4)();
         return id;
     }
     static signatureBase64(private_key, rsa_name, payload) {
@@ -677,9 +682,5 @@ class core {
         let verificationResult = key.createVerify(rsa_name).update(payload).verify(signature, 'base64');
         return verificationResult;
     }
-    static async delay(milliseconds) {
-        let pm = new Promise(resolve => setTimeout(resolve, milliseconds));
-        return pm;
-    }
 }
 exports.core = core;

package/dist/lib/Framework/SocketServer/IRpcServerWebSocket.js

@@ -38,7 +38,7 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
         ret_msg.from_group = this._group;
         ret_msg.from_id = this._id;
         ret_msg.to_group = req_msg.from_group;
-        ret_msg.to_id = req_msg.to_id;
+        ret_msg.to_id = req_msg.from_id;
         return ret_msg;
     }
     async callRemote(msg) {
@@ -48,12 +48,12 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
         }
         return new Promise((resolve, reject) => {
             let handler = null;
-            let func = (jsonData) => {
+            let func = (retRpcMsg) => {
                 if (handler) {
                     clearTimeout(handler);
                     handler = null;
                 }
-                resolve(jsonData);
+                resolve(retRpcMsg);
             };
             handler = setTimeout(() => {
                 EventTool_1.GEventTool.off(msg.__rpcid, func);
@@ -69,6 +69,10 @@ class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
     }
     async _onMessage(msg) {
         if (msg.__return) {
+            let ret = this.filterMsg(msg);
+            if (!ret) {
+                return;
+            }
             EventTool_1.GEventTool.emit(msg.__rpcid, msg);
             return;
         }

package/dist/lib/Framework/ThirdParty/CgMq.js

@@ -25,8 +25,8 @@ class CgMqServerWebsocket extends IRpcServerWebSocket_1.IRpcServerWebSocket {
         msg.to_group = to_group;
         msg.to_id = to_id;
         msg.data = data;
-        let jsonData = await this.callRemote(msg);
-        return jsonData;
+        let ret_rpcmsg = await this.callRemote(msg);
+        return ret_rpcmsg;
     }
     //收到来自远程的调用消息
     async receive_msg(req_msg) {
@@ -109,8 +109,8 @@ class CgMq {
             cmd: func_name,
             args: args
         };
-        let ret = (await this._ws.push(group, data, to_id));
-        return ret;
+        let ret_rpcmsg = await this._ws.push(group, data, to_id);
+        return ret_rpcmsg;
     }
     async onMsg(msg) {
         if (this._onmsg) {

package/dist/lib/Framework/WebServer/Engine/Request.js

@@ -51,6 +51,15 @@ class Request {
         }
         return body;
     }
+    /**
+     * 原始body字符串
+     */
+    get rawBody() {
+        if (!this._req) {
+            return "";
+        }
+        return this._req["rawBody"] || "";
+    }
     get postData() {
         var body = this._req.body || {};
         if (this._req.headers["content-type"] == "application/x-www-form-urlencoded") {

package/dist/types/Framework/Core/Core.d.ts

@@ -101,6 +101,11 @@ export declare class core {
      * @param num
      */
     static convertToGlobalStr(num: number): string;
+    /**
+     * 暂停多少毫秒
+     * @param milliseconds 毫秒
+     * @returns
+     */
     static sleep(milliseconds: number): Promise<unknown>;
     static safeCall(func: Function, thisArg?: any, ...params: any[]): Promise<any>;
     static getYearWeek(time: number): number;
@@ -110,5 +115,4 @@ export declare class core {
     static getUuid(): string;
     static signatureBase64(private_key: string, rsa_name: string, payload: string): any;
     static signatureVerifyBase64(signature: string, private_key: string, rsa_name: string, payload: string): any;
-    static delay(milliseconds: number): Promise<unknown>;
 }

package/dist/types/Framework/WebServer/Engine/Request.d.ts

@@ -21,6 +21,10 @@ export declare class Request {
     get fileUrl(): any;
     protected _params: any;
     get params(): any;
+    /**
+     * 原始body字符串
+     */
+    get rawBody(): any;
     get postData(): any;
     get url(): string;
     get root(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "9.0.2",
+  "version": "9.0.4",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",