cgserver 12.0.8 → 12.2.0

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

@@ -1,144 +1,177 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ISocketServer = void 0;
-const cgserver_1 = require("../../cgserver");
-const Log_1 = require("../../Logic/Log");
-const EventTool_1 = require("../../Logic/EventTool");
-const net = require("net");
-class ISocketServer {
-    _cfg = null;
-    //方便提示
-    get cfg() {
-        return this._cfg;
-    }
-    //服务器已被关闭
-    _is_runging = false;
-    get isrunging() {
-        return this._is_runging;
-    }
-    get name() {
-        return this._cfg.serverName;
-    }
-    //监听websocket
-    _server = null;
-    get server() {
-        return this._server;
-    }
-    //来自于用户的链接
-    _clients = {};
-    get listenPort() {
-        return this._cfg.port;
-    }
-    /**
-     * websocket can accepted protocol
-     */
-    _accepted_protocol = null;
-    //服务器管理相关
-    /*
-        item=servername:class
-    */
-    _cls = null;
-    registerSocketHandleClass(cls) {
-        this._cls = cls;
-    }
-    constructor(cfg) {
-        this._cfg = cfg;
-    }
-    removeServerSocketBySocketId(socketId) {
-        this._clients[socketId] = null;
-        delete this._clients[socketId];
-    }
-    async run() {
-        cgserver_1.gCgServer.addSocketServer(this);
-        if (this._cfg.db) {
-            await cgserver_1.gCgServer.initDb(this._cfg.db);
-        }
-        this.initSocket();
-    }
-    pause() {
-        if (!this._is_runging) {
-            Log_1.gLog.error("socketserver has paused:" + this._cfg.port);
-            return;
-        }
-        this._is_runging = false;
-        for (let key in this._clients) {
-            this._clients[key].close();
-        }
-        Log_1.gLog.info("socketserver paused:" + this._cfg.port);
-    }
-    resume() {
-        if (this._is_runging) {
-            Log_1.gLog.error("socketserver is running:" + this._cfg.port);
-            return;
-        }
-        this._is_runging = true;
-        Log_1.gLog.error("socketserver resumed:" + this._cfg.port);
-    }
-    /*
-        把所有的客户端链接保存起来
-        方便统计，广播等
-    */
-    addClient(ws_client) {
-        this._clients[ws_client.socketId] = ws_client;
-    }
-    initSocket(wss) {
-        this._server = net.createServer();
-        this._server.listen(this._cfg.port, this.onListenning.bind(this));
-        this._server.on("connection", this.onConnection.bind(this));
-        this._server.on('close', this.onClose.bind(this));
-    }
-    onClose() {
-    }
-    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;
-        Log_1.gLog.info(info);
-    }
-    onConnection(socket) {
-        if (!this._is_runging) {
-            socket.end();
-            Log_1.gLog.error(' Connection rejected.');
-            return;
-        }
-        try {
-            Log_1.gLog.info((new Date()) + ' Connection accepted.');
-            this.createSocketObjectByProtocol(socket);
-        }
-        catch (e) {
-            Log_1.gLog.error(' protocol reject');
-        }
-    }
-    createSocketObjectByProtocol(socket) {
-        let cls = this._cls;
-        if (!cls) {
-            Log_1.gLog.error("(createSocketObjectByProtocol in server(" + this.name + "))no this socket handle class");
-            return null;
-        }
-        let s_client = (new cls(this));
-        this.addClient(s_client);
-        s_client.onConnect(socket);
-        return s_client;
-    }
-    /**
-     * 广播消息
-     * @param msg
-     */
-    broadCast(msg) {
-        for (var key in this._clients) {
-            let ws = this._clients[key];
-            ws.send(msg);
-        }
-    }
-    /**
-     * 获取任意客户端连接
-     * @returns
-     */
-    getAnyWebSocket() {
-        for (var key in this._clients) {
-            return this._clients[key];
-        }
-        return null;
-    }
-}
-exports.ISocketServer = ISocketServer;
+"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.ISocketServer = 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 ISocketServer {
+    _cfg = null;
+    //方便提示
+    get cfg() {
+        return this._cfg;
+    }
+    //服务器已被关闭
+    _is_runging = false;
+    get isrunging() {
+        return this._is_runging;
+    }
+    get name() {
+        return this._cfg.serverName;
+    }
+    //监听websocket
+    _server = null;
+    get server() {
+        return this._server;
+    }
+    //来自于用户的链接
+    _clients = {};
+    get listenPort() {
+        return this._cfg.port;
+    }
+    /**
+     * websocket can accepted protocol
+     */
+    _accepted_protocol = null;
+    //服务器管理相关
+    /*
+        item=servername:class
+    */
+    _cls = null;
+    registerSocketHandleClass(cls) {
+        this._cls = cls;
+    }
+    constructor(cfg) {
+        this._cfg = cfg;
+    }
+    removeServerSocketBySocketId(socketId) {
+        this._clients[socketId] = null;
+        delete this._clients[socketId];
+    }
+    async run() {
+        cgserver_1.gCgServer.addSocketServer(this);
+        if (this._cfg.db) {
+            await cgserver_1.gCgServer.initDb(this._cfg.db);
+        }
+        this.initSocket();
+    }
+    pause() {
+        if (!this._is_runging) {
+            Log_1.gLog.error("socketserver has paused:" + this._cfg.port);
+            return;
+        }
+        this._is_runging = false;
+        for (let key in this._clients) {
+            this._clients[key].close();
+        }
+        Log_1.gLog.info("socketserver paused:" + this._cfg.port);
+    }
+    resume() {
+        if (this._is_runging) {
+            Log_1.gLog.error("socketserver is running:" + this._cfg.port);
+            return;
+        }
+        this._is_runging = true;
+        Log_1.gLog.error("socketserver resumed:" + this._cfg.port);
+    }
+    /*
+        把所有的客户端链接保存起来
+        方便统计，广播等
+    */
+    addClient(ws_client) {
+        this._clients[ws_client.socketId] = ws_client;
+    }
+    initSocket(wss) {
+        this._server = net.createServer();
+        this._server.listen(this._cfg.port, this.onListenning.bind(this));
+        this._server.on("connection", this.onConnection.bind(this));
+        this._server.on('close', this.onClose.bind(this));
+    }
+    onClose() {
+    }
+    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;
+        Log_1.gLog.info(info);
+    }
+    onConnection(socket) {
+        if (!this._is_runging) {
+            socket.end();
+            Log_1.gLog.error(' Connection rejected.');
+            return;
+        }
+        try {
+            Log_1.gLog.info((new Date()) + ' Connection accepted.');
+            this.createSocketObjectByProtocol(socket);
+        }
+        catch (e) {
+            Log_1.gLog.error(' protocol reject');
+        }
+    }
+    createSocketObjectByProtocol(socket) {
+        let cls = this._cls;
+        if (!cls) {
+            Log_1.gLog.error("(createSocketObjectByProtocol in server(" + this.name + "))no this socket handle class");
+            return null;
+        }
+        let s_client = (new cls(this));
+        this.addClient(s_client);
+        s_client.onConnect(socket);
+        return s_client;
+    }
+    /**
+     * 广播消息
+     * @param msg
+     */
+    broadCast(msg) {
+        for (var key in this._clients) {
+            let ws = this._clients[key];
+            ws.send(msg);
+        }
+    }
+    /**
+     * 获取任意客户端连接
+     * @returns
+     */
+    getAnyWebSocket() {
+        for (var key in this._clients) {
+            return this._clients[key];
+        }
+        return null;
+    }
+}
+exports.ISocketServer = ISocketServer;

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

