Merge branch 'fix_gar_proxy' into main

Author: Furtif

src/constants/index.ts

@@ -407,7 +407,7 @@ export const requestMessagesResponses = {
 	REQUEST_TYPE_METHOD_START_TEAM_LEADER_BATTLE: [3059, POGOProtos.Rpc.StartTeamLeaderBattleProto, POGOProtos.Rpc.StartTeamLeaderBattleOutProto],
 	REQUEST_TYPE_METHOD_COMPLETE_TEAM_LEADER_BATTLE: [3060, POGOProtos.Rpc.CompleteTeamLeaderBattleProto, POGOProtos.Rpc.CompleteTeamLeaderBattleOutProto],
 	REQUEST_TYPE_METHOD_GET_DEBUG_ENCOUNTER_STATISTICS_ACTION: [3061, POGOProtos.Rpc.DebugEncounterStatisticsProto, POGOProtos.Rpc.DebugEncounterStatisticsOutProto],
-	REQUEST_TYPE_METHOD_REJOIN_BATTLE_CHECK: [3062, POGOProtos.Rpc.CheckBattleRejoinProto, POGOProtos.Rpc.CheckBattleRejoinOutProto],
+	REQUEST_TYPE_METHOD_REJOIN_BATTLE_CHECK: [3062, POGOProtos.Rpc.GetBattleRejoinStatusProto, POGOProtos.Rpc.GetBattleRejoinStatusOutProto],
 	REQUEST_TYPE_METHOD_COMPLETE_ALL_QUEST: [3063, POGOProtos.Rpc.CompleteAllQuestProto, POGOProtos.Rpc.CompleteAllQuestOutProto],
 	REQUEST_TYPE_METHOD_LEAVE_WEEKLY_CHALLENGE_MATCHMAKING: [3064, POGOProtos.Rpc.LeaveWeeklyChallengeMatchmakingProto, POGOProtos.Rpc.LeaveWeeklyChallengeMatchmakingOutProto],
 	REQUEST_TYPE_METHOD_GET_PLAYER_FIELD_BOOK: [3065, POGOProtos.Rpc.GetPlayerPokemonFieldBookProto, POGOProtos.Rpc.GetPlayerPokemonFieldBookOutProto],
@@ -418,7 +418,7 @@ export const requestMessagesResponses = {
 	REQUEST_TYPE_METHOD_NATURAL_ART_POI_ENCOUNTER: [3070, POGOProtos.Rpc.NaturalArtPoiEncounterProto, POGOProtos.Rpc.NaturalArtPoiEncounterOutProto],
 	REQUEST_TYPE_METHOD_START_PVP_BATTLE: [3071, POGOProtos.Rpc.StartPvpBattleProto, POGOProtos.Rpc.StartPvpBattleOutProto],
 	REQUEST_TYPE_METHOD_COMPLETE_PVP_BATTLE: [3072, POGOProtos.Rpc.CompletePvpBattleProto, POGOProtos.Rpc.CompletePvpBattleOutProto],
-	REQUEST_TYPE_METHOD_AUTO_CATCH_LOCATION_UPDATE: [3073, POGOProtos.Rpc.AutoCatcherProto, POGOProtos.Rpc.AutoCatcherOutProto],
+	REQUEST_TYPE_METHOD_AR_PHOTO_REWARD: [3074, null, null],
 	REQUEST_TYPE_PLATFORM_REGISTER_PUSH_NOTIFICATION: [5000, POGOProtos.Rpc.PushNotificationRegistryProto, POGOProtos.Rpc.PushNotificationRegistryOutProto],
 	REQUEST_TYPE_PLATFORM_UNREGISTER_PUSH_NOTIFICATION: [5001, null, null],
 	REQUEST_TYPE_PLATFORM_UPDATE_NOTIFICATION_STATUS: [5002, POGOProtos.Rpc.UpdateNotificationProto, POGOProtos.Rpc.UpdateNotificationOutProto],

src/parser/proto-parser.ts

@@ -1,8 +1,25 @@
 import { b64Decode } from "../utils";
 import { requestMessagesResponses } from "../constants";
 import { DecodedProto } from "../types";
+import POGOProtos from "@na-ji/pogo-protos";
 
 let action_social = 0;
+let action_gar_proxy = 0;
+
+function DecoderInternalGarPayloadAsResponse(method: number, data: any): any {
+    action_gar_proxy = 0;
+    if (!data) {
+        return {};
+    }
+
+    switch (method) {
+        case 4:
+            return POGOProtos.Rpc.InternalCreateSharedLoginTokenResponse.decode(b64Decode(data)).toJSON();
+        default:
+            return { Not_Implemented_yet: data, method: method };
+    }
+}
+
 function DecoderInternalPayloadAsResponse(method: number, data: any): any {
     action_social = 0;
     let proto_tuple: any = Object.values(requestMessagesResponses)[method];
@@ -88,7 +105,7 @@ export const decodeProto = (method: number, data: string, dataType: string): Dec
                     } else {
                         parsedData = foundMethod[1].decode(b64Decode(data)).toJSON();
                     }
-                    if (foundMethod[0] === 5012 || foundMethod[0] === 600005) {
+                    if (foundMethod[0] === 5012) {
                         action_social = parsedData.action;
                         Object.values(requestMessagesResponses).forEach(val => {
                             let req: any = val;
@@ -97,6 +114,17 @@ export const decodeProto = (method: number, data: string, dataType: string): Dec
                             }
                         });
                     }
+                    else if (foundMethod[0] === 600005) {
+                        action_gar_proxy = parsedData.action;
+                        switch (action_gar_proxy) {
+                            case 4:
+                                parsedData.payload = POGOProtos.Rpc.InternalGarAccountInfoProto.decode(b64Decode(parsedData.payload)).toJSON();
+                                break;
+                            default:
+                                break;
+                        }
+
+                    }
                     returnObject = {
                         methodId: foundMethod[0],
                         methodName: remasterOrCleanMethodString(foundMethodString),
@@ -136,8 +164,8 @@ export const decodeProto = (method: number, data: string, dataType: string): Dec
                     if (foundMethod[0] === 5012 && action_social > 0 && parsedData.payload) {
                         parsedData.payload = DecoderInternalPayloadAsResponse(action_social, parsedData.payload);
                     }
-                    else if (foundMethod[0] === 600005 && action_social > 0 && parsedData.payload) {
-                        parsedData.payload = DecoderInternalPayloadAsResponse(action_social, parsedData.payload);
+                    else if (foundMethod[0] === 600005 && action_gar_proxy > 0 && parsedData.payload) {
+                        parsedData.payload = DecoderInternalGarPayloadAsResponse(action_gar_proxy, parsedData.payload);
                     }
                     returnObject = {
                         methodId: foundMethod[0],