cgserver 12.0.8 → 12.2.0

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

@@ -1,55 +1,55 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IWebServer = void 0;
-const Engine_1 = require("./Engine/Engine");
-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;
-    /**
-     * 启动服务器
-     * @param server_index 这个是服务器的配置index
-     */
-    async start(cfg, dbcfg) {
-        cgserver_1.gCgServer.addWebServer(this);
-        if (!cfg) {
-            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();
-        this._registerController();
-        this._registerRouter();
-        EventTool_1.gEventTool.emit("web_server_init_done");
-        return true;
-    }
-    pause() {
-        this._engine.pause();
-    }
-    resume() {
-        this._engine.resume();
-    }
-    /**
-     * 注册控制器
-     * eg:GControllerMgr.registerController("Admin","System",SystemController)
-     */
-    _registerController() {
-    }
-    /**
-     * 注册路由
-     */
-    _registerRouter() {
-    }
-}
-exports.IWebServer = IWebServer;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IWebServer = void 0;
+const Engine_1 = require("./Engine/Engine");
+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;
+    /**
+     * 启动服务器
+     * @param server_index 这个是服务器的配置index
+     */
+    async start(cfg, dbcfg) {
+        cgserver_1.gCgServer.addWebServer(this);
+        if (!cfg) {
+            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();
+        this._registerController();
+        this._registerRouter();
+        EventTool_1.gEventTool.emit("web_server_init_done");
+        return true;
+    }
+    pause() {
+        this._engine.pause();
+    }
+    resume() {
+        this._engine.resume();
+    }
+    /**
+     * 注册控制器
+     * eg:GControllerMgr.registerController("Admin","System",SystemController)
+     */
+    _registerController() {
+    }
+    /**
+     * 注册路由
+     */
+    _registerRouter() {
+    }
+}
+exports.IWebServer = IWebServer;

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

@@ -1,44 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IClientWebSocket = void 0;
-const Log_1 = require("../../Logic/Log");
-const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
-const IWebSocket_1 = require("./IWebSocket");
-/**
- * 服务器接收到的客户端的连接
- * 客户端的session对象
- */
-class IClientWebSocket extends IWebSocket_1.IWebSocket {
-    _server = null;
-    get server() {
-        return this._server;
-    }
-    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        super(protoType, protoPath);
-        this._server = server;
-        this._tipKey = this._server.name;
-    }
-    onClose(reasonCode, description) {
-        super.onClose(reasonCode, description);
-        this._server.removeServerWebSocketBySocketId(this._socket_id);
-    }
-    broadCast(data) {
-        if (!data) {
-            Log_1.gLog.info("Send Message warning:null data!");
-            return;
-        }
-        Log_1.gLog.info("broadCast:----------------------------------");
-        Log_1.gLog.info(data);
-        let msg = this._protoFilter.encode(data);
-        this._server.broadCast(msg);
-    }
-    _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgReq");
-        return msg;
-    }
-    _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgRes");
-        return msg;
-    }
-}
-exports.IClientWebSocket = IClientWebSocket;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IClientWebSocket = void 0;
+const Log_1 = require("../../Logic/Log");
+const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
+const IWebSocket_1 = require("./IWebSocket");
+/**
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
+ */
+class IClientWebSocket extends IWebSocket_1.IWebSocket {
+    _server = null;
+    get server() {
+        return this._server;
+    }
+    constructor(server, protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        super(protoType, protoPath);
+        this._server = server;
+        this._tipKey = this._server.name;
+    }
+    onClose(reasonCode, description) {
+        super.onClose(reasonCode, description);
+        this._server.removeServerWebSocketBySocketId(this._socket_id);
+    }
+    broadCast(data) {
+        if (!data) {
+            Log_1.gLog.info("Send Message warning:null data!");
+            return;
+        }
+        Log_1.gLog.info("broadCast:----------------------------------");
+        Log_1.gLog.info(data);
+        let msg = this._protoFilter.encode(data);
+        this._server.broadCast(msg);
+    }
+    _onDecode(message, ...params) {
+        let msg = super._onDecode(message, "msgReq");
+        return msg;
+    }
+    _onEncode(data, ...params) {
+        let msg = super._onEncode(data, "msgRes");
+        return msg;
+    }
+}
+exports.IClientWebSocket = IClientWebSocket;

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

