remote: stop remoted while quic tunnel being established (#571)

Author: doronz88

pymobiledevice3/cli/remote.py

@@ -9,7 +9,7 @@
 from pymobiledevice3.exceptions import NoDeviceConnectedError
 from pymobiledevice3.remote.bonjour import get_remoted_addresses
 from pymobiledevice3.remote.remote_service_discovery import RSD_PORT, RemoteServiceDiscoveryService
-from pymobiledevice3.remote.utils import stop_remoted
+from pymobiledevice3.remote.utils import resume_remoted_if_required, stop_remoted, stop_remoted_if_required
 
 logger = logging.getLogger(__name__)
 
@@ -70,8 +70,11 @@ def rsd_info(service_provider: RemoteServiceDiscoveryService, color: bool):
 
 async def start_quic_tunnel(service_provider: RemoteServiceDiscoveryService, secrets: TextIO) -> None:
     private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+
+    stop_remoted_if_required()
     with create_core_device_tunnel_service(service_provider, autopair=True) as service:
         async with service.start_quic_tunnel(private_key, secrets_log_file=secrets) as tunnel_result:
+            resume_remoted_if_required()
             if secrets is not None:
                 print(click.style('Secrets: ', bold=True, fg='magenta') +
                       click.style(secrets.name, bold=True, fg='white'))

pymobiledevice3/remote/utils.py

@@ -9,7 +9,7 @@
 REMOTED_PATH = '/usr/libexec/remoted'
 
 
-def _get_remoted_process() -> psutil.Process:
+def get_remoted_process() -> psutil.Process:
     for process in psutil.process_iter():
         if process.pid == 0:
             # skip kernel task
@@ -21,24 +21,42 @@ def _get_remoted_process() -> psutil.Process:
             continue
 
 
-@contextlib.contextmanager
-def stop_remoted() -> Generator[None, None, None]:
+def stop_remoted_if_required() -> None:
     if platform.system() != 'Darwin':
         # only Darwin systems require it
-        yield
         return
 
-    remoted = _get_remoted_process()
+    remoted = get_remoted_process()
     if remoted.status() == 'stopped':
         # process already stopped, we don't need to do anything
-        yield
         return
 
     try:
         remoted.suspend()
     except psutil.AccessDenied:
         raise AccessDeniedError()
+
+
+def resume_remoted_if_required() -> None:
+    if platform.system() != 'Darwin':
+        # only Darwin systems require it
+        return
+
+    remoted = get_remoted_process()
+    if remoted.status() == 'running':
+        # process already running, we don't need to do anything
+        return
+
+    try:
+        remoted.resume()
+    except psutil.AccessDenied:
+        raise AccessDeniedError()
+
+
+@contextlib.contextmanager
+def stop_remoted() -> Generator[None, None, None]:
+    stop_remoted_if_required()
     try:
         yield
     finally:
-        remoted.resume()
+        resume_remoted_if_required()