@xmobitea/gn-server 2.4.13 → 2.4.15

package/dist/index.js

@@ -5157,6 +5157,10 @@ __decorate([
     (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
     __metadata("design:type", Boolean)
 ], GetCurrencyLeaderboardOperationRequest.prototype, "loadFromCache", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetCurrencyLeaderboardOperationRequest.prototype, "catalogId", void 0);
 class ServerGetCurrencyLeaderboardOperationRequest extends GetCurrencyLeaderboardOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -5197,6 +5201,7 @@ class GetCurrencyLeaderboardRequestHandler extends CharacterPlayerBaseRequestHan
                 limit: request.limit,
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -5216,6 +5221,7 @@ class GetCurrencyLeaderboardRequestHandler extends CharacterPlayerBaseRequestHan
                 limit: request.limit,
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -5235,6 +5241,7 @@ class GetCurrencyLeaderboardRequestHandler extends CharacterPlayerBaseRequestHan
                 limit: request.limit,
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -5246,14 +5253,15 @@ class GetCurrencyLeaderboardRequestHandler extends CharacterPlayerBaseRequestHan
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
-            let playerCurrencySettingsItem = masterPlayerSettings.playerCurrencySettings.find(x => x.key == request.key);
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let playerCurrencySettingsItem = characterPlayerSettings.playerCurrencySettings.find(x => x.key == request.key);
             if (playerCurrencySettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
             let cacheKey = "characterPlayerCurrencyLeaderboard_" + request.key;
+            if (request.catalogId)
+                cacheKey += "_" + request.catalogId;
             if (request.loadFromCache) {
                 if (request.skip + request.limit > 100) {
                     request.loadFromCache = false;
@@ -5280,9 +5288,10 @@ class GetCurrencyLeaderboardRequestHandler extends CharacterPlayerBaseRequestHan
                 }
             }
             else {
+                let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
                 if (request.skip + request.limit <= 100) {
                     characterPlayerFindOptions = null;
-                    characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithCurrenciesAsync(request.key, 0, 100, secretInfo.getGameId(), characterPlayerFindOptions);
+                    characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithCurrenciesAsync(request.key, 0, 100, request.catalogId, secretInfo.getGameId(), characterPlayerFindOptions);
                     for (let i = request.skip; i < request.skip + request.limit; i++) {
                         if (i >= characterPlayers.length)
                             break;
@@ -5296,7 +5305,7 @@ class GetCurrencyLeaderboardRequestHandler extends CharacterPlayerBaseRequestHan
                     this.gnServer.getCacheData().setData(cacheKey, characterPlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
                 }
                 else {
-                    characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithCurrenciesAsync(request.key, request.skip, request.limit, secretInfo.getGameId(), characterPlayerFindOptions);
+                    characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithCurrenciesAsync(request.key, request.skip, request.limit, request.catalogId, secretInfo.getGameId(), characterPlayerFindOptions);
                     for (let i = 0; i < characterPlayers.length; i++) {
                         let characterPlayer = characterPlayers[i];
                         let gnResult = new GNData_1.GNHashtable();
@@ -5459,11 +5468,11 @@ class GetCurrencyLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerCurrencySettingsItem = masterPlayerSettings.playerCurrencySettings.find(x => x.key == request.keys[i]);
+                    let playerCurrencySettingsItem = characterPlayerSettings.playerCurrencySettings.find(x => x.key == request.keys[i]);
                     if (playerCurrencySettingsItem != null) {
                         keys.push(playerCurrencySettingsItem.key);
                     }
@@ -5838,6 +5847,7 @@ const InfoRequestParam_1 = __webpack_require__(21803);
 const FriendStatus_1 = __webpack_require__(11259);
 const GetFriendStatisticsLeaderboardRequestHandler_1 = __webpack_require__(31378);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetFriendStatisticsLeaderboardAroundPlayerOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -5865,6 +5875,10 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetFriendStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetFriendStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "loadFromCache", void 0);
 class ServerGetFriendStatisticsLeaderboardAroundPlayerOperationRequest extends GetFriendStatisticsLeaderboardAroundPlayerOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -5902,7 +5916,8 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends Character
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -5921,7 +5936,8 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends Character
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -5940,7 +5956,8 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends Character
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -5952,33 +5969,46 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends Character
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = characterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(request.characterId, secretInfo.getGameId(), { playerFriends: true, playerStatistics: true });
-            if (characterPlayer == null) {
-                operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.CharacterPlayerNotFound);
-                return operationResponse;
+            let cacheKey = "characterPlayerStatisticsLeaderboardFriendAround_" + request.characterId;
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey)) {
+                    request.loadFromCache = false;
+                }
             }
             let gnResults = new GNData_1.GNArray();
-            let friendIds = [];
-            let allPlayerFriends = characterPlayer.getAllPlayerFriends();
-            for (let i = 0; i < allPlayerFriends.length; i++) {
-                let playerFriendItem = allPlayerFriends[i];
-                if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
-                    friendIds.push(playerFriendItem.friendId);
-                }
-            }
-            let allCharacterPlayers = yield this.gnServer.getDatabase().loadFriendCharacterPlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), characterPlayerFindOptions);
-            allCharacterPlayers.push(characterPlayer);
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let characterPlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
-                ? GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue)
-                : GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue);
+            let characterPlayers;
+            if (request.loadFromCache) {
+                characterPlayers = this.gnServer.getCacheData().getData(cacheKey);
+            }
+            else {
+                let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(request.characterId, secretInfo.getGameId(), null);
+                if (characterPlayer == null) {
+                    operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.CharacterPlayerNotFound);
+                    return operationResponse;
+                }
+                let friendIds = [];
+                let allPlayerFriends = characterPlayer.getAllPlayerFriends();
+                for (let i = 0; i < allPlayerFriends.length; i++) {
+                    let playerFriendItem = allPlayerFriends[i];
+                    if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
+                        friendIds.push(playerFriendItem.friendId);
+                    }
+                }
+                let allCharacterPlayers = yield this.gnServer.getDatabase().loadFriendCharacterPlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), null);
+                allCharacterPlayers.push(characterPlayer);
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                characterPlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
+                    ? GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue)
+                    : GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue);
+                this.gnServer.getCacheData().setData(cacheKey, characterPlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+            }
+            let characterPlayer = characterPlayers.find(x => x.getCharacterId() == request.characterId);
             let thisPosition = characterPlayers.indexOf(characterPlayer);
             for (let i = request.skip + thisPosition; i < request.skip + thisPosition + request.limit; i++) {
                 if (i >= characterPlayers.length)
@@ -5992,6 +6022,7 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends Character
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
+            yield this.gnServer.getPostEventCallbackService().onEvent("characterPlayer_GetFriendStatisticsLeaderboardAroundPlayer", request, secretInfo, operationRequest, operationResponse);
             return operationResponse;
         });
     }
@@ -6066,6 +6097,10 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetFriendStatisticsLeaderboardOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetFriendStatisticsLeaderboardOperationRequest.prototype, "loadFromCache", void 0);
 class ServerGetFriendStatisticsLeaderboardOperationRequest extends GetFriendStatisticsLeaderboardOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -6102,7 +6137,8 @@ class GetFriendStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRe
                 characterId: request.characterId,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -6121,7 +6157,8 @@ class GetFriendStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRe
                 characterId: request.characterId,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -6140,7 +6177,8 @@ class GetFriendStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRe
                 characterId: request.characterId,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -6152,35 +6190,45 @@ class GetFriendStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRe
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
-            if (characterPlayerFindOptions != null)
-                characterPlayerFindOptions.playerStatistics = true;
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = characterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(request.characterId, secretInfo.getGameId(), { playerFriends: true, playerStatistics: true });
-            if (characterPlayer == null) {
-                operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.CharacterPlayerNotFound);
-                return operationResponse;
+            let cacheKey = "characterPlayerStatisticsLeaderboardFriend_" + request.characterId;
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey)) {
+                    request.loadFromCache = false;
+                }
             }
             let gnResults = new GNData_1.GNArray();
-            let friendIds = [];
-            let allPlayerFriends = characterPlayer.getAllPlayerFriends();
-            for (let i = 0; i < allPlayerFriends.length; i++) {
-                let playerFriendItem = allPlayerFriends[i];
-                if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
-                    friendIds.push(playerFriendItem.friendId);
-                }
-            }
-            let allCharacterPlayers = yield this.gnServer.getDatabase().loadFriendCharacterPlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), characterPlayerFindOptions);
-            allCharacterPlayers.push(characterPlayer);
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let characterPlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
-                ? GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue)
-                : GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue);
+            let characterPlayers;
+            if (request.loadFromCache) {
+                characterPlayers = this.gnServer.getCacheData().getData(cacheKey);
+            }
+            else {
+                let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(request.characterId, secretInfo.getGameId(), null);
+                if (characterPlayer == null) {
+                    operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.CharacterPlayerNotFound);
+                    return operationResponse;
+                }
+                let friendIds = [];
+                let allPlayerFriends = characterPlayer.getAllPlayerFriends();
+                for (let i = 0; i < allPlayerFriends.length; i++) {
+                    let playerFriendItem = allPlayerFriends[i];
+                    if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
+                        friendIds.push(playerFriendItem.friendId);
+                    }
+                }
+                let allCharacterPlayers = yield this.gnServer.getDatabase().loadFriendCharacterPlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), null);
+                allCharacterPlayers.push(characterPlayer);
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                characterPlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
+                    ? GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue)
+                    : GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allCharacterPlayers, playerStatisticsSettingsItem.initialValue);
+                this.gnServer.getCacheData().setData(cacheKey, characterPlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+            }
             for (let i = request.skip; i < request.skip + request.limit; i++) {
                 if (i >= characterPlayers.length)
                     break;
@@ -6193,6 +6241,7 @@ class GetFriendStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRe
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
+            yield this.gnServer.getPostEventCallbackService().onEvent("characterPlayer_GetFriendStatisticsLeaderboard", request, secretInfo, operationRequest, operationResponse);
             return operationResponse;
         });
     }
@@ -8572,6 +8621,7 @@ const GNErrorCode_1 = __webpack_require__(94559);
 const CharacterPlayerBaseRequestHandler_1 = __webpack_require__(91203);
 const InfoRequestParam_1 = __webpack_require__(21803);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetStatisticsLeaderboardAroundPlayerOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -8599,6 +8649,14 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "loadFromCache", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "catalogId", void 0);
 class ServerGetStatisticsLeaderboardAroundPlayerOperationRequest extends GetStatisticsLeaderboardAroundPlayerOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -8636,7 +8694,9 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends CharacterPlayer
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -8655,7 +8715,9 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends CharacterPlayer
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -8674,7 +8736,9 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends CharacterPlayer
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -8686,25 +8750,79 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends CharacterPlayer
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = characterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+            let positionCacheKey = "characterPlayerStatisticsLeaderboardAroundPosition_" + request.characterId + "_" + request.key;
+            let cacheKey = "characterPlayerStatisticsLeaderboardAround_" + request.characterId + "_" + request.key;
+            if (request.catalogId) {
+                cacheKey += "_" + request.catalogId;
+                positionCacheKey += "_" + request.catalogId;
+            }
+            if (request.loadFromCache) {
+                if (request.skip + request.limit > 100) {
+                    request.loadFromCache = false;
+                }
+            }
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey) || !this.gnServer.getCacheData().isValid(positionCacheKey)) {
+                    request.loadFromCache = false;
+                }
+            }
             let gnResults = new GNData_1.GNArray();
