Merge branch 'master' into feat/cancellation

Author: SamJakob

.github/workflows/java.yml

@@ -0,0 +1,67 @@
+name: package:java_http CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+    paths:
+      - 'pkgs/java_http/**'
+      - 'pkgs/http_client_conformance_tests/**'
+      - '.github/workflows/java.yml'
+  pull_request:
+    paths:
+      - 'pkgs/java_http/**'
+      - 'pkgs/http_client_conformance_tests/**'
+      - '.github/workflows/java.yml'
+  schedule:
+    # Runs every Sunday at midnight (00:00 UTC).
+    - cron: "0 0 * * 0"
+
+env:
+  PUB_ENVIRONMENT: bot.github
+
+jobs:
+  analyze:
+    name: Lint and static analysis
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: pkgs/java_http
+    steps:
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - id: install
+        name: Install dependencies
+        run: dart pub get
+
+      - name: Check formatting
+        run: dart format --output=none --set-exit-if-changed .
+        if: always() && steps.install.outcome == 'success'
+
+      - name: Analyze code
+        run: dart analyze --fatal-infos
+        if: always() && steps.install.outcome == 'success'
+
+  test:
+    needs: analyze
+    name: Build and test
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: pkgs/java_http
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Build jni dynamic libraries
+        run: dart run jni:setup
+
+      - name: Run tests
+        run: dart test

.github/workflows/pull_request_label.yml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@0776a679364a9a16110aac8d0f40f5e11009e327
+      - uses: actions/labeler@0967ca812e7fdc8f5f71402a1b486d5bd061fe20
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

pkgs/cronet_http/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 0.2.2
 
 * Require Dart 3.0
+* Throw `ClientException` when the `'Content-Length'` header is invalid.
 
 ## 0.2.1
 

pkgs/cronet_http/lib/src/cronet_client.dart

@@ -21,6 +21,7 @@ import 'package:http/http.dart';
 import 'messages.dart' as messages;
 
 final _api = messages.HttpApi();
+final _digitRegex = RegExp(r'^\d+$');
 
 final Finalizer<String> _cronetEngineFinalizer = Finalizer(_api.freeEngine);
 
@@ -266,11 +267,20 @@ class CronetClient extends BaseClient {
         .cast<String, List<Object?>>()
         .map((key, value) => MapEntry(key.toLowerCase(), value.join(',')));
 
-    final contentLengthHeader = responseHeaders['content-length'];
+    int? contentLength;
+    switch (responseHeaders['content-length']) {
+      case final contentLengthHeader?
+          when !_digitRegex.hasMatch(contentLengthHeader):
+        throw ClientException(
+          'Invalid content-length header [$contentLengthHeader].',
+          request.url,
+        );
+      case final contentLengthHeader?:
+        contentLength = int.parse(contentLengthHeader);
+    }
+
     return StreamedResponse(responseDataController.stream, result.statusCode,
-        contentLength: contentLengthHeader == null
-            ? null
-            : int.tryParse(contentLengthHeader),
+        contentLength: contentLength,
         reasonPhrase: result.statusText,
         request: request,
         isRedirect: result.isRedirect,

pkgs/cronet_http/pubspec.yaml

@@ -1,7 +1,7 @@
 name: cronet_http
 description: >
   An Android Flutter plugin that provides access to the Cronet HTTP client.
-version: 0.2.1
+version: 0.2.2
 repository: https://github.com/dart-lang/http/tree/master/pkgs/cronet_http
 
 environment:

pkgs/cupertino_http/CHANGELOG.md

@@ -1,6 +1,14 @@
 ## 1.1.0
 
 * Add websocket support to `cupertino_api`.
+* Add streaming upload support, i.e., if `CupertinoClient.send()` is called
+  with a `StreamedRequest` then the data will be sent to the server
+  incrementally.
+* Deprecate `Data.fromUint8List` in favor of `Data.fromList`, which accepts
+  any `List<int>`.
+* Disable additional analyses for generated Objective-C bindings to prevent
+  errors from `dart analyze`.
+* Throw `ClientException` when the `'Content-Length'` header is invalid.
 
 ## 1.0.1
 

pkgs/cupertino_http/analysis_options.yaml

@@ -11,12 +11,11 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   group('defaultSessionConfiguration', () {
-    testAll(CupertinoClient.defaultSessionConfiguration,
-        canStreamRequestBody: false);
+    testAll(CupertinoClient.defaultSessionConfiguration);
   });
   group('fromSessionConfiguration', () {
     final config = URLSessionConfiguration.ephemeralSessionConfiguration();
     testAll(() => CupertinoClient.fromSessionConfiguration(config),
-        canStreamRequestBody: false, canWorkInIsolates: false);
+        canWorkInIsolates: false);
   });
 }

