poke-go-api 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e2737346452ed25a9d5d7844df4a7389fdbd31
-  data.tar.gz: b7695c8567f9e12971a8e2002f5e4962d4625802
+  metadata.gz: e7174fe383036d773b7b7835987f7afe081b430f
+  data.tar.gz: f5c36de9678ac660b4b20359f2b5aa3dd797b71b
 SHA512:
-  metadata.gz: 507f26d5261a1a5257bb44c1d5c36755a825d33b1ee1ee82a00155a8596adeaec523ac77522ea053779711a4bb4e85ad8c4fd809e9a9c4175693328faba35a2a
-  data.tar.gz: a9554db26d2c2fce91d246d0dd1ff70d8009f4a2ec9b44c64f9caef53dfb4cf01a842abc4f38d28622f878abbc4d3e9a93b6a5c45ad0da0ec39148df56339f62
+  metadata.gz: 54dc83f4ff668d16e0b212070f01a2c4f2c7f377619a8f4f6b02d93b183c3790287f90088ec5d6d0a67d5487177e9724ccc9e65409370fe67bc64ed41f1c3c5a
+  data.tar.gz: cf57382065fd8ba7d48933a892c221249840619b87117c2dcaf99364c55cbd15b7b4d72d2e5c52e3068d480d917fc7aa95fba5c9a1d546acda85b095a9db1c2e

data/lib/poke-api/auth/ptc.rb

@@ -62,7 +62,7 @@ module Poke
             code: ticket
           }
 
-          resp = URI.decode_www_form(@client.post(PTC_LOGIN_OAUTH, data).body).to_h
+          resp = Hash[URI.decode_www_form(@client.post(PTC_LOGIN_OAUTH, data).body)]
           @access_token = resp['access_token']
           @expiry = resp['expires'].to_i + Helpers.fetch_time(ms: false)
         end

data/lib/poke-api/client.rb

@@ -3,7 +3,9 @@ module Poke
     class Client
       include Logging
       attr_accessor :endpoint, :sig_loaded, :refresh_token,
-                    :lat, :lng, :alt, :http_client, :ticket
+                    :lat, :lng, :alt, :http_client, :ticket,
+                    :android_gps_info, :sensor_info, :device_info,
+                    :activity_status, :location_fix
       attr_reader   :sig_path, :auth
 
       def initialize
@@ -41,7 +43,7 @@ module Poke
         begin
           resp = req.request(@reqs, self)
         rescue StandardError => ex
-          raise Errors::UnknownProtoFault, ex
+          error(ex)
         ensure
           @reqs = []
           logger.info '[+] Cleaning up RPC requests'
@@ -80,7 +82,11 @@ module Poke
       private
 
       def initialize_ticket
-        get_hatched_eggs
+        mark_tutorial_complete(
+          tutorials_completed: [0],
+          send_marketing_emails: false,
+          send_push_notifications: false
+        )
         call
       end
 
@@ -99,6 +105,14 @@ module Poke
         end
       end
 
+      def error(ex)
+        if Poke::API::Errors.constants.include?(ex.class.to_s.split('::').last.to_sym)
+          raise ex.class
+        end
+
+        raise Errors::UnknownProtoFault, ex
+      end
+
       def method_missing(method, *args)
         POGOProtos::Networking::Requests::RequestType.const_get(method.upcase)
         @reqs << (args.empty? ? method.to_sym.upcase : { method.to_sym.upcase => args.first })

data/lib/poke-api/errors.rb

@@ -32,7 +32,7 @@ module Poke
       end
 
       class GoogleTwoFactorAuthenticationFailure < StandardError
-        def initialize(response)
+        def initialize
           super("Two-factor authentication not supported. Create an app-specific password to log in.")
         end
       end
@@ -66,6 +66,12 @@ module Poke
           super("Level #{level} is invalid, must be between 0 and 30.")
         end
       end