@@ -1,95 +1,128 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerWebSocket = void 0;
-const IWebSocket_1 = require("./IWebSocket");
-const ws = require("websocket");
-const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
-const Log_1 = require("../../Logic/Log");
-/**
- * 连接到服务器的websocket
- * 默认自动重连
- */
-class IServerWebSocket extends IWebSocket_1.IWebSocket {
-    _host = "";
-    /**
-     * 连接的服务器地址
-     */
-    get host() {
-        return this._host;
-    }
-    _port = -1;
-    /**
-     * 连接的服务器端口
-     */
-    get port() {
-        return this._port;
-    }
-    _requestedProtocols = null;
-    get requestedProtocols() {
-        return this._requestedProtocols;
-    }
-    _origin = null;
-    get origin() {
-        return this._origin;
-    }
-    _headers = null;
-    get headers() {
-        return this._headers;
-    }
-    _extraRequestOptions = null;
-    get extraRequestOptions() {
-        return this._extraRequestOptions;
-    }
-    _need_close = false;
-    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        super(protoType, protoPath);
-    }
-    connect(domain, port, requestedProtocols = null, origin = null, headers = null, extraRequestOptions = null) {
-        this._host = domain || this._host;
-        this._port = port || this._port;
-        this._requestedProtocols = requestedProtocols || this._requestedProtocols;
-        this._origin = origin || this._origin;
-        this._headers = headers || this._headers;
-        this._extraRequestOptions = extraRequestOptions || this._extraRequestOptions;
-        this._connect();
-    }
-    _connect() {
-        let url = "ws://" + this._host + ":" + this._port + "/";
-        Log_1.gLog.info("Trying to connect to server : " + url);
-        let _ws = new ws.client();
-        _ws.on("connect", this.onConnect.bind(this));
-        _ws.on("connectFailed", this.onClose.bind(this));
-        _ws.connect(url, this._requestedProtocols, this._origin, this._headers, this._extraRequestOptions);
-    }
-    onOpen(e) {
-        super.onOpen(e);
-        Log_1.gLog.info(this._socket_id + ":success to connect to " + this._host + ":" + this._port);
-    }
-    onClose(reasonCode, description) {
-        super.onClose(reasonCode, description);
-        if (!this._need_close) {
-            setTimeout(() => {
-                if (!this._need_close) {
-                    this._connect();
-                }
-            }, 1000);
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    close() {
-        this._need_close = true;
-        super.close();
-    }
-    _onDecode(message, ...params) {
-        let msg = super._onDecode(message, "msgRes");
-        return msg;
-    }
-    _onEncode(data, ...params) {
-        let msg = super._onEncode(data, "msgReq");
-        return msg;
-    }
-}
-exports.IServerWebSocket = IServerWebSocket;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IServerWebSocket = void 0;
+const IWebSocket_1 = require("./IWebSocket");
+const ws = __importStar(require("websocket"));
+const IProtoFilter_1 = require("../ProtoFilter/IProtoFilter");
+const Log_1 = require("../../Logic/Log");
+/**
+ * 连接到服务器的websocket
+ * 默认自动重连
+ */
+class IServerWebSocket extends IWebSocket_1.IWebSocket {
+    _host = "";
+    /**
+     * 连接的服务器地址
+     */
+    get host() {
+        return this._host;
+    }
+    _port = -1;
+    /**
+     * 连接的服务器端口
+     */
+    get port() {
+        return this._port;
+    }
+    _requestedProtocols = null;
+    get requestedProtocols() {
+        return this._requestedProtocols;
+    }
+    _origin = null;
+    get origin() {
+        return this._origin;
+    }
+    _headers = null;
+    get headers() {
+        return this._headers;
+    }
+    _extraRequestOptions = null;
+    get extraRequestOptions() {
+        return this._extraRequestOptions;
+    }
+    _need_close = false;
+    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        super(protoType, protoPath);
+    }
+    connect(domain, port, requestedProtocols = null, origin = null, headers = null, extraRequestOptions = null) {
+        this._host = domain || this._host;
+        this._port = port || this._port;
+        this._requestedProtocols = requestedProtocols || this._requestedProtocols;
+        this._origin = origin || this._origin;
+        this._headers = headers || this._headers;
+        this._extraRequestOptions = extraRequestOptions || this._extraRequestOptions;
+        this._connect();
+    }
+    _connect() {
+        let url = "ws://" + this._host + ":" + this._port + "/";
+        Log_1.gLog.info("Trying to connect to server : " + url);
+        let _ws = new ws.client();
+        _ws.on("connect", this.onConnect.bind(this));
+        _ws.on("connectFailed", this.onClose.bind(this));
+        _ws.connect(url, this._requestedProtocols, this._origin, this._headers, this._extraRequestOptions);
+    }
+    onOpen(e) {
+        super.onOpen(e);
+        Log_1.gLog.info(this._socket_id + ":success to connect to " + this._host + ":" + this._port);
+    }
+    onClose(reasonCode, description) {
+        super.onClose(reasonCode, description);
+        if (!this._need_close) {
+            setTimeout(() => {
+                if (!this._need_close) {
+                    this._connect();
+                }
+            }, 1000);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    close() {
+        this._need_close = true;
+        super.close();
+    }
+    _onDecode(message, ...params) {
+        let msg = super._onDecode(message, "msgRes");
+        return msg;
+    }
+    _onEncode(data, ...params) {
+        let msg = super._onEncode(data, "msgReq");
+        return msg;
+    }
+}
+exports.IServerWebSocket = IServerWebSocket;