Add proxy usage option, take 2

docs/first-run/commandline.md

@@ -22,7 +22,7 @@
                     [-nr] [-nk] [-ss [SPAWNPOINT_SCANNING]] [-speed] [-spin]
                     [-ams ACCOUNT_MAX_SPINS] [-kph KPH] [-hkph HLVL_KPH]
                     [-ldur LURE_DURATION] [--dump-spawnpoints]
-                    [-pd PURGE_DATA] [-px PROXY] [-pxsc]
+                    [-pd PURGE_DATA] [-px PROXY] [-pxsc] [-pxu PROXY_USAGE]
                     [-pxt PROXY_TEST_TIMEOUT] [-pxre PROXY_TEST_RETRIES]
                     [-pxbf PROXY_TEST_BACKOFF_FACTOR]
                     [-pxc PROXY_TEST_CONCURRENCY] [-pxd PROXY_DISPLAY]
@@ -57,7 +57,7 @@
     ConfigArgParse documentation. If an arg is specified in more than one place,
     then commandline values override environment variables which override config
     file values which override defaults.
-    
+
     optional arguments:
       -h, --help            show this help message and exit [env var:
                             POGOMAP_HELP]
@@ -285,6 +285,9 @@
       -pxsc, --proxy-skip-check
                             Disable checking of proxies before start. [env var:
                             POGOMAP_PROXY_SKIP_CHECK]
+      -pxu PROXY_USAGE, --proxy-usage PROXY_USAGE
+                            Select which connections use proxy: ptc, niantic
+                            or all.  [env var: POGOMAP_PROXY_USAGE]
       -pxt PROXY_TEST_TIMEOUT, --proxy-test-timeout PROXY_TEST_TIMEOUT
                             Timeout settings for proxy checker in seconds. [env
                             var: POGOMAP_PROXY_TEST_TIMEOUT]
@@ -413,4 +416,3 @@
                             logs. [env var: POGOMAP_NO_FILE_LOGS]
       --log-path LOG_PATH   Defines directory to save log files to. [env var:
                             POGOMAP_LOG_PATH]
-

pogom/account.py

@@ -41,11 +41,10 @@ def setup_api(args, status, account):
         api = PGoApiWrapper(PGoApi(device_info=device_info))
 
     # New account - new proxy.
-    if args.proxy:
+    if args.proxy and args.proxy_usage != 'ptc':
         # If proxy is not assigned yet or if proxy-rotation is defined
         # - query for new proxy.
-        if ((not status['proxy_url']) or
-                (args.proxy_rotation != 'none')):
+        if not status['proxy_url'] or args.proxy_rotation != 'none':
 
             proxy_num, status['proxy_url'] = get_new_proxy(args)
             if args.proxy_display.upper() != 'FULL':
@@ -60,16 +59,16 @@ def setup_api(args, status, account):
             'https': status['proxy_url']})
         if (status['proxy_url'] not in args.proxy):
             log.warning(
-                'Tried replacing proxy %s with a new proxy, but proxy ' +
-                'rotation is disabled ("none"). If this isn\'t intentional, ' +
-                'enable proxy rotation.',
+                'Tried replacing session proxy %s with a new proxy, but ' +
+                'proxy rotation is disabled ("none"). If this isn\'t ' +
+                'intentional, enable proxy rotation.',
                 status['proxy_url'])
 
     return api
 
 
 # Use API to check the login status, and retry the login if possible.
-def check_login(args, account, api, proxy_url):
+def check_login(args, account, api):
     # Logged in? Enough time left? Cool!
     if api._auth_provider and api._auth_provider._ticket_expire:
         remaining_time = api._auth_provider._ticket_expire / 1000 - time.time()
@@ -86,7 +85,20 @@ def check_login(args, account, api, proxy_url):
     # One initial try + login_retries.
     while num_tries < (args.login_retries + 1):
         try:
