Merge branch 'main' of hiddify-github:hiddify/hiddify-next

lib/features/common/common_controllers.dart

@@ -2,7 +2,6 @@ import 'package:hiddify/core/prefs/general_prefs.dart';
 import 'package:hiddify/features/common/app_update_notifier.dart';
 import 'package:hiddify/features/common/connectivity/connectivity_controller.dart';
 import 'package:hiddify/features/common/window/window_controller.dart';
-import 'package:hiddify/features/logs/notifier/notifier.dart';
 import 'package:hiddify/features/profiles/notifier/notifier.dart';
 import 'package:hiddify/features/system_tray/controller/system_tray_controller.dart';
 import 'package:hiddify/services/service_providers.dart';
@@ -24,10 +23,6 @@ void commonControllers(CommonControllersRef ref) {
     },
     fireImmediately: true,
   );
-  ref.listen(
-    logsNotifierProvider,
-    (previous, next) {},
-  );
   ref.listen(
     connectivityControllerProvider,
     (previous, next) {},

lib/features/logs/notifier/logs_notifier.dart

@@ -1,66 +1,133 @@
 import 'dart:async';
 
-import 'package:dartx/dartx.dart';
 import 'package:hiddify/data/data_providers.dart';
-import 'package:hiddify/domain/clash/clash.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
 import 'package:hiddify/features/logs/notifier/logs_state.dart';
+import 'package:hiddify/utils/riverpod_utils.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:rxdart/rxdart.dart';
 
 part 'logs_notifier.g.dart';
 
-// TODO: rewrite
-@Riverpod(keepAlive: true)
+@riverpod
 class LogsNotifier extends _$LogsNotifier with AppLogger {
-  static const maxLength = 1000;
-
   @override
-  Stream<LogsState> build() {
-    state = const AsyncData(LogsState());
-    return ref.read(coreFacadeProvider).watchLogs().asyncMap(
-      (event) async {
-        _logs = [
-          event.getOrElse((l) => throw l),
-          ..._logs.takeFirst(maxLength - 1),
-        ];
-        return switch (state) {
-          // ignore: unused_result
-          AsyncData(:final value) => value.copyWith(logs: await _computeLogs()),
-          _ => LogsState(logs: await _computeLogs()),
-        };
+  LogsState build() {
+    ref.disposeDelay(const Duration(seconds: 20));
+    state = const LogsState();
+    ref.onDispose(
+      () {
+        loggy.debug("disposing");
+        _listener?.cancel();
+        _listener = null;
       },
     );
+    ref.onCancel(
+      () {
+        if (_listener?.isPaused != true) {
+          loggy.debug("pausing");
+          _listener?.pause();
+        }
+      },
+    );
+    ref.onResume(
+      () {
+        if (!state.paused && (_listener?.isPaused ?? false)) {
+          loggy.debug("resuming");
+          _listener?.resume();
+        }
+      },
+    );
+
+    _addListeners();
+    return const LogsState();
   }
 
-  var _logs = <String>[];
+  StreamSubscription? _listener;
+
+  Future<void> _addListeners() async {
+    loggy.debug("adding listeners");
+    await _listener?.cancel();
+    _listener = ref
+        .read(coreFacadeProvider)
+        .watchLogs()
+        .throttle(
+          (_) => Stream.value(_listener?.isPaused ?? false),
+          leading: false,
+          trailing: true,
+        )
+        .throttleTime(
+          const Duration(milliseconds: 250),
+          leading: false,
+          trailing: true,
+        )
+        .asyncMap(
+      (event) async {
+        await event.fold(
+          (f) {
+            _logs = [];
+            state = state.copyWith(logs: AsyncError(f, StackTrace.current));
+          },
+          (a) async {
+            _logs = a.reversed;
+            state = state.copyWith(logs: AsyncData(await _computeLogs()));
+          },
+        );
+      },
+    ).listen((event) {});
+  }
+
+  Iterable<String> _logs = [];
   final _debouncer = CallbackDebouncer(const Duration(milliseconds: 200));
   LogLevel? _levelFilter;
   String _filter = "";
 
-  Future<List<String>> _computeLogs() async {
-    if (_levelFilter == null && _filter.isEmpty) return _logs;
-    return _logs.where((e) {
-      return _filter.isEmpty || e.contains(_filter);
+  Future<List<BoxLog>> _computeLogs() async {
+    final logs = _logs.map(BoxLog.parse);
+    if (_levelFilter == null && _filter.isEmpty) return logs.toList();
+    return logs.where((e) {
+      return (_filter.isEmpty || e.message.contains(_filter)) &&
+          (_levelFilter == null ||
+              e.level == null ||
+              e.level!.index >= _levelFilter!.index);
     }).toList();
   }
 
-  void clear() {
-    if (state case AsyncData(:final value)) {
-      state = AsyncData(value.copyWith(logs: [])).copyWithPrevious(state);
-    }
+  void pause() {
+    loggy.debug("pausing");
+    _listener?.pause();
+    state = state.copyWith(paused: true);
+  }
+
+  void resume() {
+    loggy.debug("resuming");
+    _listener?.resume();
+    state = state.copyWith(paused: false);
+  }
+
+  Future<void> clear() async {
+    loggy.debug("clearing");
+    await ref.read(coreFacadeProvider).clearLogs().match(
+      (l) {
+        loggy.warning("error clearing logs", l);
+      },
+      (_) {
+        _logs = [];
+        state = state.copyWith(logs: const AsyncData([]));
+      },
+    ).run();
   }
 
   void filterMessage(String? filter) {
     _filter = filter ?? '';
     _debouncer(
       () async {
-        if (state case AsyncData(:final value)) {
-          state = AsyncData(
-            value.copyWith(
-              filter: _filter,
-              logs: await _computeLogs(),
-            ),
-          ).copyWithPrevious(state);
+        if (state.logs case AsyncData()) {
+          state = state.copyWith(
+            filter: _filter,
+            logs: AsyncData(await _computeLogs()),
+          );
         }
       },
     );
@@ -68,13 +135,11 @@ class LogsNotifier extends _$LogsNotifier with AppLogger {
 
   Future<void> filterLevel(LogLevel? level) async {
     _levelFilter = level;
-    if (state case AsyncData(:final value)) {
-      state = AsyncData(
-        value.copyWith(
-          levelFilter: _levelFilter,
-          logs: await _computeLogs(),
-        ),
-      ).copyWithPrevious(state);
+    if (state.logs case AsyncData()) {
+      state = state.copyWith(
+        levelFilter: _levelFilter,
+        logs: AsyncData(await _computeLogs()),
+      );
     }
   }
 }

lib/features/logs/notifier/logs_state.dart

@@ -1,5 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hiddify/domain/clash/clash.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'logs_state.freezed.dart';
 
@@ -8,7 +9,8 @@ class LogsState with _$LogsState {
   const LogsState._();
 
   const factory LogsState({
-    @Default([]) List<String> logs,
+    @Default(AsyncLoading()) AsyncValue<List<BoxLog>> logs,
+    @Default(false) bool paused,
     @Default("") String filter,
     LogLevel? levelFilter,
   }) = _LogsState;

lib/features/logs/view/logs_page.dart

@@ -1,31 +1,31 @@
-import 'package:dartx/dartx.dart';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fpdart/fpdart.dart';
 import 'package:gap/gap.dart';
 import 'package:hiddify/core/core_providers.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
-import 'package:hiddify/domain/clash/clash.dart';
 import 'package:hiddify/domain/failures.dart';
-import 'package:hiddify/features/common/common.dart';
+import 'package:hiddify/domain/singbox/singbox.dart';
 import 'package:hiddify/features/logs/notifier/notifier.dart';
 import 'package:hiddify/services/service_providers.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-import 'package:tint/tint.dart';
-
 class LogsPage extends HookConsumerWidget with PresLogger {
   const LogsPage({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final t = ref.watch(translationsProvider);
-    final asyncState = ref.watch(logsNotifierProvider);
+    final state = ref.watch(logsNotifierProvider);
     final notifier = ref.watch(logsNotifierProvider.notifier);
 
     final debug = ref.watch(debugModeNotifierProvider);
     final filesEditor = ref.watch(filesEditorServiceProvider);
 
+    final filterController = useTextEditingController(text: state.filter);
+
     final List<PopupMenuEntry> popupButtons = debug || PlatformUtils.isDesktop
         ? [
             PopupMenuItem(
@@ -49,115 +49,146 @@ class LogsPage extends HookConsumerWidget with PresLogger {
           ]
         : [];
 
-    switch (asyncState) {
-      case AsyncData(value: final state):
-        return Scaffold(
-          appBar: AppBar(
-            // TODO: fix height
-            toolbarHeight: 90,
-            title: Text(t.logs.pageTitle),
-            actions: [
-              if (popupButtons.isNotEmpty)
-                PopupMenuButton(
-                  itemBuilder: (context) {
-                    return popupButtons;
-                  },
-                ),
-            ],
-            bottom: PreferredSize(
-              preferredSize: const Size.fromHeight(36),
-              child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                child: Row(
-                  children: [
-                    Flexible(
-                      child: TextFormField(
-                        onChanged: notifier.filterMessage,
-                        decoration: InputDecoration(
-                          isDense: true,
-                          hintText: t.logs.filterHint,
-                        ),
-                      ),
+    return Scaffold(
+      appBar: AppBar(
+        // TODO: fix height
+        toolbarHeight: 90,
+        title: Text(t.logs.pageTitle),
+        actions: [
+          if (state.paused)
+            IconButton(
+              onPressed: notifier.resume,
+              icon: const Icon(Icons.play_arrow),
+              tooltip: t.logs.resumeTooltip,
+            )
+          else
+            IconButton(
+              onPressed: notifier.pause,
+              icon: const Icon(Icons.pause),
+              tooltip: t.logs.pauseTooltip,
+            ),
+          IconButton(
+            onPressed: notifier.clear,
+            icon: const Icon(Icons.clear_all),
+            tooltip: t.logs.clearTooltip,
+          ),
+          if (popupButtons.isNotEmpty)
+            PopupMenuButton(
+              itemBuilder: (context) {
+                return popupButtons;
+              },
+            ),
+        ],
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(36),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            child: Row(
+              children: [
+                Flexible(
+                  child: TextFormField(
+                    controller: filterController,
+                    onChanged: notifier.filterMessage,
+                    decoration: InputDecoration(
+                      isDense: true,
+                      hintText: t.logs.filterHint,
                     ),
-                    const Gap(16),
-                    DropdownButton<Option<LogLevel>>(
-                      value: optionOf(state.levelFilter),
-                      onChanged: (v) {
-                        if (v == null) return;
-                        notifier.filterLevel(v.toNullable());
-                      },
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
-                      borderRadius: BorderRadius.circular(4),
-                      items: [
-                        DropdownMenuItem(
-                          value: none(),
-                          child: Text(t.logs.allLevelsFilter),
-                        ),
-                        ...LogLevel.values.takeFirst(3).map(
-                              (e) => DropdownMenuItem(
-                                value: some(e),
-                                child: Text(e.name),
-                              ),
-                            ),
-                      ],
+                  ),
+                ),
+                const Gap(16),
+                DropdownButton<Option<LogLevel>>(
+                  value: optionOf(state.levelFilter),
+                  onChanged: (v) {
+                    if (v == null) return;
+                    notifier.filterLevel(v.toNullable());
+                  },
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                  borderRadius: BorderRadius.circular(4),
+                  items: [
+                    DropdownMenuItem(
+                      value: none(),
+                      child: Text(t.logs.allLevelsFilter),
+                    ),
+                    ...LogLevel.choices.map(
+                      (e) => DropdownMenuItem(
+                        value: some(e),
+                        child: Text(e.name),
+                      ),
                     ),
                   ],
                 ),
-              ),
+              ],
             ),
           ),
-          body: ListView.builder(
-            itemCount: state.logs.length,
-            reverse: true,
-            itemBuilder: (context, index) {
-              final log = state.logs[index];
-              return Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  ListTile(
-                    dense: true,
-                    subtitle: Text(log.strip()),
-                  ),
-                  if (index != 0)
-                    const Divider(
-                      indent: 16,
-                      endIndent: 16,
-                      height: 4,
+        ),
+      ),
+      body: switch (state.logs) {
+        AsyncData(value: final logs) => SelectionArea(
+            child: ListView.builder(
+              itemCount: logs.length,
+              reverse: true,
+              itemBuilder: (context, index) {
+                final log = logs[index];
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 16,
+                        vertical: 4,
+                      ),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          if (log.level != null)
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(
+                                  log.level!.name.toUpperCase(),
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .labelMedium
+                                      ?.copyWith(color: log.level!.color),
+                                ),
+                                if (log.time != null)
+                                  Text(
+                                    log.time!.toString(),
+                                    style:
+                                        Theme.of(context).textTheme.labelSmall,
+                                  ),
+                              ],
+                            ),
+                          Text(
+                            log.message,
+                            style: Theme.of(context).textTheme.bodySmall,
+                          ),
+                        ],
+                      ),
                     ),
-                ],
-              );
-            },
+                    if (index != 0)
+                      const Divider(
+                        indent: 16,
+                        endIndent: 16,
+                        height: 4,
+                      ),
+                  ],
+                );
+              },
+            ),
           ),
-        );
-
-      case AsyncError(:final error):
-        return Scaffold(
-          body: CustomScrollView(
+        AsyncError(:final error) => CustomScrollView(
             slivers: [
-              NestedTabAppBar(
-                title: Text(t.logs.pageTitle),
-              ),
               SliverErrorBodyPlaceholder(t.presentShortError(error)),
             ],
           ),
-        );
-
-      case AsyncLoading():
-        return Scaffold(
-          body: CustomScrollView(
+        _ => const CustomScrollView(
             slivers: [
-              NestedTabAppBar(
-                title: Text(t.logs.pageTitle),
-              ),
-              const SliverLoadingBodyPlaceholder(),
+              SliverLoadingBodyPlaceholder(),
             ],
           ),
-        );
-
-      // TODO: remove
-      default:
-        return const Scaffold();
-    }
+      },
+    );
   }
 }

lib/features/settings/view/config_options_page.dart

@@ -52,13 +52,13 @@ class ConfigOptionsPage extends HookConsumerWidget {
             ),
           ListTile(
             title: Text(t.settings.config.logLevel),
-            subtitle: Text(options.logLevel.name),
+            subtitle: Text(options.logLevel.name.toUpperCase()),
             onTap: () async {
               final logLevel = await SettingsPickerDialog(
                 title: t.settings.config.logLevel,
                 selected: options.logLevel,
-                options: LogLevel.values,
-                getTitle: (e) => e.name,
+                options: LogLevel.choices,
+                getTitle: (e) => e.name.toUpperCase(),
                 resetValue: _default.logLevel,
               ).show(context);
               if (logLevel == null) return;

lib/features/settings/widgets/advanced_setting_tiles.dart

@@ -6,6 +6,7 @@ import 'package:hiddify/core/core_providers.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
 import 'package:hiddify/core/router/routes/routes.dart';
 import 'package:hiddify/domain/singbox/singbox.dart';
+import 'package:hiddify/features/common/common.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 class AdvancedSettingTiles extends HookConsumerWidget {
@@ -20,6 +21,7 @@ class AdvancedSettingTiles extends HookConsumerWidget {
 
     return Column(
       children: [
+        const RegionPrefTile(),
         ListTile(
           title: Text(t.settings.config.pageTitle),
           leading: const Icon(Icons.edit_document),

lib/features/settings/widgets/general_setting_tiles.dart

@@ -3,7 +3,6 @@ import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/core_providers.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
 import 'package:hiddify/features/common/common.dart';
-import 'package:hiddify/features/settings/widgets/theme_mode_switch_button.dart';
 import 'package:hiddify/services/auto_start_service.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -44,31 +43,34 @@ class GeneralSettingTiles extends HookConsumerWidget {
         ),
         ListTile(
           title: Text(t.settings.general.themeMode),
-          subtitle: Text(
-            switch (theme.mode) {
-              ThemeMode.system => t.settings.general.themeModes.system,
-              ThemeMode.light => t.settings.general.themeModes.light,
-              ThemeMode.dark => t.settings.general.themeModes.dark,
-            },
-          ),
-          trailing: ThemeModeSwitch(
-            themeMode: theme.mode,
-            onChanged: ref.read(themeModeNotifierProvider.notifier).update,
-          ),
+          subtitle: Text(theme.mode.present(t)),
           leading: const Icon(Icons.light_mode),
           onTap: () async {
-            await ref.read(themeModeNotifierProvider.notifier).update(
-                  Theme.of(context).brightness == Brightness.light
-                      ? ThemeMode.dark
-                      : ThemeMode.light,
+            final selectedThemeMode = await showDialog<AppThemeMode>(
+              context: context,
+              builder: (context) {
+                return SimpleDialog(
+                  title: Text(t.settings.general.themeMode),
+                  children: AppThemeMode.values
+                      .map(
+                        (e) => RadioListTile(
+                          title: Text(e.present(t)),
+                          value: e,
+                          groupValue: theme.mode,
+                          onChanged: (e) => context.pop(e),
+                        ),
+                      )
+                      .toList(),
                 );
+              },
+            );
+            if (selectedThemeMode != null) {
+              await ref
+                  .read(themeModeNotifierProvider.notifier)
+                  .update(selectedThemeMode);
+            }
           },
         ),
-        SwitchListTile(
-          title: Text(t.settings.general.trueBlack),
-          value: theme.trueBlack,
-          onChanged: ref.read(trueBlackThemeNotifierProvider.notifier).update,
-        ),
         if (PlatformUtils.isDesktop) ...[
           SwitchListTile(
             title: Text(t.settings.general.autoStart),

lib/features/settings/widgets/theme_mode_switch_button.dart

@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hiddify/core/core_providers.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-
-class ThemeModeSwitch extends HookConsumerWidget {
-  const ThemeModeSwitch({
-    super.key,
-    required this.themeMode,
-    required this.onChanged,
-  });
-  final ThemeMode themeMode;
-  final ValueChanged<ThemeMode> onChanged;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final t = ref.watch(translationsProvider);
-
-    final List<bool> isSelected = <bool>[
-      themeMode == ThemeMode.light,
-      themeMode == ThemeMode.system,
-      themeMode == ThemeMode.dark,
-    ];
-
-    return ToggleButtons(
-      isSelected: isSelected,
-      onPressed: (int newIndex) {
-        if (newIndex == 0) {
-          onChanged(ThemeMode.light);
-        } else if (newIndex == 1) {
-          onChanged(ThemeMode.system);
-        } else {
-          onChanged(ThemeMode.dark);
-        }
-      },
-      children: <Widget>[
-        Icon(
-          Icons.wb_sunny,
-          semanticLabel: t.settings.general.themeModes.light,
-        ),
-        Icon(
-          Icons.phone_iphone,
-          semanticLabel: t.settings.general.themeModes.system,
-        ),
-        Icon(
-          Icons.bedtime,
-          semanticLabel: t.settings.general.themeModes.dark,
-        ),
-      ],
-    );
-  }
-}