diff --git a/README.md b/README.md index 3ae1c0c..fe15c32 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,11 @@ void main() async { var handler = const Pipeline().addMiddleware(logRequests()).addHandler(_echoRequest); - var server = await serve(handler, 'localhost', 8080); + var server = await serve( + handler, + RelicAddress.fromHostname('localhost'), + 8080, + ); // Enable content compression server.autoCompress = true; diff --git a/analysis_options.yaml b/analysis_options.yaml index 572dd23..99b2082 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1 +1,6 @@ include: package:lints/recommended.yaml + +linter: + rules: + - avoid_dynamic_calls + - unawaited_futures diff --git a/example/example.dart b/example/example.dart index 1698361..864b407 100644 --- a/example/example.dart +++ b/example/example.dart @@ -4,7 +4,11 @@ void main() async { var handler = const Pipeline().addMiddleware(logRequests()).addHandler(_echoRequest); - var server = await serve(handler, 'localhost', 8080); + var server = await serve( + handler, + RelicAddress.fromHostname('localhost'), + 8080, + ); // Enable content compression server.autoCompress = true; diff --git a/lib/relic.dart b/lib/relic.dart index e1e2b6f..5df7d0f 100644 --- a/lib/relic.dart +++ b/lib/relic.dart @@ -28,6 +28,8 @@ export 'src/middleware/middleware.dart' show Middleware, createMiddleware; export 'src/middleware/middleware_extensions.dart' show MiddlewareExtensions; /// Relic server related exports +export 'src/address/relic_address.dart' show RelicAddress; +export 'dart:io' show InternetAddress; export 'src/relic_server.dart' show RelicServer; export 'src/relic_server_serve.dart' show serve; diff --git a/lib/src/address/relic_address.dart b/lib/src/address/relic_address.dart new file mode 100644 index 0000000..0dfc366 --- /dev/null +++ b/lib/src/address/relic_address.dart @@ -0,0 +1,54 @@ +import 'dart:io'; + +/// A class that represents an address. +abstract final class RelicAddress { + /// Returns the address as an [Object]. + T get address; + + /// Creates a [RelicAddress] from a [String]. + static RelicAddress fromHostname(String hostname) { + return _RelicHostnameAddress(hostname: hostname); + } + + /// Creates a [RelicAddress] from an [InternetAddress]. + static RelicAddress fromInternetAddress( + InternetAddress address, + ) { + return _RelicInternetAddress(internetAddress: address); + } +} + +/// A class that represents a hostname address. +final class _RelicHostnameAddress implements RelicAddress { + /// The hostname of the address. + final String hostname; + + _RelicHostnameAddress({ + required this.hostname, + }); + + /// Returns the address as a [String]. + @override + String get address => hostname; + + @override + String toString() => 'RelicHostnameAddress(hostname: $hostname)'; +} + +/// A class that represents an internet address. +final class _RelicInternetAddress implements RelicAddress { + /// The internet address of the address. + final InternetAddress internetAddress; + + _RelicInternetAddress({ + required this.internetAddress, + }); + + /// Returns the address as an [InternetAddress]. + @override + InternetAddress get address => internetAddress; + + @override + String toString() => + 'RelicInternetAddress(internetAddress: $internetAddress)'; +} diff --git a/lib/src/headers/headers.dart b/lib/src/headers/headers.dart index 5df4ca0..14bb64b 100644 --- a/lib/src/headers/headers.dart +++ b/lib/src/headers/headers.dart @@ -1389,7 +1389,7 @@ final class _HeadersImpl extends Headers { return map; } - /// Date-related headers + /// Date related headers Map get _dateHeadersMap => { Headers.dateHeader: date ?? DateTime.now().toUtc(), Headers.expiresHeader: expires, @@ -1413,7 +1413,7 @@ final class _HeadersImpl extends Headers { accessControlRequestMethod?.value, }; - /// List-related headers + /// String list related headers Map?> get _listStringHeadersMap => ?>{ Headers.viaHeader: via, @@ -1422,7 +1422,7 @@ final class _HeadersImpl extends Headers { Headers.trailerHeader: trailer, }; - /// Uri-related headers + /// Uri related headers Map get _uriHeadersMap => { Headers.locationHeader: location, Headers.refererHeader: referer, @@ -1431,7 +1431,7 @@ final class _HeadersImpl extends Headers { Headers.hostHeader: host, }; - /// TypedHeader-related headers + /// TypedHeader related headers Map get _typedHeadersMap => { Headers.fromHeader: from, Headers.acceptEncodingHeader: acceptEncoding, diff --git a/lib/src/relic_server.dart b/lib/src/relic_server.dart index 77e675e..2008abf 100644 --- a/lib/src/relic_server.dart +++ b/lib/src/relic_server.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:io'; +import 'package:relic/src/address/relic_address.dart'; import 'package:relic/src/body/body.dart'; import 'package:relic/src/hijack/exception/hijack_exception.dart'; import 'package:relic/src/headers/exception/invalid_header_exception.dart'; @@ -50,7 +51,7 @@ class RelicServer { /// Creates a server with the given parameters. static Future createServer( - Object address, + RelicAddress address, int port, { SecurityContext? securityContext, int? backlog, @@ -59,21 +60,21 @@ class RelicServer { String? poweredByHeader, }) async { backlog ??= 0; - var server = switch (securityContext == null) { - true => await HttpServer.bind( - address, - port, - backlog: backlog, - shared: shared, - ), - false => await HttpServer.bindSecure( - address, - port, - securityContext!, - backlog: backlog, - shared: shared, - ), - }; + var server = securityContext == null + ? await HttpServer.bind( + address.address, + port, + backlog: backlog, + shared: shared, + ) + : await HttpServer.bindSecure( + address.address, + port, + securityContext, + backlog: backlog, + shared: shared, + ); + return RelicServer._( server, strictHeaders: strictHeaders, diff --git a/lib/src/relic_server_serve.dart b/lib/src/relic_server_serve.dart index b5589b7..4ab0a37 100644 --- a/lib/src/relic_server_serve.dart +++ b/lib/src/relic_server_serve.dart @@ -20,6 +20,7 @@ library; import 'dart:async'; import 'dart:io' as io; +import 'package:relic/src/address/relic_address.dart'; import 'package:relic/src/relic_server.dart'; import 'handler/handler.dart'; @@ -43,7 +44,7 @@ import 'message/response.dart'; /// {@endtemplate} Future serve( Handler handler, - Object address, + RelicAddress address, int port, { io.SecurityContext? securityContext, int? backlog, diff --git a/pubspec.yaml b/pubspec.yaml index 06f8016..ba861ef 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: convert: ^3.1.1 dev_dependencies: - dart_flutter_team_lints: ^3.0.0 + lints: '>=3.0.0 <5.0.0' http: '>=1.0.0 <2.0.0' test: ^1.24.2 test_descriptor: ^2.0.1 \ No newline at end of file diff --git a/test/headers/basic/access_control_allow_credentials_header_test.dart b/test/headers/basic/access_control_allow_credentials_header_test.dart index cfdb4f7..95cfeb1 100644 --- a/test/headers/basic/access_control_allow_credentials_header_test.dart +++ b/test/headers/basic/access_control_allow_credentials_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -21,19 +20,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -132,19 +119,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/access_control_max_age_header_test.dart b/test/headers/basic/access_control_max_age_header_test.dart index 0d27ae0..34ed6bc 100644 --- a/test/headers/basic/access_control_max_age_header_test.dart +++ b/test/headers/basic/access_control_max_age_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -113,19 +100,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/access_control_request_headers_heder_test.dart b/test/headers/basic/access_control_request_headers_heder_test.dart index 08c8a7e..2afb25e 100644 --- a/test/headers/basic/access_control_request_headers_heder_test.dart +++ b/test/headers/basic/access_control_request_headers_heder_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -15,19 +14,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -130,19 +117,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/age_header_test.dart b/test/headers/basic/age_header_test.dart index cdd98b2..b948d90 100644 --- a/test/headers/basic/age_header_test.dart +++ b/test/headers/basic/age_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -152,19 +139,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/allow_header_test.dart b/test/headers/basic/allow_header_test.dart index e94e400..c9c41fe 100644 --- a/test/headers/basic/allow_header_test.dart +++ b/test/headers/basic/allow_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -12,19 +11,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -123,19 +110,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/content_location_header_test.dart b/test/headers/basic/content_location_header_test.dart index 67499b3..1907084 100644 --- a/test/headers/basic/content_location_header_test.dart +++ b/test/headers/basic/content_location_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -142,19 +129,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/date_header_test.dart b/test/headers/basic/date_header_test.dart index d009ab1..64636e2 100644 --- a/test/headers/basic/date_header_test.dart +++ b/test/headers/basic/date_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -119,19 +106,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/expires_header_test.dart b/test/headers/basic/expires_header_test.dart index fec2570..73a3d2a 100644 --- a/test/headers/basic/expires_header_test.dart +++ b/test/headers/basic/expires_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -119,19 +106,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/host_header_test.dart b/test/headers/basic/host_header_test.dart index 06110ae..dbe635a 100644 --- a/test/headers/basic/host_header_test.dart +++ b/test/headers/basic/host_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -12,19 +11,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -149,19 +136,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/if_modified_since_header_test.dart b/test/headers/basic/if_modified_since_header_test.dart index d2c8eb2..448e351 100644 --- a/test/headers/basic/if_modified_since_header_test.dart +++ b/test/headers/basic/if_modified_since_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -120,19 +107,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/last_modified_header.dart b/test/headers/basic/last_modified_header.dart index bf8f285..ed04a46 100644 --- a/test/headers/basic/last_modified_header.dart +++ b/test/headers/basic/last_modified_header.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -120,19 +107,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/location_header_test.dart b/test/headers/basic/location_header_test.dart index a11c2c3..f85f002 100644 --- a/test/headers/basic/location_header_test.dart +++ b/test/headers/basic/location_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -154,19 +141,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/max_forwards_header_test.dart b/test/headers/basic/max_forwards_header_test.dart index 9eea266..b233220 100644 --- a/test/headers/basic/max_forwards_header_test.dart +++ b/test/headers/basic/max_forwards_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -135,19 +122,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/origin_header_test.dart b/test/headers/basic/origin_header_test.dart index 73ce7f7..6b6bafa 100644 --- a/test/headers/basic/origin_header_test.dart +++ b/test/headers/basic/origin_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -12,19 +11,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -154,19 +141,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/referer_header_test.dart b/test/headers/basic/referer_header_test.dart index 9629824..44e74ce 100644 --- a/test/headers/basic/referer_header_test.dart +++ b/test/headers/basic/referer_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -152,19 +139,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/server_header_test.dart b/test/headers/basic/server_header_test.dart index 18378f5..fac25d3 100644 --- a/test/headers/basic/server_header_test.dart +++ b/test/headers/basic/server_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -12,19 +11,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -91,19 +78,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/trailer_header_test.dart b/test/headers/basic/trailer_header_test.dart index a0f253a..85445c9 100644 --- a/test/headers/basic/trailer_header_test.dart +++ b/test/headers/basic/trailer_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -110,19 +97,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/upgrade_header_test.dart b/test/headers/basic/upgrade_header_test.dart index 9a5a069..fd7e8bf 100644 --- a/test/headers/basic/upgrade_header_test.dart +++ b/test/headers/basic/upgrade_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -135,19 +122,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/user_agent_header_test.dart b/test/headers/basic/user_agent_header_test.dart index 64abe20..342582d 100644 --- a/test/headers/basic/user_agent_header_test.dart +++ b/test/headers/basic/user_agent_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -83,19 +70,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/via_header_test.dart b/test/headers/basic/via_header_test.dart index 6be3371..f3e3b0d 100644 --- a/test/headers/basic/via_header_test.dart +++ b/test/headers/basic/via_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -12,19 +11,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -103,19 +90,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/basic/x_powered_by_header_test.dart b/test/headers/basic/x_powered_by_header_test.dart index 5101602..3a8a9f2 100644 --- a/test/headers/basic/x_powered_by_header_test.dart +++ b/test/headers/basic/x_powered_by_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -12,19 +11,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -79,19 +66,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/custom/custom_headers_test.dart b/test/headers/custom/custom_headers_test.dart index 885edf0..61bb60f 100644 --- a/test/headers/custom/custom_headers_test.dart +++ b/test/headers/custom/custom_headers_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:relic/src/headers/custom/custom_headers.dart'; import 'package:relic/src/relic_server.dart'; import 'package:test/test.dart'; @@ -70,19 +69,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/headers_test_utils.dart b/test/headers/headers_test_utils.dart index 5ed642e..5f89439 100644 --- a/test/headers/headers_test_utils.dart +++ b/test/headers/headers_test_utils.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:relic/relic.dart'; import 'package:http/http.dart' as http; @@ -12,6 +13,27 @@ class BadRequestException implements Exception { ); } +/// Creates a [RelicServer] that listens on the loopback IPv6 address. +/// If the IPv6 address is not available, it will listen on the loopback IPv4 +/// address. +Future createServer({ + required bool strictHeaders, +}) async { + try { + return RelicServer.createServer( + RelicAddress.fromInternetAddress(InternetAddress.loopbackIPv6), + 0, + strictHeaders: strictHeaders, + ); + } on SocketException catch (_) { + return RelicServer.createServer( + RelicAddress.fromInternetAddress(InternetAddress.loopbackIPv4), + 0, + strictHeaders: strictHeaders, + ); + } +} + /// Returns the headers from the server request if the server returns a 200 /// status code. Otherwise, throws an exception. Future getServerRequestHeaders({ diff --git a/test/headers/typed_headers/accept_encoding_header_test.dart b/test/headers/typed_headers/accept_encoding_header_test.dart index cbfe3f9..cbbd4ff 100644 --- a/test/headers/typed_headers/accept_encoding_header_test.dart +++ b/test/headers/typed_headers/accept_encoding_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -312,19 +299,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/accept_header_test.dart b/test/headers/typed_headers/accept_header_test.dart index 1fa8f5f..799b7c5 100644 --- a/test/headers/typed_headers/accept_header_test.dart +++ b/test/headers/typed_headers/accept_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -203,19 +190,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/accept_language_test.dart b/test/headers/typed_headers/accept_language_test.dart index 5ca8894..f32658a 100644 --- a/test/headers/typed_headers/accept_language_test.dart +++ b/test/headers/typed_headers/accept_language_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -334,19 +321,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/accept_ranges_header_test.dart b/test/headers/typed_headers/accept_ranges_header_test.dart index 29fa613..4f93781 100644 --- a/test/headers/typed_headers/accept_ranges_header_test.dart +++ b/test/headers/typed_headers/accept_ranges_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -91,19 +78,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/access_control_allow_headers_header_test.dart b/test/headers/typed_headers/access_control_allow_headers_header_test.dart index 584fe3b..127cc63 100644 --- a/test/headers/typed_headers/access_control_allow_headers_header_test.dart +++ b/test/headers/typed_headers/access_control_allow_headers_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -15,19 +14,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -120,19 +107,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/access_control_allow_methods_header_test.dart b/test/headers/typed_headers/access_control_allow_methods_header_test.dart index bddd61f..d26ddc4 100644 --- a/test/headers/typed_headers/access_control_allow_methods_header_test.dart +++ b/test/headers/typed_headers/access_control_allow_methods_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -15,19 +14,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -136,19 +123,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/access_control_allow_origin_header_test.dart b/test/headers/typed_headers/access_control_allow_origin_header_test.dart index 78912f9..a0d2a50 100644 --- a/test/headers/typed_headers/access_control_allow_origin_header_test.dart +++ b/test/headers/typed_headers/access_control_allow_origin_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -177,19 +164,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/access_control_expose_headers_header_test.dart b/test/headers/typed_headers/access_control_expose_headers_header_test.dart index 101926b..8cc5e27 100644 --- a/test/headers/typed_headers/access_control_expose_headers_header_test.dart +++ b/test/headers/typed_headers/access_control_expose_headers_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -15,19 +14,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -161,19 +148,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/access_control_request_method_header_test.dart b/test/headers/typed_headers/access_control_request_method_header_test.dart index 489624a..74fcd36 100644 --- a/test/headers/typed_headers/access_control_request_method_header_test.dart +++ b/test/headers/typed_headers/access_control_request_method_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:relic/src/method/request_method.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -16,19 +15,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -124,19 +111,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/authorization_header_test.dart b/test/headers/typed_headers/authorization_header_test.dart index 66e09bb..58ddf57 100644 --- a/test/headers/typed_headers/authorization_header_test.dart +++ b/test/headers/typed_headers/authorization_header_test.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'dart:io'; + import 'package:relic/src/headers/typed/headers/authorization_header.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -15,19 +15,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -455,19 +443,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/cache_control_header_test.dart b/test/headers/typed_headers/cache_control_header_test.dart index d045cf6..1aebc05 100644 --- a/test/headers/typed_headers/cache_control_header_test.dart +++ b/test/headers/typed_headers/cache_control_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -310,19 +297,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/clear_site_data_header_test.dart b/test/headers/typed_headers/clear_site_data_header_test.dart index f55122b..74fe2b1 100644 --- a/test/headers/typed_headers/clear_site_data_header_test.dart +++ b/test/headers/typed_headers/clear_site_data_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -133,19 +120,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/connection_header_test.dart b/test/headers/typed_headers/connection_header_test.dart index 828d94d..81b3ab2 100644 --- a/test/headers/typed_headers/connection_header_test.dart +++ b/test/headers/typed_headers/connection_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:relic/src/headers/headers.dart'; import 'package:test/test.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -132,19 +119,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/content_disposition_header_test.dart b/test/headers/typed_headers/content_disposition_header_test.dart index 440aa8b..47f1abd 100644 --- a/test/headers/typed_headers/content_disposition_header_test.dart +++ b/test/headers/typed_headers/content_disposition_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -131,19 +118,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/content_encoding_header_test.dart b/test/headers/typed_headers/content_encoding_header_test.dart index c9205d2..8f0daff 100644 --- a/test/headers/typed_headers/content_encoding_header_test.dart +++ b/test/headers/typed_headers/content_encoding_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -151,19 +138,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/content_language_header_test.dart b/test/headers/typed_headers/content_language_header_test.dart index 695aaca..f102197 100644 --- a/test/headers/typed_headers/content_language_header_test.dart +++ b/test/headers/typed_headers/content_language_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -131,19 +118,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/content_range_header_test.dart b/test/headers/typed_headers/content_range_header_test.dart index 97efe80..69296c3 100644 --- a/test/headers/typed_headers/content_range_header_test.dart +++ b/test/headers/typed_headers/content_range_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -179,19 +166,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/content_security_policy_header_test.dart b/test/headers/typed_headers/content_security_policy_header_test.dart index 1680336..aa6606f 100644 --- a/test/headers/typed_headers/content_security_policy_header_test.dart +++ b/test/headers/typed_headers/content_security_policy_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -107,19 +94,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/cookie_header_test.dart b/test/headers/typed_headers/cookie_header_test.dart index d140c20..6ac70f3 100644 --- a/test/headers/typed_headers/cookie_header_test.dart +++ b/test/headers/typed_headers/cookie_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -11,19 +10,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -209,19 +196,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/cross_origin_embedder_policy_header_test.dart b/test/headers/typed_headers/cross_origin_embedder_policy_header_test.dart index 4cb096a..1c8023b 100644 --- a/test/headers/typed_headers/cross_origin_embedder_policy_header_test.dart +++ b/test/headers/typed_headers/cross_origin_embedder_policy_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -101,19 +88,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/cross_origin_opener_policy_header_test.dart b/test/headers/typed_headers/cross_origin_opener_policy_header_test.dart index 4dc3358..82eb6e4 100644 --- a/test/headers/typed_headers/cross_origin_opener_policy_header_test.dart +++ b/test/headers/typed_headers/cross_origin_opener_policy_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -97,19 +84,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/cross_origin_resource_policy_header_test.dart b/test/headers/typed_headers/cross_origin_resource_policy_header_test.dart index 5141d13..3005099 100644 --- a/test/headers/typed_headers/cross_origin_resource_policy_header_test.dart +++ b/test/headers/typed_headers/cross_origin_resource_policy_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -101,19 +88,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/etag_header_test.dart b/test/headers/typed_headers/etag_header_test.dart index c244167..6a3c9ef 100644 --- a/test/headers/typed_headers/etag_header_test.dart +++ b/test/headers/typed_headers/etag_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -114,19 +101,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/expect_header_test.dart b/test/headers/typed_headers/expect_header_test.dart index 21aebc9..0dbcac2 100644 --- a/test/headers/typed_headers/expect_header_test.dart +++ b/test/headers/typed_headers/expect_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -89,19 +76,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/from_header_test.dart b/test/headers/typed_headers/from_header_test.dart index bfeab71..085189e 100644 --- a/test/headers/typed_headers/from_header_test.dart +++ b/test/headers/typed_headers/from_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -187,19 +174,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/if_match_header_test.dart b/test/headers/typed_headers/if_match_header_test.dart index 99c9b07..7a5f761 100644 --- a/test/headers/typed_headers/if_match_header_test.dart +++ b/test/headers/typed_headers/if_match_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -205,19 +192,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/if_none_match_header_test.dart b/test/headers/typed_headers/if_none_match_header_test.dart index 6e8b6c9..58115fa 100644 --- a/test/headers/typed_headers/if_none_match_header_test.dart +++ b/test/headers/typed_headers/if_none_match_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -205,19 +192,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/if_range_header_test.dart b/test/headers/typed_headers/if_range_header_test.dart index 292dbe1..564ff25 100644 --- a/test/headers/typed_headers/if_range_header_test.dart +++ b/test/headers/typed_headers/if_range_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -133,19 +120,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/permissions_policy_header_test.dart b/test/headers/typed_headers/permissions_policy_header_test.dart index dea2ec8..6ff57da 100644 --- a/test/headers/typed_headers/permissions_policy_header_test.dart +++ b/test/headers/typed_headers/permissions_policy_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -102,19 +89,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/proxy_authenticate_header_test.dart b/test/headers/typed_headers/proxy_authenticate_header_test.dart index e7148fe..2682269 100644 --- a/test/headers/typed_headers/proxy_authenticate_header_test.dart +++ b/test/headers/typed_headers/proxy_authenticate_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -11,19 +10,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -169,19 +156,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/proxy_authorization_header_test.dart b/test/headers/typed_headers/proxy_authorization_header_test.dart index d27dc2d..ab76ff3 100644 --- a/test/headers/typed_headers/proxy_authorization_header_test.dart +++ b/test/headers/typed_headers/proxy_authorization_header_test.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'dart:io'; + import 'package:relic/src/headers/typed/headers/authorization_header.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -15,19 +15,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -455,19 +443,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/range_header_test.dart b/test/headers/typed_headers/range_header_test.dart index efbb9b7..229b98c 100644 --- a/test/headers/typed_headers/range_header_test.dart +++ b/test/headers/typed_headers/range_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -192,19 +179,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/referrer_policy_header_test.dart b/test/headers/typed_headers/referrer_policy_header_test.dart index a10303d..4ae6099 100644 --- a/test/headers/typed_headers/referrer_policy_header_test.dart +++ b/test/headers/typed_headers/referrer_policy_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -95,19 +82,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/retry_after_header_test.dart b/test/headers/typed_headers/retry_after_header_test.dart index ada3f75..a233410 100644 --- a/test/headers/typed_headers/retry_after_header_test.dart +++ b/test/headers/typed_headers/retry_after_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -154,19 +141,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/sec_fetch_dest_header_test.dart b/test/headers/typed_headers/sec_fetch_dest_header_test.dart index c496039..6c9a802 100644 --- a/test/headers/typed_headers/sec_fetch_dest_header_test.dart +++ b/test/headers/typed_headers/sec_fetch_dest_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -95,19 +82,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/sec_fetch_mode_header_test.dart b/test/headers/typed_headers/sec_fetch_mode_header_test.dart index 4b33414..cbbb94c 100644 --- a/test/headers/typed_headers/sec_fetch_mode_header_test.dart +++ b/test/headers/typed_headers/sec_fetch_mode_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -95,19 +82,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/sec_fetch_site_header_test.dart b/test/headers/typed_headers/sec_fetch_site_header_test.dart index 797296b..61d4fe4 100644 --- a/test/headers/typed_headers/sec_fetch_site_header_test.dart +++ b/test/headers/typed_headers/sec_fetch_site_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -95,19 +82,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/set_cookie_header_test.dart b/test/headers/typed_headers/set_cookie_header_test.dart index e377940..0691c6c 100644 --- a/test/headers/typed_headers/set_cookie_header_test.dart +++ b/test/headers/typed_headers/set_cookie_header_test.dart @@ -1,4 +1,5 @@ import 'dart:io'; + import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -11,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -224,19 +213,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/strict_transport_security_header_test.dart b/test/headers/typed_headers/strict_transport_security_header_test.dart index 444bc7f..8640e56 100644 --- a/test/headers/typed_headers/strict_transport_security_header_test.dart +++ b/test/headers/typed_headers/strict_transport_security_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -14,19 +13,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -149,19 +136,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/te_header_test.dart b/test/headers/typed_headers/te_header_test.dart index b7ba2ed..a85c135 100644 --- a/test/headers/typed_headers/te_header_test.dart +++ b/test/headers/typed_headers/te_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -204,19 +191,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/transfer_encoding_header_test.dart b/test/headers/typed_headers/transfer_encoding_header_test.dart index e583645..ef007c1 100644 --- a/test/headers/typed_headers/transfer_encoding_header_test.dart +++ b/test/headers/typed_headers/transfer_encoding_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -126,19 +113,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/vary_header_test.dart b/test/headers/typed_headers/vary_header_test.dart index 4434871..093b23d 100644 --- a/test/headers/typed_headers/vary_header_test.dart +++ b/test/headers/typed_headers/vary_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -129,19 +116,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/headers/typed_headers/www_authenticate_header_test.dart b/test/headers/typed_headers/www_authenticate_header_test.dart index a402777..68b61af 100644 --- a/test/headers/typed_headers/www_authenticate_header_test.dart +++ b/test/headers/typed_headers/www_authenticate_header_test.dart @@ -1,4 +1,3 @@ -import 'dart:io'; import 'package:test/test.dart'; import 'package:relic/src/headers/headers.dart'; import 'package:relic/src/relic_server.dart'; @@ -13,19 +12,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: true, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: true, - ); - } + server = await createServer(strictHeaders: true); }); tearDown(() => server.close()); @@ -199,19 +186,7 @@ void main() { late RelicServer server; setUp(() async { - try { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv6, - 0, - strictHeaders: false, - ); - } on SocketException catch (_) { - server = await RelicServer.createServer( - InternetAddress.loopbackIPv4, - 0, - strictHeaders: false, - ); - } + server = await createServer(strictHeaders: false); }); tearDown(() => server.close()); diff --git a/test/relic_server_serve_test.dart b/test/relic_server_serve_test.dart index e112ebb..715a5eb 100644 --- a/test/relic_server_serve_test.dart +++ b/test/relic_server_serve_test.dart @@ -125,6 +125,7 @@ void main() { Uri.http('localhost:$_serverPort', '/'), ); request.sink.add([1, 2, 3, 4]); + // ignore: unawaited_futures request.sink.close(); var response = await request.send(); @@ -279,10 +280,14 @@ void main() { test('passes asynchronous exceptions to the parent error zone', () async { await runZonedGuarded(() async { - var server = await relic_server.serve((request) { - Future(() => throw StateError('oh no')); - return syncHandler(request); - }, 'localhost', 0); + var server = await relic_server.serve( + (request) { + Future(() => throw StateError('oh no')); + return syncHandler(request); + }, + RelicAddress.fromHostname('localhost'), + 0, + ); var response = await http.get(Uri.http('localhost:${server.port}', '/')); expect(response.statusCode, HttpStatus.ok); @@ -295,10 +300,14 @@ void main() { test("doesn't pass asynchronous exceptions to the root error zone", () async { var response = await Zone.root.run(() async { - var server = await relic_server.serve((request) { - Future(() => throw StateError('oh no')); - return syncHandler(request); - }, 'localhost', 0); + var server = await relic_server.serve( + (request) { + Future(() => throw StateError('oh no')); + return syncHandler(request); + }, + RelicAddress.fromHostname('localhost'), + 0, + ); try { return await http.get(Uri.http('localhost:${server.port}', '/')); @@ -407,7 +416,7 @@ void main() { test('can be set at the server level', () async { _server = await relic_server.serve( syncHandler, - 'localhost', + RelicAddress.fromHostname('localhost'), 0, poweredByHeader: 'ourServer', ); @@ -428,7 +437,7 @@ void main() { ), ); }, - 'localhost', + RelicAddress.fromHostname('localhost'), 0, poweredByHeader: 'ourServer', ); @@ -644,7 +653,7 @@ Future _scheduleServer( assert(_server == null); _server = await relic_server.serve( handler, - 'localhost', + RelicAddress.fromHostname('localhost'), 0, securityContext: securityContext, ); diff --git a/test/relic_server_test.dart b/test/relic_server_test.dart index 39be986..8d1c2b1 100644 --- a/test/relic_server_test.dart +++ b/test/relic_server_test.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:io'; import 'package:http/http.dart' as http; +import 'package:relic/src/address/relic_address.dart'; import 'package:relic/src/relic_server.dart'; import 'package:test/test.dart'; @@ -15,9 +16,15 @@ void main() { setUp(() async { try { - server = await RelicServer.createServer(InternetAddress.loopbackIPv6, 0); + server = await RelicServer.createServer( + RelicAddress.fromInternetAddress(InternetAddress.loopbackIPv6), + 0, + ); } on SocketException catch (_) { - server = await RelicServer.createServer(InternetAddress.loopbackIPv4, 0); + server = await RelicServer.createServer( + RelicAddress.fromInternetAddress(InternetAddress.loopbackIPv4), + 0, + ); } });