poke-go-api 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edcbf91a753d6de2dca22476e90170a4b7a5eede
-  data.tar.gz: a37f12e9e92a30701e2854bd8f9c895264611278
+  metadata.gz: f8a4ee180cf34ffc94cebb3b8bb6528b17d19382
+  data.tar.gz: b4fd14e947d0427c1ef50784525d3086b6e8fa8e
 SHA512:
-  metadata.gz: 6140ba8ffa02732f18497a42d5e09d7c4355f67a6a02700d6814cbf88a673a15bd267c96b2a783b7256e12884f2b77f7801a0d5b2bc8f835f5d5878a247f3afe
-  data.tar.gz: 9363b5ccf97b224f322f723e70d7f948ae229c44cb45abda08a63e89ffb70954db88de657ebf6948bdfe49dd3ac08d359640defdda79500fe56ba310ffa568d1
+  metadata.gz: a9a59b5cc9518cdf34390f1128771490bb382e67d57ae55c69235f4859043f2bb8074195375164a9a628e80b29b36e8ebc26dc1988bd3f148e4873c0a14959bd
+  data.tar.gz: ef2d410e34aafa7fb3d1b5f3f85b83e82b22bdf5823177f218b7c84d3f1e5b773f389e4be747c5779944768408a2575acfcbcfad873b5a75795fa09633f6071c

data/lib/poke-api/client.rb

@@ -2,7 +2,7 @@ module Poke
   module API
     class Client
       include Logging
-      attr_accessor :lat, :lng, :alt
+      attr_accessor :lat, :lng, :alt, :endpoint
 
       def initialize
         @auth     = nil
@@ -34,7 +34,7 @@ module Poke
         req = RequestBuilder.new(@auth, [@lat, @lng, @alt], @endpoint)
 
         begin
-          resp = req.request(@reqs)
+          resp = req.request(@reqs, self)
         rescue StandardError => ex
           raise Errors::UnknownProtoFault, ex
         ensure
@@ -74,15 +74,7 @@ module Poke
         check_awarded_badges
         download_settings(hash: '4a2e9bc330dae60e7b74fc85b98868ab4700802e')
 
-        resp = call.response
-
-        if !resp[:api_url] && resp[:api_url].empty?
-          logger.debug '[+] Login failed, please try again'
-          return
-        end
-
-        @endpoint = "https://#{resp[:api_url]}/rpc"
-        logger.debug "[+] Setting endpoint to #{@endpoint}"
+        call
       end
 
       def method_missing(method, *args)

data/lib/poke-api/errors.rb

@@ -42,6 +42,12 @@ module Poke
           super("Unable to login to #{provider} => [#{error} @ #{error.backtrace.first}]")
         end
       end
+
+      class InvalidEndpoint < StandardError
+        def initialize
+          super("Unable to fetch endpoint, please try to login again.")
+        end
+      end
     end
   end
 end

data/lib/poke-api/request_builder.rb

@@ -11,7 +11,7 @@ module Poke
         @client       = HTTPClient.new(agent_name: 'PokeAPI/0.0.1')
       end
 
-      def request(reqs)
+      def request(reqs, client)
         logger.debug '[+] Creating new request'
         request_proto = build_main_request(reqs)
 
@@ -19,7 +19,7 @@ module Poke
         resp = execute_rpc_request(request_proto)
 
         resp = Response.new(resp.body, reqs)
-        resp.decode_response
+        resp.decode_response(client)
 
         resp
       end
@@ -29,8 +29,8 @@ module Poke
       def build_main_request(sub_reqs)
         request_envelope = POGOProtos::Networking::Envelopes::RequestEnvelope
         req = request_envelope.new(
-          status_code: 2, 
-          request_id: 814_580_613_288_820_746_0, 
+          status_code: 2,
+          request_id: 814_580_613_288_820_746_0,
           unknown12: 989
         )
         req.latitude, req.longitude, req.altitude = @position
@@ -51,7 +51,7 @@ module Poke
           elsif sub_req.is_a?(Hash)
             append_hash_request(req, sub_req)
           else
-            raise Errors::InvalidRequestEntry.new(sub_req)
+            raise Errors::InvalidRequestEntry, sub_req
           end
         end
       end

data/lib/poke-api/response.rb

@@ -9,13 +9,14 @@ module Poke
         @request  = request
       end
 