-            let thisPosition = yield this.gnServer.getDatabase().loadPositionCharacterPlayerLeaderboardWithStatisticsAsync(request.key, request.characterId, secretInfo.getGameId(), playerStatisticsSettingsItem.initialValue, direction);
-            let characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, secretInfo.getGameId(), direction, characterPlayerFindOptions);
-            for (let i = 0; i < characterPlayers.length; i++) {
-                let characterPlayer = characterPlayers[i];
-                let gnResult = new GNData_1.GNHashtable();
-                gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
-                gnResult.add(GNParameterCode_1.GNParameterCode.CharacterId, characterPlayer.getCharacterId());
-                gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(characterPlayer, request.infoRequestParam, secretInfo.getGameId()));
-                gnResults.add(gnResult);
+            let thisPosition;
+            let characterPlayers;
+            if (request.loadFromCache) {
+                thisPosition = this.gnServer.getCacheData().getData(positionCacheKey);
+                characterPlayers = this.gnServer.getCacheData().getData(cacheKey);
+                for (let i = request.skip; i < request.skip + request.limit; i++) {
+                    if (i >= characterPlayers.length)
+                        break;
+                    let characterPlayer = characterPlayers[i];
+                    let gnResult = new GNData_1.GNHashtable();
+                    gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                    gnResult.add(GNParameterCode_1.GNParameterCode.CharacterId, characterPlayer.getCharacterId());
+                    gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(characterPlayer, request.infoRequestParam, secretInfo.getGameId()));
+                    gnResults.add(gnResult);
+                }
+            }
+            else {
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+                thisPosition = yield this.gnServer.getDatabase().loadPositionCharacterPlayerLeaderboardWithStatisticsAsync(request.key, request.characterId, request.catalogId, secretInfo.getGameId(), playerStatisticsSettingsItem.initialValue, direction);
+                if (thisPosition != -1) {
+                    this.gnServer.getCacheData().setData(positionCacheKey, thisPosition, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
+                    if (request.skip + request.limit <= 100) {
+                        characterPlayerFindOptions = null;
+                        characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, thisPosition, 100, request.catalogId, secretInfo.getGameId(), direction, characterPlayerFindOptions);
+                        for (let i = request.skip; i < request.skip + request.limit; i++) {
+                            if (i >= characterPlayers.length)
+                                break;
+                            let characterPlayer = characterPlayers[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.CharacterId, characterPlayer.getCharacterId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(characterPlayer, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                        this.gnServer.getCacheData().setData(cacheKey, characterPlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    }
+                    else {
+                        characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, characterPlayerFindOptions);
+                        for (let i = 0; i < characterPlayers.length; i++) {
+                            let characterPlayer = characterPlayers[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.CharacterId, characterPlayer.getCharacterId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(characterPlayer, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                    }
+                }
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
@@ -8786,6 +8904,10 @@ __decorate([
     (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.Version, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
     __metadata("design:type", String)
 ], GetStatisticsLeaderboardOperationRequest.prototype, "version", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetStatisticsLeaderboardOperationRequest.prototype, "catalogId", void 0);
 class ServerGetStatisticsLeaderboardOperationRequest extends GetStatisticsLeaderboardOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -8827,6 +8949,7 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -8847,6 +8970,7 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -8867,6 +8991,7 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -8878,15 +9003,16 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = characterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
             if (!request.version) {
                 let cacheKey = "characterPlayerStatisticsLeaderboard_" + request.key;
+                if (request.catalogId)
+                    cacheKey += "_" + request.catalogId;
                 if (request.loadFromCache) {
                     if (request.skip + request.limit > 100) {
                         request.loadFromCache = false;
@@ -8897,8 +9023,6 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
                         request.loadFromCache = false;
                     }
                 }
-                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let gnResults = new GNData_1.GNArray();
                 let characterPlayers;
                 if (request.loadFromCache) {
@@ -8915,9 +9039,12 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
                     }
                 }
                 else {
+                    let characterPlayerFindOptions = this.convertToCharacterPlayerFindOptions(request.infoRequestParam);
+                    let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                    let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     if (request.skip + request.limit <= 100) {
                         characterPlayerFindOptions = null;
-                        characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, 0, 100, secretInfo.getGameId(), direction, characterPlayerFindOptions);
+                        characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, 0, 100, request.catalogId, secretInfo.getGameId(), direction, characterPlayerFindOptions);
                         for (let i = request.skip; i < request.skip + request.limit; i++) {
                             if (i >= characterPlayers.length)
                                 break;
@@ -8931,7 +9058,7 @@ class GetStatisticsLeaderboardRequestHandler extends CharacterPlayerBaseRequestH
                         this.gnServer.getCacheData().setData(cacheKey, characterPlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
                     }
                     else {
-                        characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, request.skip, request.limit, secretInfo.getGameId(), direction, characterPlayerFindOptions);
+                        characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAsync(request.key, request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, characterPlayerFindOptions);
                         for (let i = 0; i < characterPlayers.length; i++) {
                             let characterPlayer = characterPlayers[i];
                             let gnResult = new GNData_1.GNHashtable();
@@ -9131,11 +9258,11 @@ class GetStatisticsLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
+            let characterPlayerSettings = this.gnServer.getGNSettings().getCharacterPlayerSettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.keys[i]);
+                    let playerStatisticsSettingsItem = characterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.keys[i]);
                     if (playerStatisticsSettingsItem != null) {
                         keys.push(playerStatisticsSettingsItem.key);
                     }
@@ -9888,7 +10015,7 @@ __decorate([
     __metadata("design:type", String)
 ], GrantPlayerItemOperationRequest.prototype, "displayName", void 0);
 __decorate([
-    (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Amount, defaultValue: 1, isOptional: true }),
+    (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Amount, defaultValue: 1, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GrantPlayerItemOperationRequest.prototype, "amount", void 0);
 class ServerGrantPlayerItemOperationRequest extends GrantPlayerItemOperationRequest {
@@ -9995,7 +10122,7 @@ class GrantPlayerItemRequestHandler extends CharacterPlayerBaseRequestHandler_1.
                 return operationResponse;
             }
             let amount = request.amount;
-            if (playerItemCatalogSettingsItem.itemType == ItemType_1.ItemType.NonConsumable) {
+            if (playerItemCatalogSettingsItem.itemType == ItemType_1.ItemType.NonStackable) {
                 amount = 1;
             }
             let itemId = StringUtility_1.StringUtility.generateRandomString(12, this.gnServer.getIdTypeCase());
@@ -14822,6 +14949,7 @@ const GNErrorCode_1 = __webpack_require__(94559);
 const GNParameterCode_1 = __webpack_require__(38343);
 const Md5Generate_1 = __webpack_require__(38632);
 const StringUtility_1 = __webpack_require__(77468);
+const xDatetime_1 = __webpack_require__(21817);
 class RequestDownloadFileUploadInfoOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -14922,7 +15050,7 @@ class RequestDownloadFileUploadInfoRequestHandler extends RequestHandler_1.Reque
             let collection = this.gnServer.getDatabase().systemCollection("DownloadFileSession");
             collection.insertOne({
                 fileId: request.fileId,
-                createdAt: new Date(),
+                createdAt: xDatetime_1.xDatetime.getCurrentDate(),
                 downloadToken: downloadToken,
                 isValid: true,
             });
@@ -15365,8 +15493,10 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                 this.gnServer.getDatabase().runtimeCollection("DeleteInDatabaseLog").insertOne(result);
                 let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(characterPlayer.getOwner().id, request.gameId);
                 if (gamePlayer != null) {
-                    gamePlayer.removePlayerCharacter(characterPlayer.getCharacterId());
-                    gamePlayer.saveAsync();
+                    if (gamePlayer.hasPlayerCharacter(characterPlayer.getCharacterId())) {
+                        gamePlayer.removePlayerCharacter(characterPlayer.getCharacterId());
+                        gamePlayer.saveAsync();
+                    }
                 }
             }
             else if (request.type == OwnerType_1.OwnerType.Inventory) {
@@ -15388,22 +15518,28 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                 if (owner.type == OwnerType_1.OwnerType.GamePlayer) {
                     let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(inventory.getOwner().id, request.gameId);
                     if (gamePlayer != null) {
-                        gamePlayer.removePlayerInventory(inventory.getItemId());
-                        gamePlayer.saveAsync();
+                        if (gamePlayer.hasPlayerInventory(inventory.getItemId())) {
+                            gamePlayer.removePlayerInventory(inventory.getItemId());
+                            gamePlayer.saveAsync();
+                        }
                     }
                 }
                 else if (owner.type == OwnerType_1.OwnerType.CharacterPlayer) {
                     let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(inventory.getOwner().id, request.gameId);
                     if (characterPlayer != null) {
-                        characterPlayer.removePlayerInventory(inventory.getItemId());
-                        characterPlayer.saveAsync();
+                        if (characterPlayer.hasPlayerInventory(inventory.getItemId())) {
+                            characterPlayer.removePlayerInventory(inventory.getItemId());
+                            characterPlayer.saveAsync();
+                        }
                     }
                 }
                 else if (owner.type == OwnerType_1.OwnerType.Group) {
                     let group = yield this.gnServer.getDatabase().loadGroupAsync(inventory.getOwner().id, request.gameId);
                     if (group != null) {
-                        group.removeGroupInventory(inventory.getItemId());
-                        group.saveAsync();
+                        if (group.hasGroupInventory(inventory.getItemId())) {
+                            group.removeGroupInventory(inventory.getItemId());
+                            group.saveAsync();
+                        }
                     }
                 }
             }
@@ -15422,27 +15558,19 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     if (memberId.length == 11) {
                         let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(memberId, request.gameId);
                         if (characterPlayer != null) {
-                            objs.push({
-                                type: "Group.Member",
-                                obj: {
-                                    memberId: memberId,
-                                }
-                            });
-                            characterPlayer.removePlayerGroup(groupId);
-                            characterPlayer.saveAsync();
+                            if (characterPlayer.hasPlayerGroup(groupId)) {
+                                characterPlayer.removePlayerGroup(groupId);
+                                characterPlayer.saveAsync();
+                            }
                         }
                     }
                     else if (memberId.length == 10) {
                         let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(memberId, request.gameId);
                         if (gamePlayer != null) {
-                            objs.push({
-                                type: "Group.Member",
-                                obj: {
-                                    memberId: memberId,
-                                }
-                            });
-                            gamePlayer.removePlayerGroup(groupId);
-                            gamePlayer.saveAsync();
+                            if (gamePlayer.hasPlayerGroup(groupId)) {
+                                gamePlayer.removePlayerGroup(groupId);
+                                gamePlayer.saveAsync();
+                            }
                         }
                     }
                 }
@@ -15931,13 +16059,9 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
             let userId = gamePlayer.getUserId();
-            answer.push({
-                type: "GamePlayer.Friend",
-                obj: {
-                    friendId: userId,
-                }
-            });
-            friendPlayer.removePlayerFriend(userId);
+            if (friendPlayer.hasPlayerFriend(userId)) {
+                friendPlayer.removePlayerGroup(userId);
+            }
             return answer;
         });
     }
@@ -15945,13 +16069,9 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
             let characterId = characterPlayer.getCharacterId();
-            answer.push({
-                type: "CharacterPlayer.Friend",
-                obj: {
-                    friendId: characterId,
-                }
-            });
-            friendPlayer.removePlayerFriend(characterId);
+            if (friendPlayer.hasPlayerFriend(characterId)) {
+                friendPlayer.removePlayerGroup(characterId);
+            }
             return answer;
         });
     }
@@ -15959,15 +16079,11 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
             let userId = gamePlayer.getUserId();
-            group.removeMember(userId);
+            if (group.hasMember(userId)) {
+                group.removeMember(userId);
+            }
             let groupId = group.getGroupId();
             this.gnServer.getCacheData().removeData("GroupMessages_" + groupId);
-            answer.push({
-                type: "GamePlayer.Group",
-                obj: {
-                    groupId: groupId,
-                }
-            });
             return answer;
         });
     }
@@ -15975,15 +16091,11 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
             let characterId = characterPlayer.getCharacterId();
-            group.removeMember(characterId);
+            if (group.hasMember(characterId)) {
+                group.removeMember(characterId);
+            }
             let groupId = group.getGroupId();
             this.gnServer.getCacheData().removeData("GroupMessages_" + groupId);
-            answer.push({
-                type: "CharacterPlayer.Member",
-                obj: {
-                    groupId: groupId,
-                }
-            });
             return answer;
         });
     }
@@ -16140,6 +16252,14 @@ __decorate([
     (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.DatabaseSystem, isOptional: true }),
     __metadata("design:type", Boolean)
 ], GetAnalyticsOperationRequest.prototype, "databaseSystem", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.Cost, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetAnalyticsOperationRequest.prototype, "cost", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.MonthlyCost, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetAnalyticsOperationRequest.prototype, "monthlyCost", void 0);
 class GetAnalyticsRequestHandler extends RequestHandler_1.RequestHandler {
     getCode() {
         return OperationCode_1.OperationCode.GetAnalytics;
@@ -16164,6 +16284,8 @@ class GetAnalyticsRequestHandler extends RequestHandler_1.RequestHandler {
                     operationSystem: request.operationSystem,
                     requestComplete: request.requestComplete,
                     databaseSystem: request.databaseSystem,
+                    cost: request.cost,
+                    monthlyCost: request.monthlyCost,
                 }
             }, secretInfo, operationRequest);
         });
@@ -16284,6 +16406,28 @@ class GetAnalyticsRequestHandler extends RequestHandler_1.RequestHandler {
                 }
                 operationResponse.setParameter(GNParameterCode_1.GNParameterCode.RequestComplete, gnRequestComplete);
             }
+            if (request.requestParams.cost) {
+                let gnCost = new GNData_1.GNHashtable();
+                if (bigAnalyticsItem.cost) {
+                    gnCost.add(GNParameterCode_1.GNParameterCode.RequestCount, bigAnalyticsItem.cost.requestCount);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.MatchmakingRequestCount, bigAnalyticsItem.cost.matchmakingRequestCount);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.CloudScriptGBs, bigAnalyticsItem.cost.cloudScriptGBs);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.StorageSizeInBytes, bigAnalyticsItem.cost.storageSizeInBytes);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.DataTransferSizeInBytes, bigAnalyticsItem.cost.dataTransferSizeInBytes);
+                }
+                operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Cost, gnCost);
+            }
+            if (request.requestParams.monthlyCost) {
+                let gnCost = new GNData_1.GNHashtable();
+                if (bigAnalyticsItem.monthlyCost) {
+                    gnCost.add(GNParameterCode_1.GNParameterCode.RequestCount, bigAnalyticsItem.monthlyCost.requestCount);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.MatchmakingRequestCount, bigAnalyticsItem.monthlyCost.matchmakingRequestCount);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.CloudScriptGBs, bigAnalyticsItem.monthlyCost.cloudScriptGBs);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.StorageSizeInBytes, bigAnalyticsItem.monthlyCost.storageSizeInBytes);
+                    gnCost.add(GNParameterCode_1.GNParameterCode.DataTransferSizeInBytes, bigAnalyticsItem.monthlyCost.dataTransferSizeInBytes);
+                }
+                operationResponse.setParameter(GNParameterCode_1.GNParameterCode.MonthlyCost, gnCost);
+            }
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
             yield this.gnServer.getPostEventCallbackService().onEvent("dashboard_GetAnalytics", request, secretInfo, operationRequest, operationResponse);
             return operationResponse;
