Merge pull request #947 from doronz88/bugfix/tunnel-option-close

cli_common: fix closing of non-required tunnel connections (#940)

pymobiledevice3/__main__.py

@@ -126,9 +126,10 @@ def main() -> None:
  except DeveloperModeIsNotEnabledError:
  logger.error('Developer Mode is disabled. You can try to enable it using: '
  'python3 -m pymobiledevice3 amfi enable-developer-mode')
- except InvalidServiceError:
- if 'developer' in sys.argv and '--tunnel' not in sys.argv:
- sys.argv += ['--tunnel', '']
+ except InvalidServiceError as e:
+ logger.warning('Trying again over tunneld since it is a developer command')
+ if (e.identifier is not None) and ('developer' in sys.argv) and ('--tunnel' not in sys.argv):
+ sys.argv += ['--tunnel', e.identifier]
  return main()
  logger.error(INVALID_SERVICE_MESSAGE)
  except NoDeviceSelectedError:

pymobiledevice3/cli/cli_common.py

@@ -247,7 +247,7 @@ def tunneld(self, ctx, param: str, udid: Optional[str] = None) -> Optional[Remot
  for rsd in rsds:
  if rsd == self.service_provider:
  continue
- rsd.close()
+ get_asyncio_loop().run_until_complete(rsd.close())
 
  return self.service_provider
 

pymobiledevice3/exceptions.py

@@ -225,7 +225,10 @@ class DeveloperModeError(PyMobileDevice3Exception):
 
 class LockdownError(PyMobileDevice3Exception):
  """ lockdown general error """
- pass
+
+ def __init__(self, message: str, identifier: Optional[str] = None) -> None:
+ super().__init__(message)
+ self.identifier = identifier
 
 
 class GetProhibitedError(LockdownError):

pymobiledevice3/lockdown.py

@@ -562,11 +562,11 @@ def _request(self, request: str, options: Mapping = None, verify_request: bool =
  'MissingValue': MissingValueError,
  'InvalidService': InvalidServiceError,
  'InvalidConnection': InvalidConnectionError, }
- raise exception_errors.get(error, LockdownError)(error)
+ raise exception_errors.get(error, LockdownError)(error, self.identifier)
 
  # iOS < 5: 'Error' is not present, so we need to check the 'Result' instead
  if response.get('Result') == 'Failure':
- raise LockdownError()
+ raise LockdownError('', self.identifier)
 
  return response