cgserver 12.0.8 → 12.2.0

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

@@ -1,105 +1,138 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gHttpTool = exports.HttpTool = void 0;
-const request = require("request");
-const qs = require("querystring");
-const Core_1 = require("../Core/Core");
-const Log_1 = require("./Log");
-class HttpTool {
-    _debug = false;
-    get debug() {
-        return this._debug;
-    }
-    set debug(value) {
-        this._debug = value;
-    }
-    get(options_url) {
-        let time = Date.now();
-        let options = null;
-        if (Core_1.core.isString(options_url)) {
-            options = { url: options_url };
-        }
-        else {
-            options = options_url;
-        }
-        if (this._debug) {
-            Log_1.gLog.info("prepare get:" + options.url);
-        }
-        return new Promise((resolve, reject) => {
-            request.get(options, (error, response, body) => {
-                let originbody = 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 = originbody;
-                    }
-                }
-                if (this._debug) {
-                    Log_1.gLog.info({
-                        dttime: (Date.now() - time) + "ms",
-                        url: options.url,
-                        originbody: originbody
-                    });
-                }
-                resolve({ error, response, body, originbody });
-            });
-        });
-    }
-    post(options_url) {
-        let time = Date.now();
-        let options = null;
-        if (Core_1.core.isString(options_url)) {
-            options = { url: options_url };
-        }
-        else {
-            options = options_url;
-        }
-        if (this._debug) {
-            Log_1.gLog.info("prepare post:" + options.url);
-            Log_1.gLog.info("prepare post data:" + JSON.stringify(options.json || options.body || options.formData || options.form || options.qs));
-        }
-        return new Promise((resolve, reject) => {
-            request.post(options, (error, response, body) => {
-                let originbody = 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 = originbody;
-                    }
-                }
-                if (this._debug) {
-                    Log_1.gLog.info({
-                        dttime: (Date.now() - time) + "ms",
-                        url: options.url,
-                        originbody: originbody
-                    });
-                }
-                resolve({ error, response, body, originbody });
-            });
-        });
-    }
-}
-exports.HttpTool = HttpTool;
-exports.gHttpTool = new HttpTool();
+"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.gHttpTool = exports.HttpTool = void 0;
+const request = __importStar(require("request"));
+const qs = __importStar(require("querystring"));
+const Core_1 = require("../Core/Core");
+const Log_1 = require("./Log");
+class HttpTool {
+    _debug = false;
+    get debug() {
+        return this._debug;
+    }
+    set debug(value) {
+        this._debug = value;
+    }
+    get(options_url) {
+        let time = Date.now();
+        let options = null;
+        if (Core_1.core.isString(options_url)) {
+            options = { url: options_url };
+        }
+        else {
+            options = options_url;
+        }
+        if (this._debug) {
+            Log_1.gLog.info("prepare get:" + options.url);
+        }
+        return new Promise((resolve, reject) => {
+            request.get(options, (error, response, body) => {
+                let originbody = 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 = originbody;
+                    }
+                }
+                if (this._debug) {
+                    Log_1.gLog.info({
+                        dttime: (Date.now() - time) + "ms",
+                        url: options.url,
+                        originbody: originbody
+                    });
+                }
+                resolve({ error, response, body, originbody });
+            });
+        });
+    }
+    post(options_url) {
+        let time = Date.now();
+        let options = null;
+        if (Core_1.core.isString(options_url)) {
+            options = { url: options_url };
+        }
+        else {
+            options = options_url;
+        }
+        if (this._debug) {
+            Log_1.gLog.info("prepare post:" + options.url);
+            Log_1.gLog.info("prepare post data:" + JSON.stringify(options.json || options.body || options.formData || options.form || options.qs));
+        }
+        return new Promise((resolve, reject) => {
+            request.post(options, (error, response, body) => {
+                let originbody = 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 = originbody;
+                    }
+                }
+                if (this._debug) {
+                    Log_1.gLog.info({
+                        dttime: (Date.now() - time) + "ms",
+                        url: options.url,
+                        originbody: originbody
+                    });
+                }
+                resolve({ error, response, body, originbody });
+            });
+        });
+    }
+}
+exports.HttpTool = HttpTool;
+exports.gHttpTool = new HttpTool();

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

