cgserver 9.1.13 → 9.1.14

package/README.md

@@ -1,3 +1,5 @@
+9.1.14
+1、http请求、websocker处理时间、rpc请求处理时间
 9.1.13
 1、请求的时间消耗提示优化
 9.1.12

package/dist/lib/Framework/Logic/HttpTool.js

@@ -15,6 +15,7 @@ class HttpTool {
         this._debug = value;
     }
     get(options_url) {
+        let time = Date.now();
         let options = null;
         if (Core_1.core.isString(options_url)) {
             options = { url: options_url };
@@ -47,6 +48,7 @@ class HttpTool {
                 }
                 if (this._debug) {
                     Log_1.GLog.info({
+                        dttime: (Date.now() - time) + "ms",
                         url: options.url,
                         originbody: originbody
                     });
@@ -56,6 +58,7 @@ class HttpTool {
         });
     }
     post(options_url) {
+        let time = Date.now();
         let options = null;
         if (Core_1.core.isString(options_url)) {
             options = { url: options_url };
@@ -88,6 +91,7 @@ class HttpTool {
                 }
                 if (this._debug) {
                     Log_1.GLog.info({
+                        dttime: (Date.now() - time) + "ms",
                         url: options.url,
                         originbody: originbody
                     });

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IRpcClientWebSocket = void 0;
-const _ = require("underscore");
 const EventTool_1 = require("../Logic/EventTool");
 const Log_1 = require("../Logic/Log");
 const IClientWebSocket_1 = require("./IClientWebSocket");
+const Core_1 = require("../Core/Core");
 class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     /**
      * 自己的身份
@@ -14,7 +14,7 @@ class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     //超时时间
     _timeout = 3000;
     _genId(pre = "") {
-        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
+        return pre + "_" + Core_1.core.getUuid();
     }
     getNewMsg(cmd, errcode) {
         let msg = super.getNewMsg(cmd, errcode);

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

@@ -139,6 +139,7 @@ class IWebSocket {
         return true;
     }
     async _onMessage(data) {
+        let time = Date.now();
         let jsonData = data;
         let func = this["receive_" + jsonData.cmd];
         let ret = this.filterMsg(jsonData);
@@ -157,6 +158,9 @@ class IWebSocket {
         else {
             await Core_1.core.safeCall(func, this, jsonData);
         }
+        if (this._debug_msg) {
+            Log_1.GLog.info("[" + (Date.now() - time) + "ms] " + jsonData.cmd);
+        }
     }
     onOpen(e) {
     }

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

@@ -105,11 +105,15 @@ class CgMq {
         });
     }
     async callRemote(group, to_id, func_name, ...args) {
+        let time = Date.now();
         let data = {
             cmd: func_name,
             args: args
         };
         let ret_rpcmsg = await this._ws.push(group, data, to_id);
+        if (this._ws.debug_msg) {
+            Log_1.GLog.info("[" + (Date.now() - time) + "ms] callRemote:" + group + "-" + func_name);
+        }
         return ret_rpcmsg;
     }
     async onMsg(msg) {

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

@@ -8,12 +8,10 @@ class Response {
     _res = null;
     _cookie_prefix = "";
     _cfg = null;
-    _create_time = -1;
     get baseRes() {
         return this._res;
     }
     constructor(res, cfg) {
-        this._create_time = Date.now();
         this._cfg = cfg;
         this._res = res;
         this._cookie_prefix = this._cfg.cookie.prefix;

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

@@ -4,7 +4,6 @@ export declare class Response {
     protected _res: Express.Response;
     protected _cookie_prefix: string;
     protected _cfg: WebServerConfig;
-    protected _create_time: number;
     get baseRes(): Express.Response<any, Record<string, any>>;
     constructor(res: Express.Response, cfg: WebServerConfig);
     /**

package/package.json

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