diff --git a/lib/helpers/message_url_image_helper.dart b/lib/helpers/message_url_image_helper.dart index d917af6d..0951dfda 100644 --- a/lib/helpers/message_url_image_helper.dart +++ b/lib/helpers/message_url_image_helper.dart @@ -16,6 +16,12 @@ class MessageUrlImageHelper { static final LinkedHashMap> _messageImageCache = LinkedHashMap>(); + /// HTTP client used to resolve sharing pages. + /// + /// Tests override this because `flutter_test` blocks real network requests. + @visibleForTesting + static http.Client? httpClient; + static final RegExp _pyxPattern = RegExp( r'''https?://pyx\.li/\?i=([^\s<>'"`]+)''', caseSensitive: false, @@ -132,8 +138,9 @@ class MessageUrlImageHelper { static Future _extractFromUrl(String pageUrl, RegExp pattern) async { try { - final response = await http - .get(Uri.parse(pageUrl)) + final uri = Uri.parse(pageUrl); + final client = httpClient; + final response = await (client == null ? http.get(uri) : client.get(uri)) .timeout(const Duration(seconds: 8)); if (response.statusCode < 200 || response.statusCode >= 300) { return null; @@ -141,9 +148,7 @@ class MessageUrlImageHelper { final value = pattern.firstMatch(response.body)?.group(1); if (value == null || value.isEmpty) return null; - final imageUrl = Uri.parse( - pageUrl, - ).resolve(value.replaceAll('&', '&')); + final imageUrl = uri.resolve(value.replaceAll('&', '&')); return imageUrl.scheme == 'http' || imageUrl.scheme == 'https' ? imageUrl.toString() : null; diff --git a/test/helpers/message_url_image_helper_test.dart b/test/helpers/message_url_image_helper_test.dart index ecb2712b..11e1b022 100644 --- a/test/helpers/message_url_image_helper_test.dart +++ b/test/helpers/message_url_image_helper_test.dart @@ -1,23 +1,38 @@ import 'package:flutter_test/flutter_test.dart'; +import 'package:http/http.dart' as http; +import 'package:http/testing.dart'; import 'package:meshcore_open/helpers/message_url_image_helper.dart'; void main() { group('MessageUrlImageHelper', () { + tearDown(() => MessageUrlImageHelper.httpClient = null); + + void mockPyxPage(String id) { + MessageUrlImageHelper.httpClient = MockClient((request) async { + expect(request.url.toString(), 'https://pyx.li/?i=$id'); + return http.Response( + '', + 200, + headers: {'content-type': 'text/html; charset=utf-8'}, + ); + }); + } + test('parses short pyx ids', () async { + mockPyxPage('RzmdkTsE'); final attachment = await MessageUrlImageHelper.parse( 'my picture: https://pyx.li/?i=RzmdkTsE text', ); - expect(attachment, isNotNull); expect(attachment, 'https://pyx.li/i/RzmdkTsE.jpg'); }); test('parses direct pyx image urls', () async { + mockPyxPage('Cd1KFiwu'); final attachment = await MessageUrlImageHelper.parse( 'https://pyx.li/?i=Cd1KFiwu', ); - expect(attachment, isNotNull); expect(attachment, 'https://pyx.li/i/Cd1KFiwu.jpg'); });