@xmobitea/gn-server 2.4.12 → 2.4.14

package/dist/GN-library/xdatabase/lib/entity/pro/MongoObject.d.ts

@@ -4,6 +4,7 @@ export declare class MongoObject {
     private static readonly EMPTY_STR;
     private readonly collection;
     protected readonly _id: mongoDB.ObjectId;
+    protected readonly originResult: mongoDB.WithId<mongoDB.Document>;
     private updateFilter;
     constructor(result: mongoDB.WithId<mongoDB.Document>, collection: mongoDB.Collection<mongoDB.Document>);
     protected inc(field: string, value: number): void;
@@ -16,5 +17,6 @@ export declare class MongoObject {
     protected setOnInsert(field: string, value: any): void;
     protected unset(field: string): void;
     getObjectId(): mongoDB.ObjectId;
+    getOriginResult(): mongoDB.WithId<mongoDB.Document>;
     saveAsync(): Promise<mongoDB.UpdateResult>;
 }

package/dist/index.js

@@ -15365,8 +15365,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 +15390,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();
+                        }
                     }
                 }
             }
@@ -15413,16 +15421,8 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.ItemNotFound);
                     return operationResponse;
                 }
-                let result = {
-                    type: "Group",
-                    gameId: request.gameId,
-                    log: request.log,
-                    tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
-                    objs: yield this.deleteGroup(group, request.gameId),
-                };
                 let groupId = group.getGroupId();
-                this.gnServer.getDatabase().systemGameCollection("Group", request.gameId).deleteOne({ groupId: groupId });
-                this.gnServer.getDatabase().runtimeCollection("DeleteInDatabaseLog").insertOne(result);
+                let objs = yield this.deleteGroup(group, request.gameId);
                 let allMembers = group.getAllMembers();
                 for (let i = 0; i < allMembers.length; i++) {
                     let member = allMembers[i];
@@ -15430,18 +15430,31 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     if (memberId.length == 11) {
                         let characterPlayer = yield this.gnServer.getDatabase().loadCharacterPlayerAsync(memberId, request.gameId);
                         if (characterPlayer != null) {
-                            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) {
-                            gamePlayer.removePlayerGroup(groupId);
-                            gamePlayer.saveAsync();
+                            if (gamePlayer.hasPlayerGroup(groupId)) {
+                                gamePlayer.removePlayerGroup(groupId);
+                                gamePlayer.saveAsync();
+                            }
                         }
                     }
                 }