pkgs/cupertino_http/example/integration_test/client_conformance_test.dart

@@ -0,0 +1,65 @@
+// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:convert/convert.dart';
+import 'package:crypto/crypto.dart';
+import 'package:cupertino_http/cupertino_http.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart';
+import 'package:integration_test/integration_test.dart';
+
+void testClient(Client client) {
+  group('client tests', () {
+    late HttpServer server;
+    late Uri uri;
+    late List<int> serverHash;
+
+    setUp(() async {
+      server = (await HttpServer.bind('localhost', 0))
+        ..listen((request) async {
+          var hashSink = AccumulatorSink<Digest>();
+          final hashConverter = sha1.startChunkedConversion(hashSink);
+          await request.listen(hashConverter.add).asFuture<void>();
+          hashConverter.close();
+          serverHash = hashSink.events.single.bytes;
+          await request.response.close();
+        });
+      uri = Uri.http('localhost:${server.port}');
+    });
+    tearDown(() {
+      server.close();
+    });
+
+    test('large single item stream', () async {
+      // This tests that `CUPHTTPStreamToNSInputStreamAdapter` correctly
+      // handles calls to `read:maxLength:` where the maximum length
+      // is smaller than the amount of data in the buffer.
+      final size = (Platform.isIOS ? 10 : 100) * 1024 * 1024;
+      final data = Uint8List(size);
+      for (var i = 0; i < data.length; ++i) {
+        data[i] = i % 256;
+      }
+      final request = StreamedRequest('POST', uri);
+      request.sink.add(data);
+      request.sink.close();
+      await client.send(request);
+      expect(serverHash, sha1.convert(data).bytes);
+    });
+  });
+}
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  group('defaultSessionConfiguration', () {
+    testClient(CupertinoClient.defaultSessionConfiguration());
+  });
+  group('fromSessionConfiguration', () {
+    final config = URLSessionConfiguration.ephemeralSessionConfiguration();
+    testClient(CupertinoClient.fromSessionConfiguration(config));
+  });
+}

pkgs/cupertino_http/example/integration_test/client_test.dart

