pymobiledevice3 7.0.7__tar.gz → 7.2.0__tar.gz

{pymobiledevice3-7.0.7 → pymobiledevice3-7.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 7.0.7
+Version: 7.2.0
 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.7 → pymobiledevice3-7.2.0}/pymobiledevice3/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '7.0.7'
-__version_tuple__ = version_tuple = (7, 0, 7)
+__version__ = version = '7.2.0'
+__version_tuple__ = version_tuple = (7, 2, 0)
 
-__commit_id__ = commit_id = 'g2e159e580'
+__commit_id__ = commit_id = 'ge03294729'

pymobiledevice3-7.2.0/pymobiledevice3/cli/developer/debugserver.py

@@ -0,0 +1,279 @@
+import logging
+import os
+import plistlib
+import signal
+import struct
+import subprocess
+import sys
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from typing import Annotated, Optional
+from zipfile import ZipFile
+
+import typer
+from packaging.version import Version
+from plumbum import local
+from typer_injector import InjectingTyper
+
+from pymobiledevice3.cli.cli_common import RSDServiceProviderDep, ServiceProviderDep, print_json
+from pymobiledevice3.exceptions import RSDRequiredError
+from pymobiledevice3.lockdown import create_using_usbmux
+from pymobiledevice3.remote.remote_service_discovery import RemoteServiceDiscoveryService
+from pymobiledevice3.services.debugserver_applist import DebugServerAppList
+from pymobiledevice3.services.installation_proxy import InstallationProxyService
+from pymobiledevice3.tcp_forwarder import LockdownTcpForwarder
+
+DEBUGSERVER_CONNECTION_STEPS = """
+Follow the following connections steps from LLDB:
+
+(lldb) platform select remote-ios
+(lldb) target create /path/to/local/application.app
+(lldb) script lldb.target.module[0].SetPlatformFileSpec(lldb.SBFileSpec('/private/var/containers/Bundle/Application/<APP-UUID>/application.app'))
+(lldb) process connect connect://[{host}]:{port}   <-- ACTUAL CONNECTION DETAILS!
+(lldb) process launch
+"""
+
+
+logger = logging.getLogger(__name__)
+
+
+cli = InjectingTyper(
+    name="debugserver",
+    help="Start and drive debugserver sessions (RSD for iOS 17+, usbmux for older).",
+    no_args_is_help=True,
+)
+
+
+@cli.command("applist")
+def debugserver_applist(service_provider: ServiceProviderDep) -> None:
+    """Print the debugserver applist XML for the device."""
+    print_json(DebugServerAppList(service_provider).get())
+
+
+@cli.command("start-server")
+def debugserver_start_server(service_provider: ServiceProviderDep, local_port: Optional[int] = None) -> None:
+    """
+    Start debugserver and print the LLDB connect string.
+
+    - For iOS < 17, you must forward to a local port (--local-port).
+    - For iOS >= 17, if connected over RSD, the remote host:port is printed for LLDB.
+    Connect quickly with your own LLDB client using the printed steps.
+    """
+
+    if Version(service_provider.product_version) < Version("17.0"):
+        service_name = "com.apple.debugserver.DVTSecureSocketProxy"
+    else:
+        service_name = "com.apple.internal.dt.remote.debugproxy"
+
+    if local_port is not None:
+        print(DEBUGSERVER_CONNECTION_STEPS.format(host="127.0.0.1", port=local_port))
+        print("Started port forwarding. Press Ctrl-C to close this shell when done")
+        sys.stdout.flush()
+        LockdownTcpForwarder(service_provider, local_port, service_name).start()
+    elif Version(service_provider.product_version) >= Version("17.0"):
+        if not isinstance(service_provider, RemoteServiceDiscoveryService):
+            raise RSDRequiredError(service_provider.identifier)
+        debugserver_port = service_provider.get_service_port(service_name)
+        print(DEBUGSERVER_CONNECTION_STEPS.format(host=service_provider.service.address[0], port=debugserver_port))
+    else:
+        print("local_port is required for iOS < 17.0")
+
+
+@cli.command("lldb")
+def debugserver_lldb(
+    service_provider: RSDServiceProviderDep,
+    project_or_ipa_path: Annotated[
+        Path,
+        typer.Argument(exists=True, file_okay=True, dir_okay=True),
+    ],
+    configuration: Annotated[
+        str,
+        typer.Option(help="Build configuration to invoke (e.g., Debug or Release)."),
+    ] = "Debug",
+    lldb_command: Annotated[
+        str,
+        typer.Option(help="Path to the lldb executable to run."),
+    ] = "lldb",
+    launch: Annotated[
+        bool,
+        typer.Option(help="Automatically launch the app after attaching."),
+    ] = False,
+    breakpoints: Annotated[
+        Optional[list[str]],
+        typer.Option("--break", "-b", help="Add multiple startup breakpoints"),
+    ] = None,
+    user_commands: Annotated[
+        Optional[list[str]],
+        typer.Option("--command", "-c", help="Additional commands to run at startup"),
+    ] = None,
+) -> None:
+    """
+    Automate lldb launch for a given xcodeproj or IPA.
+
+    \b
+    This will:
+    - Build the given xcodeproj (if provided)
+    - Extract the given IPA (if provided)
+    - Install it
+    - Start a debugserver attached to it
+    - Place breakpoints if given any
+    - Launch the application if requested
+    - Execute any additional commands if requested
+    - Switch to lldb shell
+    """
+    if Version(service_provider.product_version) < Version("17.0"):
+        logger.error("lldb is only supported on iOS >= 17.0")
+        return
+
+    commands = []
+    temp_dir = None
+    local_app = None
+    install_source = None
+
+    if project_or_ipa_path.suffix == ".xcodeproj":
+        with local.cwd(project_or_ipa_path.parent):
+            logger.info(f"Building {project_or_ipa_path} for {configuration} configuration")
+            local["xcodebuild"]["-project", str(project_or_ipa_path), "-configuration", configuration, "build"]()
+            app_candidates = [app for app in Path("build").rglob("*.app") if (app / "Info.plist").exists()]
+            if not app_candidates:
+                logger.error("No built .app with Info.plist found under build/.")
+                return
+            app_candidates.sort(key=lambda p: p.stat().st_mtime, reverse=True)
+            local_app = app_candidates[0].absolute()
+            install_source = local_app
+    elif project_or_ipa_path.suffix == ".ipa":
+        temp_dir = TemporaryDirectory()
+        with ZipFile(project_or_ipa_path, "r") as ipa_zip:
+            ipa_zip.extractall(temp_dir.name)
+        payload_dir = Path(temp_dir.name) / "Payload"
+        apps = list(payload_dir.glob("*.app"))
+        if not apps:
+            logger.error("No .app bundle found in IPA Payload.")
+            temp_dir.cleanup()
+            return
+        if len(apps) > 1:
+            logger.error("Multiple .app bundles found in IPA Payload; please provide a single-app IPA.")
+            temp_dir.cleanup()
+            return
+        local_app = apps[0].absolute()
+        install_source = project_or_ipa_path
+    else:
+        logger.error("Expected an .xcodeproj directory or an .ipa file.")
+        return
+
+    logger.info(f"Using app: {local_app}")
+
+    info_plist_path = local_app / "Info.plist"
+    info_plist = plistlib.loads(info_plist_path.read_bytes())
+    bundle_identifier = info_plist["CFBundleIdentifier"]
+    logger.info(f"Bundle identifier: {bundle_identifier}")
+
+    commands.append("platform select remote-ios")
+    commands.append(f'target create "{local_app.absolute()}"')
+
+    with InstallationProxyService(create_using_usbmux()) as installation_proxy:
+        logger.info("Installing app")
+        installation_proxy.install_from_local(install_source)
+        remote_path = installation_proxy.get_apps(bundle_identifiers=[bundle_identifier])[bundle_identifier]["Path"]
+        logger.info(f"Remote path: {remote_path}")
+        commands.append(f'script lldb.target.module[0].SetPlatformFileSpec(lldb.SBFileSpec("{remote_path}"))')
+
+    debugserver_port = service_provider.get_service_port("com.apple.internal.dt.remote.debugproxy")
+
+    # Add connection and launch commands
+    commands.append(f"process connect connect://[{service_provider.service.address[0]}]:{debugserver_port}")
+
+    if breakpoints:
+        for bp in breakpoints:
+            commands.append(f'breakpoint set -n "{bp}"')
+
+    if launch:
+        commands.append("process launch")
+
+    if user_commands:
+        # Add user commands
+        commands += user_commands
+
+    logger.info("Starting lldb with automated setup and connection")
+
+    # Works only on unix-based systems, so keep these imports here
+    import fcntl
+    import pty
+    import select as select_module
+    import termios
+    import tty
+
+    master, slave = pty.openpty()
+
+    process = None  # Initialize process variable for signal handler
+
+    # Copy terminal size from the current terminal to PTY
+    def resize_pty() -> None:
+        """Update PTY size to match current terminal size"""
+        size = struct.unpack(
+            "HHHH", fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, struct.pack("HHHH", 0, 0, 0, 0))
+        )
+        fcntl.ioctl(master, termios.TIOCSWINSZ, struct.pack("HHHH", *size))
+        # Send SIGWINCH to the child process to notify it of the resize
+        if process is not None and process.poll() is None:
+            process.send_signal(signal.SIGWINCH)
+
+    # Initial resize
+    resize_pty()
+
+    # Set up signal handler for window resize
+    def handle_sigwinch(signum, frame):
+        resize_pty()
+
+    old_sigwinch_handler = signal.signal(signal.SIGWINCH, handle_sigwinch)
+
+    # Save original terminal settings
+    old_tty = termios.tcgetattr(sys.stdin)
+
+    try:
+        # Set TERM environment variable to enable colors
+        env = os.environ.copy()
+        env["TERM"] = os.environ.get("TERM", "xterm-256color")
+
+        process = subprocess.Popen([lldb_command], stdin=slave, stdout=slave, stderr=slave, env=env)
+        os.close(slave)
+
+        # Put terminal in raw mode for proper interaction
+        tty.setraw(sys.stdin.fileno())
+        # Send all commands through stdin
+        for command in commands:
+            os.write(master, (command + "\n").encode())
+
+        # Now redirect stdin from the terminal to lldb so user can interact
+        while True:
+            rlist, _, _ = select_module.select([sys.stdin, master], [], [])
+
+            if sys.stdin in rlist:
+                # User typed something
+                data = os.read(sys.stdin.fileno(), 1024)
+                if not data:
+                    break
+                os.write(master, data)
+
+            if master in rlist:
+                # lldb has output
+                try:
+                    data = os.read(master, 1024)
+                    if not data:
+                        break
+                    os.write(sys.stdout.fileno(), data)
+                except OSError:
+                    break
+    except (KeyboardInterrupt, OSError):
+        pass
+    finally:
+        # Restore terminal settings
+        termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_tty)
+        # Restore original SIGWINCH handler
+        signal.signal(signal.SIGWINCH, old_sigwinch_handler)
+        os.close(master)
+        if process is not None:
+            process.terminate()
+            process.wait()
+        if temp_dir is not None:
+            temp_dir.cleanup()

