cgserver 9.1.2 → 9.1.4

package/README.md

@@ -1,3 +1,6 @@
+9.1.3
+1、几乎同意替换成losslessjson
+2、express使用了raw
 9.1.2
 1、losslessjson
 9.1.1

package/dist/lib/Framework/Database/Decorator/DBCache.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GDBCache = exports.VersionModel = void 0;
 const Log_1 = require("./../../Logic/Log");
 const fs = require("fs");
+const lossless_json_1 = require("lossless-json");
 class VersionModel {
     table = "";
     version = 0;
@@ -24,7 +25,7 @@ class DBCache {
         if (fs.existsSync(this._path)) {
             try {
                 let table = fs.readFileSync(this._path);
-                this._versions = JSON.parse(table.toString());
+                this._versions = (0, lossless_json_1.parse)(table.toString());
             }
             catch (e) {
                 Log_1.GLog.info("error:" + this._path);

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

@@ -18,7 +18,7 @@ class HttpTool {
         }
         return new Promise((resolve, reject) => {
             request.get(options, (error, response, body) => {
-                let bd = body;
+                let originbody = body;
                 if (error) {
                     Log_1.GLog.error("get:" + options.url);
                     Log_1.GLog.error(error);
@@ -33,10 +33,10 @@ class HttpTool {
                         body = qs.parse(body);
                     }
                     catch (e) {
-                        body = bd;
+                        body = originbody;
                     }
                 }
-                resolve({ error, response, body });
+                resolve({ error, response, body, originbody });
             });
         });
     }
@@ -50,7 +50,7 @@ class HttpTool {
         }
         return new Promise((resolve, reject) => {
             request.post(options, (error, response, body) => {
-                let bd = body;
+                let originbody = body;
                 if (error) {
                     Log_1.GLog.error("post:" + options.url);
                     Log_1.GLog.error(error);
@@ -65,10 +65,10 @@ class HttpTool {
                         body = qs.parse(body);
                     }
                     catch (e) {
-                        body = bd;
+                        body = originbody;
                     }
                 }
-                resolve({ error, response, body });
+                resolve({ error, response, body, originbody });
             });
         });
     }

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

@@ -165,18 +165,25 @@ class IWebSocket {
     onClose(reasonCode, description) {
         Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
     }
-    send(msg) {
+    filterSendMsg(msg) {
         if (!this.connected) {
-            return;
+            return false;
         }
         if (!msg) {
             Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
-            return;
+            return false;
         }
         if (this._debug_msg
             && msg.cmd != "heartbeat") {
             Log_1.GLog.info({ tipKey: this.tipKey, action: "send", msg });
         }
+        return true;
+    }
+    send(msg) {
+        let ret = this.filterSendMsg(msg);
+        if (!ret) {
+            return;
+        }
         let data = this._onEncode(msg);
         this._ws.send(data);
     }

package/dist/lib/Framework/SocketServer/ProtoFilter/JsonProtoFilter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonProtoFilter = void 0;
 const Core_1 = require("../../Core/Core");
 const Log_1 = require("../../Logic/Log");
+const lossless_json_1 = require("lossless-json");
 class JsonProtoFilter {
     init(path) {
         return true;
@@ -16,7 +17,7 @@ class JsonProtoFilter {
     decode(data) {
         try {
             if (Core_1.core.isString(data)) {
-                data = JSON.parse(data);
+                data = (0, lossless_json_1.parse)(data);
             }
         }
         catch (e) {

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

@@ -6,6 +6,7 @@ const URLEncode = require("urlencode");
 const IServerConfig_1 = require("../Config/IServerConfig");
 const HttpTool_1 = require("../Logic/HttpTool");
 const Log_1 = require("../Logic/Log");
+const lossless_json_1 = require("lossless-json");
 class QQUserInfo {
     ret = 0;
     msg = "";
@@ -92,7 +93,7 @@ class QQTool {
             body = body.replace("callback( ", "");
             body = body.replace(" );\n", "");
             try {
-                body = JSON.parse(body);
+                body = (0, lossless_json_1.parse)(body);
             }
             catch (e) { }
             if (!body.openid) {

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

@@ -48,6 +48,7 @@ class Engine {
             Log_1.GLog.info("Server(" + this._cfg.web_name + ") running at https://127.0.0.1:" + (port + 1) + "/");
         }
         this._app.use(cookieParser());
+        this._app.use(Express.raw());
         this._app.use(Express.json({ limit: '10mb', verify(req, res, buf, encoding) {
                 req["rawBody"] = buf;
             }, }));

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

@@ -4,6 +4,7 @@ exports.Request = void 0;
 const url_1 = require("url");
 const Core_1 = require("../../Core/Core");
 const Log_1 = require("../../Logic/Log");
+const lossless_json_1 = require("lossless-json");
 class Request {
     _req = null;
     get baseReq() {
@@ -70,32 +71,13 @@ class Request {
         }
         if (Core_1.core.isString(body)) {
             try {
-                body = JSON.parse(body);
+                body = (0, lossless_json_1.parse)(body);
             }
             catch (e) {
                 Log_1.GLog.error("post data--" + body + "--parse error");
                 body = {};
             }
         }
-        // 暂时去掉强制数值转换
-        // //服务器会有一层空key的json解析
-        // for(let k in body)
-        // {
-        //     var v = body[k]
-        //     if(!core.isString(v))
-        //     {
-        //         continue
-        //     }
-        //     let intv = parseInt(v)
-        //     if(intv==v)
-        //     {
-        //         body[k]=intv
-        //     }
-        //     else if(parseFloat(v)==v)
-        //     {
-        //         body[k]==parseFloat(v)
-        //     }
-        // }
         return body;
     }
     get url() {
@@ -124,7 +106,6 @@ class Request {
             ip = ips;
         }
         ip = ip ||
-            this._req.connection.remoteAddress ||
             this._req.socket.remoteAddress ||
             this._req.ip || "";
         ip = ip.replace("::ffff:", "");

package/dist/types/Framework/Logic/HttpTool.d.ts

@@ -5,11 +5,13 @@ declare class HttpTool {
         error: any;
         response: any;
         body: any;
+        originbody: any;
     }>;
     post(options_url: request.OptionsWithUrl | string): Promise<{
         error: any;
         response: any;
         body: any;
+        originbody: any;
     }>;
 }
 export {};

package/dist/types/Framework/SocketServer/IWebSocket.d.ts

@@ -55,6 +55,7 @@ export declare class IWebSocket {
     onOpen(e?: any): void;
     onError(e: Error): void;
     onClose(reasonCode: number, description: string): void;
+    filterSendMsg(msg: BaseMsg): boolean;
     send(msg: BaseMsg): void;
     close(): void;
     getServerNameFromCmd(cmd: any): any;

package/package.json

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