+
+      class ForbiddenAccess < StandardError
+        def initialize
+          super("Your host is unable to receive a response as it is banned.")
+        end
+      end
     end
   end
 end

data/lib/poke-api/helpers.rb

@@ -27,7 +27,7 @@ module Poke
         def generate_location_two(pos)
           location_bytes = d2h(pos[0]) + d2h(pos[1]) + d2h(pos[2])
 
-          XXhash.xxh32(location_bytes, seed=0x1B845238)
+          XXhash.xxh32(location_bytes, 0x1B845238)
         end 
 
         def generate_request(auth_ticket, request)
@@ -53,7 +53,7 @@ module Poke
           next_cell = s2_cell.next
           prev_cell = s2_cell.prev
 
-          radius.times.reduce([s2_cell.id]) do |acc, el|
+          radius.times.reduce([s2_cell.id]) do |acc, _|
             acc += [next_cell.id, prev_cell.id]
             next_cell = next_cell.next
             prev_cell = prev_cell.prev

data/lib/poke-api/pogoprotos/pogoprotos_data.rb

@@ -51,6 +51,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :equipped_badge, :message, 12, "POGOProtos.Data.Player.EquippedBadge"
     optional :contact_settings, :message, 13, "POGOProtos.Data.Player.ContactSettings"
     repeated :currencies, :message, 14, "POGOProtos.Data.Player.Currency"
+    optional :remaining_codename_claims, :int32, 15
   end
   add_message "POGOProtos.Data.AssetDigestEntry" do
     optional :asset_id, :string, 1

data/lib/poke-api/pogoprotos/pogoprotos_data_logs.rb

@@ -18,12 +18,13 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :result, :enum, 1, "POGOProtos.Data.Logs.CatchPokemonLogEntry.Result"
     optional :pokemon_id, :enum, 2, "POGOProtos.Enums.PokemonId"
     optional :combat_points, :int32, 3
-    optional :pokemon_data_id, :uint64, 4
+    optional :pokemon_data_id, :fixed64, 4
   end
   add_enum "POGOProtos.Data.Logs.CatchPokemonLogEntry.Result" do
     value :UNSET, 0
     value :POKEMON_CAPTURED, 1
     value :POKEMON_FLED, 2
+    value :POKEMON_HATCHED, 3
   end
   add_message "POGOProtos.Data.Logs.FortSearchLogEntry" do
     optional :result, :enum, 1, "POGOProtos.Data.Logs.FortSearchLogEntry.Result"

data/lib/poke-api/pogoprotos/pogoprotos_map_fort.rb

@@ -29,11 +29,11 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :guard_pokemon_cp, :int32, 7
     optional :gym_points, :int64, 10
     optional :is_in_battle, :bool, 11
+    repeated :active_fort_modifier, :enum, 12, "POGOProtos.Inventory.Item.ItemId"
+    optional :lure_info, :message, 13, "POGOProtos.Map.Fort.FortLureInfo"
     optional :cooldown_complete_timestamp_ms, :int64, 14
     optional :sponsor, :enum, 15, "POGOProtos.Map.Fort.FortSponsor"
     optional :rendering_type, :enum, 16, "POGOProtos.Map.Fort.FortRenderingType"
-    optional :active_fort_modifier, :bytes, 12
-    optional :lure_info, :message, 13, "POGOProtos.Map.Fort.FortLureInfo"
   end
   add_message "POGOProtos.Map.Fort.FortLureInfo" do
     optional :fort_id, :string, 1

data/lib/poke-api/pogoprotos/pogoprotos_map_pokemon.rb

@@ -19,6 +19,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :pokemon_id, :enum, 1, "POGOProtos.Enums.PokemonId"
     optional :distance_in_meters, :float, 2
     optional :encounter_id, :fixed64, 3
+    optional :fort_id, :string, 4
+    optional :fort_image_url, :string, 5
   end
   add_message "POGOProtos.Map.Pokemon.MapPokemon" do
     optional :spawn_point_id, :string, 1

