diff --git a/res/PKGBUILD b/res/PKGBUILD index 559f1c025..7aa50d563 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -7,7 +7,7 @@ arch=('x86_64') url="" license=('AGPL-3.0') groups=() -depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'curl' 'libva' 'libvdpau' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire') +depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'libva' 'libvdpau' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire') makedepends=() checkdepends=() optdepends=() diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec index cdee3d901..0ac93b716 100644 --- a/res/rpm-flutter-suse.spec +++ b/res/rpm-flutter-suse.spec @@ -3,7 +3,7 @@ Version: 1.2.0 Release: 0 Summary: RPM package License: GPL-3.0 -Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils curl libXtst6 libappindicator-gtk3 libvdpau1 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire +Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils libXtst6 libappindicator-gtk3 libvdpau1 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire Provides: libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit) %description diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec index d81bb4b89..937d36d5a 100644 --- a/res/rpm-flutter.spec +++ b/res/rpm-flutter.spec @@ -3,7 +3,7 @@ Version: 1.2.0 Release: 0 Summary: RPM package License: GPL-3.0 -Requires: gtk3 libxcb libxdo libXfixes alsa-lib curl libappindicator-gtk3 libvdpau libva pam gstreamer1-plugins-base +Requires: gtk3 libxcb libxdo libXfixes alsa-lib libappindicator-gtk3 libvdpau libva pam gstreamer1-plugins-base Provides: libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit) %description diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec index 496e47b19..8309599b9 100644 --- a/res/rpm-suse.spec +++ b/res/rpm-suse.spec @@ -3,7 +3,7 @@ Version: 1.1.9 Release: 0 Summary: RPM package License: GPL-3.0 -Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils curl libXtst6 libayatana-appindicator3-1 libvdpau1 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire +Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils libXtst6 libayatana-appindicator3-1 libvdpau1 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire %description The best open-source remote desktop client software, written in Rust. diff --git a/res/rpm.spec b/res/rpm.spec index 988b8270b..517da6872 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -3,7 +3,7 @@ Version: 1.2.0 Release: 0 Summary: RPM package License: GPL-3.0 -Requires: gtk3 libxcb libxdo libXfixes alsa-lib curl libappindicator libvdpau1 libva2 pam gstreamer1-plugins-base +Requires: gtk3 libxcb libxdo libXfixes alsa-lib libappindicator libvdpau1 libva2 pam gstreamer1-plugins-base %description The best open-source remote desktop client software, written in Rust. diff --git a/src/common.rs b/src/common.rs index e990881d1..f8836e94f 100644 --- a/src/common.rs +++ b/src/common.rs @@ -832,47 +832,16 @@ pub fn get_audit_server(api: String, custom: String, typ: String) -> String { } pub async fn post_request(url: String, body: String, header: &str) -> ResultType { - #[cfg(not(target_os = "linux"))] - { - let mut req = reqwest::Client::new().post(url); - if !header.is_empty() { - let tmp: Vec<&str> = header.split(": ").collect(); - if tmp.len() == 2 { - req = req.header(tmp[0], tmp[1]); - } + let mut req = reqwest::Client::new().post(url); + if !header.is_empty() { + let tmp: Vec<&str> = header.split(": ").collect(); + if tmp.len() == 2 { + req = req.header(tmp[0], tmp[1]); } - req = req.header("Content-Type", "application/json"); - let to = std::time::Duration::from_secs(12); - Ok(req.body(body).timeout(to).send().await?.text().await?) - } - #[cfg(target_os = "linux")] - { - let mut data = vec![ - "-sS", - "-X", - "POST", - &url, - "-H", - "Content-Type: application/json", - "-d", - &body, - "--connect-timeout", - "12", - ]; - if !header.is_empty() { - data.push("-H"); - data.push(header); - } - let output = async_process::Command::new("curl") - .args(&data) - .output() - .await?; - let res = String::from_utf8_lossy(&output.stdout).to_string(); - if !res.is_empty() { - return Ok(res); - } - hbb_common::bail!(String::from_utf8_lossy(&output.stderr).to_string()); } + req = req.header("Content-Type", "application/json"); + let to = std::time::Duration::from_secs(12); + Ok(req.body(body).timeout(to).send().await?.text().await?) } #[tokio::main(flavor = "current_thread")]