cgserver 6.8.458 → 6.9.460

package/dist/lib/SocketServer/IRpc.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpc = exports.RpcBaseMsg = void 0;
+const IWebSocket_1 = require("./IWebSocket");
+class RpcBaseMsg extends IWebSocket_1.BaseMsg {
+    __rpcid = "";
+}
+exports.RpcBaseMsg = RpcBaseMsg;
+class IRpc {
+}
+exports.IRpc = IRpc;

package/dist/lib/SocketServer/IRpcClientWebSocket copy.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpcClientWebSocket = exports.RpcBaseMsg = void 0;
+const _ = require("underscore");
+const EventTool_1 = require("../Logic/EventTool");
+const Log_1 = require("../Logic/Log");
+const IClientWebSocket_1 = require("./IClientWebSocket");
+const IWebSocket_1 = require("./IWebSocket");
+class RpcBaseMsg extends IWebSocket_1.BaseMsg {
+    __rpcid = "";
+}
+exports.RpcBaseMsg = RpcBaseMsg;
+class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
+    _genId(pre = "") {
+        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
+    }
+    getNewMsg(cmd, errcode) {
+        let msg = super.getNewMsg(cmd, errcode);
+        msg.__rpcid = this._genId(cmd);
+        return msg;
+    }
+    async callRemote(msg) {
+        if (!msg) {
+            Log_1.GLog.error("send null msg!");
+            return;
+        }
+        if (!msg.__rpcid) {
+            msg.__rpcid = this._genId(msg.cmd);
+        }
+        return new Promise((resolve, reject) => {
+            let handler = null;
+            let func = (jsonData) => {
+                if (handler) {
+                    clearTimeout(handler);
+                    handler = null;
+                }
+                resolve(jsonData);
+            };
+            handler = setTimeout(() => {
+                EventTool_1.GEventTool.off(msg.__rpcid, func);
+                resolve({ errcode: { id: 10086, des: "timeout" } });
+            }, 3000);
+            EventTool_1.GEventTool.once(msg.__rpcid, func);
+            super.send(msg);
+        });
+    }
+    receive_other_all(jsonData) {
+        if (jsonData.__rpcid) {
+            EventTool_1.GEventTool.emit(jsonData.__rpcid, jsonData);
+            return;
+        }
+        Log_1.GLog.error({ des: "no handle", jsonData });
+    }
+}
+exports.IRpcClientWebSocket = IRpcClientWebSocket;

package/dist/lib/SocketServer/IRpcClientWebSocket.js

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IRpcClientWebSocket = exports.RpcBaseMsg = void 0;
+exports.IRpcClientWebSocket = void 0;
 const _ = require("underscore");
 const EventTool_1 = require("../Logic/EventTool");
 const Log_1 = require("../Logic/Log");
 const IClientWebSocket_1 = require("./IClientWebSocket");
