@xmobitea/gn-server 2.5.1 → 2.6.1

package/dist/index.js

@@ -138,7 +138,6 @@ __webpack_require__.d(__webpack_exports__, {
   ItemDataParam: () => (/* reexport */ ItemDataParam),
   ItemStatisticsParam: () => (/* reexport */ ItemStatisticsParam),
   ItemType: () => (/* reexport */ ItemType),
-  LockService: () => (/* reexport */ LockService),
   LogSettings: () => (/* reexport */ LogSettings),
   MasterAdminMongoObject: () => (/* reexport */ MasterAdminMongoObject),
   MasterAdminPermissionRulesParam: () => (/* reexport */ MasterAdminPermissionRulesParam),
@@ -1750,6 +1749,15 @@ class AppleService {
             else if (answer.aud !== this.appleClientId) {
                 answer["error"] = "unexpected audience (aud claim): " + answer.aud;
             }
+            else {
+                let now = Math.floor(Date.now() / 1000); // thời gian hiện tại (epoch seconds)
+                if (answer.exp && answer.exp < now) {
+                    answer["error"] = "token expired at " + new Date(answer.exp * 1000).toISOString();
+                }
+                else if (answer.iat && answer.iat > now + 10) {
+                    answer["error"] = "token issued in the future: " + new Date(answer.iat * 1000).toISOString();
+                }
+            }
             return answer;
         }
         catch (error) {
@@ -1774,7 +1782,7 @@ class AppleService {
                 signedTransactionInfoPayload = external_jsonwebtoken_default().decode(transactionInfoResponse.data.signedTransactionInfo);
             }
             catch (err) {
-                Debug.log("[GN] error while validate apple receipt " + err.toString());
+                Debug.log("[GearN] error while validate apple receipt " + err.toString());
             }
             return {
                 success: true,
@@ -1826,7 +1834,7 @@ class AppleService {
     // 	try {
     // 		let result = await axios.post(AppleService.MAIN_verifyAppleAppStoreAPIUrl, { "receipt-data": payload }, {
     // 			headers: {
-    // 				'Content-Type': 'application/x-www-form-urlencoded'
+    // 				"Content-Type": "application/x-www-form-urlencoded"
     // 			},
     // 		});
     // 		answer = result.data;
@@ -1840,7 +1848,7 @@ class AppleService {
     // 	try {
     // 		let result = await axios.post(AppleService.MAIN_verifySandboxAppleAppStoreAPIUrl, { "receipt-data": payload }, {
     // 			headers: {
-    // 				'Content-Type': 'application/x-www-form-urlencoded'
+    // 				"Content-Type": "application/x-www-form-urlencoded"
     // 			},
     // 		});
     // 		answer = result.data;
@@ -1856,8 +1864,8 @@ class AppleService {
         try {
             let result = await external_axios_default().get(url, {
                 headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': 'Bearer ' + token
+                    "Content-Type": "application/json",
+                    "Authorization": "Bearer " + token
                 },
             });
             return {
@@ -1879,18 +1887,18 @@ class AppleService {
             iss: this.issuerId,
             iat: now,
             exp: now + 30 * 60,
-            aud: 'appstoreconnect-v1',
+            aud: "appstoreconnect-v1",
             bid: this.appleClientId,
         };
         // Create the header
         let header = {
-            alg: 'ES256',
+            alg: "ES256",
             kid: this.keyId,
-            typ: 'JWT',
+            typ: "JWT",
         };
         // Generate the token
         const token = external_jsonwebtoken_default().sign(payload, this.p8Content, {
-            algorithm: 'ES256',
+            algorithm: "ES256",
             header: header,
         });
         return token;
@@ -2533,6 +2541,9 @@ class GNParameterCode {
     static PushNotificationSettings = "pushNotificationSettings";
     static SendFrom = "sendFrom";
     static SendGridApiKey = "sendGridApiKey";
+    static Host = "host";
+    static Port = "port";
+    static Secure = "secure";
     static Subject = "subject";
     static ContentHtml = "contentHtml";
     static PushNotifications = "pushNotifications";
@@ -2574,6 +2585,9 @@ class GNParameterCode {
     static OwnerIds = "ownerIds";
     static GetStoreUsed = "getStoreUsed";
     static RemoveStoreUsed = "removeStoreUsed";
+    static AdminSecretKeys = "adminSecretKeys";
+    static ServerSecretKeys = "serverSecretKeys";
+    static PlayerSecretKeys = "playerSecretKeys";
 }
 
 ;// ./src/GN-app-api/service/EventCallbackService.ts
@@ -2680,15 +2694,15 @@ class EventCallbackCloudScriptService {
     async executeSystem(eventName) {
         let cloudFunction = this.cloudScriptFunctionDict.get("system");
         if (cloudFunction == null) {
-            Debug.logError("[GN] [SystemEventCallback] system not found");
+            Debug.logError("[GearN] [SystemEventCallback] system not found");
             return;
         }
         let cloudScriptWorker = this.loadCloudScriptFunctionWorkerFromCache(cloudFunction.type, eventName);
         if (cloudScriptWorker == null) {
-            Debug.logError("[GN] [SystemEventCallback] worker not found at " + cloudFunction.type);
+            Debug.logError("[GearN] [SystemEventCallback] worker not found at " + cloudFunction.type);
             return;
         }
-        Debug.log("[GN] [SystemEventCallback] auto call " + eventName);
+        Debug.log("[GearN] [SystemEventCallback] auto call " + eventName);
         let requestId = StringUtility.generateRandomString(10, 0);
         let cloudScriptRequest = {
             requestId: requestId,
@@ -2730,22 +2744,22 @@ class EventCallbackCloudScriptService {
         if (cloudScriptResponse.logs.length != 0)
             Debug.log(JSON.stringify(cloudScriptResponse.logs));
         if (cloudScriptResponse.response.status == ExecuteResponseStatus.Ok) {
-            Debug.log("[GN] [SystemEventCallback] auto call success " + eventName);
+            Debug.log("[GearN] [SystemEventCallback] auto call success " + eventName);
         }
         else {
-            Debug.log("[GN] [SystemEventCallback] auto call failed " + eventName + " " + cloudScriptResponse.response.errorMessage);
+            Debug.log("[GearN] [SystemEventCallback] auto call failed " + eventName + " " + cloudScriptResponse.response.errorMessage);
         }
     }
     async executeRequestServerDetailSystem(gameId, matchmakingTicketCanMatch) {
         let cloudFunction = this.cloudScriptFunctionDict.get("system");
         if (cloudFunction == null) {
-            Debug.logError("[GN] [SystemEventCallback] system not found");
+            Debug.logError("[GearN] [SystemEventCallback] system not found");
             return { success: false };
         }
         let eventName = "system_RequestServerDetail";
         let cloudScriptWorker = this.loadCloudScriptFunctionWorkerFromCache(cloudFunction.type, eventName);
         if (cloudScriptWorker == null) {
-            Debug.logError("[GN] [SystemEventCallback] worker not found at " + cloudFunction.type);
+            Debug.logError("[GearN] [SystemEventCallback] worker not found at " + cloudFunction.type);
             return { success: false };
         }
         let requestId = StringUtility.generateRandomString(10, 0);
@@ -2803,12 +2817,12 @@ class EventCallbackCloudScriptService {
     async executeEvent(eventName, request, operationEvent) {
         let cloudFunction = this.cloudScriptFunctionDict.get("system");
         if (cloudFunction == null) {
-            Debug.logError("[GN] [SystemEventCallback] system not found");
+            Debug.logError("[GearN] [SystemEventCallback] system not found");
             return;
         }
         let cloudScriptWorker = this.loadCloudScriptFunctionWorkerFromCache(cloudFunction.type, eventName);
         if (cloudScriptWorker == null) {
-            Debug.logError("[GN] [SystemEventCallback] worker not found at " + cloudFunction.type);
+            Debug.logError("[GearN] [SystemEventCallback] worker not found at " + cloudFunction.type);
             return;
         }
         let requestId = StringUtility.generateRandomString(10, 0);
@@ -3180,7 +3194,7 @@ class EventCallbackCloudScriptService {
     loadCloudScriptWorker(type, version) {
         let finalVersion = type + "_" + version;
         let filePath = __dirname + "/./GN-startup/cloudScript/" + finalVersion + ".js";
-        Debug.log("[GN] [EventCallback] run cloudScript " + finalVersion);
+        Debug.log("[GearN] [EventCallback] run cloudScript " + finalVersion);
         let cloudScriptWorker = (0,external_child_process_namespaceObject.fork)(filePath, {
             env: {
                 gnServerSettingsOptions: JSON.stringify(this.gnServerSettingsOptions),
@@ -3245,7 +3259,7 @@ class EventCallbackCloudScriptService {
             }
         });
         cloudScriptWorker.on("exit", (code) => {
-            Debug.log("[GN] [EventCallback] terminal cloudScript " + finalVersion + " with code " + code);
+            Debug.log("[GearN] [EventCallback] terminal cloudScript " + finalVersion + " with code " + code);
             thiz.cloudScriptWorkerDict.delete(finalVersion);
         });
         this.cloudScriptWorkerDict.set(finalVersion, cloudScriptWorker);
@@ -3345,8 +3359,9 @@ class PreEventCallbackService {
     }
 }
 
-;// external "crypto-js"
-const external_crypto_js_namespaceObject = require("crypto-js");
+;// external "crypto"
+const external_crypto_namespaceObject = require("crypto");
+var external_crypto_default = /*#__PURE__*/__webpack_require__.n(external_crypto_namespaceObject);
 ;// ./src/GN-app-api/service/FacebookService.ts
 
 
@@ -3412,10 +3427,23 @@ class FacebookService {
         let signedRequest = payloadJson["json"]["signedRequest"];
         let appId = payloadJson["json"]["appId"];
         if (this.facebookValidationReceipt(signedRequest)) {
-            let json = external_crypto_js_namespaceObject.enc.Base64.parse(signedRequest.split('.')[1]).toString(external_crypto_js_namespaceObject.enc.Utf8);
-            let gsJson = JSON.parse(json);
-            if (appId == this.facebookAppId) {
-                let product_id = gsJson["product_id"];
+            // let json = CryptoJS.enc.Base64.parse(signedRequest.split(".")[1]).toString(CryptoJS.enc.Utf8);
+            // let gsJson = JSON.parse(json);
+            // if (appId == this.facebookAppId) {
+            // 	let product_id = gsJson["product_id"];
+            // 	return {
+            // 		success: true,
+            // 		productId: product_id,
+            // 	};
+            // }
+            const base64Payload = signedRequest.split(".")[1]
+                .replace(/-/g, "+")
+                .replace(/_/g, "/");
+            const payloadBuffer = Buffer.from(base64Payload, "base64");
+            const jsonStr = payloadBuffer.toString("utf8");
+            const gsJson = JSON.parse(jsonStr);
+            if (appId === this.facebookAppId) {
+                const product_id = gsJson["product_id"];
                 return {
                     success: true,
                     productId: product_id,
@@ -3427,11 +3455,21 @@ class FacebookService {
         };
     }
     facebookValidationReceipt(signedRequest) {
-        let firstpart = signedRequest.split('.')[0];
-        firstpart = firstpart.replace(/-/g, '+').replace(/_/g, '/');
-        let signature = external_crypto_js_namespaceObject.enc.Base64.parse(firstpart).toString();
-        let dataHash = external_crypto_js_namespaceObject.HmacSHA256(signedRequest.split('.')[1], this.facebookInappSecret).toString();
-        let isValid = signature === dataHash;
+        // let [encodedSig, encodedPayload] = signedRequest.split(".");
+        // let base64Sig = encodedSig.replace(/-/g, "+").replace(/_/g, "/");
+        // let signature = CryptoJS.enc.Base64.parse(base64Sig).toString();
+        // let dataHash = CryptoJS.HmacSHA256(encodedPayload, this.facebookInappSecret).toString();
+        // let isValid = signature === dataHash;
+        // return isValid;
+        const [encodedSig, encodedPayload] = signedRequest.split(".");
+        const base64Sig = encodedSig
+            .replace(/-/g, "+")
+            .replace(/_/g, "/");
+        const signatureBuffer = Buffer.from(base64Sig, "base64");
+        const hmac = (0,external_crypto_namespaceObject.createHmac)("sha256", this.facebookInappSecret);
+        hmac.update(encodedPayload);
+        const dataHashBuffer = hmac.digest();
+        const isValid = signatureBuffer.equals(dataHashBuffer);
         return isValid;
     }
     ;
@@ -3468,9 +3506,6 @@ class GenericService {
     }
 }
 
-;// external "crypto"
-const external_crypto_namespaceObject = require("crypto");
-var external_crypto_default = /*#__PURE__*/__webpack_require__.n(external_crypto_namespaceObject);
 ;// ./src/GN-app-api/service/GoogleService.ts
 
 
@@ -3558,16 +3593,16 @@ class GoogleService {
     androidValidationReceipt(signature, signedData) {
         if (!this.publicKeyString)
             return false;
-        let verifier = external_crypto_default().createVerify('RSA-SHA1');
+        let verifier = external_crypto_default().createVerify("RSA-SHA1");
         verifier.update(signedData);
-        return verifier.verify(this.publicKeyString, signature, 'base64');
+        return verifier.verify(this.publicKeyString, signature, "base64");
     }
     ;
     // gotta give credit to nothing2lose for this function
     generateFormattedPublickey(publicKeyStr) {
         var KEY_PREFIX, KEY_SUFFIX, chunkSize, chunks, str;
         KEY_PREFIX = "-----BEGIN PUBLIC KEY-----\n";
-        KEY_SUFFIX = '\n-----END PUBLIC KEY-----';
+        KEY_SUFFIX = "\n-----END PUBLIC KEY-----";
         str = publicKeyStr;
         chunks = [];
         chunkSize = 64;
@@ -3625,7 +3660,7 @@ class PushNotificationService {
             credential: external_firebase_admin_default().credential.cert({
                 projectId: this.projectId,
                 clientEmail: this.clientEmail,
-                privateKey: this.privateKey.replace(/\\n/g, '\n'),
+                privateKey: this.privateKey.replace(/\\n/g, "\n"),
             }),
         });
         this.messaging = external_firebase_admin_default().messaging();
@@ -5628,34 +5663,61 @@ class RequestConverterService {
     }
 }
 
-;// external "@sendgrid/mail"
-const mail_namespaceObject = require("@sendgrid/mail");
-var mail_default = /*#__PURE__*/__webpack_require__.n(mail_namespaceObject);
+;// external "nodemailer"
+const external_nodemailer_namespaceObject = require("nodemailer");
+var external_nodemailer_default = /*#__PURE__*/__webpack_require__.n(external_nodemailer_namespaceObject);
 ;// ./src/GN-app-api/service/EmailService.ts
 
 class EmailService {
     isInit = false;
-    sendGridApiKey;
+    host;
+    port;
+    secure;
+    username;
+    password;
     fromEmail;
     needSetup = false;
-    init(sendGridApiKey, fromEmail) {
+    transporter;
+    init(host, port, secure, username, password, fromEmail) {
         this.isInit = false;
-        let oldSendGridApiKey = this.sendGridApiKey;
-        this.sendGridApiKey = sendGridApiKey;
+        let oldHost = this.host;
+        let oldPort = this.port;
+        let oldSecure = this.secure;
+        let oldUsername = this.username;
+        let oldPassword = this.password;
+        this.host = host;
+        this.port = port;
+        this.secure = secure;
+        this.username = username;
+        this.password = password;
         this.fromEmail = fromEmail;
-        if (oldSendGridApiKey != sendGridApiKey) {
+        if (oldHost != host || oldPort != port || oldSecure != secure || oldUsername != username || oldPassword != password) {
             this.needSetup = true;
         }
     }
     run() {
-        if (!this.sendGridApiKey)
+        if (!this.host)
+            return;
+        if (!this.port)
+            return;
+        if (!this.username)
+            return;
+        if (!this.password)
             return;
         if (!this.needSetup)
             return;
-        mail_default().setApiKey(this.sendGridApiKey);
+        this.transporter = external_nodemailer_default().createTransport({
+            host: this.host,
+            port: this.port,
+            secure: this.secure,
+            auth: {
+                user: this.username,
+                pass: this.password,
+            }
+        });
         this.isInit = true;
     }
-    async sendMail(toEmail, subject, contentHtml, onSendMailSuccess, onSendMailError) {
+    sendMail(toEmail, subject, contentHtml, onSendMailSuccess, onSendMailError) {
         if (!this.isInit)
             return;
         let msg = {
@@ -5664,24 +5726,18 @@ class EmailService {
             subject: subject,
             html: contentHtml,
         };
-        try {
-            let response = await mail_default().send(msg);
-            let statusCode = response;
-            if (statusCode > 399) {
+        this.transporter.sendMail(msg, (error, info) => {
+            if (error) {
                 if (onSendMailError != null)
-                    onSendMailError(response.toString());
+                    onSendMailError(error.message);
             }
             else {
                 if (onSendMailSuccess != null)
                     onSendMailSuccess();
             }
-        }
-        catch (err) {
-            if (onSendMailError != null)
-                onSendMailError(err.message);
-        }
+        });
     }
-    async sendMailToMore(toEmails, subject, contentHtml, onSendMailSuccess, onSendMailError) {
+    sendMailToMore(toEmails, subject, contentHtml, onSendMailSuccess, onSendMailError) {
         if (!this.isInit)
             return;
         let msg = {
@@ -5690,22 +5746,16 @@ class EmailService {
             subject: subject,
             html: contentHtml,
         };
-        try {
-            let response = await mail_default().send(msg);
-            let statusCode = response;
-            if (statusCode > 399) {
+        this.transporter.sendMail(msg, (error, info) => {
+            if (error) {
                 if (onSendMailError != null)
-                    onSendMailError(response.toString());
+                    onSendMailError(error.message);
             }
             else {
                 if (onSendMailSuccess != null)
                     onSendMailSuccess();
             }
-        }
-        catch (err) {
-            if (onSendMailError != null)
-                onSendMailError(err.message);
-        }
+        });
     }
 }
 
@@ -5957,21 +6007,6 @@ class ConfigService {
     }
 }
 
-;// external "async-lock"
-const external_async_lock_namespaceObject = require("async-lock");
-var external_async_lock_default = /*#__PURE__*/__webpack_require__.n(external_async_lock_namespaceObject);
-;// ./src/GN-app-api/service/LockService.ts
-
-const asyncLock = new (external_async_lock_default())();
-class LockService {
-    async handle(key, fn) {
-        return await asyncLock.acquire(key, fn);
-    }
-    isBusy(key) {
-        return asyncLock.isBusy(key);
-    }
-}
-
 ;// ./src/GN-app-api/service/TimerService.ts
 
 
@@ -6473,6 +6508,7 @@ class SecretInfo_BuilderBase {
     role;
     remove;
     tsExpire;
+    displayName;
     permission;
     gameId;
     isDefault;
@@ -6492,6 +6528,9 @@ class SecretInfo_BuilderBase {
     getTsExpire() {
         return this.tsExpire;
     }
+    getDisplayName() {
+        return this.displayName;
+    }
     getGameId() {
         return this.gameId;
     }
@@ -6529,6 +6568,9 @@ class SecretInfo_BuilderBase {
         //this.tsExpire = tsExpire;
         return this;
     }
+    setDisplayName(displayName) {
+        return this;
+    }
     build() {
         return null;
     }
@@ -6548,6 +6590,10 @@ class SecretInfo_Builder extends SecretInfo_BuilderBase {
         this.tsExpire = tsExpire;
         return this;
     }
+    setDisplayName(displayName) {
+        this.displayName = displayName;
+        return this;
+    }
     setPermission(permission) {
         this.permission = permission;
         return this;
@@ -6570,6 +6616,7 @@ class SecretInfo extends SecretInfo_BuilderBase {
         this.role = builder.getRole();
         this.remove = builder.isRemove();
         this.tsExpire = builder.getTsExpire();
+        this.displayName = builder.getDisplayName();
         this.permission = builder.getPermission();
         this.gameId = builder.getGameId();
         this.isDefault = builder.getIsDefault();
@@ -6585,6 +6632,7 @@ class SecretInfo extends SecretInfo_BuilderBase {
             "role": this.role,
             "isRemove": this.remove,
             "tsExpire": this.tsExpire,
+            "displayName": this.displayName,
             "permission": this.permission,
             "gameId": this.gameId,
         };
@@ -6710,19 +6758,27 @@ class DisplayNameUtility {
                 inputReturn += "y";
             else if (char == "z")
                 inputReturn += "z";
+            else if (char == "0" ||
+                char == "1" ||
+                char == "2" ||
+                char == "3" ||
+                char == "4" ||
+                char == "5" ||
+                char == "6" ||
+                char == "7" ||
+                char == "8" ||
+                char == "9")
+                inputReturn += char;
         }
         return inputReturn;
     }
 }
 
-;// external "md5"
-const external_md5_namespaceObject = require("md5");
-var external_md5_default = /*#__PURE__*/__webpack_require__.n(external_md5_namespaceObject);
 ;// ./src/GN-common/helper/Md5Generate.ts
 
 class Md5Generate {
     static getMd5(input) {
-        return external_md5_default()(input);
+        return (0,external_crypto_namespaceObject.createHash)("md5").update(input).digest("hex");
     }
 }
 
@@ -7042,6 +7098,7 @@ class SecretInfoItem extends MasterAdminMongoObject {
     static _tsExpire = "tsExpire";
     static _permission = "permission";
     static _tsCreate = "tsCreate";
+    static _displayName = "displayName";
     static _creatorId = "creatorId";
     gameId;
     secretKey;
@@ -7050,6 +7107,7 @@ class SecretInfoItem extends MasterAdminMongoObject {
     creatorId;
     remove;
     tsExpire;
+    displayName;
     permission;
     constructor(result, collection) {
         super(result, collection);
@@ -7063,6 +7121,7 @@ class SecretInfoItem extends MasterAdminMongoObject {
     setDocumentMasterSecretInfoItem(result) {
         this.remove = result[SecretInfoItem._remove];
         this.tsExpire = result[SecretInfoItem._tsExpire];
+        this.displayName = result[SecretInfoItem._displayName];
         this.permission = result[SecretInfoItem._permission];
     }
     getGameId() {
@@ -7094,6 +7153,13 @@ class SecretInfoItem extends MasterAdminMongoObject {
         this.tsExpire = tsExpire;
         this.set(SecretInfoItem._tsExpire, this.tsExpire);
     }
+    getDisplayName() {
+        return this.displayName;
+    }
+    setDisplayName(displayName) {
+        this.displayName = displayName;
+        this.set(SecretInfoItem._displayName, this.displayName);
+    }
     getPermission() {
         return this.permission;
     }
@@ -8907,14 +8973,16 @@ class xDatabase {
         }).skip(skip).limit(limit);
         return this.convertToMasterPlayers(results, collection);
     }
-    async loadMasterPlayersWithDisplayNameAsync(keyword, skip, limit, masterPlayerFindOptions) {
+    async loadMasterPlayerWithDisplayNameAsync(displayName, masterPlayerFindOptions) {
         let collection = this.systemCollection("MasterPlayer");
-        let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
+        let result = await collection.findOne({ displayName: displayName }, {
             projection: this.getFindOptions(masterPlayerFindOptions)
-        }).skip(skip).limit(limit);
-        return this.convertToMasterPlayers(results, collection);
+        });
+        if (!result)
+            return null;
+        return new MasterPlayer(result, collection);
     }
-    async loadMasterPlayerWithDisplayNameAsync(displayNameNormalize, masterPlayerFindOptions) {
+    async loadMasterPlayerWithDisplayNameNormalizeAsync(displayNameNormalize, masterPlayerFindOptions) {
         let collection = this.systemCollection("MasterPlayer");
         let result = await collection.findOne({ displayNameNormalize: displayNameNormalize }, {
             projection: this.getFindOptions(masterPlayerFindOptions)
@@ -8923,6 +8991,13 @@ class xDatabase {
             return null;
         return new MasterPlayer(result, collection);
     }
+    async loadMasterPlayersWithDisplayNameNormalizeRegexAsync(keyword, skip, limit, masterPlayerFindOptions) {
+        let collection = this.systemCollection("MasterPlayer");
+        let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
+            projection: this.getFindOptions(masterPlayerFindOptions)
+        }).skip(skip).limit(limit);
+        return this.convertToMasterPlayers(results, collection);
+    }
     async loadMasterPlayersLeaderboardWithStatisticsAsync(key, skip, limit, direction, masterPlayerFindOptions) {
         let collection = this.systemCollection("MasterPlayer");
         let $sort = {};
@@ -9228,14 +9303,16 @@ class xDatabase {
         }).skip(skip).limit(limit);
         return this.convertToGamePlayers(results, collection);
     }
-    async loadGamePlayersWithDisplayNameAsync(keyword, skip, limit, gameId, gamePlayerFindOptions) {
-        let collection = this.systemGameCollection("GamePlayer", gameId);
-        let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
+    async loadGamePlayerWithDisplayNameAsync(displayName, gamePlayerFindOptions) {
+        let collection = this.systemCollection("GamePlayer");
+        let result = await collection.findOne({ displayName: displayName }, {
             projection: this.getFindOptions(gamePlayerFindOptions)
-        }).skip(skip).limit(limit);
-        return this.convertToGamePlayers(results, collection);
+        });
+        if (!result)
+            return null;
+        return new GamePlayer(result, collection);
     }
-    async loadGamePlayerWithDisplayNameAsync(displayNameNormalize, gamePlayerFindOptions) {
+    async loadGamePlayerWithDisplayNameNormalizeAsync(displayNameNormalize, gamePlayerFindOptions) {
         let collection = this.systemCollection("GamePlayer");
         let result = await collection.findOne({ displayNameNormalize: displayNameNormalize }, {
             projection: this.getFindOptions(gamePlayerFindOptions)
@@ -9244,6 +9321,13 @@ class xDatabase {
             return null;
         return new GamePlayer(result, collection);
     }
+    async loadGamePlayersWithDisplayNameNormalizeRegexAsync(keyword, skip, limit, gameId, gamePlayerFindOptions) {
+        let collection = this.systemGameCollection("GamePlayer", gameId);
+        let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
+            projection: this.getFindOptions(gamePlayerFindOptions)
+        }).skip(skip).limit(limit);
+        return this.convertToGamePlayers(results, collection);
+    }
     async loadGamePlayersLeaderboardWithStatisticsAsync(key, skip, limit, gameId, direction, gamePlayerFindOptions) {
         let collection = this.systemGameCollection("GamePlayer", gameId);
         let $sort = {};
@@ -9470,20 +9554,31 @@ class xDatabase {
         }).skip(skip).limit(limit);
         return this.convertToCharacterPlayers(results, collection);
     }
-    async loadCharacterPlayersWithDisplayNameAsync(keyword, skip, limit, gameId, characterPlayerFindOptions) {
+    async loadCharacterPlayerWithDisplayNameAsync(displayName, gameId, characterPlayerFindOptions) {
         let collection = this.systemGameCollection("CharacterPlayer", gameId);
-        let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
+        let result = await collection.findOne({ displayName: displayName }, {
             projection: this.getFindOptions(characterPlayerFindOptions)
-        }).skip(skip).limit(limit);
-        return this.convertToCharacterPlayers(results, collection);
+        });
+        if (!result)
+            return null;
+        return new CharacterPlayer(result, collection);
     }
-    async loadCharacterPlayerWithDisplayNameAsync(displayNameNormalize, gameId, characterPlayerFindOptions) {
+    async loadCharacterPlayerWithDisplayNameNormalizeAsync(displayNameNormalize, gameId, characterPlayerFindOptions) {
         let collection = this.systemGameCollection("CharacterPlayer", gameId);
         let result = await collection.findOne({ displayNameNormalize: displayNameNormalize }, {
             projection: this.getFindOptions(characterPlayerFindOptions)
         });
+        if (!result)
+            return null;
         return new CharacterPlayer(result, collection);
     }
+    async loadCharacterPlayersWithDisplayNameNormalizeRegexAsync(keyword, skip, limit, gameId, characterPlayerFindOptions) {
+        let collection = this.systemGameCollection("CharacterPlayer", gameId);
+        let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
+            projection: this.getFindOptions(characterPlayerFindOptions)
+        }).skip(skip).limit(limit);
+        return this.convertToCharacterPlayers(results, collection);
+    }
     async loadCharacterPlayersLeaderboardWithStatisticsAsync(key, skip, limit, catalogId, gameId, direction, characterPlayerFindOptions) {
         let collection = this.systemGameCollection("CharacterPlayer", gameId);
         let $sort = {};
@@ -9716,7 +9811,25 @@ class xDatabase {
         }).skip(skip).limit(limit);
         return this.convertToGroups(results, collection);
     }
-    async loadGroupsWithDisplayNameAsync(keyword, skip, limit, gameId, groupFindOptions) {
+    async loadGroupWithDisplayNameAsync(displayName, gameId, groupFindOptions) {
+        let collection = this.systemGameCollection("Group", gameId);
+        let result = await collection.findOne({ displayName: displayName }, {
+            projection: this.getFindOptions(groupFindOptions)
+        });
+        if (!result)
+            return null;
+        return new Group(result, collection);
+    }
+    async loadGroupWithDisplayNameNormalizeAsync(displayNameNormalize, gameId, groupFindOptions) {
+        let collection = this.systemGameCollection("Group", gameId);
+        let result = await collection.findOne({ displayNameNormalize: displayNameNormalize }, {
+            projection: this.getFindOptions(groupFindOptions)
+        });
+        if (!result)
+            return null;
+        return new Group(result, collection);
+    }
+    async loadGroupsWithDisplayNameNormalizeRegexAsync(keyword, skip, limit, gameId, groupFindOptions) {
         let collection = this.systemGameCollection("Group", gameId);
         let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
             projection: this.getFindOptions(groupFindOptions)
@@ -9869,7 +9982,25 @@ class xDatabase {
         }).skip(skip).limit(limit);
         return this.convertToInventories(results, collection);
     }
-    async loadInventoriesWithDisplayNameAsync(keyword, skip, limit, gameId, inventoryFindOptions) {
+    async loadInventoryWithDisplayNameAsync(displayName, gameId, inventoryFindOptions) {
+        let collection = this.systemGameCollection("Inventory", gameId);
+        let result = await collection.findOne({ displayName: displayName }, {
+            projection: this.getFindOptions(inventoryFindOptions)
+        });
+        if (!result)
+            null;
+        return new Inventory(result, collection);
+    }
+    async loadInventoryWithDisplayNameNormalizeAsync(displayNameNormalize, gameId, inventoryFindOptions) {
+        let collection = this.systemGameCollection("Inventory", gameId);
+        let result = await collection.findOne({ displayNameNormalize: displayNameNormalize }, {
+            projection: this.getFindOptions(inventoryFindOptions)
+        });
+        if (!result)
+            null;
+        return new Inventory(result, collection);
+    }
+    async loadInventoriesWithDisplayNameNormalizeRegexAsync(keyword, skip, limit, gameId, inventoryFindOptions) {
         let collection = this.systemGameCollection("Inventory", gameId);
         let results = await collection.find({ displayNameNormalize: { $regex: keyword } }, {
             projection: this.getFindOptions(inventoryFindOptions)
@@ -10285,6 +10416,7 @@ const msgpack_namespaceObject = require("@msgpack/msgpack");
 
 
 
+
 var AntiDdosMiddleware_RequestType;
 (function (RequestType) {
     RequestType[RequestType["HTTP"] = 0] = "HTTP";
@@ -10297,6 +10429,7 @@ var BanType;
 })(BanType || (BanType = {}));
 class AntiDdosMiddleware {
     static FIVE_MINUTE_TS = 5 * 60 * 1000;
+    static K_MULTIPLE_ADMIN = 500;
     static K_MULTIPLE_WHITE_LIST = 100;
     static K_MULTIPLE_BLACK_LIST = 5;
     socketRequestPerIPDic;
@@ -10397,12 +10530,19 @@ class AntiDdosMiddleware {
             || url == "/167/11/1") {
             return ReturnCode.Ok;
         }
-        let contentLengthStr = req.headers['content-length'];
+        let contentLengthStr = req.header("content-length");
         if (contentLengthStr) {
             let ip = req.xip;
             let httpMaxRequestSize = this.httpMaxRequestSize;
             if (this.ipWhiteLst.includes(ip))
                 httpMaxRequestSize = httpMaxRequestSize * AntiDdosMiddleware.K_MULTIPLE_WHITE_LIST;
+            else {
+                let role = Number.parseInt(req.params.role);
+                if (!Number.isNaN(role)) {
+                    if (role == RequestRole.Admin || role == RequestRole.Server)
+                        httpMaxRequestSize = httpMaxRequestSize * AntiDdosMiddleware.K_MULTIPLE_ADMIN;
+                }
+            }
             let contentLength = parseInt(contentLengthStr);
             if (contentLength > httpMaxRequestSize) {
                 this.reportDdosCollection.insertOne({
@@ -10572,6 +10712,13 @@ class AntiDdosMiddleware {
             httpMaxRequestPerSecondPerIp = httpMaxRequestPerSecondPerIp / AntiDdosMiddleware.K_MULTIPLE_BLACK_LIST;
         else if (this.ipWhiteLst.includes(ip))
             httpMaxRequestPerSecondPerIp = httpMaxRequestPerSecondPerIp * AntiDdosMiddleware.K_MULTIPLE_WHITE_LIST;
+        else {
+            let role = Number.parseInt(req.params.role);
+            if (!Number.isNaN(role)) {
+                if (role == RequestRole.Admin || role == RequestRole.Server)
+                    httpMaxRequestPerSecondPerIp = httpMaxRequestPerSecondPerIp * AntiDdosMiddleware.K_MULTIPLE_ADMIN;
+            }
+        }
         if (httpRequestPerIPItem.count > httpMaxRequestPerSecondPerIp) {
             this.reportDdosCollection.insertOne({
                 returnCode: ReturnCode.MaxRequestReject,
@@ -10634,6 +10781,13 @@ class AntiDdosMiddleware {
                 httpMaxRequestPerSecondPerPeer = httpMaxRequestPerSecondPerPeer / AntiDdosMiddleware.K_MULTIPLE_BLACK_LIST;
             else if (this.ipWhiteLst.includes(ip))
                 httpMaxRequestPerSecondPerPeer = httpMaxRequestPerSecondPerPeer * AntiDdosMiddleware.K_MULTIPLE_WHITE_LIST;
+            else {
+                let role = Number.parseInt(req.params.role);
+                if (!Number.isNaN(role)) {
+                    if (role == RequestRole.Admin || role == RequestRole.Server)
+                        httpMaxRequestPerSecondPerPeer = httpMaxRequestPerSecondPerPeer * AntiDdosMiddleware.K_MULTIPLE_ADMIN;
+                }
+            }
             httpRequestPerPeerItem.count++;
             if (httpRequestPerPeerItem.count > httpMaxRequestPerSecondPerPeer) {
                 this.reportDdosCollection.insertOne({
@@ -10673,6 +10827,13 @@ class AntiDdosMiddleware {
             httpMaxPendingRequest = httpMaxPendingRequest / AntiDdosMiddleware.K_MULTIPLE_BLACK_LIST;
         else if (this.ipWhiteLst.includes(ip))
             httpMaxPendingRequest = httpMaxPendingRequest * AntiDdosMiddleware.K_MULTIPLE_WHITE_LIST;
+        else {
+            let role = Number.parseInt(req.params.role);
+            if (!Number.isNaN(role)) {
+                if (role == RequestRole.Admin || role == RequestRole.Server)
+                    httpMaxPendingRequest = httpMaxPendingRequest * AntiDdosMiddleware.K_MULTIPLE_ADMIN;
+            }
+        }
         if (this.currentHttpRequestCount > httpMaxPendingRequest) {
             this.reportDdosCollection.insertOne({
                 returnCode: ReturnCode.MaxRequestReject,
@@ -14597,7 +14758,7 @@ class ApiMiddleware {
             for (let key of keysNeedRemove) {
                 this.authInfoDict.delete(key);
             }
-            Debug.log("[GN] ApiMiddleware remove " + removeCount + "/" + startSize);
+            Debug.log("[GearN] ApiMiddleware remove " + removeCount + "/" + startSize);
         }
         catch (err) {
             Debug.logException(err);
@@ -14767,8 +14928,7 @@ class ApiMiddleware {
         return next();
     }
     async getReturnCodeAuthenticate(req) {
-        let headers = req.headers;
-        let authToken = headers[Commands.RequestAuthTokenCmd];
+        let authToken = req.header(Commands.RequestAuthTokenCmd);
         let currentMilliseconds = xDatetime.getCurrentMilliseconds();
         if (!authToken) {
             req.isAuthenticated = false;
@@ -14811,7 +14971,7 @@ class ApiMiddleware {
                 }
             }
         }
-        let secretKey = headers[Commands.RequestSecretCmd];
+        let secretKey = req.header(Commands.RequestSecretCmd);
         if (!secretKey) {
             if (!req.isAuthenticated) {
                 if (req.url != "/-1/9/3") {
@@ -14836,7 +14996,7 @@ class ApiMiddleware {
                 return ReturnCode.SecretInvalid;
             }
             if (!secretInfo.getGameId()) {
-                let gameId = headers[Commands.RequestGameIdCmd];
+                let gameId = req.header(Commands.RequestGameIdCmd);
                 if (!gameId)
                     gameId = ApiMiddleware.DEFAULT_GAME_ID;
                 let secretInfoAny = structuredClone(secretInfo);
@@ -15040,14 +15200,16 @@ class UploadFileMiddleware {
     }
 }
 
-;// external "async-middleware"
-const external_async_middleware_namespaceObject = require("async-middleware");
+;// ./src/GN-startup/routes/utils/wrap.ts
+function wrap(fn) {
+    return (req, res, next) => {
+        Promise.resolve(fn(req, res, next)).catch(next);
+    };
+}
+
 ;// external "express"
 const external_express_namespaceObject = require("express");
 var external_express_default = /*#__PURE__*/__webpack_require__.n(external_express_namespaceObject);
-;// external "express-msgpack"
-const external_express_msgpack_namespaceObject = require("express-msgpack");
-var external_express_msgpack_default = /*#__PURE__*/__webpack_require__.n(external_express_msgpack_namespaceObject);
 ;// ./src/GN-startup/routes/HttpAppHandler.ts
 
 
@@ -15059,7 +15221,6 @@ var external_express_msgpack_default = /*#__PURE__*/__webpack_require__.n(extern
 
 
 
-
 class HttpAppHandler {
     _onRequestCb;
     apiMiddleware;
@@ -15180,17 +15341,17 @@ class HttpAppHandler {
         this.router.use("/api", apiRouter);
         if (this.enablePostViaJson) {
             this.apiJsonRouter = external_express_default().Router();
-            apiRouter.use("/" + Commands.RequestCmd_Json, (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            apiRouter.use("/" + Commands.RequestCmd_Json, wrap((req, res, next) => {
                 return this.apiMiddleware.getIP(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.checkMaxRequestPerSecondPerIpViaJson(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.checkRequestSizeBodyViaJson(req, res, next);
-            }), external_express_default().json({ limit: "10mb" }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.apiMiddleware.authenticateTokenViaJson(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.checkMaxRequestPerSecondPerPeerViaJson(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), external_express_default().json({ limit: "10mb" }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.addPendingRequestViaJson(req, res, next);
             }), this.apiJsonRouter);
             this.apiJsonRouter.post("/:code/:type/:role", async (req, res) => {
@@ -15202,15 +15363,10 @@ class HttpAppHandler {
                         Debug.log("[HTTP SEND] %O", JSON.stringify(httpData));
                     }
                     if (operationResponse.isEncrypted()) {
-                        let content = Buffer.from((0,msgpack_namespaceObject.encode)(httpData));
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
-                        res.setHeader(Commands.CONTENT_LENGTH, content.length);
-                        return res.send(content);
-                    }
-                    else {
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
-                        return res.send(httpData);
+                        // TODO Encrypt data here
                     }
+                    res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
+                    return res.send(httpData);
                 }
                 res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
                 return res.send([ReturnCode.OperationInvalid]);
@@ -15218,17 +15374,33 @@ class HttpAppHandler {
         }
         if (this.enablePostViaMsgPack) {
             this.apiMsgPackRouter = external_express_default().Router();
-            apiRouter.use("/" + Commands.RequestCmd_MsgPack, (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            apiRouter.use("/" + Commands.RequestCmd_MsgPack, wrap((req, res, next) => {
                 return this.apiMiddleware.getIP(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.checkMaxRequestPerSecondPerIpViaMsgPack(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.checkRequestSizeBodyViaMsgPack(req, res, next);
-            }), external_express_msgpack_default()(), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.apiMiddleware.authenticateTokenViaMsgPack(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), wrap((req, res, next) => {
                 return this.antiDdosMiddleware.checkMaxRequestPerSecondPerPeerViaMsgPack(req, res, next);
-            }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+            }), (req, res, next) => {
+                if (req.header(Commands.CONTENT_TYPE) === Commands.APPLICATION_MSGPACK) {
+                    let buffer = [];
+                    req.on("data", chunk => buffer.push(chunk));
+                    req.on("end", () => {
+                        try {
+                            const raw = Buffer.concat(buffer);
+                            req.body = (0,msgpack_namespaceObject.decode)(raw);
+                            return next();
+                        }
+                        catch (err) {
+                            return next(err);
+                        }
+                    });
+                }
+                return next();
+            }, wrap((req, res, next) => {
                 return this.antiDdosMiddleware.addPendingRequestViaMsgPack(req, res, next);
             }), this.apiMsgPackRouter);
             this.apiMsgPackRouter.post("/:code/:type/:role", async (req, res) => {
@@ -15240,16 +15412,12 @@ class HttpAppHandler {
                         Debug.log("[HTTP SEND] %O", JSON.stringify(httpData));
                     }
                     if (operationResponse.isEncrypted()) {
-                        let content = Buffer.from((0,msgpack_namespaceObject.encode)(httpData));
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
-                        res.setHeader(Commands.CONTENT_LENGTH, content.length);
-                        return res.send(content);
-                    }
-                    else {
-                        let content = httpData;
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
-                        return res.send(content);
+                        // TODO Encrypt data here
                     }
+                    let content = Buffer.from((0,msgpack_namespaceObject.encode)(httpData));
+                    res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
+                    res.setHeader(Commands.CONTENT_LENGTH, content.length);
+                    return res.send(content);
                 }
                 let content = Buffer.from((0,msgpack_namespaceObject.encode)([ReturnCode.OperationInvalid]));
                 res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
@@ -15368,7 +15536,7 @@ class SocketAppHandler {
                                 this.apiMiddleware.socketAuthenticateToken(socket, async (returnCode) => {
                                     let operationResponse = await this.onSocketRequestMsgPack(socket, data, returnCode);
                                     if (operationResponse != null) {
-                                        this.sendResponseForSocket(socket, operationResponse);
+                                        this.sendResponseForSocket(socket, operationResponse, true);
                                     }
                                     this.antiDdosMiddleware.removePendingRequestViaSocket(socket, data);
                                 });
@@ -15387,7 +15555,7 @@ class SocketAppHandler {
                                 this.apiMiddleware.socketAuthenticateToken(socket, async (returnCode) => {
                                     let operationResponse = await this.onSocketRequestJson(socket, data, returnCode);
                                     if (operationResponse != null) {
-                                        this.sendResponseForSocket(socket, operationResponse);
+                                        this.sendResponseForSocket(socket, operationResponse, false);
                                     }
                                     this.antiDdosMiddleware.removePendingRequestViaSocket(socket, data);
                                 });
@@ -15570,11 +15738,14 @@ class SocketAppHandler {
         if (this._onDisconnectCb != null)
             this._onDisconnectCb(socket, data);
     }
-    sendResponseForSocket(socket, operationResponse) {
+    sendResponseForSocket(socket, operationResponse, useMsgPack) {
         let socketData = OperationHelper.toResponseSocketData(operationResponse);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[SOCKET SEND] %O", JSON.stringify(socketData));
         if (operationResponse.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             socket.emit(Commands.ResponseCmd_MsgPack, socketDataMsgPack);
         }
@@ -15582,28 +15753,32 @@ class SocketAppHandler {
             socket.emit(Commands.ResponseCmd_Json, socketData);
         }
     }
-    sendEventForSocket(socket, operationEvent) {
-        let socketData = OperationHelper.toEventSocketData(operationEvent);
-        if (this.enableSendAndReceiveDebug)
-            Debug.log("[EVENT SEND] %O", JSON.stringify(socketData));
-        if (operationEvent.isEncrypted()) {
-            let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
-            socket.emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
-        }
-        else {
-            socket.emit(Commands.EventCmd_Json, socketData);
-        }
-    }
-    async sendEventTo(userId, operationEvent) {
+    // private sendEventForSocket(socket: Socket, operationEvent: OperationEvent) {
+    // 	let socketData = OperationHelper.toEventSocketData(operationEvent);
+    // 	if (this.enableSendAndReceiveDebug) Debug.log("[EVENT SEND] %O", JSON.stringify(socketData));
+    // 	if (operationEvent.isEncrypted())
+    // 	{
+    // 		let socketDataMsgPack = encode(socketData);
+    // 		socket.emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
+    // 	}
+    // 	else
+    // 	{
+    // 		socket.emit(Commands.EventCmd_Json, socketData);
+    // 	}
+    // }
+    sendEventTo(userId, operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO] " + userId + " %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.to(userId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
             else
-                this.server.to(userId).emit(Commands.EventCmd_MsgPack, (0,msgpack_namespaceObject.encode)(socketData));
+                this.server.to(userId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
         }
         else {
             if (this.emitter != null)
@@ -15612,16 +15787,19 @@ class SocketAppHandler {
                 this.server.to(userId).emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToRoom(roomId, operationEvent) {
+    sendEventToRoom(roomId, operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO ROOM] " + roomId + " %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.to(roomId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
             else
-                this.server.to(roomId).emit(Commands.EventCmd_MsgPack, (0,msgpack_namespaceObject.encode)(socketData));
+                this.server.to(roomId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
         }
         else {
             if (this.emitter != null)
@@ -15630,11 +15808,14 @@ class SocketAppHandler {
                 this.server.to(roomId).emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToMoreUser(userIds, operationEvent) {
+    sendEventToMoreUser(userIds, operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO MORE USER] %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.to(userIds).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
@@ -15648,11 +15829,14 @@ class SocketAppHandler {
                 this.server.to(userIds).emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToAllPlayer(operationEvent) {
+    sendEventToAllPlayer(operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO ALL PLAYER] %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
@@ -15666,7 +15850,7 @@ class SocketAppHandler {
                 this.server.emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToNamespace(namespace, operationEvent) {
+    sendEventToNamespace(namespace, operationEvent) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO NAME SPACE] %O", JSON.stringify(socketData));
@@ -15690,10 +15874,10 @@ class SocketAppHandler {
     getSockets(userId) {
         return this.server.in(userId);
     }
-    async joinRoom(userId, roomId) {
+    joinRoom(userId, roomId) {
         this.getSockets(userId).socketsJoin(roomId);
     }
-    async leaveRoom(userId, roomId) {
+    leaveRoom(userId, roomId) {
         this.getSockets(userId).socketsLeave(roomId);
     }
     async getRooms(userId) {
@@ -15749,21 +15933,21 @@ class UploadFileHandler {
     }
     init() {
         this.uploadRouter = external_express_default().Router();
-        this.router.use("/upload", (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        this.router.use("/upload", wrap((req, res, next) => {
             return this.apiMiddleware.getIP(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.antiDdosMiddleware.checkMaxUploadRequestPerSecondPerIp(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.apiMiddleware.authenticateUploadToken(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.antiDdosMiddleware.checkMaxUploadRequestPerSecondPerPeer(req, res, next);
         }), this.uploadRouter);
         let downloadRouter = external_express_default().Router();
-        this.router.use("/download", (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        this.router.use("/download", wrap((req, res, next) => {
             return this.apiMiddleware.getIP(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.antiDdosMiddleware.checkMaxUploadRequestPerSecondPerIp(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.antiDdosMiddleware.checkMaxUploadRequestPerSecondPerPeer(req, res, next);
         }), downloadRouter);
         downloadRouter.get("/:downloadToken", 
@@ -15819,11 +16003,11 @@ class UploadFileHandler {
         if (!external_fs_default().existsSync(uploadPath)) {
             external_fs_default().mkdirSync(uploadPath, { mode: "0775" });
         }
-        this.uploadRouter.post("/:fileId", (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        this.uploadRouter.post("/:fileId", wrap((req, res, next) => {
             return this.antiDdosMiddleware.addPendingUploadRequest(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.uploadFileMiddleware.checkFileUploadInvalid(req, res, next);
-        }), (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
+        }), wrap((req, res, next) => {
             return this.uploadFileMiddleware.handleUpload().single(Commands.File)(req, res, next);
         }), async (req, res) => {
             this.antiDdosMiddleware.removePendingUploadRequest(req, res);
@@ -15849,7 +16033,7 @@ class UploadFileHandler {
     }
     removeFile(fullPath) {
         external_fs_default().rm(fullPath, err => {
-            Debug.logError("[GN] remove file at path " + fullPath + ", error " + err);
+            Debug.logError("[GearN] remove file at path " + fullPath + ", error " + err);
         });
     }
 }
@@ -16657,11 +16841,11 @@ class ClusterHandler {
     }
     init() {
         this.clusterRouter = external_express_default().Router();
-        this.router.use("/cluster", (0,external_async_middleware_namespaceObject.wrap)((req, res, next) => {
-            // let pkt = req.header("privateKeyToken");
-            // if (!pkt || pkt != this.privateKeyToken) {
-            //     return res.sendStatus(401);
-            // }
+        this.router.use("/cluster", wrap((req, res, next) => {
+            let pkt = req.header("privateKeyToken");
+            if (!pkt || pkt != this.privateKeyToken) {
+                return res.sendStatus(401);
+            }
             return next();
         }), this.clusterRouter);
     }
@@ -16712,7 +16896,7 @@ class ClusterHandler {
             callback(data);
         }
         catch (err) {
-            Debug.logError("[GN] ClusterHandler receive event failed " + err.message);
+            Debug.logError("[GearN] ClusterHandler receive event failed " + err.message);
         }
     }
     async update() {
@@ -16840,10 +17024,10 @@ class ClusterHandler {
             if (nodeInfo.instanceId != this.instanceId)
                 external_axios_default().post(nodeInfo.fullUrl + "/cluster/sendEvent/" + name, data, { headers: { "pkt": this.privateKeyToken, "Content-Type": "application/json" } }).then(response => {
                     if (response.status != 200) {
-                        Debug.logError("[GN] ClusterHandler sendEvent failed with status " + response.status + ", instanceId: " + nodeInfo.instanceId);
+                        Debug.logError("[GearN] ClusterHandler sendEvent failed with status " + response.status + ", instanceId: " + nodeInfo.instanceId);
                     }
                 }).catch(err => {
-                    Debug.logError("[GN] ClusterHandler sendEvent failed " + err.message + ", instanceId: " + nodeInfo.instanceId);
+                    Debug.logError("[GearN] ClusterHandler sendEvent failed " + err.message + ", instanceId: " + nodeInfo.instanceId);
                 });
         }
         if (includeMe) {
@@ -26551,7 +26735,6 @@ var SetDisplayNameRequestHandler_metadata = (undefined && undefined.__metadata)
 
 
 
-
 class SetDisplayNameOperationRequest extends OperationRequest {
     userId;
     displayName;
@@ -26665,7 +26848,7 @@ class SetDisplayNameRequestHandler extends MasterPlayerBaseRequestHandler {
             displayName: true,
         };
         if (request.uniqueDisplayName) {
-            let masterPlayerWithThisDisplayName = await this.gnServer.getDatabase().loadMasterPlayerWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.displayName), masterPlayerFindOptions);
+            let masterPlayerWithThisDisplayName = await this.gnServer.getDatabase().loadMasterPlayerWithDisplayNameAsync(request.displayName, masterPlayerFindOptions);
             if (masterPlayerWithThisDisplayName != null) {
                 operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.DisplayNameHasUse);
                 return operationResponse;
@@ -31761,7 +31944,7 @@ class GetPlayersWithDisplayNameRequestHandler extends MasterPlayerBaseRequestHan
         operationResponse.setReturnCode(ReturnCode.Ok);
         let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
         let gnResults = new GNArray();
-        let masterPlayers = await this.gnServer.getDatabase().loadMasterPlayersWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, masterPlayerFindOptions);
+        let masterPlayers = await this.gnServer.getDatabase().loadMasterPlayersWithDisplayNameNormalizeRegexAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, masterPlayerFindOptions);
         for (let i = 0; i < masterPlayers.length; i++) {
             let masterPlayer = masterPlayers[i];
             let gnResult = new GNHashtable();
@@ -35298,7 +35481,6 @@ var characterPlayer_SetDisplayNameRequestHandler_metadata = (undefined && undefi
 
 
 
-
 class SetDisplayNameRequestHandler_SetDisplayNameOperationRequest extends OperationRequest {
     characterId;
     displayName;
@@ -35396,7 +35578,7 @@ class SetDisplayNameRequestHandler_SetDisplayNameRequestHandler extends Characte
             displayName: true,
         };
         if (request.uniqueDisplayName) {
-            let characterPlayerWithThisDisplayName = await this.gnServer.getDatabase().loadCharacterPlayerWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.displayName), secretInfo.getGameId(), characterPlayerFindOptions);
+            let characterPlayerWithThisDisplayName = await this.gnServer.getDatabase().loadCharacterPlayerWithDisplayNameAsync(request.displayName, secretInfo.getGameId(), characterPlayerFindOptions);
             if (characterPlayerWithThisDisplayName != null) {
                 operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.DisplayNameHasUse);
                 return operationResponse;
@@ -41288,7 +41470,7 @@ class GetPlayersWithDisplayNameRequestHandler_GetPlayersWithDisplayNameRequestHa
         operationResponse.setReturnCode(ReturnCode.Ok);
         let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
         let gnResults = new GNArray();
-        let characterPlayers = await this.gnServer.getDatabase().loadCharacterPlayersWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), characterPlayerFindOptions);
+        let characterPlayers = await this.gnServer.getDatabase().loadCharacterPlayersWithDisplayNameNormalizeRegexAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), characterPlayerFindOptions);
         for (let i = 0; i < characterPlayers.length; i++) {
             let characterPlayer = characterPlayers[i];
             let gnResult = new GNHashtable();
@@ -44332,7 +44514,6 @@ var gamePlayer_SetDisplayNameRequestHandler_metadata = (undefined && undefined._
 
 
 
-
 class gamePlayer_SetDisplayNameRequestHandler_SetDisplayNameOperationRequest extends OperationRequest {
     userId;
     displayName;
@@ -44446,7 +44627,7 @@ class gamePlayer_SetDisplayNameRequestHandler_SetDisplayNameRequestHandler exten
             displayName: true,
         };
         if (request.uniqueDisplayName) {
-            let gamePlayerWithThisDisplayName = await this.gnServer.getDatabase().loadGamePlayerWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.displayName), gamePlayerFindOptions);
+            let gamePlayerWithThisDisplayName = await this.gnServer.getDatabase().loadGamePlayerWithDisplayNameAsync(request.displayName, gamePlayerFindOptions);
             if (gamePlayerWithThisDisplayName != null) {
                 operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.DisplayNameHasUse);
                 return operationResponse;
@@ -49640,7 +49821,7 @@ class GrantPlayerCharacterRequestHandler extends GamePlayerBaseRequestHandler {
             return operationResponse;
         }
         if (request.uniqueDisplayName && request.displayName) {
-            let characterPlayerWithThisDisplayName = await this.gnServer.getDatabase().loadCharacterPlayerWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.displayName), secretInfo.getGameId(), { displayName: true });
+            let characterPlayerWithThisDisplayName = await this.gnServer.getDatabase().loadCharacterPlayerWithDisplayNameAsync(request.displayName, secretInfo.getGameId(), { displayName: true });
             if (characterPlayerWithThisDisplayName != null) {
                 operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.DisplayNameHasUse);
                 return operationResponse;
@@ -50926,7 +51107,7 @@ class gamePlayer_GetPlayersWithDisplayNameRequestHandler_GetPlayersWithDisplayNa
         operationResponse.setReturnCode(ReturnCode.Ok);
         let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
         let gnResults = new GNArray();
-        let gamePlayers = await this.gnServer.getDatabase().loadGamePlayersWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), gamePlayerFindOptions);
+        let gamePlayers = await this.gnServer.getDatabase().loadGamePlayersWithDisplayNameNormalizeRegexAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), gamePlayerFindOptions);
         for (let i = 0; i < gamePlayers.length; i++) {
             let gamePlayer = gamePlayers[i];
             let gnResult = new GNHashtable();
@@ -53381,6 +53562,39 @@ class GroupBaseRequestHandler extends RequestHandler {
             answer = true;
         }
         if (!answer && permissionRules.selfEnable) {
+            let group = await this.gnServer.getDatabase().loadGroupAsync(groupId, gameId, {
+                members: true,
+                groupType: true,
+            });
+            if (group != null) {
+                let groupType = group.getGroupType();
+                if (groupType == OwnerType.GamePlayer) {
+                    let memberItem = group.getMember(userId);
+                    if (memberItem != null) {
+                        if (memberItem.status == GroupStatus.Member) {
+                            answer = true;
+                        }
+                    }
+                }
+                else if (groupType == OwnerType.CharacterPlayer) {
+                    let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, { playerCharacters: true });
+                    if (gamePlayer != null) {
+                        let characterPlayers = gamePlayer.getAllPlayerCharacters();
+                        if (characterPlayers != null) {
+                            for (let i = 0; i < characterPlayers.length; i++) {
+                                let characterPlayer = characterPlayers[i];
+                                let memberItem = group.getMember(characterPlayer.characterId);
+                                if (memberItem != null) {
+                                    if (memberItem.status == GroupStatus.Member) {
+                                        answer = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, { playerGroups: true });
             if (gamePlayer != null) {
                 let playerGroup = gamePlayer.getPlayerGroup(groupId);
@@ -57073,6 +57287,7 @@ var GetGroupInformationRequestHandler_metadata = (undefined && undefined.__metad
 
 
 
+
 class GetGroupInformationOperationRequest extends OperationRequest {
     groupId;
     infoRequestParam;
@@ -57125,12 +57340,39 @@ class GetGroupInformationRequestHandler extends GroupBaseRequestHandler {
             allowMethod = true;
         }
         if (secretInfo.getPermission().group.getGroupInformation.selfEnable) {
-            let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(authInfo.getUserId(), secretInfo.getGameId(), { playerGroups: true });
-            if (gamePlayer != null) {
-                let playerGroup = gamePlayer.getPlayerGroup(request.groupId);
-                if (playerGroup != null && playerGroup.status == GroupStatus.Member) {
-                    allowMethod = true;
-                    owned = true;
+            let group = await this.gnServer.getDatabase().loadGroupAsync(request.groupId, secretInfo.getGameId(), {
+                members: true,
+                groupType: true,
+            });
+            if (group != null) {
+                let groupType = group.getGroupType();
+                if (groupType == OwnerType.GamePlayer) {
+                    let memberItem = group.getMember(authInfo.getUserId());
+                    if (memberItem != null) {
+                        if (memberItem.status == GroupStatus.Member) {
+                            allowMethod = true;
+                            owned = true;
+                        }
+                    }
+                }
+                else if (groupType == OwnerType.CharacterPlayer) {
+                    let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(authInfo.getUserId(), secretInfo.getGameId(), { playerCharacters: true });
+                    if (gamePlayer != null) {
+                        let characterPlayers = gamePlayer.getAllPlayerCharacters();
+                        if (characterPlayers != null) {
+                            for (let i = 0; i < characterPlayers.length; i++) {
+                                let characterPlayer = characterPlayers[i];
+                                let memberItem = group.getMember(characterPlayer.characterId);
+                                if (memberItem != null) {
+                                    if (memberItem.status == GroupStatus.Member) {
+                                        allowMethod = true;
+                                        owned = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -59502,7 +59744,7 @@ class GetGroupsWithDisplayNameRequestHandler extends GroupBaseRequestHandler {
         operationResponse.setReturnCode(ReturnCode.Ok);
         let groupFindOptions = this.convertToGroupFindOptions(request.infoRequestParam);
         let gnResults = new GNArray();
-        let groups = await this.gnServer.getDatabase().loadGroupsWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), groupFindOptions);
+        let groups = await this.gnServer.getDatabase().loadGroupsWithDisplayNameNormalizeRegexAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), groupFindOptions);
         for (let i = 0; i < groups.length; i++) {
             let group = groups[i];
             let gnResult = new GNHashtable();
@@ -60048,6 +60290,7 @@ class group_GetCurrencyLogRequestHandler_GetCurrencyLogRequestHandler extends Re
 
 
 
+
 class ItemBaseRequestHandler extends RequestHandler {
     isGetAll(infoRequestParam) {
         return infoRequestParam.catalogId
@@ -60107,10 +60350,33 @@ class ItemBaseRequestHandler extends RequestHandler {
             answer = true;
         }
         if (!answer && permissionRules.selfEnable) {
-            let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, { playerInventories: true });
-            if (gamePlayer != null) {
-                if (gamePlayer.hasPlayerInventory(itemId))
-                    answer = true;
+            let inventory = await this.gnServer.getDatabase().loadInventoryAsync(itemId, gameId, { owner: true });
+            if (inventory != null) {
+                let owner = inventory.getOwner();
+                if (owner != null) {
+                    if (owner.type == OwnerType.GamePlayer) {
+                        if (owner.id == userId) {
+                            answer = true;
+                        }
+                    }
+                    else if (owner.type == OwnerType.CharacterPlayer) {
+                        let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, { playerCharacters: true });
+                        if (gamePlayer != null) {
+                            if (gamePlayer.hasPlayerCharacter(owner.id)) {
+                                answer = true;
+                            }
+                        }
+                    }
+                    else if (owner.type == OwnerType.Group) {
+                        let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, { playerGroups: true });
+                        if (gamePlayer != null) {
+                            let playerGroup = gamePlayer.getPlayerGroup(owner.id);
+                            if (playerGroup != null && playerGroup.status == GroupStatus.Member) {
+                                answer = true;
+                            }
+                        }
+                    }
+                }
             }
         }
         return answer;
@@ -63390,6 +63656,8 @@ var GetItemInformationRequestHandler_metadata = (undefined && undefined.__metada
 
 
 
+
+
 class GetItemInformationOperationRequest extends OperationRequest {
     itemId;
     infoRequestParam;
@@ -63442,11 +63710,35 @@ class GetItemInformationRequestHandler extends ItemBaseRequestHandler {
             allowMethod = true;
         }
         if (secretInfo.getPermission().inventory.getItemInformation.selfEnable) {
-            let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(authInfo.getUserId(), secretInfo.getGameId(), { playerInventories: true });
-            if (gamePlayer != null) {
-                if (gamePlayer.hasPlayerCharacter(request.itemId)) {
-                    allowMethod = true;
-                    owned = true;
+            let inventory = await this.gnServer.getDatabase().loadInventoryAsync(request.itemId, secretInfo.getGameId(), { owner: true });
+            if (inventory != null) {
+                let owner = inventory.getOwner();
+                if (owner != null) {
+                    if (owner.type == OwnerType.GamePlayer) {
+                        if (owner.id == authInfo.getUserId()) {
+                            allowMethod = true;
+                            owned = true;
+                        }
+                    }
+                    else if (owner.type == OwnerType.CharacterPlayer) {
+                        let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(authInfo.getUserId(), secretInfo.getGameId(), { playerCharacters: true });
+                        if (gamePlayer != null) {
+                            if (gamePlayer.hasPlayerCharacter(owner.id)) {
+                                allowMethod = true;
+                                owned = true;
+                            }
+                        }
+                    }
+                    else if (owner.type == OwnerType.Group) {
+                        let gamePlayer = await this.gnServer.getDatabase().loadGamePlayerAsync(authInfo.getUserId(), secretInfo.getGameId(), { playerGroups: true });
+                        if (gamePlayer != null) {
+                            let playerGroup = gamePlayer.getPlayerGroup(owner.id);
+                            if (playerGroup != null && playerGroup.status == GroupStatus.Member) {
+                                allowMethod = true;
+                                owned = true;
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -65161,7 +65453,7 @@ class GetItemsWithDisplayNameRequestHandler extends ItemBaseRequestHandler {
         operationResponse.setReturnCode(ReturnCode.Ok);
         let inventoryFindOptions = this.convertToInventoryFindOptions(request.infoRequestParam);
         let gnResults = new GNArray();
-        let inventorys = await this.gnServer.getDatabase().loadInventoriesWithDisplayNameAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), inventoryFindOptions);
+        let inventorys = await this.gnServer.getDatabase().loadInventoriesWithDisplayNameNormalizeRegexAsync(DisplayNameUtility.normalizeString(request.keyword), request.skip, request.limit, secretInfo.getGameId(), inventoryFindOptions);
         for (let i = 0; i < inventorys.length; i++) {
             let inventory = inventorys[i];
             let gnResult = new GNHashtable();
@@ -70335,16 +70627,36 @@ var EmailSettingsParam_metadata = (undefined && undefined.__metadata) || functio
 
 class EmailSettingsParam {
     sendFrom;
-    sendGridApiKey;
+    secure;
+    host;
+    port;
+    username;
+    password;
 }
 EmailSettingsParam_decorate([
     StringDataMember({ code: GNParameterCode.SendFrom }),
     EmailSettingsParam_metadata("design:type", String)
 ], EmailSettingsParam.prototype, "sendFrom", void 0);
 EmailSettingsParam_decorate([
-    StringDataMember({ code: GNParameterCode.SendGridApiKey }),
+    BooleanDataMember({ code: GNParameterCode.Secure }),
+    EmailSettingsParam_metadata("design:type", Boolean)
+], EmailSettingsParam.prototype, "secure", void 0);
+EmailSettingsParam_decorate([
+    StringDataMember({ code: GNParameterCode.Host }),
+    EmailSettingsParam_metadata("design:type", String)
+], EmailSettingsParam.prototype, "host", void 0);
+EmailSettingsParam_decorate([
+    NumberDataMember({ code: GNParameterCode.Port }),
+    EmailSettingsParam_metadata("design:type", Number)
+], EmailSettingsParam.prototype, "port", void 0);
+EmailSettingsParam_decorate([
+    StringDataMember({ code: GNParameterCode.Username }),
+    EmailSettingsParam_metadata("design:type", String)
+], EmailSettingsParam.prototype, "username", void 0);
+EmailSettingsParam_decorate([
+    StringDataMember({ code: GNParameterCode.Password }),
     EmailSettingsParam_metadata("design:type", String)
-], EmailSettingsParam.prototype, "sendGridApiKey", void 0);
+], EmailSettingsParam.prototype, "password", void 0);
 
 ;// ./src/GN-app-api/handler/controller/handler/dashboard/model/PushNotificationSettingsParam.ts
 var PushNotificationSettingsParam_decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
@@ -70616,7 +70928,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                         let key = removeKeyLst[i];
                         let indexName = "playerCurrencies." + key + ".value_-1";
                         masterPlayerCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -70624,7 +70936,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                         indexDoc["playerCurrencies." + key + ".value"] = -1;
                         let indexName = "playerCurrencies." + key + ".value_-1";
                         masterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
                     }
                 }
                 masterPlayerSettings.playerCurrencySettings = playerCurrencySettings;
@@ -70678,7 +70990,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                             let key = removeKeyLst[i];
                             let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                             masterPlayerCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
                             let key = addKeyLst[i];
@@ -70687,7 +70999,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                             indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                             let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                             masterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
                         }
                     }
                 }
@@ -70706,7 +71018,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                             let key = removeKeyAscLst[i];
                             let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                             masterPlayerCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
                         }
                         for (let i = 0; i < addKeyAscLst.length; i++) {
                             let key = addKeyAscLst[i];
@@ -70715,7 +71027,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                             indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                             let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                             masterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
                         }
                     }
                 }
@@ -70781,7 +71093,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                         let key = removeKeyLst[i];
                         let indexName = "tags." + key + "_1";
                         masterPlayerCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + masterPlayerCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -70789,7 +71101,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
                         indexDoc["tags." + key] = 1;
                         let indexName = "tags." + key + "_1";
                         masterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + masterPlayerCollection.collectionName);
                     }
                 }
                 masterPlayerSettings.tagsSettings = tagsSettings;
@@ -70800,9 +71112,17 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
             let emailSettings = masterGameSettings.getEmailSettings();
             if (request.emailSettings.sendFrom)
                 emailSettings.sendFrom = request.emailSettings.sendFrom;
-            if (request.emailSettings.sendGridApiKey)
-                emailSettings.sendGridApiKey = request.emailSettings.sendGridApiKey;
-            this.gnServer.getEmailService().init(emailSettings.sendGridApiKey, emailSettings.sendFrom);
+            if (request.emailSettings.secure != null)
+                emailSettings.secure = request.emailSettings.secure;
+            if (request.emailSettings.host)
+                emailSettings.host = request.emailSettings.host;
+            if (request.emailSettings.port)
+                emailSettings.port = request.emailSettings.port;
+            if (request.emailSettings.username)
+                emailSettings.username = request.emailSettings.username;
+            if (request.emailSettings.password)
+                emailSettings.password = request.emailSettings.password;
+            this.gnServer.getEmailService().init(emailSettings.host, emailSettings.port, emailSettings.secure, emailSettings.username, emailSettings.password, emailSettings.sendFrom);
             this.gnServer.getEmailService().run();
             masterGameSettings.setEmailSettings(emailSettings);
         }
@@ -72201,12 +72521,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         {
                             let indexName = "playerCurrencies." + key + ".value_-1";
                             characterPlayerCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                         }
                         {
                             let indexName = "catalogId_1_" + "playerCurrencies." + key + ".value_-1";
                             characterPlayerCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                         }
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
@@ -72216,7 +72536,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             indexDoc["playerCurrencies." + key + ".value"] = -1;
                             let indexName = "playerCurrencies." + key + ".value_-1";
                             characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                         }
                         {
                             let indexDoc = {};
@@ -72224,7 +72544,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             indexDoc["playerCurrencies." + key + ".value"] = -1;
                             let indexName = "catalogId_1_" + "playerCurrencies." + key + ".value_-1";
                             characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                         }
                     }
                 }
@@ -72278,12 +72598,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             {
                                 let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                             {
                                 let indexName = "catalogId_1_" + "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
@@ -72294,7 +72614,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                             {
                                 let indexDoc = {};
@@ -72303,7 +72623,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "catalogId_1_" + "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                         }
                     }
@@ -72322,12 +72642,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             {
                                 let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                             {
                                 let indexName = "catalogId_1_" + "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                         }
                         for (let i = 0; i < addKeyAscLst.length; i++) {
@@ -72338,7 +72658,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                             {
                                 let indexDoc = {};
@@ -72347,7 +72667,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "catalogId_1_" + "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                                 characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                             }
                         }
                     }
@@ -72411,7 +72731,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         let key = removeKeyLst[i];
                         let indexName = "tags." + key + "_1";
                         characterPlayerCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -72419,7 +72739,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         indexDoc["tags." + key] = 1;
                         let indexName = "tags." + key + "_1";
                         characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
                     }
                 }
                 if (request.gameSettings.characterPlayerSettings.playerGroupCatalogSettings != null) {
@@ -72499,7 +72819,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         let key = removeKeyLst[i];
                         let indexName = "playerCurrencies." + key + ".value_-1";
                         gamePlayerCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -72507,7 +72827,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         indexDoc["playerCurrencies." + key + ".value"] = -1;
                         let indexName = "playerCurrencies." + key + ".value_-1";
                         gamePlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
                     }
                 }
                 if (request.gameSettings.gamePlayerSettings.playerStatisticsSettings != null) {
@@ -72559,7 +72879,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             let key = removeKeyLst[i];
                             let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                             gamePlayerCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
                             let key = addKeyLst[i];
@@ -72568,7 +72888,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                             let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
                             gamePlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
                         }
                     }
                     {
@@ -72585,7 +72905,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             let key = removeKeyAscLst[i];
                             let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                             gamePlayerCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
                         }
                         for (let i = 0; i < addKeyAscLst.length; i++) {
                             let key = addKeyAscLst[i];
@@ -72594,7 +72914,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
                             let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
                             gamePlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
                         }
                     }
                 }
@@ -72657,7 +72977,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         let key = removeKeyLst[i];
                         let indexName = "tags." + key + "_1";
                         gamePlayerCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + gamePlayerCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -72665,7 +72985,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         indexDoc["tags." + key] = 1;
                         let indexName = "tags." + key + "_1";
                         gamePlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + gamePlayerCollection.collectionName);
                     }
                 }
                 if (request.gameSettings.gamePlayerSettings.playerCharacterCatalogSettings != null) {
@@ -72758,12 +73078,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         {
                             let indexName = "groupCurrencies." + key + ".value_-1";
                             groupCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                         }
                         {
                             let indexName = "catalogId_1_" + "groupCurrencies." + key + ".value_-1";
                             groupCollection.dropIndex(indexName);
-                            Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                            Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                         }
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
@@ -72773,7 +73093,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             indexDoc["groupCurrencies." + key + ".value"] = -1;
                             let indexName = "groupCurrencies." + key + ".value_-1";
                             groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                         }
                         {
                             let indexDoc = {};
@@ -72781,7 +73101,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             indexDoc["groupCurrencies." + key + ".value"] = -1;
                             let indexName = "catalogId_1_" + "groupCurrencies." + key + ".value_-1";
                             groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                            Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                         }
                     }
                 }
@@ -72835,12 +73155,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             {
                                 let indexName = "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                             }
                             {
                                 let indexName = "catalogId_1_" + "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                             }
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
@@ -72851,7 +73171,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                             }
                             {
                                 let indexDoc = {};
@@ -72860,7 +73180,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "catalogId_1_" + "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                             }
                         }
                     }
@@ -72879,12 +73199,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             {
                                 let indexName = "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                             }
                             {
                                 let indexName = "catalogId_1_" + "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                             }
                         }
                         for (let i = 0; i < addKeyAscLst.length; i++) {
@@ -72895,7 +73215,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                             }
                             {
                                 let indexDoc = {};
@@ -72904,7 +73224,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "catalogId_1_" + "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
                                 groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                             }
                         }
                     }
@@ -72969,7 +73289,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         groupCollection.dropIndex("tags." + key + "_1");
                         let indexName = "tags." + key + "_1";
                         groupCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -72977,7 +73297,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         indexDoc["tags." + key] = 1;
                         let indexName = "tags." + key + "_1";
                         groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
                     }
                 }
                 if (request.gameSettings.groupSettings.groupItemCatalogSettings != null) {
@@ -73048,12 +73368,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             {
                                 let indexName = "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                             {
                                 let indexName = "catalogId_1_" + "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
@@ -73064,7 +73384,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                             {
                                 let indexDoc = {};
@@ -73073,7 +73393,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "catalogId_1_" + "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                         }
                     }
@@ -73092,12 +73412,12 @@ class SetGameInformationRequestHandler extends RequestHandler {
                             {
                                 let indexName = "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                             {
                                 let indexName = "catalogId_1_" + "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.dropIndex(indexName);
-                                Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                         }
                         for (let i = 0; i < addKeyAscLst.length; i++) {
@@ -73108,7 +73428,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                             {
                                 let indexDoc = {};
@@ -73117,7 +73437,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                                 indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
                                 let indexName = "catalogId_1_" + "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
                                 inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                Debug.log("[GearN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
                             }
                         }
                     }
@@ -73181,7 +73501,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         let key = removeKeyLst[i];
                         let indexName = "tags." + key + "_1";
                         inventoryCollection.dropIndex(indexName);
-                        Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                        Debug.log("[GearN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
                     }
                     for (let i = 0; i < addKeyLst.length; i++) {
                         let key = addKeyLst[i];
@@ -73189,7 +73509,7 @@ class SetGameInformationRequestHandler extends RequestHandler {
                         indexDoc["tags." + key] = 1;
                         let indexName = "tags." + key + "_1";
                         inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                        Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                        Debug.log("[GearN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
                     }
                 }
             }
@@ -73809,7 +74129,7 @@ class CloudScriptService {
     }
     loadCloudScriptWorker(version) {
         let filePath = __dirname + "/./GN-startup/cloudScript/" + version + ".js";
-        Debug.log("[GN] [CloudScript] run cloudScript " + version);
+        Debug.log("[GearN] [CloudScript] run cloudScript " + version);
         let cloudScriptWorker = (0,external_child_process_namespaceObject.fork)(filePath, {
             env: {
                 gameId: this.gameId,
@@ -73875,7 +74195,7 @@ class CloudScriptService {
             }
         });
         cloudScriptWorker.on("exit", (code) => {
-            Debug.log("[GN] [CloudScript] terminal cloudScript " + version + " with code " + code);
+            Debug.log("[GearN] [CloudScript] terminal cloudScript " + version + " with code " + code);
             thiz.cloudScriptWorkerDict.delete(version);
         });
         this.cloudScriptWorkerDict.set(version, cloudScriptWorker);
@@ -75325,7 +75645,11 @@ class GetMasterGameSettingsRequestHandler extends RequestHandler {
             let emailSettings = masterGameSettings.getEmailSettings();
             let gnEmailSettings = new GNHashtable();
             gnEmailSettings.add(GNParameterCode.SendFrom, emailSettings.sendFrom);
-            gnEmailSettings.add(GNParameterCode.SendGridApiKey, emailSettings.sendGridApiKey);
+            gnEmailSettings.add(GNParameterCode.Host, emailSettings.host);
+            gnEmailSettings.add(GNParameterCode.Port, emailSettings.port);
+            gnEmailSettings.add(GNParameterCode.Secure, emailSettings.secure);
+            gnEmailSettings.add(GNParameterCode.Username, emailSettings.username);
+            gnEmailSettings.add(GNParameterCode.Password, emailSettings.password);
             operationResponse.setParameter(GNParameterCode.EmailSettings, gnEmailSettings);
         }
         {
@@ -75515,6 +75839,7 @@ class GetSecretInfoInformationRequestHandler extends RequestHandler {
         operationResponse.setParameter(GNParameterCode.CreatorId, secretInfoItem.getCreatorId());
         operationResponse.setParameter(GNParameterCode.Remove, secretInfoItem.getRemove());
         operationResponse.setParameter(GNParameterCode.TsExpire, secretInfoItem.getTsExpire());
+        operationResponse.setParameter(GNParameterCode.DisplayName, secretInfoItem.getDisplayName());
         let gnPermission = GetSecretInfoInformationRequestHandler.getPermissionHashtable(secretInfoItem.getPermission());
         operationResponse.setParameter(GNParameterCode.Permission, gnPermission);
         operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.Ok);
@@ -78541,7 +78866,7 @@ class GetSecretInfoInformationRequestHandler extends RequestHandler {
                 gnPermissionRules.add(GNParameterCode.OtherSelfEnable, permissionRules.otherSelfEnable);
                 gnPermissionRules.add(GNParameterCode.ServerSelfEnable, permissionRules.serverSelfEnable);
                 gnPermissionRules.add(GNParameterCode.AdminSelfEnable, permissionRules.adminSelfEnable);
-                gnMasterAdmin.add(GNParameterCode.ChangePasswordAdminAccount, gnPermissionRules);
+                gnMasterAdmin.add(GNParameterCode.DeleteInDatabase, gnPermissionRules);
             }
             gnPermission.add(GNParameterCode.MasterAdmin, gnMasterAdmin);
         }
@@ -78705,6 +79030,7 @@ class GetSecretInfoInformationRequestHandler extends RequestHandler {
 
 
 
+
 class GetSecretInfoListOperationRequest extends OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -78737,15 +79063,25 @@ class GetSecretInfoListRequestHandler extends RequestHandler {
         operationResponse = new OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
         operationResponse.setReturnCode(ReturnCode.Ok);
         let collection = this.gnServer.getDatabase().systemCollection("MasterAdmin");
-        let results = await collection.find({ type: "secretInfo" }, { secretKey: true });
-        let gnSecretInfoItems = new GNArray();
+        let results = await collection.find({ type: "secretInfo" }, { secretKey: true, role: true });
+        let gnAdminSecretKeys = new GNArray();
+        let gnServerSecretKeys = new GNArray();
+        let gnPlayerSecretKeys = new GNArray();
         while (await results.hasNext()) {
             let secretInfoItem = new SecretInfoItem(await results.next(), collection);
             let gnSecretInfoItem = new GNHashtable();
             gnSecretInfoItem.add(GNParameterCode.SecretKey, secretInfoItem.getSecretKey());
-            gnSecretInfoItems.add(gnSecretInfoItem);
+            let role = secretInfoItem.getRole();
+            if (role == SecretRole.Admin)
+                gnAdminSecretKeys.add(gnSecretInfoItem);
+            else if (role == SecretRole.Server)
+                gnServerSecretKeys.add(gnSecretInfoItem);
+            else
+                gnPlayerSecretKeys.add(gnSecretInfoItem);
         }
-        operationResponse.setParameter(GNParameterCode.Results, gnSecretInfoItems);
+        operationResponse.setParameter(GNParameterCode.AdminSecretKeys, gnAdminSecretKeys);
+        operationResponse.setParameter(GNParameterCode.ServerSecretKeys, gnServerSecretKeys);
+        operationResponse.setParameter(GNParameterCode.PlayerSecretKeys, gnPlayerSecretKeys);
         operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.Ok);
         await this.gnServer.getPostEventCallbackService().onEvent("dashboard_GetSecretInfoList", request, secretInfo, operationRequest, operationResponse);
         return operationResponse;
@@ -78779,6 +79115,7 @@ class SetSecretInfoInformationOperationRequest extends OperationRequest {
     remove;
     tsExpire;
     permissionParam;
+    displayName;
     isValidRequest() {
         if (!super.isValidRequest())
             return false;
@@ -78801,6 +79138,10 @@ SetSecretInfoInformationRequestHandler_decorate([
     GNHashtableDataMember({ code: GNParameterCode.Permission, isOptional: true }),
     SetSecretInfoInformationRequestHandler_metadata("design:type", PermissionParam)
 ], SetSecretInfoInformationOperationRequest.prototype, "permissionParam", void 0);
+SetSecretInfoInformationRequestHandler_decorate([
+    StringDataMember({ code: GNParameterCode.DisplayName, isOptional: true }),
+    SetSecretInfoInformationRequestHandler_metadata("design:type", String)
+], SetSecretInfoInformationOperationRequest.prototype, "displayName", void 0);
 class SetSecretInfoInformationRequestHandler extends RequestHandler {
     getCode() {
         return OperationCode.SetSecretInfoInformation;
@@ -78821,6 +79162,7 @@ class SetSecretInfoInformationRequestHandler extends RequestHandler {
             remove: request.remove,
             tsExpire: request.tsExpire,
             permissionParam: request.permissionParam,
+            displayName: request.displayName,
         }, secretInfo, operationRequest);
     }
     async execute(request, secretInfo, operationRequest) {
@@ -78843,6 +79185,9 @@ class SetSecretInfoInformationRequestHandler extends RequestHandler {
         if (request.tsExpire != null) {
             secretInfoItem.setTsExpire(request.tsExpire);
         }
+        if (request.displayName != null) {
+            secretInfoItem.setDisplayName(request.displayName);
+        }
         // let secretRole = <SecretRole>secretInfoItem.getRole();
         if (request.permissionParam) {
             let permissionAny = secretInfoItem.getPermission();
@@ -78908,6 +79253,7 @@ class SetSecretInfoInformationRequestHandler extends RequestHandler {
             .setRole(secretInfoItem.getRole())
             .setSecretKey(secretInfoItem.getSecretKey())
             .setTsExpire(secretInfoItem.getTsExpire())
+            .setDisplayName(secretInfoItem.getDisplayName())
             .build();
         this.gnServer.getApiMiddleware().updateSecretInfo(newSecretInfo);
         operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.Ok);
@@ -79493,7 +79839,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
             let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
             let direction = statisticsAggregationMethod == xStatisticsAggregationMethod.Minimum ? 1 : -1;
             let masterPlayerCollection = await this.gnServer.getDatabase().systemCollection("MasterPlayer");
-            Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + masterPlayerCollection.collectionName + " starting");
+            Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + masterPlayerCollection.collectionName + " starting");
             let masterPlayers = await this.gnServer.getDatabase().loadMasterPlayersLeaderboardWithStatisticsAllAsync(key, direction, masterPlayerFindOptions);
             let backupData = {
                 key: key,
@@ -79539,7 +79885,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
             });
             await backupStatisticsLeaderboardCollection.insertOne(backupData);
             this.gnServer.getDatabase().insertMasterPlayerStatisticsLogsAsync(logRequests);
-            Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + masterPlayerCollection.collectionName + " success");
+            Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + masterPlayerCollection.collectionName + " success");
         }
         else {
             let gameId = request.gameId;
@@ -79563,7 +79909,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
                 let direction = statisticsAggregationMethod == xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let gamePlayerCollection = await this.gnServer.getDatabase().systemGameCollection("GamePlayer", gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + gamePlayerCollection.collectionName + " starting");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + gamePlayerCollection.collectionName + " starting");
                 let gamePlayers = await this.gnServer.getDatabase().loadGamePlayersLeaderboardWithStatisticsAllAsync(key, gameId, direction, gamePlayerFindOptions);
                 let backupData = {
                     key: key,
@@ -79609,7 +79955,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 });
                 await backupStatisticsLeaderboardCollection.insertOne(backupData);
                 this.gnServer.getDatabase().insertGamePlayerStatisticsLogsAsync(logRequests, gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + gamePlayerCollection.collectionName + " success");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + gamePlayerCollection.collectionName + " success");
             }
             else if (type == OwnerType.CharacterPlayer) {
                 let backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().runtimeGameCollection("CharacterPlayer.StatisticsBackup", gameId);
@@ -79631,7 +79977,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
                 let direction = statisticsAggregationMethod == xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let characterPlayerCollection = await this.gnServer.getDatabase().systemGameCollection("CharacterPlayer", gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + characterPlayerCollection.collectionName + " starting");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + characterPlayerCollection.collectionName + " starting");
                 let characterPlayers = await this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAllAsync(key, request.catalogId, gameId, direction, characterPlayerFindOptions);
                 let backupData = {
                     key: key,
@@ -79677,7 +80023,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 });
                 await backupStatisticsLeaderboardCollection.insertOne(backupData);
                 this.gnServer.getDatabase().insertCharacterPlayerStatisticsLogsAsync(logRequests, gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + characterPlayerCollection.collectionName + " success");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + characterPlayerCollection.collectionName + " success");
             }
             else if (type == OwnerType.Group) {
                 let backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().runtimeGameCollection("Group.StatisticsBackup", gameId);
@@ -79699,7 +80045,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 let statisticsAggregationMethod = groupStatisticsSettingsItem.statisticsAggregationMethod;
                 let direction = statisticsAggregationMethod == xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let groupCollection = await this.gnServer.getDatabase().systemGameCollection("Group", gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + groupCollection.collectionName + " starting");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + groupCollection.collectionName + " starting");
                 let groups = await this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAllAsync(key, request.catalogId, gameId, direction, groupFindOptions);
                 let backupData = {
                     key: key,
@@ -79745,7 +80091,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 });
                 await backupStatisticsLeaderboardCollection.insertOne(backupData);
                 this.gnServer.getDatabase().insertGroupStatisticsLogsAsync(logRequests, gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + groupCollection.collectionName + " success");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + groupCollection.collectionName + " success");
             }
             else if (type == OwnerType.Inventory) {
                 let backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().runtimeGameCollection("Inventory.StatisticsBackup", gameId);
@@ -79762,7 +80108,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 let statisticsAggregationMethod = inventoryStatisticsSettingsItem.statisticsAggregationMethod;
                 let direction = statisticsAggregationMethod == xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let inventoryCollection = await this.gnServer.getDatabase().systemGameCollection("Inventory", gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + inventoryCollection.collectionName + " starting");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + inventoryCollection.collectionName + " starting");
                 let inventories = await this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAllAsync(key, request.catalogId, gameId, direction, inventoryFindOptions);
                 let backupData = {
                     key: key,
@@ -79808,7 +80154,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler {
                 });
                 await backupStatisticsLeaderboardCollection.insertOne(backupData);
                 this.gnServer.getDatabase().insertInventoryStatisticsLogsAsync(logRequests, gameId);
-                Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + inventoryCollection.collectionName + " success");
+                Debug.log("[GearN] ResetStatisticsLeaderboard for key " + key + " at " + inventoryCollection.collectionName + " success");
             }
             else {
                 operationResponse.setParameter(ParameterCode.ErrorCode, GNErrorCode.OwnerTypeNotSupport);
@@ -80073,7 +80419,7 @@ class GetServerGameDataRequestHandler extends RequestHandler {
         }
         if (requestParams.groupCount) {
             let groupCollection = this.gnServer.getDatabase().systemGameCollection("Group", gameId);
-            operationResponse.setParameter(GNParameterCode.Group, await groupCollection.countDocuments());
+            operationResponse.setParameter(GNParameterCode.GroupCount, await groupCollection.countDocuments());
         }
         if (requestParams.country) {
             // [ { countryCode: "", regions: [{regionCode: "", "lat": 0, "lon": 0, ccu: 0}]} ]
@@ -84200,7 +84546,8 @@ class CountryIPDetailService {
 }
 
 ;// ./src/GNServer.ts
-const GN_VERSION = "2.5";
+const GN_VERSION = "2.6";
+
 
 
 
@@ -84586,7 +84933,6 @@ class GNServer {
     googlePlayGameService;
     gameCenterService;
     timerService;
-    lockService;
     requestConverterService;
     analyticsService;
     postEventCallbackService;
@@ -84612,7 +84958,6 @@ class GNServer {
         this.googlePlayGameService = new GooglePlayGameService();
         this.gameCenterService = new GameCenterService();
         this.timerService = new TimerService();
-        this.lockService = new LockService();
         this.requestConverterService = new RequestConverterService();
         this.pushNotificationService = new PushNotificationService();
         this.emailService = new EmailService();
@@ -85039,6 +85384,18 @@ class GNServer {
         tempAnalyticsService.run();
         this.analyticsService = tempAnalyticsService;
         this.postEventCallbackCollection = this.xDatabase.systemCollection("EventCallback.Post");
+        this.getHttpApp().getClusterHandler().onEvent("sendEventTo", data => {
+            this.executeSendEventTo(data);
+        });
+        this.getHttpApp().getClusterHandler().onEvent("sendEventToRoom", data => {
+            this.executeSendEventToRoom(data);
+        });
+        this.getHttpApp().getClusterHandler().onEvent("sendEventToMoreUser", data => {
+            this.executeSendEventToMoreUser(data);
+        });
+        this.getHttpApp().getClusterHandler().onEvent("executeSendEventToAllPlayer", data => {
+            this.executeSendEventToAllPlayer(data);
+        });
         if (onRunSuccess != null)
             onRunSuccess();
     }
@@ -85132,9 +85489,6 @@ class GNServer {
     getTimerService() {
         return this.timerService;
     }
-    getLockService() {
-        return this.lockService;
-    }
     getAnalyticsService() {
         return this.analyticsService;
     }
@@ -85169,7 +85523,15 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
         });
-        return await this.socketApp.getSocketAppHandler().sendEventTo(userId, operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventTo", {
+            userId: userId,
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventTo(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventTo(data.userId, operationEvent, data.useMsgPack);
     }
     async sendEventToRoom(roomId, operationEvent) {
         await this.eventCallbackCloudScriptService.executeEvent("system_SendEventToRoom", { roomId: roomId }, operationEvent);
@@ -85187,7 +85549,15 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
         });
-        return await this.socketApp.getSocketAppHandler().sendEventToRoom(roomId, operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventToRoom", {
+            roomId: roomId,
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventToRoom(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventToRoom(data.roomId, operationEvent, data.useMsgPack);
     }
     async sendEventToMoreUser(userIds, operationEvent) {
         await this.eventCallbackCloudScriptService.executeEvent("system_SendEventToMoreUser", { userIds: userIds }, operationEvent);
@@ -85205,7 +85575,15 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8") * userIds.length,
         });
-        return await this.socketApp.getSocketAppHandler().sendEventToMoreUser(userIds, operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventToMoreUser", {
+            userIds: userIds,
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventToMoreUser(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventToMoreUser(data.userIds, operationEvent, data.useMsgPack);
     }
     async sendEventToAllPlayer(operationEvent) {
         await this.eventCallbackCloudScriptService.executeEvent("system_SendEventToAllPlayer", {}, operationEvent);
@@ -85221,16 +85599,23 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
         });
-        return await this.socketApp.getSocketAppHandler().sendEventToAllPlayer(operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventToAllPlayer", {
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventToAllPlayer(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventToAllPlayer(operationEvent, data.useMsgPack);
     }
     // public async sendEventToNamespace(namespace: string, operationEvent: OperationEvent): Promise<void> {
     // 	return await this.socketApp.getSocketAppHandler().sendEventToNamespace(namespace, operationEvent);
     // }
-    async joinRoom(userId, roomId) {
-        return await this.socketApp.getSocketAppHandler().joinRoom(userId, roomId);
+    joinRoom(userId, roomId) {
+        return this.socketApp.getSocketAppHandler().joinRoom(userId, roomId);
     }
-    async leaveRoom(userId, roomId) {
-        return await this.socketApp.getSocketAppHandler().leaveRoom(userId, roomId);
+    leaveRoom(userId, roomId) {
+        return this.socketApp.getSocketAppHandler().leaveRoom(userId, roomId);
     }
     async getRooms(userId) {
         return await this.socketApp.getSocketAppHandler().getRooms(userId);
@@ -85279,7 +85664,7 @@ class GNServer {
     }
     async requestMatchServerDetail(gameId, matchmakingTicketCanMatch) {
         let matchId = matchmakingTicketCanMatch.matchId;
-        Debug.logInfo("[GN] [Matchmaking] request match server detail for " + matchId + " to set serverDetail on gameId " + gameId);
+        Debug.logInfo("[GearN] [Matchmaking] request match server detail for " + matchId + " to set serverDetail on gameId " + gameId);
         let thiz = this;
         let timeout = setTimeout(async () => {
             thiz.setMatchServerDetailFailed(gameId, matchId, matchmakingTicketCanMatch.ticketIds, "Timeout");
@@ -85307,7 +85692,7 @@ class GNServer {
             clearTimeout(timeout);
             this.waitingServerDetailDict.delete(matchId);
         }
-        Debug.logInfo("[GN] [Matchmaking] request match server detail for " + matchId + " failed on " + gameId + ", with reason " + reason);
+        Debug.logInfo("[GearN] [Matchmaking] request match server detail for " + matchId + " failed on " + gameId + ", with reason " + reason);
         let matchCollection = this.getDatabase().systemGameCollection("Match", gameId);
         matchCollection.updateOne({ matchId: matchId }, { $set: {} });
         let matchmakingTicketCollection = this.getDatabase().runtimeGameCollection("MatchmakingTicket", gameId);
@@ -85323,6 +85708,8 @@ class GNServer {
 
 ;// external "@xmobitea/gn-typescript-client"
 const gn_typescript_client_namespaceObject = require("@xmobitea/gn-typescript-client");
+;// external "@xmobitea/gn-typescript-client/dist/runtime/config/GNServerSettings"
+const GNServerSettings_namespaceObject = require("@xmobitea/gn-typescript-client/dist/runtime/config/GNServerSettings");
 ;// ./src/GN-startup/ServerApplication.ts
 
 
@@ -85346,6 +85733,7 @@ const gn_typescript_client_namespaceObject = require("@xmobitea/gn-typescript-cl
 
 
 
+
 
 
 class ServerApplication_BuilderBase {
@@ -85453,18 +85841,18 @@ class ServerApplication extends ServerApplication_BuilderBase {
                 fullLogPath = process.cwd() + "/" + configFullLogPath;
             }
         }
-        console.log("[GN] FullLogPath at: " + fullLogPath);
+        console.log("[GearN] FullLogPath at: " + fullLogPath);
         Debug.init({
             isLogToConsoleEnable: this.getLogSettings().getLogToConsoleEnable(),
             isLogToFileEnable: this.getLogSettings().getLogToFileEnable(),
             logPath: fullLogPath,
         });
         Debug.run();
-        Debug.log("[GN XmobiTea] -->>==>>>--<<<==<<-- [GN XmobiTea]");
-        const port = this.applicationSettings.getPort();
-        Debug.log("[GN] Try run server on the port " + port);
-        const socketPort = this.applicationSettings.getSocketPort();
-        Debug.log("[GN] Try run socket server on the port " + socketPort);
+        Debug.log("[GearN XmobiTea] -->>==>>>--<<<==<<-- [GN XmobiTea]");
+        const port = this.getApplicationSettings().getPort();
+        Debug.log("[GearN] Try run server on the port " + port);
+        const socketPort = this.getApplicationSettings().getSocketPort();
+        Debug.log("[GearN] Try run socket server on the port " + socketPort);
         const app = external_express_default()();
         const server = this.getServer(app, this.getApplicationSettings());
         const useOtherSocketServer = this.getApplicationSettings().getPort() != this.getApplicationSettings().getSocketPort() && this.getSocketAppSettings().getEnable();
@@ -85515,9 +85903,9 @@ class ServerApplication extends ServerApplication_BuilderBase {
         this.gnServer.setHttpApp(this.httpApp);
         this.gnServer.setSocketApp(this.socketApp);
         this.gnServer.getDatabase().run(() => {
-            Debug.log("[GN] Database run success");
+            Debug.log("[GearN] Database run success");
         }, (err) => {
-            Debug.logError("[GN] Database connect error " + err);
+            Debug.logError("[GearN] Database connect error " + err);
         });
         let authInfoCollection = this.gnServer.getDatabase().systemCollection("AuthInfo");
         this.apiMiddleware.setAuthInfoCollection(authInfoCollection);
@@ -85539,7 +85927,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
         this.socketApp.setEmitter(adapterEventCollection);
         // if (this.mailSettings.getEnable()) {
         // 	this.gnServer.getMail().run(() => {
-        // 		Debug.log("[GN] Send Grid Mail run success");
+        // 		Debug.log("[GearN] Send Grid Mail run success");
         // 	});
         // }
         let uploadFileInfoCollection = this.gnServer.getDatabase().systemCollection("UploadFileInfo");
@@ -85549,7 +85937,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
         this.uploadFileMiddleware.setUploadFileInfoCollection(uploadFileInfoCollection);
         this.gnServer.init();
         this.gnServer.run(() => {
-            Debug.log("[GN] Game Application run success");
+            Debug.log("[GearN] Game Application run success");
         });
         let secretInfoResults = await secretInfoCollection.find({ isDefault: true }).toArray();
         let secretInfo = secretInfoResults.at(0);
@@ -85561,11 +85949,11 @@ class ServerApplication extends ServerApplication_BuilderBase {
             useSsl: false,
             useSocket: false,
             useHttp: true,
-            sendRate: 20,
+            messageType: GNServerSettings_namespaceObject.MessageType.MsgPack,
+            sendRate: 2000,
             reconnectDelay: 5000,
             pingInterval: 20000,
             pingTimeout: 20000,
-            gnServerSourcePath: "",
             logType: gn_typescript_client_namespaceObject.LogType.Off,
             adminSecretKey: secretKey,
             serverSecretKey: secretKey,
@@ -85589,12 +85977,12 @@ class ServerApplication extends ServerApplication_BuilderBase {
         this.gnServer.getPostEventCallbackService().setEventCallbackCollection(postEventCallbackCollection);
         this.gnServer.getPostEventCallbackService().setCloudScriptService(this.gnServer.getEventCallbackCloudScriptService());
         this.gnServer.getPreEventCallbackService().setCloudScriptService(this.gnServer.getEventCallbackCloudScriptService());
-        server.listen(port, () => {
-            Debug.log("[GN XmobiTea] -->>==>>>--<<<==<<-- [GN XmobiTea]");
-            Debug.log("[GN] Server Application running on the port " + port + " with id: " + this.sessionId);
+        server.listen(port, "0.0.0.0", () => {
+            Debug.log("[GearN XmobiTea] -->>==>>>--<<<==<<-- [GearN XmobiTea]");
+            Debug.log("[GearN] Server Application running on 0.0.0.0 the port " + port + " with sessionId: " + this.sessionId);
             if (useOtherSocketServer) {
-                socketServer.listen(socketPort, () => {
-                    Debug.log("[GN] Socket Server running on the port " + socketPort);
+                socketServer.listen(socketPort, "0.0.0.0", () => {
+                    Debug.log("[GearN] Socket Server running on 0.0.0.0 the port " + socketPort);
                 });
             }
             if (onRunSuccess != null)
@@ -85645,132 +86033,120 @@ class ServerApplication extends ServerApplication_BuilderBase {
         }
         let userId = StringUtility.generateRandomString(10, 0);
         {
-            let permission = GrantSecretInfoRequestHandler.generateRecommendAdminPermission();
-            {
-                permission.masterAdmin.setMasterGameSettings = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.grantAdminAccount = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.removeAdminAccount = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.setPasswordAdminAccount = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.setSecretKeyAdminAccount = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.setGameInformation = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.grantGame = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.changePasswordAdminAccount = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getAdminAccountList = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getGameInformation = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getGameList = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getMasterGameSettings = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getSecretInfoInformation = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getSecretInfoList = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.grantSecretInfo = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.setSecretInfoInformation = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.getEventCallbackCloudScript = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-                permission.masterAdmin.setEventCallbackCloudScript = {
-                    selfEnable: false,
-                    adminSelfEnable: false,
-                    otherSelfEnable: false,
-                    serverSelfEnable: false,
-                };
-            }
-            {
-                let newSecretInfo = SecretInfo.Builder()
-                    .setGameId("")
-                    .setIsRemove(false)
-                    .setPermission(permission)
-                    .setRole(SecretRole.Admin)
-                    .setSecretKey(StringUtility.generateRandomString(20, 0))
-                    .setTsExpire(-1)
-                    .setIsDefault(true)
-                    .build();
-                await this.gnServer.getApiMiddleware().updateSecretInfo(newSecretInfo);
-            }
             let currentMilliseconds = xDatetime.getCurrentMilliseconds();
             // create secretInfo for admin account
             {
+                let permission = GrantSecretInfoRequestHandler.generateRecommendAdminPermission();
+                {
+                    permission.masterAdmin.setMasterGameSettings = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.grantAdminAccount = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.removeAdminAccount = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.setPasswordAdminAccount = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.setSecretKeyAdminAccount = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.setGameInformation = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.grantGame = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.changePasswordAdminAccount = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getAdminAccountList = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getGameInformation = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getGameList = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getMasterGameSettings = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getSecretInfoInformation = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getSecretInfoList = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.grantSecretInfo = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.setSecretInfoInformation = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.getEventCallbackCloudScript = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                    permission.masterAdmin.setEventCallbackCloudScript = {
+                        selfEnable: false,
+                        adminSelfEnable: false,
+                        otherSelfEnable: false,
+                        serverSelfEnable: false,
+                    };
+                }
                 let adminPermission = structuredClone(permission);
                 // adminPermission.masterAdmin.grantAdminAccount.selfEnable = false;
                 // adminPermission.masterAdmin.removeAdminAccount.selfEnable = false;
@@ -85786,6 +86162,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
                     creatorId: userId,
                     remove: false,
                     tsExpire: -1,
+                    displayName: "default recommend sub admin secret info",
                     tsCreate: currentMilliseconds,
                 };
                 await masterAdminCollection.insertOne(result);
@@ -85797,6 +86174,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
                     .setRole(secretInfoItem.getRole())
                     .setSecretKey(secretInfoItem.getSecretKey())
                     .setTsExpire(secretInfoItem.getTsExpire())
+                    .setDisplayName(secretInfoItem.getDisplayName())
                     .build();
                 this.gnServer.getApiMiddleware().updateSecretInfo(newSecretInfo);
             }
@@ -85812,6 +86190,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
                         creatorId: userId,
                         remove: false,
                         tsExpire: -1,
+                        displayName: "default recommend player secret info for gameId dev",
                         tsCreate: currentMilliseconds,
                     };
                     await masterAdminCollection.insertOne(result);
@@ -85823,6 +86202,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
                         .setRole(secretInfoItem.getRole())
                         .setSecretKey(secretInfoItem.getSecretKey())
                         .setTsExpire(secretInfoItem.getTsExpire())
+                        .setDisplayName(secretInfoItem.getDisplayName())
                         .build();
                     this.gnServer.getApiMiddleware().updateSecretInfo(newSecretInfo);
                 }
@@ -85836,6 +86216,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
                         creatorId: userId,
                         remove: false,
                         tsExpire: -1,
+                        displayName: "default recommend player secret info for gameId main",
                         tsCreate: currentMilliseconds,
                     };
                     await masterAdminCollection.insertOne(result);
@@ -85847,16 +86228,17 @@ class ServerApplication extends ServerApplication_BuilderBase {
                         .setRole(secretInfoItem.getRole())
                         .setSecretKey(secretInfoItem.getSecretKey())
                         .setTsExpire(secretInfoItem.getTsExpire())
+                        .setDisplayName(secretInfoItem.getDisplayName())
                         .build();
                     this.gnServer.getApiMiddleware().updateSecretInfo(newSecretInfo);
                 }
             }
-            let password = process.env["defaultPassword"] ?? "gnpassword";
-            let username = process.env["defaultUsername"] ?? "gnadmin";
+            let username = process.env["GEARN_INIT_ROOT_USERNAME"] ?? "gearnadmin";
+            let password = process.env["GEARN_INIT_ROOT_PASSWORD"] ?? "gearnpassword";
             // create secretInfo for admin account
             {
                 let permission = GrantSecretInfoRequestHandler.generateDefaultPermission(true, true, true, true);
-                let secretKey = "admin_" + StringUtility.generateRandomString(14, 0);
+                let secretKey = StringUtility.generateRandomString(20, 0);
                 let newSecretInfo = SecretInfo.Builder()
                     .setGameId("")
                     .setIsRemove(false)
@@ -85864,6 +86246,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
                     .setRole(SecretRole.Admin)
                     .setSecretKey(secretKey)
                     .setTsExpire(-1)
+                    .setDisplayName("default root admin secret info")
                     .setIsDefault(true)
                     .setIsOnlyMasterAdmin(true)
                     .build();
@@ -86586,7 +86969,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
             }
             {
                 let emailSettings = masterGameSettings.getEmailSettings();
-                this.gnServer.getEmailService().init(emailSettings.sendGridApiKey, emailSettings.sendFrom);
+                this.gnServer.getEmailService().init(emailSettings.host, emailSettings.port, emailSettings.secure, emailSettings.username, emailSettings.password, emailSettings.sendFrom);
                 this.gnServer.getEmailService().run();
             }
             {
@@ -87285,8 +87668,6 @@ group_model_GroupMemberParam_decorate([
 
 
 
-
-