-            if proxy_url:
+            if args.proxy and args.proxy_usage != 'niantic':
+                # If we still dont have any auth proxy configured or
+                # proxy rotation is set, we change the proxy
+                if not api._auth_provider or args.proxy_rotation != 'none':
+                    proxy_idx, proxy_url = get_new_proxy(args)
+                elif api._auth_provider:
+                    proxy_url = api._auth_provider._session.proxies['http']
+                    if proxy_url not in args.proxy:
+                        log.warning(
+                            'Tried replacing auth proxy %s with a new ' +
+                            'proxy, but proxy rotation is disabled  ' +
+                            '("none"). If this isn\'t intentional, enable ' +
+                            'proxy rotation.',
+                            proxy_url)
                 api.set_authentication(
                     provider=account['auth_service'],
                     username=account['username'],

pogom/captcha.py

@@ -123,7 +123,7 @@ def captcha_solver_thread(args, account_queue, account_captchas, hash_key,
         api.activate_hash_server(hash_key)
 
     proxy_url = False
-    if args.proxy:
+    if args.proxy and args.proxy_usage != 'ptc':
         # Try to fetch a new proxy
         proxy_num, proxy_url = get_new_proxy(args)
 
@@ -138,7 +138,7 @@ def captcha_solver_thread(args, account_queue, account_captchas, hash_key,
         location = jitter_location(location)
 
     api.set_position(*location)
-    check_login(args, account, api, proxy_url)
+    check_login(args, account, api)
 
     wh_message = {'status_name': args.status_name,
                   'status': 'error',

pogom/models.py

@@ -2386,15 +2386,12 @@ def encounter_pokemon(args, pokemon, account, api, account_sets, status,
 
         # If the already existent API is using a proxy but
         # it's not alive anymore, we need to get a new proxy.
-        elif (args.proxy and
+        elif (args.proxy and args.proxy_usage != 'ptc' and
               (hlvl_api._session.proxies['http'] not in args.proxy)):
             proxy_idx, proxy_new = get_new_proxy(args)
             hlvl_api.set_proxy({
                 'http': proxy_new,
                 'https': proxy_new})
-            hlvl_api._auth_provider.set_proxy({
-                'http': proxy_new,
-                'https': proxy_new})
 
         # Hashing key.
         # TODO: Rework inefficient threading.
@@ -2411,7 +2408,7 @@ def encounter_pokemon(args, pokemon, account, api, account_sets, status,
         hlvl_api.set_position(*scan_location)
 
         # Log in.
-        check_login(args, hlvl_account, hlvl_api, status['proxy_url'])
+        check_login(args, hlvl_account, hlvl_api)
         encounter_level = hlvl_account['level']
 
         # User error -> we skip freeing the account.

pogom/pgorequestwrapper.py

@@ -92,7 +92,8 @@ def call(self, *args, **kwargs):
             # the proxy worked. The variable "rotate_proxy" may seem
             # unnecessary, but it's here for readability and avoiding problems
             # in the future.
-            if rotate_proxy and self.args.proxy:
+            if (rotate_proxy and self.args.proxy and
+                    self.args.proxy_usage != 'ptc'):
                 proxy_idx, proxy_url = get_new_proxy(get_args())
 
                 if proxy_url:
@@ -103,7 +104,6 @@ def call(self, *args, **kwargs):
                     }
                     parent = self.request.__parent__
                     parent.set_proxy(proxy_config)
-                    parent._auth_provider.set_proxy(proxy_config)
 
         # If we've reached here, we have no retries left and an exception
         # still occurred.

pogom/proxy.py

@@ -28,7 +28,7 @@
 # Evaluates the status of PTC and Niantic request futures, and returns the
 # result (optionally with an error).
 # Warning: blocking! Can only get status code if request has finished.
-def get_proxy_test_status(proxy, future_ptc, future_niantic):
+def get_proxy_test_status(proxy, args, future_ptc, future_niantic):
     # Start by assuming everything is OK.
     check_result = check_result_ok
     proxy_error = None
@@ -39,8 +39,10 @@ def get_proxy_test_status(proxy, future_ptc, future_niantic):
 
     # Make sure both requests are completed.
     try:
-        ptc_response = future_ptc.result()
-        niantic_response = future_niantic.result()
+        if args.proxy_usage != 'niantic':
+            ptc_response = future_ptc.result()
+        if args.proxy_usage != 'ptc':
+            niantic_response = future_niantic.result()
     except requests.exceptions.ConnectTimeout:
         proxy_error = ('Connection timeout for'
                        + ' proxy {}.').format(proxy)
@@ -57,8 +59,15 @@ def get_proxy_test_status(proxy, future_ptc, future_niantic):
         return (proxy_error, check_result)
 
     # Evaluate response status code.
-    ptc_status = ptc_response.status_code
-    niantic_status = niantic_response.status_code
+    if args.proxy_usage == 'niantic':
+        ptc_status = 200
+        niantic_status = niantic_response.status_code
+    elif args.proxy_usage == 'ptc':
+        ptc_status = ptc_response.status_code
+        niantic_status = 200
+    else:
+        ptc_status = ptc_response.status_code
+        niantic_status = niantic_response.status_code
 
     banned_status_codes = [403, 409]
 
@@ -81,8 +90,10 @@ def get_proxy_test_status(proxy, future_ptc, future_niantic):
 
     # Explicitly release connection back to the pool, because we don't need
     # or want to consume the content.
-    ptc_response.close()
-    niantic_response.close()
+    if args.proxy_usage != 'niantic':
+        ptc_response.close()
+    if args.proxy_usage != 'ptc':
+        niantic_response.close()
 
     return (proxy_error, check_result)
 
@@ -220,6 +231,7 @@ def check_proxies(args, proxies):
     # blocking to wait for one. The double loop is intentional.
     for proxy, future_ptc, future_niantic in proxy_queue:
         error, result = get_proxy_test_status(proxy,
+                                              args,
                                               future_ptc,
                                               future_niantic)
 

pogom/search.py

@@ -851,7 +851,8 @@ def search_worker_thread(args, account_queue, account_sets,
                 # If used proxy disappears from "live list" after background
                 # checking - switch account but do not freeze it (it's not an
                 # account failure).
-                if args.proxy and status['proxy_url'] not in args.proxy:
+                if (args.proxy and args.proxy_usage != 'ptc' and
+                        status['proxy_url'] not in args.proxy):
                     status['message'] = (
                         'Account {} proxy {} is not in a live list any ' +
                         'more. Switching accounts...').format(
@@ -932,7 +933,7 @@ def search_worker_thread(args, account_queue, account_sets,
 
                 # Ok, let's get started -- check our login status.
                 status['message'] = 'Logging in...'
-                check_login(args, account, api, status['proxy_url'])
+                check_login(args, account, api)
 
                 # Only run this when it's the account's first login, after
                 # check_login().
@@ -1252,7 +1253,7 @@ def get_api_version(args):
     """
     proxies = {}
 
-    if args.proxy:
+    if args.proxy and args.proxy_usage != 'ptc':
         num, proxy = get_new_proxy(args)
         proxies = {
             'http': proxy,

pogom/utils.py

@@ -333,6 +333,10 @@ def get_args():
     parser.add_argument('-px', '--proxy',
                         help='Proxy url (e.g. socks5://127.0.0.1:9050)',
                         action='append')
+    parser.add_argument('-pxu', '--proxy-usage',
+                        help=('Select which connections use proxy ' +
+                              '(all/ptc/niantic).'),
+                        type=str, default='all')
     parser.add_argument('-pxsc', '--proxy-skip-check',
                         help='Disable checking of proxies before start.',
                         action='store_true', default=False)