@@ -22959,30 +23103,30 @@ class GrantSecretInfoRequestHandler extends RequestHandler_1.RequestHandler {
                 getStoreLog: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
             },
             masterAdmin: {
-                setMasterGameSettings: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
+                setMasterGameSettings: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 grantAdminAccount: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 removeAdminAccount: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 setPasswordAdminAccount: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 setSecretKeyAdminAccount: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 setGameInformation: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 grantGame: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
-                changePasswordAdminAccount: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
+                changePasswordAdminAccount: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 getAdminAccountList: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 getGameInformation: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
-                getGameList: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getMasterGameSettings: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getServerLog: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getSecretInfoInformation: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
+                getGameList: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getMasterGameSettings: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getServerLog: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getSecretInfoInformation: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 getSecretInfoList: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 grantSecretInfo: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 setSecretInfoInformation: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
-                getUsernameAdminAccount: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getAnalytics: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getEventCallbackCloudScript: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                setEventCallbackCloudScript: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                resetStatisticsLeaderboard: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getBackupStatisticsLeaderboardVersion: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
-                getServerGameData: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: true, serverSelfEnable: false, },
+                getUsernameAdminAccount: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getAnalytics: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getEventCallbackCloudScript: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                setEventCallbackCloudScript: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                resetStatisticsLeaderboard: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getBackupStatisticsLeaderboardVersion: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
+                getServerGameData: { selfEnable: true, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
                 deleteInDatabase: { selfEnable: false, otherSelfEnable: false, adminSelfEnable: false, serverSelfEnable: false, },
             },
             multiplayer: {
@@ -23657,6 +23801,10 @@ __decorate([
     (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.Log, minLength: 1, maxLength: 256, mustNonNull: true, isOptional: true }),
     __metadata("design:type", String)
 ], ResetStatisticsLeaderboardOperationRequest.prototype, "log", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], ResetStatisticsLeaderboardOperationRequest.prototype, "catalogId", void 0);
 class ResetStatisticsLeaderboardRequestHandler extends RequestHandler_1.RequestHandler {
     getCode() {
         return OperationCode_1.OperationCode.ResetStatisticsLeaderboard;
@@ -23679,6 +23827,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler_1.RequestH
                 version: request.version,
                 gameId: request.gameId,
                 log: request.log,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -23854,7 +24003,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler_1.RequestH
                     let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     let characterPlayerCollection = yield this.gnServer.getDatabase().systemGameCollection("CharacterPlayer", gameId);
                     xDebug_1.Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + characterPlayerCollection.collectionName + " starting");
-                    let characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAllAsync(key, gameId, direction, characterPlayerFindOptions);
+                    let characterPlayers = yield this.gnServer.getDatabase().loadCharacterPlayersLeaderboardWithStatisticsAllAsync(key, request.catalogId, gameId, direction, characterPlayerFindOptions);
                     let backupData = {
                         key: key,
                         version: version,
@@ -23922,7 +24071,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler_1.RequestH
                     let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     let groupCollection = yield this.gnServer.getDatabase().systemGameCollection("Group", gameId);
                     xDebug_1.Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + groupCollection.collectionName + " starting");
-                    let groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAllAsync(key, gameId, direction, groupFindOptions);
+                    let groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAllAsync(key, request.catalogId, gameId, direction, groupFindOptions);
                     let backupData = {
                         key: key,
                         version: version,
@@ -23985,7 +24134,7 @@ class ResetStatisticsLeaderboardRequestHandler extends RequestHandler_1.RequestH
                     let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     let inventoryCollection = yield this.gnServer.getDatabase().systemGameCollection("Inventory", gameId);
                     xDebug_1.Debug.log("[GN] ResetStatisticsLeaderboard for key " + key + " at " + inventoryCollection.collectionName + " starting");
-                    let inventories = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAllAsync(key, gameId, direction, inventoryFindOptions);
+                    let inventories = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAllAsync(key, request.catalogId, gameId, direction, inventoryFindOptions);
                     let backupData = {
                         key: key,
                         version: version,
@@ -24565,17 +24714,34 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         }
                         for (let i = 0; i < removeKeyLst.length; i++) {
                             let key = removeKeyLst[i];
-                            let indexName = "playerCurrencies." + key + ".value_-1";
-                            characterPlayerCollection.dropIndex(indexName);
-                            xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            {
+                                let indexName = "playerCurrencies." + key + ".value_-1";
+                                characterPlayerCollection.dropIndex(indexName);
+                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            }
+                            {
+                                let indexName = "catalogId_1_" + "playerCurrencies." + key + ".value_-1";
+                                characterPlayerCollection.dropIndex(indexName);
+                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            }
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
                             let key = addKeyLst[i];
-                            let indexDoc = {};
-                            indexDoc["playerCurrencies." + key + ".value"] = -1;
-                            let indexName = "playerCurrencies." + key + ".value_-1";
-                            characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            {
+                                let indexDoc = {};
+                                indexDoc["playerCurrencies." + key + ".value"] = -1;
+                                let indexName = "playerCurrencies." + key + ".value_-1";
+                                characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            }
+                            {
+                                let indexDoc = {};
+                                indexDoc["catalogId"] = 1;
+                                indexDoc["playerCurrencies." + key + ".value"] = -1;
+                                let indexName = "catalogId_1_" + "playerCurrencies." + key + ".value_-1";
+                                characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                            }
                         }
                     }
                     if (request.gameSettings.characterPlayerSettings.playerStatisticsSettings != null) {
@@ -24625,18 +24791,36 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             }
                             for (let i = 0; i < removeKeyLst.length; i++) {
                                 let key = removeKeyLst[i];
-                                let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
-                                characterPlayerCollection.dropIndex(indexName);
-                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                {
+                                    let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
+                                    characterPlayerCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
+                                {
+                                    let indexName = "catalogId_1_" + "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
+                                    characterPlayerCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
                             }
                             for (let i = 0; i < addKeyLst.length; i++) {
                                 let key = addKeyLst[i];
-                                let indexDoc = {};
-                                indexDoc["playerStatistics." + key + ".value"] = -1;
-                                indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
-                                let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
-                                characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["playerStatistics." + key + ".value"] = -1;
+                                    indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
+                                    let indexName = "playerStatistics." + key + ".value_-1_playerStatistics." + key + ".tsLastUpdate_1";
+                                    characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["catalogId"] = 1;
+                                    indexDoc["playerStatistics." + key + ".value"] = -1;
+                                    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 });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
                             }
                         }
                         {
@@ -24651,18 +24835,36 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             }
                             for (let i = 0; i < removeKeyAscLst.length; i++) {
                                 let key = removeKeyAscLst[i];
-                                let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
-                                characterPlayerCollection.dropIndex(indexName);
-                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                {
+                                    let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
+                                    characterPlayerCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
+                                {
+                                    let indexName = "catalogId_1_" + "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
+                                    characterPlayerCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
                             }
                             for (let i = 0; i < addKeyAscLst.length; i++) {
                                 let key = addKeyAscLst[i];
-                                let indexDoc = {};
-                                indexDoc["playerStatistics." + key + ".value"] = 1;
-                                indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
-                                let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
-                                characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["playerStatistics." + key + ".value"] = 1;
+                                    indexDoc["playerStatistics." + key + ".tsLastUpdate"] = 1;
+                                    let indexName = "playerStatistics." + key + ".value_1_playerStatistics." + key + ".tsLastUpdate_1";
+                                    characterPlayerCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["catalogId"] = 1;
+                                    indexDoc["playerStatistics." + key + ".value"] = 1;
+                                    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 });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + characterPlayerCollection.collectionName);
+                                }
                             }
                         }
                     }
@@ -25069,17 +25271,34 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         }
                         for (let i = 0; i < removeKeyLst.length; i++) {
                             let key = removeKeyLst[i];
-                            let indexName = "groupCurrencies." + key + ".value_-1";
-                            groupCollection.dropIndex(indexName);
-                            xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                            {
+                                let indexName = "groupCurrencies." + key + ".value_-1";
+                                groupCollection.dropIndex(indexName);
+                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                            }
+                            {
+                                let indexName = "catalogId_1_" + "groupCurrencies." + key + ".value_-1";
+                                groupCollection.dropIndex(indexName);
+                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                            }
                         }
                         for (let i = 0; i < addKeyLst.length; i++) {
                             let key = addKeyLst[i];
-                            let indexDoc = {};
-                            indexDoc["groupCurrencies." + key + ".value"] = -1;
-                            let indexName = "groupCurrencies." + key + ".value_-1";
-                            groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                            xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                            {
+                                let indexDoc = {};
+                                indexDoc["groupCurrencies." + key + ".value"] = -1;
+                                let indexName = "groupCurrencies." + key + ".value_-1";
+                                groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                            }
+                            {
+                                let indexDoc = {};
+                                indexDoc["catalogId"] = 1;
+                                indexDoc["groupCurrencies." + key + ".value"] = -1;
+                                let indexName = "catalogId_1_" + "groupCurrencies." + key + ".value_-1";
+                                groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                            }
                         }
                     }
                     if (request.gameSettings.groupSettings.groupStatisticsSettings != null) {
@@ -25129,18 +25348,36 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             }
                             for (let i = 0; i < removeKeyLst.length; i++) {
                                 let key = removeKeyLst[i];
-                                let indexName = "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
-                                groupCollection.dropIndex(indexName);
-                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                {
+                                    let indexName = "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
+                                    groupCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                }
+                                {
+                                    let indexName = "catalogId_1_" + "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
+                                    groupCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                }
                             }
                             for (let i = 0; i < addKeyLst.length; i++) {
                                 let key = addKeyLst[i];
-                                let indexDoc = {};
-                                indexDoc["groupStatistics." + key + ".value"] = -1;
-                                indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
-                                let indexName = "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
-                                groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["groupStatistics." + key + ".value"] = -1;
+                                    indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
+                                    let indexName = "groupStatistics." + key + ".value_-1_groupStatistics." + key + ".tsLastUpdate_1";
+                                    groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                }
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["catalogId"] = 1;
+                                    indexDoc["groupStatistics." + key + ".value"] = -1;
+                                    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 });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                }
                             }
                         }
                         {
@@ -25155,18 +25392,36 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             }
                             for (let i = 0; i < removeKeyAscLst.length; i++) {
                                 let key = removeKeyAscLst[i];
-                                let indexName = "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
-                                groupCollection.dropIndex(indexName);
-                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                {
+                                    let indexName = "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
+                                    groupCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                }
+                                {
+                                    let indexName = "catalogId_1_" + "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
+                                    groupCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + groupCollection.collectionName);
+                                }
                             }
                             for (let i = 0; i < addKeyAscLst.length; i++) {
                                 let key = addKeyAscLst[i];
-                                let indexDoc = {};
-                                indexDoc["groupStatistics." + key + ".value"] = 1;
-                                indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
-                                let indexName = "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
-                                groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["groupStatistics." + key + ".value"] = 1;
+                                    indexDoc["groupStatistics." + key + ".tsLastUpdate"] = 1;
+                                    let indexName = "groupStatistics." + key + ".value_1_groupStatistics." + key + ".tsLastUpdate_1";
+                                    groupCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                }
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["catalogId"] = 1;
+                                    indexDoc["groupStatistics." + key + ".value"] = 1;
+                                    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 });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + groupCollection.collectionName);
+                                }
                             }
                         }
                     }
@@ -25306,18 +25561,36 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             }
                             for (let i = 0; i < removeKeyLst.length; i++) {
                                 let key = removeKeyLst[i];
-                                let indexName = "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
-                                inventoryCollection.dropIndex(indexName);
-                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                {
+                                    let indexName = "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
+                                    inventoryCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
+                                {
+                                    let indexName = "catalogId_1_" + "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
+                                    inventoryCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
                             }
                             for (let i = 0; i < addKeyLst.length; i++) {
                                 let key = addKeyLst[i];
-                                let indexDoc = {};
-                                indexDoc["itemStatistics." + key + ".value"] = -1;
-                                indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
-                                let indexName = "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
-                                inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["itemStatistics." + key + ".value"] = -1;
+                                    indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
+                                    let indexName = "itemStatistics." + key + ".value_-1_itemStatistics." + key + ".tsLastUpdate_1";
+                                    inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["catalogId"] = 1;
+                                    indexDoc["itemStatistics." + key + ".value"] = -1;
+                                    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 });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
                             }
                         }
                         {
@@ -25332,18 +25605,36 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             }
                             for (let i = 0; i < removeKeyAscLst.length; i++) {
                                 let key = removeKeyAscLst[i];
-                                let indexName = "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
-                                inventoryCollection.dropIndex(indexName);
-                                xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                {
+                                    let indexName = "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
+                                    inventoryCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
+                                {
+                                    let indexName = "catalogId_1_" + "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
+                                    inventoryCollection.dropIndex(indexName);
+                                    xDebug_1.Debug.log("[GN] [Database] drop index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
                             }
                             for (let i = 0; i < addKeyAscLst.length; i++) {
                                 let key = addKeyAscLst[i];
-                                let indexDoc = {};
-                                indexDoc["itemStatistics." + key + ".value"] = 1;
-                                indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
-                                let indexName = "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
-                                inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
-                                xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["itemStatistics." + key + ".value"] = 1;
+                                    indexDoc["itemStatistics." + key + ".tsLastUpdate"] = 1;
+                                    let indexName = "itemStatistics." + key + ".value_1_itemStatistics." + key + ".tsLastUpdate_1";
+                                    inventoryCollection.createIndex(indexDoc, { background: true, sparse: true, name: indexName });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
+                                {
+                                    let indexDoc = {};
+                                    indexDoc["catalogId"] = 1;
+                                    indexDoc["itemStatistics." + key + ".value"] = 1;
+                                    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 });
+                                    xDebug_1.Debug.log("[GN] [Database] create new index " + indexName + " at " + inventoryCollection.collectionName);
+                                }
                             }
                         }
                     }
@@ -31128,9 +31419,8 @@ class GetCurrencyLeaderboardRequestHandler extends GamePlayerBaseRequestHandler_
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
-            let playerCurrencySettingsItem = masterPlayerSettings.playerCurrencySettings.find(x => x.key == request.key);
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let playerCurrencySettingsItem = gamePlayerSettings.playerCurrencySettings.find(x => x.key == request.key);
             if (playerCurrencySettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
@@ -31162,6 +31452,7 @@ class GetCurrencyLeaderboardRequestHandler extends GamePlayerBaseRequestHandler_
                 }
             }
             else {
+                let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
                 if (request.skip + request.limit <= 100) {
                     gamePlayerFindOptions = null;
                     gamePlayers = yield this.gnServer.getDatabase().loadGamePlayersLeaderboardWithCurrenciesAsync(request.key, 0, 100, secretInfo.getGameId(), gamePlayerFindOptions);
@@ -31341,11 +31632,11 @@ class GetCurrencyLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerCurrencySettingsItem = masterPlayerSettings.playerCurrencySettings.find(x => x.key == request.keys[i]);
+                    let playerCurrencySettingsItem = gamePlayerSettings.playerCurrencySettings.find(x => x.key == request.keys[i]);
                     if (playerCurrencySettingsItem != null) {
                         keys.push(playerCurrencySettingsItem.key);
                     }
@@ -31750,6 +32041,7 @@ const InfoRequestParam_1 = __webpack_require__(68350);
 const GetFriendStatisticsLeaderboardRequestHandler_1 = __webpack_require__(28199);
 const FriendStatus_1 = __webpack_require__(11259);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetFriendStatisticsLeaderboardAroundPlayerOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -31777,6 +32069,10 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetFriendStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetFriendStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "loadFromCache", void 0);
 class ServerGetFriendStatisticsLeaderboardAroundPlayerOperationRequest extends GetFriendStatisticsLeaderboardAroundPlayerOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -31830,7 +32126,8 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlaye
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -31849,7 +32146,8 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlaye
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -31868,7 +32166,8 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlaye
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -31880,33 +32179,46 @@ class GetFriendStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlaye
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = gamePlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(request.userId, secretInfo.getGameId(), { playerFriends: true, playerStatistics: true });
-            if (gamePlayer == null) {
-                operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.GamePlayerNotFound);
-                return operationResponse;
+            let cacheKey = "gamePlayerStatisticsLeaderboardFriendAround_" + request.userId;
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey)) {
+                    request.loadFromCache = false;
+                }
             }
             let gnResults = new GNData_1.GNArray();
-            let friendIds = [];
-            let allPlayerFriends = gamePlayer.getAllPlayerFriends();
-            for (let i = 0; i < allPlayerFriends.length; i++) {
-                let playerFriendItem = allPlayerFriends[i];
-                if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
-                    friendIds.push(playerFriendItem.friendId);
-                }
-            }
-            let allGamePlayers = yield this.gnServer.getDatabase().loadFriendGamePlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), gamePlayerFindOptions);
-            allGamePlayers.push(gamePlayer);
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let gamePlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
-                ? GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue)
-                : GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue);
+            let gamePlayers;
+            if (request.loadFromCache) {
+                gamePlayers = this.gnServer.getCacheData().getData(cacheKey);
+            }
+            else {
+                let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(request.userId, secretInfo.getGameId(), null);
+                if (gamePlayer == null) {
+                    operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.GamePlayerNotFound);
+                    return operationResponse;
+                }
+                let friendIds = [];
+                let allPlayerFriends = gamePlayer.getAllPlayerFriends();
+                for (let i = 0; i < allPlayerFriends.length; i++) {
+                    let playerFriendItem = allPlayerFriends[i];
+                    if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
+                        friendIds.push(playerFriendItem.friendId);
+                    }
+                }
+                let allGamePlayers = yield this.gnServer.getDatabase().loadFriendGamePlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), null);
+                allGamePlayers.push(gamePlayer);
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                gamePlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
+                    ? GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue)
+                    : GetFriendStatisticsLeaderboardRequestHandler_1.GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue);
+                this.gnServer.getCacheData().setData(cacheKey, gamePlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+            }
+            let gamePlayer = gamePlayers.find(x => x.getUserId() == request.userId);
             let thisPosition = gamePlayers.indexOf(gamePlayer);
             for (let i = request.skip + thisPosition; i < request.skip + thisPosition + request.limit; i++) {
                 if (i >= gamePlayers.length)
@@ -31995,6 +32307,10 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetFriendStatisticsLeaderboardOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetFriendStatisticsLeaderboardOperationRequest.prototype, "loadFromCache", void 0);
 class ServerGetFriendStatisticsLeaderboardOperationRequest extends GetFriendStatisticsLeaderboardOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -32048,7 +32364,8 @@ class GetFriendStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequest
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -32067,7 +32384,8 @@ class GetFriendStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequest
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -32086,7 +32404,8 @@ class GetFriendStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequest
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -32098,35 +32417,45 @@ class GetFriendStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequest
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
-            if (gamePlayerFindOptions != null)
-                gamePlayerFindOptions.playerStatistics = true;
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = gamePlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(request.userId, secretInfo.getGameId(), { playerFriends: true, playerStatistics: true });
-            if (gamePlayer == null) {
-                operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.GamePlayerNotFound);
-                return operationResponse;
+            let cacheKey = "gamePlayerStatisticsLeaderboardFriend_" + request.userId;
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey)) {
+                    request.loadFromCache = false;
+                }
             }
             let gnResults = new GNData_1.GNArray();