+                let result = {
+                    type: "Group",
+                    gameId: request.gameId,
+                    log: request.log,
+                    tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
+                    objs: objs,
+                };
+                this.gnServer.getDatabase().systemGameCollection("Group", request.gameId).deleteOne({ groupId: groupId });
+                this.gnServer.getDatabase().runtimeCollection("DeleteInDatabaseLog").insertOne(result);
             }
             else {
                 operationResponse.setParameter(ParameterCode_1.ParameterCode.ErrorCode, GNErrorCode_1.GNErrorCode.ItemNotFound);
@@ -15455,6 +15468,10 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
     deleteMasterPlayer(masterPlayer) {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
+            answer.push({
+                type: "MasterPlayer",
+                obj: masterPlayer.getOriginResult()
+            });
             let gameIds = this.gnServer.getGameIds();
             let userId = masterPlayer.getUserId();
             for (let i = 0; i < gameIds.length; i++) {
@@ -15462,7 +15479,11 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                 let gamePlayer = yield this.gnServer.getDatabase().loadGamePlayerAsync(userId, gameId);
                 if (gamePlayer != null) {
                     let results = yield this.deleteGamePlayer(gamePlayer, gameId);
-                    answer.push(...results);
+                    answer.push({
+                        type: "GamePlayer",
+                        gameId: gameId,
+                        objs: results
+                    });
                     this.gnServer.getDatabase().systemGameCollection("GamePlayer", gameId).deleteOne({ userId: userId });
                 }
             }
@@ -15520,6 +15541,10 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
     deleteGamePlayer(gamePlayer, gameId) {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
+            answer.push({
+                type: "GamePlayer",
+                obj: gamePlayer.getOriginResult()
+            });
             let userId = gamePlayer.getUserId();
             {
                 let playerCharacters = gamePlayer.getAllPlayerCharacters();
@@ -15552,7 +15577,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "Group.Message",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15587,7 +15611,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "GamePlayer.CurrencyLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15600,7 +15623,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "GamePlayer.StatisticsLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15621,7 +15643,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                         backupStatisticsCollection.updateOne({ _id: result._id }, { $set: { results: backupResults } });
                         answer.push({
                             type: "GamePlayer.StatisticsBackup",
-                            gameId: gameId,
                             obj: {
                                 key: result.key,
                                 version: result.version,
@@ -15638,7 +15659,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "StoreInventory.StoreLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15650,6 +15670,10 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
     deleteCharacterPlayer(characterPlayer, gameId) {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
+            answer.push({
+                type: "CharacterPlayer",
+                obj: characterPlayer.getOriginResult()
+            });
             let characterId = characterPlayer.getCharacterId();
             {
                 let playerFriends = characterPlayer.getAllPlayerFriends();
@@ -15670,7 +15694,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "Group.Message",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15705,7 +15728,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "CharacterPlayer.CurrencyLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15718,7 +15740,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "CharacterPlayer.StatisticsLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15739,7 +15760,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                         backupStatisticsCollection.updateOne({ _id: result._id }, { $set: { results: backupResults } });
                         answer.push({
                             type: "CharacterPlayer.StatisticsBackup",
-                            gameId: gameId,
                             obj: {
                                 key: result.key,
                                 version: result.version,
@@ -15756,7 +15776,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "StoreInventory.StoreLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15768,6 +15787,10 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
     deleteInventory(inventory, gameId) {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
+            answer.push({
+                type: "Inventory",
+                obj: inventory.getOriginResult()
+            });
             let itemId = inventory.getItemId();
             {
                 let statisticsLogCollection = this.gnServer.getDatabase().runtimeGameCollection("Inventory.StatisticsLog", gameId);
@@ -15776,7 +15799,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "Inventory.StatisticsLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15797,7 +15819,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                         backupStatisticsCollection.updateOne({ _id: result._id }, { $set: { results: backupResults } });
                         answer.push({
                             type: "Inventory.StatisticsBackup",
-                            gameId: gameId,
                             obj: {
                                 key: result.key,
                                 version: result.version,
@@ -15813,6 +15834,10 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
     deleteGroup(group, gameId) {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
+            answer.push({
+                type: "Group",
+                obj: group.getOriginResult()
+            });
             let groupId = group.getGroupId();
             {
                 let groupMessageCollection = this.gnServer.getDatabase().runtimeGameCollection("Group.Message", gameId);
@@ -15821,7 +15846,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "Group.Message",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15847,7 +15871,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "Group.CurrencyLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15860,7 +15883,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "Group.StatisticsLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15881,7 +15903,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                         backupStatisticsCollection.updateOne({ _id: result._id }, { $set: { results: backupResults } });
                         answer.push({
                             type: "Group.StatisticsBackup",
-                            gameId: gameId,
                             obj: {
                                 key: result.key,
                                 version: result.version,
@@ -15898,7 +15919,6 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
                     let result = yield results.next();
                     answer.push({
                         type: "StoreInventory.StoreLog",
-                        gameId: gameId,
                         obj: result,
                     });
                 }
@@ -15911,7 +15931,9 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
             let userId = gamePlayer.getUserId();
-            friendPlayer.removePlayerFriend(userId);
+            if (friendPlayer.hasPlayerFriend(userId)) {
+                friendPlayer.removePlayerGroup(userId);
+            }
             return answer;
         });
     }
@@ -15919,7 +15941,9 @@ class DeleteInDatabaseRequestHandler extends RequestHandler_1.RequestHandler {
         return __awaiter(this, void 0, void 0, function* () {
             let answer = [];
             let characterId = characterPlayer.getCharacterId();
-            friendPlayer.removePlayerFriend(characterId);
+            if (friendPlayer.hasPlayerFriend(characterId)) {
+                friendPlayer.removePlayerGroup(characterId);
+            }
             return answer;
         });
     }
@@ -15927,7 +15951,9 @@ 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);
             return answer;
@@ -15937,7 +15963,9 @@ 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);
             return answer;
@@ -22915,30 +22943,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: {
@@ -84887,6 +84915,7 @@ class MongoObject {
     constructor(result, collection) {
         this.collection = collection;
         this._id = result[MongoObject.__id];
+        this.originResult = result;
     }
     inc(field, value) {
         if (this.updateFilter == null)
@@ -84973,6 +85002,9 @@ class MongoObject {
     getObjectId() {
         return this._id;
     }
+    getOriginResult() {
+        return this.originResult;
+    }
     saveAsync() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.updateFilter == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmobitea/gn-server",
-  "version": "2.4.12",
+  "version": "2.4.14",
   "description": "Game Networking Server by XmobiTea (Pro)",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",