@@ -1,40 +1,40 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PacketParser = void 0;
-class PacketParser {
-    buffer;
-    offset;
-    constructor() {
-        this.buffer = Buffer.alloc(0);
-        this.offset = 0;
-    }
-    push(chunk) {
-        const newBuffer = Buffer.alloc(this.buffer.length + chunk.length);
-        this.buffer.copy(newBuffer, 0);
-        chunk.copy(newBuffer, this.buffer.length);
-        this.buffer = newBuffer;
-    }
-    parse() {
-        if (this.buffer.length < 4)
-            return null;
-        // Read packet length (first 4 bytes)
-        const length = this.buffer.readUInt32BE(0);
-        if (this.buffer.length < length + 4)
-            return null;
-        // Extract packet
-        const packet = this.buffer.slice(4, length + 4);
-        // Remove parsed data from buffer
-        this.buffer = this.buffer.slice(length + 4);
-        return packet;
-    }
-    pack(data) {
-        const length = data.length;
-        const packet = Buffer.alloc(length + 4);
-        // Write length header
-        packet.writeUInt32BE(length, 0);
-        // Write data
-        data.copy(packet, 4);
-        return packet;
-    }
-}
-exports.PacketParser = PacketParser;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PacketParser = void 0;
+class PacketParser {
+    buffer;
+    offset;
+    constructor() {
+        this.buffer = Buffer.alloc(0);
+        this.offset = 0;
+    }
+    push(chunk) {
+        const newBuffer = Buffer.alloc(this.buffer.length + chunk.length);
+        this.buffer.copy(newBuffer, 0);
+        chunk.copy(newBuffer, this.buffer.length);
+        this.buffer = newBuffer;
+    }
+    parse() {
+        if (this.buffer.length < 4)
+            return null;
+        // Read packet length (first 4 bytes)
+        const length = this.buffer.readUInt32BE(0);
+        if (this.buffer.length < length + 4)
+            return null;
+        // Extract packet
+        const packet = this.buffer.slice(4, length + 4);
+        // Remove parsed data from buffer
+        this.buffer = this.buffer.slice(length + 4);
+        return packet;
+    }
+    pack(data) {
+        const length = data.length;
+        const packet = Buffer.alloc(length + 4);
+        // Write length header
+        packet.writeUInt32BE(length, 0);
+        // Write data
+        data.copy(packet, 4);
+        return packet;
+    }
+}
+exports.PacketParser = PacketParser;

