* feat: Added Port Forwarding Functionality Implemented port forwarding functionality, including the following major changes: - Added a port forwarding configuration model and related state management - Added a port forwarding page and interaction logic - Implemented forwarding connections between local and remote ports - Integrated into the server features menu - Added necessary Hive adapters and storage support - Updated plugin configurations across all platforms to support the new feature * feat (Port Forwarding): Added multilingual support and optimized implementation Added multilingual support for the port forwarding feature, including Chinese, English, and other languages Optimized the port forwarding implementation by adding connection management and error handling Fixed an issue with state persistence when updating port forwarding configurations Updated related dependencies and submodules * fix(port_forward): Fixed port forwarding error handling and redesigned the configuration dialog Handled uncaught errors when port forwarding is disabled or during connection attempts Extracted the configuration dialog into a standalone component and added port range validation * fix(port_forward): Fixed issues with port forwarding connection management and UI layout Fixed an issue where port forwarding connections were not closed properly; now uses `clientGetter` to delay the retrieval of `SSHClient` Added cleanup logic when connections are closed to prevent memory leaks Added a `mounted` check in `PortForwardPage` to prevent operations from executing after the component is unmounted Wrapped the configuration dialog content in a `SingleChildScrollView` to prevent content overflow * fix(port_forward): Fixed a concurrent modification exception that occurred when closing a port forwarding connection Fixed a concurrent modification exception that could occur when closing a local forwarding entry by copying the connection list to prevent modifications to the collection during iteration. Also improved the UI by using theme colors and added error handling for configuration saving. * fix(port_forward_provider): Fixed an issue where entries were not properly removed when port forwarding was stopped When port forwarding is stopped, ensure that the corresponding entries are removed from the _forwards map. Additionally, before adding a new forwarding rule, check for and close any existing forwarding rules with the same ID to prevent resource leaks. * refactor(l1n): Remove unused localization and remote host port translations * fix(port_forward_provider): Handle errors when closing port forwarding Add error handling to prevent the program from crashing due to exceptions when closing port forwarding * refactor(port_forward): Refactor port forwarding state management to use serverId Directly link port forwarding state management to the server ID to simplify parameter passing Remove direct dependencies on Spi and use serverId as the core identifier instead Update relevant providers and page logic to accommodate the new state structure * fix(port_forward): Fixed a race condition issue in port forwarding operations Added an _inFlight collection to prevent duplicate operations Added a _saving state when saving configurations to prevent duplicate submissions Automatically cleans up forwarding when changes in server connection status are detected * refactor(port_forward_provider): Remove unnecessary concurrency control logic Simplify the `toggleForward` method by removing concurrency control for the `_inFlight` collection, as it is not required in the current scenario
322 lines
10 KiB
Dart
322 lines
10 KiB
Dart
import 'package:fl_lib/fl_lib.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
import 'package:server_box/core/extension/context/locale.dart';
|
|
import 'package:server_box/core/route.dart';
|
|
import 'package:server_box/data/model/server/port_forward.dart';
|
|
import 'package:server_box/data/provider/port_forward_provider.dart';
|
|
|
|
final class PortForwardPage extends ConsumerStatefulWidget {
|
|
final SpiRequiredArgs args;
|
|
|
|
const PortForwardPage({super.key, required this.args});
|
|
|
|
static const route = AppRouteArg<void, SpiRequiredArgs>(page: PortForwardPage.new, path: '/port_forward');
|
|
|
|
@override
|
|
ConsumerState<PortForwardPage> createState() => _PortForwardPageState();
|
|
}
|
|
|
|
final class _PortForwardPageState extends ConsumerState<PortForwardPage> {
|
|
late final PortForwardNotifier _notifier;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
_notifier = ref.read(portForwardProvider(widget.args.spi.id).notifier);
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (!mounted) return;
|
|
_showBetaWarning();
|
|
});
|
|
}
|
|
|
|
void _showBetaWarning() {
|
|
context.showRoundDialog(
|
|
title: libL10n.attention,
|
|
child: Text(context.l10n.portForwardBeta),
|
|
actions: [Btnx.ok],
|
|
);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(
|
|
appBar: CustomAppBar(
|
|
title: Text(libL10n.portForward),
|
|
actions: [
|
|
IconButton(
|
|
icon: const Icon(Icons.add),
|
|
onPressed: _onAdd,
|
|
),
|
|
],
|
|
),
|
|
body: _buildBody(),
|
|
);
|
|
}
|
|
|
|
Widget _buildBody() {
|
|
final state = ref.watch(portForwardProvider(widget.args.spi.id));
|
|
final configs = state.configs;
|
|
|
|
if (configs.isEmpty) {
|
|
return _buildEmpty();
|
|
}
|
|
|
|
return ListView.builder(
|
|
padding: const EdgeInsets.symmetric(vertical: 8),
|
|
itemCount: configs.length,
|
|
itemBuilder: (context, index) {
|
|
final config = configs[index];
|
|
final status = state.activeForwards[config.id];
|
|
return _buildConfigTile(config, status);
|
|
},
|
|
);
|
|
}
|
|
|
|
Widget _buildEmpty() {
|
|
return Center(
|
|
child: Column(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: [
|
|
Icon(Icons.compare_arrows, size: 64, color: Colors.grey),
|
|
const SizedBox(height: 16),
|
|
Text(libL10n.empty, style: UIs.textGrey),
|
|
const SizedBox(height: 8),
|
|
Text(context.l10n.portForward_startPrompt, style: UIs.text13Grey),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _buildConfigTile(PortForwardConfig config, PortForwardStatus? status) {
|
|
final isActive = status?.isActive ?? false;
|
|
final hasError = status?.error != null;
|
|
final colorScheme = Theme.of(context).colorScheme;
|
|
|
|
return ListTile(
|
|
leading: Icon(
|
|
isActive ? Icons.link : Icons.link_off,
|
|
color: isActive ? colorScheme.primary : (hasError ? colorScheme.error : colorScheme.onSurfaceVariant),
|
|
),
|
|
title: Text(config.name),
|
|
subtitle: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Text(config.displayAddr, style: UIs.text13Grey),
|
|
if (hasError) Text(status!.error!, style: TextStyle(color: colorScheme.error, fontSize: 12)),
|
|
],
|
|
),
|
|
trailing: Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Switch(
|
|
value: isActive,
|
|
onChanged: (_) => _notifier.toggleForward(config.id),
|
|
),
|
|
PopupMenu(
|
|
items: [
|
|
PopupMenuItem(
|
|
value: 'edit',
|
|
child: Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Icon(Icons.edit, size: 18),
|
|
const SizedBox(width: 8),
|
|
Text(libL10n.edit),
|
|
],
|
|
),
|
|
),
|
|
PopupMenuItem(
|
|
value: 'delete',
|
|
child: Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Icon(Icons.delete, size: 18),
|
|
const SizedBox(width: 8),
|
|
Text(libL10n.delete),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
onSelected: (val) {
|
|
if (val == 'edit') {
|
|
_onEdit(config);
|
|
} else if (val == 'delete') {
|
|
_onDelete(config);
|
|
}
|
|
},
|
|
),
|
|
],
|
|
),
|
|
isThreeLine: hasError,
|
|
).cardx.paddingSymmetric(horizontal: 13, vertical: 4);
|
|
}
|
|
|
|
void _onAdd() {
|
|
_showConfigDialog(null);
|
|
}
|
|
|
|
void _onEdit(PortForwardConfig config) {
|
|
_showConfigDialog(config);
|
|
}
|
|
|
|
void _onDelete(PortForwardConfig config) async {
|
|
final sure = await context.showRoundDialog<bool>(
|
|
title: libL10n.attention,
|
|
child: Text(context.l10n.portForward_deleteConfirmFmt(config.name)),
|
|
actions: Btnx.cancelOk,
|
|
);
|
|
if (sure == true) {
|
|
await _notifier.removeConfig(config.id);
|
|
}
|
|
}
|
|
|
|
void _showConfigDialog(PortForwardConfig? existing) {
|
|
showDialog(
|
|
context: context,
|
|
builder: (ctx) => _PortForwardConfigDialog(
|
|
existing: existing,
|
|
serverId: widget.args.spi.id,
|
|
onSave: (config) async {
|
|
if (existing == null) {
|
|
await _notifier.addConfig(config);
|
|
} else {
|
|
final wasActive = ref.read(portForwardProvider(widget.args.spi.id)).activeForwards[existing.id]?.isActive ?? false;
|
|
await _notifier.updateConfig(existing, config);
|
|
if (wasActive) {
|
|
await _notifier.startForward(config.id);
|
|
}
|
|
}
|
|
},
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _PortForwardConfigDialog extends StatefulWidget {
|
|
final PortForwardConfig? existing;
|
|
final String serverId;
|
|
final Future<void> Function(PortForwardConfig config) onSave;
|
|
|
|
const _PortForwardConfigDialog({
|
|
required this.existing,
|
|
required this.serverId,
|
|
required this.onSave,
|
|
});
|
|
|
|
@override
|
|
State<_PortForwardConfigDialog> createState() => _PortForwardConfigDialogState();
|
|
}
|
|
|
|
class _PortForwardConfigDialogState extends State<_PortForwardConfigDialog> {
|
|
late final TextEditingController nameController;
|
|
late final TextEditingController localHostController;
|
|
late final TextEditingController localPortController;
|
|
late final TextEditingController remoteHostController;
|
|
late final TextEditingController remotePortController;
|
|
late final TextEditingController descController;
|
|
bool _saving = false;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
nameController = TextEditingController(text: widget.existing?.name ?? '');
|
|
localHostController = TextEditingController(text: widget.existing?.localHost ?? 'localhost');
|
|
localPortController = TextEditingController(text: widget.existing?.localPort.toString() ?? '');
|
|
remoteHostController = TextEditingController(text: widget.existing?.remoteHost ?? '');
|
|
remotePortController = TextEditingController(text: widget.existing?.remotePort.toString() ?? '');
|
|
descController = TextEditingController(text: widget.existing?.description ?? '');
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
nameController.dispose();
|
|
localHostController.dispose();
|
|
localPortController.dispose();
|
|
remoteHostController.dispose();
|
|
remotePortController.dispose();
|
|
descController.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return AlertDialog(
|
|
title: Text(widget.existing == null ? libL10n.add : libL10n.edit),
|
|
content: SingleChildScrollView(
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Input(controller: nameController, hint: libL10n.name),
|
|
const SizedBox(height: 8),
|
|
Row(
|
|
children: [
|
|
Expanded(child: Input(controller: localHostController, hint: context.l10n.portForward_localHost)),
|
|
const SizedBox(width: 8),
|
|
Expanded(child: Input(controller: localPortController, hint: context.l10n.portForward_localPort, type: TextInputType.number)),
|
|
],
|
|
),
|
|
const SizedBox(height: 8),
|
|
Row(
|
|
children: [
|
|
Expanded(child: Input(controller: remoteHostController, hint: context.l10n.portForward_remoteHost)),
|
|
const SizedBox(width: 8),
|
|
Expanded(child: Input(controller: remotePortController, hint: context.l10n.portForward_remotePort, type: TextInputType.number)),
|
|
],
|
|
),
|
|
const SizedBox(height: 8),
|
|
Input(controller: descController, hint: libL10n.note),
|
|
],
|
|
),
|
|
),
|
|
actions: [
|
|
Btn.cancel(),
|
|
Btn.ok(
|
|
onTap: () async {
|
|
if (_saving) return;
|
|
setState(() => _saving = true);
|
|
try {
|
|
final name = nameController.text.trim();
|
|
final localHost = localHostController.text.trim();
|
|
final localPort = int.tryParse(localPortController.text.trim()) ?? 0;
|
|
final remoteHost = remoteHostController.text.trim();
|
|
final remotePort = int.tryParse(remotePortController.text.trim()) ?? 0;
|
|
final desc = descController.text.trim();
|
|
|
|
if (name.isEmpty ||
|
|
localHost.isEmpty ||
|
|
localPort <= 0 ||
|
|
localPort > 65535 ||
|
|
remoteHost.isEmpty ||
|
|
remotePort <= 0 ||
|
|
remotePort > 65535) {
|
|
if (mounted) context.showSnackBar(libL10n.invalid);
|
|
return;
|
|
}
|
|
|
|
final config = PortForwardConfig(
|
|
id: widget.existing?.id ?? ShortId.generate(),
|
|
serverId: widget.serverId,
|
|
name: name,
|
|
localHost: localHost,
|
|
localPort: localPort,
|
|
remoteHost: remoteHost,
|
|
remotePort: remotePort,
|
|
description: desc.isEmpty ? null : desc,
|
|
);
|
|
|
|
await widget.onSave(config);
|
|
if (mounted) Navigator.of(context).pop();
|
|
} catch (e, s) {
|
|
Loggers.app.warning('Failed to save port forward config', e, s);
|
|
if (mounted) context.showSnackBar(libL10n.error);
|
|
} finally {
|
|
if (mounted) setState(() => _saving = false);
|
|
}
|
|
},
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|