Merge branch 'master' into master

Author: tlueder

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 0.13.4-dev
 
 * Add `onSendProgress` callback
+* Throw a more useful error when a client is used after it has been closed.
 
 ## 0.13.3
 

README.md

@@ -30,9 +30,12 @@ If you do this, make sure to close the client when you're done:
 ```dart
 var client = http.Client();
 try {
-  var uriResponse = await client.post(Uri.parse('https://example.com/whatsit/create'),
+  var response = await client.post(
+      Uri.https('example.com', 'whatsit/create'),
       body: {'name': 'doodle', 'color': 'blue'});
-  print(await client.get(uriResponse.bodyFields['uri']));
+  var decodedResponse = jsonDecode(utf8.decode(response.bodyBytes)) as Map;
+  var uri = Uri.parse(decodedResponse['uri'] as String);
+  print(await client.get(uri));
 } finally {
   client.close();
 }

analysis_options.yaml

@@ -1,10 +1,8 @@
-include: package:pedantic/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
     implicit-casts: false
-  enable-experiment:
-  - non-nullable
 
 linter:
   rules:

lib/src/browser_client.dart

@@ -6,14 +6,13 @@ import 'dart:async';
 import 'dart:html';
 import 'dart:typed_data';
 
-import 'package:pedantic/pedantic.dart' show unawaited;
-
 import 'base_client.dart';
 import 'base_request.dart';
 import 'byte_stream.dart';
 import 'exception.dart';
 import 'progress.dart';
 import 'streamed_response.dart';
+import 'utils.dart' show unawaited;
 
 /// Create a [BrowserClient].
 ///

lib/src/byte_stream.dart

@@ -13,7 +13,7 @@ class ByteStream extends StreamView<List<int>> {
   /// Returns a single-subscription byte stream that will emit the given bytes
   /// in a single chunk.
   factory ByteStream.fromBytes(List<int> bytes) =>
-      ByteStream(Stream.fromIterable([bytes]));
+      ByteStream(Stream.value(bytes));
 
   /// Collects the data of this stream in a [Uint8List].
   Future<Uint8List> toBytes() {

lib/src/io_client.dart

@@ -28,6 +28,11 @@ class IOClient extends BaseClient {
     BaseRequest request, {
     Progress? onSendProgress,
   }) async {
+    if (_inner == null) {
+      throw ClientException(
+          'HTTP request failed. Client is already closed.', request.url);
+    }
+
     var stream = request.finalize();
 
     try {

lib/src/utils.dart

@@ -74,3 +74,6 @@ Stream<T> onDone<T>(Stream<T> stream, void Function() onDone) =>
       sink.close();
       onDone();
     }));
+
+// TODO: Remove after Dart 2.14 is stable
+void unawaited<T>(Future<T> future) {}

pubspec.yaml

@@ -11,9 +11,9 @@ dependencies:
   http_parser: ^4.0.0
   meta: ^1.3.0
   path: ^1.8.0
-  pedantic: ^1.10.0
 
 dev_dependencies:
   fake_async: ^1.2.0
+  lints: ^1.0.0
   shelf: ^1.1.0
   test: ^1.16.0

test/io/http_test.dart

@@ -375,17 +375,16 @@ void main() {
       expect(response.statusCode, equals(200));
       expect(
           response.body,
-          parse(equals({
-            'method': 'DELETE',
-            'path': '/',
-            'headers': {
-              'content-length': ['0'],
-              'accept-encoding': ['gzip'],
-              'user-agent': ['Dart'],
-              'x-random-header': ['Value'],
-              'x-other-header': ['Other Value']
-            }
-          })));
+          parse(allOf(
+              containsPair('method', 'DELETE'),
+              containsPair('path', '/'),
+              containsPair(
+                  'headers',
+                  allOf(
+                      containsPair('accept-encoding', ['gzip']),
+                      containsPair('user-agent', ['Dart']),
+                      containsPair('x-random-header', ['Value']),
+                      containsPair('x-other-header', ['Other Value']))))));
     });
 
     test('read', () async {

test/io/utils.dart

@@ -7,7 +7,6 @@ import 'dart:io';
 
 import 'package:http/http.dart';
 import 'package:http/src/utils.dart';
-import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 
 export '../utils.dart';

test/response_test.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:http/http.dart' as http;
-import 'package:pedantic/pedantic.dart';
+import 'package:http/src/utils.dart' show unawaited;
 import 'package:test/test.dart';
 
 void main() {