cgserver 9.1.5 → 9.1.7

package/README.md

@@ -1,3 +1,7 @@
+9.1.7
+1、httptool 默认可以支持全局输出日志了
+9.1.6
+1、默认不适用losslessjson，会把数字变成对象
 9.1.5
 1、https只单独监听
 9.1.3

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

@@ -3,7 +3,6 @@ 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;
@@ -25,7 +24,7 @@ class DBCache {
         if (fs.existsSync(this._path)) {
             try {
                 let table = fs.readFileSync(this._path);
-                this._versions = (0, lossless_json_1.parse)(table.toString());
+                this._versions = JSON.parse(table.toString());
             }
             catch (e) {
                 Log_1.GLog.info("error:" + this._path);

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

@@ -5,9 +5,15 @@ const request = require("request");
 const qs = require("querystring");
 const Log_1 = require("./Log");
 const Core_1 = require("../Core/Core");
-const lossless_json_1 = require("lossless-json");
 exports.GHttpTool = null;
 class HttpTool {
+    _debug = false;
+    get debug() {
+        return this._debug;
+    }
+    set debug(value) {
+        this._debug = value;
+    }
     get(options_url) {
         let options = null;
         if (Core_1.core.isString(options_url)) {
@@ -16,6 +22,9 @@ class HttpTool {
         else {
             options = options_url;
         }
+        if (this._debug) {
+            Log_1.GLog.info("prepare get:" + options.url);
+        }
         return new Promise((resolve, reject) => {
             request.get(options, (error, response, body) => {
                 let originbody = body;
@@ -25,7 +34,7 @@ class HttpTool {
                 }
                 try {
                     if (Core_1.core.isString(body)) {
-                        body = (0, lossless_json_1.parse)(body);
+                        body = JSON.parse(body);
                     }
                 }
                 catch (e) {
@@ -36,6 +45,12 @@ class HttpTool {
                         body = originbody;
                     }
                 }
+                if (this._debug) {
+                    Log_1.GLog.info({
+                        url: options.url,
+                        originbody: originbody
+                    });
+                }
                 resolve({ error, response, body, originbody });
             });
         });
@@ -48,6 +63,9 @@ class HttpTool {
         else {
             options = options_url;
         }
+        if (this._debug) {
+            Log_1.GLog.info("prepare post:" + options.url);
+        }
         return new Promise((resolve, reject) => {
             request.post(options, (error, response, body) => {
                 let originbody = body;
@@ -57,7 +75,7 @@ class HttpTool {
                 }
                 try {
                     if (Core_1.core.isString(body)) {
-                        body = (0, lossless_json_1.parse)(body);
+                        body = JSON.parse(body);
                     }
                 }
                 catch (e) {
@@ -68,6 +86,12 @@ class HttpTool {
                         body = originbody;
                     }
                 }
+                if (this._debug) {
+                    Log_1.GLog.info({
+                        url: options.url,
+                        originbody: originbody
+                    });
+                }
                 resolve({ error, response, body, originbody });
             });
         });

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

@@ -3,7 +3,6 @@ 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;
@@ -17,7 +16,7 @@ class JsonProtoFilter {
     decode(data) {
         try {
             if (Core_1.core.isString(data)) {
-                data = (0, lossless_json_1.parse)(data);
+                data = JSON.parse(data);
             }
         }
         catch (e) {

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

@@ -6,7 +6,6 @@ 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 = "";
@@ -93,7 +92,7 @@ class QQTool {
             body = body.replace("callback( ", "");
             body = body.replace(" );\n", "");
             try {
-                body = (0, lossless_json_1.parse)(body);
+                body = JSON.parse(body);
             }
             catch (e) { }
             if (!body.openid) {

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

@@ -4,7 +4,6 @@ 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() {
@@ -71,7 +70,7 @@ class Request {
         }
         if (Core_1.core.isString(body)) {
             try {
-                body = (0, lossless_json_1.parse)(body);
+                body = JSON.parse(body);
             }
             catch (e) {
                 Log_1.GLog.error("post data--" + body + "--parse error");

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

@@ -1,6 +1,9 @@
 import * as request from "request";
 export declare let GHttpTool: HttpTool;
 declare class HttpTool {
+    protected _debug: boolean;
+    get debug(): boolean;
+    set debug(value: boolean);
     get(options_url: request.OptionsWithUrl | string): Promise<{
         error: any;
         response: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "9.1.5",
+  "version": "9.1.7",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -62,7 +62,6 @@
     "https": "^1.0.0",
     "jsonc": "^2.0.0",
     "log4js": "^6.9.1",
-    "lossless-json": "^4.0.1",
     "mime": "^3.0.0",
     "mongodb": "^6.7.0",
     "mssql": "^11.0.0",