-      def decode_response
+      def decode_response(client)
         logger.info '[+] Decoding Main RPC responses'
+        logger.debug "[+] RPC response \r\n#{@response.inspect}"
+
         @response = POGOProtos::Networking::Envelopes::ResponseEnvelope.decode(@response)
+        logger.debug "[+] Decoded RPC response \r\n#{@response.inspect}"
 
-        logger.debug "[+] Decoding RPC response \r\n#{@response.inspect}"
         logger.info '[+] Decoding Sub RPC responses'
-
         decoded_resp = parse_rpc_fields(decode_sub_responses)
 
         loop do
@@ -23,6 +24,7 @@ module Poke
           parse_rpc_fields(decoded_resp)
         end
 
+        store_endpoint(client)
         decoded_resp.merge!(status_code: @response.status_code,
                             api_url: @response.api_url, error: @response.error)
 
@@ -32,28 +34,43 @@ module Poke
 
       private
 
+      def store_endpoint(client)
+        logger.debug "[+] Current Endpoint #{client.endpoint}"
+
+        if client.endpoint == 'https://pgorelease.nianticlabs.com/plfe/rpc'
+          raise Errors::InvalidEndpoint if @response.api_url.empty?
+        end
+
+        return if @response.api_url.empty?
+
+        logger.debug "[+] Setting Endpoint to #{@response.api_url}"
+        client.endpoint = "https://#{@response.api_url}/rpc"
+      end
+
       def decode_sub_responses
         @response.returns.zip(@request).each_with_object({}) do |(resp, req), memo|
+          logger.debug "[+] Decoding Sub RPC response for #{req}\r\n#{resp.inspect}"
           proto_name, entry_name = fetch_proto_response_metadata(req)
 
-          resp = begin
+          response = begin
             POGOProtos::Networking::Responses.const_get(proto_name).decode(resp).to_hash
           rescue StandardError
             logger.error "[+] Protobuf definition mismatch/not found for #{entry_name}"
             'Mismatched/Invalid Protobuf Definition'
           end
 
-          memo[entry_name] = resp
+          logger.debug "[+] Decoded Sub RPC response \r\n#{response.inspect}"
+          memo[entry_name] = response
         end
       end
 
       def fetch_proto_response_metadata(req)
-          entry_name   = req.is_a?(Symbol) ? req : req.keys.first
-          proto_name = Poke::API::Helpers.camel_case_lower(entry_name) + 'Response'
+        entry_name = req.is_a?(Symbol) ? req : req.keys.first
+        proto_name = Poke::API::Helpers.camel_case_lower(entry_name) + 'Response'
 
-          require "poke-api/POGOProtos/Networking/Responses/#{proto_name}"
+        require "poke-api/POGOProtos/Networking/Responses/#{proto_name}"
 
-          [ proto_name, entry_name ]
+        [proto_name, entry_name]
       end
 
       def parse_rpc_fields(responses)

data/lib/poke-api/testing.rb

@@ -0,0 +1,24 @@
+# Load Poke-API related classes
+require 'pp'
+require 'pry'
+require_relative 'logging'
+require_relative 'client'
+require_relative 'helpers'
+require_relative 'request_builder'
+require_relative 'response'
+require_relative 'errors'
+require_relative 'version'
+require_relative 'auth/ptc'
+require_relative 'auth/google'
+
+# Load Google Generated POGOProtos
+require_relative 'POGOProtos/Networking/Envelopes/RequestEnvelope'
+require_relative 'POGOProtos/Networking/Envelopes/ResponseEnvelope'
+
+client = Poke::API::Client.new
+Poke::API::Logging.log_level = :DEBUG
+#client.store_lat_lng(55.864237, -4.251806)
+client.login('srn720', 'illi0wnz', 'ptc')
+#client.get_player
+#resp = client.call
+#pp resp

data/lib/poke-api/version.rb

@@ -1,5 +1,5 @@
 module Poke
   module API
-    VERSION = '0.0.7'.freeze
+    VERSION = '0.0.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poke-go-api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nabeel Amjad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -526,6 +526,7 @@ files:
 - lib/poke-api/logging.rb
 - lib/poke-api/request_builder.rb
 - lib/poke-api/response.rb
+- lib/poke-api/testing.rb
 - lib/poke-api/version.rb
 homepage: https://github.com/nabeelamjad/poke-api
 licenses: