pymobiledevice3 7.0.0__py3-none-any.whl → 7.0.2__py3-none-any.whl

pymobiledevice3/__main__.py

@@ -44,6 +44,7 @@ from pymobiledevice3.exceptions import (
     QuicProtocolNotSupportedError,
     RSDRequiredError,
     SetProhibitedError,
+    StartServiceError,
     TunneldConnectionError,
     UserDeniedPairingError,
 )
@@ -402,6 +403,14 @@ def invoke_cli_with_error_handling() -> bool:
         )
     except QuicProtocolNotSupportedError:
         logger.error("Encountered a QUIC protocol error.")
+    except StartServiceError as e:
+        if e.message == "ServiceProhibited" and e.service_name == "com.apple.pcapd.shim.remote":
+            logger.error(
+                f"The {e.service_name} service is USB only (at least for some iOS versions).\n"
+                "Full discussion is available in: https://github.com/doronz88/pymobiledevice3/issues/1515"
+            )
+        else:
+            logger.error(f"Failed to start: {e.service_name} with. Received error: {e.message}.")
     except click.ClickException as e:
         from typer import rich_utils
 

pymobiledevice3/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '7.0.0'
-__version_tuple__ = version_tuple = (7, 0, 0)
+__version__ = version = '7.0.2'
+__version_tuple__ = version_tuple = (7, 0, 2)
 
 __commit_id__ = commit_id = None

pymobiledevice3/exceptions.py

@@ -107,7 +107,10 @@ class PasswordRequiredError(PairingError):
 
 
 class StartServiceError(PyMobileDevice3Exception):
-    pass
+    def __init__(self, service_name: str, message: str) -> None:
+        super().__init__()
+        self.service_name = service_name
+        self.message = message
 
 
 class FatalPairingError(PyMobileDevice3Exception):

pymobiledevice3/lockdown.py

@@ -580,7 +580,7 @@ class LockdownClient(ABC, LockdownServiceProvider):
                 raise PasswordRequiredError(
                     "your device is protected with password, please enter password in device and try again"
                 )
-            raise StartServiceError(response.get("Error"))
+            raise StartServiceError(name, response.get("Error"))
         return response
 
     @_reconnect_on_remote_close

pymobiledevice3/remote/remote_service_discovery.py

@@ -105,6 +105,9 @@ class RemoteServiceDiscoveryService(LockdownServiceProvider):
                 raise PyMobileDevice3Exception(
                     f'Invalid response for RSDCheckIn: {response}. Expected "ServiceService"'
                 )
+            error = response.get("Error")
+            if error is not None:
+                raise StartServiceError(name, error)
         except Exception:
             service.close()
             raise

