cgserver 8.6.8 → 8.6.10

package/dist/lib/Framework/Logic/HttpTool.js

@@ -1,75 +1,75 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GHttpTool = void 0;
-const request = require("request");
-const qs = require("querystring");
-const Log_1 = require("./Log");
-const Core_1 = require("../Core/Core");
-exports.GHttpTool = null;
-class HttpTool {
-    get(options_url) {
-        let options = null;
-        if (Core_1.core.isString(options_url)) {
-            options = { url: options_url };
-        }
-        else {
-            options = options_url;
-        }
-        return new Promise((resolve, reject) => {
-            request.get(options, (error, response, body) => {
-                let bd = body;
-                if (error) {
-                    Log_1.GLog.error("get:" + options.url);
-                    Log_1.GLog.error(error);
-                }
-                try {
-                    if (Core_1.core.isString(body)) {
-                        body = JSON.parse(body);
-                    }
-                }
-                catch (e) {
-                    try {
-                        body = qs.parse(body);
-                    }
-                    catch (e) {
-                        body = bd;
-                    }
-                }
-                resolve({ error, response, body });
-            });
-        });
-    }
-    post(options_url) {
-        let options = null;
-        if (Core_1.core.isString(options_url)) {
-            options = { url: options_url };
-        }
-        else {
-            options = options_url;
-        }
-        return new Promise((resolve, reject) => {
-            request.post(options, (error, response, body) => {
-                let bd = body;
-                if (error) {
-                    Log_1.GLog.error("post:" + options.url);
-                    Log_1.GLog.error(error);
-                }
-                try {
-                    if (Core_1.core.isString(body)) {
-                        body = JSON.parse(body);
-                    }
-                }
-                catch (e) {
-                    try {
-                        body = qs.parse(body);
-                    }
-                    catch (e) {
-                        body = bd;
-                    }
-                }
-                resolve({ error, response, body });
-            });
-        });
-    }
-}
-exports.GHttpTool = new HttpTool();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GHttpTool = void 0;
+const request = require("request");
+const qs = require("querystring");
+const Log_1 = require("./Log");
+const Core_1 = require("../Core/Core");
+exports.GHttpTool = null;
+class HttpTool {
+    get(options_url) {
+        let options = null;
+        if (Core_1.core.isString(options_url)) {
+            options = { url: options_url };
+        }
+        else {
+            options = options_url;
+        }
+        return new Promise((resolve, reject) => {
+            request.get(options, (error, response, body) => {
+                let bd = body;
+                if (error) {
+                    Log_1.GLog.error("get:" + options.url);
+                    Log_1.GLog.error(error);
+                }
+                try {
+                    if (Core_1.core.isString(body)) {
+                        body = JSON.parse(body);
+                    }
+                }
+                catch (e) {
+                    try {
+                        body = qs.parse(body);
+                    }
+                    catch (e) {
+                        body = bd;
+                    }
+                }
+                resolve({ error, response, body });
+            });
+        });
+    }
+    post(options_url) {
+        let options = null;
+        if (Core_1.core.isString(options_url)) {
+            options = { url: options_url };
+        }
+        else {
+            options = options_url;
+        }
+        return new Promise((resolve, reject) => {
+            request.post(options, (error, response, body) => {
+                let bd = body;
+                if (error) {
+                    Log_1.GLog.error("post:" + options.url);
+                    Log_1.GLog.error(error);
+                }
+                try {
+                    if (Core_1.core.isString(body)) {
+                        body = JSON.parse(body);
+                    }
+                }
+                catch (e) {
+                    try {
+                        body = qs.parse(body);
+                    }
+                    catch (e) {
+                        body = bd;
+                    }
+                }
+                resolve({ error, response, body });
+            });
+        });
+    }
+}
+exports.GHttpTool = new HttpTool();

package/dist/lib/Framework/Logic/Log.js

