cgserver 6.4.2 → 6.4.4

package/dist/lib/Core/Core.js

@@ -5,6 +5,7 @@ let os = require('os');
 let request = require('request');
 const _ = require("underscore");
 const crypto = require("crypto");
+const Log_1 = require("../Logic/Log");
 /**
  * 常用的工具函数类
  */
@@ -564,5 +565,35 @@ class core {
             }, milliseconds);
         });
     }
+    static async safeCall(func, thisArg = null, ...params) {
+        if (!func) {
+            return;
+        }
+        try {
+            if (core.isAsyncFunc(func)) {
+                if (thisArg) {
+                    await func.call(thisArg, params).catch((reason) => {
+                        Log_1.GLog.error(reason);
+                    });
+                }
+                else {
+                    await func(params).catch((reason) => {
+                        Log_1.GLog.error(reason);
+                    });
+                }
+            }
+            else {
+                if (thisArg) {
+                    func.call(thisArg, params);
+                }
+                else {
+                    func(params);
+                }
+            }
+        }
+        catch (e) {
+            Log_1.GLog.error(e.stack);
+        }
+    }
 }
 exports.core = core;

package/dist/lib/Logic/AsyncQueueTool.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GAsyncQueueTool = void 0;
 const cgserver_1 = require("../cgserver");
-const Log_1 = require("./Log");
 class AsyncQueueItem {
     key = "";
     running = false;
@@ -10,9 +9,11 @@ class AsyncQueueItem {
     constructor(key) {
         this.key = key;
     }
-    add(func, cb) {
-        this.funcs.push({ func: func, cb: cb });
-        this._run();
+    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) {
@@ -20,29 +21,12 @@ class AsyncQueueItem {
         }
         this.running = true;
         while (this.funcs.length > 0) {
-            try {
-                let funcitem = this.funcs.shift();
-                if (!funcitem.func) {
-                    continue;
-                }
-                if (cgserver_1.core.isAsyncFunc(funcitem.func)) {
-                    await funcitem.func().catch((error) => {
-                        Log_1.GLog.error(error);
-                    });
-                    if (funcitem.cb) {
-                        funcitem.cb();
-                    }
-                }
-                else {
-                    funcitem.func();
-                    if (funcitem.cb) {
-                        funcitem.cb();
-                    }
-                }
-            }
-            catch (error) {
-                Log_1.GLog.error(error);
+            let funcitem = this.funcs.shift();
+            if (!funcitem.func) {
+                continue;
             }
+            await cgserver_1.core.safeCall(funcitem.func, funcitem.thisArg, funcitem.params);
+            await cgserver_1.core.safeCall(funcitem.resolve);
         }
         this.running = false;
     }

package/dist/lib/Logic/HelpTool.js

@@ -0,0 +1,2 @@
+class HelpTool {
+}

package/dist/lib/Logic/Log.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLog = void 0;
-const Core_1 = require("../Core/Core");
 const colors = require("colors");
 const log4js = require("log4js");
 /**
@@ -40,29 +39,29 @@ class Log {
         this._errorLogger = log4js.getLogger(cfg.categories.default.appenders[2] || "error_log_file");
     }
     error(message, ...optionalParams) {
-        if (Core_1.core.isObject(message)) {
+        if (this.isObject(message)) {
             message = JSON.stringify(message);
         }
         this._errorLogger.error(message);
         var time = new Date();
-        var time_str = Core_1.core.format(time, "[YYYY-MM-DD HH:mm:SS.");
+        var time_str = this.format(time, "[YYYY-MM-DD HH:mm:SS.");
         time_str += time.getMilliseconds() + "]";
         console.error(time_str + " " + message);
     }
     info(message, to_console) {
-        if (Core_1.core.isObject(message)) {
+        if (this.isObject(message)) {
             message = JSON.stringify(message);
         }
         this._logger.info(message);
         if (to_console) {
             var time = new Date();
-            var time_str = Core_1.core.format(time, "[YYYY-MM-DD HH:mm:SS.");
+            var time_str = this.format(time, "[YYYY-MM-DD HH:mm:SS.");
             time_str += time.getMilliseconds() + "]";
             console.log(time_str + " " + message);
         }
     }
     warn(message, ...optionalParams) {
-        if (Core_1.core.isObject(message)) {
+        if (this.isObject(message)) {
             message = JSON.stringify(message);
         }
         this._errorLogger.warn(message);
@@ -73,5 +72,47 @@ class Log {
     clientLog(message, ...optionalParams) {
         this._client_logger.error(message);
     }
+    isObject(param) {
+        return typeof (param) === "object";
+    }
+    isString(param) {
+        return typeof (param) === "string";
+    }
+    format = function (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/types/Core/Core.d.ts

@@ -100,4 +100,5 @@ export declare class core {
      */
     static convertToGlobalStr(num: number): string;
     static sleep(milliseconds: any): Promise<unknown>;
+    static safeCall(func: Function, thisArg?: any, ...params: any[]): Promise<void>;
 }

package/dist/types/Logic/AsyncQueueTool.d.ts

@@ -3,10 +3,12 @@ declare class AsyncQueueItem {
     running: boolean;
     funcs: {
         func: Function;
-        cb?: Function;
+        thisArg: any;
+        params: any[];
+        resolve?: Function;
     }[];
     constructor(key: string);
-    add(func: Function, cb?: Function): void;
+    add(func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
     protected _run(): Promise<void>;
 }
 declare class AsyncQueueTool {

package/dist/types/Logic/HelpTool.d.ts

@@ -0,0 +1,2 @@
+declare class HelpTool {
+}

package/dist/types/Logic/Log.d.ts

@@ -11,5 +11,8 @@ declare class Log {
     warn(message?: any, ...optionalParams: any[]): void;
     record(message?: any, ...optionalParams: any[]): void;
     clientLog(message?: any, ...optionalParams: any[]): void;
+    isObject(param: any): boolean;
+    isString(param: any): boolean;
+    format: (src: any, formatStr: any) => any;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.4.2",
+  "version": "6.4.4",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",