{pymobiledevice3-7.0.7 → pymobiledevice3-7.2.0}/pymobiledevice3/cli/developer/dvt/__init__.py

@@ -166,46 +166,49 @@ def process_id_for_bundle_id(service_provider: ServiceProviderDep, app_bundle_id
 
 
 def get_matching_processes(
-    service_provider: ServiceProviderDep,
+    device_info: DeviceInfo,
     name: Optional[str] = None,
     bundle_identifier: Optional[str] = None,
 ) -> list[MatchedProcessByPid]:
     result: list[MatchedProcessByPid] = []
-    with DvtSecureSocketProxyService(lockdown=service_provider) as dvt:
-        device_info = DeviceInfo(dvt)
-        for process in device_info.proclist():
-            current_name = process["name"]
-            current_bundle_identifier = process.get("bundleIdentifier", "")
-            pid = process["pid"]
-            if (bundle_identifier is not None and bundle_identifier in current_bundle_identifier) or (
-                name is not None and name in current_name
-            ):
-                result.append(MatchedProcessByPid(name=current_name, pid=pid))
+    for process in device_info.proclist():
+        current_name = process["name"]
+        current_bundle_identifier = process.get("bundleIdentifier", "")
+        pid = process["pid"]
+        if (bundle_identifier is not None and bundle_identifier in current_bundle_identifier) or (
+            name is not None and name in current_name
+        ):
+            result.append(MatchedProcessByPid(name=current_name, pid=pid))
     return result
 
 
 @cli.command("pkill")
 def pkill(
     service_provider: ServiceProviderDep,
-    expression: str,
+    expressions: Annotated[
+        list[str],
+        typer.Argument(help="One or more process-name (or bundle id) expressions to match."),
+    ],
     bundle: Annotated[
         bool,
-        typer.Option(help="Treat given expression as a bundle-identifier instead of a process name"),
+        typer.Option(help="Treat given expressions as bundle-identifiers instead of process names"),
     ] = False,
 ) -> None:
-    """Kill all processes containing `expression` in their name."""
-    matching_name = expression if not bundle else None
-    matching_bundle_identifier = expression if bundle else None
-    matching_processes = get_matching_processes(
-        service_provider, name=matching_name, bundle_identifier=matching_bundle_identifier
-    )
-
+    """Kill all processes containing each expression in their name."""
     with DvtSecureSocketProxyService(lockdown=service_provider) as dvt:
+        device_info = DeviceInfo(dvt)
         process_control = ProcessControl(dvt)
 
-        for process in matching_processes:
-            logger.info(f"killing {process.name}({process.pid})")
-            process_control.kill(process.pid)
+        for expression in expressions:
+            matching_name = expression if not bundle else None
+            matching_bundle_identifier = expression if bundle else None
+            matching_processes = get_matching_processes(
+                device_info, name=matching_name, bundle_identifier=matching_bundle_identifier
+            )
+
+            for process in matching_processes:
+                logger.info(f"Killing {process.name}({process.pid})")
+                process_control.kill(process.pid)
 
 
 @cli.command("launch")

{pymobiledevice3-7.0.7 → pymobiledevice3-7.2.0}/pymobiledevice3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 7.0.7
+Version: 7.2.0
 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.7/pymobiledevice3/cli/developer/debugserver.py

@@ -1,244 +0,0 @@
-import logging
-import os
-import plistlib
-import signal
-import struct
-import subprocess
-import sys
-from pathlib import Path
-from typing import Annotated, Optional
-
-import typer
-from packaging.version import Version
-from plumbum import local
-from typer_injector import InjectingTyper
-
-from pymobiledevice3.cli.cli_common import RSDServiceProviderDep, ServiceProviderDep, print_json
-from pymobiledevice3.exceptions import RSDRequiredError
-from pymobiledevice3.lockdown import create_using_usbmux
-from pymobiledevice3.remote.remote_service_discovery import RemoteServiceDiscoveryService
-from pymobiledevice3.services.debugserver_applist import DebugServerAppList
-from pymobiledevice3.services.installation_proxy import InstallationProxyService
-from pymobiledevice3.tcp_forwarder import LockdownTcpForwarder
-
-DEBUGSERVER_CONNECTION_STEPS = """
-Follow the following connections steps from LLDB:
-
-(lldb) platform select remote-ios
-(lldb) target create /path/to/local/application.app
-(lldb) script lldb.target.module[0].SetPlatformFileSpec(lldb.SBFileSpec('/private/var/containers/Bundle/Application/<APP-UUID>/application.app'))
-(lldb) process connect connect://[{host}]:{port}   <-- ACTUAL CONNECTION DETAILS!
-(lldb) process launch
-"""
-
-
-logger = logging.getLogger(__name__)
-
-
-cli = InjectingTyper(
-    name="debugserver",
-    help="Start and drive debugserver sessions (RSD for iOS 17+, usbmux for older).",
-    no_args_is_help=True,
-)
-
-
-@cli.command("applist")
-def debugserver_applist(service_provider: ServiceProviderDep) -> None:
-    """Print the debugserver applist XML for the device."""
-    print_json(DebugServerAppList(service_provider).get())
-
-
-@cli.command("start-server")
-def debugserver_start_server(service_provider: ServiceProviderDep, local_port: Optional[int] = None) -> None:
-    """
-    Start debugserver and print the LLDB connect string.
-
-    - For iOS < 17, you must forward to a local port (--local-port).
-    - For iOS >= 17, if connected over RSD, the remote host:port is printed for LLDB.
-    Connect quickly with your own LLDB client using the printed steps.
-    """
-
-    if Version(service_provider.product_version) < Version("17.0"):
-        service_name = "com.apple.debugserver.DVTSecureSocketProxy"
-    else:
-        service_name = "com.apple.internal.dt.remote.debugproxy"
-
-    if local_port is not None:
-        print(DEBUGSERVER_CONNECTION_STEPS.format(host="127.0.0.1", port=local_port))
-        print("Started port forwarding. Press Ctrl-C to close this shell when done")
-        sys.stdout.flush()
-        LockdownTcpForwarder(service_provider, local_port, service_name).start()
-    elif Version(service_provider.product_version) >= Version("17.0"):
-        if not isinstance(service_provider, RemoteServiceDiscoveryService):
-            raise RSDRequiredError(service_provider.identifier)
-        debugserver_port = service_provider.get_service_port(service_name)
-        print(DEBUGSERVER_CONNECTION_STEPS.format(host=service_provider.service.address[0], port=debugserver_port))
-    else:
-        print("local_port is required for iOS < 17.0")
-
-
-@cli.command("lldb")
-def debugserver_lldb(
-    service_provider: RSDServiceProviderDep,
-    xcodeproj_path: Annotated[
-        Path,
-        typer.Argument(exists=True, file_okay=False, dir_okay=True),
-    ],
-    configuration: Annotated[
-        str,
-        typer.Option(help="Build configuration to invoke (e.g., Debug or Release)."),
-    ] = "Debug",
-    lldb_command: Annotated[
-        str,
-        typer.Option(help="Path to the lldb executable to run."),
-    ] = "lldb",
-    launch: Annotated[
-        bool,
-        typer.Option(help="Automatically launch the app after attaching."),
-    ] = False,
-    breakpoints: Annotated[
-        Optional[list[str]],
-        typer.Option("--break", "-b", help="Add multiple startup breakpoints"),
-    ] = None,
-    user_commands: Annotated[
-        Optional[list[str]],
-        typer.Option("--command", "-c", help="Additional commands to run at startup"),
-    ] = None,
-) -> None:
-    """
-    Automate lldb launch for a given xcodeproj.
-
-    \b
-    This will:
-    - Build the given xcodeproj
-    - Install it
-    - Start a debugserver attached to it
-    - Place breakpoints if given any
-    - Launch the application if requested
-    - Execute any additional commands if requested
-    - Switch to lldb shell
-    """
-    if Version(service_provider.product_version) < Version("17.0"):
-        logger.error("lldb is only supported on iOS >= 17.0")
-        return
-
-    commands = []
-    with local.cwd(xcodeproj_path.parent):
-        logger.info(f"Building {xcodeproj_path} for {configuration} configuration")
-        local["xcodebuild"]["-configuration", configuration, "build"]()
-        local_app = next(iter(Path(f"build/{configuration}-iphoneos").glob("*.app")))
-        logger.info(f"Using app: {local_app}")
-
-        info_plist_path = local_app / "Info.plist"
-        info_plist = plistlib.loads(info_plist_path.read_bytes())
-        bundle_identifier = info_plist["CFBundleIdentifier"]
-        logger.info(f"Bundle identifier: {bundle_identifier}")
-
-        commands.append("platform select remote-ios")
-        commands.append(f'target create "{local_app.absolute()}"')
-
-        with InstallationProxyService(create_using_usbmux()) as installation_proxy:
-            logger.info("Installing app")
-            installation_proxy.install_from_local(local_app)
-            remote_path = installation_proxy.get_apps(bundle_identifiers=[bundle_identifier])[bundle_identifier]["Path"]
-            logger.info(f"Remote path: {remote_path}")
-
-        commands.append(f'script lldb.target.module[0].SetPlatformFileSpec(lldb.SBFileSpec("{remote_path}"))')
-
-        debugserver_port = service_provider.get_service_port("com.apple.internal.dt.remote.debugproxy")
-
-        # Add connection and launch commands
-        commands.append(f"process connect connect://[{service_provider.service.address[0]}]:{debugserver_port}")
-
-        if breakpoints:
-            for bp in breakpoints:
-                commands.append(f'breakpoint set -n "{bp}"')
-
-        if launch:
-            commands.append("process launch")
-
-        if user_commands:
-            # Add user commands
-            commands += user_commands
-
-        logger.info("Starting lldb with automated setup and connection")
-
-        # Works only on unix-based systems, so keep these imports here
-        import fcntl
-        import pty
-        import select as select_module
-        import termios
-        import tty
-
-        master, slave = pty.openpty()
-
-        process = None  # Initialize process variable for signal handler
-
-        # Copy terminal size from the current terminal to PTY
-        def resize_pty() -> None:
-            """Update PTY size to match current terminal size"""
-            size = struct.unpack(
-                "HHHH", fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, struct.pack("HHHH", 0, 0, 0, 0))
-            )
-            fcntl.ioctl(master, termios.TIOCSWINSZ, struct.pack("HHHH", *size))
-            # Send SIGWINCH to the child process to notify it of the resize
-            if process is not None and process.poll() is None:
-                process.send_signal(signal.SIGWINCH)
-
-        # Initial resize
-        resize_pty()
-
-        # Set up signal handler for window resize
-        def handle_sigwinch(signum, frame):
-            resize_pty()
-
-        old_sigwinch_handler = signal.signal(signal.SIGWINCH, handle_sigwinch)
-
-        # Save original terminal settings
-        old_tty = termios.tcgetattr(sys.stdin)
-
-        try:
-            # Set TERM environment variable to enable colors
-            env = os.environ.copy()
-            env["TERM"] = os.environ.get("TERM", "xterm-256color")
-
-            process = subprocess.Popen([lldb_command], stdin=slave, stdout=slave, stderr=slave, env=env)
-            os.close(slave)
-
-            # Put terminal in raw mode for proper interaction
-            tty.setraw(sys.stdin.fileno())
-            # Send all commands through stdin
-            for command in commands:
-                os.write(master, (command + "\n").encode())
-
-            # Now redirect stdin from the terminal to lldb so user can interact
-            while True:
-                rlist, _, _ = select_module.select([sys.stdin, master], [], [])
-
-                if sys.stdin in rlist:
-                    # User typed something
-                    data = os.read(sys.stdin.fileno(), 1024)
-                    if not data:
-                        break
-                    os.write(master, data)
-
-                if master in rlist:
-                    # lldb has output
-                    try:
-                        data = os.read(master, 1024)
-                        if not data:
-                            break
-                        os.write(sys.stdout.fileno(), data)
-                    except OSError:
-                        break
-        except (KeyboardInterrupt, OSError):
-            pass
-        finally:
-            # Restore terminal settings
-            termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_tty)
-            # Restore original SIGWINCH handler
-            signal.signal(signal.SIGWINCH, old_sigwinch_handler)
-            os.close(master)
-            if process is not None:
-                process.terminate()
-                process.wait()