-            let friendIds = [];
-            let allPlayerFriends = gamePlayer.getAllPlayerFriends();
-            for (let i = 0; i < allPlayerFriends.length; i++) {
-                let playerFriendItem = allPlayerFriends[i];
-                if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
-                    friendIds.push(playerFriendItem.friendId);
-                }
-            }
-            let allGamePlayers = yield this.gnServer.getDatabase().loadFriendGamePlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), gamePlayerFindOptions);
-            allGamePlayers.push(gamePlayer);
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let gamePlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
-                ? GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue)
-                : GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue);
+            let gamePlayers;
+            if (request.loadFromCache) {
+                gamePlayers = this.gnServer.getCacheData().getData(cacheKey);
+            }
+            else {
+                let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(request.userId, secretInfo.getGameId(), null);
+                if (gamePlayer == null) {
+                    operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.GamePlayerNotFound);
+                    return operationResponse;
+                }
+                let friendIds = [];
+                let allPlayerFriends = gamePlayer.getAllPlayerFriends();
+                for (let i = 0; i < allPlayerFriends.length; i++) {
+                    let playerFriendItem = allPlayerFriends[i];
+                    if (playerFriendItem.status == FriendStatus_1.FriendStatus.Friend) {
+                        friendIds.push(playerFriendItem.friendId);
+                    }
+                }
+                let allGamePlayers = yield this.gnServer.getDatabase().loadFriendGamePlayersLeaderboardWithStatisticsAsync(friendIds, secretInfo.getGameId(), null);
+                allGamePlayers.push(gamePlayer);
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                gamePlayers = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum
+                    ? GetFriendStatisticsLeaderboardRequestHandler.quickSortAsc(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue)
+                    : GetFriendStatisticsLeaderboardRequestHandler.quickSort(request.key, allGamePlayers, playerStatisticsSettingsItem.initialValue);
+                this.gnServer.getCacheData().setData(cacheKey, gamePlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+            }
             for (let i = request.skip; i < request.skip + request.limit; i++) {
                 if (i >= gamePlayers.length)
                     break;
@@ -34971,6 +35300,7 @@ const GNErrorCode_1 = __webpack_require__(94559);
 const GamePlayerBaseRequestHandler_1 = __webpack_require__(67811);
 const InfoRequestParam_1 = __webpack_require__(68350);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetStatisticsLeaderboardAroundPlayerOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -34998,6 +35328,10 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "loadFromCache", void 0);
 class ServerGetStatisticsLeaderboardAroundPlayerOperationRequest extends GetStatisticsLeaderboardAroundPlayerOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -35051,7 +35385,8 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlayerBaseR
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -35070,7 +35405,8 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlayerBaseR
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -35089,7 +35425,8 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlayerBaseR
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -35101,25 +35438,75 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends GamePlayerBaseR
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = gamePlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+            let positionCacheKey = "gamePlayerStatisticsLeaderboardAroundPosition_" + request.userId + "_" + request.key;
+            let cacheKey = "gamePlayerStatisticsLeaderboardAround_" + request.userId + "_" + request.key;
+            if (request.loadFromCache) {
+                if (request.skip + request.limit > 100) {
+                    request.loadFromCache = false;
+                }
+            }
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey) || !this.gnServer.getCacheData().isValid(positionCacheKey)) {
+                    request.loadFromCache = false;
+                }
+            }
             let gnResults = new GNData_1.GNArray();
