@xmobitea/gn-server 2.4.6 → 2.4.8

package/dist/GN-app-api/handler/controller/handler/dashboard/GetAnalyticsRequestHandler.d.ts

@@ -7,11 +7,17 @@ declare class GetAnalyticsOperationRequest extends OperationRequest {
     timestamp?: number;
     analyticsItem?: boolean;
     country?: boolean;
+    requestComplete?: boolean;
+    operationSystem?: boolean;
+    databaseSystem?: boolean;
     isValidRequest(): boolean;
 }
 export interface AnalyticsRequestParams {
     analyticsItem: boolean;
     country: boolean;
+    requestComplete: boolean;
+    operationSystem: boolean;
+    databaseSystem: boolean;
 }
 export declare class GetAnalyticsRequestHandler extends RequestHandler {
     getCode(): number;

package/dist/GN-app-api/handler/controller/handler/dashboard/model/DataSettingsParam.d.ts

@@ -1,4 +1,5 @@
 export declare class DataSettingsParam {
     key: string;
+    displayName: string;
     permission: number;
 }

package/dist/GN-app-api/service/AnalyticsService.d.ts

@@ -15,8 +15,11 @@ export declare class AnalyticsService implements IAnalyticsService {
     private currentMNUSince0h1;
     private currentMRT;
     private currentMRTSince0h1;
-    private analyticsPrice;
+    private currentAnalyticsPrice;
     private currentCountry;
+    private currentOperationSystem;
+    private currentDatabaseSystem;
+    private currentRequestComplete;
     setGNServer(gnServer: GNServer): void;
     getBigAnalyticsItem(tsDate?: number): Promise<BigAnalyticsItem>;
     run(): void;

package/dist/GN-app-api/service/IAnalyticsService.d.ts

@@ -23,6 +23,35 @@ export interface BigAnalyticsItem {
             longitude: number;
         }[];
     }[];
+    operationSystem: {
+        cpuUsage: number;
+        memoryUsage: {
+            totalMemoryInBytes: number;
+            freeMemoryInBytes: number;
+        };
+        storageUsage: {
+            name: string;
+            fsTotalSizeInBytes: number;
+            fsUsedSizeInBytes: number;
+        }[];
+    };
+    databaseSystem: {
+        fsTotalSizeInBytes: number;
+        fsUsedSizeInBytes: number;
+        totalSizeInBytes: number;
+        collections: number;
+        objects: number;
+        indexes: number;
+    };
+    requestComplete: {
+        eventName: string;
+        results: [
+            {
+                errorCode: number;
+                count: number;
+            }
+        ];
+    }[];
 }
 export interface IAnalyticsService {
     getBigAnalyticsItem(tsDate?: number): Promise<BigAnalyticsItem>;

package/dist/GN-common/constant/parameterCode/GNParameterCode.d.ts

@@ -562,4 +562,20 @@ export declare class GNParameterCode {
     static readonly Title: string;
     static readonly Body: string;
     static readonly TargetPlatforms: string;
+    static readonly OperationSystem: string;
+    static readonly RequestComplete: string;
+    static readonly CpuUsage: string;
+    static readonly MemoryUsage: string;
+    static readonly StorageUsage: string;
+    static readonly FreeMemoryInBytes: string;
+    static readonly TotalMemoryInBytes: string;
+    static readonly ErrorCode: string;
+    static readonly Count: string;
+    static readonly FsTotalSizeInBytes: string;
+    static readonly FsUsedSizeInBytes: string;
+    static readonly TotalSizeInBytes: string;
+    static readonly Collections: string;
+    static readonly Objects: string;
+    static readonly Indexes: string;
+    static readonly DatabaseSystem: string;
 }

package/dist/GN-library/xsettings/lib/entity/xDataSettings.d.ts

@@ -1,4 +1,5 @@
 export interface xDataSettings {
     key: string;
+    displayName: string;
     permission: number;
 }

package/dist/GN-startup/cloudScript/templateCloudScript.ts

@@ -443,7 +443,7 @@ if (parentPort) {
 			context: {},
 			customTags: request.customTags,
 			log(log: any) {
-				logs.push(log);
+				logs.push(JSON.stringify(log));
 			},
 		};
 

package/dist/GN-startup/cloudScript/templateEventCallback.ts

@@ -525,7 +525,7 @@ if (parentPort) {
 					secretInfo: null as any,
 					request: request.request,
 					log(log: any) {
-						logs.push(log);
+						logs.push(JSON.stringify(log));
 					},
 				};
 
@@ -538,7 +538,7 @@ if (parentPort) {
 					secretInfo: null as any,
 					request: null as any,
 					log(log: any) {
-						logs.push(log);
+						logs.push(JSON.stringify(log));
 					},
 				};
 
@@ -573,7 +573,7 @@ if (parentPort) {
 					secretInfo: secretInfo,
 					request: request.request,
 					log(log: any) {
-						logs.push(log);
+						logs.push(JSON.stringify(log));
 					},
 				};
 
@@ -599,7 +599,7 @@ if (parentPort) {
 					secretInfo: secretInfo,
 					request: request.request,
 					log(log: any) {
-						logs.push(log);
+						logs.push(JSON.stringify(log));
 					},
 				};
 

package/dist/index.js

@@ -15356,6 +15356,18 @@ __decorate([
     (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.Country, isOptional: true }),
     __metadata("design:type", Boolean)
 ], GetAnalyticsOperationRequest.prototype, "country", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.RequestComplete, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetAnalyticsOperationRequest.prototype, "requestComplete", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.OperationSystem, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetAnalyticsOperationRequest.prototype, "operationSystem", void 0);