data/lib/poke-api/pogoprotos/pogoprotos_networking_envelopes.rb

@@ -10,19 +10,20 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "POGOProtos.Networking.Envelopes.Signature" do
     optional :timestamp_since_start, :uint64, 2
     repeated :location_fix, :message, 4, "POGOProtos.Networking.Envelopes.Signature.LocationFix"
-    optional :gps_info, :message, 5, "POGOProtos.Networking.Envelopes.Signature.AndroidGpsInfo"
+    optional :android_gps_info, :message, 5, "POGOProtos.Networking.Envelopes.Signature.AndroidGpsInfo"
     optional :sensor_info, :message, 7, "POGOProtos.Networking.Envelopes.Signature.SensorInfo"
     optional :device_info, :message, 8, "POGOProtos.Networking.Envelopes.Signature.DeviceInfo"
     optional :activity_status, :message, 9, "POGOProtos.Networking.Envelopes.Signature.ActivityStatus"
-    optional :location_hash1, :uint32, 10
-    optional :location_hash2, :uint32, 20
-    optional :unknown22, :bytes, 22
+    optional :location_hash1, :uint64, 10
+    optional :location_hash2, :uint64, 20
+    optional :session_hash, :bytes, 22
     optional :timestamp, :uint64, 23
     repeated :request_hash, :uint64, 24
+    optional :unknown25, :int64, 25
   end
   add_message "POGOProtos.Networking.Envelopes.Signature.LocationFix" do
     optional :provider, :string, 1
-    optional :timestamp_since_start, :uint64, 2
+    optional :timestamp_snapshot, :uint64, 2
     optional :latitude, :float, 13
     optional :longitude, :float, 14
     optional :horizontal_accuracy, :float, 20

data/lib/poke-api/pogoprotos/pogoprotos_networking_requests_messages.rb

@@ -93,6 +93,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :player_longitude, :double, 3
     optional :gym_latitude, :double, 4
     optional :gym_longitude, :double, 5
+    optional :client_version, :string, 6
   end
   add_message "POGOProtos.Networking.Requests.Messages.SfidaActionLogMessage" do
   end
@@ -201,7 +202,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :hash, :string, 1
   end
   add_message "POGOProtos.Networking.Requests.Messages.GetPlayerMessage" do
-    optional :app_version, :string, 1
   end
   add_message "POGOProtos.Networking.Requests.Messages.AddFortModifierMessage" do
     optional :modifier_type, :enum, 1, "POGOProtos.Inventory.Item.ItemId"

data/lib/poke-api/pogoprotos/pogoprotos_networking_responses.rb

@@ -416,6 +416,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :user_message, :string, 2
     optional :is_assignable, :bool, 3
     optional :status, :enum, 4, "POGOProtos.Networking.Responses.ClaimCodenameResponse.Status"
+    optional :updated_player, :message, 5, "POGOProtos.Data.PlayerData"
   end
   add_enum "POGOProtos.Networking.Responses.ClaimCodenameResponse.Status" do
     value :UNSET, 0
@@ -426,6 +427,15 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     value :CODENAME_CHANGE_NOT_ALLOWED, 5
   end
   add_message "POGOProtos.Networking.Responses.AddFortModifierResponse" do
+    optional :result, :enum, 1, "POGOProtos.Networking.Responses.AddFortModifierResponse.Result"
+    optional :fort_details, :message, 2, "POGOProtos.Networking.Responses.FortDetailsResponse"
+  end
+  add_enum "POGOProtos.Networking.Responses.AddFortModifierResponse.Result" do
+    value :NO_RESULT_SET, 0
+    value :SUCCESS, 1
+    value :FORT_ALREADY_HAS_MODIFIER, 2
+    value :TOO_FAR_AWAY, 3
+    value :NO_ITEM_IN_INVENTORY, 4
   end
   add_message "POGOProtos.Networking.Responses.CatchPokemonResponse" do
     optional :status, :enum, 1, "POGOProtos.Networking.Responses.CatchPokemonResponse.CatchStatus"
