fix(android): prevent adb::device_list deadlock due to shell stuck (#493)

* fix(android): prevent adb::device_list deadlock due to shell stuck

when an emulator gets in a weird state and disconnects from adb, `adb shell` gets stuck and never resolves; we're now adding a timeout to prevent the CLI from appear in a deadlock state, and return the error instead

* import

Author: lucasfernog

.changes/avoid-shell-stuck.md

@@ -0,0 +1,5 @@
+---
+"cargo-mobile2": patch
+---
+
+Prevent adb device list from getting stuck if any of the available devices are not properly connected.

Cargo.lock

@@ -75,7 +75,7 @@ structopt = { version = "0.3", optional = true }
 textwrap = { version = "0.16", features = ["terminal_size"] }
 thiserror = "2.0"
 toml = { version = "0.9", features = ["preserve_order"] }
-duct = "1"
+duct = "1.1"
 which = "8"
 os_pipe = "1"
 

Cargo.toml

@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use super::adb;
 use crate::{
     android::env::Env,
@@ -51,7 +53,13 @@ pub fn device_name(env: &Env, serial_no: &str) -> Result<String, Error> {
                     command: format!("{cmd:?}"),
                     error,
                 })?
-                .wait()
+                .wait_timeout(Duration::from_secs(3))
+                .and_then(|output| {
+                    output.ok_or(std::io::Error::new(
+                        std::io::ErrorKind::TimedOut,
+                        "adb emu avd name timed out",
+                    ))
+                })
                 .map_err(|error| Error::CommandFailed {
                     command: format!("{cmd:?}"),
                     error,

src/android/adb/device_name.rs

@@ -2,7 +2,7 @@ use crate::{
     android::env::Env,
     util::cli::{Report, Reportable},
 };
-use std::str;
+use std::{str, time::Duration};
 use thiserror::Error;
 
 use super::adb;
@@ -54,10 +54,18 @@ pub fn get_prop(env: &Env, serial_no: &str, prop: &str) -> Result<String, Error>
             error,
         })?;
 
-    let output = handle.wait().map_err(|error| Error::CommandFailed {
-        command: format!("{cmd:?}"),
-        error,
-    })?;
+    let output = handle
+        .wait_timeout(Duration::from_secs(3))
+        .and_then(|output| {
+            output.ok_or(std::io::Error::new(
+                std::io::ErrorKind::TimedOut,
+                "adb shell getprop timed out",
+            ))
+        })
+        .map_err(|error| Error::CommandFailed {
+            command: format!("{cmd:?}"),
+            error,
+        })?;
     super::check_authorized(output).map_err(|source| Error::LookupFailed {
         prop: prop.to_owned(),
         source,