cgserver 6.4.5 → 6.4.8

package/dist/lib/Core/Core.js

@@ -570,29 +570,34 @@ class core {
             return;
         }
         try {
+            let rs = undefined;
             if (core.isAsyncFunc(func)) {
                 if (thisArg) {
-                    await func.call(thisArg, params).catch((reason) => {
+                    rs = await func.call(thisArg, params).catch((reason) => {
                         Log_1.GLog.error(reason);
+                        rs = { errcode: { id: 1008611, des: "failed" } };
                     });
                 }
                 else {
-                    await func(params).catch((reason) => {
+                    rs = await func(params).catch((reason) => {
                         Log_1.GLog.error(reason);
+                        rs = { errcode: { id: 1008612, des: "failed" } };
                     });
                 }
             }
             else {
                 if (thisArg) {
-                    func.call(thisArg, params);
+                    rs = func.call(thisArg, params);
                 }
                 else {
-                    func(params);
+                    rs = func(params);
                 }
             }
+            return rs;
         }
         catch (e) {
             Log_1.GLog.error(e.stack);
+            return { errcode: { id: 1008613, des: "failed" } };
         }
     }
 }

package/dist/lib/Logic/AsyncQueueTool.js

@@ -25,8 +25,8 @@ class AsyncQueueItem {
             if (!funcitem.func) {
                 continue;
             }
-            await cgserver_1.core.safeCall(funcitem.func, funcitem.thisArg, funcitem.params);
-            await cgserver_1.core.safeCall(funcitem.resolve);
+            let rs = await cgserver_1.core.safeCall(funcitem.func, funcitem.thisArg, funcitem.params);
+            await cgserver_1.core.safeCall(funcitem.resolve, null, rs);
         }
         this.running = false;
     }
@@ -36,7 +36,8 @@ class AsyncQueueTool {
     _queues;
     async add(key, func, thisArg = null, ...params) {
         this._queues[key] = this._queues[key] || new AsyncQueueItem(key);
-        await this._queues[key].add(func);
+        let error = await this._queues[key].add(func);
+        return error;
     }
 }
 exports.GAsyncQueueTool = new AsyncQueueTool();

package/dist/lib/Logic/Log.js

@@ -78,15 +78,18 @@ class Log {
     isString(param) {
         return typeof (param) === "string";
     }
+    isNumber(param) {
+        return typeof (param) === "number";
+    }
     format = function (src, formatStr) {
-        if (this.isString(src)) {
+        if (exports.GLog.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)) {
+            if (exports.GLog.isNumber(src)) {
                 src = new Date(src);
             }
             let str = formatStr;

package/dist/types/Core/Core.d.ts

@@ -100,5 +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>;
+    static safeCall(func: Function, thisArg?: any, ...params: any[]): Promise<any>;
 }

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

@@ -15,7 +15,7 @@ declare class AsyncQueueTool {
     protected _queues: {
         [key: string]: AsyncQueueItem;
     };
-    add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<void>;
+    add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
 }
 export declare let GAsyncQueueTool: AsyncQueueTool;
 export {};

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

@@ -13,6 +13,7 @@ declare class Log {
     clientLog(message?: any, ...optionalParams: any[]): void;
     isObject(param: any): boolean;
     isString(param: any): boolean;
+    isNumber(param: any): boolean;
     format: (src: any, formatStr: any) => any;
 }
 export {};

package/package.json

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