Merge branch 'master' into master

libs/hbb_common/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 flexi_logger = { version = "0.27", features = ["async"] }
-protobuf = { version = "3.3", features = ["with-bytes"] }
+protobuf = { version = "3.4", features = ["with-bytes"] }
 tokio = { version = "1.36", features = ["full"] }
 tokio-util = { version = "0.7", features = ["full"] }
 futures = "0.3"
@@ -44,6 +44,7 @@ thiserror = "1.0"
 httparse = "1.5"
 base64 = "0.22"
 url = "2.2"
+
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 mac_address = "1.1"
 machine-uid = { git = "https://github.com/21pages/machine-uid" }
@@ -59,7 +60,7 @@ quic = []
 flatpak = []
 
 [build-dependencies]
-protobuf-codegen = { version = "3.3" }
+protobuf-codegen = { version = "3.4" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["winuser", "synchapi", "pdh", "memoryapi"] }

libs/hbb_common/protos/message.proto

@@ -504,6 +504,11 @@ message Resolution {
   int32 height = 2;
 }
 
+message DisplayResolution {
+  int32 display = 1;
+  Resolution resolution = 2;
+}
+
 message SupportedResolutions { repeated Resolution resolutions = 1; }
 
 message SwitchDisplay {
@@ -596,7 +601,8 @@ message OptionMessage {
   BoolOption disable_keyboard = 12;
 // Position 13 is used for Resolution. Remove later.
 // Resolution custom_resolution = 13;
-  BoolOption support_windows_specific_session = 14;
+// BoolOption support_windows_specific_session = 14;
+  // starting from 15 please, do not use removed fields
 }
 
 message TestDelay {
@@ -716,6 +722,13 @@ message WindowsSessions {
   uint32 current_sid = 2;
 }
 
+// Query messages from peer.
+message MessageQuery {
+  // The SwitchDisplay message of the target display.
+  // If the target display is not found, the message will be ignored.
+  int32 switch_display = 1;
+}
+
 message Misc {
   oneof union {
     ChatMessage chat_message = 4;
@@ -736,6 +749,8 @@ message Misc {
     bool portable_service_running = 20;
     SwitchSidesRequest switch_sides_request = 21;
     SwitchBack switch_back = 22;
+    // Deprecated since 1.2.4, use `change_display_resolution` (36) instead.
+    // But we must keep it for compatibility when peer version < 1.2.4.
     Resolution change_resolution = 24;
     PluginRequest plugin_request = 25;
     PluginFailure plugin_failure = 26;
@@ -748,6 +763,8 @@ message Misc {
     TogglePrivacyMode toggle_privacy_mode = 33;
     SupportedEncoding supported_encoding = 34;
     uint32 selected_sid = 35;
+    DisplayResolution change_display_resolution = 36;
+    MessageQuery message_query = 37;
   }
 }
 

libs/hbb_common/src/config.rs

@@ -409,9 +409,7 @@ fn patch(path: PathBuf) -> PathBuf {
                 if let Ok(user) = crate::platform::linux::run_cmds_trim_newline("whoami") {
                     if user != "root" {
                         let cmd = format!("getent passwd '{}' | awk -F':' '{{print $6}}'", user);
-                        if let Ok(output) =
-                            crate::platform::linux::run_cmds_trim_newline(&cmd)
-                        {
+                        if let Ok(output) = crate::platform::linux::run_cmds_trim_newline(&cmd) {
                             return output.into();
                         }
                         return format!("/home/{user}").into();
@@ -505,7 +503,7 @@ impl Config {
     fn store_<T: serde::Serialize>(config: &T, suffix: &str) {
         let file = Self::file_(suffix);
         if let Err(err) = store_path(file, config) {
-            log::error!("Failed to store config: {}", err);
+            log::error!("Failed to store {suffix} config: {err}");
         }
     }
 
@@ -1495,8 +1493,10 @@ impl LanPeers {
 
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct HwCodecConfig {
-    #[serde(default, deserialize_with = "deserialize_hashmap_string_string")]
-    pub options: HashMap<String, String>,
+    #[serde(default, deserialize_with = "deserialize_string")]
+    pub ram: String,
+    #[serde(default, deserialize_with = "deserialize_string")]
+    pub vram: String,
 }
 
 impl HwCodecConfig {
@@ -1511,25 +1511,17 @@ impl HwCodecConfig {
     pub fn clear() {
         HwCodecConfig::default().store();
     }
-}
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone)]
-pub struct GpucodecConfig {
-    #[serde(default, deserialize_with = "deserialize_string")]
-    pub available: String,
-}
-
-impl GpucodecConfig {
-    pub fn load() -> GpucodecConfig {
-        Config::load_::<GpucodecConfig>("_gpucodec")
+    pub fn clear_ram() {
+        let mut c = Self::load();
+        c.ram = Default::default();
+        c.store();
     }
 
-    pub fn store(&self) {
-        Config::store_(self, "_gpucodec");
-    }
-
-    pub fn clear() {
-        GpucodecConfig::default().store();
+    pub fn clear_vram() {
+        let mut c = Self::load();
+        c.vram = Default::default();
+        c.store();
     }
 }
 
@@ -1569,6 +1561,7 @@ impl UserDefaultConfig {
             }
             "custom_image_quality" => self.get_double_string(key, 50.0, 10.0, 0xFFF as f64),
             "custom-fps" => self.get_double_string(key, 30.0, 5.0, 120.0),
+            "enable_file_transfer" => self.get_string(key, "Y", vec![""]),
             _ => self
                 .get_after(key)
                 .map(|v| v.to_string())

libs/hbb_common/src/lib.rs

@@ -47,10 +47,13 @@ pub mod keyboard;
 pub use dlopen;
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 pub use machine_uid;
+pub use serde_derive;
+pub use serde_json;
 pub use sysinfo;
 pub use toml;
 pub use uuid;
 pub use base64;
+pub use thiserror;
 
 #[cfg(feature = "quic")]
 pub type Stream = quic::Connection;