Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gui] ask before closing running terminal #3835

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions src/client/gui/lib/grpc_client.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:async';
import 'dart:io';

import 'package:async/async.dart';
import 'package:fpdart/fpdart.dart';
import 'package:grpc/grpc.dart';
import 'package:protobuf/protobuf.dart' hide RpcClient;
Expand Down Expand Up @@ -100,7 +100,7 @@ class GrpcClient {
.start(Stream.value(request))
.doOnData(checkForUpdate)
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<StopReply?> stop(Iterable<String> names) {
Expand All @@ -111,7 +111,7 @@ class GrpcClient {
return _client
.stop(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<SuspendReply?> suspend(Iterable<String> names) {
Expand All @@ -122,7 +122,7 @@ class GrpcClient {
return _client
.suspend(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<RestartReply?> restart(Iterable<String> names) {
Expand All @@ -134,7 +134,7 @@ class GrpcClient {
.restart(Stream.value(request))
.doOnData(checkForUpdate)
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<DeleteReply?> delete(Iterable<String> names) {
Expand All @@ -147,7 +147,7 @@ class GrpcClient {
return _client
.delet(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<RecoverReply?> recover(Iterable<String> names) {
Expand All @@ -158,7 +158,7 @@ class GrpcClient {
return _client
.recover(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<DeleteReply?> purge(Iterable<String> names) {
Expand All @@ -172,7 +172,7 @@ class GrpcClient {
return _client
.delet(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<List<VmInfo>> info([Iterable<String> names = const []]) {
Expand All @@ -193,7 +193,7 @@ class GrpcClient {
return _client
.mount(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<void> umount(String name, [String? path]) {
Expand All @@ -204,7 +204,7 @@ class GrpcClient {
return _client
.umount(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<FindReply> find({bool images = true, bool blueprints = true}) {
Expand Down Expand Up @@ -254,7 +254,7 @@ class GrpcClient {
return _client
.set(Stream.value(request))
.doOnEach(logGrpc(request))
.firstOrNull;
.lastOrNull;
}

Future<SSHInfo?> sshInfo(String name) {
Expand All @@ -263,7 +263,7 @@ class GrpcClient {
return _client
.ssh_info(Stream.value(request))
.doOnEach(logGrpc(request))
.first
.last
.then((reply) => reply.sshInfo[name]);
}

Expand Down Expand Up @@ -299,3 +299,17 @@ class CustomChannelCredentials extends ChannelCredentials {
return ctx;
}
}

extension<T> on Stream<T> {
Future<T?> get lastOrNull {
final completer = Completer<T?>.sync();
T? result;
listen(
(event) => result = event,
onError: completer.completeError,
onDone: () => completer.complete(result),
cancelOnError: true,
);
return completer.future;
}
}
26 changes: 19 additions & 7 deletions src/client/gui/lib/providers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,28 @@ final daemonAvailableProvider = Provider((ref) {
if (message.contains('failed to obtain exit status for remote process')) {
return true;
}
if (message.contains('Connection is being forcefully terminated')) {
return true;
}
}
return false;
});

class AllVmInfosNotifier extends Notifier<List<DetailedInfoItem>> {
@override
List<DetailedInfoItem> build() {
return ref.watch(vmInfosStreamProvider).valueOrNull ?? const [];
}

Future<void> update() async {
state = await ref.read(grpcClientProvider).info();
}
}

final allVmInfosProvider =
NotifierProvider<AllVmInfosNotifier, List<DetailedInfoItem>>(
AllVmInfosNotifier.new);

final vmInfosProvider = Provider((ref) {
final vmInfos = ref.watch(vmInfosStreamProvider).valueOrNull ?? const [];
final existingVms = vmInfos
final existingVms = ref
.watch(allVmInfosProvider)
.where((info) => info.instanceStatus.status != Status.DELETED)
.toBuiltList();
final existingVmNames = existingVms.map((i) => i.name).toSet();
Expand Down Expand Up @@ -115,8 +127,8 @@ final vmNamesProvider = Provider((ref) {
});

final deletedVmsProvider = Provider((ref) {
final vmInfos = ref.watch(vmInfosStreamProvider).valueOrNull ?? const [];
return vmInfos
return ref
.watch(allVmInfosProvider)
.where((info) => info.instanceStatus.status == Status.DELETED)
.map((info) => info.name)
.toBuiltSet();
Expand Down
37 changes: 30 additions & 7 deletions src/client/gui/lib/vm_details/terminal.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'dart:isolate';
import 'dart:math';
Expand All @@ -14,6 +15,7 @@ import '../logger.dart';
import '../notifications.dart';
import '../platform/platform.dart';
import '../providers.dart';
import '../vm_action.dart';

final runningShellsProvider =
StateProvider.autoDispose.family<int, String>((_, __) {
Expand Down Expand Up @@ -182,6 +184,7 @@ class _VmTerminalState extends ConsumerState<VmTerminal> {
final scrollController = ScrollController();
final focusNode = FocusNode();
var fontSize = defaultFontSize;
late final terminalIdentifier = (vmName: widget.name, shellId: widget.id);

@override
void initState() {
Expand All @@ -202,13 +205,35 @@ class _VmTerminalState extends ConsumerState<VmTerminal> {
if (widget.isCurrent) focusNode.requestFocus();
}

Future<void> startVmIfNeeded(final bool vmRunning) async {
if (vmRunning) return;
final name = widget.name;
final action = VmAction.start;
final operation = ref.read(grpcClientProvider).start([name]);
ref.read(notificationsProvider.notifier).addOperation(
operation,
loading: '${action.continuousTense} $name',
onSuccess: (_) => '${action.pastTense} $name',
onError: (error) {
return 'Failed to ${action.name.toLowerCase()} $name: $error';
},
);
await operation;
await ref.read(allVmInfosProvider.notifier).update();
}

void openShell() {
ref.read(terminalProvider(terminalIdentifier).notifier).start();
}

@override
Widget build(BuildContext context) {
final terminalIdentifier = (vmName: widget.name, shellId: widget.id);
final terminal = ref.watch(terminalProvider(terminalIdentifier));
final vmRunning = ref.watch(vmInfoProvider(widget.name).select((info) {
return info.instanceStatus.status == Status.RUNNING;
final vmStatus = ref.watch(vmInfoProvider(widget.name).select((info) {
return info.instanceStatus.status;
}));
final vmRunning = vmStatus == Status.RUNNING;
final canStartVm = [Status.STOPPED, Status.SUSPENDED].contains(vmStatus);

final buttonStyle = ButtonStyle(
foregroundColor: WidgetStateColor.resolveWith((states) {
Expand All @@ -234,10 +259,8 @@ class _VmTerminalState extends ConsumerState<VmTerminal> {
const SizedBox(height: 12),
OutlinedButton(
style: buttonStyle,
onPressed: vmRunning
? () => ref
.read(terminalProvider(terminalIdentifier).notifier)
.start()
onPressed: canStartVm || vmRunning
? () => startVmIfNeeded(vmRunning).then((_) => openShell())
: null,
child: const Text('Open shell'),
),
Expand Down
27 changes: 26 additions & 1 deletion src/client/gui/lib/vm_details/terminal_tabs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/flutter_svg.dart';

import '../confirmation_dialog.dart';
import 'terminal.dart';

typedef ShellIds = ({
Expand Down Expand Up @@ -144,7 +145,31 @@ class TerminalTabs extends ConsumerWidget {
title: 'Shell ${shellId.id}',
selected: index == currentIndex,
onTap: () => ref.read(notifier).setCurrent(index),
onClose: () => ref.read(notifier).remove(index),
onClose: () {
final terminalKey = (vmName: name, shellId: shellId);
final terminal = ref.read(terminalProvider(terminalKey));
if (terminal == null) {
ref.read(notifier).remove(index);
return;
}
showDialog(
context: context,
barrierDismissible: false,
builder: (context) {
return ConfirmationDialog(
title: 'Are you sure you want to close this terminal?',
body: Text('Its current state will be lost.'),
actionText: 'Yes',
onAction: () {
Navigator.pop(context);
ref.read(notifier).remove(index);
},
inactionText: 'No',
onInaction: () => Navigator.pop(context),
);
},
);
},
),
);

Expand Down
Loading