PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.
Dart airdrop-alternativeclipboardclipboard-sharingclipboard-synccopy-pastecross-platformend-to-end-encryptionfile-syncfile-transferfluttergolanglinuxmacosnat-traversalp2pself-hostedtailscaleuniversal-clipboardwebrtcwindows
fix(ui): allow cancelling ongoing files sent to friends
baiyuze8f9acb3dc94b
diff --git a/client-core/internal/send/ask_test.go b/client-core/internal/send/ask_test.goindex 815b959..7e3787e 100644--- a/client-core/internal/send/ask_test.go+++ b/client-core/internal/send/ask_test.go@@ -164,12 +164,58 @@ func TestFriendAskCancelledBySender(t *testing.T) {if err := p.a.eng.Cancel(tr.Id); err != nil {t.Fatal(err)}- waitStatus(t, p.b, got.ID, store.TransferCancelled)+ waitStatus(t, p.a, tr.Id, store.TransferCancelled)+ if cancelled := waitStatus(t, p.b, got.ID, store.TransferCancelled); cancelled.Error != "peer_cancelled" {+ t.Fatalf("接收方的取消原因 = %q", cancelled.Error)+ }if _, _, err := p.b.eng.Answer(got.ID, true); err != ErrNotAsking {t.Fatalf("取消后不能再接受: %v", err)}}+// 好友接受后仍能取消正在发送的文件,清掉临时数据,后续发送照常。+func TestFriendActiveSendCancelledBySender(t *testing.T) {+ p := friendPair(t)+ path := filepath.Join(t.TempDir(), "big.bin")+ writeFile(t, path, randomBytes(t, 60<<20))+ tr, err := p.a.eng.SendFiles("bob", []string{path}, false, "")+ if err != nil {+ t.Fatal(err)+ }+ got := askingOn(t, p.b)+ if _, _, err := p.b.eng.Answer(got.ID, true); err != nil {+ t.Fatal(err)+ }+ waitStatus(t, p.a, tr.Id, store.TransferActive)+ if err := p.a.eng.Cancel(tr.Id); err != nil {+ t.Fatal(err)+ }+ waitStatus(t, p.a, tr.Id, store.TransferCancelled)+ if cancelled := waitStatus(t, p.b, tr.Id, store.TransferCancelled); cancelled.Error != "peer_cancelled" {+ t.Fatalf("接收方的取消原因 = %q", cancelled.Error)+ }+ if _, err := os.Stat(filepath.Join(p.b.recvDir, partialDir, tr.Id)); !os.IsNotExist(err) {+ t.Fatal("取消后仍留着未收完的临时数据")+ }+ if _, err := os.Stat(filepath.Join(p.b.recvDir, "big.bin")); !os.IsNotExist(err) {+ t.Fatal("取消的文件不应保存到接收目录")+ }+ path = filepath.Join(t.TempDir(), "next.txt")+ data := []byte("send after cancellation")+ writeFile(t, path, data)+ next, err := p.a.eng.SendFiles("bob", []string{path}, false, "")+ if err != nil {+ t.Fatal(err)+ }+ asking := askingOn(t, p.b)+ if _, _, err := p.b.eng.Answer(asking.ID, true); err != nil {+ t.Fatal(err)+ }+ waitStatus(t, p.a, next.Id, store.TransferDone)+ waitStatus(t, p.b, next.Id, store.TransferDone)+ sameFile(t, data, filepath.Join(p.b.recvDir, "next.txt"))+}+func TestSendToFriendNeedsAskAndValidNote(t *testing.T) {p := friendPair(t)src := t.TempDir()diff --git a/ui/lib/widgets/friend_send_dialog.dart b/ui/lib/widgets/friend_send_dialog.dartindex f37f6c8..d7c40b1 100644--- a/ui/lib/widgets/friend_send_dialog.dart+++ b/ui/lib/widgets/friend_send_dialog.dart@@ -63,8 +63,8 @@ class _FriendSendDialogState extends State<FriendSendDialog> {bool _dragging = false;bool _sending = false;- /// 这个窗口里发出的批次- final List<String> _sent = [];+ /// 本窗口发出、或打开后看到的未结束批次;结束后仍保留结果。+ final Set<String> _sent = {};@overridevoid initState() {@@ -72,6 +72,14 @@ class _FriendSendDialogState extends State<FriendSendDialog> {_add(widget.initial);}+ @override+ void didChangeDependencies() {+ super.didChangeDependencies();+ for (final t in AppScope.of(context).transfers(TransferDirection.TRANSFER_DIRECTION_OUTGOING)) {+ if (t.deviceId == widget.target.id && canCancelTransfer(t)) _sent.add(t.id);+ }+ }+@overridevoid dispose() {_note.dispose();@@ -134,10 +142,10 @@ class _FriendSendDialogState extends State<FriendSendDialog> {});return const SizedBox.shrink();}- final batches = [- for (final id in _sent)- ?state.transfers(TransferDirection.TRANSFER_DIRECTION_OUTGOING).where((t) => t.id == id).firstOrNull,- ];+ // 重开窗口也保留未结束的批次,随时可以取消;本窗口发出的保留结果。+ final batches = state.transfers(TransferDirection.TRANSFER_DIRECTION_OUTGOING)+ .where((t) => _sent.contains(t.id) || t.deviceId == target.id && canCancelTransfer(t)).toList()+ ..sort((a, b) => b.createdAtUnix.compareTo(a.createdAtUnix));final route = friend != null ? friendStatus(l, state, friend) : l.strangerNearby;final pasteKey = Platform.isMacOS ? '⌘V' : 'Ctrl+V';final total = _staged.fold<int>(0, (n, path) => n + (_sizes[path] ?? 0));@@ -152,7 +160,7 @@ class _FriendSendDialogState extends State<FriendSendDialog> {child: Dialog(child: SizedBox(width: 540,- child: Padding(+ child: SingleChildScrollView(child: Padding(padding: const EdgeInsets.fromLTRB(Insets.xl, Insets.lg, Insets.md, Insets.xl),child: Column(mainAxisSize: MainAxisSize.min,@@ -187,7 +195,13 @@ class _FriendSendDialogState extends State<FriendSendDialog> {children: [if (batches.isNotEmpty) ...[const SizedBox(height: Insets.lg),- for (final t in batches.reversed) TransferBatchRow(transfer: t),+ ConstrainedBox(+ constraints: const BoxConstraints(maxHeight: 160),+ child: ListView(+ shrinkWrap: true,+ children: [for (final t in batches) TransferBatchRow(key: ValueKey(t.id), transfer: t)],+ ),+ ),],const SizedBox(height: Insets.lg),if (_staged.isNotEmpty) ...[@@ -294,7 +308,7 @@ class _FriendSendDialogState extends State<FriendSendDialog> {),],),- ),+ )),),),),diff --git a/ui/lib/widgets/friends_dialog.dart b/ui/lib/widgets/friends_dialog.dartindex ec1e57b..706e0fb 100644--- a/ui/lib/widgets/friends_dialog.dart+++ b/ui/lib/widgets/friends_dialog.dart@@ -691,7 +691,7 @@ class FriendDetail extends StatelessWidget {padding: const EdgeInsets.only(right: Insets.md),itemCount: list.length,separatorBuilder: (_, _) => Divider(height: 1, color: p.separator),- itemBuilder: (_, i) => _HistoryRow(transfer: list[i]),+ itemBuilder: (_, i) => _HistoryRow(key: ValueKey(list[i].id), transfer: list[i]),);return Column(mainAxisSize: inDialog ? MainAxisSize.min : MainAxisSize.max,@@ -757,7 +757,7 @@ class FriendDetail extends StatelessWidget {}class _HistoryRow extends StatelessWidget {- const _HistoryRow({required this.transfer});+ const _HistoryRow({super.key, required this.transfer});final Transfer transfer;@@ -803,6 +803,8 @@ class _HistoryRow extends StatelessWidget {),if (!out && t.status == 'done' && t.paths.isNotEmpty)TextButton(onPressed: () => revealFile(t.paths.first), child: Text(revealLabel(l))),+ if (out && canCancelTransfer(t))+ TransferCancelButton(key: ValueKey(t.id), transfer: t),],),);diff --git a/ui/lib/widgets/send_dialog.dart b/ui/lib/widgets/send_dialog.dartindex 69ba92a..b94ac50 100644--- a/ui/lib/widgets/send_dialog.dart+++ b/ui/lib/widgets/send_dialog.dart@@ -354,6 +354,41 @@ class _SendDialogState extends State<SendDialog> {}}+bool canCancelTransfer(Transfer t) =>+ const {'scanning', 'queued', 'waiting', 'asking', 'active', 'paused', 'interrupted'}.contains(t.status);++/// 发送窗口与好友记录共用的取消入口。+class TransferCancelButton extends StatefulWidget {+ const TransferCancelButton({super.key, required this.transfer});++ final Transfer transfer;++ @override+ State<TransferCancelButton> createState() => _TransferCancelButtonState();+}++class _TransferCancelButtonState extends State<TransferCancelButton> {+ bool _busy = false;++ Future<void> _cancel() async {+ if (_busy) return;+ setState(() => _busy = true);+ try {+ await AppScope.read(context).cancelTransfer(widget.transfer.id);+ } catch (e) {+ if (mounted) showToast(context, AppState.describeError(e), error: true);+ } finally {+ if (mounted) setState(() => _busy = false);+ }+ }++ @override+ Widget build(BuildContext context) => TextButton(+ onPressed: _busy ? null : _cancel,+ child: Text(widget.transfer.status == 'queued' ? context.l10n.sendRemoveQueued : context.l10n.cancel),+ );+}+/// 发送窗口里的一批:名称、大小,进度或结果。class TransferBatchRow extends StatelessWidget {const TransferBatchRow({super.key, required this.transfer});@@ -366,8 +401,6 @@ class TransferBatchRow extends StatelessWidget {final p = context.palette;final t = transfer;final active = t.status == 'active';- final cancellable =- const {'scanning', 'queued', 'waiting', 'asking', 'active', 'paused', 'interrupted'}.contains(t.status);final status = switch (t.status) {'done' => l.sendDelivered,'active' => null,@@ -415,19 +448,10 @@ class TransferBatchRow extends StatelessWidget {],),),- if (cancellable)+ if (canCancelTransfer(t))Padding(padding: const EdgeInsets.only(left: Insets.sm),- child: t.status == 'queued'- ? TextButton(- onPressed: () => AppScope.read(context).cancelTransfer(t.id),- child: Text(l.sendRemoveQueued),- )- : IconAction(- icon: AppIcons.xmark,- tooltip: l.cancel,- onTap: () => AppScope.read(context).cancelTransfer(t.id),- ),+ child: TransferCancelButton(key: ValueKey(t.id), transfer: t),),],),diff --git a/ui/test/friend_send_cancel_test.dart b/ui/test/friend_send_cancel_test.dartnew file mode 100644index 0000000..9abc6c6--- /dev/null+++ b/ui/test/friend_send_cancel_test.dart@@ -0,0 +1,219 @@+import 'dart:async';++import 'package:flutter/material.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:grpc/grpc.dart';+import 'package:pasteferry_ui/app_state.dart';+import 'package:pasteferry_ui/gen/pasteferry/v1/daemon.pb.dart';+import 'package:pasteferry_ui/i18n.dart';+import 'package:pasteferry_ui/main.dart';+import 'package:pasteferry_ui/widgets/friend_send_dialog.dart';+import 'package:pasteferry_ui/widgets/friends_dialog.dart';+import 'package:pasteferry_ui/widgets/send_dialog.dart';++const _out = TransferDirection.TRANSFER_DIRECTION_OUTGOING;+final _friend = Friend(+ id: 'friend',+ displayName: '小明',+ online: true,+ connection: ConnectionKind.CONNECTION_KIND_DIRECT,+ featuresKnown: true,+ receivesFiles: true,+);++Transfer _transfer(+ String status, {+ String id = 'batch',+ String device = 'friend',+}) => Transfer(+ id: id,+ direction: _out,+ deviceId: device,+ deviceName: '小明',+ peerRole: 'friend',+ status: status,+ items: [ClipItem(name: '$id.txt')],+);++class _CancelState extends AppState {+ _CancelState(List<Transfer> transfers) {+ debugSeed(+ status: Status(),+ config: Config(language: 'zh-Hans'),+ self: Device(id: 'self'),+ friends: [_friend],+ transfers: transfers,+ );+ }++ final cancelled = <String>[];+ Completer<void>? pending;++ @override+ Future<void> cancelTransfer(String id) async {+ cancelled.add(id);+ await pending?.future;+ final t = transfers(_out).firstWhere((t) => t.id == id).deepCopy()+ ..status = 'cancelled'+ ..error = 'cancelled';+ debugEvent(Event(transferChanged: t));+ }+}++Future<BuildContext> _open(WidgetTester tester, AppState state) async {+ await tester.pumpWidget(PasteFerryApp(state: state));+ await tester.pump();+ return tester.element(find.byType(Shell));+}++Future<void> _detail(WidgetTester tester, BuildContext context) async {+ unawaited(+ showDialog<void>(+ context: context,+ builder: (_) => const Dialog(+ child: SizedBox(+ width: 580,+ child: Padding(+ padding: EdgeInsets.all(20),+ child: FriendDetail(friendId: 'friend', inDialog: true),+ ),+ ),+ ),+ ),+ );+ await tester.pumpAndSettle();+}++void main() {+ for (final status in [+ 'scanning',+ 'queued',+ 'waiting',+ 'asking',+ 'active',+ 'paused',+ 'interrupted',+ ]) {+ testWidgets('好友记录可以取消 $status 的发送', (tester) async {+ final state = _CancelState([_transfer(status)]);+ final context = await _open(tester, state);+ final l = context.l10n;+ await _detail(tester, context);+ await tester.tap(+ find.widgetWithText(+ TextButton,+ status == 'queued' ? l.sendRemoveQueued : l.cancel,+ ),+ );+ await tester.pump();+ expect(state.cancelled, ['batch']);+ expect(find.text(l.transferCancelled), findsOneWidget);+ expect(find.byType(TransferCancelButton), findsNothing);+ await tester.pumpWidget(const SizedBox.shrink());+ });+ }++ testWidgets('已结束的好友发送不显示取消', (tester) async {+ final state = _CancelState([+ for (final status in [+ 'done',+ 'failed',+ 'cancelled',+ 'declined',+ 'expired',+ ])+ _transfer(status, id: status),+ ]);+ final context = await _open(tester, state);+ await _detail(tester, context);+ expect(find.byType(TransferCancelButton), findsNothing);+ await tester.pumpWidget(const SizedBox.shrink());+ });++ testWidgets('重开发送窗口仍能取消该好友的传输,不显示别人的任务', (tester) async {+ final state = _CancelState([+ _transfer('asking'),+ _transfer('active', id: 'other', device: 'another-friend'),+ _transfer('done', id: 'finished'),+ ]);+ final context = await _open(tester, state);+ final l = context.l10n;+ unawaited(showFriendSendDialog(context, SendTarget.friend(_friend)));+ await tester.pumpAndSettle();+ expect(find.text('batch.txt'), findsOneWidget);+ expect(find.text('other.txt'), findsNothing);+ expect(find.text('finished.txt'), findsNothing);+ await tester.tap(find.byTooltip(l.close));+ await tester.pumpAndSettle();+ unawaited(showFriendSendDialog(context, SendTarget.friend(_friend)));+ await tester.pumpAndSettle();+ await tester.tap(find.widgetWithText(TextButton, l.cancel));+ await tester.pump();+ expect(state.cancelled, ['batch']);+ expect(find.text(l.transferCancelled), findsOneWidget);+ await tester.pumpWidget(const SizedBox.shrink());+ });++ testWidgets('取消请求等待时防止重复点击,失败后可重试', (tester) async {+ final state = _CancelState([_transfer('waiting')])+ ..pending = Completer<void>();+ final context = await _open(tester, state);+ final l = context.l10n;+ await _detail(tester, context);+ final button = find.widgetWithText(TextButton, l.cancel);+ await tester.tap(button);+ await tester.pump();+ expect(tester.widget<TextButton>(button).onPressed, isNull);+ expect(state.cancelled, ['batch']);+ state.pending!.completeError(const GrpcError.internal('cancel failed'));+ await tester.pump();+ expect(+ find.text(+ AppState.describeError(const GrpcError.internal('cancel failed')),+ ),+ findsOneWidget,+ );+ expect(tester.widget<TextButton>(button).onPressed, isNotNull);+ state.pending = null;+ await tester.tap(button);+ await tester.pump();+ expect(state.cancelled, ['batch', 'batch']);+ expect(find.text(l.transferCancelled), findsOneWidget);+ await tester.pump(const Duration(seconds: 4));+ await tester.pumpWidget(const SizedBox.shrink());+ });++ testWidgets('最小窗口里多批待发送文件仍能滚动并取消', (tester) async {+ tester.view.physicalSize = const Size(760, 520);+ tester.view.devicePixelRatio = 1;+ addTearDown(tester.view.reset);+ final state = _CancelState([+ for (var i = 0; i < 8; i++) _transfer('asking', id: 'batch-$i'),+ ]);+ final context = await _open(tester, state);+ final l = context.l10n;+ unawaited(showFriendSendDialog(context, SendTarget.friend(_friend)));+ await tester.pumpAndSettle();+ expect(tester.takeException(), isNull);+ final list = find.descendant(+ of: find.byType(FriendSendDialog),+ matching: find.byType(ListView),+ );+ await tester.drag(list, const Offset(0, -500));+ await tester.pumpAndSettle();+ final row = find.ancestor(+ of: find.text('batch-7.txt'),+ matching: find.byType(TransferBatchRow),+ );+ await tester.tap(+ find.descendant(+ of: row,+ matching: find.widgetWithText(TextButton, l.cancel),+ ),+ );+ await tester.pump();+ expect(state.cancelled, ['batch-7']);+ expect(tester.takeException(), isNull);+ await tester.pumpWidget(const SizedBox.shrink());+ });+}