@@ -1,140 +1,140 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLog = void 0;
-const colors = require("colors");
-const log4js = require("log4js");
-/**
- * 输出颜色
- */
-colors.setTheme({
-    silly: 'rainbow',
-    input: 'grey',
-    verbose: 'cyan',
-    prompt: 'red',
-    info: 'green',
-    data: 'blue',
-    help: 'cyan',
-    warn: 'yellow',
-    debug: 'magenta',
-    error: 'red'
-});
-exports.GLog = null;
-class Log {
-    //default log
-    _logger = null;
-    //the log from client
-    _client_logger = null;
-    //error and warn
-    _errorLogger = null;
-    _inited = false;
-    /**
-     * 该level只是用来控制控制台的显示的
-     * -1不输出到console，0，仅错误信息输出到console，1，都输出到console
-     */
-    _console_level = 0;
-    init(cfg, console_level = 0) {
-        if (this._inited) {
-            return;
-        }
-        this._inited = true;
-        colors.enable();
-        log4js.configure(cfg);
-        this._logger = log4js.getLogger(cfg.categories.default.appenders[0] || "log_date");
-        this._client_logger = log4js.getLogger(cfg.categories.default.appenders[1] || "client_log_date");
-        this._errorLogger = log4js.getLogger(cfg.categories.default.appenders[2] || "error_log_file");
-        this._console_level = console_level;
-    }
-    error(message) {
-        if (this._isObject(message)) {
-            if (message.stack) {
-                message = message.stack;
-            }
-            else {
-                message = JSON.stringify(message);
-            }
-        }
-        this._errorLogger?.error(message);
-        if (this._console_level >= 0) {
-            let time_str = this._getTimeStr();
-            console.error(time_str + " " + message);
-        }
-    }
-    info(message) {
-        if (this._isObject(message)) {
-            message = JSON.stringify(message);
-        }
-        this._logger?.info(message);
-        if (this._console_level >= 0) {
-            let time_str = this._getTimeStr();
-            console.log(time_str + " " + message);
-        }
-    }
-    warn(message) {
-        if (this._isObject(message)) {
-            message = JSON.stringify(message);
-        }
-        this._errorLogger?.warn(message);
-        if (this._console_level >= 0) {
-            let time_str = this._getTimeStr();
-            console.error(time_str + " " + message);
-        }
-    }
-    record(message) {
-        this.info(message);
-    }
-    clientLog(message) {
-        this._client_logger?.error(message);
-    }
-    _getTimeStr() {
-        let time = new Date();
-        let time_str = this._format(time, "[YYYY-MM-DD HH:mm:SS.");
-        time_str += time.getMilliseconds() + "]";
-        return time_str;
-    }
-    _isObject(param) {
-        return typeof (param) === "object";
-    }
-    _isString(param) {
-        return typeof (param) === "string";
-    }
-    _isNumber(param) {
-        return typeof (param) === "number";
-    }
-    _format(src, formatStr) {
-        if (this._isString(src)) {
-            let args = Array.prototype.slice.call(arguments, 1);
-            return src.replace(/\{(\d+)\}/g, function (m, i) {
-                return args[i];
-            });
-        }
-        else {
-            if (this._isNumber(src)) {
-                src = new Date(src);
-            }
-            let str = formatStr;
-            let Week = ['日', '一', '二', '三', '四', '五', '六'];
-            let month = src.getMonth() + 1;
-            let year = src.getFullYear();
-            let date = src.getDate();
-            let hour = src.getHours();
-            let min = src.getMinutes();
-            let sec = src.getSeconds();
-            let day = src.getDay();
-            str = str.replace(/yyyy|YYYY/, year);
-            str = str.replace(/yy|YY/, (year % 100) > 9 ? (year % 100).toString() : '0' + (year % 100));
-            str = str.replace(/MM/, month > 9 ? month.toString() : '0' + month);
-            str = str.replace(/M/g, month);
-            str = str.replace(/w|W/g, Week[day]);
-            str = str.replace(/dd|DD/, date > 9 ? date.toString() : '0' + date);
-            str = str.replace(/d|D/g, date);
-            str = str.replace(/hh|HH/, hour > 9 ? hour.toString() : '0' + hour);
-            str = str.replace(/h|H/g, hour);
-            str = str.replace(/mm/, min > 9 ? min.toString() : '0' + min);
-            str = str.replace(/m/g, min);
-            str = str.replace(/ss|SS/, sec > 9 ? sec.toString() : '0' + sec);
-            str = str.replace(/s|S/g, sec);
-            return str;
-        }
-    }
-}
-exports.GLog = new Log();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLog = void 0;
+const colors = require("colors");
+const log4js = require("log4js");
+/**
+ * 输出颜色
+ */
+colors.setTheme({
+    silly: 'rainbow',
+    input: 'grey',
+    verbose: 'cyan',
+    prompt: 'red',
+    info: 'green',
+    data: 'blue',
+    help: 'cyan',
+    warn: 'yellow',
+    debug: 'magenta',
+    error: 'red'
+});
+exports.GLog = null;
+class Log {
+    //default log
+    _logger = null;
+    //the log from client
+    _client_logger = null;
+    //error and warn
+    _errorLogger = null;
+    _inited = false;
+    /**
+     * 该level只是用来控制控制台的显示的
+     * -1不输出到console，0，仅错误信息输出到console，1，都输出到console
+     */
+    _console_level = 0;
+    init(cfg, console_level = 0) {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
+        colors.enable();
+        log4js.configure(cfg);
+        this._logger = log4js.getLogger(cfg.categories.default.appenders[0] || "log_date");
+        this._client_logger = log4js.getLogger(cfg.categories.default.appenders[1] || "client_log_date");
+        this._errorLogger = log4js.getLogger(cfg.categories.default.appenders[2] || "error_log_file");
+        this._console_level = console_level;
+    }
+    error(message) {
+        if (this._isObject(message)) {
+            if (message.stack) {
+                message = message.stack;
+            }
+            else {
+                message = JSON.stringify(message);
+            }
+        }
+        this._errorLogger?.error(message);
+        if (this._console_level >= 0) {
+            let time_str = this._getTimeStr();
+            console.error(time_str + " " + message);
+        }
+    }
+    info(message) {
+        if (this._isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._logger?.info(message);
+        if (this._console_level >= 0) {
+            let time_str = this._getTimeStr();
+            console.log(time_str + " " + message);
+        }
+    }
+    warn(message) {
+        if (this._isObject(message)) {
+            message = JSON.stringify(message);
+        }
+        this._errorLogger?.warn(message);
+        if (this._console_level >= 0) {
+            let time_str = this._getTimeStr();
+            console.error(time_str + " " + message);
+        }
+    }
+    record(message) {
+        this.info(message);
+    }
+    clientLog(message) {
+        this._client_logger?.error(message);
+    }
+    _getTimeStr() {
+        let time = new Date();
+        let time_str = this._format(time, "[YYYY-MM-DD HH:mm:SS.");
+        time_str += time.getMilliseconds() + "]";
+        return time_str;
+    }
+    _isObject(param) {
+        return typeof (param) === "object";
+    }
+    _isString(param) {
+        return typeof (param) === "string";
+    }
+    _isNumber(param) {
+        return typeof (param) === "number";
+    }
+    _format(src, formatStr) {
+        if (this._isString(src)) {
+            let args = Array.prototype.slice.call(arguments, 1);
+            return src.replace(/\{(\d+)\}/g, function (m, i) {
+                return args[i];
+            });
+        }
+        else {
+            if (this._isNumber(src)) {
+                src = new Date(src);
+            }
+            let str = formatStr;
+            let Week = ['日', '一', '二', '三', '四', '五', '六'];
+            let month = src.getMonth() + 1;
+            let year = src.getFullYear();
+            let date = src.getDate();
+            let hour = src.getHours();
+            let min = src.getMinutes();
+            let sec = src.getSeconds();
+            let day = src.getDay();
+            str = str.replace(/yyyy|YYYY/, year);
+            str = str.replace(/yy|YY/, (year % 100) > 9 ? (year % 100).toString() : '0' + (year % 100));
+            str = str.replace(/MM/, month > 9 ? month.toString() : '0' + month);
+            str = str.replace(/M/g, month);
+            str = str.replace(/w|W/g, Week[day]);
+            str = str.replace(/dd|DD/, date > 9 ? date.toString() : '0' + date);
+            str = str.replace(/d|D/g, date);
+            str = str.replace(/hh|HH/, hour > 9 ? hour.toString() : '0' + hour);
+            str = str.replace(/h|H/g, hour);
+            str = str.replace(/mm/, min > 9 ? min.toString() : '0' + min);
+            str = str.replace(/m/g, min);
+            str = str.replace(/ss|SS/, sec > 9 ? sec.toString() : '0' + sec);
+            str = str.replace(/s|S/g, sec);
+            return str;
+        }
+    }
+}
+exports.GLog = new Log();

package/dist/lib/Framework/Logic/SyncQueueTool.js

@@ -1,43 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GSyncQueueTool = void 0;
-const Core_1 = require("../Core/Core");
-class SyncQueueItem {
-    key = "";
-    running = false;
-    funcs = [];
-    constructor(key) {
-        this.key = key;
-    }
-    async add(func, thisArg = null, ...params) {
-        return new Promise((resolve, reject) => {
-            this.funcs.push({ func: func, thisArg: thisArg, params: params, resolve: resolve });
-            this._run();
-        });
-    }
-    async _run() {
-        if (this.running) {
-            return;
-        }
-        this.running = true;
-        while (this.funcs.length > 0) {
-            let funcitem = this.funcs.shift();
-            if (!funcitem.func) {
-                continue;
-            }
-            let rs = await Core_1.core.safeCall(funcitem.func, funcitem.thisArg, ...funcitem.params);
-            await Core_1.core.safeCall(funcitem.resolve, null, rs);
-        }
-        this.running = false;
-    }
-}
-class SyncQueueTool {
-    //队列数据,一个key队列必须有先后
-    _queues = {};
-    async add(key, func, thisArg = null, ...params) {
-        this._queues[key] = this._queues[key] || new SyncQueueItem(key);
-        let error = await this._queues[key].add(func, thisArg, ...params);
-        return error;
-    }
-}
-exports.GSyncQueueTool = new SyncQueueTool();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GSyncQueueTool = void 0;
+const Core_1 = require("../Core/Core");
+class SyncQueueItem {
+    key = "";
+    running = false;
+    funcs = [];
+    constructor(key) {
+        this.key = key;
+    }
+    async add(func, thisArg = null, ...params) {
+        return new Promise((resolve, reject) => {
+            this.funcs.push({ func: func, thisArg: thisArg, params: params, resolve: resolve });
+            this._run();
+        });
+    }
+    async _run() {
+        if (this.running) {
+            return;
+        }
+        this.running = true;
+        while (this.funcs.length > 0) {
+            let funcitem = this.funcs.shift();
+            if (!funcitem.func) {
+                continue;
+            }
+            let rs = await Core_1.core.safeCall(funcitem.func, funcitem.thisArg, ...funcitem.params);
+            await Core_1.core.safeCall(funcitem.resolve, null, rs);
+        }
+        this.running = false;
+    }
+}
+class SyncQueueTool {
+    //队列数据,一个key队列必须有先后
+    _queues = {};
+    async add(key, func, thisArg = null, ...params) {
+        this._queues[key] = this._queues[key] || new SyncQueueItem(key);
+        let error = await this._queues[key].add(func, thisArg, ...params);
+        return error;
+    }
+}
+exports.GSyncQueueTool = new SyncQueueTool();