Refactor logs
This commit is contained in:
@@ -12,6 +12,7 @@ import 'package:hiddify/data/repository/app_repository_impl.dart';
|
|||||||
import 'package:hiddify/domain/environment.dart';
|
import 'package:hiddify/domain/environment.dart';
|
||||||
import 'package:hiddify/features/common/window/window_controller.dart';
|
import 'package:hiddify/features/common/window/window_controller.dart';
|
||||||
import 'package:hiddify/features/geo_asset/data/geo_asset_data_providers.dart';
|
import 'package:hiddify/features/geo_asset/data/geo_asset_data_providers.dart';
|
||||||
|
import 'package:hiddify/features/log/data/log_data_providers.dart';
|
||||||
import 'package:hiddify/features/profile/data/profile_data_providers.dart';
|
import 'package:hiddify/features/profile/data/profile_data_providers.dart';
|
||||||
import 'package:hiddify/features/profile/notifier/active_profile_notifier.dart';
|
import 'package:hiddify/features/profile/notifier/active_profile_notifier.dart';
|
||||||
import 'package:hiddify/features/system_tray/system_tray_controller.dart';
|
import 'package:hiddify/features/system_tray/system_tray_controller.dart';
|
||||||
@@ -88,6 +89,7 @@ Future<void> _lazyBootstrap(
|
|||||||
|
|
||||||
final filesEditor = container.read(filesEditorServiceProvider);
|
final filesEditor = container.read(filesEditorServiceProvider);
|
||||||
await filesEditor.init();
|
await filesEditor.init();
|
||||||
|
await container.read(logRepositoryProvider.future);
|
||||||
await container.read(geoAssetRepositoryProvider.future);
|
await container.read(geoAssetRepositoryProvider.future);
|
||||||
await container.read(profileRepositoryProvider.future);
|
await container.read(profileRepositoryProvider.future);
|
||||||
|
|
||||||
@@ -145,7 +147,7 @@ void initLoggers(
|
|||||||
final logToFile = debug || (!Platform.isAndroid && !Platform.isIOS);
|
final logToFile = debug || (!Platform.isAndroid && !Platform.isIOS);
|
||||||
if (logToFile) {
|
if (logToFile) {
|
||||||
_loggers.addPrinter(
|
_loggers.addPrinter(
|
||||||
FileLogPrinter(read(filesEditorServiceProvider).appLogsFile.path),
|
FileLogPrinter(read(logPathResolverProvider).appFile().path),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Loggy.initLoggy(
|
Loggy.initLoggy(
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ int getCurrentIndex(BuildContext context) {
|
|||||||
final String location = GoRouterState.of(context).uri.path;
|
final String location = GoRouterState.of(context).uri.path;
|
||||||
if (location == const HomeRoute().location) return 0;
|
if (location == const HomeRoute().location) return 0;
|
||||||
if (location.startsWith(const ProxiesRoute().location)) return 1;
|
if (location.startsWith(const ProxiesRoute().location)) return 1;
|
||||||
if (location.startsWith(const LogsRoute().location)) return 2;
|
if (location.startsWith(const LogsOverviewRoute().location)) return 2;
|
||||||
if (location.startsWith(const SettingsRoute().location)) return 3;
|
if (location.startsWith(const SettingsRoute().location)) return 3;
|
||||||
if (location.startsWith(const AboutRoute().location)) return 4;
|
if (location.startsWith(const AboutRoute().location)) return 4;
|
||||||
return 0;
|
return 0;
|
||||||
@@ -66,7 +66,7 @@ void switchTab(int index, BuildContext context) {
|
|||||||
case 1:
|
case 1:
|
||||||
const ProxiesRoute().go(context);
|
const ProxiesRoute().go(context);
|
||||||
case 2:
|
case 2:
|
||||||
const LogsRoute().go(context);
|
const LogsOverviewRoute().go(context);
|
||||||
case 3:
|
case 3:
|
||||||
const SettingsRoute().go(context);
|
const SettingsRoute().go(context);
|
||||||
case 4:
|
case 4:
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import 'package:hiddify/features/common/adaptive_root_scaffold.dart';
|
|||||||
import 'package:hiddify/features/geo_asset/overview/geo_assets_overview_page.dart';
|
import 'package:hiddify/features/geo_asset/overview/geo_assets_overview_page.dart';
|
||||||
import 'package:hiddify/features/home/view/view.dart';
|
import 'package:hiddify/features/home/view/view.dart';
|
||||||
import 'package:hiddify/features/intro/intro_page.dart';
|
import 'package:hiddify/features/intro/intro_page.dart';
|
||||||
import 'package:hiddify/features/logs/view/logs_page.dart';
|
import 'package:hiddify/features/log/overview/logs_overview_page.dart';
|
||||||
import 'package:hiddify/features/profile/add/add_profile_modal.dart';
|
import 'package:hiddify/features/profile/add/add_profile_modal.dart';
|
||||||
import 'package:hiddify/features/profile/details/profile_details_page.dart';
|
import 'package:hiddify/features/profile/details/profile_details_page.dart';
|
||||||
import 'package:hiddify/features/profile/overview/profiles_overview_page.dart';
|
import 'package:hiddify/features/profile/overview/profiles_overview_page.dart';
|
||||||
@@ -44,9 +44,9 @@ GlobalKey<NavigatorState>? _dynamicRootKey =
|
|||||||
path: "profiles/:id",
|
path: "profiles/:id",
|
||||||
name: ProfileDetailsRoute.name,
|
name: ProfileDetailsRoute.name,
|
||||||
),
|
),
|
||||||
TypedGoRoute<LogsRoute>(
|
TypedGoRoute<LogsOverviewRoute>(
|
||||||
path: "logs",
|
path: "logs",
|
||||||
name: LogsRoute.name,
|
name: LogsOverviewRoute.name,
|
||||||
),
|
),
|
||||||
TypedGoRoute<SettingsRoute>(
|
TypedGoRoute<SettingsRoute>(
|
||||||
path: "settings",
|
path: "settings",
|
||||||
@@ -116,9 +116,9 @@ class MobileWrapperRoute extends ShellRouteData {
|
|||||||
path: "/proxies",
|
path: "/proxies",
|
||||||
name: ProxiesRoute.name,
|
name: ProxiesRoute.name,
|
||||||
),
|
),
|
||||||
TypedGoRoute<LogsRoute>(
|
TypedGoRoute<LogsOverviewRoute>(
|
||||||
path: "/logs",
|
path: "/logs",
|
||||||
name: LogsRoute.name,
|
name: LogsOverviewRoute.name,
|
||||||
),
|
),
|
||||||
TypedGoRoute<SettingsRoute>(
|
TypedGoRoute<SettingsRoute>(
|
||||||
path: "/settings",
|
path: "/settings",
|
||||||
@@ -260,8 +260,8 @@ class ProfileDetailsRoute extends GoRouteData {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class LogsRoute extends GoRouteData {
|
class LogsOverviewRoute extends GoRouteData {
|
||||||
const LogsRoute();
|
const LogsOverviewRoute();
|
||||||
static const name = "Logs";
|
static const name = "Logs";
|
||||||
|
|
||||||
static final GlobalKey<NavigatorState>? $parentNavigatorKey = _dynamicRootKey;
|
static final GlobalKey<NavigatorState>? $parentNavigatorKey = _dynamicRootKey;
|
||||||
@@ -272,10 +272,10 @@ class LogsRoute extends GoRouteData {
|
|||||||
return const MaterialPage(
|
return const MaterialPage(
|
||||||
fullscreenDialog: true,
|
fullscreenDialog: true,
|
||||||
name: name,
|
name: name,
|
||||||
child: LogsPage(),
|
child: LogsOverviewPage(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return const NoTransitionPage(name: name, child: LogsPage());
|
return const NoTransitionPage(name: name, child: LogsOverviewPage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
|
|||||||
import 'package:hiddify/core/prefs/prefs.dart';
|
import 'package:hiddify/core/prefs/prefs.dart';
|
||||||
import 'package:hiddify/data/data_providers.dart';
|
import 'package:hiddify/data/data_providers.dart';
|
||||||
import 'package:hiddify/domain/singbox/singbox.dart';
|
import 'package:hiddify/domain/singbox/singbox.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
import 'package:hiddify/utils/pref_notifier.dart';
|
import 'package:hiddify/utils/pref_notifier.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -240,24 +240,6 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
|
||||||
Stream<Either<CoreServiceFailure, List<String>>> watchLogs() {
|
|
||||||
return singbox.watchLogs(filesEditor.coreLogsFile.path).handleExceptions(
|
|
||||||
(error, stackTrace) {
|
|
||||||
loggy.warning("error watching logs", error, stackTrace);
|
|
||||||
return CoreServiceFailure.unexpected(error, stackTrace);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
TaskEither<CoreServiceFailure, Unit> clearLogs() {
|
|
||||||
return exceptionHandler(
|
|
||||||
() => singbox.clearLogs().mapLeft(CoreServiceFailure.other).run(),
|
|
||||||
CoreServiceFailure.unexpected,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Stream<ConnectionStatus> watchConnectionStatus() =>
|
Stream<ConnectionStatus> watchConnectionStatus() =>
|
||||||
singbox.watchConnectionStatus();
|
singbox.watchConnectionStatus();
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
import 'package:dartx/dartx.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
|
||||||
import 'package:tint/tint.dart';
|
|
||||||
|
|
||||||
part 'box_log.freezed.dart';
|
|
||||||
|
|
||||||
enum LogLevel {
|
|
||||||
trace,
|
|
||||||
debug,
|
|
||||||
info,
|
|
||||||
warn,
|
|
||||||
error,
|
|
||||||
fatal,
|
|
||||||
panic;
|
|
||||||
|
|
||||||
static List<LogLevel> get choices => values.takeFirst(4);
|
|
||||||
|
|
||||||
Color? get color => switch (this) {
|
|
||||||
trace => Colors.lightBlueAccent,
|
|
||||||
debug => Colors.grey,
|
|
||||||
info => Colors.lightGreen,
|
|
||||||
warn => Colors.orange,
|
|
||||||
error => Colors.redAccent,
|
|
||||||
fatal => Colors.red,
|
|
||||||
panic => Colors.red,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@freezed
|
|
||||||
class BoxLog with _$BoxLog {
|
|
||||||
const factory BoxLog({
|
|
||||||
LogLevel? level,
|
|
||||||
DateTime? time,
|
|
||||||
required String message,
|
|
||||||
}) = _BoxLog;
|
|
||||||
|
|
||||||
factory BoxLog.parse(String log) {
|
|
||||||
log = log.strip();
|
|
||||||
DateTime? time;
|
|
||||||
if (log.length > 25) {
|
|
||||||
time = DateTime.tryParse(log.substring(6, 25));
|
|
||||||
}
|
|
||||||
if (time != null) {
|
|
||||||
log = log.substring(26);
|
|
||||||
}
|
|
||||||
final level = LogLevel.values.firstOrNullWhere(
|
|
||||||
(e) {
|
|
||||||
if (log.startsWith(e.name.toUpperCase())) {
|
|
||||||
log = log.removePrefix(e.name.toUpperCase());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
);
|
|
||||||
return BoxLog(
|
|
||||||
level: level,
|
|
||||||
time: time,
|
|
||||||
message: log.trim(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,8 +2,8 @@ import 'dart:convert';
|
|||||||
|
|
||||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||||
import 'package:hiddify/core/prefs/prefs.dart';
|
import 'package:hiddify/core/prefs/prefs.dart';
|
||||||
import 'package:hiddify/domain/singbox/box_log.dart';
|
|
||||||
import 'package:hiddify/domain/singbox/rules.dart';
|
import 'package:hiddify/domain/singbox/rules.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
|
|
||||||
part 'config_options.freezed.dart';
|
part 'config_options.freezed.dart';
|
||||||
part 'config_options.g.dart';
|
part 'config_options.g.dart';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
export 'box_log.dart';
|
|
||||||
export 'config_options.dart';
|
export 'config_options.dart';
|
||||||
export 'core_status.dart';
|
export 'core_status.dart';
|
||||||
export 'outbounds.dart';
|
export 'outbounds.dart';
|
||||||
|
|||||||
@@ -46,8 +46,4 @@ abstract interface class SingboxFacade {
|
|||||||
Stream<ConnectionStatus> watchConnectionStatus();
|
Stream<ConnectionStatus> watchConnectionStatus();
|
||||||
|
|
||||||
Stream<Either<CoreServiceFailure, CoreStatus>> watchCoreStatus();
|
Stream<Either<CoreServiceFailure, CoreStatus>> watchCoreStatus();
|
||||||
|
|
||||||
Stream<Either<CoreServiceFailure, List<String>>> watchLogs();
|
|
||||||
|
|
||||||
TaskEither<CoreServiceFailure, Unit> clearLogs();
|
|
||||||
}
|
}
|
||||||
|
|||||||
23
lib/features/log/data/log_data_providers.dart
Normal file
23
lib/features/log/data/log_data_providers.dart
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import 'package:hiddify/features/log/data/log_path_resolver.dart';
|
||||||
|
import 'package:hiddify/features/log/data/log_repository.dart';
|
||||||
|
import 'package:hiddify/services/service_providers.dart';
|
||||||
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
|
part 'log_data_providers.g.dart';
|
||||||
|
|
||||||
|
@Riverpod(keepAlive: true)
|
||||||
|
Future<LogRepository> logRepository(LogRepositoryRef ref) async {
|
||||||
|
final repo = LogRepositoryImpl(
|
||||||
|
singbox: ref.watch(singboxServiceProvider),
|
||||||
|
logPathResolver: ref.watch(logPathResolverProvider),
|
||||||
|
);
|
||||||
|
await repo.init().getOrElse((l) => throw l).run();
|
||||||
|
return repo;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Riverpod(keepAlive: true)
|
||||||
|
LogPathResolver logPathResolver(LogPathResolverRef ref) {
|
||||||
|
return LogPathResolver(
|
||||||
|
ref.watch(filesEditorServiceProvider).dirs.workingDir,
|
||||||
|
);
|
||||||
|
}
|
||||||
33
lib/features/log/data/log_parser.dart
Normal file
33
lib/features/log/data/log_parser.dart
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
// ignore_for_file: parameter_assignments
|
||||||
|
|
||||||
|
import 'package:dartx/dartx.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_entity.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
|
import 'package:tint/tint.dart';
|
||||||
|
|
||||||
|
abstract class LogParser {
|
||||||
|
static LogEntity parseSingbox(String log) {
|
||||||
|
log = log.strip();
|
||||||
|
DateTime? time;
|
||||||
|
if (log.length > 25) {
|
||||||
|
time = DateTime.tryParse(log.substring(6, 25));
|
||||||
|
}
|
||||||
|
if (time != null) {
|
||||||
|
log = log.substring(26);
|
||||||
|
}
|
||||||
|
final level = LogLevel.values.firstOrNullWhere(
|
||||||
|
(e) {
|
||||||
|
if (log.startsWith(e.name.toUpperCase())) {
|
||||||
|
log = log.removePrefix(e.name.toUpperCase());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return LogEntity(
|
||||||
|
level: level,
|
||||||
|
time: time,
|
||||||
|
message: log.trim(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
19
lib/features/log/data/log_path_resolver.dart
Normal file
19
lib/features/log/data/log_path_resolver.dart
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:path/path.dart' as p;
|
||||||
|
|
||||||
|
class LogPathResolver {
|
||||||
|
const LogPathResolver(this._workingDir);
|
||||||
|
|
||||||
|
final Directory _workingDir;
|
||||||
|
|
||||||
|
Directory get directory => _workingDir;
|
||||||
|
|
||||||
|
File coreFile() {
|
||||||
|
return File(p.join(directory.path, "box.log"));
|
||||||
|
}
|
||||||
|
|
||||||
|
File appFile() {
|
||||||
|
return File(p.join(directory.path, "app.log"));
|
||||||
|
}
|
||||||
|
}
|
||||||
70
lib/features/log/data/log_repository.dart
Normal file
70
lib/features/log/data/log_repository.dart
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
import 'package:fpdart/fpdart.dart';
|
||||||
|
import 'package:hiddify/data/repository/exception_handlers.dart';
|
||||||
|
import 'package:hiddify/features/log/data/log_parser.dart';
|
||||||
|
import 'package:hiddify/features/log/data/log_path_resolver.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_entity.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_failure.dart';
|
||||||
|
import 'package:hiddify/services/singbox/singbox_service.dart';
|
||||||
|
import 'package:hiddify/utils/custom_loggers.dart';
|
||||||
|
|
||||||
|
abstract interface class LogRepository {
|
||||||
|
TaskEither<LogFailure, Unit> init();
|
||||||
|
Stream<Either<LogFailure, List<LogEntity>>> watchLogs();
|
||||||
|
TaskEither<LogFailure, Unit> clearLogs();
|
||||||
|
}
|
||||||
|
|
||||||
|
class LogRepositoryImpl
|
||||||
|
with ExceptionHandler, InfraLogger
|
||||||
|
implements LogRepository {
|
||||||
|
LogRepositoryImpl({
|
||||||
|
required this.singbox,
|
||||||
|
required this.logPathResolver,
|
||||||
|
});
|
||||||
|
|
||||||
|
final SingboxService singbox;
|
||||||
|
final LogPathResolver logPathResolver;
|
||||||
|
|
||||||
|
@override
|
||||||
|
TaskEither<LogFailure, Unit> init() {
|
||||||
|
return exceptionHandler(
|
||||||
|
() async {
|
||||||
|
if (!await logPathResolver.directory.exists()) {
|
||||||
|
await logPathResolver.directory.create(recursive: true);
|
||||||
|
}
|
||||||
|
if (await logPathResolver.coreFile().exists()) {
|
||||||
|
await logPathResolver.coreFile().writeAsString("");
|
||||||
|
} else {
|
||||||
|
await logPathResolver.coreFile().create(recursive: true);
|
||||||
|
}
|
||||||
|
if (await logPathResolver.appFile().exists()) {
|
||||||
|
await logPathResolver.appFile().writeAsString("");
|
||||||
|
} else {
|
||||||
|
await logPathResolver.appFile().create(recursive: true);
|
||||||
|
}
|
||||||
|
return right(unit);
|
||||||
|
},
|
||||||
|
LogUnexpectedFailure.new,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Stream<Either<LogFailure, List<LogEntity>>> watchLogs() {
|
||||||
|
return singbox
|
||||||
|
.watchLogs(logPathResolver.coreFile().path)
|
||||||
|
.map((event) => event.map(LogParser.parseSingbox).toList())
|
||||||
|
.handleExceptions(
|
||||||
|
(error, stackTrace) {
|
||||||
|
loggy.warning("error watching logs", error, stackTrace);
|
||||||
|
return LogFailure.unexpected(error, stackTrace);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
TaskEither<LogFailure, Unit> clearLogs() {
|
||||||
|
return exceptionHandler(
|
||||||
|
() => singbox.clearLogs().mapLeft(LogFailure.unexpected).run(),
|
||||||
|
LogFailure.unexpected,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
13
lib/features/log/model/log_entity.dart
Normal file
13
lib/features/log/model/log_entity.dart
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
|
|
||||||
|
part 'log_entity.freezed.dart';
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
class LogEntity with _$LogEntity {
|
||||||
|
const factory LogEntity({
|
||||||
|
LogLevel? level,
|
||||||
|
DateTime? time,
|
||||||
|
required String message,
|
||||||
|
}) = _LogEntity;
|
||||||
|
}
|
||||||
25
lib/features/log/model/log_failure.dart
Normal file
25
lib/features/log/model/log_failure.dart
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||||
|
import 'package:hiddify/core/prefs/locale_prefs.dart';
|
||||||
|
import 'package:hiddify/domain/failures.dart';
|
||||||
|
|
||||||
|
part 'log_failure.freezed.dart';
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
sealed class LogFailure with _$LogFailure, Failure {
|
||||||
|
const LogFailure._();
|
||||||
|
|
||||||
|
const factory LogFailure.unexpected([
|
||||||
|
Object? error,
|
||||||
|
StackTrace? stackTrace,
|
||||||
|
]) = LogUnexpectedFailure;
|
||||||
|
|
||||||
|
@override
|
||||||
|
({String type, String? message}) present(TranslationsEn t) {
|
||||||
|
return switch (this) {
|
||||||
|
LogUnexpectedFailure() => (
|
||||||
|
type: "unexpected",
|
||||||
|
message: null,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
25
lib/features/log/model/log_level.dart
Normal file
25
lib/features/log/model/log_level.dart
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
import 'package:dartx/dartx.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
enum LogLevel {
|
||||||
|
trace,
|
||||||
|
debug,
|
||||||
|
info,
|
||||||
|
warn,
|
||||||
|
error,
|
||||||
|
fatal,
|
||||||
|
panic;
|
||||||
|
|
||||||
|
/// [LogLevel] selectable by user as preference
|
||||||
|
static List<LogLevel> get choices => values.takeFirst(4);
|
||||||
|
|
||||||
|
Color? get color => switch (this) {
|
||||||
|
trace => Colors.lightBlueAccent,
|
||||||
|
debug => Colors.grey,
|
||||||
|
info => Colors.lightGreen,
|
||||||
|
warn => Colors.orange,
|
||||||
|
error => Colors.redAccent,
|
||||||
|
fatal => Colors.red,
|
||||||
|
panic => Colors.red,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,21 +1,22 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:hiddify/data/data_providers.dart';
|
import 'package:hiddify/features/log/data/log_data_providers.dart';
|
||||||
import 'package:hiddify/domain/singbox/singbox.dart';
|
import 'package:hiddify/features/log/model/log_entity.dart';
|
||||||
import 'package:hiddify/features/logs/notifier/logs_state.dart';
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
|
import 'package:hiddify/features/log/overview/logs_overview_state.dart';
|
||||||
import 'package:hiddify/utils/riverpod_utils.dart';
|
import 'package:hiddify/utils/riverpod_utils.dart';
|
||||||
import 'package:hiddify/utils/utils.dart';
|
import 'package:hiddify/utils/utils.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
import 'package:rxdart/rxdart.dart';
|
import 'package:rxdart/rxdart.dart';
|
||||||
|
|
||||||
part 'logs_notifier.g.dart';
|
part 'logs_overview_notifier.g.dart';
|
||||||
|
|
||||||
@riverpod
|
@riverpod
|
||||||
class LogsNotifier extends _$LogsNotifier with AppLogger {
|
class LogsOverviewNotifier extends _$LogsOverviewNotifier with AppLogger {
|
||||||
@override
|
@override
|
||||||
LogsState build() {
|
LogsOverviewState build() {
|
||||||
ref.disposeDelay(const Duration(seconds: 20));
|
ref.disposeDelay(const Duration(seconds: 20));
|
||||||
state = const LogsState();
|
state = const LogsOverviewState();
|
||||||
ref.onDispose(
|
ref.onDispose(
|
||||||
() {
|
() {
|
||||||
loggy.debug("disposing");
|
loggy.debug("disposing");
|
||||||
@@ -41,7 +42,7 @@ class LogsNotifier extends _$LogsNotifier with AppLogger {
|
|||||||
);
|
);
|
||||||
|
|
||||||
_addListeners();
|
_addListeners();
|
||||||
return const LogsState();
|
return const LogsOverviewState();
|
||||||
}
|
}
|
||||||
|
|
||||||
StreamSubscription? _listener;
|
StreamSubscription? _listener;
|
||||||
@@ -50,7 +51,8 @@ class LogsNotifier extends _$LogsNotifier with AppLogger {
|
|||||||
loggy.debug("adding listeners");
|
loggy.debug("adding listeners");
|
||||||
await _listener?.cancel();
|
await _listener?.cancel();
|
||||||
_listener = ref
|
_listener = ref
|
||||||
.read(coreFacadeProvider)
|
.read(logRepositoryProvider)
|
||||||
|
.requireValue
|
||||||
.watchLogs()
|
.watchLogs()
|
||||||
.throttle(
|
.throttle(
|
||||||
(_) => Stream.value(_listener?.isPaused ?? false),
|
(_) => Stream.value(_listener?.isPaused ?? false),
|
||||||
@@ -78,15 +80,14 @@ class LogsNotifier extends _$LogsNotifier with AppLogger {
|
|||||||
).listen((event) {});
|
).listen((event) {});
|
||||||
}
|
}
|
||||||
|
|
||||||
Iterable<String> _logs = [];
|
Iterable<LogEntity> _logs = [];
|
||||||
final _debouncer = CallbackDebouncer(const Duration(milliseconds: 200));
|
final _debouncer = CallbackDebouncer(const Duration(milliseconds: 200));
|
||||||
LogLevel? _levelFilter;
|
LogLevel? _levelFilter;
|
||||||
String _filter = "";
|
String _filter = "";
|
||||||
|
|
||||||
Future<List<BoxLog>> _computeLogs() async {
|
Future<List<LogEntity>> _computeLogs() async {
|
||||||
final logs = _logs.map(BoxLog.parse);
|
if (_levelFilter == null && _filter.isEmpty) return _logs.toList();
|
||||||
if (_levelFilter == null && _filter.isEmpty) return logs.toList();
|
return _logs.where((e) {
|
||||||
return logs.where((e) {
|
|
||||||
return (_filter.isEmpty || e.message.contains(_filter)) &&
|
return (_filter.isEmpty || e.message.contains(_filter)) &&
|
||||||
(_levelFilter == null ||
|
(_levelFilter == null ||
|
||||||
e.level == null ||
|
e.level == null ||
|
||||||
@@ -108,7 +109,7 @@ class LogsNotifier extends _$LogsNotifier with AppLogger {
|
|||||||
|
|
||||||
Future<void> clear() async {
|
Future<void> clear() async {
|
||||||
loggy.debug("clearing");
|
loggy.debug("clearing");
|
||||||
await ref.read(coreFacadeProvider).clearLogs().match(
|
await ref.read(logRepositoryProvider).requireValue.clearLogs().match(
|
||||||
(l) {
|
(l) {
|
||||||
loggy.warning("error clearing logs", l);
|
loggy.warning("error clearing logs", l);
|
||||||
},
|
},
|
||||||
@@ -5,25 +5,25 @@ import 'package:gap/gap.dart';
|
|||||||
import 'package:hiddify/core/core_providers.dart';
|
import 'package:hiddify/core/core_providers.dart';
|
||||||
import 'package:hiddify/core/prefs/prefs.dart';
|
import 'package:hiddify/core/prefs/prefs.dart';
|
||||||
import 'package:hiddify/domain/failures.dart';
|
import 'package:hiddify/domain/failures.dart';
|
||||||
import 'package:hiddify/domain/singbox/singbox.dart';
|
|
||||||
import 'package:hiddify/features/common/nested_app_bar.dart';
|
import 'package:hiddify/features/common/nested_app_bar.dart';
|
||||||
import 'package:hiddify/features/logs/notifier/notifier.dart';
|
import 'package:hiddify/features/log/data/log_data_providers.dart';
|
||||||
import 'package:hiddify/services/service_providers.dart';
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
|
import 'package:hiddify/features/log/overview/logs_overview_notifier.dart';
|
||||||
import 'package:hiddify/utils/utils.dart';
|
import 'package:hiddify/utils/utils.dart';
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
import 'package:sliver_tools/sliver_tools.dart';
|
import 'package:sliver_tools/sliver_tools.dart';
|
||||||
|
|
||||||
class LogsPage extends HookConsumerWidget with PresLogger {
|
class LogsOverviewPage extends HookConsumerWidget with PresLogger {
|
||||||
const LogsPage({super.key});
|
const LogsOverviewPage({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final t = ref.watch(translationsProvider);
|
final t = ref.watch(translationsProvider);
|
||||||
final state = ref.watch(logsNotifierProvider);
|
final state = ref.watch(logsOverviewNotifierProvider);
|
||||||
final notifier = ref.watch(logsNotifierProvider.notifier);
|
final notifier = ref.watch(logsOverviewNotifierProvider.notifier);
|
||||||
|
|
||||||
final debug = ref.watch(debugModeNotifierProvider);
|
final debug = ref.watch(debugModeNotifierProvider);
|
||||||
final filesEditor = ref.watch(filesEditorServiceProvider);
|
final pathResolver = ref.watch(logPathResolverProvider);
|
||||||
|
|
||||||
final filterController = useTextEditingController(text: state.filter);
|
final filterController = useTextEditingController(text: state.filter);
|
||||||
|
|
||||||
@@ -33,8 +33,8 @@ class LogsPage extends HookConsumerWidget with PresLogger {
|
|||||||
child: Text(t.logs.shareCoreLogs),
|
child: Text(t.logs.shareCoreLogs),
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
await UriUtils.tryShareOrLaunchFile(
|
await UriUtils.tryShareOrLaunchFile(
|
||||||
Uri.parse(filesEditor.coreLogsFile.path),
|
Uri.parse(pathResolver.coreFile().path),
|
||||||
fileOrDir: filesEditor.logsDir.uri,
|
fileOrDir: pathResolver.directory.uri,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
@@ -42,8 +42,8 @@ class LogsPage extends HookConsumerWidget with PresLogger {
|
|||||||
child: Text(t.logs.shareAppLogs),
|
child: Text(t.logs.shareAppLogs),
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
await UriUtils.tryShareOrLaunchFile(
|
await UriUtils.tryShareOrLaunchFile(
|
||||||
Uri.parse(filesEditor.appLogsFile.path),
|
Uri.parse(pathResolver.appFile().path),
|
||||||
fileOrDir: filesEditor.logsDir.uri,
|
fileOrDir: pathResolver.directory.uri,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
18
lib/features/log/overview/logs_overview_state.dart
Normal file
18
lib/features/log/overview/logs_overview_state.dart
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_entity.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
|
part 'logs_overview_state.freezed.dart';
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
class LogsOverviewState with _$LogsOverviewState {
|
||||||
|
const LogsOverviewState._();
|
||||||
|
|
||||||
|
const factory LogsOverviewState({
|
||||||
|
@Default(AsyncLoading()) AsyncValue<List<LogEntity>> logs,
|
||||||
|
@Default(false) bool paused,
|
||||||
|
@Default("") String filter,
|
||||||
|
LogLevel? levelFilter,
|
||||||
|
}) = _LogsOverviewState;
|
||||||
|
}
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
|
||||||
import 'package:hiddify/domain/singbox/singbox.dart';
|
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
|
||||||
|
|
||||||
part 'logs_state.freezed.dart';
|
|
||||||
|
|
||||||
@freezed
|
|
||||||
class LogsState with _$LogsState {
|
|
||||||
const LogsState._();
|
|
||||||
|
|
||||||
const factory LogsState({
|
|
||||||
@Default(AsyncLoading()) AsyncValue<List<BoxLog>> logs,
|
|
||||||
@Default(false) bool paused,
|
|
||||||
@Default("") String filter,
|
|
||||||
LogLevel? levelFilter,
|
|
||||||
}) = _LogsState;
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
export 'logs_notifier.dart';
|
|
||||||
export 'logs_state.dart';
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export 'logs_page.dart';
|
|
||||||
@@ -4,6 +4,7 @@ import 'package:gap/gap.dart';
|
|||||||
import 'package:hiddify/core/core_providers.dart';
|
import 'package:hiddify/core/core_providers.dart';
|
||||||
import 'package:hiddify/data/repository/config_options_store.dart';
|
import 'package:hiddify/data/repository/config_options_store.dart';
|
||||||
import 'package:hiddify/domain/singbox/singbox.dart';
|
import 'package:hiddify/domain/singbox/singbox.dart';
|
||||||
|
import 'package:hiddify/features/log/model/log_level.dart';
|
||||||
import 'package:hiddify/features/settings/widgets/widgets.dart';
|
import 'package:hiddify/features/settings/widgets/widgets.dart';
|
||||||
import 'package:hiddify/utils/utils.dart';
|
import 'package:hiddify/utils/utils.dart';
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class SystemTrayController extends _$SystemTrayController
|
|||||||
final destinations = <(String label, String location)>[
|
final destinations = <(String label, String location)>[
|
||||||
(t.home.pageTitle, const HomeRoute().location),
|
(t.home.pageTitle, const HomeRoute().location),
|
||||||
(t.proxies.pageTitle, const ProxiesRoute().location),
|
(t.proxies.pageTitle, const ProxiesRoute().location),
|
||||||
(t.logs.pageTitle, const LogsRoute().location),
|
(t.logs.pageTitle, const LogsOverviewRoute().location),
|
||||||
(t.settings.pageTitle, const SettingsRoute().location),
|
(t.settings.pageTitle, const SettingsRoute().location),
|
||||||
(t.about.pageTitle, const AboutRoute().location),
|
(t.about.pageTitle, const AboutRoute().location),
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import 'dart:io';
|
|||||||
|
|
||||||
import 'package:hiddify/services/platform_services.dart';
|
import 'package:hiddify/services/platform_services.dart';
|
||||||
import 'package:hiddify/utils/utils.dart';
|
import 'package:hiddify/utils/utils.dart';
|
||||||
import 'package:path/path.dart' as p;
|
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
|
||||||
typedef Directories = ({
|
typedef Directories = ({
|
||||||
@@ -19,10 +18,6 @@ class FilesEditorService with InfraLogger {
|
|||||||
late final Directories dirs;
|
late final Directories dirs;
|
||||||
|
|
||||||
Directory get workingDir => dirs.workingDir;
|
Directory get workingDir => dirs.workingDir;
|
||||||
Directory get logsDir => dirs.workingDir;
|
|
||||||
|
|
||||||
File get appLogsFile => File(p.join(logsDir.path, "app.log"));
|
|
||||||
File get coreLogsFile => File(p.join(logsDir.path, "box.log"));
|
|
||||||
|
|
||||||
Future<void> init() async {
|
Future<void> init() async {
|
||||||
dirs = await platformServices.getPaths().getOrElse(
|
dirs = await platformServices.getPaths().getOrElse(
|
||||||
@@ -40,18 +35,6 @@ class FilesEditorService with InfraLogger {
|
|||||||
if (!await dirs.workingDir.exists()) {
|
if (!await dirs.workingDir.exists()) {
|
||||||
await dirs.workingDir.create(recursive: true);
|
await dirs.workingDir.create(recursive: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (await appLogsFile.exists()) {
|
|
||||||
await appLogsFile.writeAsString("");
|
|
||||||
} else {
|
|
||||||
await appLogsFile.create(recursive: true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (await coreLogsFile.exists()) {
|
|
||||||
await coreLogsFile.writeAsString("");
|
|
||||||
} else {
|
|
||||||
await coreLogsFile.create(recursive: true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<Directory> getDatabaseDirectory() async {
|
static Future<Directory> getDatabaseDirectory() async {
|
||||||
|
|||||||
Reference in New Issue
Block a user