From a505b73a56a53ebb7da36f6f462818fc54b807e7 Mon Sep 17 00:00:00 2001 From: Asura Date: Mon, 12 Sep 2022 23:27:07 -0700 Subject: [PATCH 1/4] Fix build flutter deb --- DEBIAN/postinst | 13 ++++++++++--- DEBIAN/prerm | 7 ++++++- build.py | 35 +++++++++++++++++++++++++++++------ flutter/linux/CMakeLists.txt | 2 +- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/DEBIAN/postinst b/DEBIAN/postinst index d643c5caf..b30664ce0 100755 --- a/DEBIAN/postinst +++ b/DEBIAN/postinst @@ -5,8 +5,10 @@ set -e if [ "$1" = configure ]; then INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - + if [ "systemd" == "$INITSYS" ]; then + ln -s /usr/lib/rustdesk/flutter_hbb /usr/bin/rustdesk + if [ -e /etc/systemd/system/rustdesk.service ]; then rm /etc/systemd/system/rustdesk.service /usr/lib/systemd/system/rustdesk.service /usr/lib/systemd/user/rustdesk.service >/dev/null 2>&1 fi @@ -18,7 +20,12 @@ if [ "$1" = configure ]; then systemctl start rustdesk cp /usr/share/rustdesk/files/systemd/rustdesk.service.user /usr/lib/systemd/user/rustdesk.service - curUser=$(who | awk '{print $1}' | head -1) - systemctl --machine=${curUser}@.host --user daemon-reload + ubuntuVersion=$(grep -oP 'VERSION_ID="\K[\d]+' /etc/os-release | bc -l) + waylandSupportVersion=21 + if [ "$ubuntuVersion" -ge "$waylandSupportVersion" ] + then + curUser=$(who | awk '{print $1}' | head -1) + systemctl --machine=${curUser}@.host --user daemon-reload + fi fi fi diff --git a/DEBIAN/prerm b/DEBIAN/prerm index 3bb453198..e9e3931ac 100755 --- a/DEBIAN/prerm +++ b/DEBIAN/prerm @@ -5,12 +5,17 @@ set -e case $1 in remove|upgrade) INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') + if [ "systemd" == "${INITSYS}" ]; then + rm /usr/bin/rustdesk + systemctl stop rustdesk || true systemctl disable rustdesk || true serverUser=$(ps -ef | grep -E 'rustdesk +--server' | awk '{print $1}' | head -1) - if [ "$serverUser" != "" ] && [ "$serverUser" != "root" ] + ubuntuVersion=$(grep -oP 'VERSION_ID="\K[\d]+' /etc/os-release | bc -l) + waylandSupportVersion=21 + if [ "$serverUser" != "" ] && [ "$serverUser" != "root" ] && [ "$ubuntuVersion" -ge "$waylandSupportVersion" ] then systemctl --machine=${serverUser}@.host --user stop rustdesk || true fi diff --git a/build.py b/build.py index cdca16645..e56d6a41e 100755 --- a/build.py +++ b/build.py @@ -121,15 +121,34 @@ def get_features(args): print("features:", features) return features +def generate_control_file(version): + control_file_path = "../DEBIAN/control" + os.system('/bin/rm -rf %s' % control_file_path) + + content = """Package: rustdesk +Version: %s +Architecture: amd64 +Maintainer: open-trade +Homepage: https://rustdesk.com +Depends: libgtk-3-0, libxcb-randr0, libxdo3, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, pulseaudio, curl +Description: A remote control software. + +""" % version + file = open(control_file_path, "w") + file.write(content) + file.close() def build_flutter_deb(version): os.chdir('flutter') os.system('dpkg-deb -R rustdesk.deb tmpdeb') - # os.system('flutter build linux --release') - os.system('rm tmpdeb/usr/bin/rustdesk') + os.system('flutter build linux --release') os.system('strip build/linux/x64/release/liblibrustdesk.so') + + os.system('mkdir -p tmpdeb/usr/bin/') os.system('mkdir -p tmpdeb/usr/lib/rustdesk') os.system('mkdir -p tmpdeb/usr/share/rustdesk/files/systemd/') + os.system('mkdir -p tmpdeb/usr/share/applications/') + os.system( 'cp -r build/linux/x64/release/bundle/* tmpdeb/usr/lib/rustdesk/') os.system( @@ -137,18 +156,22 @@ def build_flutter_deb(version): os.system( 'cp build/linux/x64/release/liblibrustdesk.so tmpdeb/usr/lib/rustdesk/librustdesk.so') os.system( - 'cp rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') + 'cp ../rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') os.system( - 'cp rustdesk.service.user tmpdeb/usr/share/rustdesk/files/systemd/') + 'cp ../rustdesk.service.user tmpdeb/usr/share/rustdesk/files/systemd/') os.system( 'cp ../128x128@2x.png tmpdeb/usr/share/rustdesk/files/rustdesk.png') os.system( - 'cp rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') + 'cp ../rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') os.system('mkdir -p tmpdeb/DEBIAN') + generate_control_file(version) os.system('cp -a ../DEBIAN/* tmpdeb/DEBIAN/') md5_file('usr/share/rustdesk/files/systemd/rustdesk.service') md5_file('usr/share/rustdesk/files/systemd/rustdesk.service.user') - os.system('dpkg-deb -b tmpdeb rustdesk.deb; /bin/rm -rf tmpdeb/') + os.system('dpkg-deb -b tmpdeb rustdesk.deb;') + + os.system('/bin/rm -rf tmpdeb/') + os.system('/bin/rm -rf ../DEBIAN/control') os.rename('rustdesk.deb', '../rustdesk-%s.deb' % version) os.chdir("..") diff --git a/flutter/linux/CMakeLists.txt b/flutter/linux/CMakeLists.txt index 9a4e0527b..83778e83d 100644 --- a/flutter/linux/CMakeLists.txt +++ b/flutter/linux/CMakeLists.txt @@ -129,7 +129,7 @@ set(RUSTDESK_LIB_BUILD_TYPE $,debug,release>) string(TOLOWER ${CMAKE_BUILD_TYPE} ${RUSTDESK_LIB_BUILD_TYPE}) message(STATUS "rustdesk lib build type: ${RUSTDESK_LIB_BUILD_TYPE}") -set(RUSTDESK_LIB "../../target/${RUSTDESK_LIB_BUILD_TYPE}/liblibrustdesk.so") +set(RUSTDESK_LIB "../build/linux/x64/${RUSTDESK_LIB_BUILD_TYPE}/liblibrustdesk.so") install(FILES "${RUSTDESK_LIB}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime RENAME librustdesk.so) From 675e199b351c379f4cefc5aeccb51fd721ac0443 Mon Sep 17 00:00:00 2001 From: Asura Date: Tue, 13 Sep 2022 01:50:22 -0700 Subject: [PATCH 2/4] Disable keyboard listen --- src/client.rs | 6 +++++- src/flutter.rs | 1 + src/ui_session_interface.rs | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/client.rs b/src/client.rs index a625efb31..cc1f78b78 100644 --- a/src/client.rs +++ b/src/client.rs @@ -4,7 +4,7 @@ use std::{ ops::{Deref, Not}, sync::{atomic::AtomicBool, mpsc, Arc, Mutex, RwLock}, }; - +use std::sync::atomic::Ordering; pub use async_trait::async_trait; #[cfg(not(any(target_os = "android", target_os = "linux")))] use cpal::{ @@ -1891,3 +1891,7 @@ fn decode_id_pk(signed: &[u8], key: &sign::PublicKey) -> ResultType<(String, [u8 bail!("Wrong public length"); } } + +pub fn disable_keyboard_listening() { + crate::ui_session_interface::KEYBOARD_HOOKED.store(false, Ordering::SeqCst); +} \ No newline at end of file diff --git a/src/flutter.rs b/src/flutter.rs index eb66260c9..81b455b04 100644 --- a/src/flutter.rs +++ b/src/flutter.rs @@ -328,6 +328,7 @@ pub fn session_start_(id: &str, event_stream: StreamSink) -> ResultTy *session.event_stream.write().unwrap() = Some(event_stream); let session = session.clone(); std::thread::spawn(move || { + crate::client::disable_keyboard_listening(); io_loop(session); }); Ok(()) diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs index 43cd35754..7af3a2fbd 100644 --- a/src/ui_session_interface.rs +++ b/src/ui_session_interface.rs @@ -22,7 +22,7 @@ use std::sync::{Arc, Mutex, RwLock}; /// IS_IN KEYBOARD_HOOKED sciter only pub static IS_IN: AtomicBool = AtomicBool::new(false); -static KEYBOARD_HOOKED: AtomicBool = AtomicBool::new(false); +pub static KEYBOARD_HOOKED: AtomicBool = AtomicBool::new(true); #[cfg(windows)] static mut IS_ALT_GR: bool = false; @@ -1166,7 +1166,7 @@ impl Session { if self.is_port_forward() || self.is_file_transfer() { return; } - if KEYBOARD_HOOKED.swap(true, Ordering::SeqCst) { + if !KEYBOARD_HOOKED.load(Ordering::SeqCst){ return; } log::info!("keyboard hooked"); From a8e501cb79beef47bad7fd6f0a69dd0298a02f5b Mon Sep 17 00:00:00 2001 From: Asura Date: Tue, 13 Sep 2022 02:20:25 -0700 Subject: [PATCH 3/4] Fix compile error on Android --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d778cc279..95ae98409 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,6 +61,7 @@ default-net = "0.11.0" wol-rs = "0.9.1" flutter_rust_bridge = { git = "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge", optional = true } errno = "0.2.8" +rdev = { git = "https://github.com/asur4s/rdev" } [target.'cfg(not(target_os = "linux"))'.dependencies] reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features=false } @@ -75,7 +76,6 @@ sciter-rs = { git = "https://github.com/open-trade/rust-sciter", branch = "dyn" sys-locale = "0.2" enigo = { path = "libs/enigo", features = [ "with_serde" ] } clipboard = { path = "libs/clipboard" } -rdev = { git = "https://github.com/asur4s/rdev" } ctrlc = "3.2" arboard = "2.0" #minreq = { version = "2.4", features = ["punycode", "https-native"] } From 7ffa407604b991847b23f5998da082ea8632d4e0 Mon Sep 17 00:00:00 2001 From: Asura Date: Tue, 13 Sep 2022 06:19:08 -0700 Subject: [PATCH 4/4] Fix logger without ui --- Cargo.lock | 2 +- flutter/linux/CMakeLists.txt | 2 +- src/core_main.rs | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c3313336..3a6abcaf7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3975,7 +3975,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/asur4s/rdev#895c8fb1a6106714793e8877d35d2b7a1c57ce9c" +source = "git+https://github.com/asur4s/rdev#0ad53987fa6f0e37a7bc000358f71c3802de4e7c" dependencies = [ "cocoa", "core-foundation 0.9.3", diff --git a/flutter/linux/CMakeLists.txt b/flutter/linux/CMakeLists.txt index 83778e83d..9a4e0527b 100644 --- a/flutter/linux/CMakeLists.txt +++ b/flutter/linux/CMakeLists.txt @@ -129,7 +129,7 @@ set(RUSTDESK_LIB_BUILD_TYPE $,debug,release>) string(TOLOWER ${CMAKE_BUILD_TYPE} ${RUSTDESK_LIB_BUILD_TYPE}) message(STATUS "rustdesk lib build type: ${RUSTDESK_LIB_BUILD_TYPE}") -set(RUSTDESK_LIB "../build/linux/x64/${RUSTDESK_LIB_BUILD_TYPE}/liblibrustdesk.so") +set(RUSTDESK_LIB "../../target/${RUSTDESK_LIB_BUILD_TYPE}/liblibrustdesk.so") install(FILES "${RUSTDESK_LIB}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime RENAME librustdesk.so) diff --git a/src/core_main.rs b/src/core_main.rs index 02ac5e646..cecbf4115 100644 --- a/src/core_main.rs +++ b/src/core_main.rs @@ -1,6 +1,6 @@ use hbb_common::log; -use crate::{start_os_service, flutter::connection_manager, start_server}; +use crate::{flutter::connection_manager, start_os_service, start_server}; /// Main entry of the RustDesk Core. /// Return true if the app should continue running with UI(possibly Flutter), false if the app should exit. @@ -14,6 +14,9 @@ pub fn core_main() -> bool { connection_manager::start_listen_ipc_thread(); return true; } + + use hbb_common::env_logger::*; + init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "info")); if args[1] == "--service" { log::info!("start --service"); start_os_service();