AndroidFridaManager 1.9.4__py3-none-any.whl → 1.9.6__py3-none-any.whl

AndroidFridaManager/about.py

@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Daniel Baier"
-__version__ = "1.9.4"
+__version__ = "1.9.6"

AndroidFridaManager/job.py

@@ -32,7 +32,7 @@ class Job:
         display_name: Human-readable name for UI display.
         hooks_registry: List of methods/functions this job hooks (for conflict detection).
         priority: Job priority (lower = higher priority, default 50).
-        state: Current state ("initialized", "running", "stopping").
+        state: Current state ("initialized", "running", "stopping", "error", "stopped").
         started_at: Timestamp when job was started (None if not started).
     """
 
@@ -75,6 +75,50 @@ class Job:
         self.priority = priority
         self.started_at: Optional[datetime.datetime] = None
 
+        # State propagation for callers to wait on job readiness
+        self._ready_event = threading.Event()
+        self._error_message: Optional[str] = None
+
+    def _set_state(self, new_state: str, error_msg: Optional[str] = None) -> None:
+        """Set state and signal ready event if terminal state reached.
+
+        Args:
+            new_state: New state value ("initialized", "running", "error", "stopping", "stopped").
+            error_msg: Optional error message when transitioning to "error" state.
+        """
+        self.state = new_state
+        if error_msg:
+            self._error_message = error_msg
+        # Signal ready event when job reaches a terminal state (running, error, stopped)
+        if new_state in ("running", "error", "stopped"):
+            self._ready_event.set()
+
+    def wait_until_ready(self, timeout: float = 10.0) -> bool:
+        """Wait for job to reach running or error state.
+
+        Blocks until the job thread signals that hooks have been loaded
+        successfully (state="running") or an error occurred (state="error").
+
+        Args:
+            timeout: Maximum seconds to wait (default: 10.0).
+
+        Returns:
+            True if job is running successfully, False if error or timeout.
+        """
+        if self._ready_event.wait(timeout=timeout):
+            return self.state == "running"
+        # Timeout occurred
+        self._error_message = f"Timeout waiting for job to start after {timeout}s"
+        return False
+
+    def get_error(self) -> Optional[str]:
+        """Get error message if job failed.
+
+        Returns:
+            Error message string if job is in error state, None otherwise.
+        """
+        return self._error_message
+
 
     def create_job_script(self):
         self.instrument(self.process_session)
@@ -93,18 +137,39 @@ class Job:
 
 
     def invoke_handle_hooking(self):
-        if self.is_script_created == False:
-            self.instrument(self.process_session)
-            self.is_script_created = True
-        self.script.on("message", self.wrap_custom_hooking_handler_with_job_id(self.custom_hooking_handler))
-        self.script.load()
-        self.state = "running"
-        self.logger.info("[+] hooks successfully loaded")
-
-        #if self.is_running_as_thread:
-        # Keep the thread alive to handle messages until stop_event is set
-        while not self.stop_event.is_set():
-            self.stop_event.wait(1) # Sleep for 1 second and check again
+        try:
+            if self.is_script_created == False:
+                self.instrument(self.process_session)
+                self.is_script_created = True
+            self.script.on("message", self.wrap_custom_hooking_handler_with_job_id(self.custom_hooking_handler))
+            self.script.load()
+            self._set_state("running")
+            self.logger.info("[+] hooks successfully loaded")
+
+            #if self.is_running_as_thread:
+            # Keep the thread alive to handle messages until stop_event is set
+            while not self.stop_event.is_set():
+                self.stop_event.wait(1) # Sleep for 1 second and check again
+        except frida.TransportError as e:
+            error_msg = f"TransportError during script load: {e} - target app may have crashed or restarted"
+            self._set_state("error", error_msg)
+            self.logger.error(f"[-] {error_msg}")
+        except frida.InvalidOperationError as e:
+            error_msg = f"InvalidOperationError during script load: {e}"
+            self._set_state("error", error_msg)
+            self.logger.error(f"[-] {error_msg}")
+        except frida.ProcessNotFoundError as e:
+            error_msg = f"ProcessNotFoundError: Target process no longer exists: {e}"
+            self._set_state("error", error_msg)
+            self.logger.error(f"[-] {error_msg}")
+        except frida.ProtocolError as e:
+            error_msg = f"ProtocolError: Connection issue with target: {e}"
+            self._set_state("error", error_msg)
+            self.logger.error(f"[-] {error_msg}")
+        except Exception as e:
+            error_msg = f"Unexpected error in hook thread: {type(e).__name__}: {e}"
+            self._set_state("error", error_msg)
+            self.logger.error(f"[-] {error_msg}")
 
 
     def wrap_custom_hooking_handler_with_job_id(self, handler):
@@ -134,15 +199,51 @@ class Job:
                 raise FridaBasedException("Connection is closed. Probably the target app crashed")
 
 
-    def close_job(self):
-        self.state = "stopping"
+    def close_job(self, timeout: float = 5.0) -> bool:
+        """Stop the job and cleanup resources.
+
+        Uses a staged shutdown approach:
+        1. Set stop_event FIRST to signal thread to exit wait loop
+        2. Wait briefly for thread to notice stop_event
+        3. Try to unload script (may hang if connection broken)
+        4. Set final stopped state
+
+        Args:
+            timeout: Maximum seconds to wait for thread to stop.
+                     Default 5.0 seconds. Use 0 for no wait.
+
+        Returns:
+            True if job stopped cleanly, False if timed out.
+        """
+        self._set_state("stopping")
+
+        # Step 1: Signal thread to exit wait loop FIRST
         self.stop_event.set()
-        if self.thread:
-            self.thread.join()
+
+        # Step 2: Wait for thread to notice stop_event (short timeout)
+        thread_timeout = min(1.0, timeout) if timeout > 0 else 1.0
+        timed_out = False
+        if self.thread and self.thread.is_alive():
+            self.thread.join(timeout=thread_timeout)
+            if self.thread.is_alive():
+                self.logger.warning(
+                    f"Job {self.job_id} thread did not stop within {thread_timeout}s"
+                )
+                timed_out = True
+
+        # Step 3: Try to unload script (may hang if connection broken)
         if self.script:
-            self.script.unload()
-        
-        self.logger.info(f"Job {self.job_id} stopped")
+            try:
+                self.script.unload()
+            except Exception as e:
+                self.logger.warning(f"Script unload failed (connection may be broken): {e}")
+
+        # Step 4: Set final state
+        self._set_state("stopped")
+
+        status = "timed out" if timed_out else "stopped"
+        self.logger.info(f"Job {self.job_id} {status}")
+        return not timed_out
 
 
     def get_id(self):

AndroidFridaManager/job_manager.py

@@ -424,29 +424,48 @@ class JobManager(object):
             return None
 
 
-    def stop_jobs(self):
+    def stop_jobs(self, timeout_per_job: float = 3.0) -> dict:
+        """Stop all running jobs.
+
+        Args:
+            timeout_per_job: Maximum seconds to wait per job.
+
+        Returns:
+            Dictionary mapping job_id to success status.
+        """
+        results = {}
         jobs_to_stop = [job_id for job_id, job in self.jobs.items() if job.state == "running"]
+
         for job_id in jobs_to_stop:
             try:
-                self.logger.info('[job manager] Job: {0} - Stopping'.format(job_id))
-                self.stop_job_with_id(job_id)
+                self.logger.info(f'[job manager] Job: {job_id} - Stopping')
+                results[job_id] = self.stop_job_with_id(job_id, timeout=timeout_per_job)
             except frida.InvalidOperationError:
-                self.logger.error('[job manager] Job: {0} - An error occurred stopping job. Device may '
-                             'no longer be available.'.format(job_id))
+                self.logger.error(f'[job manager] Job: {job_id} - Error stopping')
+                results[job_id] = False
+
+        return results
 
 
-    def stop_job_with_id(self, job_id: str) -> None:
+    def stop_job_with_id(self, job_id: str, timeout: float = 5.0) -> bool:
         """Stop a specific job by ID.
 
         Args:
             job_id: UUID of the job to stop.