{pymobiledevice3-7.0.0.dist-info → pymobiledevice3-7.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 7.0.0
+Version: 7.0.2
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>

{pymobiledevice3-7.0.0.dist-info → pymobiledevice3-7.0.2.dist-info}/RECORD

@@ -7,15 +7,15 @@ misc/remotexpc_sniffer.py,sha256=EMhJusdbOhFHJCYF2TLtNABAnzAibIeq8hxRu4xaVhA,797
 misc/understanding_idevice_protocol_layers.md,sha256=FMJQ-ik2j9kFLPS15JzDZg62uk1FzxDnfHO6Nf5EM-A,19207
 misc/usbmux_sniff.sh,sha256=iWtbucOEQ9_UEFXk9x-2VNt48Jg5zrPsnUbZ_LfZxwA,212
 pymobiledevice3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymobiledevice3/__main__.py,sha256=2ZtOv3OfsWyjNNFtWR7AiHZTdPQXcfPIwEJWCiFaJUQ,15876
-pymobiledevice3/_version.py,sha256=lB_6pZBic6H_5wY9p7_cc7miE65gtXFl65pORFxuiX0,704
+pymobiledevice3/__main__.py,sha256=Ogsyro4MUVVSciEtg8kZufL81AHcjuphItnaL0BT10Q,16386
+pymobiledevice3/_version.py,sha256=Sd7srCYvlucRy8Y17pgfM_X-99Va2KsO3sfgkXAvKVo,704
 pymobiledevice3/bonjour.py,sha256=lmx3uCaiolF59AieftmTKqktNod5ZDyJ06oRZdYKHSE,13681
 pymobiledevice3/ca.py,sha256=5_Y4F-zDFX_KeDL-M_TRCKKyrRRb9h1lBE8MGTWv91o,10606
 pymobiledevice3/common.py,sha256=FZzF0BQYV5fCEUPbLo6jbt2Ig9s5YwR8AvX_iR124Ew,329
-pymobiledevice3/exceptions.py,sha256=7l1PPBxsK2Sw-LcXiZui7D6kDH92b44YDAsNg7Wtq6Y,10737
+pymobiledevice3/exceptions.py,sha256=hEAAvzGRZ4Ij9IKwu9BaBhKZAM57VEZxfcrDf76eCCA,10892
 pymobiledevice3/irecv.py,sha256=623PDDVXQGPXtNPE-134sp0Gnys7VkWmb0ZQPZ2xrsE,10570
 pymobiledevice3/irecv_devices.py,sha256=Mpp0AZYwFxqtqS9dTPdLZfxnj6UiDf8HbGGrHpsSnIA,44220
-pymobiledevice3/lockdown.py,sha256=xq4psDQir4CBIlMgRRkAZ6GxhjXPz-I6D5vdcfmjTw4,39570
+pymobiledevice3/lockdown.py,sha256=CgT3FApB3SLXbvbL3I7OFN7IkiPpSKjdxA1Zr0I6xIs,39576
 pymobiledevice3/lockdown_service_provider.py,sha256=mj5Hf3fNWdVYYUayKnLO3NWNgvD0xDMAiSIXKDcXCuk,1814
 pymobiledevice3/pair_records.py,sha256=4T32UPcBuN_4e-QFzGLoDoUBg3k7hgQh72Yo3CTi18M,6001
 pymobiledevice3/service_connection.py,sha256=7-FxkycdgzAMcPqn5j5K4z8Zj5O_EOAj67j9DhkJcOY,15041
@@ -72,7 +72,7 @@ pymobiledevice3/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 pymobiledevice3/remote/common.py,sha256=epLBlSCw8e8w2XvgsCuZfZYAwzHCQpBZ_S6U-_rl8oE,288
 pymobiledevice3/remote/module_imports.py,sha256=DwExSL1r4kkFIWmXiQpqPo-cGl4duYd33kJGyVckYuA,829
 pymobiledevice3/remote/remote_service.py,sha256=fCyzm4oT_WEorAXVHVLYnIOyTOuMGhX69Co3HkUdRYY,867
-pymobiledevice3/remote/remote_service_discovery.py,sha256=SR6W_0PkyUTUeYAQKxExId8LTKqSpF1ssVydCZSWdXw,7592
+pymobiledevice3/remote/remote_service_discovery.py,sha256=lBIGzkeM8zyOP3pRDG2sMZ_9p5gyGpvc2CxurcZ0pwc,7721
 pymobiledevice3/remote/remotexpc.py,sha256=tyGHn-IMDiM7WeGhfKMC1yH-ONEto-zCVpnvhE4i2Yw,8266
 pymobiledevice3/remote/tunnel_service.py,sha256=AmqvIb-0fUT9KzJub3QcMbtHtHuBBDh4ZKHIeAmkyk8,45961
 pymobiledevice3/remote/utils.py,sha256=RPyDYCLqe638FoPIJ7Lcmx05BJqM2PseJe9lc3Al3bM,2550
@@ -180,9 +180,9 @@ pymobiledevice3/services/web_protocol/switch_to.py,sha256=TCdVrMfsvd18o-vZ0owVrE
 pymobiledevice3/tunneld/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/tunneld/api.py,sha256=Lwl1OdhPTgX6Zqezy8T4dEcXRfaEPwyGNClioTx3fUc,2338
 pymobiledevice3/tunneld/server.py,sha256=dMEZAv_X-76l0vSalpq4x0IVkbE-MNGR77T-u1TiHuE,25752
-pymobiledevice3-7.0.0.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-pymobiledevice3-7.0.0.dist-info/METADATA,sha256=rfdl6HXQYVuK2RKltF0jDIPDkjaN42rSR8B2HphAXRg,17500
-pymobiledevice3-7.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymobiledevice3-7.0.0.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
-pymobiledevice3-7.0.0.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
-pymobiledevice3-7.0.0.dist-info/RECORD,,
+pymobiledevice3-7.0.2.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+pymobiledevice3-7.0.2.dist-info/METADATA,sha256=Q9FFjzNplZDqxJtKSt3B9GVRiCLkB3RJJdvpEQZMuYQ,17500
+pymobiledevice3-7.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymobiledevice3-7.0.2.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
+pymobiledevice3-7.0.2.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
+pymobiledevice3-7.0.2.dist-info/RECORD,,