vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Add error handling for geo assets

Browse Source
This commit is contained in:
problematicconsumer
2023-11-17 23:22:12 +03:30
parent 4a6b112087
commit 436fc8133c
13 changed files with 113 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/translations/strings_en.i18n.json
View File

@@ -269,6 +269,8 @@
"serviceNotRunning": "Service is not running",
"missingPrivilege": "Missing Privilege",
"missingPrivilegeMsg": "VPN mode requires administrator privileges. Either relaunch the app as administrator or change service mode.",
"missingGeoAssets": "Missing Geo Assets",
"missingGeoAssetsMsg": "Geo assets are missing. consider changing active asset or download selected one in the settings.",
"invalidConfigOptions": "Invalid configuration options",
"invalidConfig": "Invalid Configuration",
"create": "Service creation error",

4
assets/translations/strings_fa.i18n.json
View File

@@ -272,7 +272,9 @@
"invalidConfigOptions": "تنظیمات کانفیگ نامعتبر",
"invalidConfig": "کانفیگ غیر معتبر",
"create": "در ایجاد سرویس خطایی رخ داده",
"start": "در راه‌اندازی سرویس خطایی رخ داده"
"start": "در راه‌اندازی سرویس خطایی رخ داده",
"missingGeoAssets": "دارایی های جغرافیایی از دست رفته",
"missingGeoAssetsMsg": "دارایی های جغرافیایی گم شده اند. تغییر دارایی فعال را در نظر بگیرید یا یکی را در تنظیمات دانلود کنید."
},
"connectivity": {
"unexpected": "خطای غیرمنتظره",

4
assets/translations/strings_ru.i18n.json
View File

@@ -272,7 +272,9 @@
"invalidConfigOptions": "Неправильные параметры конфигурации",
"invalidConfig": "Неправильная конфигурация",
"create": "Ошибка создания сервиса",
"start": "Ошибка запуска сервиса"
"start": "Ошибка запуска сервиса",
"missingGeoAssets": "Отсутствующие географические ресурсы",
"missingGeoAssetsMsg": "Георесурсы отсутствуют. рассмотрите возможность изменения активного актива или загрузите выбранный в настройках."
},
"connectivity": {
"unexpected": "Неожиданная ошибка",

4
assets/translations/strings_tr.i18n.json
View File

@@ -272,7 +272,9 @@
"invalidConfigOptions": "Geçersiz yapılandırma seçenekleri",
"invalidConfig": "Geçersiz Yapılandırma",
"create": "Servis oluşturma hatası",
"start": "Servis başlatma hatası"
"start": "Servis başlatma hatası",
"missingGeoAssets": "Eksik Coğrafi Varlıklar",
"missingGeoAssetsMsg": "Coğrafi öğeler eksik. Aktif varlığı değiştirmeyi veya ayarlarda seçileni indirmeyi düşünün."
},
"connectivity": {
"unexpected": "Beklenmedik Hata",

4
assets/translations/strings_zh.i18n.json
View File

@@ -272,7 +272,9 @@
"invalidConfigOptions": "配置选项无效",
"invalidConfig": "无效配置",
"create": "服务创建错误",
"start": "服务启动错误"
"start": "服务启动错误",
"missingGeoAssets": "缺少地理资产",
"missingGeoAssetsMsg": "地理资产缺失。考虑更改活动资产或下载设置中选定的资产。"
},
"connectivity": {
"unexpected": "意外失败",

6
lib/data/local/dao/geo_assets_dao.dart
View File

@@ -28,6 +28,12 @@ class GeoAssetsDao extends DatabaseAccessor<AppDatabase>
Future<void> edit(GeoAsset patch) async {
await transaction(
() async {
if (patch.active) {
await (update(geoAssetEntries)
..where((tbl) => tbl.active.equals(true))
..where((tbl) => tbl.type.equalsValue(patch.type)))
.write(const GeoAssetEntriesCompanion(active: Value(false)));
}
await (update(geoAssetEntries)..where((tbl) => tbl.id.equals(patch.id)))
.write(patch.toCompanion());
},

67
lib/data/repository/core_facade_impl.dart
View File

@@ -1,4 +1,5 @@
import 'dart:convert';
import 'dart:io';
import 'package:fpdart/fpdart.dart';
import 'package:hiddify/data/api/clash_api.dart';
@@ -33,6 +34,21 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
bool _initialized = false;
TaskEither<CoreServiceFailure, ConfigOptions> _getConfigOptions() {
return exceptionHandler(
() async {
final options = await configOptions();
final geoip = filesEditor.resolveGeoAssetPath(options.geoipPath);
final geosite = filesEditor.resolveGeoAssetPath(options.geositePath);
if (!await File(geoip).exists() || !await File(geosite).exists()) {
return left(const CoreMissingGeoAssets());
}
return right(options);
},
CoreServiceFailure.unexpected,
);
}
@override
TaskEither<CoreServiceFailure, Unit> setup() {
if (_initialized) return TaskEither.of(unit);
@@ -94,21 +110,17 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
TaskEither<CoreServiceFailure, String> generateConfig(
String fileName,
) {
return exceptionHandler(
() async {
return TaskEither<CoreServiceFailure, String>.Do(
($) async {
final configPath = filesEditor.configPath(fileName);
final options = await configOptions();
return setup()
.andThen(() => changeConfigOptions(options))
.andThen(
() => singbox
.generateConfig(configPath)
.mapLeft(CoreServiceFailure.other),
)
.run();
},
CoreServiceFailure.unexpected,
final options = await $(_getConfigOptions());
await $(setup());
await $(changeConfigOptions(options));
return await $(
singbox.generateConfig(configPath).mapLeft(CoreServiceFailure.other),
);
},
).handleExceptions(CoreServiceFailure.unexpected);
}
@override
@@ -116,14 +128,16 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
String fileName,
bool disableMemoryLimit,
) {
return exceptionHandler(
() async {
return TaskEither<CoreServiceFailure, Unit>.Do(
($) async {
final configPath = filesEditor.configPath(fileName);
final options = await configOptions();
final options = await $(_getConfigOptions());
loggy.info(
"config options: ${options.format()}\nMemory Limit: ${!disableMemoryLimit}",
);
await $(
TaskEither(() async {
if (options.enableTun) {
final hasPrivilege = await platformServices.hasPrivilege();
if (!hasPrivilege) {
@@ -131,18 +145,18 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
return left(const CoreMissingPrivilege());
}
}
return setup()
.andThen(() => changeConfigOptions(options))
.andThen(
() => singbox
return right(unit);
}),
);
await $(setup());
await $(changeConfigOptions(options));
return await $(
singbox
.start(configPath, disableMemoryLimit)
.mapLeft(CoreServiceFailure.start),
)
.run();
},
CoreServiceFailure.unexpected,
);
},
).handleExceptions(CoreServiceFailure.unexpected);
}
@override
@@ -161,7 +175,8 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade {
return exceptionHandler(
() async {
final configPath = filesEditor.configPath(fileName);
return changeConfigOptions(await configOptions())
return _getConfigOptions()
.flatMap((options) => changeConfigOptions(options))
.andThen(
() => singbox
.restart(configPath, disableMemoryLimit)

16
lib/data/repository/exception_handlers.dart
View File

@@ -30,3 +30,19 @@ extension StreamExceptionHandler<R extends Object?> on Stream<R> {
);
}
}
extension TaskEitherExceptionHandler<F, R> on TaskEither<F, R> {
TaskEither<F, R> handleExceptions(
F Function(Object error, StackTrace stackTrace) onError,
) {
return TaskEither(
() async {
try {
return await run();
} catch (error, stackTrace) {
return Left(onError(error, stackTrace));
}
},
);
}
}

13
lib/data/repository/geo_assets_repository.dart
View File

@@ -68,9 +68,7 @@ class GeoAssetsRepositoryImpl
filesEditor.geoAssetsDir.path,
pollingDelay: const Duration(seconds: 1),
).events.asyncMap((event) async {
if (event.type == ChangeType.MODIFY) {
await _readGeoFiles();
}
return _geoFiles;
});
}
@@ -137,4 +135,15 @@ class GeoAssetsRepositoryImpl
GeoAssetFailure.unexpected,
);
}
@override
TaskEither<GeoAssetFailure, Unit> markAsActive(GeoAsset geoAsset) {
return exceptionHandler(
() async {
await geoAssetsDao.edit(geoAsset.copyWith(active: true));
return right(unit);
},
GeoAssetFailure.unexpected,
);
}
}

8
lib/domain/core_service_failure.dart
View File

@@ -21,6 +21,9 @@ sealed class CoreServiceFailure with _$CoreServiceFailure, Failure {
@With<ExpectedFailure>()
const factory CoreServiceFailure.missingPrivilege() = CoreMissingPrivilege;
@With<ExpectedFailure>()
const factory CoreServiceFailure.missingGeoAssets() = CoreMissingGeoAssets;
const factory CoreServiceFailure.invalidConfigOptions([
String? message,
]) = InvalidConfigOptions;
@@ -46,6 +49,7 @@ sealed class CoreServiceFailure with _$CoreServiceFailure, Failure {
UnexpectedCoreServiceFailure() => null,
CoreServiceNotRunning(:final message) => message,
CoreMissingPrivilege() => null,
CoreMissingGeoAssets() => null,
InvalidConfigOptions(:final message) => message,
InvalidConfig(:final message) => message,
CoreServiceCreateFailure(:final message) => message,
@@ -68,6 +72,10 @@ sealed class CoreServiceFailure with _$CoreServiceFailure, Failure {
type: t.failure.singbox.missingPrivilege,
message: t.failure.singbox.missingPrivilegeMsg,
),
CoreMissingGeoAssets() => (
type: t.failure.singbox.missingGeoAssets,
message: t.failure.singbox.missingGeoAssetsMsg,
),
InvalidConfigOptions(:final message) => (
type: t.failure.singbox.invalidConfigOptions,
message: message

2
lib/domain/rules/geo_assets_repository.dart
View File

@@ -9,4 +9,6 @@ abstract interface class GeoAssetsRepository {
Stream<Either<GeoAssetFailure, List<GeoAssetWithFileSize>>> watchAll();
TaskEither<GeoAssetFailure, Unit> update(GeoAsset geoAsset);
TaskEither<GeoAssetFailure, Unit> markAsActive(GeoAsset geoAsset);
}

4
lib/services/files_editor_service.dart
View File

@@ -99,6 +99,10 @@ class FilesEditorService with InfraLogger {
return p.relative(fullPath, from: workingDir.path);
}
String resolveGeoAssetPath(String path) {
return p.absolute(workingDir.path, path);
}
String tempConfigPath(String fileName) => configPath("temp_$fileName");
Future<void> deleteConfig(String fileName) {

2
libcore

Submodule libcore updated: 2c2504f971...2f865d5c8a