@@ -12,15 +12,15 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   group('empty data', () {
-    final data = Data.fromUint8List(Uint8List(0));
+    final data = Data.fromList(<int>[]);
 
     test('length', () => expect(data.length, 0));
     test('bytes', () => expect(data.bytes, Uint8List(0)));
     test('toString', data.toString); // Just verify that there is no crash.
   });
 
   group('non-empty data', () {
-    final data = Data.fromUint8List(Uint8List.fromList([1, 2, 3, 4, 5]));
+    final data = Data.fromList([1, 2, 3, 4, 5]);
     test('length', () => expect(data.length, 5));
     test(
         'bytes', () => expect(data.bytes, Uint8List.fromList([1, 2, 3, 4, 5])));
@@ -29,12 +29,12 @@ void main() {
 
   group('Data.fromData', () {
     test('from empty', () {
-      final from = Data.fromUint8List(Uint8List(0));
-      expect(Data.fromData(from).bytes, Uint8List.fromList([]));
+      final from = Data.fromList(<int>[]);
+      expect(Data.fromData(from).bytes, Uint8List(0));
     });
 
     test('from non-empty', () {
-      final from = Data.fromUint8List(Uint8List.fromList([1, 2, 3, 4, 5]));
+      final from = Data.fromList([1, 2, 3, 4, 5]);
       expect(Data.fromData(from).bytes, Uint8List.fromList([1, 2, 3, 4, 5]));
     });
   });

pkgs/cupertino_http/example/integration_test/data_test.dart

@@ -2,15 +2,37 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-@Skip('Error tests cannot currently be written. See comments in this file.')
-library;
-
+import 'package:cupertino_http/cupertino_http.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:test/test.dart';
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  // TODO(https://github.com/dart-lang/ffigen/issues/386): Implement tests
-  // when an initializer is callable.
+  group('error', () {
+    test('simple', () {
+      final e = Error.fromCustomDomain('test domain', 123);
+      expect(e.code, 123);
+      expect(e.domain, 'test domain');
+      expect(e.localizedDescription,
+          allOf(contains('test domain'), contains('123')));
+      expect(e.localizedFailureReason, null);
+      expect(e.localizedRecoverySuggestion, null);
+      expect(e.toString(), allOf(contains('test domain'), contains('123')));
+    });
+
+    test('localized description', () {
+      final e = Error.fromCustomDomain('test domain', 123,
+          localizedDescription: 'This is a description');
+      expect(e.code, 123);
+      expect(e.domain, 'test domain');
+      expect(e.localizedDescription, 'This is a description');
+      expect(e.localizedFailureReason, null);
+      expect(e.localizedRecoverySuggestion, null);
+      expect(
+          e.toString(),
+          allOf(contains('test domain'), contains('123'),
+              contains('This is a description')));
+    });
+  });
 }

pkgs/cupertino_http/example/integration_test/error_test.dart

@@ -5,6 +5,7 @@
 import 'package:integration_test/integration_test.dart';
 
 import 'client_conformance_test.dart' as client_conformance_test;
+import 'client_test.dart' as client_test;
 import 'data_test.dart' as data_test;
 import 'error_test.dart' as error_test;
 import 'http_url_response_test.dart' as http_url_response_test;
@@ -27,6 +28,7 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   client_conformance_test.main();
+  client_test.main();
   data_test.main();
   error_test.main();
   http_url_response_test.main();

pkgs/cupertino_http/example/integration_test/main.dart

@@ -21,16 +21,15 @@ void main() {
 
   group('appendBytes', () {
     test('append no bytes', () {
-      final data = MutableData.empty()..appendBytes(Uint8List(0));
+      final data = MutableData.empty()..appendBytes(<int>[]);
       expect(data.bytes, Uint8List(0));
       data.toString(); // Just verify that there is no crash.
     });
 
     test('append some bytes', () {
-      final data = MutableData.empty()
-        ..appendBytes(Uint8List.fromList([1, 2, 3, 4, 5]));
+      final data = MutableData.empty()..appendBytes([1, 2, 3, 4, 5]);
       expect(data.bytes, Uint8List.fromList([1, 2, 3, 4, 5]));
-      data.appendBytes(Uint8List.fromList([6, 7, 8, 9, 10]));
+      data.appendBytes([6, 7, 8, 9, 10]);
       expect(data.bytes, Uint8List.fromList([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]));
       data.toString(); // Just verify that there is no crash.
     });

pkgs/cupertino_http/example/integration_test/mutable_data_test.dart

@@ -47,13 +47,13 @@ void main() {
 
     test('empty', () => expect(request.httpBody, null));
     test('set', () {
-      request.httpBody = Data.fromUint8List(Uint8List.fromList([1, 2, 3]));
+      request.httpBody = Data.fromList([1, 2, 3]);
       expect(request.httpBody!.bytes, Uint8List.fromList([1, 2, 3]));
       request.toString(); // Just verify that there is no crash.
     });
     test('set to null', () {
       request
-        ..httpBody = Data.fromUint8List(Uint8List.fromList([1, 2, 3]))
+        ..httpBody = Data.fromList([1, 2, 3])
         ..httpBody = null;
       expect(request.httpBody, null);
     });

pkgs/cupertino_http/example/integration_test/mutable_url_request_test.dart

@@ -5,7 +5,6 @@
 import 'dart:io';
 
 import 'package:cupertino_http/cupertino_http.dart';
-import 'package:flutter/foundation.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:test/test.dart';
 
@@ -63,8 +62,7 @@ void testWebSocketTask() {
       await task
           .sendMessage(URLSessionWebSocketMessage.fromString('Hello World!'));
       await task.receiveMessage();
-      task.cancelWithCloseCode(
-          4998, Data.fromUint8List(Uint8List.fromList('Bye'.codeUnits)));
+      task.cancelWithCloseCode(4998, Data.fromList('Bye'.codeUnits));
 
       // Allow the server to run and save the close code.
       while (lastCloseCode == null) {
@@ -96,8 +94,8 @@ void testWebSocketTask() {
       final task = session.webSocketTaskWithRequest(
           URLRequest.fromUrl(Uri.parse('ws://localhost:${server.port}')))
         ..resume();
-      await task.sendMessage(URLSessionWebSocketMessage.fromData(
-          Data.fromUint8List(Uint8List.fromList([1, 2, 3]))));
+      await task.sendMessage(
+          URLSessionWebSocketMessage.fromData(Data.fromList([1, 2, 3])));
       final receivedMessage = await task.receiveMessage();
       expect(receivedMessage.type,
           URLSessionWebSocketMessageType.urlSessionWebSocketMessageTypeData);
@@ -221,7 +219,7 @@ void testURLSessionTaskCommon(
           MutableURLRequest.fromUrl(
               Uri.parse('http://localhost:${server.port}/mypath'))
             ..httpMethod = 'POST'
-            ..httpBody = Data.fromUint8List(Uint8List.fromList([1, 2, 3])))
+            ..httpBody = Data.fromList([1, 2, 3]))
         ..prefersIncrementalDelivery = false
         ..priority = 0.2
         ..taskDescription = 'my task description'