+__decorate([
+    (0, DataMember_1.BooleanDataMember)({ code: GNParameterCode_1.GNParameterCode.DatabaseSystem, isOptional: true }),
+    __metadata("design:type", Boolean)
+], GetAnalyticsOperationRequest.prototype, "databaseSystem", void 0);
 class GetAnalyticsRequestHandler extends RequestHandler_1.RequestHandler {
     getCode() {
         return OperationCode_1.OperationCode.GetAnalytics;
@@ -15377,6 +15389,9 @@ class GetAnalyticsRequestHandler extends RequestHandler_1.RequestHandler {
                 requestParams: {
                     analyticsItem: request.analyticsItem,
                     country: request.country,
+                    operationSystem: request.operationSystem,
+                    requestComplete: request.requestComplete,
+                    databaseSystem: request.databaseSystem,
                 }
             }, secretInfo, operationRequest);
         });
@@ -15439,6 +15454,64 @@ class GetAnalyticsRequestHandler extends RequestHandler_1.RequestHandler {
                 }
                 operationResponse.setParameter(GNParameterCode_1.GNParameterCode.Country, gnCountrys);
             }
+            if (request.requestParams.operationSystem) {
+                let gnOperationSystem = new GNData_1.GNHashtable();
+                if (bigAnalyticsItem.operationSystem) {
+                    gnOperationSystem.add(GNParameterCode_1.GNParameterCode.CpuUsage, bigAnalyticsItem.operationSystem.cpuUsage);
+                    let gnMemoryUsage = new GNData_1.GNHashtable();
+                    if (bigAnalyticsItem.operationSystem.memoryUsage) {
+                        gnMemoryUsage.add(GNParameterCode_1.GNParameterCode.FreeMemoryInBytes, bigAnalyticsItem.operationSystem.memoryUsage.freeMemoryInBytes);
+                        gnMemoryUsage.add(GNParameterCode_1.GNParameterCode.TotalMemoryInBytes, bigAnalyticsItem.operationSystem.memoryUsage.totalMemoryInBytes);
+                    }
+                    gnOperationSystem.add(GNParameterCode_1.GNParameterCode.MemoryUsage, gnMemoryUsage);
+                    let gnStorageUsages = new GNData_1.GNArray();
+                    if (bigAnalyticsItem.operationSystem.storageUsage) {
+                        for (let i = 0; i < bigAnalyticsItem.operationSystem.storageUsage.length; i++) {
+                            let storageUsage = bigAnalyticsItem.operationSystem.storageUsage[i];
+                            let gnStorageUsage = new GNData_1.GNHashtable();
+                            gnStorageUsage.add(GNParameterCode_1.GNParameterCode.Name, storageUsage.name);
+                            gnStorageUsage.add(GNParameterCode_1.GNParameterCode.FsTotalSizeInBytes, storageUsage.fsTotalSizeInBytes);
+                            gnStorageUsage.add(GNParameterCode_1.GNParameterCode.FsUsedSizeInBytes, storageUsage.fsUsedSizeInBytes);
+                            gnStorageUsages.add(gnStorageUsage);
+                        }
+                    }
+                    gnOperationSystem.add(GNParameterCode_1.GNParameterCode.StorageUsage, gnStorageUsages);
+                }
+                operationResponse.setParameter(GNParameterCode_1.GNParameterCode.OperationSystem, gnOperationSystem);
+            }
+            if (request.requestParams.databaseSystem) {
+                let gnDatabaseSystem = new GNData_1.GNHashtable();
+                if (bigAnalyticsItem.operationSystem) {
+                    gnDatabaseSystem.add(GNParameterCode_1.GNParameterCode.FsTotalSizeInBytes, bigAnalyticsItem.databaseSystem.fsTotalSizeInBytes);
+                    gnDatabaseSystem.add(GNParameterCode_1.GNParameterCode.FsUsedSizeInBytes, bigAnalyticsItem.databaseSystem.fsUsedSizeInBytes);
+                    gnDatabaseSystem.add(GNParameterCode_1.GNParameterCode.TotalSizeInBytes, bigAnalyticsItem.databaseSystem.totalSizeInBytes);
+                    gnDatabaseSystem.add(GNParameterCode_1.GNParameterCode.Collections, bigAnalyticsItem.databaseSystem.collections);
+                    gnDatabaseSystem.add(GNParameterCode_1.GNParameterCode.Objects, bigAnalyticsItem.databaseSystem.objects);
+                    gnDatabaseSystem.add(GNParameterCode_1.GNParameterCode.Indexes, bigAnalyticsItem.databaseSystem.indexes);
+                }
+                operationResponse.setParameter(GNParameterCode_1.GNParameterCode.DatabaseSystem, gnDatabaseSystem);
+            }
+            if (request.requestParams.requestComplete) {
+                let gnRequestComplete = new GNData_1.GNArray();
+                if (bigAnalyticsItem.requestComplete) {
+                    for (let i = 0; i < bigAnalyticsItem.requestComplete.length; i++) {
+                        let requestComplete = bigAnalyticsItem.requestComplete[i];
+                        let thisGnRequestComplete = new GNData_1.GNHashtable();
+                        thisGnRequestComplete.add(GNParameterCode_1.GNParameterCode.EventName, requestComplete.eventName);
+                        let gnResults = new GNData_1.GNArray();
+                        for (let j = 0; j < requestComplete.results.length; j++) {
+                            let result = requestComplete.results[j];
+                            let gnResult = new GNData_1.GNHashtable();
+                            gnResult.add(GNParameterCode_1.GNParameterCode.ErrorCode, result.errorCode);
+                            gnResult.add(GNParameterCode_1.GNParameterCode.Count, result.count);
+                            gnResults.add(gnResult);
+                        }
+                        thisGnRequestComplete.add(GNParameterCode_1.GNParameterCode.Results, gnResults);
+                        gnRequestComplete.add(thisGnRequestComplete);
+                    }
+                }
+                operationResponse.setParameter(GNParameterCode_1.GNParameterCode.RequestComplete, gnRequestComplete);
+            }
             operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.Ok);
             yield this.gnServer.getPostEventCallbackService().onEvent("dashboard_GetAnalytics", request, secretInfo, operationRequest, operationResponse);
             return operationResponse;
