Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle server-side endpoint change requests #161

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle server-side endpoint change requests #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions pgoapi/pgoapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def set_position(self, lat, lng, alt):
self._position_alt = alt

def create_request(self):
request = PGoApiRequest(self._api_endpoint, self._auth_provider, self._position_lat, self._position_lng, self._position_alt)
request = PGoApiRequest(self._api_endpoint, self._auth_provider, self._position_lat, self._position_lng, self._position_alt, self)
return request

def __getattr__(self, func):
Expand Down Expand Up @@ -124,35 +124,24 @@ def login(self, provider, username, password, lat = None, lng = None, alt = None
request.download_settings(hash="05daf51635c82611d1aac95c0b051d3ec088a930")

response = request.call()
else:
self.log.info('Starting minimal RPC login sequence')
response = self.get_player()

if not response:
self.log.info('Login failed!')
return False

if 'api_url' in response:
self._api_endpoint = ('https://{}/rpc'.format(response['api_url']))
self.log.debug('Setting API endpoint to: %s', self._api_endpoint)
else:
self.log.error('Login failed - unexpected server response!')
return False
if not response:
self.log.info('Login failed!')
return False

if app_simulation:
self.log.info('Finished RPC login sequence (app simulation)')
else:
self.log.info('Finished minimal RPC login sequence')

self.log.info('Login process completed')

return True


class PGoApiRequest:
def __init__(self, api_endpoint, auth_provider, position_lat, position_lng, position_alt):
def __init__(self, api_endpoint, auth_provider, position_lat, position_lng, position_alt, pgoapi=None):
self.log = logging.getLogger(__name__)

self._pgoapi = pgoapi

""" Inherit necessary parameters """
self._api_endpoint = api_endpoint
self._auth_provider = auth_provider
Expand All @@ -178,10 +167,20 @@ def call(self):

self.log.info('Execution of RPC')
response = None
try:
response = request.request(self._api_endpoint, self._req_method_list, self.get_position())
except ServerBusyOrOfflineException as e:
self.log.info('Server seems to be busy or offline - try again!')
retry = True
while retry:
retry = False
try:
response = request.request(self._api_endpoint, self._req_method_list, self.get_position())
except ServerBusyOrOfflineException as e:
self.log.info('Server seems to be busy or offline - try again!')
if isinstance(response, dict) and 'status_code' in response:
if response['status_code'] == 53:
self._api_endpoint = 'https://{}/rpc'.format(response['api_url'])
self.log.info('Server requested to change endpoint to %s, retrying request on new endpoint', self._api_endpoint)
if self._pgoapi:
self._pgoapi._api_endpoint = self._api_endpoint
retry = True

# cleanup after call execution
self.log.info('Cleanup of request!')
Expand Down