force relay when id is suffixed with "/r"

Signed-off-by: 21pages <pages21@163.com>

flutter/lib/common.dart

@@ -1405,13 +1405,14 @@ bool callUniLinksUriHandler(Uri uri) {
 connectMainDesktop(String id,
     {required bool isFileTransfer,
     required bool isTcpTunneling,
-    required bool isRDP}) async {
+    required bool isRDP,
+    bool? forceRelay}) async {
   if (isFileTransfer) {
-    await rustDeskWinManager.newFileTransfer(id);
+    await rustDeskWinManager.newFileTransfer(id, forceRelay: forceRelay);
   } else if (isTcpTunneling || isRDP) {
-    await rustDeskWinManager.newPortForward(id, isRDP);
+    await rustDeskWinManager.newPortForward(id, isRDP, forceRelay: forceRelay);
   } else {
-    await rustDeskWinManager.newRemoteDesktop(id);
+    await rustDeskWinManager.newRemoteDesktop(id, forceRelay: forceRelay);
   }
 }
 
@@ -1422,7 +1423,8 @@ connectMainDesktop(String id,
 connect(BuildContext context, String id,
     {bool isFileTransfer = false,
     bool isTcpTunneling = false,
-    bool isRDP = false}) async {
+    bool isRDP = false,
+    bool forceRelay = false}) async {
   if (id == '') return;
   id = id.replaceAll(' ', '');
   assert(!(isFileTransfer && isTcpTunneling && isRDP),
@@ -1430,18 +1432,18 @@ connect(BuildContext context, String id,
 
   if (isDesktop) {
     if (desktopType == DesktopType.main) {
-      await connectMainDesktop(
+      await connectMainDesktop(id,
-        id,
+          isFileTransfer: isFileTransfer,
-        isFileTransfer: isFileTransfer,
+          isTcpTunneling: isTcpTunneling,
-        isTcpTunneling: isTcpTunneling,
+          isRDP: isRDP,
-        isRDP: isRDP,
+          forceRelay: forceRelay);
-      );
     } else {
       await rustDeskWinManager.call(WindowType.Main, kWindowConnect, {
         'id': id,
         'isFileTransfer': isFileTransfer,
         'isTcpTunneling': isTcpTunneling,
         'isRDP': isRDP,
+        "forceRelay": forceRelay,
       });
     }
   } else {
@@ -1735,6 +1737,7 @@ Future<void> updateSystemWindowTheme() async {
     }
   }
 }
+
 /// macOS only
 ///
 /// Note: not found a general solution for rust based AVFoundation bingding.

flutter/lib/desktop/pages/connection_page.dart

@@ -66,7 +66,8 @@ class _ConnectionPageState extends State<ConnectionPage>
     _idFocusNode.addListener(() {
       _idInputFocused.value = _idFocusNode.hasFocus;
       // select all to faciliate removing text, just following the behavior of address input of chrome
-      _idController.selection = TextSelection(baseOffset: 0, extentOffset: _idController.value.text.length);
+      _idController.selection = TextSelection(
+          baseOffset: 0, extentOffset: _idController.value.text.length);
     });
     windowManager.addListener(this);
   }
@@ -149,8 +150,11 @@ class _ConnectionPageState extends State<ConnectionPage>
   /// Callback for the connect button.
   /// Connects to the selected peer.
   void onConnect({bool isFileTransfer = false}) {
-    final id = _idController.id;
+    var id = _idController.id;
-    connect(context, id, isFileTransfer: isFileTransfer);
+    var forceRelay = id.endsWith(r'/r');
+    if (forceRelay) id = id.substring(0, id.length - 2);
+    connect(context, id,
+        isFileTransfer: isFileTransfer, forceRelay: forceRelay);
   }
 
   /// UI for the remote ID TextField.

flutter/lib/desktop/pages/desktop_home_page.dart

@@ -556,6 +556,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           isFileTransfer: call.arguments['isFileTransfer'],
           isTcpTunneling: call.arguments['isTcpTunneling'],
           isRDP: call.arguments['isRDP'],
+          forceRelay: call.arguments['forceRelay'],
         );
       }
     });

flutter/lib/desktop/pages/file_manager_page.dart

