cgserver 8.3.3 → 8.3.5

package/dist/lib/Framework/WebServer/Decorator/SyncCall.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncCall = void 0;
+exports.SyncCall2 = exports.SyncCall = void 0;
 const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
 /**
  * 异步函数变为同步函数，当前进程有效
@@ -19,3 +19,23 @@ function SyncCall(target, propertyName, descriptor) {
     };
 }
 exports.SyncCall = SyncCall;
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param param_index 动态参数的索引
+ */
+function SyncCall2(param_index) {
+    return (target, propertyName, descriptor) => {
+        let method = descriptor.value;
+        descriptor.value = function () {
+            let key = propertyName;
+            if (param_index != undefined && param_index < arguments.length) {
+                key = propertyName + "_" + arguments[param_index];
+            }
+            let ret = SyncQueueTool_1.GSyncQueueTool.add(key, async () => {
+                return await method.apply(target, arguments);
+            });
+            return ret;
+        };
+    };
+}
+exports.SyncCall2 = SyncCall2;

package/dist/lib/Framework/WebServer/Decorator/SyncCallServer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncCallServer = void 0;
+exports.SyncCallServer2 = exports.SyncCallServer = void 0;
 const Core_1 = require("../../Core/Core");
 const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
 const MongoCacheService_1 = require("../../Service/MongoCacheService");
@@ -10,11 +10,47 @@ const MongoCacheService_1 = require("../../Service/MongoCacheService");
  * 只支持mongo模式
  * @returns
  */
-let SyncCallServer = function () {
+function SyncCallServer(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = async () => {
+        let key = "sync_" + method.name;
+        let func = async () => {
+            let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            let ret = null;
+            while (item) {
+                await Core_1.core.sleep(200);
+                item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+            }
+            //10秒后过期，避免卡死
+            let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+            if (!mcm) {
+                await func();
+            }
+            return;
+        };
+        await func();
+        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+            return await method.apply(self, arguments);
+        });
+        await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+        return ret;
+    };
+}
+exports.SyncCallServer = SyncCallServer;
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+let SyncCallServer2 = function (params_index) {
     return function (target, propertyName, descriptor) {
         let method = descriptor.value;
         descriptor.value = async () => {
             let key = "sync_" + method.name;
+            if (params_index != undefined && params_index < arguments.length) {
+                key = key + "_" + arguments[params_index];
+            }
             let func = async () => {
                 let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
                 let ret = null;
@@ -38,4 +74,4 @@ let SyncCallServer = function () {
         };
     };
 };
-exports.SyncCallServer = SyncCallServer;
+exports.SyncCallServer2 = SyncCallServer2;

package/dist/lib/Framework/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = 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.IServerConfig = 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.SyncCallServer = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = 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.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = void 0;
+exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = 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.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = void 0;
+exports.SyncCallServer2 = 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");
@@ -184,5 +185,7 @@ var IRpcClientWebSocket_1 = require("./SocketServer/IRpcClientWebSocket");
 Object.defineProperty(exports, "IRpcClientWebSocket", { enumerable: true, get: function () { return IRpcClientWebSocket_1.IRpcClientWebSocket; } });
 var SyncCall_1 = require("./WebServer/Decorator/SyncCall");
 Object.defineProperty(exports, "SyncCall", { enumerable: true, get: function () { return SyncCall_1.SyncCall; } });
+Object.defineProperty(exports, "SyncCall2", { enumerable: true, get: function () { return SyncCall_1.SyncCall2; } });
 var SyncCallServer_1 = require("./WebServer/Decorator/SyncCallServer");
 Object.defineProperty(exports, "SyncCallServer", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer; } });
+Object.defineProperty(exports, "SyncCallServer2", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer2; } });

package/dist/types/Framework/WebServer/Decorator/SyncCall.d.ts

@@ -5,3 +5,8 @@
  * @param descriptor
  */
 export declare function SyncCall(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param param_index 动态参数的索引
+ */
+export declare function SyncCall2(param_index?: number): (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/WebServer/Decorator/SyncCallServer.d.ts

@@ -4,4 +4,11 @@
  * 只支持mongo模式
  * @returns
  */
-export declare let SyncCallServer: () => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;
+export declare function SyncCallServer(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+export declare let SyncCallServer2: (params_index?: number) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/index.d.ts

@@ -82,5 +82,5 @@ export { Rpc, RpcConfig } from './ThirdParty/Rpc';
 export { CgMq, CgMqConfig } from './ThirdParty/CgMq';
 export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
 export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
-export { SyncCall } from './WebServer/Decorator/SyncCall';
-export { SyncCallServer } from './WebServer/Decorator/SyncCallServer';
+export { SyncCall, SyncCall2 } from './WebServer/Decorator/SyncCall';
+export { SyncCallServer, SyncCallServer2 } from './WebServer/Decorator/SyncCallServer';

package/package.json

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