Merge pull request #1104 from Heap-Hop/master

fix: android build & CONFIG deadlock

libs/hbb_common/src/config.rs

@@ -596,6 +596,18 @@ impl Config {
         config.store();
     }
 
+    // * Manually make sure no gen_keypair more than once 
+    // for uuid, avoid deadlock  
+    pub fn get_key_pair_without_lock() -> (Vec<u8>, Vec<u8>) {
+        let mut config = Config::load_::<Config>("");
+        if config.key_pair.0.is_empty() {
+            let (pk, sk) = sign::gen_keypair();
+            config.key_pair = (sk.0.to_vec(), pk.0.into());
+            Config::store_(&config, "");
+        }
+        config.key_pair.clone()
+    }
+
     pub fn get_key_pair() -> (Vec<u8>, Vec<u8>) {
         // lock here to make sure no gen_keypair more than once
         let mut config = CONFIG.write().unwrap();

libs/hbb_common/src/lib.rs

@@ -39,6 +39,10 @@ pub use tokio_socks::IntoTargetAddr;
 pub use tokio_socks::TargetAddr;
 pub mod password_security;
 
+lazy_static::lazy_static!{
+    static ref UUID: Vec<u8> = gen_uuid();
+}
+
 #[cfg(feature = "quic")]
 pub type Stream = quic::Connection;
 #[cfg(not(feature = "quic"))]
@@ -202,12 +206,23 @@ pub fn get_modified_time(path: &std::path::Path) -> SystemTime {
         .unwrap_or(UNIX_EPOCH)
 }
 
-pub fn get_uuid() -> Vec<u8> {
+fn gen_uuid() -> Vec<u8> {
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     if let Ok(id) = machine_uid::get() {
-        return id.into();
+        id.into()
+    } else {
+        Config::get_key_pair().1
     }
-    Config::get_key_pair().1
+    #[cfg(any(target_os = "android", target_os = "ios"))]
+    Config::get_key_pair_without_lock().1
+}
+
+pub fn init_uuid() {
+    let _ = *UUID;
+}
+
+pub fn get_uuid() -> Vec<u8> {
+    UUID.to_owned()
 }
 
 #[cfg(test)]