@@ -15798,6 +15871,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MinimumValue, playerStatisticsSetting.minimumValue);
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MaximumValue, playerStatisticsSetting.maximumValue);
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.InitialValue, playerStatisticsSetting.initialValue);
+                        gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, playerStatisticsSetting.displayName);
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.Index, playerStatisticsSetting.index);
                         gnPlayerStatisticsSettings.add(gnPlayerStatisticsSetting);
                     }
@@ -15811,6 +15885,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnPlayerDatasSetting = new GNData_1.GNHashtable();
                         gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, playerDatasSetting.key);
                         gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, playerDatasSetting.permission);
+                        gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, playerDatasSetting.displayName);
                         gnPlayerDatasSettings.add(gnPlayerDatasSetting);
                     }
                     gnCharacterPlayerSettings.add(GNParameterCode_1.GNParameterCode.DatasSettings, gnPlayerDatasSettings);
@@ -15823,6 +15898,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnCustomDatasSetting = new GNData_1.GNHashtable();
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, customDatasSetting.key);
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, customDatasSetting.permission);
+                        gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, customDatasSetting.displayName);
                         gnCustomDatasSettings.add(gnCustomDatasSetting);
                     }
                     gnCharacterPlayerSettings.add(GNParameterCode_1.GNParameterCode.CustomDatasSettings, gnCustomDatasSettings);
