cgserver 8.6.8 → 8.7.0

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

@@ -1,237 +1,237 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Request = void 0;
-const url_1 = require("url");
-const Core_1 = require("../../Core/Core");
-const Log_1 = require("../../Logic/Log");
-class Request {
-    _req = null;
-    get baseReq() {
-        return this._req;
-    }
-    _cfg = null;
-    _post_cb = null;
-    set onPost(value) {
-        this._post_cb = value;
-    }
-    _module = "";
-    get module() {
-        return this._module;
-    }
-    _controller = "";
-    get controller() {
-        return this._controller;
-    }
-    _action = "";
-    get action() {
-        return this._action;
-    }
-    _suffix = "";
-    get suffix() {
-        return this._suffix;
-    }
-    _file_url = null;
-    get fileUrl() {
-        return this._file_url;
-    }
-    _params = {};
-    get params() {
-        var body = (this._req.query || {});
-        for (let k in body) {
-            var v = body[k];
-            if (!Core_1.core.isString(v)) {
-                continue;
-            }
-            if (parseInt(v) == v) {
-                body[k] = parseInt(v);
-            }
-            else if (parseFloat(v) == v) {
-                body[k] == parseFloat(v);
-            }
-        }
-        return body;
-    }
-    get postData() {
-        var body = this._req.body || {};
-        if (this._req.headers["content-type"] == "application/x-www-form-urlencoded") {
-            for (let k in body) {
-                body = k;
-                break;
-            }
-        }
-        if (Core_1.core.isString(body)) {
-            try {
-                body = JSON.parse(body);
-            }
-            catch (e) {
-                Log_1.GLog.error("post data--" + body + "--parse error");
-                body = {};
-            }
-        }
-        // 暂时去掉强制数值转换
-        // //服务器会有一层空key的json解析
-        // for(let k in body)
-        // {
-        //     var v = body[k]
-        //     if(!core.isString(v))
-        //     {
-        //         continue
-        //     }
-        //     let intv = parseInt(v)
-        //     if(intv==v)
-        //     {
-        //         body[k]=intv
-        //     }
-        //     else if(parseFloat(v)==v)
-        //     {
-        //         body[k]==parseFloat(v)
-        //     }
-        // }
-        return body;
-    }
-    get url() {
-        return this._req.url;
-    }
-    get root() {
-        let root = this._req.headers.host;
-        if (root != "") {
-            root = this._req.protocol + "://" + root;
-        }
-        return root;
-    }
-    get method() {
-        return this._req.method;
-    }
-    get headers() {
-        return this._req.headers;
-    }
-    get remoteHost() {
-        let ips = this._req.headers['x-forwarded-for'];
-        let ip = "";
-        if (Core_1.core.isArray(ips)) {
-            ip = ips[0];
-        }
-        else {
-            ip = ips;
-        }
-        ip = ip ||
-            this._req.connection.remoteAddress ||
-            this._req.socket.remoteAddress ||
-            this._req.ip || "";
-        ip = ip.replace("::ffff:", "");
-        return ip;
-    }
-    constructor(req, cfg) {
-        this._cfg = cfg;
-        this._req = req;
-        this._init();
-    }
-    getCookie(key) {
-        let cookie_key = this._cfg.cookie.prefix + key;
-        if (!this._req.cookies) {
-            return null;
-        }
-        return this._req.cookies[cookie_key];
-    }
-    _init() {
-        let method = this._req.method.toLowerCase();
-        if (method != "get" && method != "post") {
-            return;
-        }
-        let path = this._req.url;
-        //服务器根目录路径写法，链接转换
-        let _i = path.lastIndexOf("~");
-        if (_i >= 0) {
-            path = path.substr(_i + 1);
-        }
-        //处理参数
-        this._parseParams(path);
-    }
-    _addListener(event, listener) {
-        this._req.addListener(event, listener);
-    }
-    _parseParams(path) {
-        this._module = this._cfg.routs.onlyModule || this._cfg.routs.defaults.module;
-        this._controller = this._cfg.routs.defaults.controller;
-        this._action = this._cfg.routs.defaults.action;
-        this._suffix = null;
-        this._file_url = null;
-        this._params = {};
-        if (path == "/") {
-            return;
-        }
-        let firstQuoteIndex = path.indexOf("?");
-        let preQuoteStr = path;
-        if (firstQuoteIndex > 0) {
-            preQuoteStr = path.substring(0, firstQuoteIndex);
-        }
-        let lastDotIndex = preQuoteStr.lastIndexOf(".");
-        if (lastDotIndex > 0) {
-            let dotStr = preQuoteStr.substring(lastDotIndex + 1);
-            this._suffix = dotStr;
-            this._file_url = preQuoteStr;
-            return;
-        }
-        let quote_index = path.indexOf("?");
-        if (quote_index >= 0) {
-            let url = new url_1.URL(path);
-            url.searchParams.forEach((value, name, searchParams) => {
-                this._params[name] = value;
-            });
-            path = path.substring(0, quote_index);
-        }
-        let params = path.split("/");
-        let default_module = false;
-        if (this._cfg.routs.onlyModule) {
-            default_module = true;
-        }
-        if (params.length > 1 && params[1].length > 0) {
-            /**
-             * 如果是only模式，那么就不支持controller和module相同，
-             * 如果相同则认为是模块名，这样就可以同时支持，带模块的路径模式和非带模块的路径模式了
-             */
-            if (default_module
-                && params[1].toLowerCase() == this._cfg.routs.onlyModule.toLowerCase()) {
-                default_module = false;
-            }
-            if (default_module) {
-                this._controller = params[1];
-            }
-            else {
-                this._module = params[1];
-            }
-        }
-        if (params.length > 2 && params[2].length > 0) {
-            if (default_module) {
-                this._action = params[2];
-            }
-            else {
-                this._controller = params[2];
-            }
-        }
-        if (params.length > 3
-            && params[3].length > 0
-            && !default_module) {
-            this._action = params[3];
-        }
-        this._params = this._params || {};
-        return;
-    }
-    debugInfo() {
-        if (!this._cfg.debug) {
-            return;
-        }
-        let debuginfo = {
-            module: this._module,
-            controller: this._controller,
-            action: this._action,
-            suffix: this._suffix,
-            file_url: this._file_url,
-            params: this._params,
-            post: this.postData,
-            method: this._req.method.toLowerCase()
-        };
-        Log_1.GLog.info(debuginfo);
-    }
-}
-exports.Request = Request;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Request = void 0;
+const url_1 = require("url");
+const Core_1 = require("../../Core/Core");
+const Log_1 = require("../../Logic/Log");
+class Request {
+    _req = null;
+    get baseReq() {
+        return this._req;
+    }
+    _cfg = null;
+    _post_cb = null;
+    set onPost(value) {
+        this._post_cb = value;
+    }
+    _module = "";
+    get module() {
+        return this._module;
+    }
+    _controller = "";
+    get controller() {
+        return this._controller;
+    }
+    _action = "";
+    get action() {
+        return this._action;
+    }
+    _suffix = "";
+    get suffix() {
+        return this._suffix;
+    }
+    _file_url = null;
+    get fileUrl() {
+        return this._file_url;
+    }
+    _params = {};
+    get params() {
+        var body = (this._req.query || {});
+        for (let k in body) {
+            var v = body[k];
+            if (!Core_1.core.isString(v)) {
+                continue;
+            }
+            if (parseInt(v) == v) {
+                body[k] = parseInt(v);
+            }
+            else if (parseFloat(v) == v) {
+                body[k] == parseFloat(v);
+            }
+        }
+        return body;
+    }
+    get postData() {
+        var body = this._req.body || {};
+        if (this._req.headers["content-type"] == "application/x-www-form-urlencoded") {
+            for (let k in body) {
+                body = k;
+                break;
+            }
+        }
+        if (Core_1.core.isString(body)) {
+            try {
+                body = JSON.parse(body);
+            }
+            catch (e) {
+                Log_1.GLog.error("post data--" + body + "--parse error");
+                body = {};
+            }
+        }
+        // 暂时去掉强制数值转换
+        // //服务器会有一层空key的json解析
+        // for(let k in body)
+        // {
+        //     var v = body[k]
+        //     if(!core.isString(v))
+        //     {
+        //         continue
+        //     }
+        //     let intv = parseInt(v)
+        //     if(intv==v)
+        //     {
+        //         body[k]=intv
+        //     }
+        //     else if(parseFloat(v)==v)
+        //     {
+        //         body[k]==parseFloat(v)
+        //     }
+        // }
+        return body;
+    }
+    get url() {
+        return this._req.url;
+    }
+    get root() {
+        let root = this._req.headers.host;
+        if (root != "") {
+            root = this._req.protocol + "://" + root;
+        }
+        return root;
+    }
+    get method() {
+        return this._req.method;
+    }
+    get headers() {
+        return this._req.headers;
+    }
+    get remoteHost() {
+        let ips = this._req.headers['x-forwarded-for'];
+        let ip = "";
+        if (Core_1.core.isArray(ips)) {
+            ip = ips[0];
+        }
+        else {
+            ip = ips;
+        }
+        ip = ip ||
+            this._req.connection.remoteAddress ||
+            this._req.socket.remoteAddress ||
+            this._req.ip || "";
+        ip = ip.replace("::ffff:", "");
+        return ip;
+    }
+    constructor(req, cfg) {
+        this._cfg = cfg;
+        this._req = req;
+        this._init();
+    }
+    getCookie(key) {
+        let cookie_key = this._cfg.cookie.prefix + key;
+        if (!this._req.cookies) {
+            return null;
+        }
+        return this._req.cookies[cookie_key];
+    }
+    _init() {
+        let method = this._req.method.toLowerCase();
+        if (method != "get" && method != "post") {
+            return;
+        }
+        let path = this._req.url;
+        //服务器根目录路径写法，链接转换
+        let _i = path.lastIndexOf("~");
+        if (_i >= 0) {
+            path = path.substr(_i + 1);
+        }
+        //处理参数
+        this._parseParams(path);
+    }
+    _addListener(event, listener) {
+        this._req.addListener(event, listener);
+    }
+    _parseParams(path) {
+        this._module = this._cfg.routs.onlyModule || this._cfg.routs.defaults.module;
+        this._controller = this._cfg.routs.defaults.controller;
+        this._action = this._cfg.routs.defaults.action;
+        this._suffix = null;
+        this._file_url = null;
+        this._params = {};
+        if (path == "/") {
+            return;
+        }
+        let firstQuoteIndex = path.indexOf("?");
+        let preQuoteStr = path;
+        if (firstQuoteIndex > 0) {
+            preQuoteStr = path.substring(0, firstQuoteIndex);
+        }
+        let lastDotIndex = preQuoteStr.lastIndexOf(".");
+        if (lastDotIndex > 0) {
+            let dotStr = preQuoteStr.substring(lastDotIndex + 1);
+            this._suffix = dotStr;
+            this._file_url = preQuoteStr;
+            return;
+        }
+        let quote_index = path.indexOf("?");
+        if (quote_index >= 0) {
+            let url = new url_1.URL(path);
+            url.searchParams.forEach((value, name, searchParams) => {
+                this._params[name] = value;
+            });
+            path = path.substring(0, quote_index);
+        }
+        let params = path.split("/");
+        let default_module = false;
+        if (this._cfg.routs.onlyModule) {
+            default_module = true;
+        }
+        if (params.length > 1 && params[1].length > 0) {
+            /**
+             * 如果是only模式，那么就不支持controller和module相同，
+             * 如果相同则认为是模块名，这样就可以同时支持，带模块的路径模式和非带模块的路径模式了
+             */
+            if (default_module
+                && params[1].toLowerCase() == this._cfg.routs.onlyModule.toLowerCase()) {
+                default_module = false;
+            }
+            if (default_module) {
+                this._controller = params[1];
+            }
+            else {
+                this._module = params[1];
+            }
+        }
+        if (params.length > 2 && params[2].length > 0) {
+            if (default_module) {
+                this._action = params[2];
+            }
+            else {
+                this._controller = params[2];
+            }
+        }
+        if (params.length > 3
+            && params[3].length > 0
+            && !default_module) {
+            this._action = params[3];
+        }
+        this._params = this._params || {};
+        return;
+    }
+    debugInfo() {
+        if (!this._cfg.debug) {
+            return;
+        }
+        let debuginfo = {
+            module: this._module,
+            controller: this._controller,
+            action: this._action,
+            suffix: this._suffix,
+            file_url: this._file_url,
+            params: this._params,
+            post: this.postData,
+            method: this._req.method.toLowerCase()
+        };
+        Log_1.GLog.info(debuginfo);
+    }
+}
+exports.Request = Request;

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

@@ -1,100 +1,100 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Response = void 0;
-const fs = require("fs");
-const mime = require("mime");
-const Log_1 = require("../../Logic/Log");
-class Response {
-    _res = null;
-    _cookie_prefix = "";
-    _cfg = null;
-    _create_time = -1;
-    constructor(res, cfg) {
-        this._cfg = cfg;
-        this._res = res;
-        this._cookie_prefix = this._cfg.cookie.prefix;
-        this._init();
-    }
-    _init() {
-        this._create_time = Date.now();
-    }
-    /**
-     *
-     * @param key
-     * @param value
-     * @param time 秒
-     */
-    setCookie(key, value, time) {
-        key = this._cookie_prefix + key;
-        if (time) {
-            this._res.cookie(key, value, { maxAge: time * 1000, httpOnly: true });
-        }
-        else {
-            this._res.cookie(key, value, { httpOnly: true });
-        }
-    }
-    clearCookie(key) {
-        this.setCookie(key, "", -1000);
-    }
-    redirect(path) {
-        this._res.writeHead(302, { 'Location': path });
-        this._res.end();
-    }
-    renderJson(data, origin) {
-        this._res.json(data);
-        this.debugInfo(data);
-    }
-    renderJson404(origin) {
-        this._res.status(404).json();
-    }
-    renderJson500(origin) {
-        this._res.status(500).json();
-        this.debugInfo("500");
-    }
-    renderHtml(html) {
-        this._res.send(html || "");
-    }
-    render404(html) {
-        this._res.status(404).send(html || "没找到该页面");
-    }
-    render500(html) {
-        this._res.status(500).send(html || "服务器内部错误500");
-    }
-    renderOptions(method, origin) {
-        this._res.sendStatus(204);
-    }
-    renderFile(fullPath) {
-        this._res.sendFile(fullPath);
-    }
-    downloadFile(fullPath) {
-        let fileName = "";
-        let quote_index = fullPath.indexOf("/");
-        if (quote_index > 0) {
-            fileName = fullPath.substring(quote_index + 1);
-        }
-        fs.stat(fullPath, (err, stats) => {
-            if (!stats || stats.isDirectory()) {
-                return this.render404("");
-            }
-            let size = stats.size;
-            var f = fs.createReadStream(fullPath);
-            this._res.writeHead(200, {
-                'Content-Type': mime.getType(fullPath) || 'application/octet-stream',
-                'Content-Disposition': 'attachment; filename=' + fileName,
-                'Content-Length': size
-            });
-            f.pipe(this._res);
-        });
-    }
-    render304() {
-        this._res.sendStatus(304);
-    }
-    debugInfo(data) {
-        if (!this._cfg.debug) {
-            return;
-        }
-        Log_1.GLog.info("dttime:" + (Date.now() - this._create_time).toLocaleString() + "ms");
-        Log_1.GLog.info(data);
-    }
-}
-exports.Response = Response;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Response = void 0;
+const fs = require("fs");
+const mime_1 = require("mime");
+const Log_1 = require("../../Logic/Log");
+class Response {
+    _res = null;
+    _cookie_prefix = "";
+    _cfg = null;
+    _create_time = -1;
+    constructor(res, cfg) {
+        this._cfg = cfg;
+        this._res = res;
+        this._cookie_prefix = this._cfg.cookie.prefix;
+        this._init();
+    }
+    _init() {
+        this._create_time = Date.now();
+    }
+    /**
+     *
+     * @param key
+     * @param value
+     * @param time 秒
+     */
+    setCookie(key, value, time) {
+        key = this._cookie_prefix + key;
+        if (time) {
+            this._res.cookie(key, value, { maxAge: time * 1000, httpOnly: true });
+        }
+        else {
+            this._res.cookie(key, value, { httpOnly: true });
+        }
+    }
+    clearCookie(key) {
+        this.setCookie(key, "", -1000);
+    }
+    redirect(path) {
+        this._res.writeHead(302, { 'Location': path });
+        this._res.end();
+    }
+    renderJson(data, origin) {
+        this._res.json(data);
+        this.debugInfo(data);
+    }
+    renderJson404(origin) {
+        this._res.status(404).json();
+    }
+    renderJson500(origin) {
+        this._res.status(500).json();
+        this.debugInfo("500");
+    }
+    renderHtml(html) {
+        this._res.send(html || "");
+    }
+    render404(html) {
+        this._res.status(404).send(html || "没找到该页面");
+    }
+    render500(html) {
+        this._res.status(500).send(html || "服务器内部错误500");
+    }
+    renderOptions(method, origin) {
+        this._res.sendStatus(204);
+    }
+    renderFile(fullPath) {
+        this._res.sendFile(fullPath);
+    }
+    downloadFile(fullPath) {
+        let fileName = "";
+        let quote_index = fullPath.indexOf("/");
+        if (quote_index > 0) {
+            fileName = fullPath.substring(quote_index + 1);
+        }
+        fs.stat(fullPath, (err, stats) => {
+            if (!stats || stats.isDirectory()) {
+                return this.render404("");
+            }
+            let size = stats.size;
+            var f = fs.createReadStream(fullPath);
+            this._res.writeHead(200, {
+                'Content-Type': mime_1.default.getType(fullPath) || 'application/octet-stream',
+                'Content-Disposition': 'attachment; filename=' + fileName,
+                'Content-Length': size
+            });
+            f.pipe(this._res);
+        });
+    }
+    render304() {
+        this._res.sendStatus(304);
+    }
+    debugInfo(data) {
+        if (!this._cfg.debug) {
+            return;
+        }
+        Log_1.GLog.info("dttime:" + (Date.now() - this._create_time).toLocaleString() + "ms");
+        Log_1.GLog.info(data);
+    }
+}
+exports.Response = Response;