do http requests inside isolate

This commit is contained in:
Fabian Freund
2025-02-21 22:20:42 +01:00
parent e76d63eed0
commit a5133b0b90
4 changed files with 30 additions and 29 deletions
+11 -9
View File
@@ -57,8 +57,6 @@ Iterable<ResourceSize> sizesToList(String? sizes) sync* {
class GenericWebsiteService extends _$GenericWebsiteService { class GenericWebsiteService extends _$GenericWebsiteService {
final GeckoIconService _iconsService; final GeckoIconService _iconsService;
late http.Client _client;
//Global icon cache //Global icon cache
late CacheRepository _cacheRepository; late CacheRepository _cacheRepository;
//Local decoded icon cache //Local decoded icon cache
@@ -70,7 +68,6 @@ class GenericWebsiteService extends _$GenericWebsiteService {
@override @override
void build() { void build() {
_client = http.Client();
_cacheRepository = ref.watch(cacheRepositoryProvider.notifier); _cacheRepository = ref.watch(cacheRepositoryProvider.notifier);
} }
@@ -189,13 +186,15 @@ class GenericWebsiteService extends _$GenericWebsiteService {
Future<Result<WebPageInfo>> fetchPageInfo(Uri url) async { Future<Result<WebPageInfo>> fetchPageInfo(Uri url) async {
return Result.fromAsync(() async { return Result.fromAsync(() async {
final response = await _client final result = await compute((String urlString) async {
.get(url) final client = http.Client();
try {
final baseUri = Uri.parse(urlString);
final response = await client
.get(baseUri)
.timeout(const Duration(seconds: 15)); .timeout(const Duration(seconds: 15));
final result = await compute((args) async { final document = html_parser.parse(response.body);
final document = html_parser.parse(args[0]);
final baseUri = Uri.parse(args[1]);
final title = document.querySelector('title')?.text; final title = document.querySelector('title')?.text;
final resources = _extractIcons(baseUri, document); final resources = _extractIcons(baseUri, document);
@@ -204,7 +203,10 @@ class GenericWebsiteService extends _$GenericWebsiteService {
'title': title, 'title': title,
'resources': resources.map(_serializeResource).toList(), 'resources': resources.map(_serializeResource).toList(),
}; };
}, [response.body, url.toString()]); } finally {
client.close();
}
}, url.toString());
final resources = final resources =
(result['resources']! as List<Map<String, dynamic>>) (result['resources']! as List<Map<String, dynamic>>)
@@ -7,7 +7,7 @@ part of 'generic_website.dart';
// ************************************************************************** // **************************************************************************
String _$genericWebsiteServiceHash() => String _$genericWebsiteServiceHash() =>
r'7891376773d7e6a61eeab37e0e92bb21f1acd8e3'; r'663759beb3ae7448f4d60339557ba11c1a3a687d';
/// See also [GenericWebsiteService]. /// See also [GenericWebsiteService].
@ProviderFor(GenericWebsiteService) @ProviderFor(GenericWebsiteService)
@@ -12,21 +12,20 @@ part 'data_source.g.dart';
@Riverpod() @Riverpod()
class BangDataSourceService extends _$BangDataSourceService { class BangDataSourceService extends _$BangDataSourceService {
late http.Client _client;
@override @override
void build() { void build() {}
_client = http.Client();
}
Future<Result<List<Bang>>> getBangs(Uri url, BangGroup? group) async { Future<Result<List<Bang>>> getBangs(Uri url, BangGroup? group) async {
return Result.fromAsync(() async { return Result.fromAsync(() async {
final response = await _client return await compute((args) async {
final client = http.Client();
final url = Uri.parse(args[0]);
final response = await client
.get(url) .get(url)
.timeout(const Duration(seconds: 30)); .timeout(const Duration(seconds: 30));
return await compute((args) => jsonDecode(utf8.decode(args[0])) as List, [
response.bodyBytes, return jsonDecode(utf8.decode(response.bodyBytes)) as List;
]).then( }, [url.toString()]).then(
(json) => (json) =>
json.map((e) { json.map((e) {
var bang = Bang.fromJson(e as Map<String, dynamic>); var bang = Bang.fromJson(e as Map<String, dynamic>);
@@ -7,7 +7,7 @@ part of 'data_source.dart';
// ************************************************************************** // **************************************************************************
String _$bangDataSourceServiceHash() => String _$bangDataSourceServiceHash() =>
r'fb00762858a2878505c14e2b1a0f26c1b2f60d7d'; r'883fd708053523def4a5bc966c0b6ad88e085215';
/// See also [BangDataSourceService]. /// See also [BangDataSourceService].
@ProviderFor(BangDataSourceService) @ProviderFor(BangDataSourceService)