@@ -46,8 +46,10 @@ enum MouseFocusScope {
 }
 
 class FileManagerPage extends StatefulWidget {
-  const FileManagerPage({Key? key, required this.id}) : super(key: key);
+  const FileManagerPage({Key? key, required this.id, this.forceRelay})
+      : super(key: key);
   final String id;
+  final bool? forceRelay;
 
   @override
   State<StatefulWidget> createState() => _FileManagerPageState();
@@ -102,7 +104,7 @@ class _FileManagerPageState extends State<FileManagerPage>
   void initState() {
     super.initState();
     _ffi = FFI();
-    _ffi.start(widget.id, isFileTransfer: true);
+    _ffi.start(widget.id, isFileTransfer: true, forceRelay: widget.forceRelay);
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _ffi.dialogManager
           .showLoading(translate('Connecting...'), onCancel: closeConnection);

flutter/lib/desktop/pages/file_manager_tab_page.dart

@@ -41,7 +41,11 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
         onTabCloseButton: () => () => tabController.closeBy(params['id']),
-        page: FileManagerPage(key: ValueKey(params['id']), id: params['id'])));
+        page: FileManagerPage(
+          key: ValueKey(params['id']),
+          id: params['id'],
+          forceRelay: params['forceRelay'],
+        )));
   }
 
   @override
@@ -64,7 +68,11 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
             selectedIcon: selectedIcon,
             unselectedIcon: unselectedIcon,
             onTabCloseButton: () => tabController.closeBy(id),
-            page: FileManagerPage(key: ValueKey(id), id: id)));
+            page: FileManagerPage(
+              key: ValueKey(id),
+              id: id,
+              forceRelay: args['forceRelay'],
+            )));
       } else if (call.method == "onDestroy") {
         tabController.clear();
       } else if (call.method == kWindowActionRebuild) {

flutter/lib/desktop/pages/port_forward_page.dart

@@ -26,10 +26,12 @@ class _PortForward {
 }
 
 class PortForwardPage extends StatefulWidget {
-  const PortForwardPage({Key? key, required this.id, required this.isRDP})
+  const PortForwardPage(
+      {Key? key, required this.id, required this.isRDP, this.forceRelay})
       : super(key: key);
   final String id;
   final bool isRDP;
+  final bool? forceRelay;
 
   @override
   State<PortForwardPage> createState() => _PortForwardPageState();
@@ -47,7 +49,7 @@ class _PortForwardPageState extends State<PortForwardPage>
   void initState() {
     super.initState();
     _ffi = FFI();
-    _ffi.start(widget.id, isPortForward: true);
+    _ffi.start(widget.id, isPortForward: true, forceRelay: widget.forceRelay);
     Get.put(_ffi, tag: 'pf_${widget.id}');
     if (!Platform.isLinux) {
       Wakelock.enable();

flutter/lib/desktop/pages/port_forward_tab_page.dart

@@ -44,6 +44,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
           key: ValueKey(params['id']),
           id: params['id'],
           isRDP: isRDP,
+          forceRelay: params['forceRelay'],
         )));
   }
 
@@ -72,7 +73,12 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
             label: id,
             selectedIcon: selectedIcon,
             unselectedIcon: unselectedIcon,
-            page: PortForwardPage(id: id, isRDP: isRDP)));
+            page: PortForwardPage(
+              key: ValueKey(args['id']),
+              id: id,
+              isRDP: isRDP,
+              forceRelay: args['forceRelay'],
+            )));
       } else if (call.method == "onDestroy") {
         tabController.clear();
       } else if (call.method == kWindowActionRebuild) {

flutter/lib/desktop/pages/remote_page.dart

@@ -34,11 +34,13 @@ class RemotePage extends StatefulWidget {
     required this.id,
     required this.menubarState,
     this.switchUuid,
+    this.forceRelay,
   }) : super(key: key);
 
   final String id;
   final MenubarState menubarState;
   final String? switchUuid;
+  final bool? forceRelay;
   final SimpleWrapper<State<RemotePage>?> _lastState = SimpleWrapper(null);
 
   FFI get ffi => (_lastState.value! as _RemotePageState)._ffi;
