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

new: add json editor and editing configs <3

Browse Source
This commit is contained in:
hiddify-com
2024-07-30 08:07:46 +02:00
parent 503e48a830
commit 531ddbc2e2
10 changed files with 1524 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/features/profile/data/profile_data_providers.dart
View File

@@ -1,6 +1,8 @@
import 'package:hiddify/core/database/database_provider.dart';
import 'package:hiddify/core/directories/directories_provider.dart';
import 'package:hiddify/core/http_client/http_client_provider.dart';
import 'package:hiddify/features/config_option/data/config_option_data_providers.dart';
import 'package:hiddify/features/config_option/notifier/config_option_notifier.dart';
import 'package:hiddify/features/profile/data/profile_data_source.dart';
import 'package:hiddify/features/profile/data/profile_path_resolver.dart';
import 'package:hiddify/features/profile/data/profile_repository.dart';
@@ -15,6 +17,7 @@ Future<ProfileRepository> profileRepository(ProfileRepositoryRef ref) async {
profileDataSource: ref.watch(profileDataSourceProvider),
profilePathResolver: ref.watch(profilePathResolverProvider),
singbox: ref.watch(singboxServiceProvider),
configOptionRepository: ref.watch(configOptionRepositoryProvider),
httpClient: ref.watch(httpClientProvider),
);
await repo.init().getOrElse((l) => throw l).run();

73
lib/features/profile/data/profile_repository.dart
View File

@@ -6,6 +6,8 @@ import 'package:fpdart/fpdart.dart';
import 'package:hiddify/core/database/app_database.dart';
import 'package:hiddify/core/http_client/dio_http_client.dart';
import 'package:hiddify/core/utils/exception_handler.dart';
import 'package:hiddify/features/config_option/data/config_option_repository.dart';
import 'package:hiddify/features/connection/model/connection_failure.dart';
import 'package:hiddify/features/profile/data/profile_data_mapper.dart';
import 'package:hiddify/features/profile/data/profile_data_source.dart';
import 'package:hiddify/features/profile/data/profile_parser.dart';
@@ -36,7 +38,10 @@ abstract interface class ProfileRepository {
bool markAsActive = false,
CancelToken? cancelToken,
});
TaskEither<ProfileFailure, Unit> updateContent(
String profileId,
String content,
);
TaskEither<ProfileFailure, Unit> addByContent(
String content, {
required String name,
@@ -67,12 +72,14 @@ class ProfileRepositoryImpl with ExceptionHandler, InfraLogger implements Profil
required this.profileDataSource,
required this.profilePathResolver,
required this.singbox,
required this.configOptionRepository,
required this.httpClient,
});
final ProfileDataSource profileDataSource;
final ProfilePathResolver profilePathResolver;
final SingboxService singbox;
final ConfigOptionRepository configOptionRepository;
final DioHttpClient httpClient;
@override
@@ -177,6 +184,30 @@ class ProfileRepositoryImpl with ExceptionHandler, InfraLogger implements Profil
);
}
@override
TaskEither<ProfileFailure, Unit> updateContent(
String profileId,
String content,
) {
return exceptionHandler(
() async {
final file = profilePathResolver.file(profileId);
final tempFile = profilePathResolver.tempFile(profileId);
try {
await tempFile.writeAsString(content);
return await validateConfig(file.path, tempFile.path, false).run();
} finally {
if (tempFile.existsSync()) tempFile.deleteSync();
}
},
(error, stackTrace) {
loggy.warning("error adding profile by content", error, stackTrace);
return ProfileUnexpectedFailure(error, stackTrace);
},
);
}
@override
TaskEither<ProfileFailure, Unit> addByContent(
String content, {
@@ -186,28 +217,22 @@ class ProfileRepositoryImpl with ExceptionHandler, InfraLogger implements Profil
return exceptionHandler(
() async {
final profileId = const Uuid().v4();
final file = profilePathResolver.file(profileId);
final tempFile = profilePathResolver.tempFile(profileId);
try {
await tempFile.writeAsString(content);
return await validateConfig(file.path, tempFile.path, false)
.andThen(
() => TaskEither(() async {
final profile = LocalProfileEntity(
id: profileId,
active: markAsActive,
name: name,
lastUpdate: DateTime.now(),
);
await profileDataSource.insert(profile.toEntry());
return right(unit);
}),
)
.run();
} finally {
if (tempFile.existsSync()) tempFile.deleteSync();
}
return await updateContent(profileId, content)
.andThen(
() => TaskEither(() async {
final profile = LocalProfileEntity(
id: profileId,
active: markAsActive,
name: name,
lastUpdate: DateTime.now(),
);
await profileDataSource.insert(profile.toEntry());
return right(unit);
}),
)
.run();
},
(error, stackTrace) {
loggy.warning("error adding profile by content", error, stackTrace);
@@ -252,6 +277,10 @@ class ProfileRepositoryImpl with ExceptionHandler, InfraLogger implements Profil
($) async {
final configFile = profilePathResolver.file(id);
// TODO pass options
final options = await configOptionRepository.getConfigOptions();
singbox.changeOptions(options).mapLeft(InvalidConfigOption.new).run();
return await $(
singbox.generateFullConfigByPath(configFile.path).mapLeft(ProfileFailure.unexpected),
);