Merge PR #847.

Author: AdamVe

lib/app/state.dart

@@ -27,6 +27,21 @@ import 'models.dart';
 
 final _log = Logger('app.state');
 
+// When non-null, an unrecoverable error preventing the app from functioning has occurred.
+final applicationError =
+    StateNotifierProvider<ApplicationErrorNotifier, String?>(
+  (ref) => ApplicationErrorNotifier(),
+);
+
+class ApplicationErrorNotifier extends StateNotifier<String?> {
+  ApplicationErrorNotifier() : super(null);
+
+  void setApplicationError(String? error) {
+    _log.debug('Set ApplicationError to $error');
+    state = error;
+  }
+}
+
 // Override this to alter the set of supported apps.
 final supportedAppsProvider =
     Provider<List<Application>>((ref) => Application.values);
@@ -42,8 +57,7 @@ final supportedThemesProvider = StateProvider<List<ThemeMode>>(
 
 final themeModeProvider = StateNotifierProvider<ThemeModeNotifier, ThemeMode>(
   (ref) => ThemeModeNotifier(
-      ref.watch(prefProvider),
-      ref.read(supportedThemesProvider)),
+      ref.watch(prefProvider), ref.read(supportedThemesProvider)),
 );
 
 class ThemeModeNotifier extends StateNotifier<ThemeMode> {

lib/app/views/main_page.dart

@@ -16,19 +16,25 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:logging/logging.dart';
 import 'package:yubico_authenticator/cancellation_exception.dart';
 import 'package:yubico_authenticator/core/state.dart';
 
 import '../../fido/views/fido_screen.dart';
 import '../../oath/models.dart';
 import '../../oath/views/add_account_page.dart';
 import '../../oath/views/oath_screen.dart';
+import '../../version.dart';
+import '../logging.dart';
 import '../message.dart';
 import '../models.dart';
 import '../state.dart';
 import 'device_error_screen.dart';
 import 'message_page.dart';
 
+final _log = Logger('app.views.main_page');
+
 class MainPage extends ConsumerWidget {
   const MainPage({super.key});
 
@@ -40,6 +46,35 @@ class MainPage extends ConsumerWidget {
         next?.call(context);
       },
     );
+
+    final appError = ref.watch(applicationError);
+    if (appError != null) {
+      return MessagePage(
+        header: 'An unrecoverable error has occured',
+        message: appError,
+        actions: [
+          ActionChip(
+            avatar: const Icon(Icons.copy),
+            label: Text(AppLocalizations.of(context)!.general_copy_log),
+            onPressed: () async {
+              _log.info('Copying log to clipboard ($version)...');
+              final logs = await ref.read(logLevelProvider.notifier).getLogs();
+              var clipboard = ref.read(clipboardProvider);
+              await clipboard.setText(logs.join('\n'));
+              if (!clipboard.platformGivesFeedback()) {
+                await ref.read(withContextProvider)(
+                  (context) async {
+                    showMessage(context,
+                        AppLocalizations.of(context)!.general_log_copied);
+                  },
+                );
+              }
+            },
+          ),
+        ],
+      );
+    }
+
     // If the current device changes, we need to pop any open dialogs.
     ref.listen<AsyncValue<YubiKeyData>>(currentDeviceDataProvider, (_, __) {
       Navigator.of(context).popUntil((route) {

lib/desktop/init.dart

@@ -102,7 +102,11 @@ Future<Widget> initialize(List<String> argv) async {
   final rpc = RpcSession(exe!);
   await rpc.initialize();
   _log.info('Helper process started', exe);
-  rpc.setLogLevel(Logger.root.level);
+
+  // Set the initial logging level. As this is the first message to the RPC,
+  // it also serves to check that the Helper is functioning correctly.
+  // The future will be awaited further down.
+  final initRpcLogFuture = rpc.setLogLevel(Logger.root.level);
 
   _initLicenses();
 
@@ -131,7 +135,8 @@ Future<Widget> initialize(List<String> argv) async {
       fingerprintProvider.overrideWithProvider(desktopFingerprintProvider),
       credentialProvider.overrideWithProvider(desktopCredentialProvider),
       clipboardProvider.overrideWithProvider(desktopClipboardProvider),
-      supportedThemesProvider.overrideWithProvider(desktopSupportedThemesProvider)
+      supportedThemesProvider
+          .overrideWithProvider(desktopSupportedThemesProvider)
     ],
     child: YubicoAuthenticatorApp(
       page: Consumer(
@@ -141,6 +146,17 @@ Future<Widget> initialize(List<String> argv) async {
             rpc.setLogLevel(level);
           });
 
+          // Ensure the initial log level was successfully set within 5s, or
+          // assume the Helper isn't functional.
+          initRpcLogFuture.timeout(const Duration(seconds: 5)).onError(
+            (error, stackTrace) {
+              _log.error('Helper is not responsive.');
+              ref
+                  .read(applicationError.notifier)
+                  .setApplicationError('Helper subprocess failed to start');
+            },
+          );
+
           return const MainPage();
         }),
       ),
@@ -175,10 +191,12 @@ void _initLogging(List<String> argv) {
 
 void _initLicenses() async {
   LicenseRegistry.addLicense(() async* {
-    final python = await rootBundle.loadString('assets/licenses/raw/python.txt');
+    final python =
+        await rootBundle.loadString('assets/licenses/raw/python.txt');
     yield LicenseEntryWithLineBreaks(['Python'], python);
 
-    final zxingcpp = await rootBundle.loadString('assets/licenses/raw/apache-2.0.txt');
+    final zxingcpp =
+        await rootBundle.loadString('assets/licenses/raw/apache-2.0.txt');
     yield LicenseEntryWithLineBreaks(['zxing-cpp'], zxingcpp);
 
     final helper = await rootBundle.loadStructuredData<List>(

lib/desktop/rpc.dart

@@ -121,7 +121,7 @@ class RpcSession {
         );
       }
     } catch (e) {
-      _log.error(e.toString(), entry);
+      _log.error(entry);
     }
   }
 
@@ -235,7 +235,7 @@ class RpcSession {
     return request.completer.future;
   }
 
-  void setLogLevel(Level level) async {
+  Future<void> setLogLevel(Level level) async {
     final name = Levels.LEVELS
         .firstWhere((e) => level.value <= e.value, orElse: () => Level.OFF)
         .name