@@ -15916,6 +15992,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MinimumValue, playerStatisticsSetting.minimumValue);
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MaximumValue, playerStatisticsSetting.maximumValue);
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.InitialValue, playerStatisticsSetting.initialValue);
+                        gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, playerStatisticsSetting.displayName);
                         gnPlayerStatisticsSetting.add(GNParameterCode_1.GNParameterCode.Index, playerStatisticsSetting.index);
                         gnPlayerStatisticsSettings.add(gnPlayerStatisticsSetting);
                     }
@@ -15929,6 +16006,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnPlayerDatasSetting = new GNData_1.GNHashtable();
                         gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, playerDatasSetting.key);
                         gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, playerDatasSetting.permission);
+                        gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, playerDatasSetting.displayName);
                         gnPlayerDatasSettings.add(gnPlayerDatasSetting);
                     }
                     gnGamePlayerSettings.add(GNParameterCode_1.GNParameterCode.DatasSettings, gnPlayerDatasSettings);
@@ -15941,6 +16019,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnCustomDatasSetting = new GNData_1.GNHashtable();
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, customDatasSetting.key);
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, customDatasSetting.permission);
+                        gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, customDatasSetting.displayName);
                         gnCustomDatasSettings.add(gnCustomDatasSetting);
                     }
                     gnGamePlayerSettings.add(GNParameterCode_1.GNParameterCode.CustomDatasSettings, gnCustomDatasSettings);
@@ -16046,6 +16125,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         gnGroupStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MinimumValue, groupStatisticsSetting.minimumValue);
                         gnGroupStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MaximumValue, groupStatisticsSetting.maximumValue);
                         gnGroupStatisticsSetting.add(GNParameterCode_1.GNParameterCode.InitialValue, groupStatisticsSetting.initialValue);
+                        gnGroupStatisticsSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, groupStatisticsSetting.displayName);
                         gnGroupStatisticsSetting.add(GNParameterCode_1.GNParameterCode.Index, groupStatisticsSetting.index);
                         gnGroupStatisticsSettings.add(gnGroupStatisticsSetting);
                     }
@@ -16059,6 +16139,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnGroupDatasSetting = new GNData_1.GNHashtable();
                         gnGroupDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, groupDatasSetting.key);
                         gnGroupDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, groupDatasSetting.permission);
+                        gnGroupDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, groupDatasSetting.displayName);
                         gnGroupDatasSettings.add(gnGroupDatasSetting);
                     }
                     gnGroupSettings.add(GNParameterCode_1.GNParameterCode.DatasSettings, gnGroupDatasSettings);
@@ -16071,6 +16152,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnCustomDatasSetting = new GNData_1.GNHashtable();
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, customDatasSetting.key);
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, customDatasSetting.permission);
+                        gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, customDatasSetting.displayName);
                         gnCustomDatasSettings.add(gnCustomDatasSetting);
                     }
                     gnGroupSettings.add(GNParameterCode_1.GNParameterCode.CustomDatasSettings, gnCustomDatasSettings);
@@ -16125,6 +16207,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         gnInventoryStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MinimumValue, inventoryStatisticsSetting.minimumValue);
                         gnInventoryStatisticsSetting.add(GNParameterCode_1.GNParameterCode.MaximumValue, inventoryStatisticsSetting.maximumValue);
                         gnInventoryStatisticsSetting.add(GNParameterCode_1.GNParameterCode.InitialValue, inventoryStatisticsSetting.initialValue);
+                        gnInventoryStatisticsSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, inventoryStatisticsSetting.displayName);
                         gnInventoryStatisticsSetting.add(GNParameterCode_1.GNParameterCode.Index, inventoryStatisticsSetting.index);
                         gnInventoryStatisticsSettings.add(gnInventoryStatisticsSetting);
                     }