-const IWebSocket_1 = require("./IWebSocket");
-class RpcBaseMsg extends IWebSocket_1.BaseMsg {
-    __rpcid = "";
-}
-exports.RpcBaseMsg = RpcBaseMsg;
 class IRpcClientWebSocket extends IClientWebSocket_1.IClientWebSocket {
     _genId(pre = "") {
         return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);

package/dist/lib/SocketServer/IRpcServerWebSocket.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IRpcServerWebSocket = void 0;
+const _ = require("underscore");
+const EventTool_1 = require("../Logic/EventTool");
+const Log_1 = require("../Logic/Log");
+const IServerWebSocket_1 = require("./IServerWebSocket");
+class IRpcServerWebSocket extends IServerWebSocket_1.IServerWebSocket {
+    _genId(pre = "") {
+        return pre + "_" + Date.now() % 10000000000 + "_" + _.uniqueId() + _.random(9999999);
+    }
+    getNewMsg(cmd, errcode) {
+        let msg = super.getNewMsg(cmd, errcode);
+        msg.__rpcid = this._genId(cmd);
+        return msg;
+    }
+    async callRemote(msg) {
+        if (!msg) {
+            Log_1.GLog.error("send null msg!");
+            return;
+        }
+        if (!msg.__rpcid) {
+            msg.__rpcid = this._genId(msg.cmd);
+        }
+        return new Promise((resolve, reject) => {
+            let handler = null;
+            let func = (jsonData) => {
+                if (handler) {
+                    clearTimeout(handler);
+                    handler = null;
+                }
+                resolve(jsonData);
+            };
+            handler = setTimeout(() => {
+                EventTool_1.GEventTool.off(msg.__rpcid, func);
+                resolve({ errcode: { id: 10086, des: "timeout" } });
+            }, 3000);
+            EventTool_1.GEventTool.once(msg.__rpcid, func);
+            super.send(msg);
+        });
+    }
+    receive_other_all(jsonData) {
+        if (jsonData.__rpcid) {
+            EventTool_1.GEventTool.emit(jsonData.__rpcid, jsonData);
+            return;
+        }
+        Log_1.GLog.error({ des: "no handle", jsonData });
+    }
+}
+exports.IRpcServerWebSocket = IRpcServerWebSocket;

package/dist/lib/ThirdParty/CgMq.js

@@ -4,8 +4,9 @@ exports.CgMq = exports.CgMqConfig = exports.CgMqRetMsg = void 0;
 const Core_1 = require("../Core/Core");
 const Log_1 = require("../Logic/Log");
 const IRpcClientWebSocket_1 = require("../SocketServer/IRpcClientWebSocket");
+const IRpc_1 = require("../SocketServer/IRpc");
 //接受到的消息无需basemsg部分
-class CgMqMsg extends IRpcClientWebSocket_1.RpcBaseMsg {
+class CgMqMsg extends IRpc_1.RpcBaseMsg {
     /**
      * 必填，目的身份
      */

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.RpcBaseMsg = exports.IRpcClientWebSocket = exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = 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.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = void 0;
+exports.IRpcServerWebSocket = exports.IRpcClientWebSocket = exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = exports.RpcBaseMsg = 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.BaseMsg = 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");
@@ -165,6 +165,8 @@ var EventTool_1 = require("./Logic/EventTool");
 Object.defineProperty(exports, "GEventTool", { enumerable: true, get: function () { return EventTool_1.GEventTool; } });
 var ini_2 = require("./Service/ini");
 Object.defineProperty(exports, "EAccountState", { enumerable: true, get: function () { return ini_2.EAccountState; } });
+var IRpc_1 = require("./SocketServer/IRpc");
+Object.defineProperty(exports, "RpcBaseMsg", { enumerable: true, get: function () { return IRpc_1.RpcBaseMsg; } });
 var Rpc_1 = require("./ThirdParty/Rpc");
 Object.defineProperty(exports, "Rpc", { enumerable: true, get: function () { return Rpc_1.Rpc; } });
 Object.defineProperty(exports, "RpcConfig", { enumerable: true, get: function () { return Rpc_1.RpcConfig; } });
@@ -173,4 +175,5 @@ Object.defineProperty(exports, "CgMq", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "CgMqConfig", { enumerable: true, get: function () { return CgMq_1.CgMqConfig; } });
 var IRpcClientWebSocket_1 = require("./SocketServer/IRpcClientWebSocket");
 Object.defineProperty(exports, "IRpcClientWebSocket", { enumerable: true, get: function () { return IRpcClientWebSocket_1.IRpcClientWebSocket; } });
-Object.defineProperty(exports, "RpcBaseMsg", { enumerable: true, get: function () { return IRpcClientWebSocket_1.RpcBaseMsg; } });
+var IRpcServerWebSocket_1 = require("./SocketServer/IRpcServerWebSocket");
+Object.defineProperty(exports, "IRpcServerWebSocket", { enumerable: true, get: function () { return IRpcServerWebSocket_1.IRpcServerWebSocket; } });

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

@@ -0,0 +1,7 @@
+import { BaseMsg } from "./IWebSocket";
+export declare class RpcBaseMsg extends BaseMsg {
+    __rpcid: string;
+}
+export declare abstract class IRpc {
+    abstract callRemote(msg: RpcBaseMsg): any;
+}

package/dist/types/SocketServer/IRpcClientWebSocket copy.d.ts

@@ -0,0 +1,14 @@
+import { IClientWebSocket } from "./IClientWebSocket";
+import { BaseMsg } from "./IWebSocket";
+export declare class RpcBaseMsg extends BaseMsg {
+    __rpcid: string;
+}
+export declare class IRpcClientWebSocket extends IClientWebSocket {
+    protected _genId(pre?: string): string;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): any;
+    callRemote(msg: RpcBaseMsg): Promise<unknown>;
+    receive_other_all(jsonData: any): void;
+}

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

@@ -1,9 +1,6 @@
 import { IClientWebSocket } from "./IClientWebSocket";
-import { BaseMsg } from "./IWebSocket";
-export declare class RpcBaseMsg extends BaseMsg {
-    __rpcid: string;
-}
-export declare class IRpcClientWebSocket extends IClientWebSocket {
+import { IRpc, RpcBaseMsg } from "./IRpc";
+export declare class IRpcClientWebSocket extends IClientWebSocket implements IRpc {
     protected _genId(pre?: string): string;
     getNewMsg(cmd: string, errcode?: {
         id: number;

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

@@ -0,0 +1,11 @@
+import { IRpc, RpcBaseMsg } from "./IRpc";
+import { IServerWebSocket } from "./IServerWebSocket";
+export declare class IRpcServerWebSocket extends IServerWebSocket implements IRpc {
+    protected _genId(pre?: string): string;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): any;
+    callRemote(msg: RpcBaseMsg): Promise<unknown>;
+    receive_other_all(jsonData: any): void;
+}

package/dist/types/ThirdParty/CgMq.d.ts

@@ -1,4 +1,5 @@
-import { IRpcClientWebSocket, RpcBaseMsg } from "../SocketServer/IRpcClientWebSocket";
+import { IRpcClientWebSocket } from "../SocketServer/IRpcClientWebSocket";
+import { RpcBaseMsg } from "../SocketServer/IRpc";
 declare class CgMqMsg extends RpcBaseMsg {
     /**
      * 必填，目的身份

package/dist/types/index.d.ts

@@ -76,6 +76,8 @@ export { WebServerConfig } from './Config/FrameworkConfig';
 export { GSyncQueueTool } from './Logic/SyncQueueTool';
 export { GEventTool } from './Logic/EventTool';
 export { EAccountState } from './Service/ini';
+export { RpcBaseMsg } from './SocketServer/IRpc';
 export { Rpc, RpcConfig } from './ThirdParty/Rpc';
 export { CgMq, CgMqConfig } from './ThirdParty/CgMq';
-export { IRpcClientWebSocket, RpcBaseMsg } from './SocketServer/IRpcClientWebSocket';
+export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
+export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';

package/package.json

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