cgserver 5.4.9 → 5.4.10

package/lib/Framework/Config/FrameworkConfig.d.ts

@@ -43,77 +43,75 @@ export declare class WebServerConfig {
 export declare let GFCfg: FrameworkConfig;
 export declare class FrameworkConfig extends ServerConfig {
     log: {
-        cfg: {
-            appenders: {
-                console: {
-                    type: string;
-                    category: string;
-                };
-                log_file: {
-                    category: string;
-                    type: string;
-                    filename: string;
-                    maxLogSize: number;
-                    backups: number;
-                };
-                log_date: {
-                    category: string;
-                    type: string;
-                    filename: string;
-                    alwaysIncludePattern: boolean;
-                    pattern: string;
-                };
-                client_log_file: {
-                    category: string;
-                    type: string;
-                    filename: string;
-                    maxLogSize: number;
-                    backups: number;
-                };
-                client_log_date: {
-                    category: string;
-                    type: string;
-                    filename: string;
-                    alwaysIncludePattern: boolean;
-                    pattern: string;
-                };
-                error_log_file: {
-                    category: string;
-                    type: string;
-                    filename: string;
-                    maxLogSize: number;
-                    backups: number;
-                };
+        appenders: {
+            console: {
+                type: string;
+                category: string;
             };
-            categories: {
-                default: {
-                    appenders: string[];
-                    level: string;
-                };
-                console: {
-                    appenders: string[];
-                    level: string;
-                };
-                log_file: {
-                    appenders: string[];
-                    level: string;
-                };
-                log_date: {
-                    appenders: string[];
-                    level: string;
-                };
-                client_log_file: {
-                    appenders: string[];
-                    level: string;
-                };
-                client_log_date: {
-                    appenders: string[];
-                    level: string;
-                };
-                error_log_file: {
-                    appenders: string[];
-                    level: string;
-                };
+            log_file: {
+                category: string;
+                type: string;
+                filename: string;
+                maxLogSize: number;
+                backups: number;
+            };
+            log_date: {
+                category: string;
+                type: string;
+                filename: string;
+                alwaysIncludePattern: boolean;
+                pattern: string;
+            };
+            client_log_file: {
+                category: string;
+                type: string;
+                filename: string;
+                maxLogSize: number;
+                backups: number;
+            };
+            client_log_date: {
+                category: string;
+                type: string;
+                filename: string;
+                alwaysIncludePattern: boolean;
+                pattern: string;
+            };
+            error_log_file: {
+                category: string;
+                type: string;
+                filename: string;
+                maxLogSize: number;
+                backups: number;
+            };
+        };
+        categories: {
+            default: {
+                appenders: string[];
+                level: string;
+            };
+            console: {
+                appenders: string[];
+                level: string;
+            };
+            log_file: {
+                appenders: string[];
+                level: string;
+            };
+            log_date: {
+                appenders: string[];
+                level: string;
+            };
+            client_log_file: {
+                appenders: string[];
+                level: string;
+            };
+            client_log_date: {
+                appenders: string[];
+                level: string;
+            };
+            error_log_file: {
+                appenders: string[];
+                level: string;
             };
         };
     };

package/lib/Framework/Config/FrameworkConfig.js

@@ -37,78 +37,76 @@ exports.WebServerConfig = WebServerConfig;
 exports.GFCfg = null;
 class FrameworkConfig extends ServerConfig_1.ServerConfig {
     log = {
-        cfg: {
-            appenders: {
-                console: {
-                    "type": "console",
-                    "category": "console"
-                },
-                log_file: {
-                    category: "log_file",
-                    type: "file",
-                    filename: "./logs/log_file/file.log",
-                    maxLogSize: 10 * 1024 * 1024,
-                    backups: 100,
-                },
-                log_date: {
-                    category: "log_date",
-                    type: "dateFile",
-                    filename: "./logs/log_date/date",
-                    alwaysIncludePattern: true,
-                    pattern: "yyyy-MM-dd-hh.log"
-                },
-                client_log_file: {
-                    category: "log_file",
-                    type: "file",
-                    filename: "./logs/client_log_file/file.log",
-                    maxLogSize: 10 * 1024 * 1024,
-                    backups: 100,
-                },
-                client_log_date: {
-                    category: "log_date",
-                    type: "dateFile",
-                    filename: "./logs/client_log_date/date",
-                    alwaysIncludePattern: true,
-                    pattern: "yyyy-MM-dd.log"
-                },
-                error_log_file: {
-                    category: "error_log_file",
-                    type: "file",
-                    filename: "./logs/error_log_file/file.log",
-                    maxLogSize: 5 * 1024 * 1024,
-                    backups: 100,
-                }
+        appenders: {
+            console: {
+                "type": "console",
+                "category": "console"
             },
-            categories: {
-                default: {
-                    appenders: ['log_date'],
-                    level: 'ALL'
-                },
-                console: {
-                    appenders: ['console'],
-                    level: 'ALL'
-                },
-                log_file: {
-                    appenders: ['log_file'],
-                    level: 'ALL'
-                },
-                log_date: {
-                    appenders: ['log_date'],
-                    level: 'ALL'
-                },
-                client_log_file: {
-                    appenders: ['client_log_file'],
-                    level: 'ALL'
-                },
-                client_log_date: {
-                    appenders: ['client_log_date'],
-                    level: 'ALL'
-                },
-                error_log_file: {
-                    appenders: ['error_log_file'],
-                    level: 'ALL'
-                },
+            log_file: {
+                category: "log_file",
+                type: "file",
+                filename: "./logs/log_file/file.log",
+                maxLogSize: 10 * 1024 * 1024,
+                backups: 100,
+            },
+            log_date: {
+                category: "log_date",
+                type: "dateFile",
+                filename: "./logs/log_date/date",
+                alwaysIncludePattern: true,
+                pattern: "yyyy-MM-dd-hh.log"
+            },
+            client_log_file: {
+                category: "log_file",
+                type: "file",
+                filename: "./logs/client_log_file/file.log",
+                maxLogSize: 10 * 1024 * 1024,
+                backups: 100,
+            },
+            client_log_date: {
+                category: "log_date",
+                type: "dateFile",
+                filename: "./logs/client_log_date/date",
+                alwaysIncludePattern: true,
+                pattern: "yyyy-MM-dd.log"
+            },
+            error_log_file: {
+                category: "error_log_file",
+                type: "file",
+                filename: "./logs/error_log_file/file.log",
+                maxLogSize: 5 * 1024 * 1024,
+                backups: 100,
             }
+        },
+        categories: {
+            default: {
+                appenders: ['log_date'],
+                level: 'ALL'
+            },
+            console: {
+                appenders: ['console'],
+                level: 'ALL'
+            },
+            log_file: {
+                appenders: ['log_file'],
+                level: 'ALL'
+            },
+            log_date: {
+                appenders: ['log_date'],
+                level: 'ALL'
+            },
+            client_log_file: {
+                appenders: ['client_log_file'],
+                level: 'ALL'
+            },
+            client_log_date: {
+                appenders: ['client_log_date'],
+                level: 'ALL'
+            },
+            error_log_file: {
+                appenders: ['error_log_file'],
+                level: 'ALL'
+            },
         }
     };
     debug_msg = false;
@@ -215,10 +213,10 @@ class FrameworkConfig extends ServerConfig_1.ServerConfig {
     root_path = process.cwd();
     constructor(server_name) {
         super(server_name);
-        Log_1.GLog.init(this.log.cfg);
     }
     init() {
         let ret = super.init();
+        Log_1.GLog.init(this.log);
         exports.GFCfg = this;
         return ret;
     }

package/lib/Framework/Config/FrameworkConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"FrameworkConfig.js","sourceRoot":"","sources":["../../../Framework/Config/FrameworkConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FrameworkConfig.js","sourceRoot":"","sources":["../../../Framework/Config/FrameworkConfig.ts"],"names":[],"mappings":"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"}

package/lib/Framework/Logic/Log.d.ts

@@ -4,8 +4,8 @@ declare class Log {
     protected _logger: log4js.Logger;
     protected _client_logger: log4js.Logger;
     protected _errorLogger: log4js.Logger;
-    constructor();
-    init(cfg: any): void;
+    protected _inited: boolean;
+    init(cfg: log4js.Configuration): void;
     error(message?: any, ...optionalParams: any[]): void;
     info(message: any, to_console?: any): void;
     warn(message?: any, ...optionalParams: any[]): void;

package/lib/Framework/Logic/Log.js

@@ -27,14 +27,17 @@ class Log {
     _client_logger = null;
     //error and warn
     _errorLogger = null;
-    constructor() {
-        this._logger = log4js.getLogger("log_date");
-        this._client_logger = log4js.getLogger("client_log_date");
-        this._errorLogger = log4js.getLogger("error_log_file");
-    }
+    _inited = false;
     init(cfg) {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
         colors.enable();
         log4js.configure(cfg);
+        this._logger = log4js.getLogger(cfg.categories.default.appenders[0] || "log_date");
+        this._client_logger = log4js.getLogger(cfg.categories.default.appenders[1] || "client_log_date");
+        this._errorLogger = log4js.getLogger(cfg.categories.default.appenders[2] || "error_log_file");
     }
     error(message, ...optionalParams) {
         if (Core_1.core.isObject(message)) {

package/lib/Framework/Logic/Log.js.map

@@ -1 +1 @@
-{"version":3,"file":"Log.js","sourceRoot":"","sources":["../../../Framework/Logic/Log.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Log.js","sourceRoot":"","sources":["../../../Framework/Logic/Log.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "5.4.9",
+  "version": "5.4.10",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -81,7 +81,5 @@
     "websocket": "^1.0.34"
   },
   "devDependencies": {
-    "typedoc": "^0.22.8",
-    "typedoc-webpack-plugin": "^1.1.4"
   }
 }

package/doc/.nojekyll

@@ -1 +0,0 @@
-TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.

package/doc/assets/highlight.css

@@ -1,22 +0,0 @@
-:root {
-    --light-code-background: #FFFFFF;
-    --dark-code-background: #1E1E1E;
-}
-
-@media (prefers-color-scheme: light) { :root {
-    --code-background: var(--light-code-background);
-} }
-
-@media (prefers-color-scheme: dark) { :root {
-    --code-background: var(--dark-code-background);
-} }
-
-body.light {
-    --code-background: var(--light-code-background);
-}
-
-body.dark {
-    --code-background: var(--dark-code-background);
-}
-
-pre, code { background: var(--code-background); }