@@ -16138,6 +16221,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnInventoryDatasSetting = new GNData_1.GNHashtable();
                         gnInventoryDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, inventoryDatasSetting.key);
                         gnInventoryDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, inventoryDatasSetting.permission);
+                        gnInventoryDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, inventoryDatasSetting.displayName);
                         gnInventoryDatasSettings.add(gnInventoryDatasSetting);
                     }
                     gnInventorySettings.add(GNParameterCode_1.GNParameterCode.DatasSettings, gnInventoryDatasSettings);
@@ -16150,6 +16234,7 @@ class GetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                         let gnCustomDatasSetting = new GNData_1.GNHashtable();
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, customDatasSetting.key);
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, customDatasSetting.permission);
+                        gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, customDatasSetting.displayName);
                         gnCustomDatasSettings.add(gnCustomDatasSetting);
                     }
                     gnInventorySettings.add(GNParameterCode_1.GNParameterCode.CustomDatasSettings, gnCustomDatasSettings);
@@ -16632,6 +16717,7 @@ class GetMasterGameSettingsRequestHandler extends RequestHandler_1.RequestHandle
                         let gnPlayerDatasSetting = new GNData_1.GNHashtable();
                         gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, playerDatasSetting.key);
                         gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, playerDatasSetting.permission);
+                        gnPlayerDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, playerDatasSetting.displayName);
                         gnPlayerDatasSettings.add(gnPlayerDatasSetting);
                     }
                     gnMasterPlayerSettings.add(GNParameterCode_1.GNParameterCode.DatasSettings, gnPlayerDatasSettings);
@@ -16643,6 +16729,7 @@ class GetMasterGameSettingsRequestHandler extends RequestHandler_1.RequestHandle
                         let gnCustomDatasSetting = new GNData_1.GNHashtable();
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Key, customDatasSetting.key);
                         gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.Permission, customDatasSetting.permission);
+                        gnCustomDatasSetting.add(GNParameterCode_1.GNParameterCode.DisplayName, customDatasSetting.displayName);
                         gnCustomDatasSettings.add(gnCustomDatasSetting);
                     }
                     gnMasterPlayerSettings.add(GNParameterCode_1.GNParameterCode.CustomDatasSettings, gnCustomDatasSettings);
@@ -23035,6 +23122,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             playerDatasSettings.push({
                                 key: playerDatasSetting.key,
                                 permission: playerDatasSetting.permission,
+                                displayName: playerDatasSetting.displayName,
                             });
                         }
                         currentCharacterPlayerSettings.playerDatasSettings = playerDatasSettings;
@@ -23047,6 +23135,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             customDatasSettings.push({
                                 key: customDatasSetting.key,
                                 permission: customDatasSetting.permission,
+                                displayName: customDatasSetting.displayName,
                             });
                         }
                         currentCharacterPlayerSettings.customDatasSettings = customDatasSettings;
@@ -23279,6 +23368,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             playerDatasSettings.push({
                                 key: playerDatasSetting.key,
                                 permission: playerDatasSetting.permission,
+                                displayName: playerDatasSetting.displayName,
                             });
                         }
                         currentGamePlayerSettings.playerDatasSettings = playerDatasSettings;
@@ -23291,6 +23381,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             customDatasSettings.push({
                                 key: customDatasSetting.key,
                                 permission: customDatasSetting.permission,
+                                displayName: customDatasSetting.displayName,
                             });
                         }
                         currentGamePlayerSettings.customDatasSettings = customDatasSettings;
@@ -23535,6 +23626,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             groupDatasSettings.push({
                                 key: groupDatasSetting.key,
                                 permission: groupDatasSetting.permission,
+                                displayName: groupDatasSetting.displayName,
                             });
                         }
                         currentGroupSettings.groupDatasSettings = groupDatasSettings;
@@ -23547,6 +23639,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             customDatasSettings.push({
                                 key: customDatasSetting.key,
                                 permission: customDatasSetting.permission,
+                                displayName: customDatasSetting.displayName,
                             });
                         }
                         currentGroupSettings.customDatasSettings = customDatasSettings;
@@ -23710,6 +23803,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             inventoryDatasSettings.push({
                                 key: inventoryDatasSetting.key,
                                 permission: inventoryDatasSetting.permission,
+                                displayName: inventoryDatasSetting.displayName,
                             });
                         }
                         currentInventorySettings.inventoryDatasSettings = inventoryDatasSettings;