@@ -628,6 +638,7 @@ module POGOProtos
       ClaimCodenameResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.ClaimCodenameResponse").msgclass
       ClaimCodenameResponse::Status = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.ClaimCodenameResponse.Status").enummodule
       AddFortModifierResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.AddFortModifierResponse").msgclass
+      AddFortModifierResponse::Result = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.AddFortModifierResponse.Result").enummodule
       CatchPokemonResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.CatchPokemonResponse").msgclass
       CatchPokemonResponse::CatchStatus = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.CatchPokemonResponse.CatchStatus").enummodule
       UseItemReviveResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Networking.Responses.UseItemReviveResponse").msgclass

data/lib/poke-api/pogoprotos/pogoprotos_settings.rb

@@ -21,12 +21,19 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :deploy_attack_multiplier, :double, 5
     optional :far_interaction_range_meters, :double, 6
   end
+  add_message "POGOProtos.Settings.GpsSettings" do
+    optional :driving_warning_speed_meters_per_second, :float, 1
+    optional :driving_warning_cooldown_minutes, :float, 2
+    optional :driving_speed_sample_interval_seconds, :float, 3
+    optional :driving_speed_sample_count, :int32, 4
+  end
   add_message "POGOProtos.Settings.GlobalSettings" do
     optional :fort_settings, :message, 2, "POGOProtos.Settings.FortSettings"
     optional :map_settings, :message, 3, "POGOProtos.Settings.MapSettings"
     optional :level_settings, :message, 4, "POGOProtos.Settings.LevelSettings"
     optional :inventory_settings, :message, 5, "POGOProtos.Settings.InventorySettings"
     optional :minimum_client_version, :string, 6
+    optional :gps_settings, :message, 7, "POGOProtos.Settings.GpsSettings"
   end
   add_message "POGOProtos.Settings.InventorySettings" do
     optional :max_pokemon, :int32, 1
@@ -48,6 +55,7 @@ module POGOProtos
   module Settings
     MapSettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Settings.MapSettings").msgclass
     FortSettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Settings.FortSettings").msgclass
+    GpsSettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Settings.GpsSettings").msgclass
     GlobalSettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Settings.GlobalSettings").msgclass
     InventorySettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Settings.InventorySettings").msgclass
     LevelSettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("POGOProtos.Settings.LevelSettings").msgclass

data/lib/poke-api/pogoprotos/pogoprotos_settings_master.rb

@@ -70,6 +70,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :dodge_duration_ms, :int32, 12
     optional :minimum_player_level, :int32, 13
     optional :swap_duration_ms, :int32, 14
+    optional :dodge_damage_reduction_percent, :float, 15
   end
   add_message "POGOProtos.Settings.Master.MoveSettings" do
     optional :movement_id, :enum, 1, "POGOProtos.Enums.PokemonMove"

data/lib/poke-api/pogoprotos/setup_protobufs.rb

@@ -10,7 +10,7 @@ files.each do |file|
   fopen = File.open(file)
 
   new_body = fopen.each_line.map do |x|
-    if x =~ /require_relative_*pogo/
+    if x =~ /require_relative 'pog/i
       x = x.sub('require', 'require_relative').downcase.tr('.', '_')
     end
     x

data/lib/poke-api/request_builder.rb

@@ -64,7 +64,7 @@ module Poke
         )
 
         Signature.load_signature(client) if client.sig_path
-        Signature.create_signature(req, self) if client.sig_loaded
+        Signature.create_signature(req, self, client) if client.sig_loaded
       end
 
       def build_sub_request(req, sub_reqs)
@@ -73,8 +73,6 @@ module Poke
             append_int_request(req, sub_req)
           elsif sub_req.is_a?(Hash)
             append_hash_request(req, sub_req)
