cgserver 6.1.10 → 6.2.4

package/dist/lib/Core/Core.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.core = void 0;
-let Md5 = require("md5");
 let os = require('os');
 let request = require('request');
 const _ = require("underscore");
+const crypto = require("crypto");
 /**
  * 常用的工具函数类
  */
@@ -321,13 +321,14 @@ class core {
         newStr += last;
         return newStr;
     }
-    static md5 = function (data) {
-        let str = data;
-        if (!core.isString(data)) {
-            str = JSON.stringify(data);
-        }
-        return Md5(str);
-    };
+    static md5(str) {
+        let md5_str = crypto.createHash('md5').update(str).digest('hex');
+        return md5_str;
+    }
+    static sha1(str) {
+        let sha1_str = crypto.createHash('sha1').update(str).digest('hex');
+        return sha1_str;
+    }
     static getLocalIP = function () {
         let iptable = {};
         let ifaces = os.networkInterfaces();

package/dist/lib/Database/BaseMongoService.js

@@ -72,7 +72,7 @@ class BaseService {
         return rs;
     }
     aggregate(pipeline, options) {
-        let ret = MongoManager_1.GMongoMgr.aggregate(this._table);
+        let ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
         return ret;
     }
 }

package/dist/lib/Database/MongoManager.js

@@ -133,12 +133,7 @@ class MongoManager {
         let one = null;
         try {
             let col = this._mongo.collection(collection);
-            if (!sort) {
-                one = await col.findOne(where, property);
-            }
-            else {
-                one = await (col.find(where, property).sort(sort).limit(1).next());
-            }
+            one = await col.findOne(where, { projection: property });
         }
         catch (e) {
             Log_1.GLog.error(e.stack);

package/dist/lib/SocketServer/IWebSocket.js

@@ -99,7 +99,7 @@ class IWebSocket {
             }
         }
         catch (e) {
-            Log_1.GLog.error('Received Message Handle Error: ' + e);
+            Log_1.GLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
         }
     }
     _onDecode(message, ...params) {
@@ -135,11 +135,11 @@ class IWebSocket {
             && jsonData
             && jsonData.cmd != "heartbeat") {
             Log_1.GLog.info(this.tipKey + "  receive:--------", true);
-            Log_1.GLog.info(jsonData, true);
+            Log_1.GLog.info({ tipKey: this.tipKey, jsonData }, true);
         }
         if (!jsonData.cmd || jsonData.cmd == "") {
-            Log_1.GLog.error('Received Message warning: no cmd param,data=');
-            Log_1.GLog.error(jsonData);
+            Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd param,data=');
+            Log_1.GLog.error({ tipKey: this.tipKey, jsonData });
             return false;
         }
         return true;
@@ -156,16 +156,11 @@ class IWebSocket {
                     await this["receive_other_all"](jsonData); //默认支持其他所有处理消息
                 }
                 catch (e) {
-                    if (e && e.stack) {
-                        Log_1.GLog.error(e.stack);
-                    }
-                    else {
-                        Log_1.GLog.error(e + "  msg:data=" + JSON.stringify(jsonData));
-                    }
+                    Log_1.GLog.error(this.tipKey + e.stack);
                 }
             }
             else {
-                Log_1.GLog.error('Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
+                Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
             }
         }
         else {
@@ -173,35 +168,30 @@ class IWebSocket {
                 await this["receive_" + jsonData.cmd](jsonData);
             }
             catch (e) {
-                if (e && e.stack) {
-                    Log_1.GLog.error("error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
-                }
-                else {
-                    Log_1.GLog.error(e + "  msg:data=" + JSON.stringify(jsonData));
-                }
+                Log_1.GLog.error(this.tipKey + " error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
             }
         }
     }
     onOpen(e) {
     }
     onError(e) {
-        Log_1.GLog.info("onError:" + e.message);
+        Log_1.GLog.info(this.tipKey + " onError:" + e.message);
     }
     onClose(reasonCode, description) {
-        Log_1.GLog.info("onClose resonCode=" + reasonCode + "  des=" + description);
+        Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
     }
     send(data) {
         if (!this.connected) {
             return;
         }
         if (!data) {
-            Log_1.GLog.error("Send Message warning:null data!");
+            Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
             return;
         }
         if (this._debug_msg
             && data.cmd != "heartbeat") {
             Log_1.GLog.info(this.tipKey + "  send:-----------------------------------", true);
-            Log_1.GLog.info(data, true);
+            Log_1.GLog.info({ tipKey: this.tipKey, data }, true);
         }
         let msg = this._onEncode(data);
         this._ws.send(msg);

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

@@ -38,7 +38,8 @@ export declare class core {
      * @param str
      */
     static fuzzy(str: string): string;
-    static md5: (data: any) => any;
+    static md5(str: string): string;
+    static sha1(str: string): string;
     static getLocalIP: () => any;
     static getIP: () => Promise<string>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.1.10",
+  "version": "6.2.4",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -35,7 +35,6 @@
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/formidable": "^2.0.0",
-    "@types/md5": "^2.3.1",
     "@types/mime": "^2.0.3",
     "@types/mssql": "^7.1.5",
     "@types/mysql": "^2.15.19",
@@ -61,7 +60,6 @@
     "https": "^1.0.0",
     "jsonc": "^2.0.0",
     "log4js": "^6.3.0",
-    "md5": "^2.3.0",
     "mime": "^3.0.0",
     "mongodb": "^4.2.1",
     "mssql": "^8.0.2",
@@ -80,7 +78,5 @@
     "webpack": "^5.73.0",
     "webpack-node-externals": "^3.0.0",
     "websocket": "^1.0.34"
-  },
-  "devDependencies": {
   }
 }