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

add basic routing options, auto update routing assets,use ruleset, remove geo assets

Browse Source
This commit is contained in:
hiddify-com
2024-07-04 21:04:44 +02:00
parent 93f4bbca32
commit c6d34e7455
27 changed files with 773 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/features/connection/data/connection_data_providers.dart
View File

@@ -2,7 +2,7 @@ import 'package:hiddify/core/directories/directories_provider.dart';
import 'package:hiddify/features/config_option/data/config_option_data_providers.dart';
import 'package:hiddify/features/connection/data/connection_platform_source.dart';
import 'package:hiddify/features/connection/data/connection_repository.dart';
import 'package:hiddify/features/geo_asset/data/geo_asset_data_providers.dart';
import 'package:hiddify/features/profile/data/profile_data_providers.dart';
import 'package:hiddify/singbox/service/singbox_service_provider.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -19,6 +19,5 @@ ConnectionRepository connectionRepository(
singbox: ref.watch(singboxServiceProvider),
platformSource: ConnectionPlatformSourceImpl(),
profilePathResolver: ref.watch(profilePathResolverProvider),
geoAssetPathResolver: ref.watch(geoAssetPathResolverProvider),
);
}

47
lib/features/connection/data/connection_repository.dart
View File

@@ -1,5 +1,3 @@
import 'dart:io';
import 'package:fpdart/fpdart.dart';
import 'package:hiddify/core/model/directories.dart';
import 'package:hiddify/core/utils/exception_handler.dart';
@@ -7,7 +5,7 @@ import 'package:hiddify/features/config_option/data/config_option_repository.dar
import 'package:hiddify/features/connection/data/connection_platform_source.dart';
import 'package:hiddify/features/connection/model/connection_failure.dart';
import 'package:hiddify/features/connection/model/connection_status.dart';
import 'package:hiddify/features/geo_asset/data/geo_asset_path_resolver.dart';
import 'package:hiddify/features/profile/data/profile_path_resolver.dart';
import 'package:hiddify/singbox/model/singbox_config_option.dart';
import 'package:hiddify/singbox/model/singbox_status.dart';
@@ -33,16 +31,13 @@ abstract interface class ConnectionRepository {
);
}
class ConnectionRepositoryImpl
with ExceptionHandler, InfraLogger
implements ConnectionRepository {
class ConnectionRepositoryImpl with ExceptionHandler, InfraLogger implements ConnectionRepository {
ConnectionRepositoryImpl({
required this.directories,
required this.singbox,
required this.platformSource,
required this.configOptionRepository,
required this.profilePathResolver,
required this.geoAssetPathResolver,
});
final Directories directories;
@@ -50,7 +45,6 @@ class ConnectionRepositoryImpl
final ConnectionPlatformSource platformSource;
final ConfigOptionRepository configOptionRepository;
final ProfilePathResolver profilePathResolver;
final GeoAssetPathResolver geoAssetPathResolver;
SingboxConfigOption? _configOptionsSnapshot;
@override
@@ -64,16 +58,10 @@ class ConnectionRepositoryImpl
(event) => switch (event) {
SingboxStopped(:final alert?, :final message) => Disconnected(
switch (alert) {
SingboxAlert.emptyConfiguration =>
ConnectionFailure.invalidConfig(message),
SingboxAlert.requestNotificationPermission =>
ConnectionFailure.missingNotificationPermission(message),
SingboxAlert.requestVPNPermission =>
ConnectionFailure.missingVpnPermission(message),
SingboxAlert.startCommandServer ||
SingboxAlert.createService ||
SingboxAlert.startService =>
ConnectionFailure.unexpected(message),
SingboxAlert.emptyConfiguration => ConnectionFailure.invalidConfig(message),
SingboxAlert.requestNotificationPermission => ConnectionFailure.missingNotificationPermission(message),
SingboxAlert.requestVPNPermission => ConnectionFailure.missingVpnPermission(message),
SingboxAlert.startCommandServer || SingboxAlert.createService || SingboxAlert.startService => ConnectionFailure.unexpected(message),
},
),
SingboxStopped() => const Disconnected(),
@@ -89,21 +77,19 @@ class ConnectionRepositoryImpl
return TaskEither<ConnectionFailure, SingboxConfigOption>.Do(
($) async {
final options = await $(
configOptionRepository
.getFullSingboxConfigOption()
.mapLeft((l) => const InvalidConfigOption()),
configOptionRepository.getFullSingboxConfigOption().mapLeft((l) => const InvalidConfigOption()),
);
return $(
TaskEither(
() async {
final geoip = geoAssetPathResolver.resolvePath(options.geoipPath);
final geosite =
geoAssetPathResolver.resolvePath(options.geositePath);
if (!await File(geoip).exists() ||
!await File(geosite).exists()) {
return left(const ConnectionFailure.missingGeoAssets());
}
// final geoip = geoAssetPathResolver.resolvePath(options.geoipPath);
// final geosite =
// geoAssetPathResolver.resolvePath(options.geositePath);
// if (!await File(geoip).exists() ||
// !await File(geosite).exists()) {
// return left(const ConnectionFailure.missingGeoAssets());
// }
return right(options);
},
),
@@ -119,10 +105,7 @@ class ConnectionRepositoryImpl
return exceptionHandler(
() {
_configOptionsSnapshot = options;
return singbox
.changeOptions(options)
.mapLeft(InvalidConfigOption.new)
.run();
return singbox.changeOptions(options).mapLeft(InvalidConfigOption.new).run();
},
UnexpectedConnectionFailure.new,
);