@@ -107,6 +109,7 @@ class _RemotePageState extends State<RemotePage>
     _ffi.start(
       widget.id,
       switchUuid: widget.switchUuid,
+      forceRelay: widget.forceRelay,
     );
     WidgetsBinding.instance.addPostFrameCallback((_) {
       SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -70,6 +70,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
           id: peerId,
           menubarState: _menubarState,
           switchUuid: params['switch_uuid'],
+          forceRelay: params['forceRelay'],
         ),
       ));
       _update_remote_count();
@@ -104,6 +105,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
             id: id,
             menubarState: _menubarState,
             switchUuid: switchUuid,
+            forceRelay: args['forceRelay'],
           ),
         ));
       } else if (call.method == "onDestroy") {

flutter/lib/models/model.dart

@@ -1339,7 +1339,8 @@ class FFI {
   void start(String id,
       {bool isFileTransfer = false,
       bool isPortForward = false,
-      String? switchUuid}) {
+      String? switchUuid,
+      bool? forceRelay}) {
     assert(!(isFileTransfer && isPortForward), 'more than one connect type');
     if (isFileTransfer) {
       connType = ConnType.fileTransfer;
@@ -1355,11 +1356,11 @@ class FFI {
     }
     // ignore: unused_local_variable
     final addRes = bind.sessionAddSync(
-      id: id,
+        id: id,
-      isFileTransfer: isFileTransfer,
+        isFileTransfer: isFileTransfer,
-      isPortForward: isPortForward,
+        isPortForward: isPortForward,
-      switchUuid: switchUuid ?? "",
+        switchUuid: switchUuid ?? "",
-    );
+        forceRelay: forceRelay ?? false);
     final stream = bind.sessionStart(id: id);
     final cb = ffiModel.startEventListener(id);
     () async {

flutter/lib/utils/multi_window_manager.dart

@@ -41,11 +41,15 @@ class RustDeskMultiWindowManager {
   int? _fileTransferWindowId;
   int? _portForwardWindowId;
 
-  Future<dynamic> newRemoteDesktop(String remoteId,
+  Future<dynamic> newRemoteDesktop(
-      {String? switch_uuid}) async {
+    String remoteId, {
+    String? switch_uuid,
+    bool? forceRelay,
+  }) async {
     var params = {
       "type": WindowType.RemoteDesktop.index,
       "id": remoteId,
+      "forceRelay": forceRelay
     };
     if (switch_uuid != null) {
       params['switch_uuid'] = switch_uuid;
@@ -78,9 +82,12 @@ class RustDeskMultiWindowManager {
     }
   }
 
-  Future<dynamic> newFileTransfer(String remoteId) async {
+  Future<dynamic> newFileTransfer(String remoteId, {bool? forceRelay}) async {
-    final msg =
+    var msg = jsonEncode({
-        jsonEncode({"type": WindowType.FileTransfer.index, "id": remoteId});
+      "type": WindowType.FileTransfer.index,
+      "id": remoteId,
+      "forceRelay": forceRelay,
+    });
 
     try {
       final ids = await DesktopMultiWindow.getAllSubWindowIds();
@@ -107,9 +114,14 @@ class RustDeskMultiWindowManager {
     }
   }
 
-  Future<dynamic> newPortForward(String remoteId, bool isRDP) async {
+  Future<dynamic> newPortForward(String remoteId, bool isRDP,
-    final msg = jsonEncode(
+      {bool? forceRelay}) async {
-        {"type": WindowType.PortForward.index, "id": remoteId, "isRDP": isRDP});
+    final msg = jsonEncode({
+      "type": WindowType.PortForward.index,
+      "id": remoteId,
+      "isRDP": isRDP,
+      "forceRelay": forceRelay,
+    });
 
     try {
       final ids = await DesktopMultiWindow.getAllSubWindowIds();

src/client.rs

@@ -3,15 +3,15 @@ use std::{
     net::SocketAddr,
     ops::{Deref, Not},
     str::FromStr,
-    sync::{Arc, atomic::AtomicBool, mpsc, Mutex, RwLock},
+    sync::{atomic::AtomicBool, mpsc, Arc, Mutex, RwLock},
 };
 
 pub use async_trait::async_trait;
 use bytes::Bytes;
 #[cfg(not(any(target_os = "android", target_os = "linux")))]
 use cpal::{
-    Device,
+    traits::{DeviceTrait, HostTrait, StreamTrait},
-    Host, StreamConfig, traits::{DeviceTrait, HostTrait, StreamTrait},
+    Device, Host, StreamConfig,
 };
 use magnum_opus::{Channels::*, Decoder as AudioDecoder};
 use sha2::{Digest, Sha256};
@@ -19,26 +19,26 @@ use uuid::Uuid;
 
 pub use file_trait::FileManager;
 use hbb_common::{
-    AddrMangle,
     allow_err,
     anyhow::{anyhow, Context},
     bail,
     config::{
-        Config, CONNECT_TIMEOUT, PeerConfig, PeerInfoSerde, READ_TIMEOUT, RELAY_PORT,
+        Config, PeerConfig, PeerInfoSerde, CONNECT_TIMEOUT, READ_TIMEOUT, RELAY_PORT,
         RENDEZVOUS_TIMEOUT,
-    }, get_version_number,
+    },
-    log,
+    get_version_number, log,
-    message_proto::{*, option_message::BoolOption},
+    message_proto::{option_message::BoolOption, *},
     protobuf::Message as _,
     rand,
     rendezvous_proto::*,
-    ResultType,
     socket_client,
     sodiumoxide::crypto::{box_, secretbox, sign},
-    Stream, timeout, tokio::time::Duration,
+    timeout,
+    tokio::time::Duration,
+    AddrMangle, ResultType, Stream,
 };
-pub use helper::*;
 pub use helper::LatencyController;
+pub use helper::*;
 use scrap::{
     codec::{Decoder, DecoderCfg},
     record::{Recorder, RecorderContext},
@@ -943,7 +943,13 @@ impl LoginConfigHandler {
     ///
     /// * `id` - id of peer
     /// * `conn_type` - Connection type enum.
-    pub fn initialize(&mut self, id: String, conn_type: ConnType, switch_uuid: Option<String>) {
+    pub fn initialize(
+        &mut self,
+        id: String,
+        conn_type: ConnType,
+        switch_uuid: Option<String>,
+        force_relay: bool,
+    ) {
         self.id = id;
         self.conn_type = conn_type;
         let config = self.load_config();
@@ -952,7 +958,7 @@ impl LoginConfigHandler {
         self.session_id = rand::random();
         self.supported_encoding = None;
         self.restarting_remote_device = false;
-        self.force_relay = !self.get_option("force-always-relay").is_empty();
+        self.force_relay = !self.get_option("force-always-relay").is_empty() || force_relay;
         self.direct = None;
         self.received = false;
         self.switch_uuid = switch_uuid;

src/flutter.rs

@@ -3,19 +3,19 @@ use crate::{
     flutter_ffi::EventToUI,
     ui_session_interface::{io_loop, InvokeUiSession, Session},
 };
-use flutter_rust_bridge::{StreamSink};
+use flutter_rust_bridge::StreamSink;
 use hbb_common::{
     bail, config::LocalConfig, get_version_number, message_proto::*, rendezvous_proto::ConnType,
     ResultType,
 };
 use serde_json::json;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::{
     collections::HashMap,
     ffi::CString,
     os::raw::{c_char, c_int},
     sync::{Arc, RwLock},
 };
-use std::sync::atomic::{AtomicBool, Ordering};
 
 pub(super) const APP_TYPE_MAIN: &str = "main";
 pub(super) const APP_TYPE_CM: &str = "cm";
@@ -114,7 +114,7 @@ pub struct FlutterHandler {
     // SAFETY: [rgba] is guarded by [rgba_valid], and it's safe to reach [rgba] with `rgba_valid == true`.
     // We must check the `rgba_valid` before reading [rgba].
     pub rgba: Arc<RwLock<Vec<u8>>>,
-    pub rgba_valid: Arc<AtomicBool>
+    pub rgba_valid: Arc<AtomicBool>,
 }
 
 impl FlutterHandler {
@@ -449,6 +449,7 @@ pub fn session_add(
     is_file_transfer: bool,
     is_port_forward: bool,
     switch_uuid: &str,
+    force_relay: bool,
 ) -> ResultType<()> {
     let session_id = get_session_id(id.to_owned());
     LocalConfig::set_remote_id(&session_id);
@@ -477,7 +478,7 @@ pub fn session_add(
         .lc
         .write()
         .unwrap()
-        .initialize(session_id, conn_type, switch_uuid);
+        .initialize(session_id, conn_type, switch_uuid, force_relay);
 
     if let Some(same_id_session) = SESSIONS.write().unwrap().insert(id.to_owned(), session) {
         same_id_session.close();
@@ -667,7 +668,7 @@ pub fn session_get_rgba_size(id: *const char) -> usize {
     let id = unsafe { std::ffi::CStr::from_ptr(id as _) };
     if let Ok(id) = id.to_str() {
         if let Some(session) = SESSIONS.write().unwrap().get_mut(id) {
-           return session.rgba.read().unwrap().len();
+            return session.rgba.read().unwrap().len();
         }
     }
     0
@@ -692,4 +693,4 @@ pub fn session_next_rgba(id: *const char) {
             return session.next_rgba();
         }
     }
-}
+}

src/flutter_ffi.rs

@@ -1,3 +1,4 @@
+use crate::ui_session_interface::InvokeUiSession;
 use crate::{
     client::file_trait::FileManager,
     common::make_fd_to_json,
@@ -20,7 +21,6 @@ use std::{
     os::raw::c_char,
     str::FromStr,
 };
-use crate::ui_session_interface::InvokeUiSession;
 
 // use crate::hbbs_http::account::AuthResult;
 
@@ -84,8 +84,15 @@ pub fn session_add_sync(
     is_file_transfer: bool,
     is_port_forward: bool,
     switch_uuid: String,
+    force_relay: bool,
 ) -> SyncReturn<String> {
-    if let Err(e) = session_add(&id, is_file_transfer, is_port_forward, &switch_uuid) {
+    if let Err(e) = session_add(
+        &id,
+        is_file_transfer,
+        is_port_forward,
+        &switch_uuid,
+        force_relay,
+    ) {
         SyncReturn(format!("Failed to add session with id {}, {}", &id, e))
     } else {
         SyncReturn("".to_owned())

src/ui/remote.rs

@@ -1,24 +1,24 @@
+use std::sync::RwLock;
 use std::{
     collections::HashMap,
     ops::{Deref, DerefMut},
     sync::{Arc, Mutex},
 };
-use std::sync::RwLock;
 
 use sciter::{
     dom::{
-        Element,
+        event::{EventReason, BEHAVIOR_EVENTS, EVENT_GROUPS, PHASE_MASK},
-        event::{BEHAVIOR_EVENTS, EVENT_GROUPS, EventReason, PHASE_MASK}, HELEMENT,
+        Element, HELEMENT,
     },
     make_args,
+    video::{video_destination, AssetPtr, COLOR_SPACE},
     Value,
-    video::{AssetPtr, COLOR_SPACE, video_destination},
 };
 
+use hbb_common::tokio::io::AsyncReadExt;
 use hbb_common::{
     allow_err, fs::TransferJobMeta, log, message_proto::*, rendezvous_proto::ConnType,
 };
-use hbb_common::tokio::io::AsyncReadExt;
 
 use crate::{
     client::*,
@@ -286,7 +286,9 @@ impl InvokeUiSession for SciterHandler {
     }
 
     /// RGBA is directly rendered by [on_rgba]. No need to store the rgba for the sciter ui.
-    fn get_rgba(&self) -> *const u8  { std::ptr::null() }
+    fn get_rgba(&self) -> *const u8 {
+        std::ptr::null()
+    }
 
     fn next_rgba(&mut self) {}
 }
@@ -467,7 +469,11 @@ impl SciterSession {
             ConnType::DEFAULT_CONN
         };
 
-        session.lc.write().unwrap().initialize(id, conn_type, None);
+        session
+            .lc
+            .write()
+            .unwrap()
+            .initialize(id, conn_type, None, false);
 
         Self(session)
     }