-            let thisPosition = yield this.gnServer.getDatabase().loadPositionGamePlayerLeaderboardWithStatisticsAsync(request.key, request.userId, secretInfo.getGameId(), playerStatisticsSettingsItem.initialValue, direction);
-            let gamePlayers = yield this.gnServer.getDatabase().loadGamePlayersLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, secretInfo.getGameId(), direction, gamePlayerFindOptions);
-            for (let i = 0; i < gamePlayers.length; i++) {
-                let gamePlayer = gamePlayers[i];
-                let gnResult = new GNData_1.GNHashtable();
-                gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + request.skip + thisPosition);
-                gnResult.add(GNParameterCode_1.GNParameterCode.UserId, gamePlayer.getUserId());
-                gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(gamePlayer, request.infoRequestParam, secretInfo.getGameId()));
-                gnResults.add(gnResult);
+            let thisPosition;
+            let gamePlayers;
+            if (request.loadFromCache) {
+                thisPosition = this.gnServer.getCacheData().getData(positionCacheKey);
+                gamePlayers = this.gnServer.getCacheData().getData(cacheKey);
+                for (let i = request.skip; i < request.skip + request.limit; i++) {
+                    if (i >= gamePlayers.length)
+                        break;
+                    let gamePlayer = gamePlayers[i];
+                    let gnResult = new GNData_1.GNHashtable();
+                    gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                    gnResult.add(GNParameterCode_1.GNParameterCode.UserId, gamePlayer.getUserId());
+                    gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(gamePlayer, request.infoRequestParam, secretInfo.getGameId()));
+                    gnResults.add(gnResult);
+                }
+            }
+            else {
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+                thisPosition = yield this.gnServer.getDatabase().loadPositionGamePlayerLeaderboardWithStatisticsAsync(request.key, request.userId, secretInfo.getGameId(), playerStatisticsSettingsItem.initialValue, direction);
+                if (thisPosition != -1) {
+                    this.gnServer.getCacheData().setData(positionCacheKey, thisPosition, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
+                    if (request.skip + request.limit <= 100) {
+                        gamePlayerFindOptions = null;
+                        gamePlayers = yield this.gnServer.getDatabase().loadGamePlayersLeaderboardWithStatisticsAsync(request.key, thisPosition, 100, secretInfo.getGameId(), direction, gamePlayerFindOptions);
+                        for (let i = request.skip; i < request.skip + request.limit; i++) {
+                            if (i >= gamePlayers.length)
+                                break;
+                            let gamePlayer = gamePlayers[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.UserId, gamePlayer.getUserId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(gamePlayer, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                        this.gnServer.getCacheData().setData(cacheKey, gamePlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    }
+                    else {
+                        gamePlayers = yield this.gnServer.getDatabase().loadGamePlayersLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, secretInfo.getGameId(), direction, gamePlayerFindOptions);
+                        for (let i = 0; i < gamePlayers.length; i++) {
+                            let gamePlayer = gamePlayers[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.UserId, gamePlayer.getUserId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(gamePlayer, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                    }
+                }
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
@@ -35290,9 +35677,8 @@ class GetStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequestHandle
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
-            let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let playerStatisticsSettingsItem = gamePlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
@@ -35309,8 +35695,6 @@ class GetStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequestHandle
                         request.loadFromCache = false;
                     }
                 }
-                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let gnResults = new GNData_1.GNArray();
                 let gamePlayers;
                 if (request.loadFromCache) {
@@ -35327,6 +35711,9 @@ class GetStatisticsLeaderboardRequestHandler extends GamePlayerBaseRequestHandle
                     }
                 }
                 else {
+                    let gamePlayerFindOptions = this.convertToGamePlayerFindOptions(request.infoRequestParam);
+                    let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                    let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     if (request.skip + request.limit <= 100) {
                         gamePlayerFindOptions = null;
                         gamePlayers = yield this.gnServer.getDatabase().loadGamePlayersLeaderboardWithStatisticsAsync(request.key, 0, 100, secretInfo.getGameId(), direction, gamePlayerFindOptions);
@@ -35543,11 +35930,11 @@ class GetStatisticsLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
+            let gamePlayerSettings = this.gnServer.getGNSettings().getGamePlayerSettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.keys[i]);
+                    let playerStatisticsSettingsItem = gamePlayerSettings.playerStatisticsSettings.find(x => x.key == request.keys[i]);
                     if (playerStatisticsSettingsItem != null) {
                         keys.push(playerStatisticsSettingsItem.key);
                     }
@@ -36586,7 +36973,7 @@ __decorate([
     __metadata("design:type", String)
 ], GrantPlayerItemOperationRequest.prototype, "displayName", void 0);
 __decorate([
-    (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Amount, defaultValue: 1, isOptional: true }),
+    (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Amount, defaultValue: 1, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GrantPlayerItemOperationRequest.prototype, "amount", void 0);
 class ServerGrantPlayerItemOperationRequest extends GrantPlayerItemOperationRequest {
@@ -36709,7 +37096,7 @@ class GrantPlayerItemRequestHandler extends GamePlayerBaseRequestHandler_1.GameP
                 return operationResponse;
             }
             let amount = request.amount;
-            if (playerItemCatalogSettingsItem.itemType == ItemType_1.ItemType.NonConsumable) {
+            if (playerItemCatalogSettingsItem.itemType == ItemType_1.ItemType.NonStackable) {
                 amount = 1;
             }
             let itemId = StringUtility_1.StringUtility.generateRandomString(12, this.gnServer.getIdTypeCase());
@@ -41252,11 +41639,11 @@ class GetCurrencyLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
+            let groupSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerCurrencySettingsItem = masterPlayerSettings.groupCurrencySettings.find(x => x.key == request.keys[i]);
+                    let playerCurrencySettingsItem = groupSettings.groupCurrencySettings.find(x => x.key == request.keys[i]);
                     if (playerCurrencySettingsItem != null) {
                         keys.push(playerCurrencySettingsItem.key);
                     }
@@ -43503,6 +43890,7 @@ const GNErrorCode_1 = __webpack_require__(94559);
 const GroupBaseRequestHandler_1 = __webpack_require__(93655);
 const InfoRequestParam_1 = __webpack_require__(23228);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetStatisticsLeaderboardAroundGroupOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -43530,6 +43918,14 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetStatisticsLeaderboardAroundGroupOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetStatisticsLeaderboardAroundGroupOperationRequest.prototype, "loadFromCache", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetStatisticsLeaderboardAroundGroupOperationRequest.prototype, "catalogId", void 0);
 class ServerGetStatisticsLeaderboardAroundGroupOperationRequest extends GetStatisticsLeaderboardAroundGroupOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -43567,7 +43963,9 @@ class GetStatisticsLeaderboardAroundGroupRequestHandler extends GroupBaseRequest
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -43586,7 +43984,9 @@ class GetStatisticsLeaderboardAroundGroupRequestHandler extends GroupBaseRequest
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -43605,7 +44005,9 @@ class GetStatisticsLeaderboardAroundGroupRequestHandler extends GroupBaseRequest
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -43617,25 +44019,79 @@ class GetStatisticsLeaderboardAroundGroupRequestHandler extends GroupBaseRequest
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let groupFindOptions = this.convertToGroupFindOptions(request.infoRequestParam);
-            let masterGroupSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
-            let groupStatisticsSettingsItem = masterGroupSettings.groupStatisticsSettings.find(x => x.key == request.key);
+            let groupSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
+            let groupStatisticsSettingsItem = groupSettings.groupStatisticsSettings.find(x => x.key == request.key);
             if (groupStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
+            let positionCacheKey = "groupStatisticsLeaderboardAroundPosition_" + request.groupId + "_" + request.key;
+            let cacheKey = "groupStatisticsLeaderboardAround_" + request.groupId + "_" + request.key;
+            if (request.catalogId) {
+                cacheKey += "_" + request.catalogId;
+                positionCacheKey += "_" + request.catalogId;
+            }
+            if (request.loadFromCache) {
+                if (request.skip + request.limit > 100) {
+                    request.loadFromCache = false;
+                }
+            }
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey) || !this.gnServer.getCacheData().isValid(positionCacheKey)) {
+                    request.loadFromCache = false;
+                }
+            }
             let gnResults = new GNData_1.GNArray();
-            let statisticsAggregationMethod = groupStatisticsSettingsItem.statisticsAggregationMethod;
-            let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
-            let thisPosition = yield this.gnServer.getDatabase().loadPositionGroupLeaderboardWithStatisticsAsync(request.key, request.groupId, secretInfo.getGameId(), groupStatisticsSettingsItem.initialValue, direction);
-            let groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, secretInfo.getGameId(), direction, groupFindOptions);
-            for (let i = 0; i < groups.length; i++) {
-                let group = groups[i];
-                let gnResult = new GNData_1.GNHashtable();
-                gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
-                gnResult.add(GNParameterCode_1.GNParameterCode.GroupId, group.getGroupId());
-                gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(group, request.infoRequestParam, secretInfo.getGameId()));
-                gnResults.add(gnResult);
+            let thisPosition;
+            let groups;
+            if (request.loadFromCache) {
+                thisPosition = this.gnServer.getCacheData().getData(positionCacheKey);
+                groups = this.gnServer.getCacheData().getData(cacheKey);
+                for (let i = request.skip; i < request.skip + request.limit; i++) {
+                    if (i >= groups.length)
+                        break;
+                    let group = groups[i];
+                    let gnResult = new GNData_1.GNHashtable();
+                    gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                    gnResult.add(GNParameterCode_1.GNParameterCode.GroupId, group.getGroupId());
+                    gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(group, request.infoRequestParam, secretInfo.getGameId()));
+                    gnResults.add(gnResult);
+                }
+            }
+            else {
+                let statisticsAggregationMethod = groupStatisticsSettingsItem.statisticsAggregationMethod;
+                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+                thisPosition = yield this.gnServer.getDatabase().loadPositionGroupLeaderboardWithStatisticsAsync(request.key, request.groupId, request.catalogId, secretInfo.getGameId(), groupStatisticsSettingsItem.initialValue, direction);
+                if (thisPosition != -1) {
+                    this.gnServer.getCacheData().setData(positionCacheKey, thisPosition, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    let groupFindOptions = this.convertToGroupFindOptions(request.infoRequestParam);
+                    if (request.skip + request.limit <= 100) {
+                        groupFindOptions = null;
+                        groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, thisPosition, 100, request.catalogId, secretInfo.getGameId(), direction, groupFindOptions);
+                        for (let i = request.skip; i < request.skip + request.limit; i++) {
+                            if (i >= groups.length)
+                                break;
+                            let group = groups[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.GroupId, group.getGroupId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(group, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                        this.gnServer.getCacheData().setData(cacheKey, groups, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    }
+                    else {
+                        groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, groupFindOptions);
+                        for (let i = 0; i < groups.length; i++) {
+                            let group = groups[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.GroupId, group.getGroupId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(group, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                    }
+                }
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
@@ -43717,6 +44173,10 @@ __decorate([
     (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.Version, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
     __metadata("design:type", String)
 ], GetStatisticsLeaderboardOperationRequest.prototype, "version", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetStatisticsLeaderboardOperationRequest.prototype, "catalogId", void 0);
 class ServerGetStatisticsLeaderboardOperationRequest extends GetStatisticsLeaderboardOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -43755,6 +44215,7 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -43775,6 +44236,7 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -43795,6 +44257,7 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -43806,15 +44269,16 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let groupFindOptions = this.convertToGroupFindOptions(request.infoRequestParam);
-            let masterGroupSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
-            let groupStatisticsSettingsItem = masterGroupSettings.groupStatisticsSettings.find(x => x.key == request.key);
+            let groupSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
+            let groupStatisticsSettingsItem = groupSettings.groupStatisticsSettings.find(x => x.key == request.key);
             if (groupStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
             if (!request.version) {
                 let cacheKey = "groupStatisticsLeaderboard_" + request.key;
+                if (request.catalogId)
+                    cacheKey += "_" + request.catalogId;
                 if (request.loadFromCache) {
                     if (request.skip + request.limit > 100) {
                         request.loadFromCache = false;
@@ -43825,8 +44289,6 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
                         request.loadFromCache = false;
                     }
                 }
-                let statisticsAggregationMethod = groupStatisticsSettingsItem.statisticsAggregationMethod;
-                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let gnResults = new GNData_1.GNArray();
                 let groups;
                 if (request.loadFromCache) {
@@ -43843,9 +44305,12 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
                     }
                 }
                 else {
+                    let groupFindOptions = this.convertToGroupFindOptions(request.infoRequestParam);
+                    let statisticsAggregationMethod = groupStatisticsSettingsItem.statisticsAggregationMethod;
+                    let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     if (request.skip + request.limit <= 100) {
                         groupFindOptions = null;
-                        groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, 0, 100, secretInfo.getGameId(), direction, groupFindOptions);
+                        groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, 0, 100, request.catalogId, secretInfo.getGameId(), direction, groupFindOptions);
                         for (let i = request.skip; i < request.skip + request.limit; i++) {
                             if (i >= groups.length)
                                 break;
@@ -43859,7 +44324,7 @@ class GetStatisticsLeaderboardRequestHandler extends GroupBaseRequestHandler_1.G
                         this.gnServer.getCacheData().setData(cacheKey, groups, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
                     }
                     else {
-                        groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, request.skip, request.limit, secretInfo.getGameId(), direction, groupFindOptions);
+                        groups = yield this.gnServer.getDatabase().loadGroupsLeaderboardWithStatisticsAsync(request.key, request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, groupFindOptions);
                         for (let i = 0; i < groups.length; i++) {
                             let group = groups[i];
                             let gnResult = new GNData_1.GNHashtable();
@@ -44059,11 +44524,11 @@ class GetStatisticsLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
+            let groupSettings = this.gnServer.getGNSettings().getGroupSettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerStatisticsSettingsItem = masterPlayerSettings.groupStatisticsSettings.find(x => x.key == request.keys[i]);
+                    let playerStatisticsSettingsItem = groupSettings.groupStatisticsSettings.find(x => x.key == request.keys[i]);
                     if (playerStatisticsSettingsItem != null) {
                         keys.push(playerStatisticsSettingsItem.key);
                     }
@@ -44461,7 +44926,7 @@ __decorate([
     __metadata("design:type", String)
 ], GrantGroupItemOperationRequest.prototype, "displayName", void 0);
 __decorate([
-    (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Amount, defaultValue: 1, isOptional: true }),
+    (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Amount, defaultValue: 1, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GrantGroupItemOperationRequest.prototype, "amount", void 0);
 class ServerGrantGroupItemOperationRequest extends GrantGroupItemOperationRequest {
@@ -44568,7 +45033,7 @@ class GrantGroupItemRequestHandler extends GroupBaseRequestHandler_1.GroupBaseRe
                 return operationResponse;
             }
             let amount = request.amount;
-            if (groupItemCatalogSettingsItem.itemType == ItemType_1.ItemType.NonConsumable) {
+            if (groupItemCatalogSettingsItem.itemType == ItemType_1.ItemType.NonStackable) {
                 amount = 1;
             }
             let itemId = StringUtility_1.StringUtility.generateRandomString(12, this.gnServer.getIdTypeCase());
@@ -50505,6 +50970,7 @@ const GNErrorCode_1 = __webpack_require__(94559);
 const ItemBaseRequestHandler_1 = __webpack_require__(72916);
 const InfoRequestParam_1 = __webpack_require__(55389);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetStatisticsLeaderboardAroundItemOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -50532,6 +50998,14 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetStatisticsLeaderboardAroundItemOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetStatisticsLeaderboardAroundItemOperationRequest.prototype, "loadFromCache", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetStatisticsLeaderboardAroundItemOperationRequest.prototype, "catalogId", void 0);
 class ServerGetStatisticsLeaderboardAroundItemOperationRequest extends GetStatisticsLeaderboardAroundItemOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -50569,7 +51043,9 @@ class GetStatisticsLeaderboardAroundItemRequestHandler extends ItemBaseRequestHa
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -50588,7 +51064,9 @@ class GetStatisticsLeaderboardAroundItemRequestHandler extends ItemBaseRequestHa
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -50607,7 +51085,9 @@ class GetStatisticsLeaderboardAroundItemRequestHandler extends ItemBaseRequestHa
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -50619,25 +51099,79 @@ class GetStatisticsLeaderboardAroundItemRequestHandler extends ItemBaseRequestHa
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let inventoryFindOptions = this.convertToInventoryFindOptions(request.infoRequestParam);
-            let masterItemSettings = this.gnServer.getGNSettings().getInventorySettings(secretInfo.getGameId());
-            let inventoryStatisticsSettingsItem = masterItemSettings.inventoryStatisticsSettings.find(x => x.key == request.key);
+            let inventorySettings = this.gnServer.getGNSettings().getInventorySettings(secretInfo.getGameId());
+            let inventoryStatisticsSettingsItem = inventorySettings.inventoryStatisticsSettings.find(x => x.key == request.key);
             if (inventoryStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
+            let positionCacheKey = "inventoryStatisticsLeaderboardAroundPosition_" + request.itemId + "_" + request.key;
+            let cacheKey = "inventoryStatisticsLeaderboardAround_" + request.itemId + "_" + request.key;
+            if (request.catalogId) {
+                cacheKey += "_" + request.catalogId;
+                positionCacheKey += "_" + request.catalogId;
+            }
+            if (request.loadFromCache) {
+                if (request.skip + request.limit > 100) {
+                    request.loadFromCache = false;
+                }
+            }
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey) || !this.gnServer.getCacheData().isValid(positionCacheKey)) {
+                    request.loadFromCache = false;
+                }
+            }
             let gnResults = new GNData_1.GNArray();
-            let statisticsAggregationMethod = inventoryStatisticsSettingsItem.statisticsAggregationMethod;
-            let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
-            let thisPosition = yield this.gnServer.getDatabase().loadPositionInventoryLeaderboardWithStatisticsAsync(request.key, request.itemId, secretInfo.getGameId(), inventoryStatisticsSettingsItem.initialValue, direction);
-            let inventorys = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, secretInfo.getGameId(), direction, inventoryFindOptions);
-            for (let i = 0; i < inventorys.length; i++) {
-                let inventory = inventorys[i];
-                let gnResult = new GNData_1.GNHashtable();
-                gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
-                gnResult.add(GNParameterCode_1.GNParameterCode.ItemId, inventory.getItemId());
-                gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(inventory, request.infoRequestParam, secretInfo.getGameId()));
-                gnResults.add(gnResult);
+            let thisPosition;
+            let inventories;
+            if (request.loadFromCache) {
+                thisPosition = this.gnServer.getCacheData().getData(positionCacheKey);
+                inventories = this.gnServer.getCacheData().getData(cacheKey);
+                for (let i = request.skip; i < request.skip + request.limit; i++) {
+                    if (i >= inventories.length)
+                        break;
+                    let inventory = inventories[i];
+                    let gnResult = new GNData_1.GNHashtable();
+                    gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                    gnResult.add(GNParameterCode_1.GNParameterCode.ItemId, inventory.getItemId());
+                    gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(inventory, request.infoRequestParam, secretInfo.getGameId()));
+                    gnResults.add(gnResult);
+                }
+            }
+            else {
+                let statisticsAggregationMethod = inventoryStatisticsSettingsItem.statisticsAggregationMethod;
+                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+                thisPosition = yield this.gnServer.getDatabase().loadPositionInventoryLeaderboardWithStatisticsAsync(request.key, request.itemId, request.catalogId, secretInfo.getGameId(), inventoryStatisticsSettingsItem.initialValue, direction);
+                if (thisPosition != -1) {
+                    this.gnServer.getCacheData().setData(positionCacheKey, thisPosition, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    let inventoryFindOptions = this.convertToInventoryFindOptions(request.infoRequestParam);
+                    if (request.skip + request.limit <= 100) {
+                        inventoryFindOptions = null;
+                        inventories = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, inventoryFindOptions);
+                        for (let i = request.skip; i < request.skip + request.limit; i++) {
+                            if (i >= inventories.length)
+                                break;
+                            let inventory = inventories[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.ItemId, inventory.getItemId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(inventory, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                        this.gnServer.getCacheData().setData(cacheKey, inventories, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    }
+                    else {
+                        inventories = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, inventoryFindOptions);
+                        for (let i = 0; i < inventories.length; i++) {
+                            let inventory = inventories[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.ItemId, inventory.getItemId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(inventory, request.infoRequestParam, secretInfo.getGameId()));
+                            gnResults.add(gnResult);
+                        }
+                    }
+                }
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
@@ -50719,6 +51253,10 @@ __decorate([
     (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.Version, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
     __metadata("design:type", String)
 ], GetStatisticsLeaderboardOperationRequest.prototype, "version", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.CatalogId, minLength: 2, maxLength: 32, mustNonNull: true, isOptional: true }),
+    __metadata("design:type", String)
+], GetStatisticsLeaderboardOperationRequest.prototype, "catalogId", void 0);
 class ServerGetStatisticsLeaderboardOperationRequest extends GetStatisticsLeaderboardOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -50757,6 +51295,7 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -50777,6 +51316,7 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -50797,6 +51337,7 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
                 infoRequestParam: request.infoRequestParam,
                 loadFromCache: request.loadFromCache,
                 version: request.version,
+                catalogId: request.catalogId,
             }, secretInfo, operationRequest);
         });
     }
@@ -50808,15 +51349,16 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let inventoryFindOptions = this.convertToInventoryFindOptions(request.infoRequestParam);
-            let masterItemSettings = this.gnServer.getGNSettings().getInventorySettings(secretInfo.getGameId());
-            let inventoryStatisticsSettingsItem = masterItemSettings.inventoryStatisticsSettings.find(x => x.key == request.key);
+            let inventorySettings = this.gnServer.getGNSettings().getInventorySettings(secretInfo.getGameId());
+            let inventoryStatisticsSettingsItem = inventorySettings.inventoryStatisticsSettings.find(x => x.key == request.key);
             if (inventoryStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
             if (!request.version) {
                 let cacheKey = "inventoryStatisticsLeaderboard_" + request.key;
+                if (request.catalogId)
+                    cacheKey += "_" + request.catalogId;
                 if (request.loadFromCache) {
                     if (request.skip + request.limit > 100) {
                         request.loadFromCache = false;
@@ -50827,8 +51369,6 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
                         request.loadFromCache = false;
                     }
                 }
-                let statisticsAggregationMethod = inventoryStatisticsSettingsItem.statisticsAggregationMethod;
-                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let gnResults = new GNData_1.GNArray();
                 let inventorys;
                 if (request.loadFromCache) {
@@ -50845,9 +51385,12 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
                     }
                 }
                 else {
+                    let inventoryFindOptions = this.convertToInventoryFindOptions(request.infoRequestParam);
+                    let statisticsAggregationMethod = inventoryStatisticsSettingsItem.statisticsAggregationMethod;
+                    let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     if (request.skip + request.limit <= 100) {
                         inventoryFindOptions = null;
-                        inventorys = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, 0, 100, secretInfo.getGameId(), direction, inventoryFindOptions);
+                        inventorys = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, 0, 100, request.catalogId, secretInfo.getGameId(), direction, inventoryFindOptions);
                         for (let i = request.skip; i < request.skip + request.limit; i++) {
                             if (i >= inventorys.length)
                                 break;
@@ -50861,7 +51404,7 @@ class GetStatisticsLeaderboardRequestHandler extends ItemBaseRequestHandler_1.It
                         this.gnServer.getCacheData().setData(cacheKey, inventorys, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
                     }
                     else {
-                        inventorys = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, request.skip, request.limit, secretInfo.getGameId(), direction, inventoryFindOptions);
+                        inventorys = yield this.gnServer.getDatabase().loadInventoriesLeaderboardWithStatisticsAsync(request.key, request.skip, request.limit, request.catalogId, secretInfo.getGameId(), direction, inventoryFindOptions);
                         for (let i = 0; i < inventorys.length; i++) {
                             let inventory = inventorys[i];
                             let gnResult = new GNData_1.GNHashtable();
@@ -51061,11 +51604,11 @@ class GetStatisticsLogRequestHandler extends RequestHandler_1.RequestHandler {
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerSettings = this.gnServer.getGNSettings().getInventorySettings(secretInfo.getGameId());
+            let inventorySettings = this.gnServer.getGNSettings().getInventorySettings(secretInfo.getGameId());
             let keys = [];
             if (request.keys) {
                 for (let i = 0; i < request.keys.length; i++) {
-                    let playerStatisticsSettingsItem = masterPlayerSettings.inventoryStatisticsSettings.find(x => x.key == request.keys[i]);
+                    let playerStatisticsSettingsItem = inventorySettings.inventoryStatisticsSettings.find(x => x.key == request.keys[i]);
                     if (playerStatisticsSettingsItem != null) {
                         keys.push(playerStatisticsSettingsItem.key);
                     }
@@ -52268,8 +52811,8 @@ class SetAmountRequestHandler extends ItemBaseRequestHandler_1.ItemBaseRequestHa
                 return operationResponse;
             }
             let itemType = inventory.getItemType();
-            if (itemType == ItemType_1.ItemType.NonConsumable) {
-                operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.ItemNotConsumable);
+            if (itemType == ItemType_1.ItemType.NonStackable) {
+                operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.ItemNotStackable);
                 return operationResponse;
             }
             inventory.setAmount(inventory.getAmount() + request.amount);
@@ -55125,7 +55668,6 @@ class GetCurrencyLeaderboardRequestHandler extends MasterPlayerBaseRequestHandle
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
             let masterPlayerSettings = this.gnServer.getGNSettings().getMasterPlayerSettings();
             let playerCurrencySettingsItem = masterPlayerSettings.playerCurrencySettings.find(x => x.key == request.key);
             if (playerCurrencySettingsItem == null) {
@@ -55159,6 +55701,7 @@ class GetCurrencyLeaderboardRequestHandler extends MasterPlayerBaseRequestHandle
                 }
             }
             else {
+                let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
                 if (request.skip + request.limit <= 100) {
                     masterPlayerFindOptions = null;
                     masterPlayers = yield this.gnServer.getDatabase().loadMasterPlayersLeaderboardWithCurrenciesAsync(request.key, 0, 100, masterPlayerFindOptions);
@@ -58955,6 +59498,7 @@ const GNErrorCode_1 = __webpack_require__(94559);
 const MasterPlayerBaseRequestHandler_1 = __webpack_require__(28575);
 const InfoRequestParam_1 = __webpack_require__(17818);
 const xStatisticsAggregationMethod_1 = __webpack_require__(21554);
+const xDatetime_1 = __webpack_require__(21817);
 class GetStatisticsLeaderboardAroundPlayerOperationRequest extends OperationRequest_1.OperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -58982,6 +59526,10 @@ __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Limit, defaultValue: 10, minValue: 1, maxValue: 100, mustInt: true, isOptional: true }),
     __metadata("design:type", Number)
 ], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "limit", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.LoadFromCache, defaultValue: true, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetStatisticsLeaderboardAroundPlayerOperationRequest.prototype, "loadFromCache", void 0);
 class ServerGetStatisticsLeaderboardAroundPlayerOperationRequest extends GetStatisticsLeaderboardAroundPlayerOperationRequest {
     isValidRequest() {
         if (!super.isValidRequest())
@@ -59035,7 +59583,8 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends MasterPlayerBas
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -59054,7 +59603,8 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends MasterPlayerBas
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -59073,7 +59623,8 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends MasterPlayerBas
                 key: request.key,
                 skip: request.skip,
                 limit: request.limit,
-                infoRequestParam: request.infoRequestParam
+                infoRequestParam: request.infoRequestParam,
+                loadFromCache: request.loadFromCache,
             }, secretInfo, operationRequest);
         });
     }
@@ -59085,25 +59636,75 @@ class GetStatisticsLeaderboardAroundPlayerRequestHandler extends MasterPlayerBas
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
             let masterPlayerSettings = this.gnServer.getGNSettings().getMasterPlayerSettings();
             let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.KeyNotFound);
                 return operationResponse;
             }
-            let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-            let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+            let positionCacheKey = "masterPlayerStatisticsLeaderboardAroundPosition_" + request.userId + "_" + request.key;
+            let cacheKey = "masterPlayerStatisticsLeaderboardAround_" + request.userId + "_" + request.key;
+            if (request.loadFromCache) {
+                if (request.skip + request.limit > 100) {
+                    request.loadFromCache = false;
+                }
+            }
+            if (request.loadFromCache) {
+                if (!this.gnServer.getCacheData().isValid(cacheKey) || !this.gnServer.getCacheData().isValid(positionCacheKey)) {
+                    request.loadFromCache = false;
+                }
+            }
             let gnResults = new GNData_1.GNArray();
-            let thisPosition = yield this.gnServer.getDatabase().loadPositionMasterPlayerLeaderboardWithStatisticsAsync(request.key, request.userId, playerStatisticsSettingsItem.initialValue, direction);
-            let masterPlayers = yield this.gnServer.getDatabase().loadMasterPlayersLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, direction, masterPlayerFindOptions);
-            for (let i = 0; i < masterPlayers.length; i++) {
-                let masterPlayer = masterPlayers[i];
-                let gnResult = new GNData_1.GNHashtable();
-                gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
-                gnResult.add(GNParameterCode_1.GNParameterCode.UserId, masterPlayer.getUserId());
-                gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(masterPlayer, request.infoRequestParam));
-                gnResults.add(gnResult);
+            let thisPosition;
+            let masterPlayers;
+            if (request.loadFromCache) {
+                thisPosition = this.gnServer.getCacheData().getData(positionCacheKey);
+                masterPlayers = this.gnServer.getCacheData().getData(cacheKey);
+                for (let i = request.skip; i < request.skip + request.limit; i++) {
+                    if (i >= masterPlayers.length)
+                        break;
+                    let masterPlayer = masterPlayers[i];
+                    let gnResult = new GNData_1.GNHashtable();
+                    gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                    gnResult.add(GNParameterCode_1.GNParameterCode.UserId, masterPlayer.getUserId());
+                    gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(masterPlayer, request.infoRequestParam));
+                    gnResults.add(gnResult);
+                }
+            }
+            else {
+                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
+                thisPosition = yield this.gnServer.getDatabase().loadPositionMasterPlayerLeaderboardWithStatisticsAsync(request.key, request.userId, playerStatisticsSettingsItem.initialValue, direction);
+                if (thisPosition != -1) {
+                    this.gnServer.getCacheData().setData(positionCacheKey, thisPosition, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
+                    if (request.skip + request.limit <= 100) {
+                        masterPlayerFindOptions = null;
+                        masterPlayers = yield this.gnServer.getDatabase().loadMasterPlayersLeaderboardWithStatisticsAsync(request.key, thisPosition, 100, direction, masterPlayerFindOptions);
+                        for (let i = request.skip; i < request.skip + request.limit; i++) {
+                            if (i >= masterPlayers.length)
+                                break;
+                            let masterPlayer = masterPlayers[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.UserId, masterPlayer.getUserId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(masterPlayer, request.infoRequestParam));
+                            gnResults.add(gnResult);
+                        }
+                        this.gnServer.getCacheData().setData(cacheKey, masterPlayers, xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND * 5);
+                    }
+                    else {
+                        masterPlayers = yield this.gnServer.getDatabase().loadMasterPlayersLeaderboardWithStatisticsAsync(request.key, thisPosition + request.skip, request.limit, direction, masterPlayerFindOptions);
+                        for (let i = 0; i < masterPlayers.length; i++) {
+                            let masterPlayer = masterPlayers[i];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Position, i + thisPosition + request.skip);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.UserId, masterPlayer.getUserId());
+                            gnResult.add(GNParameterCode_1.GNParameterCode.InfoResponseParameters, this.generateInfoResponseParameters(masterPlayer, request.infoRequestParam));
+                            gnResults.add(gnResult);
+                        }
+                    }
+                }
             }
             operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Results, gnResults);
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
@@ -59274,7 +59875,6 @@ class GetStatisticsLeaderboardRequestHandler extends MasterPlayerBaseRequestHand
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
-            let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
             let masterPlayerSettings = this.gnServer.getGNSettings().getMasterPlayerSettings();
             let playerStatisticsSettingsItem = masterPlayerSettings.playerStatisticsSettings.find(x => x.key == request.key);
             if (playerStatisticsSettingsItem == null) {
@@ -59293,8 +59893,6 @@ class GetStatisticsLeaderboardRequestHandler extends MasterPlayerBaseRequestHand
                         request.loadFromCache = false;
                     }
                 }