@@ -1,88 +1,121 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gLog = exports.Log = 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'
-});
-class Log {
-    //default log
-    _logger = null;
-    //the log from client
-    _client_logger = null;
-    //error and warn
-    _error_logger = null;
-    _inited = false;
-    init(cfg) {
-        if (this._inited) {
-            return;
-        }
-        this._inited = true;
-        if (!cfg) {
-            return;
-        }
-        colors.enable();
-        log4js.configure(cfg);
-        this._logger = log4js.getLogger();
-        if (cfg.categories.client_logger) {
-            this._client_logger = log4js.getLogger("client_logger");
-        }
-        if (cfg.categories.error_logger && cfg.categories.error_logger.appenders.length > 0) {
-            this._error_logger = log4js.getLogger("error_logger");
-        }
-    }
-    _convertMsg(message) {
-        if (this._isObject(message)) {
-            if (message.stack) {
-                message = message.stack;
-            }
-            else {
-                message = JSON.stringify(message);
-            }
-        }
-        return message;
-    }
-    error(message) {
-        message = this._convertMsg(message);
-        this._error_logger?.error(message);
-    }
-    info(message) {
-        message = this._convertMsg(message);
-        this._logger?.info(message);
-    }
-    warn(message) {
-        message = this._convertMsg(message);
-        this._error_logger?.warn(message);
-    }
-    record(message) {
-        this.info(message);
-    }
-    clientLog(message) {
-        message = this._convertMsg(message);
-        this._client_logger?.info(message);
-    }
-    _isObject(param) {
-        return typeof (param) === "object";
-    }
-    _isString(param) {
-        return typeof (param) === "string";
-    }
-    _isNumber(param) {
-        return typeof (param) === "number";
-    }
-}
-exports.Log = Log;
-exports.gLog = new Log();
+"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.gLog = exports.Log = void 0;
+const colors = __importStar(require("colors"));
+const log4js = __importStar(require("log4js"));
+/**
+ * 输出颜色
+ */
+colors.setTheme({
+    silly: 'rainbow',
+    input: 'grey',
+    verbose: 'cyan',
+    prompt: 'red',
+    info: 'green',
+    data: 'blue',
+    help: 'cyan',
+    warn: 'yellow',
+    debug: 'magenta',
+    error: 'red'
+});
+class Log {
+    //default log
+    _logger = null;
+    //the log from client
+    _client_logger = null;
+    //error and warn
+    _error_logger = null;
+    _inited = false;
+    init(cfg) {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
+        if (!cfg) {
+            return;
+        }
+        colors.enable();
+        log4js.configure(cfg);
+        this._logger = log4js.getLogger();
+        if (cfg.categories.client_logger) {
+            this._client_logger = log4js.getLogger("client_logger");
+        }
+        if (cfg.categories.error_logger && cfg.categories.error_logger.appenders.length > 0) {
+            this._error_logger = log4js.getLogger("error_logger");
+        }
+    }
+    _convertMsg(message) {
+        if (this._isObject(message)) {
+            if (message.stack) {
+                message = message.stack;
+            }
+            else {
+                message = JSON.stringify(message);
+            }
+        }
+        return message;
+    }
+    error(message) {
+        message = this._convertMsg(message);
+        this._error_logger?.error(message);
+    }
+    info(message) {
+        message = this._convertMsg(message);
+        this._logger?.info(message);
+    }
+    warn(message) {
+        message = this._convertMsg(message);
+        this._error_logger?.warn(message);
+    }
+    record(message) {
+        this.info(message);
+    }
+    clientLog(message) {
+        message = this._convertMsg(message);
+        this._client_logger?.info(message);
+    }
+    _isObject(param) {
+        return typeof (param) === "object";
+    }
+    _isString(param) {
+        return typeof (param) === "string";
+    }
+    _isNumber(param) {
+        return typeof (param) === "number";
+    }
+}
+exports.Log = Log;
+exports.gLog = new Log();

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

@@ -1,44 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gSyncQueueTool = exports.SyncQueueTool = 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.SyncQueueTool = SyncQueueTool;
-exports.gSyncQueueTool = new SyncQueueTool();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gSyncQueueTool = exports.SyncQueueTool = 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.SyncQueueTool = SyncQueueTool;
+exports.gSyncQueueTool = new SyncQueueTool();