cgserver 12.2.7 → 12.3.0

package/README.md

@@ -1,5 +1,10 @@
 # 版本更新日志
 
+## v12.3.0
+- 中型版本更新
+- webserver websocketserver socketserver均取消默认数据库初始化，打算还是剥离
+- websocketserver支持更强大的ssl配置
+
 ## v12.2.7
 - redis 轻微更新，无实际影响
 

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

@@ -30,7 +30,7 @@ class WebServerConfig {
         onlyModule: "Web",
         defaults: { module: "Web", controller: "Index", action: "Index" }
     };
-    ssl = null;
+    httpsOption = null;
     //默认不跨域
     cors = null;
     static = null;

package/dist/lib/Framework/Config/IServerConfig.js

@@ -4,7 +4,6 @@ exports.gServerCfg = exports.IServerConfig = void 0;
 const Log_1 = require("../Logic/Log");
 const FrameworkConfig_1 = require("./FrameworkConfig");
 class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
-    port = -1;
     _server_name = "";
     get serverName() {
         return this._server_name;

package/dist/lib/Framework/Server/SocketServer/ISocketServer.js

@@ -33,11 +33,16 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ISocketServer = void 0;
+exports.ISocketServer = exports.SocketServerConfig = void 0;
 const cgserver_1 = require("../../cgserver");
 const Log_1 = require("../../Logic/Log");
 const EventTool_1 = require("../../Logic/EventTool");
 const net = __importStar(require("net"));
+class SocketServerConfig {
+    port = 0;
+    name = "";
+}
+exports.SocketServerConfig = SocketServerConfig;
 class ISocketServer {
     _cfg = null;
     //方便提示
@@ -50,7 +55,7 @@ class ISocketServer {
         return this._is_runging;
     }
     get name() {
-        return this._cfg.serverName;
+        return this._cfg.name;
     }
     //监听websocket
     _server = null;
@@ -83,9 +88,6 @@ class ISocketServer {
     }
     async run() {
         cgserver_1.gCgServer.addSocketServer(this);
-        if (this._cfg.db) {
-            await cgserver_1.gCgServer.initDb(this._cfg.db);
-        }
         this.initSocket();
     }
     pause() {
@@ -125,7 +127,7 @@ class ISocketServer {
     onListenning() {
         this._is_runging = true;
         EventTool_1.gEventTool.emit("socket_server_init_done");
-        let info = (new Date()) + "  Server " + this.name + " is listening on port " + this._cfg.port;
+        let info = (new Date()) + "  SocketServer " + this.name + " is listening on port " + this._cfg.port;
         Log_1.gLog.info(info);
     }
     onConnection(socket) {

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

@@ -76,12 +76,10 @@ class Engine {
             Log_1.gLog.error(this._cfg);
             return;
         }
-        if (this._cfg.ssl) {
-            const httpsOption = {
-                key: fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.ssl.key),
-                cert: fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.ssl.crt)
-            };
-            https.createServer(httpsOption, this._app).listen(port, () => {
+        if (this._cfg.httpsOption) {
+            this._cfg.httpsOption.key = fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.httpsOption.key);
+            this._cfg.httpsOption.cert = fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.httpsOption.cert);
+            https.createServer(this._cfg.httpsOption, this._app).listen(port, () => {
                 this._is_running = true;
                 Log_1.gLog.info("Server(" + this._cfg.web_name + ") running at https://127.0.0.1:" + port + "/");
             });

package/dist/lib/Framework/Server/WebServer/IWebServer.js

@@ -6,7 +6,6 @@ const RazorJs_1 = require("./Engine/RazorJs");
 const cgserver_1 = require("../../cgserver");
 const EventTool_1 = require("../../Logic/EventTool");
 const Log_1 = require("../../Logic/Log");
-const IServerConfig_1 = require("../../Config/IServerConfig");
 //实现对controller的手动注册
 class IWebServer {
     _engine = null;
@@ -20,12 +19,6 @@ class IWebServer {
             Log_1.gLog.error("webserver 配置不存在，启动服务器失败");
             return false;
         }
-        if (!dbcfg && IServerConfig_1.gServerCfg) {
-            dbcfg = IServerConfig_1.gServerCfg.db;
-        }
-        if (dbcfg) {
-            await cgserver_1.gCgServer.initDb(dbcfg);
-        }
         //初始化web引擎
         this._engine = new Engine_1.Engine(cfg, new RazorJs_1.RazorJs());
         this._engine.start();

package/dist/lib/Framework/Server/WebSocketServer/IWebSocketServer.js

@@ -33,15 +33,22 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IWebSocketServer = void 0;
+exports.IWebSocketServer = exports.WebSocketServerConfig = void 0;
 const ws = __importStar(require("websocket"));
 const fs = __importStar(require("fs"));
 const http = __importStar(require("http"));
 const https = __importStar(require("https"));
-const Config_1 = require("../../Config/Config");
 const cgserver_1 = require("../../cgserver");
 const Log_1 = require("../../Logic/Log");
 const EventTool_1 = require("../../Logic/EventTool");
+const Config_1 = require("../../Config/Config");
+class WebSocketServerConfig {
+    port = 0;
+    accepted_protocol = null;
+    name = "";
+    ssl_options = null;
+}
+exports.WebSocketServerConfig = WebSocketServerConfig;
 class IWebSocketServer {
     _cfg = null;
     //方便提示
@@ -54,7 +61,7 @@ class IWebSocketServer {
         return this._is_runging;
     }
     get name() {
-        return this._cfg.serverName;
+        return this._cfg.name;
     }
     //监听websocket
     _listening_websocket = null;
@@ -69,10 +76,6 @@ class IWebSocketServer {
     get listenPort() {
         return this._cfg.port;
     }
-    /**
-     * websocket can accepted protocol
-     */
-    _accepted_protocol = null;
     //服务器管理相关
     /*
         item=servername:class
@@ -93,9 +96,6 @@ class IWebSocketServer {
     }
     async run() {
         cgserver_1.gCgServer.addWebSocketServer(this);
-        if (this._cfg.db) {
-            await cgserver_1.gCgServer.initDb(this._cfg.db);
-        }
         this.initWebSocket();
     }
     pause() {
@@ -128,15 +128,12 @@ class IWebSocketServer {
         }
         return true;
     }
-    initWebSocket(wss) {
+    initWebSocket() {
         let server = null;
-        if (wss) {
-            let options = {
-                key: fs.readFileSync(Config_1.Config.rootDataDir + "ssl/ssl2.key"),
-                cert: fs.readFileSync(Config_1.Config.rootDataDir + "ssl/ssl2.crt"),
-                //passphrase:'1234'//如果秘钥文件有密码的话，用这个属性设置密码
-            };
-            server = https.createServer(options, (request, response) => {
+        if (this._cfg.ssl_options) {
+            this._cfg.ssl_options.key = fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.ssl_options.key);
+            this._cfg.ssl_options.cert = fs.readFileSync(Config_1.Config.rootDataDir + this._cfg.ssl_options.cert);
+            server = https.createServer(this._cfg.ssl_options, (request, response) => {
                 Log_1.gLog.info((new Date()) + 'wss Received request for ' + request.url);
                 response.writeHead(200);
                 response.end();
@@ -167,7 +164,13 @@ class IWebSocketServer {
     onListenning() {
         this._is_runging = true;
         EventTool_1.gEventTool.emit("socket_server_init_done");
-        let info = (new Date()) + "  Server " + this.name + " is listening on port " + this._cfg.port;
+        let info = "";
+        if (this._cfg.ssl_options) {
+            info = (new Date()) + "  wss://" + this.name + ":" + this._cfg.port;
+        }
+        else {
+            info = (new Date()) + "  ws://" + this.name + ":" + this._cfg.port;
+        }
         Log_1.gLog.info(info);
     }
     onRequest(req) {
@@ -187,7 +190,7 @@ class IWebSocketServer {
             return;
         }
         try {
-            let conn = req.accept(this._accepted_protocol, req.origin);
+            let conn = req.accept(this._cfg.accepted_protocol, req.origin);
             if (!conn) {
                 Log_1.gLog.error(' protocol reject');
                 return;

package/dist/lib/Framework/index_export_.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheService = exports.MongoCacheModel = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = 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.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.MongoServiceManager = exports.CgRankRankData = exports.CgRankRankItem = exports.CgRankCommandItem = exports.CgRankTool = exports.AliSmsConfig = exports.AlipaySdk = exports.EAlipayExecType = void 0;
-exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.PacketParser = exports.ISocketServer = exports.ISocket = exports.IServerSocket = exports.IClientSocket = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = 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.BaseMsg = exports.IWebSocket = exports.IWebSocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = void 0;
+exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.PacketParser = exports.SocketServerConfig = exports.ISocketServer = exports.ISocket = exports.IServerSocket = exports.IClientSocket = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = 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.BaseMsg = exports.IWebSocket = exports.WebSocketServerConfig = exports.IWebSocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = void 0;
 var AlipayTool_1 = require("./ThirdParty/AlipayTool");
 Object.defineProperty(exports, "EAlipayExecType", { enumerable: true, get: function () { return AlipayTool_1.EAlipayExecType; } });
 var alipay_sdk_1 = require("alipay-sdk");
@@ -108,6 +108,7 @@ var IClientWebSocket_1 = require("./Server/WebSocketServer/IClientWebSocket");
 Object.defineProperty(exports, "IClientWebSocket", { enumerable: true, get: function () { return IClientWebSocket_1.IClientWebSocket; } });
 var IWebSocketServer_1 = require("./Server/WebSocketServer/IWebSocketServer");
 Object.defineProperty(exports, "IWebSocketServer", { enumerable: true, get: function () { return IWebSocketServer_1.IWebSocketServer; } });
+Object.defineProperty(exports, "WebSocketServerConfig", { enumerable: true, get: function () { return IWebSocketServer_1.WebSocketServerConfig; } });
 var IWebSocket_1 = require("./Server/WebSocketServer/IWebSocket");
 Object.defineProperty(exports, "IWebSocket", { enumerable: true, get: function () { return IWebSocket_1.IWebSocket; } });
 Object.defineProperty(exports, "BaseMsg", { enumerable: true, get: function () { return IWebSocket_1.BaseMsg; } });
@@ -156,6 +157,7 @@ var ISocket_1 = require("./Server/SocketServer/ISocket");
 Object.defineProperty(exports, "ISocket", { enumerable: true, get: function () { return ISocket_1.ISocket; } });
 var ISocketServer_1 = require("./Server/SocketServer/ISocketServer");
 Object.defineProperty(exports, "ISocketServer", { enumerable: true, get: function () { return ISocketServer_1.ISocketServer; } });
+Object.defineProperty(exports, "SocketServerConfig", { enumerable: true, get: function () { return ISocketServer_1.SocketServerConfig; } });
 var PacketParser_1 = require("./Server/SocketServer/PacketParser");
 Object.defineProperty(exports, "PacketParser", { enumerable: true, get: function () { return PacketParser_1.PacketParser; } });
 var IRpc_1 = require("./Server/RpcWebSocketServer/IRpc");

package/dist/types/Framework/Config/FrameworkConfig.d.ts

@@ -1,5 +1,7 @@
+import { ServerOptions } from "https";
 import { Config } from "./Config";
 import { DbConfig } from "./DbConfig";
+import * as log4js from "log4js";
 export declare enum ESessionType {
     Cache = 0,
     Redis = 1,
@@ -29,10 +31,7 @@ export declare class WebServerConfig {
             action: string;
         };
     };
-    ssl: {
-        key: string;
-        crt: string;
-    };
+    httpsOption: ServerOptions<any, any>;
     cors: {
         origin: string | string[];
         methods: string | string[];
@@ -72,65 +71,7 @@ declare class WechatConfig {
     redirect_uri: string;
 }
 export declare class FrameworkConfig extends Config {
-    log: {
-        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;
-                numBackups: number;
-            };
-            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;
-                numBackups: number;
-            };
-            error_log_file: {
-                category: string;
-                type: string;
-                filename: string;
-                maxLogSize: number;
-                backups: number;
-            };
-        };
-        categories: {
-            default: {
-                appenders: string[];
-                level: string;
-            };
-            client_logger: {
-                appenders: string[];
-                level: string;
-            };
-            error_logger: {
-                appenders: string[];
-                level: string;
-            };
-        };
-    };
+    log: log4js.Configuration;
     db: DbConfig;
     qiniu: QiNiuConfig;
     email: EmailConfig;

package/dist/types/Framework/Config/IServerConfig.d.ts

@@ -1,6 +1,5 @@
 import { FrameworkConfig } from './FrameworkConfig';
 export declare class IServerConfig extends FrameworkConfig {
-    port: number;
     protected _server_name: string;
     get serverName(): string;
     constructor(server_name: string);

package/dist/types/Framework/Server/SocketServer/ISocketServer.d.ts

@@ -1,10 +1,13 @@
-import { IServerConfig } from '../../Config/IServerConfig';
 import { BaseMsg } from './ISocket';
 import * as net from 'net';
 import { IClientSocket } from './IClientSocket';
+export declare class SocketServerConfig {
+    port: number;
+    name: string;
+}
 export declare class ISocketServer {
-    protected _cfg: IServerConfig;
-    get cfg(): IServerConfig;
+    protected _cfg: SocketServerConfig;
+    get cfg(): SocketServerConfig;
     protected _is_runging: boolean;
     get isrunging(): boolean;
     get name(): string;
@@ -20,7 +23,7 @@ export declare class ISocketServer {
     protected _accepted_protocol: any;
     protected _cls: any;
     registerSocketHandleClass(cls: any): void;
-    constructor(cfg: IServerConfig);
+    constructor(cfg: SocketServerConfig);
     removeServerSocketBySocketId(socketId: number): void;
     run(): Promise<void>;
     pause(): void;

package/dist/types/Framework/Server/WebSocketServer/IWebSocketServer.d.ts

@@ -1,10 +1,17 @@
 import * as ws from 'websocket';
-import { IServerConfig } from '../../Config/IServerConfig';
+import * as http from "http";
+import * as https from "https";
 import { BaseMsg } from './IWebSocket';
 import { IClientWebSocket } from './IClientWebSocket';
+export declare class WebSocketServerConfig {
+    port: number;
+    accepted_protocol: string | null;
+    name: string;
+    ssl_options?: https.ServerOptions<typeof http.IncomingMessage, typeof http.ServerResponse>;
+}
 export declare class IWebSocketServer {
-    protected _cfg: IServerConfig;
-    get cfg(): IServerConfig;
+    protected _cfg: WebSocketServerConfig;
+    get cfg(): WebSocketServerConfig;
     protected _is_runging: boolean;
     get isrunging(): boolean;
     get name(): string;
@@ -17,20 +24,16 @@ export declare class IWebSocketServer {
         [socketid: number]: IClientWebSocket;
     };
     get listenPort(): number;
-    /**
-     * websocket can accepted protocol
-     */
-    protected _accepted_protocol: any;
     protected _name_vs_class: {};
     registerWebSocketHandleClass(name: string, cls: any): void;
-    constructor(cfg: IServerConfig);
+    constructor(cfg: WebSocketServerConfig);
     removeServerWebSocketBySocketId(socketId: number): void;
     run(): Promise<void>;
     pause(): void;
     resume(): void;
     addClient(ws_client: IClientWebSocket): void;
     isOriginAllowed(origin: any): boolean;
-    initWebSocket(wss?: any): void;
+    initWebSocket(): void;
     onClose(connection: ws.connection, reason: number, desc: string): void;
     onListenning(): void;
     onRequest(req: ws.request): void;

package/dist/types/Framework/index_export_.d.ts

@@ -46,7 +46,7 @@ export { IProtoFilter } from './Server/ProtoFilter/IProtoFilter';
 export { JsonProtoFilter } from './Server/ProtoFilter/JsonProtoFilter';
 export { IServerWebSocket } from './Server/WebSocketServer/IServerWebSocket';
 export { IClientWebSocket } from './Server/WebSocketServer/IClientWebSocket';
-export { IWebSocketServer } from './Server/WebSocketServer/IWebSocketServer';
+export { IWebSocketServer, WebSocketServerConfig } from './Server/WebSocketServer/IWebSocketServer';
 export { IWebSocket, BaseMsg } from './Server/WebSocketServer/IWebSocket';
 export { IWebServer } from './Server/WebServer/IWebServer';
 export { BaseController } from './Server/WebServer/Controller/BaseController';
@@ -69,7 +69,7 @@ export { EAccountState } from './Service/ini';
 export { IClientSocket } from './Server/SocketServer/IClientSocket';
 export { IServerSocket } from './Server/SocketServer/IServerSocket';
 export { ISocket } from './Server/SocketServer/ISocket';
-export { ISocketServer } from './Server/SocketServer/ISocketServer';
+export { ISocketServer, SocketServerConfig } from './Server/SocketServer/ISocketServer';
 export { PacketParser } from './Server/SocketServer/PacketParser';
 export { RpcMsg as RpcBaseMsg } from './Server/RpcWebSocketServer/IRpc';
 export { Rpc } from './ThirdParty/Rpc';

package/package.json

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