cgserver 9.1.4 → 9.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/README.md +2 -0
  2. package/dist/lib/Framework/Database/Decorator/DBCache.js +1 -2
  3. package/dist/lib/Framework/Database/MongoBaseService.js +0 -2
  4. package/dist/lib/Framework/Logic/HttpTool.js +2 -3
  5. package/dist/lib/Framework/SocketServer/ProtoFilter/JsonProtoFilter.js +1 -2
  6. package/dist/lib/Framework/ThirdParty/QQTool.js +1 -2
  7. package/dist/lib/Framework/WebServer/Engine/Engine.js +12 -7
  8. package/dist/lib/Framework/WebServer/Engine/Request.js +1 -2
  9. package/dist/lib/Framework/index.js +3 -5
  10. package/dist/types/Framework/index.d.ts +0 -1
  11. package/package.json +1 -2
package/README.md CHANGED
@@ -1,3 +1,5 @@
1
+ 9.1.5
2
+ 1、https只单独监听
1
3
  9.1.3
2
4
  1、几乎同意替换成losslessjson
3
5
  2、express使用了raw
package/dist/lib/Framework/Database/Decorator/DBCache.js CHANGED
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GDBCache = exports.VersionModel = void 0;
4
4
  const Log_1 = require("./../../Logic/Log");
5
5
  const fs = require("fs");
