terminal works basically. (#12189)

* terminal works basically. todo: - persistent - sessions restore - web - mobile * missed terminal persistent option change * android sdk 34 -> 35 * +#![cfg_attr(lt_1_77, feature(c_str_literals))] * fixing ci * fix ci * fix ci for android * try "Fix Android SDK Platform 35" * fix android 34 * revert flutter_plugin_android_lifecycle to 2.0.17 which used in rustdesk 1.4.0 * refactor, but break something of desktop terminal (new tab showing loading) * fix connecting...
2026-03-31 00:51:04 +03:00 · 2025-07-01 13:12:55 +08:00
parent ee5cdc3155
commit 5faf0ad3cf
130 changed files with 4064 additions and 4247 deletions
--- a/flutter/lib/mobile/pages/file_manager_page.dart
+++ b/flutter/lib/mobile/pages/file_manager_page.dart
@@ -12,11 +12,12 @@ import '../../common/widgets/dialog.dart';

 class FileManagerPage extends StatefulWidget {
  FileManagerPage(
-      {Key? key, required this.id, this.password, this.isSharedPassword})
+      {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
      : super(key: key);
  final String id;
  final String? password;
  final bool? isSharedPassword;
+  final bool? forceRelay;

  @override
  State<StatefulWidget> createState() => _FileManagerPageState();
@@ -74,7 +75,8 @@ class _FileManagerPageState extends State<FileManagerPage> {
    gFFI.start(widget.id,
        isFileTransfer: true,
        password: widget.password,
-        isSharedPassword: widget.isSharedPassword);
+        isSharedPassword: widget.isSharedPassword,
+        forceRelay: widget.forceRelay);
    WidgetsBinding.instance.addPostFrameCallback((_) {
      gFFI.dialogManager
          .showLoading(translate('Connecting...'), onCancel: closeConnection);
--- a/flutter/lib/mobile/pages/home_page.dart
+++ b/flutter/lib/mobile/pages/home_page.dart
@@ -205,13 +205,13 @@ class WebHomePage extends StatelessWidget {
    }
    bool isFileTransfer = false;
    bool isViewCamera = false;
+    bool isTerminal = false;
    String? id;
    String? password;
    for (int i = 0; i < args.length; i++) {
      switch (args[i]) {
        case '--connect':
        case '--play':
-          isFileTransfer = false;
          id = args[i + 1];
          i++;
          break;
@@ -225,6 +225,11 @@ class WebHomePage extends StatelessWidget {
          id = args[i + 1];
          i++;
          break;
+        case '--terminal':
+          isTerminal = true;
+          id = args[i + 1];
+          i++;
+          break;
        case '--password':
          password = args[i + 1];
          i++;
@@ -234,7 +239,11 @@ class WebHomePage extends StatelessWidget {
      }
    }
    if (id != null) {
-      connect(context, id, isFileTransfer: isFileTransfer, isViewCamera: isViewCamera, password: password);
+      connect(context, id, 
+        isFileTransfer: isFileTransfer, 
+        isViewCamera: isViewCamera, 
+        isTerminal: isTerminal,
+        password: password);
    }
  }
 }
--- a/flutter/lib/mobile/pages/remote_page.dart
+++ b/flutter/lib/mobile/pages/remote_page.dart
@@ -40,12 +40,13 @@ void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) {
 }

 class RemotePage extends StatefulWidget {
-  RemotePage({Key? key, required this.id, this.password, this.isSharedPassword})
+  RemotePage({Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
      : super(key: key);

  final String id;
  final String? password;
  final bool? isSharedPassword;
+  final bool? forceRelay;

  @override
  State<RemotePage> createState() => _RemotePageState(id);
@@ -89,6 +90,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
      widget.id,
      password: widget.password,
      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
    );
    WidgetsBinding.instance.addPostFrameCallback((_) {
      SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -17,7 +17,7 @@ import 'home_page.dart';

 class ServerPage extends StatefulWidget implements PageShape {
  @override
-  final title = translate("Share Screen");
+  final title = translate("Share screen");

  @override
  final icon = const Icon(Icons.mobile_screen_share);
@@ -649,8 +649,8 @@ class ConnectionManager extends StatelessWidget {
        children: serverModel.clients
            .map((client) => PaddingCard(
                title: translate(client.isFileTransfer
-                    ? "File Connection"
-                    : "Screen Connection"),
+                    ? "Transfer file"
+                    : "Share screen"),
                titleIcon: client.isFileTransfer
                    ? Icon(Icons.folder_outlined)
                    : Icon(Icons.mobile_screen_share),
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -815,7 +815,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
            !outgoingOnly &&
            !hideSecuritySettings)
          SettingsSection(
-            title: Text(translate("Share Screen")),
+            title: Text(translate("Share screen")),
            tiles: shareScreenTiles,
          ),
        if (!bind.isIncomingOnly()) defaultDisplaySection(),
--- a/flutter/lib/mobile/pages/terminal_page.dart
+++ b/flutter/lib/mobile/pages/terminal_page.dart
@@ -0,0 +1,106 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/models/model.dart';
+import 'package:flutter_hbb/models/terminal_model.dart';
+import 'package:xterm/xterm.dart';
+import '../../desktop/pages/terminal_connection_manager.dart';
+
+class TerminalPage extends StatefulWidget {
+  const TerminalPage({
+    Key? key,
+    required this.id,
+    required this.password,
+    required this.isSharedPassword,
+    this.forceRelay,
+    this.connToken,
+  }) : super(key: key);
+  final String id;
+  final String? password;
+  final bool? forceRelay;
+  final bool? isSharedPassword;
+  final String? connToken;
+  final terminalId = 0;
+
+  @override
+  State<TerminalPage> createState() => _TerminalPageState();
+}
+
+class _TerminalPageState extends State<TerminalPage>
+    with AutomaticKeepAliveClientMixin {
+  late FFI _ffi;
+  late TerminalModel _terminalModel;
+
+  @override
+  void initState() {
+    super.initState();
+
+    debugPrint(
+        '[TerminalPage] Initializing terminal ${widget.terminalId} for peer ${widget.id}');
+
+    // Use shared FFI instance from connection manager
+    _ffi = TerminalConnectionManager.getConnection(
+      peerId: widget.id,
+      password: widget.password,
+      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
+      connToken: widget.connToken,
+    );
+
+    // Create terminal model with specific terminal ID
+    _terminalModel = TerminalModel(_ffi, widget.terminalId);
+    debugPrint(
+        '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');
+
+    // Register this terminal model with FFI for event routing
+    _ffi.registerTerminalModel(widget.terminalId, _terminalModel);
+
+    // Initialize terminal connection
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _ffi.dialogManager
+          .showLoading(translate('Connecting...'), onCancel: closeConnection);
+    });
+    _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id);
+  }
+
+  @override
+  void dispose() {
+    // Unregister terminal model from FFI
+    _ffi.unregisterTerminalModel(widget.terminalId);
+    _terminalModel.dispose();
+    super.dispose();
+    TerminalConnectionManager.releaseConnection(widget.id);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return Scaffold(
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+      body: TerminalView(
+        _terminalModel.terminal,
+        controller: _terminalModel.terminalController,
+        autofocus: true,
+        backgroundOpacity: 0.7,
+        padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0),
+        onSecondaryTapDown: (details, offset) async {
+          final selection = _terminalModel.terminalController.selection;
+          if (selection != null) {
+            final text = _terminalModel.terminal.buffer.getText(selection);
+            _terminalModel.terminalController.clearSelection();
+            await Clipboard.setData(ClipboardData(text: text));
+          } else {
+            final data = await Clipboard.getData('text/plain');
+            final text = data?.text;
+            if (text != null) {
+              _terminalModel.terminal.paste(text);
+            }
+          }
+        },
+      ),
+    );
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}
--- a/flutter/lib/mobile/pages/view_camera_page.dart
+++ b/flutter/lib/mobile/pages/view_camera_page.dart
@@ -39,12 +39,13 @@ void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) {

 class ViewCameraPage extends StatefulWidget {
  ViewCameraPage(
-      {Key? key, required this.id, this.password, this.isSharedPassword})
+      {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
      : super(key: key);

  final String id;
  final String? password;
  final bool? isSharedPassword;
+  final bool? forceRelay;

  @override
  State<ViewCameraPage> createState() => _ViewCameraPageState(id);
@@ -88,6 +89,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
      isViewCamera: true,
      password: widget.password,
      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
    );
    WidgetsBinding.instance.addPostFrameCallback((_) {
      SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);