package/dist/lib/Framework/Server/WebServer/Controller/BaseController.js

@@ -1,119 +1,119 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseController = void 0;
-class BaseController {
-    _request = null;
-    get request() {
-        return this._request;
-    }
-    _response = null;
-    get response() {
-        return this._response;
-    }
-    //模块名称
-    _module = "";
-    _ctr_name = "";
-    get ctrName() {
-        return this._ctr_name;
-    }
-    _engine = null;
-    get postData() {
-        if (!this._request) {
-            return {};
-        }
-        return this._request.postData || {};
-    }
-    get paramData() {
-        if (!this._request) {
-            return {};
-        }
-        return this._request.params || {};
-    }
-    constructor(req, res, engine) {
-        this._engine = engine;
-        this._request = req;
-        this._response = res;
-        //静态控制器，传过来全是空
-        if (this._request) {
-            this._request.debugInfo();
-        }
-    }
-    async init() {
-    }
-    /**
-     * 方便static ctr使用
-     * @param req
-     * @param res
-     * @param engine
-     */
-    initStatic(req, res, engine) {
-        this._engine = engine;
-        this._request = req;
-        this._response = res;
-        this._request.debugInfo();
-    }
-    //填充每个页面需要的通用数据
-    _init_data(model) {
-        model = model || {};
-        model.webName = this._engine.cfg.web_name;
-        return { model };
-    }
-    showJson(model) {
-        this._response.renderJson(model);
-    }
-    show(model) {
-        let html = this._engine.getRenderHtml(this._request, this._response, this._init_data(model));
-        this._response.renderHtml(html);
-    }
-    showText(text, noMeta) {
-        if (!noMeta) {
-            text = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />" + text;
-        }
-        this._response.renderHtml(text);
-    }
-    redirect(module, controller, action, params) {
-        module = module || this._module;
-        controller = controller || this._ctr_name;
-        let url = this.parseFullUrl(module, controller, action);
-        params = params || {};
-        let str_p = "";
-        for (let key in params) {
-            str_p += "&" + key + "=" + params[key];
-        }
-        if (str_p.length > 0) {
-            str_p = "?" + str_p.substring(1);
-        }
-        url += str_p;
-        this._response.redirect(url);
-    }
-    parseFullUrl(module, controller, action) {
-        if (typeof action === "undefined" || !action) {
-            action = "index";
-            if (this._engine.cfg.routs.defaults.action == action) {
-                action = null;
-            }
-        }
-        let url = "";
-        if (this._engine.cfg.routs.onlyModule) {
-            url = this._request.root + "/" + controller;
-        }
-        else {
-            url = this._request.root + "/" + module + "/" + controller;
-        }
-        if (action) {
-            url += "/" + action;
-        }
-        return url;
-    }
-    get remoteHost() {
-        return this._request.remoteHost;
-    }
-    forceDebug() {
-        //静态控制器，传过来全是空
-        if (this._request) {
-            this._request.debugInfo();
-        }
-        this._response.debug = true;
-    }
-}
-exports.BaseController = BaseController;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseController = void 0;
+class BaseController {
+    _request = null;
+    get request() {
+        return this._request;
+    }
+    _response = null;
+    get response() {
+        return this._response;
+    }
+    //模块名称
+    _module = "";
+    _ctr_name = "";
+    get ctrName() {
+        return this._ctr_name;
+    }
+    _engine = null;
+    get postData() {
+        if (!this._request) {
+            return {};
+        }
+        return this._request.postData || {};
+    }
+    get paramData() {
+        if (!this._request) {
+            return {};
+        }
+        return this._request.params || {};
+    }
+    constructor(req, res, engine) {
+        this._engine = engine;
+        this._request = req;
+        this._response = res;
+        //静态控制器，传过来全是空
+        if (this._request) {
+            this._request.debugInfo();
+        }
+    }
+    async init() {
+    }
+    /**
+     * 方便static ctr使用
+     * @param req
+     * @param res
+     * @param engine
+     */
+    initStatic(req, res, engine) {
+        this._engine = engine;
+        this._request = req;
+        this._response = res;
+        this._request.debugInfo();
+    }
+    //填充每个页面需要的通用数据
+    _init_data(model) {
+        model = model || {};
+        model.webName = this._engine.cfg.web_name;
+        return { model };
+    }
+    showJson(model) {
+        this._response.renderJson(model);
+    }
+    show(model) {
+        let html = this._engine.getRenderHtml(this._request, this._response, this._init_data(model));
+        this._response.renderHtml(html);
+    }
+    showText(text, noMeta) {
+        if (!noMeta) {
+            text = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />" + text;
+        }
+        this._response.renderHtml(text);
+    }
+    redirect(module, controller, action, params) {
+        module = module || this._module;
+        controller = controller || this._ctr_name;
+        let url = this.parseFullUrl(module, controller, action);
+        params = params || {};
+        let str_p = "";
+        for (let key in params) {
+            str_p += "&" + key + "=" + params[key];
+        }
+        if (str_p.length > 0) {
+            str_p = "?" + str_p.substring(1);
+        }
+        url += str_p;
+        this._response.redirect(url);
+    }
+    parseFullUrl(module, controller, action) {
+        if (typeof action === "undefined" || !action) {
+            action = "index";
+            if (this._engine.cfg.routs.defaults.action == action) {
+                action = null;
+            }
+        }
+        let url = "";
+        if (this._engine.cfg.routs.onlyModule) {
+            url = this._request.root + "/" + controller;
+        }
+        else {
+            url = this._request.root + "/" + module + "/" + controller;
+        }
+        if (action) {
+            url += "/" + action;
+        }
+        return url;
+    }
+    get remoteHost() {
+        return this._request.remoteHost;
+    }
+    forceDebug() {
+        //静态控制器，传过来全是空
+        if (this._request) {
+            this._request.debugInfo();
+        }
+        this._response.debug = true;
+    }
+}
+exports.BaseController = BaseController;