cgserver 5.2.2 → 5.4.0

package/lib/Framework/SocketServer/ISocketServer.js

@@ -11,53 +11,57 @@ const https = require("https");
 const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 const MongoManager_1 = require("../Database/MongoManager");
 class ISocketServer {
-    //服务器已被关闭
-    _is_closed = false;
+    constructor(server_name) {
+        //服务器已被关闭
+        this._is_closed = false;
+        this._code = -1; //服务器唯一编码
+        this._name = "";
+        //监听websocket
+        this._web_socket = null;
+        //来自于用户的链接
+        this._ws_clients = new Map();
+        this._listen_port = 0;
+        /**
+         * websocket can accepted protocol
+         */
+        this._accepted_protocol = null;
+        //服务器管理相关
+        /*
+            item=servername:class
+        */
+        this._name_vs_class = {};
+        this._name = server_name;
+    }
     get isClosed() {
         return this._is_closed;
     }
-    _code = -1; //服务器唯一编码
     get code() {
         return this._code;
     }
     set code(value) {
         this._code = value;
     }
-    _name = "";
     get name() {
         return this._name;
     }
     get fullServerName() {
         return this._name + "@" + this._code;
     }
-    //监听websocket
-    _web_socket = null;
     get serverWebSocket() {
         return this._web_socket;
     }
-    //来自于用户的链接
-    _ws_clients = new Map();
-    _listen_port = 0;
     get listenPort() {
         return this._listen_port;
     }
     set listenPort(value) {
         this._listen_port = value;
     }
-    //服务器管理相关
-    /*
-        item=servername:class
-    */
-    _name_vs_class = {};
     registerWebSocketHandleClass(name, cls) {
         if (!name || name == "") {
             throw "registerWebSocketHandleClass name must be not null or empty!";
         }
         this._name_vs_class[name] = cls;
     }
-    constructor(server_name) {
-        this._name = server_name;
-    }
     removeServerWebSocketBySocketId(socketId) {
         this._ws_clients[socketId] = null;
         delete this._ws_clients[socketId];
@@ -91,7 +95,6 @@ class ISocketServer {
             let options = {
                 key: fs.readFileSync("ssl/ssl2.key"),
                 cert: fs.readFileSync("ssl/ssl2.crt"),
-                //passphrase:'1234'//如果秘钥文件有密码的话，用这个属性设置密码
             };
             server = https.createServer(options, (request, response) => {
                 Log_1.GLog.info((new Date()) + 'wss Received request for ' + request.url);
@@ -119,8 +122,7 @@ class ISocketServer {
         this._web_socket.on('request', this.onRequest.bind(this));
         this._web_socket.on('close', this.onClose.bind(this));
     }
-    onClose() {
-        this._is_closed = true;
+    onClose(connection, reason, desc) {
     }
     onListenning() {
         let info = (new Date()) + "  Server " + this.fullServerName + " is listening on port " + this._listen_port;
@@ -138,15 +140,26 @@ class ISocketServer {
         let allowed = this.isOriginAllowed(req.origin);
         if (!allowed) {
             req.reject();
-            Log_1.GLog.info((new Date()) + ' Connection from origin ' + req.origin + ' rejected.');
+            Log_1.GLog.info(' Connection from origin ' + req.origin + ' rejected.', true);
             return;
         }
-        let ws = req.accept(null, req.origin);
-        Log_1.GLog.info((new Date()) + ' Connection accepted.');
-        let server_name = this._getServerNameByCookies(req.cookies);
-        this.createWebSocketObjectByProtocol(server_name, ws);
+        try {
+            let conn = req.accept(this._accepted_protocol, req.origin);
+            if (!conn) {
+                req.reject();
+                Log_1.GLog.info(' protocol reject', true);
+                return;
+            }
+            Log_1.GLog.info((new Date()) + ' Connection accepted.');
+            let server_name = this._getServerNameByCookies(req.cookies);
+            this.createWebSocketObjectByProtocol(server_name, conn);
+        }
+        catch (e) {
+            req.reject();
+            Log_1.GLog.info(' protocol reject', true);
+        }
     }
-    createWebSocketObjectByProtocol(server_name, ws) {
+    createWebSocketObjectByProtocol(server_name, _ws) {
         server_name = server_name || "default";
         let cls = this._name_vs_class[server_name];
         if (!cls) {
@@ -155,7 +168,7 @@ class ISocketServer {
         }
         let ws_server = (new cls(this));
         this.addClient(ws_server);
-        ws_server.onConnect(ws);
+        ws_server.onConnect(_ws);
         return ws_server;
     }
     _getServerNameByCookies(cookies) {

package/lib/Framework/SocketServer/ISocketServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ISocketServer.js","sourceRoot":"","sources":["../../../Framework/SocketServer/ISocketServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ISocketServer.js","sourceRoot":"","sources":["../../../Framework/SocketServer/ISocketServer.ts"],"names":[],"mappings":";;;AAAA,2DAAqD;AACrD,2DAAqD;AAErD,gCAAgC;AAChC,wCAAsC;AACtC,yBAAyB;AACzB,6BAA6B;AAC7B,+BAA+B;AAC/B,+DAAkD;AAClD,2DAAqD;AAErD,MAAa,aAAa;IA4DtB,YAAY,WAAW;QA1DvB,SAAS;QACC,eAAU,GAAC,KAAK,CAAA;QAKlB,UAAK,GAAU,CAAC,CAAC,CAAA,CAAA,SAAS;QASxB,UAAK,GAAQ,EAAE,CAAA;QASzB,aAAa;QACL,gBAAW,GAAY,IAAI,CAAA;QAKnC,UAAU;QACA,gBAAW,GAAE,IAAI,GAAG,EAA2B,CAAA;QACjD,iBAAY,GAAQ,CAAC,CAAA;QAS7B;;WAEG;QACO,uBAAkB,GAAC,IAAI,CAAA;QACjC,SAAS;QACT;;UAEE;QACQ,mBAAc,GAAC,EAAE,CAAA;QAWvB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAA;IAC5B,CAAC;IA3DD,IAAI,QAAQ;QAER,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IAED,IAAI,IAAI;QAEJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACrB,CAAC;IACD,IAAI,IAAI,CAAC,KAAK;QAEV,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,IAAI,IAAI;QAEJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACrB,CAAC;IACD,IAAI,cAAc;QAEd,OAAO,IAAI,CAAC,KAAK,GAAC,GAAG,GAAC,IAAI,CAAC,KAAK,CAAA;IACpC,CAAC;IAGD,IAAI,eAAe;QAEf,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IAID,IAAI,UAAU;QAEV,OAAO,IAAI,CAAC,YAAY,CAAA;IAC5B,CAAC;IACD,IAAI,UAAU,CAAC,KAAK;QAEhB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;IAC7B,CAAC;IAUD,4BAA4B,CAAC,IAAW,EAAC,GAAG;QAExC,IAAG,CAAC,IAAI,IAAE,IAAI,IAAE,EAAE,EAClB;YACI,MAAM,8DAA8D,CAAA;SACvE;QACD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,GAAG,CAAA;IACnC,CAAC;IAKD,+BAA+B,CAAC,QAAQ;QAEpC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAA;QACjC,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;IACrC,CAAC;IACD,KAAK,CAAC,GAAG;QAEL,MAAM,wBAAS,CAAC,IAAI,EAAE,CAAA;QACtB,MAAM,wBAAS,CAAC,IAAI,CAAC,uBAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;QACpC,MAAM,wBAAS,CAAC,IAAI,EAAE,CAAA;QACtB,IAAI,IAAI,GAAG,MAAM,wBAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC9C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,IAAI,CAAC,CAAA,CAAA,aAAa;IAC/D,CAAC;IACD,IAAI;QAEA,IAAI,CAAC,UAAU,GAAC,IAAI,CAAA;QACpB,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAA;IAC1C,CAAC;IACD;;;MAGE;IACF,SAAS,CAAC,aAA8B;QAEpC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAA;IAC5D,CAAC;IACD,eAAe,CAAC,MAAM;QAElB,OAAO,IAAI,CAAA;IACf,CAAC;IACD,aAAa,CAAC,GAAI;QAEd,IAAI,MAAM,GAAG,IAAI,CAAA;QACjB,IAAG,GAAG,EACN;YACI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACtB,IAAI,OAAO,GACX;gBACI,GAAG,EAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC;gBACnC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC;aAExC,CAAA;YACD,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,EAAC,CAAC,OAAO,EAAE,QAAQ,EAAC,EAAE;gBAErD,UAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,2BAA2B,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;gBACnE,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvB,QAAQ,CAAC,GAAG,EAAE,CAAA;YAClB,CAAC,CAAC,CAAA;SACL;aAED;YACI,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAC,EAAE;gBAE5C,UAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;gBAClE,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBACvB,QAAQ,CAAC,GAAG,EAAE,CAAA;YAClB,CAAC,CAAC,CAAA;SACL;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAE9D,IAAI,CAAC,WAAW,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC;YAC7B,UAAU,EAAE,MAAM;YAClB,2DAA2D;YAC3D,oEAAoE;YACpE,mEAAmE;YACnE,qEAAqE;YACrE,iBAAiB;YACjB,qBAAqB,EAAE,KAAK;SAC/B,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACzD,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,CAAC,UAAyB,EAAE,MAAc,EAAE,IAAY;IAG/D,CAAC;IACD,YAAY;QAER,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,WAAW,GAAE,IAAI,CAAC,cAAc,GAAE,wBAAwB,GAAC,IAAI,CAAC,YAAY,CAAA;QACtG,UAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IACD,SAAS,CAAC,GAAc;QAEpB,IAAG,IAAI,CAAC,UAAU,EAClB;YACI,OAAM;SACT;QACD,IAAI,QAAQ,GAAG,IAAI,CAAA;QACnB,IAAG,GAAG,CAAC,kBAAkB,CAAC,MAAM,GAAC,CAAC,EAClC;YACI,QAAQ,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAA;SACvC;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,CAAC,OAAO,EACZ;YACI,GAAG,CAAC,MAAM,EAAE,CAAA;YACZ,UAAI,CAAC,IAAI,CAAC,0BAA0B,GAAG,GAAG,CAAC,MAAM,GAAG,YAAY,EAAC,IAAI,CAAC,CAAA;YACtE,OAAM;SACT;QACD,IACA;YACI,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;YAC1D,IAAG,CAAC,IAAI,EACR;gBACI,GAAG,CAAC,MAAM,EAAE,CAAA;gBACZ,UAAI,CAAC,IAAI,CAAC,kBAAkB,EAAC,IAAI,CAAC,CAAA;gBAClC,OAAM;aACT;YACD,UAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,uBAAuB,CAAC,CAAA;YACjD,IAAI,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3D,IAAI,CAAC,+BAA+B,CAAC,WAAW,EAAC,IAAI,CAAC,CAAA;SACzD;QACD,OAAM,CAAC,EACP;YACI,GAAG,CAAC,MAAM,EAAE,CAAA;YACZ,UAAI,CAAC,IAAI,CAAC,kBAAkB,EAAC,IAAI,CAAC,CAAA;SACrC;IACL,CAAC;IACD,+BAA+B,CAAC,WAAkB,EAAC,GAAiB;QAEhE,WAAW,GAAC,WAAW,IAAE,SAAS,CAAA;QAClC,IAAI,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAC1C,IAAG,CAAC,GAAG,EACP;YACI,UAAI,CAAC,KAAK,CAAC,6CAA6C,GAAC,IAAI,CAAC,IAAI,GAAC,mCAAmC,GAAC,WAAW,CAAC,CAAA;YACnH,OAAO,IAAI,CAAA;SACd;QACD,IAAI,SAAS,GAAqB,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QACjD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QACzB,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACxB,OAAO,SAAS,CAAA;IACpB,CAAC;IACS,uBAAuB,CAAC,OAAO;QAErC,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,IAAG,CAAC,OAAO,EACX;YACI,OAAO,WAAW,CAAA;SACrB;QACD,KAAI,IAAI,KAAK,IAAI,OAAO,EACxB;YACI,IAAI,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;YAC3B,IAAG,MAAM,CAAC,IAAI,IAAE,QAAQ,EACxB;gBACI,WAAW,GAAG,MAAM,CAAC,KAAK,CAAA;gBAC1B,MAAK;aACR;SACJ;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;CACJ;AAzND,sCAyNC"}

package/lib/Framework/SocketServer/IWebSocket.d.ts

@@ -36,8 +36,8 @@ export declare class IWebSocket {
     filterMsg(jsonData: any): boolean;
     protected _onMessage(data: any): Promise<void>;
     onOpen(e?: any): void;
-    onError(e: any): void;
-    onClose(e: any): void;
+    onError(e: Error): void;
+    onClose(reasonCode: number, description: string): void;
     send(data: any): void;
     close(): void;
     getServerNameFromCmd(cmd: any): any;

package/lib/Framework/SocketServer/IWebSocket.js

@@ -14,30 +14,38 @@ let WebSocketIdMgr = {
     },
 };
 class IWebSocket {
-    _await = false;
+    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
+        this._await = false;
+        this._debug_msg = false;
+        this._socket_id = 0;
+        this._tipKey = "";
+        this._ws = null;
+        this._protoType = IProtoFilter_1.EProtoType.Json;
+        this._protoFilter = null;
+        this._protoPath = "";
+        this._ip = null;
+        this._msgs = [];
+        this._run_await = false;
+        this._debug_msg = FrameworkConfig_1.GFCfg.debug_msg;
+        this._socket_id = WebSocketIdMgr.getNewID();
+        this._protoType = protoType;
+        this._protoPath = protoPath;
+    }
     get await() {
         return this._await;
     }
-    _debug_msg = false;
     get debug_msg() {
         return this._debug_msg;
     }
     set debug_msg(value) {
         this._debug_msg = value;
     }
-    _socket_id = 0;
     get socketId() {
         return this._socket_id;
     }
-    _tipKey = "";
     get tipKey() {
         return this._tipKey;
     }
-    _ws = null;
-    _protoType = IProtoFilter_1.EProtoType.Json;
-    _protoFilter = null;
-    _protoPath = "";
-    _ip = null;
     get remoteHost() {
         if (!this._ip) {
             this._ip = this._ws.remoteAddress;
@@ -52,12 +60,6 @@ class IWebSocket {
         }
         return false;
     }
-    constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
-        this._debug_msg = FrameworkConfig_1.GFCfg.debug_msg;
-        this._socket_id = WebSocketIdMgr.getNewID();
-        this._protoType = protoType;
-        this._protoPath = protoPath;
-    }
     getNewMsg(cmd, errcode) {
         let msg = {
             cmd: cmd,
@@ -84,7 +86,6 @@ class IWebSocket {
         this._ws.on("close", this.onClose.bind(this));
         this.onOpen();
     }
-    _msgs = [];
     onMessage(message) {
         try {
             let msg = this._onDecode(message);
@@ -116,7 +117,6 @@ 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) {
@@ -185,9 +185,10 @@ class IWebSocket {
     onOpen(e) {
     }
     onError(e) {
-        Log_1.GLog.info(e);
+        Log_1.GLog.info("onError:" + e.message);
     }
-    onClose(e) {
+    onClose(reasonCode, description) {
+        Log_1.GLog.info("onClose resonCode=" + reasonCode + "  des=" + description);
     }
     send(data) {
         if (!this.connected) {

package/lib/Framework/SocketServer/IWebSocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"IWebSocket.js","sourceRoot":"","sources":["../../../Framework/SocketServer/IWebSocket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IWebSocket.js","sourceRoot":"","sources":["../../../Framework/SocketServer/IWebSocket.ts"],"names":[],"mappings":"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"}

package/lib/Framework/SocketServer/ProtoFilter/GoogleProtoFilter.js

@@ -4,8 +4,10 @@ exports.GoogleProtoFilter = void 0;
 const Log_1 = require("../../Logic/Log");
 const protobufjs = require("protobufjs");
 class GoogleProtoFilter {
-    _root = new protobufjs.Root();
-    _inited = false;
+    constructor() {
+        this._root = new protobufjs.Root();
+        this._inited = false;
+    }
     init(path) {
         if (this._inited) {
             return;

package/lib/Framework/SocketServer/ProtoFilter/GoogleProtoFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleProtoFilter.js","sourceRoot":"","sources":["../../../../Framework/SocketServer/ProtoFilter/GoogleProtoFilter.ts"],"names":[],"mappings":";;;AAEA,yCAAuC;AACvC,yCAAyC;AAEzC,MAAa,iBAAiB;IAEhB,KAAK,GAAiB,IAAI,UAAU,CAAC,IAAI,EAAE,CAAA;IAC3C,OAAO,GAAC,KAAK,CAAA;IACvB,IAAI,CAAC,IAAY;QAEb,IAAG,IAAI,CAAC,OAAO,EACf;YACI,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAC,IAAI,CAAA;QACjB,IACA;YACI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAC,EAAC,QAAQ,EAAC,IAAI,EAAC,CAAC,CAAA;SAC5C;QACD,OAAM,CAAC,EACP;YACI,UAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACb,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IACD,MAAM,CAAC,IAAI,EAAC,IAAW;QAEnB,IAAI,GAAG,GAAC,EAAC,GAAG,EAAC,IAAI,CAAC,GAAG,EAAC,CAAA;QACtB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAC,IAAI,CAAA;QACjB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAC,SAAS,CAAA;QAE1B,GAAG,CAAC,SAAS,CAAC,GAAC,IAAI,CAAC,OAAO,CAAA;QAC3B,GAAG,CAAC,KAAK,CAAC,GAAC,IAAI,CAAC,GAAG,CAAA;QACnB,IAAI,CAAC,OAAO,GAAC,SAAS,CAAA;QAEtB,OAAO,IAAI,CAAC,OAAO,CAAA;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAA;QAEvB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,MAAM;YACN,MAAM,KAAK,CAAC,MAAM,CAAC,CAAA;QACvB,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/C,OAAO,UAAU,CAAA;IACrB,CAAC;IACD,MAAM,CAAC,IAAI,EAAC,IAAW;QAEnB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtC,IAAG,CAAC,IAAI,EACR;YACI,UAAI,CAAC,IAAI,CAAC,2BAA2B,GAAC,IAAI,GAAC,GAAG,CAAC,CAAA;YAC/C,OAAO,IAAI,CAAA;SACd;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAG,CAAC,OAAO,EACX;YACI,UAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;YACrC,OAAO,IAAI,CAAA;SACd;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACpC,IAAI,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC9B,GAAG,CAAC,GAAG,GAAC,OAAO,CAAC,GAAG,CAAA;QACnB,OAAO,GAAG,CAAA;IACd,CAAC;CACJ;AA9DD,8CA8DC"}
+{"version":3,"file":"GoogleProtoFilter.js","sourceRoot":"","sources":["../../../../Framework/SocketServer/ProtoFilter/GoogleProtoFilter.ts"],"names":[],"mappings":";;;AAEA,yCAAuC;AACvC,yCAAyC;AAEzC,MAAa,iBAAiB;IAA9B;QAEc,UAAK,GAAiB,IAAI,UAAU,CAAC,IAAI,EAAE,CAAA;QAC3C,YAAO,GAAC,KAAK,CAAA;IA2D3B,CAAC;IA1DG,IAAI,CAAC,IAAY;QAEb,IAAG,IAAI,CAAC,OAAO,EACf;YACI,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAC,IAAI,CAAA;QACjB,IACA;YACI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAC,EAAC,QAAQ,EAAC,IAAI,EAAC,CAAC,CAAA;SAC5C;QACD,OAAM,CAAC,EACP;YACI,UAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACb,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IACD,MAAM,CAAC,IAAI,EAAC,IAAW;QAEnB,IAAI,GAAG,GAAC,EAAC,GAAG,EAAC,IAAI,CAAC,GAAG,EAAC,CAAA;QACtB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAC,IAAI,CAAA;QACjB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,GAAC,SAAS,CAAA;QAE1B,GAAG,CAAC,SAAS,CAAC,GAAC,IAAI,CAAC,OAAO,CAAA;QAC3B,GAAG,CAAC,KAAK,CAAC,GAAC,IAAI,CAAC,GAAG,CAAA;QACnB,IAAI,CAAC,OAAO,GAAC,SAAS,CAAA;QAEtB,OAAO,IAAI,CAAC,OAAO,CAAA;QACnB,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAA;QAEvB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,MAAM;YACN,MAAM,KAAK,CAAC,MAAM,CAAC,CAAA;QACvB,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/C,OAAO,UAAU,CAAA;IACrB,CAAC;IACD,MAAM,CAAC,IAAI,EAAC,IAAW;QAEnB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtC,IAAG,CAAC,IAAI,EACR;YACI,UAAI,CAAC,IAAI,CAAC,2BAA2B,GAAC,IAAI,GAAC,GAAG,CAAC,CAAA;YAC/C,OAAO,IAAI,CAAA;SACd;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAG,CAAC,OAAO,EACX;YACI,UAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;YACrC,OAAO,IAAI,CAAA;SACd;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACpC,IAAI,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC9B,GAAG,CAAC,GAAG,GAAC,OAAO,CAAC,GAAG,CAAA;QACnB,OAAO,GAAG,CAAA;IACd,CAAC;CACJ;AA9DD,8CA8DC"}

package/lib/Framework/SocketServer/ProtoFilter/ProtoFactory.js

@@ -6,7 +6,9 @@ const JsonProtoFilter_1 = require("./JsonProtoFilter");
 const IProtoFilter_1 = require("./IProtoFilter");
 exports.GProtoFactory = null;
 class ProtoFactory {
-    _filters = new Map();
+    constructor() {
+        this._filters = new Map();
+    }
     createFilter(type) {
         let filter = this._filters.get(type);
         if (filter) {

package/lib/Framework/SocketServer/ProtoFilter/ProtoFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProtoFactory.js","sourceRoot":"","sources":["../../../../Framework/SocketServer/ProtoFilter/ProtoFactory.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,uDAAoD;AAEpD,iDAA4C;AAEjC,QAAA,aAAa,GAAc,IAAI,CAAA;AAC1C,MAAM,YAAY;IAEJ,QAAQ,GAAC,IAAI,GAAG,EAA2B,CAAA;IACrD,YAAY,CAAC,IAAe;QAExB,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpC,IAAG,MAAM,EACT;YACI,OAAO,MAAM,CAAA;SAChB;QACD,QAAO,IAAI,EACX;YACI,KAAK,yBAAU,CAAC,iBAAiB;gBACjC;oBACI,MAAM,GAAG,IAAI,qCAAiB,EAAE,CAAA;oBAChC,MAAK;iBACR;YACD;gBACA;oBACI,MAAM,GAAG,IAAI,iCAAe,EAAE,CAAA;oBAC9B,MAAK;iBACR;SACJ;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAC,MAAM,CAAC,CAAA;QAC9B,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ;AACD,qBAAa,GAAC,IAAI,YAAY,EAAE,CAAA"}
+{"version":3,"file":"ProtoFactory.js","sourceRoot":"","sources":["../../../../Framework/SocketServer/ProtoFilter/ProtoFactory.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,uDAAoD;AAEpD,iDAA4C;AAEjC,QAAA,aAAa,GAAc,IAAI,CAAA;AAC1C,MAAM,YAAY;IAAlB;QAEc,aAAQ,GAAC,IAAI,GAAG,EAA2B,CAAA;IAwBzD,CAAC;IAvBG,YAAY,CAAC,IAAe;QAExB,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpC,IAAG,MAAM,EACT;YACI,OAAO,MAAM,CAAA;SAChB;QACD,QAAO,IAAI,EACX;YACI,KAAK,yBAAU,CAAC,iBAAiB;gBACjC;oBACI,MAAM,GAAG,IAAI,qCAAiB,EAAE,CAAA;oBAChC,MAAK;iBACR;YACD;gBACA;oBACI,MAAM,GAAG,IAAI,iCAAe,EAAE,CAAA;oBAC9B,MAAK;iBACR;SACJ;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAC,MAAM,CAAC,CAAA;QAC9B,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ;AACD,qBAAa,GAAC,IAAI,YAAY,EAAE,CAAA"}

package/lib/Framework/ThirdParty/AlipayTool.js

@@ -9,21 +9,23 @@ const form_1 = require("alipay-sdk/lib/form");
 const Log_1 = require("../Logic/Log");
 exports.GAlipayTool = null;
 class AlipayTool {
-    _alipaySdk = null;
-    _aliPay = null;
-    _cfg = {
-        app_id: "",
-        app_key: "",
-        gateway: "",
-        //RSA1 RSA2
-        signType: 'RSA2',
-        /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-        keyType: 'PKCS1',
-        alipay_root_cert_sn: "",
-        alipay_cert_sn: "",
-        app_cert_sn: "",
-        notify_url: ""
-    };
+    constructor() {
+        this._alipaySdk = null;
+        this._aliPay = null;
+        this._cfg = {
+            app_id: "",
+            app_key: "",
+            gateway: "",
+            //RSA1 RSA2
+            signType: 'RSA2',
+            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
+            keyType: 'PKCS1',
+            alipay_root_cert_sn: "",
+            alipay_cert_sn: "",
+            app_cert_sn: "",
+            notify_url: ""
+        };
+    }
     init() {
         if (!FrameworkConfig_1.GFCfg.third_cfg.alipay
             || !FrameworkConfig_1.GFCfg.third_cfg.alipay.open) {

package/lib/Framework/ThirdParty/AlipayTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlipayTool.js","sourceRoot":"","sources":["../../../Framework/ThirdParty/AlipayTool.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AACnC,uDAAkE;AAClE,yBAAyB;AACzB,+DAAkD;AAClD,8CAAiD;AACjD,sCAAoC;AAEzB,QAAA,WAAW,GAAY,IAAI,CAAA;AACtC,MAAM,UAAU;IAEF,UAAU,GAAW,IAAI,CAAA;IACzB,OAAO,GAAY,IAAI,CAAA;IAEvB,IAAI,GAAC;QACX,MAAM,EAAE,EAAE;QACV,OAAO,EAAC,EAAE;QACV,OAAO,EAAC,EAAE;QACV,WAAW;QACX,QAAQ,EAAgB,MAAM;QAC9B,6EAA6E;QAC7E,OAAO,EAAmB,OAAO;QACjC,mBAAmB,EAAC,EAAE;QACtB,cAAc,EAAC,EAAE;QACjB,WAAW,EAAC,EAAE;QACd,UAAU,EAAC,EAAE;KAChB,CAAA;IACD,IAAI;QAEA,IAAG,CAAC,uBAAK,CAAC,SAAS,CAAC,MAAM;eACpB,CAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAClC;YACI,OAAO,KAAK,CAAA;SACf;QACD,IAAI,MAAM,GAAC,EAAE,CAAA;QACb,IAAG,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAC7B;YACI,MAAM,GAAC,MAAM,CAAA;SAChB;QACD,IAAI,CAAC,IAAI,GAAC;YACN,MAAM,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAC,MAAM,CAAC;YAC/C,OAAO,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,GAAC,MAAM,CAAC;YACjD,OAAO,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,GAAC,MAAM,CAAC;YACjD,WAAW;YACX,QAAQ,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,GAAC,MAAM,CAAC;YACnD,6EAA6E;YAC7E,OAAO,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,GAAC,MAAM,CAAC;YAClD,mBAAmB,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAC,MAAM,CAAC;YACzE,cAAc,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,GAAC,MAAM,CAAC;YAC/D,WAAW,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,GAAC,MAAM,CAAC;YACzD,UAAU,EAAE,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,GAAC,MAAM,CAAC;SAC1D,CAAA;QACD,IAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAC3B;YACI,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,CAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAE,CAAA;SAC/E;aAED;YACI,IAAI,OAAO,GAAC,EAAE,CAAA;YACd,IAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAC,CAAC,EACtC;gBACI,OAAO,GAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;aACtD;iBAED;gBACI,OAAO,GAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA;aAC5B;YACD,IAAI,CAAC,UAAU,GAAG,IAAI,oBAAS,CAAC;gBAC5B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;gBACvB,UAAU,EAAE,OAAO;gBACnB,OAAO,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO;gBACzB,QAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAC3B,OAAO,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO;aAC5B,CAAC,CAAA;SACL;IACL,CAAC;IACD;;;;;OAKG;IACH,KAAK,CAAC,KAAY,EAAE,QAAe,EAAE,KAAY;QAE7C,MAAM,KAAK,GAAgB;YACvB,MAAM,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM;YACvB,UAAU,EAAC,IAAI,CAAC,IAAI,CAAC,UAAU;YAC/B,WAAW,EAAC,IAAI,CAAC,IAAI,CAAC,WAAW;YACjC,mBAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB;YACjD,OAAO,EAAC,KAAK;YACb,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,KAAK;SACtB,CAAC;QAEF,IAAI,GAAG,GAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,KAAK,CAAE,CAAA;QACxC,OAAO,GAAG,CAAA;IACd,CAAC;IACD,QAAQ,CAAC,OAAW;QAEhB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC;IACD;;;;;;;;;OASG;IACH,KAAK,CAAC,aAAa,CAAC,MAAqB,EAAC,SAAgB,EAAC,SAAgB,EAAC,UAAiB,EAAC,KAAY,EAAC,OAAc,EAAC,IAAW;QAEjI,IAAG,CAAC,IAAI,CAAC,UAAU,EACnB;YACI,UAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAC/B,OAAM;SACT;QACD,MAAM,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;QACtC,yCAAyC;QACzC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC1B,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAC,SAAS,CAAC,CAAA;QACzC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;QACzC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE;YAC5B,UAAU,EAAE,UAAU;YACtB,WAAW,EAAE,wBAAwB;YACrC,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACxC,uBAAuB,EACvB,EAAE,EACF,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACzB,CAAA;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;CACJ;AACD,mBAAW,GAAC,IAAI,UAAU,EAAE,CAAA"}
+{"version":3,"file":"AlipayTool.js","sourceRoot":"","sources":["../../../Framework/ThirdParty/AlipayTool.ts"],"names":[],"mappings":"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"}

package/lib/Framework/ThirdParty/Alisms.js

@@ -6,8 +6,10 @@ let SMSClient = require("@alicloud/sms-sdk");
 const FrameworkConfig_1 = require("../Config/FrameworkConfig");
 exports.GSmsTool = null;
 class SMSTool {
-    _is_init = false;
-    _sms_client = null;
+    constructor() {
+        this._is_init = false;
+        this._sms_client = null;
+    }
     init() {
         if (this._is_init) {
             return true;

package/lib/Framework/ThirdParty/Alisms.js.map

@@ -1 +1 @@
-{"version":3,"file":"Alisms.js","sourceRoot":"","sources":["../../../Framework/ThirdParty/Alisms.ts"],"names":[],"mappings":";;;AAAA,wCAAsC;AACtC,IAAI,SAAS,GAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAC3C,+DAAkD;AAEvC,QAAA,QAAQ,GAAS,IAAI,CAAA;AAChC,MAAM,OAAO;IAEC,QAAQ,GAAC,KAAK,CAAA;IACd,WAAW,GAAC,IAAI,CAAA;IAC1B,IAAI;QAEA,IAAG,IAAI,CAAC,QAAQ,EAChB;YACI,OAAO,IAAI,CAAA;SACd;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,SAAS,CAAC,EAAC,WAAW,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAC,eAAe,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,EAAC,CAAC,CAAA;IAC7I,CAAC;IACD;;;;;OAKG;IACH,OAAO,CAAC,IAAW,EAAC,KAAY;QAE5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAC,MAAM,EAAC,EAAE;YAEjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAC,KAAK;gBAClB,QAAQ,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ;gBACxC,YAAY,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY;gBAChD,aAAa,EAAC,IAAI,CAAC,SAAS,CAAC,EAAC,IAAI,EAAC,IAAI,EAAC,CAAC;aAC5C,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAC,EAAE;gBAEX,IAAG,GAAG,CAAC,IAAI,IAAE,IAAI,EACjB;oBACI,OAAO,CAAC,IAAI,CAAC,CAAA;iBAChB;qBAED;oBACI,UAAI,CAAC,KAAK,CAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;iBACpB;YACL,CAAC,EAAC,CAAC,GAAG,EAAC,EAAE;gBAEL,UAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACf,OAAO,CAAC,GAAG,CAAC,CAAA;YAChB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AACD,gBAAQ,GAAC,IAAI,OAAO,EAAE,CAAA"}
+{"version":3,"file":"Alisms.js","sourceRoot":"","sources":["../../../Framework/ThirdParty/Alisms.ts"],"names":[],"mappings":";;;AAAA,wCAAsC;AACtC,IAAI,SAAS,GAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAC3C,+DAAkD;AAEvC,QAAA,QAAQ,GAAS,IAAI,CAAA;AAChC,MAAM,OAAO;IAAb;QAEc,aAAQ,GAAC,KAAK,CAAA;QACd,gBAAW,GAAC,IAAI,CAAA;IA2C9B,CAAC;IA1CG,IAAI;QAEA,IAAG,IAAI,CAAC,QAAQ,EAChB;YACI,OAAO,IAAI,CAAA;SACd;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,SAAS,CAAC,EAAC,WAAW,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAC,eAAe,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,EAAC,CAAC,CAAA;IAC7I,CAAC;IACD;;;;;OAKG;IACH,OAAO,CAAC,IAAW,EAAC,KAAY;QAE5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAC,MAAM,EAAC,EAAE;YAEjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBACrB,YAAY,EAAC,KAAK;gBAClB,QAAQ,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ;gBACxC,YAAY,EAAC,uBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY;gBAChD,aAAa,EAAC,IAAI,CAAC,SAAS,CAAC,EAAC,IAAI,EAAC,IAAI,EAAC,CAAC;aAC5C,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAC,EAAE;gBAEX,IAAG,GAAG,CAAC,IAAI,IAAE,IAAI,EACjB;oBACI,OAAO,CAAC,IAAI,CAAC,CAAA;iBAChB;qBAED;oBACI,UAAI,CAAC,KAAK,CAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;iBACpB;YACL,CAAC,EAAC,CAAC,GAAG,EAAC,EAAE;gBAEL,UAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACf,OAAO,CAAC,GAAG,CAAC,CAAA;YAChB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AACD,gBAAQ,GAAC,IAAI,OAAO,EAAE,CAAA"}