-          else
-            raise Errors::InvalidRequestEntry, sub_req
           end
         end
       end
@@ -113,7 +111,10 @@ module Poke
       end
 
       def execute_rpc_request(request)
-        @client.post(@endpoint, request)
+        resp = @client.post(@endpoint, request)
+        raise Errors::ForbiddenAccess if resp.status == 403
+
+        resp
       end
     end
   end

data/lib/poke-api/signature.rb

@@ -30,18 +30,20 @@ module Poke
         output.to_str
       end
 
-      def self.create_signature(req, client)
+      def self.create_signature(req, req_client, api_client)
         signature = POGOProtos::Networking::Envelopes::Signature.new(
-          location_hash1: Helpers.generate_location_one(req.auth_ticket.to_proto, client.position),
-          location_hash2: Helpers.generate_location_two(client.position),
-          unknown22: SecureRandom.random_bytes(32),
+          location_hash1: Helpers.generate_location_one(req.auth_ticket.to_proto, req_client.position),
+          location_hash2: Helpers.generate_location_two(req_client.position),
+          unknown25: -8537042734809897855,
           timestamp: Helpers.fetch_time,
-          timestamp_since_start: Helpers.fetch_time - client.start_time
+          timestamp_since_start: Helpers.fetch_time - req_client.start_time
         )
 
         add_requests(req, signature)
+        add_optional_signature_information(signature, api_client)
 
-        logger.debug "[+] Generated Signature \r\n#{signature.to_proto.inspect}"
+        logger.debug "[+] Generated Signature \r\n#{signature.inspect}"
+        logger.debug "[+] Generated Protobuf Signature \r\n#{signature.to_proto.inspect}"
         add_unknown6(req, signature)
       end
 
@@ -60,6 +62,22 @@ module Poke
         )
       end
 
+      def self.add_optional_signature_information(sig, api_client)
+        %i(android_gps_info sensor_info device_info activity_status location_fix).each do |i|
+          name = Helpers.camel_case_lower(i)
+
+          if api_client.send(i)
+            message = add_optional_information(name, api_client.send(i))
+            i == :location_fix ? (sig.send(i) << message) : sig.send("#{i.to_s}=", message)
+          end
+        end
+      end
+
+      def self.add_optional_information(name, client_info)
+        info_class = POGOProtos::Networking::Envelopes::Signature.const_get(name)
+        info_class.new(client_info)
+      end
+
       private_class_method :add_requests, :add_unknown6
     end
   end

data/lib/poke-api/testing.rb

@@ -25,19 +25,24 @@ require_relative 'pogoprotos/pogoprotos_networking_requests_messages'
 require_relative 'pogoprotos/pogoprotos_networking_responses'
 OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
-#Poke::API::Logging.log_level = :DEBUG
+Poke::API::Logging.log_level = :DEBUG
 client = Poke::API::Client.new
 #client.refresh_token = "1/QyOAeM7043LCkvyFfm61MXWV9UOBPutLwuLbjePhqPw"
 client.activate_signature('C:\encrypt64bit.dll')
 client.store_location('Glasgow')
-client.login('sof2er@gmail.com', 'kidureallypwnme', 'google')
+client.login('srn720', 'illi0wnz', 'ptc')
+
+
+client.location_fix = {provider: 'foo'}
+client.android_gps_info = {satellites_prn: [1]}
+client.sensor_info = {magnetometer_x: 1.2}
+client.device_info = {device_model: 'some-device'}
+client.activity_status = {cycling: false}
 
-client.get_player
-client.call
 #Get cells
 cell_ids = Poke::API::Helpers.get_cells(client.lat, client.lng)
 
-# Construct map objects call
+#Construct map objects call
 client.get_map_objects(
   latitude: client.lat,
   longitude: client.lng,

data/lib/poke-api/version.rb

@@ -1,5 +1,5 @@
 module Poke
   module API
-    VERSION = '0.1.7'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poke-go-api
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Nabeel Amjad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient