cgserver 7.8.2113 → 7.9.2113

package/dist/lib/WebServer/Engine/RazorJs.js

@@ -1,7 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.RazorJs = void 0;
-const Log_1 = require("./../../Logic/Log");
+var Log_1 = require("./../../Logic/Log");
 'use strict';
 var _suffix = ".cshtml";
 var _MATCH_HTML = /[&<>\'"]/g;
@@ -59,7 +59,7 @@ var utils = {
         reset: function () {
             this._data = {};
         }
-    },
+    }
 };
 utils.escapeXML.toString = function () {
     return Function.prototype.toString.call(this) + ';\n' + this.escapeFuncStr;
@@ -75,21 +75,21 @@ var _OPTS = ['cache', 'filename', 'delimiter', 'scope', 'context',
 ];
 var _TRAILING_SEMCOL = /;\s*$/;
 var _BOM = /^\uFEFF/;
-class RazorJs {
-    _request = null;
-    _response = null;
-    cache = utils.cache;
-    localsName = _DEFAULT_LOCALS_NAME;
-    constructor() {
+var RazorJs = /** @class */ (function () {
+    function RazorJs() {
+        this._request = null;
+        this._response = null;
+        this.cache = utils.cache;
+        this.localsName = _DEFAULT_LOCALS_NAME;
     }
-    resolveInclude(name, filename) {
+    RazorJs.prototype.resolveInclude = function (name, filename) {
         var path = require('path'), dirname = path.dirname, extname = path.extname, resolve = path.resolve, includePath = resolve(dirname(filename), name), ext = extname(name);
         if (!ext) {
             includePath += _suffix;
         }
         return includePath;
-    }
-    _handleCache(options, template) {
+    };
+    RazorJs.prototype._handleCache = function (options, template) {
         var fn;
         var path = options.filename;
         var hasTemplate = arguments.length > 1;
@@ -118,16 +118,16 @@ class RazorJs {
             this.cache.set(path, fn);
         }
         return fn;
-    }
-    includeFile(path, options) {
+    };
+    RazorJs.prototype.includeFile = function (path, options) {
         var opts = utils.shallowCopy({}, options);
         if (!opts.filename) {
             throw new Error('`include` requires the \'filename\' option.');
         }
         opts.filename = this.resolveInclude(path, opts.filename);
         return this._handleCache(opts);
-    }
-    includeSource(path, options) {
+    };
+    RazorJs.prototype.includeSource = function (path, options) {
         var opts = utils.shallowCopy({}, options), includePath, template;
         includePath = path;
         /*
@@ -154,15 +154,15 @@ class RazorJs {
         var templ = new Template(this, template, opts);
         templ.generateSource();
         return templ.source;
-    }
-    _cpOptsInData(data, opts) {
+    };
+    RazorJs.prototype._cpOptsInData = function (data, opts) {
         _OPTS.forEach(function (p) {
             if (typeof data[p] != 'undefined') {
                 opts[p] = data[p];
             }
         });
-    }
-    compile(template, opts) {
+    };
+    RazorJs.prototype.compile = function (template, opts) {
         var templ;
         // v1 compat
         // 'scope' is 'context'
@@ -179,8 +179,8 @@ class RazorJs {
         }
         templ = new Template(this, template, opts);
         return templ.compile();
-    }
-    render(req, res, tmpl_path, data, opts) {
+    };
+    RazorJs.prototype.render = function (req, res, tmpl_path, data, opts) {
         this._request = req;
         this._response = res;
         var cs_path = tmpl_path + ".cshtml";
@@ -203,8 +203,8 @@ class RazorJs {
             this._cpOptsInData(data, opts);
         }
         return this._handleCache(opts, template)(data);
-    }
-    renderFile() {
+    };
+    RazorJs.prototype.renderFile = function () {
         var args = Array.prototype.slice.call(arguments), path = args.shift(), cb = args.pop(), data = args.shift() || {}, opts = args.pop() || {}, result;
         // Don't pollute passed in opts obj with new vals
         opts = utils.shallowCopy({}, opts);
@@ -228,11 +228,12 @@ class RazorJs {
             return cb(err);
         }
         return cb(null, result);
-    }
-    clearCache() {
+    };
+    RazorJs.prototype.clearCache = function () {
         this.cache.reset();
-    }
-}
+    };
+    return RazorJs;
+}());
 exports.RazorJs = RazorJs;
 var rethrow = function (err, str, filename, lineno) {
     var lines = str.split('\n'), start = Math.max(lineno - 3, 0), end = Math.min(lines.length, lineno + 3);
@@ -252,24 +253,24 @@ var rethrow = function (err, str, filename, lineno) {
         + err.message;
     throw err;
 };
-class Template {
-    _razorJs = null;
-    templateText = "";
-    mode = null;
-    truncate = false;
-    currentLine = 1;
-    source = "";
-    dependencies = [];
-    opts = null;
-    regex = null;
-    modes = {
-        EVAL: 'eval',
-        ESCAPED: 'escaped',
-        RAW: 'raw',
-        COMMENT: 'comment',
-        LITERAL: 'literal'
-    };
-    constructor(razorjs, text, opts) {
+var Template = /** @class */ (function () {
+    function Template(razorjs, text, opts) {
+        this._razorJs = null;
+        this.templateText = "";
+        this.mode = null;
+        this.truncate = false;
+        this.currentLine = 1;
+        this.source = "";
+        this.dependencies = [];
+        this.opts = null;
+        this.regex = null;
+        this.modes = {
+            EVAL: 'eval',
+            ESCAPED: 'escaped',
+            RAW: 'raw',
+            COMMENT: 'comment',
+            LITERAL: 'literal'
+        };
         this._razorJs = razorjs;
         opts = opts || {};
         this.templateText = text;
@@ -285,7 +286,7 @@ class Template {
             cache: opts.cache || false,
             rmWhitespace: opts.rmWhitespace,
             localsName: opts.localsName || exports.localsName || _DEFAULT_LOCALS_NAME,
-            _with: false,
+            _with: false
         };
         if (!options.strict) {
             options._with = typeof opts._with != 'undefined' ? opts._with : true;
@@ -293,12 +294,13 @@ class Template {
         this.opts = options;
         this.regex = this.createRegex();
     }
-    createRegex() {
+    Template.prototype.createRegex = function () {
         var str = _REGEX_STRING, delim = utils.escapeRegExpChars(this.opts.delimiter);
         str = str.replace(/%/g, delim);
         return new RegExp(str);
-    }
-    compile() {
+    };
+    Template.prototype.compile = function () {
+        var _this = this;
         var src, fn, opts = this.opts, prepended = '', appended = '', escape = opts.escapeFunction;
         if (opts.rmWhitespace) {
             // Have to use two separate replace here as `^` and `$` operators don't
@@ -365,20 +367,20 @@ class Template {
         // Return a callable function which will execute the function
         // created by the source-code, with the passed data as locals
         // Adds a local `include` function which allows full recursive include
-        var returnedFn = (data) => {
-            var include = (path, includeData) => {
+        var returnedFn = function (data) {
+            var include = function (path, includeData) {
                 var d = utils.shallowCopy({}, data);
                 if (includeData) {
                     d = utils.shallowCopy(d, includeData);
                 }
-                return this._razorJs.includeFile(path, opts)(d);
+                return _this._razorJs.includeFile(path, opts)(d);
             };
             return fn.apply(opts.context, [data || {}, escape, include, rethrow]);
         };
         returnedFn.dependencies = this.dependencies;
         return returnedFn;
-    }
-    generateSource() {
+    };
+    Template.prototype.generateSource = function () {
         var self = this;
         var matches = this.parseTemplateText();
         var d = this.opts.delimiter;
@@ -417,8 +419,8 @@ class Template {
                 self.scanLine(line);
             });
         }
-    }
-    parseTemplateText() {
+    };
+    Template.prototype.parseTemplateText = function () {
         var str = this.templateText, pat = this.regex, result = pat.exec(str), arr = [], firstPos, lastPos;
         while (result) {
             firstPos = result.index;
@@ -435,8 +437,8 @@ class Template {
             arr.push(str);
         }
         return arr;
-    }
-    scanLine(line) {
+    };
+    Template.prototype.scanLine = function (line) {
         var self = this, d = this.opts.delimiter, newLineCount = 0;
         function _addOutput() {
             if (self.truncate) {
@@ -540,5 +542,6 @@ class Template {
             this.currentLine += newLineCount;
             this.source += '    ; __line = ' + this.currentLine + '\n';
         }
-    }
-}
+    };
+    return Template;
+}());

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

@@ -1,135 +1,192 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = 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;
+var url_1 = require("url");
+var Core_1 = require("../../Core/Core");
+var Log_1 = require("../../Logic/Log");
+var Request = /** @class */ (function () {
+    function Request(req, cfg) {
+        this._req = null;
+        this._cfg = null;
+        this._post_cb = null;
+        this._module = "";
+        this._controller = "";
+        this._action = "";
+        this._suffix = "";
+        this._file_url = null;
+        this._params = {};
+        this._cfg = cfg;
+        this._req = req;
+        this._init();
     }
-    _params = {};
-    get params() {
-        var body = (this._req.query || {});
-        for (let k in body) {
-            var v = body[k];
-            if (!Core_1.core.isString(v)) {
-                continue;
+    Object.defineProperty(Request.prototype, "baseReq", {
+        get: function () {
+            return this._req;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "onPost", {
+        set: function (value) {
+            this._post_cb = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "module", {
+        get: function () {
+            return this._module;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "controller", {
+        get: function () {
+            return this._controller;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "action", {
+        get: function () {
+            return this._action;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "suffix", {
+        get: function () {
+            return this._suffix;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "fileUrl", {
+        get: function () {
+            return this._file_url;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "params", {
+        get: function () {
+            var body = (this._req.query || {});
+            for (var 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);
+                }
             }
-            if (parseInt(v) == v) {
-                body[k] = parseInt(v);
+            return body;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "postData", {
+        get: function () {
+            var body = this._req.body || {};
+            //服务器会有一层空key的json解析
+            for (var 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);
+                }
             }
-            else if (parseFloat(v) == v) {
-                body[k] == parseFloat(v);
-            }
-        }
-        return body;
-    }
-    get postData() {
-        var body = this._req.body || {};
-        //服务器会有一层空key的json解析
-        for (let k in body) {
-            var v = body[k];
-            if (!Core_1.core.isString(v)) {
-                continue;
+            return body;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "url", {
+        get: function () {
+            return this._req.url;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "root", {
+        get: function () {
+            var root = this._req.headers.host;
+            if (root != "") {
+                root = this._req.protocol + "://" + root;
             }
-            if (parseInt(v) == v) {
-                body[k] = parseInt(v);
+            return root;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "method", {
+        get: function () {
+            return this._req.method;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "headers", {
+        get: function () {
+            return this._req.headers;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Request.prototype, "remoteHost", {
+        get: function () {
+            var ips = this._req.headers['x-forwarded-for'];
+            var ip = "";
+            if (Core_1.core.isArray(ips)) {
+                ip = ips[0];
             }
-            else if (parseFloat(v) == v) {
-                body[k] == parseFloat(v);
+            else {
+                ip = ips;
             }
-        }
-        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;
+            ip = ip ||
+                this._req.connection.remoteAddress ||
+                this._req.socket.remoteAddress ||
+                this._req.ip || "";
+            ip = ip.replace("::ffff:", "");
+            return ip;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Request.prototype.getCookie = function (key) {
+        var 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();
+    };
+    Request.prototype._init = function () {
+        var method = this._req.method.toLowerCase();
         if (method != "get" && method != "post") {
             return;
         }
-        let path = this._req.url;
+        var path = this._req.url;
         //服务器根目录路径写法，链接转换
-        let _i = path.lastIndexOf("~");
+        var _i = path.lastIndexOf("~");
         if (_i >= 0) {
             path = path.substr(_i + 1);
         }
         //处理参数
         this._parseParams(path);
-    }
-    _addListener(event, listener) {
+    };
+    Request.prototype._addListener = function (event, listener) {
         this._req.addListener(event, listener);
-    }
-    _parseParams(path) {
+    };
+    Request.prototype._parseParams = function (path) {
+        var _this = this;
         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;
@@ -139,28 +196,28 @@ class Request {
         if (path == "/") {
             return;
         }
-        let firstQuoteIndex = path.indexOf("?");
-        let preQuoteStr = path;
+        var firstQuoteIndex = path.indexOf("?");
+        var preQuoteStr = path;
         if (firstQuoteIndex > 0) {
             preQuoteStr = path.substring(0, firstQuoteIndex);
         }
-        let lastDotIndex = preQuoteStr.lastIndexOf(".");
+        var lastDotIndex = preQuoteStr.lastIndexOf(".");
         if (lastDotIndex > 0) {
-            let dotStr = preQuoteStr.substring(lastDotIndex + 1);
+            var dotStr = preQuoteStr.substring(lastDotIndex + 1);
             this._suffix = dotStr;
             this._file_url = preQuoteStr;
             return;
         }
-        let quote_index = path.indexOf("?");
+        var 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;
+            var url = new url_1.URL(path);
+            url.searchParams.forEach(function (value, name, searchParams) {
+                _this._params[name] = value;
             });
             path = path.substring(0, quote_index);
         }
-        let params = path.split("/");
-        let default_module = false;
+        var params = path.split("/");
+        var default_module = false;
         if (this._cfg.routs.onlyModule) {
             default_module = true;
         }
@@ -195,12 +252,12 @@ class Request {
         }
         this._params = this._params || {};
         return;
-    }
-    debugInfo() {
+    };
+    Request.prototype.debugInfo = function () {
         if (!this._cfg.debug) {
             return;
         }
-        let debuginfo = {
+        var debuginfo = {
             module: this._module,
             controller: this._controller,
             action: this._action,
@@ -211,6 +268,7 @@ class Request {
             method: this._req.method.toLowerCase()
         };
         Log_1.GLog.info(debuginfo);
-    }
-}
+    };
+    return Request;
+}());
 exports.Request = Request;