@@ -23722,6 +23816,7 @@ class SetGameInformationRequestHandler extends RequestHandler_1.RequestHandler {
                             customDatasSettings.push({
                                 key: customDatasSetting.key,
                                 permission: customDatasSetting.permission,
+                                displayName: customDatasSetting.displayName,
                             });
                         }
                         currentInventorySettings.customDatasSettings = customDatasSettings;
@@ -24384,6 +24479,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler_1.RequestHandle
                         playerDatasSettings.push({
                             key: playerDatasSetting.key,
                             permission: playerDatasSetting.permission,
+                            displayName: playerDatasSetting.displayName,
                         });
                     }
                     this.gnServer.getGNSettings().getMasterPlayerSettings().playerDatasSettings = playerDatasSettings;
@@ -24396,6 +24492,7 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler_1.RequestHandle
                         playerDatasSettings.push({
                             key: customDatasSetting.key,
                             permission: customDatasSetting.permission,
+                            displayName: customDatasSetting.displayName,
                         });
                     }
                     this.gnServer.getGNSettings().getMasterPlayerSettings().customDatasSettings = playerDatasSettings;
@@ -25457,6 +25554,10 @@ __decorate([
     (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.Key, minLength: 2, maxLength: 32 }),
     __metadata("design:type", String)
 ], DataSettingsParam.prototype, "key", void 0);