+            timeout: Maximum seconds to wait for job to stop.
+
+        Returns:
+            True if job stopped cleanly, False if timed out or not found.
         """
-        if job_id in self.jobs:
-            job = self.jobs[job_id]
-            # Unregister hooks before closing
-            self.unregister_hooks(job_id)
-            job.close_job()
-            del self.jobs[job_id]
+        if job_id not in self.jobs:
+            return False
+
+        job = self.jobs[job_id]
+        # Unregister hooks before closing
+        self.unregister_hooks(job_id)
+        success = job.close_job(timeout=timeout)
+        del self.jobs[job_id]
+        return success
 
 
     def get_last_created_job(self):
@@ -461,10 +480,38 @@ class JobManager(object):
             raise ValueError(f"Job with ID {job_id} not found.")
 
 
-    def detach_from_app(self):
-        if self.process_session:
+    def detach_from_app(self, timeout: float = 3.0) -> bool:
+        """Detach from the current app session.
+
+        Args:
+            timeout: Maximum seconds to wait for detach.
+
+        Returns:
+            True if detached successfully, False if timed out or failed.
+        """
+        if not self.process_session:
+            return True
+
+        import concurrent.futures
+
+        def _detach():
             self.process_session.detach()
 
+        try:
+            with concurrent.futures.ThreadPoolExecutor(max_workers=1) as executor:
+                future = executor.submit(_detach)
+                future.result(timeout=timeout)
+            self.process_session = None
+            return True
+        except concurrent.futures.TimeoutError:
+            self.logger.warning(f"Detach timed out after {timeout}s")
+            self.process_session = None  # Clear anyway to avoid reuse
+            return False
+        except Exception as e:
+            self.logger.warning(f"Detach failed: {e}")
+            self.process_session = None
+            return False
+
 
     def stop_app(self, app_package):
         cmd = self._build_adb_command(["shell", "am", "force-stop", app_package])
@@ -670,23 +717,21 @@ class JobManager(object):
         """Get the current session mode ('spawn' or 'attach')."""
         return self._mode
 
-    def reset_session(self) -> None:
+    def reset_session(self, timeout_per_job: float = 2.0, detach_timeout: float = 2.0) -> None:
         """Reset the session state for a new connection.
 