-                let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
-                let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                 let gnResults = new GNData_1.GNArray();
                 let masterPlayers;
                 if (request.loadFromCache) {
@@ -59311,6 +59909,9 @@ class GetStatisticsLeaderboardRequestHandler extends MasterPlayerBaseRequestHand
                     }
                 }
                 else {
+                    let masterPlayerFindOptions = this.convertToMasterPlayerFindOptions(request.infoRequestParam);
+                    let statisticsAggregationMethod = playerStatisticsSettingsItem.statisticsAggregationMethod;
+                    let direction = statisticsAggregationMethod == xStatisticsAggregationMethod_1.xStatisticsAggregationMethod.Minimum ? 1 : -1;
                     if (request.skip + request.limit <= 100) {
                         masterPlayerFindOptions = null;
                         masterPlayers = yield this.gnServer.getDatabase().loadMasterPlayersLeaderboardWithStatisticsAsync(request.key, 0, 100, direction, masterPlayerFindOptions);
@@ -76980,6 +77581,8 @@ class AnalyticsService {
                     operationSystem: this.currentOperationSystem,
                     requestComplete: this.currentRequestComplete,
                     databaseSystem: this.currentDatabaseSystem,
+                    cost: this.currentCost,
+                    monthlyCost: this.currentMonthlyCost,
                 };
             }
             else {
@@ -77005,6 +77608,8 @@ class AnalyticsService {
                         operationSystem: null,
                         requestComplete: null,
                         databaseSystem: null,
+                        cost: null,
+                        monthlyCost: null,
                     };
                 }
                 else {
@@ -77027,6 +77632,8 @@ class AnalyticsService {
                         operationSystem: result["operationSystem"],
                         requestComplete: result["requestComplete"],
                         databaseSystem: result["databaseSystem"],
+                        cost: result["cost"],
+                        monthlyCost: result["monthlyCost"],
                     };
                 }
             }
@@ -77053,6 +77660,7 @@ class AnalyticsService {
     }
     getAnalytics() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let currentMilliseconds = xDatetime_1.xDatetime.getCurrentMilliseconds();
             let millisecondsSince0h = xDatetime_1.xDatetime.getToday0hMilliseconds();
             let playerCollection = this.gnServer.getDatabase().systemCollection("MasterPlayer");
@@ -77224,41 +77832,41 @@ class AnalyticsService {
                     storageUsage: storageUsage
                 };
             }
-            {
-                let eventCallbackPostCollection = this.gnServer.getDatabase().systemCollection("EventCallback.Post");
-                let results = yield eventCallbackPostCollection.aggregate([
-                    {
-                        $match: {
-                            _id: { $gt: mongoDB.ObjectId.createFromTime(millisecondsAt15MinutesAgo / 1000 - 1) }
-                        }
-                    },
-                    {
-                        $group: {
-                            _id: { eventName: "$eventName", E: "$operationResponse.parameters.E" },
-                            count: { $sum: 1 } // Đếm số lần xuất hiện
-                        }
-                    },
-                    {
-                        $group: {
-                            _id: "$_id.eventName",
-                            results: {
-                                $push: {
-                                    errorCode: "$_id.E",
-                                    count: "$count"
-                                }
-                            }
-                        }
-                    }
-                ]);
-                this.currentRequestComplete = [];
-                while (yield results.hasNext()) {
-                    let result = yield results.next();
-                    this.currentRequestComplete.push({
-                        eventName: result["_id"],
-                        results: result.results,
-                    });
-                }
-            }
+            // {
+            //     let eventCallbackPostCollection = this.gnServer.getDatabase().systemCollection("EventCallback.Post");
+            //     let results = await eventCallbackPostCollection.aggregate([
+            //         {
+            //             $match: {
+            //                 _id: { $gt: mongoDB.ObjectId.createFromTime(millisecondsAt15MinutesAgo / 1000 - 1) }
+            //             }
+            //         },
+            //         {
+            //             $group: {
+            //                 _id: { eventName: "$eventName", E: "$operationResponse.parameters.E" },
+            //                 count: { $sum: 1 } // Đếm số lần xuất hiện
+            //             }
+            //         },
+            //         {
+            //             $group: {
+            //                 _id: "$_id.eventName",
+            //                 results: {
+            //                     $push: {
+            //                         errorCode: "$_id.E",
+            //                         count: "$count"
+            //                     }
+            //                 }
+            //             }
+            //         }
+            //     ]);
+            //     this.currentRequestComplete = [];
+            //     while (await results.hasNext()) {
+            //         let result = await results.next();
+            //         this.currentRequestComplete.push({
+            //             eventName: result["_id"],
+            //             results: result.results,
+            //         });
+            //     }
+            // }
             {
                 let stats = yield this.gnServer.getDatabase().getDb().stats();
                 if (stats.ok == 1) {
@@ -77272,6 +77880,101 @@ class AnalyticsService {
                     };
                 }
             }
+            {
+                let eventCallbackPostCollection = this.gnServer.getDatabase().systemCollection("EventCallback.Post");
+                let now = xDatetime_1.xDatetime.getCurrentDate();
+                let month0h = new Date(now.getFullYear(), now.getMonth(), 1);
+                let results = yield eventCallbackPostCollection.find({ _id: { $gt: mongoDB.ObjectId.createFromTime(month0h.getTime() / 1000 - 1) } });
+                this.currentCost = {
+                    requestCount: 0,
+                    matchmakingRequestCount: 0,
+                    cloudScriptGBs: 0,
+                    storageSizeInBytes: (_b = (_a = this.currentDatabaseSystem) === null || _a === void 0 ? void 0 : _a.totalSizeInBytes) !== null && _b !== void 0 ? _b : 0,
+                    dataTransferSizeInBytes: 0,
+                };
+                this.currentMonthlyCost = {
+                    requestCount: 0,
+                    matchmakingRequestCount: 0,
+                    cloudScriptGBs: 0,
+                    storageSizeInBytes: (_d = (_c = this.currentDatabaseSystem) === null || _c === void 0 ? void 0 : _c.totalSizeInBytes) !== null && _d !== void 0 ? _d : 0,
+                    dataTransferSizeInBytes: 0,
+                };
+                this.currentRequestComplete = [];
+                while (yield results.hasNext()) {
+                    let result = yield results.next();
+                    let tsCreate = result["tsCreate"];
+                    let eventName = result["eventName"];
+                    let operationResponse = result["operationResponse"];
+                    if (tsCreate > millisecondsAt15MinutesAgo) {
+                        let thisCurrentRequestComplete = this.currentRequestComplete.find(x => x.eventName == eventName);
+                        if (thisCurrentRequestComplete == null) {
+                            thisCurrentRequestComplete = {
+                                eventName: eventName,
+                                results: [],
+                            };
+                            this.currentRequestComplete.push(thisCurrentRequestComplete);
+                        }
+                        let errorCode = (_e = operationResponse === null || operationResponse === void 0 ? void 0 : operationResponse.parameters) === null || _e === void 0 ? void 0 : _e.E;
+                        if (errorCode) {
+                            let thisCurrentRequestCompleteErrorCode = thisCurrentRequestComplete.results.find(x => x.errorCode == errorCode);
+                            if (thisCurrentRequestCompleteErrorCode == null) {
+                                thisCurrentRequestCompleteErrorCode = {
+                                    errorCode: errorCode,
+                                    count: 0,
+                                };
+                                thisCurrentRequestComplete.results.push(thisCurrentRequestCompleteErrorCode);
+                            }
+                            thisCurrentRequestCompleteErrorCode.count += 1;
+                        }
+                        if (!eventName.startsWith("dashboard_")) {
+                            if (!eventName.startWith("system_")) {
+                                this.currentCost.requestCount += 1;
+                                this.currentMonthlyCost.requestCount += 1;
+                                if (eventName.startWith("multiplayer_")) {
+                                    this.currentCost.matchmakingRequestCount += 1;
+                                    this.currentMonthlyCost.matchmakingRequestCount += 1;
+                                }
+                                else if (eventName.startWith("cloudScript_")) {
+                                    let parameters = operationResponse === null || operationResponse === void 0 ? void 0 : operationResponse.parameters;
+                                    if (parameters) {
+                                        let executionTimeInMs = parameters.executionTimeInMs;
+                                        let memoryUsedInBytes = parameters.memoryUsedInBytes;
+                                        if (executionTimeInMs != null && memoryUsedInBytes != null) {
+                                            let cloudScriptGBs = (executionTimeInMs / 1000) * (memoryUsedInBytes / 1024 / 1024 / 1024);
+                                            this.currentCost.cloudScriptGBs += cloudScriptGBs;
+                                            this.currentMonthlyCost.cloudScriptGBs += cloudScriptGBs;
+                                        }
+                                    }
+                                }
+                            }
+                            this.currentCost.dataTransferSizeInBytes += (_f = result.responseSize) !== null && _f !== void 0 ? _f : 0;
+                            this.currentMonthlyCost.dataTransferSizeInBytes += (_g = result.responseSize) !== null && _g !== void 0 ? _g : 0;
+                        }
+                    }
+                    else {
+                        if (!eventName.startsWith("dashboard_")) {
+                            if (!eventName.startWith("system_")) {
+                                this.currentMonthlyCost.requestCount += 1;
+                                if (eventName.startWith("multiplayer_")) {
+                                    this.currentMonthlyCost.matchmakingRequestCount += 1;
+                                }
+                                else if (eventName.startWith("cloudScript_")) {
+                                    let parameters = operationResponse === null || operationResponse === void 0 ? void 0 : operationResponse.parameters;
+                                    if (parameters) {
+                                        let executionTimeInMs = parameters.executionTimeInMs;
+                                        let memoryUsedInBytes = parameters.memoryUsedInBytes;
+                                        if (executionTimeInMs != null && memoryUsedInBytes != null) {
+                                            let cloudScriptGBs = (executionTimeInMs / 1000) * (memoryUsedInBytes / 1024 / 1024 / 1024);
+                                            this.currentMonthlyCost.cloudScriptGBs += cloudScriptGBs;
+                                        }
+                                    }
+                                }
+                            }
+                            this.currentMonthlyCost.dataTransferSizeInBytes += (_h = result.responseSize) !== null && _h !== void 0 ? _h : 0;
+                        }
+                    }
+                }
+            }
         });
     }
     saveAnalytics() {
@@ -77300,6 +78003,8 @@ class AnalyticsService {
                 operationSystem: this.currentOperationSystem,
                 requestComplete: this.currentRequestComplete,
                 databaseSystem: this.currentDatabaseSystem,
+                cost: this.currentCost,
+                monthlyCost: this.currentMonthlyCost,
                 tsCreate: currentDate.getTime()
             });
         });