+__decorate([
+    (0, DataMember_1.StringDataMember)({ code: GNParameterCode_1.GNParameterCode.DisplayName, minLength: 2, maxLength: 64 }),
+    __metadata("design:type", String)
+], DataSettingsParam.prototype, "displayName", void 0);
 __decorate([
     (0, DataMember_1.NumberDataMember)({ code: GNParameterCode_1.GNParameterCode.Permission, mustInt: true }),
     __metadata("design:type", Number)
@@ -70537,7 +70638,9 @@ class MultiplayerBaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = {};
             if (attribute != null && matchmakingQueueSettings.rules != null) {
-                let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, null);
+                let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId, {
+                    playerDatas: true,
+                });
                 if (gamePlayer != null) {
                     for (let i = 0; i < matchmakingQueueSettings.rules.length; i++) {
                         let matchmakingRules = matchmakingQueueSettings.rules[i];
@@ -74967,6 +75070,39 @@ __decorate([
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -74976,9 +75112,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AnalyticsService = void 0;
 const xDatetime_1 = __webpack_require__(21817);
+const systeminformation_1 = __importDefault(__webpack_require__(90333));
+const mongoDB = __importStar(__webpack_require__(12518));
 class AnalyticsService {
     setGNServer(gnServer) {
         this.gnServer = gnServer;
@@ -75001,8 +75142,11 @@ class AnalyticsService {
                     MNUSince0h1: this.currentMNUSince0h1,
                     MRT: this.currentMRT,
                     MRTSince0h1: this.currentMRTSince0h1,
-                    analyticsPrice: this.analyticsPrice,
+                    analyticsPrice: this.currentAnalyticsPrice,
                     country: this.currentCountry,
+                    operationSystem: this.currentOperationSystem,
+                    requestComplete: this.currentRequestComplete,
+                    databaseSystem: this.currentDatabaseSystem,
                 };
             }
             else {
@@ -75025,6 +75169,9 @@ class AnalyticsService {
                         MRTSince0h1: 0,
                         analyticsPrice: 0,
                         country: null,
+                        operationSystem: null,
+                        requestComplete: null,
+                        databaseSystem: null,
                     };
                 }
                 else {
@@ -75044,6 +75191,9 @@ class AnalyticsService {
                         MRTSince0h1: result["mrtSince0h1"],
                         analyticsPrice: result["analyticsPrice"],
                         country: result["country"],
+                        operationSystem: result["operationSystem"],
+                        requestComplete: result["requestComplete"],
+                        databaseSystem: result["databaseSystem"],
                     };
                 }
             }
@@ -75073,9 +75223,9 @@ class AnalyticsService {
             let currentMilliseconds = xDatetime_1.xDatetime.getCurrentMilliseconds();
             let millisecondsSince0h = xDatetime_1.xDatetime.getToday0hMilliseconds();
             let playerCollection = this.gnServer.getDatabase().systemCollection("MasterPlayer");
+            let millisecondsAt15MinutesAgo = currentMilliseconds - 15 * xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND;
             // CCU
             {
-                let millisecondsAt15MinutesAgo = currentMilliseconds - 15 * xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND;
                 this.currentCCU = yield playerCollection.countDocuments({
                     tsLastLogin: {
                         $gt: millisecondsAt15MinutesAgo
@@ -75083,8 +75233,7 @@ class AnalyticsService {
                 });
             }
             {
-                let millisecondsAt15MinutesAgo = currentMilliseconds - 15 * xDatetime_1.xDatetime.ONE_MINUTE_MILLISECOND;
-                this.analyticsPrice = yield this.gnServer.getDatabase().systemCollection("StoreAnalytics").countDocuments({
+                this.currentAnalyticsPrice = yield this.gnServer.getDatabase().systemCollection("StoreAnalytics").countDocuments({
                     tsLastLogin: {
                         $gt: millisecondsAt15MinutesAgo
                     }
@@ -75220,6 +75369,76 @@ class AnalyticsService {
                 }
                 this.currentCountry = gnCountrys;
             }
+            {
+                const cpu = yield systeminformation_1.default.currentLoad();
+                const memory = yield systeminformation_1.default.mem();
+                const fsSize = yield systeminformation_1.default.fsSize();
+                let storageUsage = [];
+                for (let i = 0; i < fsSize.length; i++) {
+                    let storage = fsSize[i];
+                    storageUsage.push({
+                        name: storage.mount,
+                        fsTotalSizeInBytes: storage.size,
+                        fsUsedSizeInBytes: storage.used
+                    });
+                }
+                this.currentOperationSystem = {
+                    cpuUsage: cpu.currentLoad,
+                    memoryUsage: {
+                        freeMemoryInBytes: memory.free,
+                        totalMemoryInBytes: memory.total,
+                    },
+                    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 stats = yield this.gnServer.getDatabase().getDb().stats();
+                if (stats.ok == 1) {
+                    this.currentDatabaseSystem = {
+                        collections: stats.collections,
+                        fsTotalSizeInBytes: stats.fsTotalSize,
+                        fsUsedSizeInBytes: stats.fsUsedSize,
+                        indexes: stats.indexes,
+                        objects: stats.objects,
+                        totalSizeInBytes: stats.totalSize,
+                    };
+                }
+            }
         });
     }
     saveAnalytics() {
@@ -75243,8 +75462,11 @@ class AnalyticsService {
                 mnuSince0h1: this.currentMNUSince0h1,
                 mrt: this.currentMRT,
                 mrtSince0h1: this.currentMRTSince0h1,
-                analyticsPrice: this.analyticsPrice,
+                analyticsPrice: this.currentAnalyticsPrice,
                 country: this.currentCountry,
+                operationSystem: this.currentOperationSystem,
+                requestComplete: this.currentRequestComplete,
+                databaseSystem: this.currentDatabaseSystem,
                 tsCreate: currentDate.getTime()
             });
         });
@@ -80251,6 +80473,22 @@ GNParameterCode.Sound = "sound";
 GNParameterCode.Title = "title";
 GNParameterCode.Body = "body";
 GNParameterCode.TargetPlatforms = "targetPlatforms";
+GNParameterCode.OperationSystem = "operationSystem";
+GNParameterCode.RequestComplete = "requestComplete";
+GNParameterCode.CpuUsage = "cpuUsage";
+GNParameterCode.MemoryUsage = "memoryUsage";
+GNParameterCode.StorageUsage = "storageUsage";
+GNParameterCode.FreeMemoryInBytes = "freeMemoryInBytes";
+GNParameterCode.TotalMemoryInBytes = "totalMemoryInBytes";
+GNParameterCode.ErrorCode = "errorCode";
+GNParameterCode.Count = "count";
+GNParameterCode.FsTotalSizeInBytes = "fsTotalSizeInBytes";
+GNParameterCode.FsUsedSizeInBytes = "fsUsedSizeInBytes";
+GNParameterCode.TotalSizeInBytes = "totalSizeInBytes";
+GNParameterCode.Collections = "collections";
+GNParameterCode.Objects = "objects";
+GNParameterCode.Indexes = "indexes";
+GNParameterCode.DatabaseSystem = "databaseSystem";
 
 
 /***/ }),
@@ -85605,9 +85843,10 @@ class xMail {
     }
     init(sendGridApiKey, fromEmail) {
         this.isInit = false;
+        let oldSendGridApiKey = this.sendGridApiKey;
         this.sendGridApiKey = sendGridApiKey;
         this.fromEmail = fromEmail;
-        if (this.sendGridApiKey != sendGridApiKey) {
+        if (oldSendGridApiKey != sendGridApiKey) {
             this.needSetup = true;
         }
     }
@@ -85709,10 +85948,13 @@ class xPushNotification {
     }
     init(projectId, clientEmail, privateKey) {
         this.isInit = false;
+        let oldProjectId = this.projectId;
+        let oldClientEmail = this.clientEmail;
+        let oldPrivateKey = this.privateKey;
         this.projectId = projectId;
         this.clientEmail = clientEmail;
         this.privateKey = privateKey;
-        if (this.projectId != projectId || this.clientEmail != clientEmail || this.privateKey != privateKey) {
+        if (oldProjectId != projectId || oldClientEmail != clientEmail || oldPrivateKey != privateKey) {
             this.needSetup = true;
         }
     }
@@ -86372,7 +86614,6 @@ class ServerApplication extends BuilderBase {
                     fullLogPath = process.cwd() + "/" + configFullLogPath;
                 }
             }
-            console.log(fullLogPath);
             console.log("[GN] FullLogPath at: " + fullLogPath);
             xDebug_1.Debug.init({
                 isLogToConsoleEnable: this.getLogSettings().getLogToConsoleEnable(),
@@ -87304,7 +87545,7 @@ class ServerApplication extends BuilderBase {
                 yield this.gnServer.getDatabase().createCollection("System.AdapterEvent", {
                     capped: true,
                     size: 5120000,
-                    max: 100000
+                    max: 50000
                 });
                 let adapterEventCollection = this.gnServer.getDatabase().systemCollection("AdapterEvent");
                 yield adapterEventCollection.createIndex({ "createdAt": 1 }, { expireAfterSeconds: 60, background: true, name: "createdAt_1" });
@@ -87315,11 +87556,11 @@ class ServerApplication extends BuilderBase {
             {
                 yield this.gnServer.getDatabase().createCollection("System.EventCallback.Post", {
                     capped: true,
-                    size: 51200000000,
-                    max: 100000000
+                    size: 512000000,
+                    max: 100000
                 });
-                let postEventCallbackPostCollection = this.gnServer.getDatabase().systemCollection("EventCallback.Post");
-                yield postEventCallbackPostCollection.createIndex({ "eventName": 1, "_id": -1 }, { background: true, name: "eventName_1_id_-1" });
+                // let postEventCallbackPostCollection = this.gnServer.getDatabase().systemCollection("EventCallback.Post");
+                // await postEventCallbackPostCollection.createIndex({ "eventName": 1, "_id": -1 }, { background: true, name: "eventName_1_id_-1" });
             }
             {
                 let cloudScriptFunctionCollection = this.gnServer.getDatabase().systemCollection("EventCallback.CloudScript");
@@ -91760,6 +92001,13 @@ module.exports = require("socket.io");
 
 /***/ }),
 
+/***/ 90333:
+/***/ ((module) => {
+
+module.exports = require("systeminformation");
+
+/***/ }),
+
 /***/ 35317:
 /***/ ((module) => {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmobitea/gn-server",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "Game Networking Server by XmobiTea (Pro)",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -40,7 +40,7 @@
     "@socket.io/mongo-emitter": "^0.2.0",
     "@types/crypto-js": "^4.2.2",
     "@types/node": "^22.10.5",
-    "@xmobitea/gn-typescript-client": "^2.4.1",
+    "@xmobitea/gn-typescript-client": "^2.4.2",
     "async-lock": "^1.4.1",
     "async-middleware": "^1.2.1",
     "axios": "^1.7.9",
@@ -59,7 +59,8 @@
     "mongodb": "^6.12.0",
     "multer": "^1.4.5-lts.1",
     "reflect-metadata": "^0.2.2",
-    "socket.io": "^4.8.1"
+    "socket.io": "^4.8.1",
+    "systeminformation": "^5.25.11"
   },
   "repository": {
     "type": "git",