-        Stops all jobs, clears hook registry, and resets session state.
+        Args:
+            timeout_per_job: Max seconds to wait per job when stopping.
+            detach_timeout: Max seconds to wait for session detach.
         """
-        # Stop all running jobs
-        self.stop_jobs()
+        # Stop all running jobs with timeout
+        self.stop_jobs(timeout_per_job=timeout_per_job)
 
         # Clear hook registry
         self._hook_registry.clear()
 
-        # Detach from app
-        if self.process_session:
-            try:
-                self.process_session.detach()
-            except Exception:
-                pass
+        # Detach from app with timeout
+        self.detach_from_app(timeout=detach_timeout)
 
         # Reset state
         self.process_session = None

{androidfridamanager-1.9.4.dist-info → androidfridamanager-1.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AndroidFridaManager
-Version: 1.9.4
+Version: 1.9.6
 Summary: A python API in order to install and run the frida-server on an Android device.
 Home-page: https://github.com/fkie-cad/AndroidFridaManager
 Author: Daniel Baier
@@ -33,7 +33,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-![version](https://img.shields.io/badge/version-1.9.4-blue) [![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager) [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/AndroidFridaManager/actions/workflows/publish-to-pypi.yml)
+![version](https://img.shields.io/badge/version-1.9.6-blue) [![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager) [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/AndroidFridaManager/actions/workflows/publish-to-pypi.yml)
 
 # AndroidFridaManager
 

androidfridamanager-1.9.6.dist-info/RECORD

@@ -0,0 +1,11 @@
+AndroidFridaManager/FridaManager.py,sha256=pTcis4oLPBN5U7CdBqdUufwuG6QQDWTPBleTC7rtTbI,32145
+AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
+AndroidFridaManager/about.py,sha256=tytVSs7JHtb8wVUCXH89lg4vd5mn04MrHfzmOgihOUQ,98
+AndroidFridaManager/job.py,sha256=jDDaqiG_ri-vAwwk045X80mzftd8INxh7UIv9YOELDU,10525
+AndroidFridaManager/job_manager.py,sha256=Ce2lHLezRVKuj7r_RodH6Q8l43zL_cL5ZGhE1zGB-E8,27336
+androidfridamanager-1.9.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+androidfridamanager-1.9.6.dist-info/METADATA,sha256=Dmw-7QAphEDeTviAvvTbHllZzksDSnO7lSfdgAF-3Xw,5141
+androidfridamanager-1.9.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+androidfridamanager-1.9.6.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
+androidfridamanager-1.9.6.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
+androidfridamanager-1.9.6.dist-info/RECORD,,

{androidfridamanager-1.9.4.dist-info → androidfridamanager-1.9.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

androidfridamanager-1.9.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-AndroidFridaManager/FridaManager.py,sha256=pTcis4oLPBN5U7CdBqdUufwuG6QQDWTPBleTC7rtTbI,32145
-AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
-AndroidFridaManager/about.py,sha256=st5zrhGhtBpwZErvuVGrS-VQL9AmtAxFwL9AYgf-rqI,98
-AndroidFridaManager/job.py,sha256=sMkTk1rHdfNmh9jFNQuiL4oqsUEBCJcbP6p2DZQPbL0,6172
-AndroidFridaManager/job_manager.py,sha256=oPkzFK8XpwFhDHKuJmAoqylUDaV6VIKL_AikJBcg3iQ,25772
-androidfridamanager-1.9.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-androidfridamanager-1.9.4.dist-info/METADATA,sha256=bghFYQPx8KRnUXKXZNyfHkPmBuTx3yBjT5_jXSZD9HM,5141
-androidfridamanager-1.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-androidfridamanager-1.9.4.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
-androidfridamanager-1.9.4.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
-androidfridamanager-1.9.4.dist-info/RECORD,,