@@ -78072,6 +78777,7 @@ var EventCallbackType;
     EventCallbackType[EventCallbackType["Pre"] = 0] = "Pre";
     EventCallbackType[EventCallbackType["Post"] = 1] = "Post";
     EventCallbackType[EventCallbackType["System"] = 2] = "System";
+    EventCallbackType[EventCallbackType["Event"] = 3] = "Event";
 })(EventCallbackType || (EventCallbackType = {}));
 var CloudScriptEventType;
 (function (CloudScriptEventType) {
@@ -78268,6 +78974,76 @@ class EventCallbackCloudScriptService {
             };
         });
     }
+    executeEvent(eventName, request, operationEvent) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let cloudFunction = this.cloudScriptFunctionDict.get("system");
+            if (cloudFunction == null) {
+                xDebug_1.Debug.logError("[GN] [SystemEventCallback] system not found");
+                return;
+            }
+            let cloudScriptWorker = this.loadCloudScriptFunctionWorkerFromCache(cloudFunction.type, eventName);
+            if (cloudScriptWorker == null) {
+                xDebug_1.Debug.logError("[GN] [SystemEventCallback] worker not found at " + cloudFunction.type);
+                return;
+            }
+            let requestId = StringUtility_1.StringUtility.generateRandomString(10, 0);
+            let cloudScriptRequest = {
+                requestId: requestId,
+                eventName: eventName,
+                eventType: EventCallbackType.Event,
+                operationRequest: {
+                    operationCode: operationEvent.getEventCode(),
+                    encrypted: operationEvent.isEncrypted(),
+                    parameters: operationEvent.getParameters(),
+                    requestId: 0,
+                },
+                request: request,
+                secretInfo: null,
+            };
+            cloudScriptWorker.postMessage(cloudScriptRequest);
+            let thiz = this;
+            let isResolved = false;
+            let cloudScriptResponse = yield new Promise((resolve) => {
+                let timeout = setTimeout(() => {
+                    if (isResolved)
+                        return;
+                    isResolved = true;
+                    resolve({
+                        responseId: requestId,
+                        response: {
+                            status: ICloudScriptService_1.ExecuteResponseStatus.Timeout,
+                            errorMessage: "function execute timeout",
+                            result: null,
+                            request: null,
+                        },
+                        stats: null,
+                        logs: [],
+                    });
+                }, EventCallbackCloudScriptService.SystemExecuteTimeoutInMs);
+                thiz.cloudScriptWaitingResponseCallbackDict.set(requestId, (cloudScriptResponse) => {
+                    if (isResolved)
+                        return;
+                    isResolved = true;
+                    clearTimeout(timeout);
+                    resolve(cloudScriptResponse);
+                });
+            });
+            this.cloudScriptWaitingResponseCallbackDict.delete(requestId);
+            if (cloudScriptResponse.logs.length != 0)
+                xDebug_1.Debug.log(JSON.stringify(cloudScriptResponse.logs));
+            if (cloudScriptResponse.response.status == ICloudScriptService_1.ExecuteResponseStatus.Ok) {
+                operationEvent.setParameters(cloudScriptResponse.response.result.parameters ? GNData_1.GNHashtable.builder().addAll(cloudScriptResponse.response.result.parameters).build() : null);
+                operationEvent.setEncrypted(cloudScriptResponse.response.result.encrypted);
+                operationEvent.eventCode = cloudScriptResponse.response.result.returnCode;
+                if (cloudScriptResponse.response.request.userId)
+                    request.userId = cloudScriptResponse.response.request.userId;
+                if (cloudScriptResponse.response.request.userIds)
+                    request.userIds = cloudScriptResponse.response.request.userIds;
+                if (cloudScriptResponse.response.request.roomId)
+                    request.roomId = cloudScriptResponse.response.request.roomId;
+            }
+        });
+    }
     executePre(eventName, request, secretInfo, operationRequest) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -78662,14 +79438,16 @@ class PostEventCallbackService {
             if (this.cloudScriptService) {
                 this.cloudScriptService.executePost(eventName, request, secretInfo, operationRequest, operationResponse);
             }
+            let operationResponseToData = OperationHelper_1.OperationHelper.toDataOperationResponse(operationResponse);
             this.eventCallbackCollection.insertOne({
                 eventName: eventName,
                 tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
                 request: request,
                 operationRequest: OperationHelper_1.OperationHelper.toDataOperationRequest(operationRequest),
                 originRequest: OperationHelper_1.OperationHelper.toDataFromRequest(operationRequest.originRequest),
-                operationResponse: OperationHelper_1.OperationHelper.toDataOperationResponse(operationResponse),
+                operationResponse: operationResponseToData,
                 customTags: operationRequest.getParameters().getGNHashtable("CustomTags"),
+                responseSize: Buffer.byteLength(JSON.stringify(operationResponseToData), "utf-8"),
             });
             if (!this.eventLstDict.has(eventName)) {
                 return;
@@ -80824,12 +81602,13 @@ exports.RequestConverterService = RequestConverterService;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TimerService = void 0;
+const xDatetime_1 = __webpack_require__(21817);
 const xDebug_1 = __webpack_require__(32501);
 class TimerService {
     run() {
         setInterval(() => {
             this.onEverySecond();
-            let now = new Date();
+            let now = xDatetime_1.xDatetime.getCurrentDate();
             if (now.getSeconds() == 0) {
                 this.onEveryMinute();
                 if (now.getMinutes() == 0) {
@@ -81538,8 +82317,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ItemType = void 0;
 var ItemType;
 (function (ItemType) {
-    ItemType[ItemType["NonConsumable"] = 1] = "NonConsumable";
-    ItemType[ItemType["Consumable"] = 2] = "Consumable";
+    ItemType[ItemType["NonStackable"] = 1] = "NonStackable";
+    ItemType[ItemType["Stackable"] = 2] = "Stackable";
 })(ItemType || (exports.ItemType = ItemType = {}));
 
 
@@ -81715,7 +82494,7 @@ GNErrorCode.GamePlayerNotFound = 17;
 GNErrorCode.FileNotFound = 18;
 GNErrorCode.FileNotUpload = 19;
 GNErrorCode.OwnerTypeNotSupport = 20;
-GNErrorCode.ItemNotConsumable = 21;
+GNErrorCode.ItemNotStackable = 21;
 GNErrorCode.GameNotFound = 22;
 GNErrorCode.GameIsExists = 23;
 GNErrorCode.SecretInfoNotFound = 24;
@@ -82336,6 +83115,13 @@ GNParameterCode.Collections = "collections";
 GNParameterCode.Objects = "objects";
 GNParameterCode.Indexes = "indexes";
 GNParameterCode.DatabaseSystem = "databaseSystem";
+GNParameterCode.Cost = "cost";
+GNParameterCode.MonthlyCost = "monthlyCost";
+GNParameterCode.RequestCount = "requestCount";
+GNParameterCode.MatchmakingRequestCount = "matchmakingRequestCount";
+GNParameterCode.CloudScriptGBs = "cloudScriptGBs";
+GNParameterCode.StorageSizeInBytes = "storageSizeInBytes";
+GNParameterCode.DataTransferSizeInBytes = "dataTransferSizeInBytes";
 
 
 /***/ }),
@@ -83671,6 +84457,18 @@ class xCacheData {
             return false;
         return true;
     }
+    removeInvalidData() {
+        let removeCount = 0;
+        let keys = this.dataDic.keys();
+        for (let key in keys) {
+            let cacheItem = this.dataDic.get(key);
+            if (cacheItem == null || cacheItem.isExpired()) {
+                this.dataDic.delete(key);
+                removeCount++;
+            }
+        }
+        return removeCount;
+    }
     constructor() {
         this.dataDic = new Map();
     }
@@ -86130,9 +86928,9 @@ class xDatabase {
     loadMasterPlayersWithGenericServiceAsync(genericService, genericIds, masterPlayerFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemCollection("MasterPlayer");
-            let filter = {};
-            filter["external.genericService.genericServices." + genericService] = { $in: { "genericId": genericIds } };
-            let results = yield collection.find(filter, {
+            let $filter = {};
+            $filter["external.genericService.genericServices." + genericService] = { $in: { "genericId": genericIds } };
+            let results = yield collection.find($filter, {
                 projection: this.getFindOptions(masterPlayerFindOptions)
             });
             return this.convertToMasterPlayers(results, collection);
@@ -86253,14 +87051,14 @@ class xDatabase {
                 score = playerStatistics.value;
                 tsLastUpdate = playerStatistics.tsLastUpdate;
             }
-            let filter = {};
+            let $filter = {};
             if (direction == -1) {
                 let condition1 = {};
                 let condition2 = {};
                 condition1["playerStatistics." + key + ".value"] = { $gt: score };
                 condition2["playerStatistics." + key + ".value"] = score;
                 condition2["playerStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
             else {
                 let condition1 = {};
@@ -86268,9 +87066,9 @@ class xDatabase {
                 condition1["playerStatistics." + key + ".value"] = { $lt: score };
                 condition2["playerStatistics." + key + ".value"] = score;
                 condition2["playerStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadPositionMasterPlayerLeaderboardWithCurrencies(key, userId) {
@@ -86287,13 +87085,13 @@ class xDatabase {
             if (playerCurrencies != null) {
                 score = playerCurrencies.value;
             }
-            let filter = {};
-            filter["playerCurrencies." + key] = {
+            let $filter = {};
+            $filter["playerCurrencies." + key] = {
                 $gt: {
                     value: score,
                 }
             };
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadMasterPlayerAsync(userId, masterPlayerFindOptions) {
@@ -86492,9 +87290,9 @@ class xDatabase {
     loadMasterPlayerByGenericServiceAsync(serviceName, serviceId, masterPlayerFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemCollection("MasterPlayer");
-            let filter = {};
-            filter["external.genericService.genericServices." + serviceName + ".serviceId"] = serviceId;
-            let result = yield collection.findOne(filter, {
+            let $filter = {};
+            $filter["external.genericService.genericServices." + serviceName + ".serviceId"] = serviceId;
+            let result = yield collection.findOne($filter, {
                 projection: this.getFindOptions(masterPlayerFindOptions)
             });
             if (result) {
@@ -86648,14 +87446,14 @@ class xDatabase {
                 score = playerStatistics.value;
                 tsLastUpdate = playerStatistics.tsLastUpdate;
             }
-            let filter = {};
+            let $filter = {};
             if (direction == -1) {
                 let condition1 = {};
                 let condition2 = {};
                 condition1["playerStatistics." + key + ".value"] = { $gt: score };
                 condition2["playerStatistics." + key + ".value"] = score;
                 condition2["playerStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
             else {
                 let condition1 = {};
@@ -86663,9 +87461,9 @@ class xDatabase {
                 condition1["playerStatistics." + key + ".value"] = { $lt: score };
                 condition2["playerStatistics." + key + ".value"] = score;
                 condition2["playerStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadPositionGamePlayerLeaderboardWithCurrenciesAsync(key, userId, gameId) {
@@ -86682,13 +87480,13 @@ class xDatabase {
             if (playerCurrencies != null) {
                 score = playerCurrencies.value;
             }
-            let filter = {};
-            filter["playerCurrencies." + key] = {
+            let $filter = {};
+            $filter["playerCurrencies." + key] = {
                 $gt: {
                     value: score,
                 }
             };
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadGamePlayerAsync(userId, gameId, gamePlayerFindOptions) {
@@ -86840,23 +87638,29 @@ class xDatabase {
             return this.convertToCharacterPlayers(results, collection);
         });
     }
-    loadCharacterPlayersLeaderboardWithStatisticsAsync(key, skip, limit, gameId, direction, characterPlayerFindOptions) {
+    loadCharacterPlayersLeaderboardWithStatisticsAsync(key, skip, limit, catalogId, gameId, direction, characterPlayerFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("CharacterPlayer", gameId);
             let $sort = {};
             $sort["playerStatistics." + key + ".value"] = direction;
             $sort["playerStatistics." + key + ".tsLastUpdate"] = 1;
-            let results = yield collection.find({}, {
+            let $filter = {};
+            if (catalogId) {
+                $filter["catalogId"] = catalogId;
+            }
+            let results = yield collection.find($filter, {
                 projection: this.getFindOptions(characterPlayerFindOptions)
             }).sort($sort).skip(skip).limit(limit);
             return this.convertToCharacterPlayers(results, collection);
         });
     }
-    loadCharacterPlayersLeaderboardWithStatisticsAllAsync(key, gameId, direction, characterPlayerFindOptions) {
+    loadCharacterPlayersLeaderboardWithStatisticsAllAsync(key, catalogId, gameId, direction, characterPlayerFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("CharacterPlayer", gameId);
             let $filter = {};
             $filter["playerStatistics." + key + ".value"] = { $ne: null };
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
             let $sort = {};
             $sort["playerStatistics." + key + ".value"] = direction;
             $sort["playerStatistics." + key + ".tsLastUpdate"] = 1;
@@ -86877,26 +87681,33 @@ class xDatabase {
             return this.convertToCharacterPlayers(results, collection);
         });
     }
-    loadCharacterPlayersLeaderboardWithCurrenciesAsync(key, skip, limit, gameId, characterPlayerFindOptions) {
+    loadCharacterPlayersLeaderboardWithCurrenciesAsync(key, skip, limit, catalogId, gameId, characterPlayerFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("CharacterPlayer", gameId);
             let $sort = {};
             $sort["playerCurrencies." + key + ".value"] = -1;
-            let results = yield collection.find({}, {
+            let $filter = {};
+            if (catalogId) {
+                $filter["catalogId"] = catalogId;
+            }
+            let results = yield collection.find($filter, {
                 projection: this.getFindOptions(characterPlayerFindOptions)
             }).sort($sort).skip(skip).limit(limit);
             return this.convertToCharacterPlayers(results, collection);
         });
     }
-    loadPositionCharacterPlayerLeaderboardWithStatisticsAsync(key, userId, gameId, initialValue, direction) {
+    loadPositionCharacterPlayerLeaderboardWithStatisticsAsync(key, characterId, catalogId, gameId, initialValue, direction) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("CharacterPlayer", gameId);
             let characterPlayerFindOptions = {
-                playerStatistics: true
+                catalogId: true,
+                playerStatistics: true,
             };
-            let thisPlayer = yield this.loadCharacterPlayerAsync(userId, gameId, characterPlayerFindOptions);
+            let thisPlayer = yield this.loadCharacterPlayerAsync(characterId, gameId, characterPlayerFindOptions);
             if (thisPlayer == null)
                 return -1;
+            if (catalogId && thisPlayer.getCatalogId() != catalogId)
+                return -1;
             let score = initialValue;
             let tsLastUpdate = xDatetime_1.xDatetime.getCurrentMilliseconds();
             let playerStatistics = thisPlayer.getPlayerStatistics(key);
@@ -86904,14 +87715,17 @@ class xDatabase {
                 score = playerStatistics.value;
                 tsLastUpdate = playerStatistics.tsLastUpdate;
             }
-            let filter = {};
+            let $filter = {};
+            if (catalogId) {
+                $filter["catalogId"] = catalogId;
+            }
             if (direction == -1) {
                 let condition1 = {};
                 let condition2 = {};
                 condition1["playerStatistics." + key + ".value"] = { $gt: score };
                 condition2["playerStatistics." + key + ".value"] = score;
                 condition2["playerStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
             else {
                 let condition1 = {};
@@ -86919,38 +87733,41 @@ class xDatabase {
                 condition1["playerStatistics." + key + ".value"] = { $lt: score };
                 condition2["playerStatistics." + key + ".value"] = score;
                 condition2["playerStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
-    loadPositionCharacterPlayerLeaderboardWithCurrenciesAsync(key, userId, gameId) {
+    loadPositionCharacterPlayerLeaderboardWithCurrenciesAsync(key, userId, catalogId, gameId) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("CharacterPlayer", gameId);
             let characterPlayerFindOptions = {
-                playerCurrencies: true
+                playerCurrencies: true,
+                catalogId: true,
             };
             let thisPlayer = yield this.loadCharacterPlayerAsync(userId, gameId, characterPlayerFindOptions);
             if (thisPlayer == null)
                 return -1;
+            if (catalogId && thisPlayer.getCatalogId() != catalogId)
+                return -1;
             let score = 0;
             let playerCurrencies = thisPlayer.getPlayerCurrency(key);
             if (playerCurrencies != null) {
                 score = playerCurrencies.value;
             }
-            let filter = {};
-            filter["playerCurrencies." + key] = {
+            let $filter = {};
+            $filter["playerCurrencies." + key] = {
                 $gt: {
                     value: score,
                 }
             };
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadFriendCharacterPlayersLeaderboardWithStatisticsAsync(friendIds, gameId, characterPlayerFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("CharacterPlayer", gameId);
-            let results = yield collection.find({ userId: { $in: friendIds } }, {
+            let results = yield collection.find({ characterId: { $in: friendIds } }, {
                 projection: this.getFindOptions(characterPlayerFindOptions)
             });
             let answer = [];
@@ -87091,23 +87908,28 @@ class xDatabase {
             return this.convertToGroups(results, collection);
         });
     }
-    loadGroupsLeaderboardWithStatisticsAsync(key, skip, limit, gameId, direction, groupFindOptions) {
+    loadGroupsLeaderboardWithStatisticsAsync(key, skip, limit, catalogId, gameId, direction, groupFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Group", gameId);
             let $sort = {};
             $sort["groupStatistics." + key + ".value"] = direction;
             $sort["groupStatistics." + key + ".tsLastUpdate"] = 1;
-            let results = yield collection.find({}, {
+            let $filter = {};
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
+            let results = yield collection.find($filter, {
                 projection: this.getFindOptions(groupFindOptions)
             }).sort($sort).skip(skip).limit(limit);
             return this.convertToGroups(results, collection);
         });
     }
-    loadGroupsLeaderboardWithStatisticsAllAsync(key, gameId, direction, groupFindOptions) {
+    loadGroupsLeaderboardWithStatisticsAllAsync(key, catalogId, gameId, direction, groupFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Group", gameId);
             let $filter = {};
             $filter["groupStatistics." + key + ".value"] = { $ne: null };
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
             let $sort = {};
             $sort["groupStatistics." + key + ".value"] = direction;
             $sort["groupStatistics." + key + ".tsLastUpdate"] = 1;
@@ -87128,26 +87950,32 @@ class xDatabase {
             return this.convertToGroups(results, collection);
         });
     }
-    loadGroupsLeaderboardWithCurrenciesAsync(key, skip, limit, gameId, groupFindOptions) {
+    loadGroupsLeaderboardWithCurrenciesAsync(key, skip, limit, catalogId, gameId, groupFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Group", gameId);
             let $sort = {};
             $sort["groupCurrencies." + key + ".value"] = -1;
-            let results = yield collection.find({}, {
+            let $filter = {};
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
+            let results = yield collection.find($filter, {
                 projection: this.getFindOptions(groupFindOptions)
             }).sort($sort).skip(skip).limit(limit);
             return this.convertToGroups(results, collection);
         });
     }
-    loadPositionGroupLeaderboardWithStatisticsAsync(key, groupId, gameId, initialValue, direction) {
+    loadPositionGroupLeaderboardWithStatisticsAsync(key, groupId, catalogId, gameId, initialValue, direction) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Group", gameId);
             let groupFindOptions = {
-                groupStatistics: true
+                groupStatistics: true,
+                catalogId: true,
             };
             let thisGroup = yield this.loadGroupAsync(groupId, gameId, groupFindOptions);
             if (thisGroup == null)
                 return -1;
+            if (catalogId && thisGroup.getCatalogId() != catalogId)
+                return -1;
             let score = initialValue;
             let tsLastUpdate = xDatetime_1.xDatetime.getCurrentMilliseconds();
             let groupStatistics = thisGroup.getGroupStatistics(key);
@@ -87155,14 +87983,16 @@ class xDatabase {
                 score = groupStatistics.value;
                 tsLastUpdate = groupStatistics.tsLastUpdate;
             }
-            let filter = {};
+            let $filter = {};
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
             if (direction == -1) {
                 let condition1 = {};
                 let condition2 = {};
                 condition1["groupStatistics." + key + ".value"] = { $gt: score };
                 condition2["groupStatistics." + key + ".value"] = score;
                 condition2["groupStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
             else {
                 let condition1 = {};
@@ -87170,9 +88000,9 @@ class xDatabase {
                 condition1["groupStatistics." + key + ".value"] = { $lt: score };
                 condition2["groupStatistics." + key + ".value"] = score;
                 condition2["groupStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadPositionGroupLeaderboardWithCurrenciesAsync(key, groupId, gameId) {
@@ -87189,13 +88019,13 @@ class xDatabase {
             if (groupCurrency != null) {
                 score = groupCurrency.value;
             }
-            let filter = {};
-            filter["groupCurrencies." + key] = {
+            let $filter = {};
+            $filter["groupCurrencies." + key] = {
                 $gt: {
                     value: score,
                 }
             };
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadGroupAsync(groupId, gameId, groupFindOptions) {
@@ -87255,23 +88085,27 @@ class xDatabase {
             return this.convertToInventories(results, collection);
         });
     }
-    loadInventoriesLeaderboardWithStatisticsAsync(key, skip, limit, gameId, direction, inventoryFindOptions) {
+    loadInventoriesLeaderboardWithStatisticsAsync(key, skip, limit, catalogId, gameId, direction, inventoryFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Inventory", gameId);
             let $sort = {};
             $sort["itemStatistics." + key + ".value"] = direction;
             $sort["itemStatistics." + key + ".tsLastUpdate"] = 1;
-            let results = yield collection.find({}, {
+            let $filter = {};
+            $filter["catalogId"] = catalogId;
+            let results = yield collection.find($filter, {
                 projection: this.getFindOptions(inventoryFindOptions)
             }).sort($sort).skip(skip).limit(limit);
             return this.convertToInventories(results, collection);
         });
     }
-    loadInventoriesLeaderboardWithStatisticsAllAsync(key, gameId, direction, inventoryFindOptions) {
+    loadInventoriesLeaderboardWithStatisticsAllAsync(key, catalogId, gameId, direction, inventoryFindOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Inventory", gameId);
             let $filter = {};
             $filter["itemStatistics." + key + ".value"] = { $ne: null };
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
             let $sort = {};
             $sort["itemStatistics." + key + ".value"] = direction;
             $sort["itemStatistics." + key + ".tsLastUpdate"] = 1;
@@ -87292,15 +88126,18 @@ class xDatabase {
             return this.convertToInventories(results, collection);
         });
     }
-    loadPositionInventoryLeaderboardWithStatisticsAsync(key, itemId, gameId, initialValue, direction) {
+    loadPositionInventoryLeaderboardWithStatisticsAsync(key, itemId, catalogId, gameId, initialValue, direction) {
         return __awaiter(this, void 0, void 0, function* () {
             let collection = this.systemGameCollection("Inventory", gameId);
             let inventoryFindOptions = {
-                itemStatistics: true
+                itemStatistics: true,
+                catalogId: true,
             };
             let thisInventory = yield this.loadInventoryAsync(itemId, gameId, inventoryFindOptions);
             if (thisInventory == null)
                 return -1;
+            if (catalogId && thisInventory.getCatalogId() != catalogId)
+                return -1;
             let score = initialValue;
             let tsLastUpdate = xDatetime_1.xDatetime.getCurrentMilliseconds();
             let itemStatistics = thisInventory.getItemStatistics(key);
@@ -87308,14 +88145,16 @@ class xDatabase {
                 score = itemStatistics.value;
                 tsLastUpdate = itemStatistics.tsLastUpdate;
             }
-            let filter = {};
+            let $filter = {};
+            if (catalogId)
+                $filter["catalogId"] = catalogId;
             if (direction == -1) {
                 let condition1 = {};
                 let condition2 = {};
                 condition1["itemStatistics." + key + ".value"] = { $gt: score };
                 condition2["itemStatistics." + key + ".value"] = score;
                 condition2["itemStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
             else {
                 let condition1 = {};
@@ -87323,9 +88162,9 @@ class xDatabase {
                 condition1["itemStatistics." + key + ".value"] = { $lt: score };
                 condition2["itemStatistics." + key + ".value"] = score;
                 condition2["itemStatistics." + key + ".tsLastUpdate"] = { $lt: tsLastUpdate };
-                filter.$or = [condition1, condition2];
+                $filter.$or = [condition1, condition2];
             }
-            return yield collection.countDocuments(filter);
+            return yield collection.countDocuments($filter);
         });
     }
     loadInventoryAsync(itemId, gameId, inventoryFindOptions) {
@@ -93213,9 +94052,14 @@ class GNServer {
         let thiz = this;
         this.timerService.subscriberEverySecond(() => {
             let currentDate = xDatetime_1.xDatetime.getCurrentDate();
-            if (currentDate.getSeconds() % 5 == 0)
+            if (currentDate.getSeconds() % 10 == 0)
                 thiz.handleMatchmaking();
         });
+        this.timerService.subscriberEveryMinute(() => {
+            let currentDate = xDatetime_1.xDatetime.getCurrentDate();
+            if (currentDate.getMinutes() % 10 == 0)
+                thiz.xCacheData.removeInvalidData();
+        });
     }
     init() {
         {
@@ -93608,6 +94452,7 @@ class GNServer {
         tempAnalyticsService.setGNServer(this);
         tempAnalyticsService.run();
         this.analyticsService = tempAnalyticsService;
+        this.postEventCallbackCollection = this.xDatabase.systemCollection("EventCallback.Post");
         if (onRunSuccess != null)
             onRunSuccess();
     }
@@ -93721,21 +94566,83 @@ class GNServer {
     }
     sendEventTo(userId, operationEvent) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield this.eventCallbackCloudScriptService.executeEvent("system_SendEventTo", { userId: userId }, operationEvent);
+            let operationEventToData = {
+                eventCode: operationEvent.getEventCode(),
+                encrypted: operationEvent.isEncrypted(),
+                parameters: (_a = operationEvent.getParameters()) === null || _a === void 0 ? void 0 : _a.toData()
+            };
+            this.postEventCallbackCollection.insertOne({
+                eventName: "system_SendEventTo",
+                tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
+                request: {
+                    userId: userId
+                },
+                operationEvent: operationEventToData,
+                responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
+            });
             return yield this.socketApp.getSocketAppHandler().sendEventTo(userId, operationEvent);
         });
     }
     sendEventToRoom(roomId, operationEvent) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield this.eventCallbackCloudScriptService.executeEvent("system_SendEventToRoom", { roomId: roomId }, operationEvent);
+            let operationEventToData = {
+                eventCode: operationEvent.getEventCode(),
+                encrypted: operationEvent.isEncrypted(),
+                parameters: (_a = operationEvent.getParameters()) === null || _a === void 0 ? void 0 : _a.toData()
+            };
+            this.postEventCallbackCollection.insertOne({
+                eventName: "system_SendEventToRoom",
+                tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
+                request: {
+                    roomId: roomId
+                },
+                operationEvent: operationEventToData,
+                responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
+            });
             return yield this.socketApp.getSocketAppHandler().sendEventToRoom(roomId, operationEvent);
         });
     }
     sendEventToMoreUser(userIds, operationEvent) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield this.eventCallbackCloudScriptService.executeEvent("system_SendEventToMoreUser", { userIds: userIds }, operationEvent);
+            let operationEventToData = {
+                eventCode: operationEvent.getEventCode(),
+                encrypted: operationEvent.isEncrypted(),
+                parameters: (_a = operationEvent.getParameters()) === null || _a === void 0 ? void 0 : _a.toData()
+            };
+            this.postEventCallbackCollection.insertOne({
+                eventName: "system_SendEventToMoreUser",
+                tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
+                request: {
+                    userIds: userIds
+                },
+                operationEvent: operationEventToData,
+                responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8") * userIds.length,
+            });
             return yield this.socketApp.getSocketAppHandler().sendEventToMoreUser(userIds, operationEvent);
         });
     }
     sendEventToAllPlayer(operationEvent) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield this.eventCallbackCloudScriptService.executeEvent("system_SendEventToAllPlayer", {}, operationEvent);
+            let operationEventToData = {
+                eventCode: operationEvent.getEventCode(),
+                encrypted: operationEvent.isEncrypted(),
+                parameters: (_a = operationEvent.getParameters()) === null || _a === void 0 ? void 0 : _a.toData()
+            };
+            this.postEventCallbackCollection.insertOne({
+                eventName: "system_SendEventToAllPlayer",
+                tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
+                request: {},
+                operationEvent: operationEventToData,
+                responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
+            });
             return yield this.socketApp.getSocketAppHandler().sendEventToAllPlayer(operationEvent);
         });
     }