6
- const lossless_json_1 = require("lossless-json");
7
6
  class VersionModel {
8
7
  table = "";
9
8
  version = 0;
@@ -25,7 +24,7 @@ class DBCache {
25
24
  if (fs.existsSync(this._path)) {
26
25
  try {
27
26
  let table = fs.readFileSync(this._path);
28
- this._versions = (0, lossless_json_1.parse)(table.toString());
27
+ this._versions = JSON.parse(table.toString());
29
28
  }
30
29
  catch (e) {
31
30
  Log_1.GLog.info("error:" + this._path);
package/dist/lib/Framework/Database/MongoBaseService.js CHANGED
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MongoBaseService = void 0;
4
4
  const MongoManager_1 = require("./MongoManager");
5
- const MongoServiceManager_1 = require("./MongoServiceManager");
6
5
  class MongoBaseService {
7
6
  _table = "";
8
7
  get table() {
@@ -27,7 +26,6 @@ class MongoBaseService {
27
26
  this._t_type = type;
28
27
  this._table = table;
29
28
  this._dbname = dbname;
30
- MongoServiceManager_1.GMongoSerMgr.add(this);
31
29
  }
32
30
  async getNextId(key = "") {
33
31
  if (!key) {
package/dist/lib/Framework/Logic/HttpTool.js CHANGED
@@ -5,7 +5,6 @@ const request = require("request");
5
5
  const qs = require("querystring");
6
6
  const Log_1 = require("./Log");
7
7
  const Core_1 = require("../Core/Core");
8
- const lossless_json_1 = require("lossless-json");
9
8
  exports.GHttpTool = null;
10
9
  class HttpTool {
11
10
  get(options_url) {
@@ -25,7 +24,7 @@ class HttpTool {
25
24
  }
26
25
  try {
27
26
  if (Core_1.core.isString(body)) {
28
- body = (0, lossless_json_1.parse)(body);
27
+ body = JSON.parse(body);
29
28
  }
30
29
  }
31
30
  catch (e) {
@@ -57,7 +56,7 @@ class HttpTool {
57
56
  }
58
57
  try {
59
58
  if (Core_1.core.isString(body)) {
60
- body = (0, lossless_json_1.parse)(body);
59
+ body = JSON.parse(body);
61
60
  }
62
61
  }
63
62
  catch (e) {
package/dist/lib/Framework/SocketServer/ProtoFilter/JsonProtoFilter.js CHANGED
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.JsonProtoFilter = void 0;
4
4
  const Core_1 = require("../../Core/Core");
5
5
  const Log_1 = require("../../Logic/Log");
6
- const lossless_json_1 = require("lossless-json");
7
6
  class JsonProtoFilter {
8
7
  init(path) {
9
8
  return true;
@@ -17,7 +16,7 @@ class JsonProtoFilter {
17
16
  decode(data) {
18
17
  try {
19
18
  if (Core_1.core.isString(data)) {
20
- data = (0, lossless_json_1.parse)(data);
19
+ data = JSON.parse(data);
21
20
  }
22
21
  }
23
22
  catch (e) {
package/dist/lib/Framework/ThirdParty/QQTool.js CHANGED
@@ -6,7 +6,6 @@ const URLEncode = require("urlencode");
6
6
  const IServerConfig_1 = require("../Config/IServerConfig");
7
7
  const HttpTool_1 = require("../Logic/HttpTool");
8
8
  const Log_1 = require("../Logic/Log");
9
- const lossless_json_1 = require("lossless-json");
10
9
  class QQUserInfo {
11
10
  ret = 0;
12
11
  msg = "";
@@ -93,7 +92,7 @@ class QQTool {
93
92
  body = body.replace("callback( ", "");
94
93
  body = body.replace(" );\n", "");
95
94
  try {
96
- body = (0, lossless_json_1.parse)(body);
95
+ body = JSON.parse(body);
97
96
  }
98
97
  catch (e) { }
99
98
  if (!body.openid) {
package/dist/lib/Framework/WebServer/Engine/Engine.js CHANGED
@@ -5,6 +5,7 @@ const Response_1 = require("./Response");
5
5
  const Request_1 = require("./Request");
6
6
  const ControllerManager_1 = require("./ControllerManager");
7
7
  const http = require("http");
8
+ const https = require("https");
8
9
  const Log_1 = require("../../Logic/Log");
9
10
  const cors = require("cors");
10
11
  const Express = require("express");
@@ -29,23 +30,27 @@ class Engine {
29
30
  }
30
31
  start() {
31
32
  let port = this._cfg.port;
32
- let https = require("https");
33
+ //let https = require("https");
33
34
  let fs = require("fs");
34
35
  if (!port) {
35
36
  Log_1.GLog.error(this._cfg);
36
37
  return;
37
38
  }
38
- http.createServer(this._app).listen(port, () => {
39
- this._is_running = true;
40
- Log_1.GLog.info("Server(" + this._cfg.web_name + ") running at http://127.0.0.1:" + port + "/");
41
- });
42
39
  if (this._cfg.ssl) {
43
40
  const httpsOption = {
44
41
  key: fs.readFileSync(this._cfg.ssl.key),
45
42
  cert: fs.readFileSync(this._cfg.ssl.crt)
46
43
  };
47
- https.createServer(httpsOption, this._app).listen(port + 1);
48
- Log_1.GLog.info("Server(" + this._cfg.web_name + ") running at https://127.0.0.1:" + (port + 1) + "/");
44
+ https.createServer(httpsOption, this._app).listen(port, () => {
45
+ this._is_running = true;
46
+ Log_1.GLog.info("Server(" + this._cfg.web_name + ") running at https://127.0.0.1:" + port + "/");
47
+ });
48
+ }
49
+ else {
50
+ http.createServer(this._app).listen(port, () => {
51
+ this._is_running = true;
52
+ Log_1.GLog.info("Server(" + this._cfg.web_name + ") running at http://127.0.0.1:" + port + "/");
53
+ });
49
54
  }
50
55
  this._app.use(cookieParser());
51
56
  this._app.use(Express.raw());
package/dist/lib/Framework/WebServer/Engine/Request.js CHANGED
@@ -4,7 +4,6 @@ exports.Request = void 0;
4
4
  const url_1 = require("url");
5
5
  const Core_1 = require("../../Core/Core");
6
6
  const Log_1 = require("../../Logic/Log");
7
- const lossless_json_1 = require("lossless-json");
8
7
  class Request {
9
8
  _req = null;
10
9
  get baseReq() {
@@ -71,7 +70,7 @@ class Request {
71
70
  }
72
71
  if (Core_1.core.isString(body)) {
73
72
  try {
74
- body = (0, lossless_json_1.parse)(body);
73
+ body = JSON.parse(body);
75
74
  }
76
75
  catch (e) {
77
76
  Log_1.GLog.error("post data--" + body + "--parse error");
package/dist/lib/Framework/index.js CHANGED
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.GMongoSerMgr = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoExt = exports.MongoManager = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GCgServer = void 0;
4
- exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = exports.GMongoCacheSer = void 0;
5
- exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = void 0;
3
+ exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoExt = exports.MongoManager = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GCgServer = void 0;
4
+ exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = void 0;
5
+ exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = void 0;
6
6
  var cgserver_1 = require("./cgserver");
7
7
  Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
8
8
  var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -70,8 +70,6 @@ Object.defineProperty(exports, "SqlReturns", { enumerable: true, get: function (
70
70
  var RedisManager_1 = require("./Database/RedisManager");
71
71
  Object.defineProperty(exports, "GRedisMgr", { enumerable: true, get: function () { return RedisManager_1.GRedisMgr; } });
72
72
  Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
73
- var MongoServiceManager_1 = require("./Database/MongoServiceManager");
74
- Object.defineProperty(exports, "GMongoSerMgr", { enumerable: true, get: function () { return MongoServiceManager_1.GMongoSerMgr; } });
75
73
  var CacheTool_1 = require("./Logic/CacheTool");
76
74
  Object.defineProperty(exports, "GCacheTool", { enumerable: true, get: function () { return CacheTool_1.GCacheTool; } });
77
75
  var HttpTool_1 = require("./Logic/HttpTool");
package/dist/types/Framework/index.d.ts CHANGED
@@ -27,7 +27,6 @@ export { GMSSqlMgr } from './Database/MSSqlManager';
27
27
  export { MysqlBaseService } from './Database/MysqlBaseService';
28
28
  export { GMysqlMgr, SqlResult, SqlReturn, SqlReturns } from './Database/MysqlManager';
29
29
  export { GRedisMgr, RedisManager } from './Database/RedisManager';
30
- export { GMongoSerMgr } from './Database/MongoServiceManager';
31
30
  export { GCacheTool } from './Logic/CacheTool';
32
31
  export { GHttpTool } from './Logic/HttpTool';
33
32
  export { GLog } from './Logic/Log';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cgserver",
3
- "version": "9.1.4",
3
+ "version": "9.1.6",
4
4
  "author": "trojan",
5
5
  "type": "commonjs",
6
6
  "description": "free for all.Websocket or Http",
@@ -62,7 +62,6 @@
62
62
  "https": "^1.0.0",
63
63
  "jsonc": "^2.0.0",
64
64
  "log4js": "^6.9.1",
65
- "lossless-json": "^4.0.1",
66
65
  "mime": "^3.0.0",
67
66
  "mongodb": "^6.7.0",
68
67
  "mssql": "^11.0.0",