cgserver 6.6.7 → 6.7.445

package/dist/lib/Logic/AsyncQueueTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GAsyncQueueTool = void 0;
+exports.GSyncQueueTool = void 0;
 const Core_1 = require("../Core/Core");
 class AsyncQueueItem {
     key = "";
@@ -40,4 +40,4 @@ class AsyncQueueTool {
         return error;
     }
 }
-exports.GAsyncQueueTool = new AsyncQueueTool();
+exports.GSyncQueueTool = new AsyncQueueTool();

package/dist/lib/Logic/SyncQueueTool.js

@@ -0,0 +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();

package/dist/lib/SocketServer/IWebSocket.js

@@ -1,22 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IWebSocket = void 0;
+exports.IWebSocket = exports.BaseMsg = void 0;
 const Log_1 = require("../Logic/Log");
 const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
 const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
 const Core_1 = require("../Core/Core");
 const _ = require("underscore");
 const ServerConfig_1 = require("../Config/ServerConfig");
-let WebSocketIdMgr = {
-    id: _.random(0, 99999999),
-    getNewID() {
-        return this.id++;
-    },
-};
+const SyncQueueTool_1 = require("../Logic/SyncQueueTool");
+class BaseMsg {
+    cmd;
+    errcode;
+    servertime = Date.now();
+    constructor(cmd, errcode) {
+        this.cmd = cmd;
+        this.errcode = errcode;
+    }
+}
+exports.BaseMsg = BaseMsg;
 class IWebSocket {
-    _await = false;
-    get await() {
-        return this._await;
+    /**
+     * 是否同步消息
+     * 默认为true
+     */
+    _is_sync_msg = true;
+    get isSynMsg() {
+        return this._is_sync_msg;
     }
     _debug_msg = false;
     get debug_msg() {
@@ -54,16 +63,12 @@ class IWebSocket {
     }
     constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
         this._debug_msg = ServerConfig_1.GServerCfg.debug_msg;
-        this._socket_id = WebSocketIdMgr.getNewID();
+        this._socket_id = parseInt(_.uniqueId());
         this._protoType = protoType;
         this._protoPath = protoPath;
     }
     getNewMsg(cmd, errcode) {
-        let msg = {
-            cmd: cmd,
-            errcode: errcode,
-            servertime: new Date().getTime()
-        };
+        let msg = new BaseMsg(cmd, errcode);
         return msg;
     }
     receive_heartbeat(jsonData) {
@@ -84,15 +89,11 @@ class IWebSocket {
         this._ws.on("close", this.onClose.bind(this));
         this.onOpen();
     }
-    _msgs = [];
     onMessage(message) {
         try {
             let msg = this._onDecode(message);
-            if (this._await) {
-                this._msgs.push(msg);
-                if (!this._run_await) {
-                    this._awaitMessages();
-                }
+            if (this._is_sync_msg) {
+                SyncQueueTool_1.GSyncQueueTool.add(this._socket_id + "", this._onMessage, this, msg);
             }
             else {
                 this._onMessage(msg);
@@ -116,30 +117,21 @@ class IWebSocket {
         let msg = this._protoFilter.encode(data, ...params);
         return msg;
     }
-    _run_await = false;
-    async _awaitMessages() {
-        this._run_await = true;
-        while (this._msgs.length > 0) {
-            let msg = this._msgs.shift();
-            await this._onMessage(msg);
-        }
-        this._run_await = false;
-    }
     /**
      * 过滤消息，每个消息处理之前调用
-     * @param jsonData
+     * @param msg
      * @returns
      */
-    filterMsg(jsonData) {
-        if (this._debug_msg
-            && jsonData
-            && jsonData.cmd != "heartbeat") {
-            Log_1.GLog.info(this.tipKey + "  receive:--------");
-            Log_1.GLog.info({ tipKey: this.tipKey, jsonData });
-        }
-        if (!jsonData.cmd || jsonData.cmd == "") {
-            Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd param,data=');
-            Log_1.GLog.error({ tipKey: this.tipKey, jsonData });
+    filterMsg(msg) {
+        if (!msg) {
+            Log_1.GLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
+            return false;
+        }
+        if (this._debug_msg && msg.cmd != "heartbeat") {
+            Log_1.GLog.info({ tipKey: this.tipKey, action: "receive", msg });
+        }
+        if (!msg.cmd) {
+            Log_1.GLog.error({ tipKey: this.tipKey, action: "receive", error: "no cmd", msg });
             return false;
         }
         return true;
@@ -154,40 +146,14 @@ class IWebSocket {
         else if (!func) {
             let otherfunc = this["receive_other_all"];
             if (otherfunc) {
-                try {
-                    if (Core_1.core.isAsyncFunc(otherfunc)) {
-                        //默认支持其他所有处理消息
-                        await otherfunc.call(this, jsonData).catch((reason) => {
-                            Log_1.GLog.error(reason);
-                        });
-                    }
-                    else {
-                        otherfunc.call(this, jsonData);
-                    }
-                }
-                catch (e) {
-                    Log_1.GLog.error(this.tipKey + e.stack);
-                }
+                await Core_1.core.safeCall(otherfunc, this, jsonData);
             }
             else {
                 Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
             }
         }
         else {
-            try {
-                if (Core_1.core.isAsyncFunc(func)) {
-                    //默认支持其他所有处理消息
-                    await func.call(this, jsonData).catch((reason) => {
-                        Log_1.GLog.error(reason);
-                    });
-                }
-                else {
-                    func.call(this, jsonData);
-                }
-            }
-            catch (e) {
-                Log_1.GLog.error(this.tipKey + " error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
-            }
+            await Core_1.core.safeCall(func, this, jsonData);
         }
     }
     onOpen(e) {
@@ -197,21 +163,20 @@ class IWebSocket {
     onClose(reasonCode, description) {
         Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
     }
-    send(data) {
+    send(msg) {
         if (!this.connected) {
             return;
         }
-        if (!data) {
+        if (!msg) {
             Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
             return;
         }
         if (this._debug_msg
-            && data.cmd != "heartbeat") {
-            Log_1.GLog.info(this.tipKey + "  send:-----------------------------------");
-            Log_1.GLog.info({ tipKey: this.tipKey, data });
+            && msg.cmd != "heartbeat") {
+            Log_1.GLog.info({ tipKey: this.tipKey, action: "send", msg });
         }
-        let msg = this._onEncode(data);
-        this._ws.send(msg);
+        let data = this._onEncode(msg);
+        this._ws.send(data);
     }
     close() {
         this._ws.close();

package/dist/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.GServerCfg = exports.ServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = exports.GCgServer = void 0;
-exports.EAccountState = exports.GEventTool = exports.GAsyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
+exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
@@ -158,8 +158,8 @@ var Response_1 = require("./WebServer/Engine/Response");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return Response_1.Response; } });
 var FrameworkConfig_2 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "WebServerConfig", { enumerable: true, get: function () { return FrameworkConfig_2.WebServerConfig; } });
-var AsyncQueueTool_1 = require("./Logic/AsyncQueueTool");
-Object.defineProperty(exports, "GAsyncQueueTool", { enumerable: true, get: function () { return AsyncQueueTool_1.GAsyncQueueTool; } });
+var SyncQueueTool_1 = require("./Logic/SyncQueueTool");
+Object.defineProperty(exports, "GSyncQueueTool", { enumerable: true, get: function () { return SyncQueueTool_1.GSyncQueueTool; } });
 var EventTool_1 = require("./Logic/EventTool");
 Object.defineProperty(exports, "GEventTool", { enumerable: true, get: function () { return EventTool_1.GEventTool; } });
 var ini_2 = require("./Service/ini");

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

@@ -17,5 +17,5 @@ declare class AsyncQueueTool {
     };
     add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
 }
-export declare let GAsyncQueueTool: AsyncQueueTool;
+export declare let GSyncQueueTool: AsyncQueueTool;
 export {};

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

@@ -0,0 +1,21 @@
+declare class SyncQueueItem {
+    key: string;
+    running: boolean;
+    funcs: {
+        func: Function;
+        thisArg: any;
+        params: any[];
+        resolve?: Function;
+    }[];
+    constructor(key: string);
+    add(func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
+    protected _run(): Promise<void>;
+}
+declare class SyncQueueTool {
+    protected _queues: {
+        [key: string]: SyncQueueItem;
+    };
+    add(key: string, func: Function, thisArg?: any, ...params: any[]): Promise<unknown>;
+}
+export declare let GSyncQueueTool: SyncQueueTool;
+export {};

package/dist/types/SocketServer/IWebSocket.d.ts

@@ -1,8 +1,24 @@
 import { IProtoFilter, EProtoType } from "./ProtoFilter/IProtoFilter";
 import * as ws from 'websocket';
+export declare class BaseMsg {
+    cmd: string;
+    errcode?: {
+        id: number;
+        des: string;
+    };
+    servertime: number;
+    constructor(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    });
+}
 export declare class IWebSocket {
-    protected _await: boolean;
-    get await(): boolean;
+    /**
+     * 是否同步消息
+     * 默认为true
+     */
+    protected _is_sync_msg: boolean;
+    get isSynMsg(): boolean;
     protected _debug_msg: boolean;
     get debug_msg(): boolean;
     set debug_msg(value: boolean);
@@ -18,27 +34,27 @@ export declare class IWebSocket {
     get remoteHost(): string;
     get connected(): boolean;
     constructor(protoType?: EProtoType, protoPath?: string);
-    getNewMsg(cmd: any, errcode?: any): any;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): BaseMsg;
     receive_heartbeat(jsonData: any): void;
     send_heartbeat(): void;
     onConnect(_ws: ws.connection): void;
-    protected _msgs: Array<any>;
     onMessage(message: ws.Message): void;
     protected _onDecode(message: ws.Message, ...params: any[]): any;
     protected _onEncode(data: any, ...params: any[]): any;
-    protected _run_await: boolean;
-    protected _awaitMessages(): Promise<void>;
     /**
      * 过滤消息，每个消息处理之前调用
-     * @param jsonData
+     * @param msg
      * @returns
      */
-    filterMsg(jsonData: any): boolean;
+    filterMsg(msg: BaseMsg): boolean;
     protected _onMessage(data: any): Promise<void>;
     onOpen(e?: any): void;
     onError(e: Error): void;
     onClose(reasonCode: number, description: string): void;
-    send(data: any): void;
+    send(msg: BaseMsg): void;
     close(): void;
     getServerNameFromCmd(cmd: any): any;
 }

package/dist/types/index.d.ts

@@ -73,6 +73,6 @@ export { RazorJs } from './WebServer/Engine/RazorJs';
 export { Request } from './WebServer/Engine/Request';
 export { Response } from './WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
-export { GAsyncQueueTool } from './Logic/AsyncQueueTool';
+export { GSyncQueueTool } from './Logic/SyncQueueTool';
 export { GEventTool } from './Logic/EventTool';
 export { EAccountState } from './Service/ini';

package/package.json

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