Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkgs/ok_http: DevTools Networking Support. #1242

Merged
merged 6 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
pkgs/ok_http: add http profile to provide network inspector integration
  • Loading branch information
Anikate-De committed Jun 23, 2024
commit 8f16111b9e5224708b2e4277f308fc4ee13134d4
70 changes: 62 additions & 8 deletions pkgs/ok_http/lib/src/ok_http_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import 'dart:async';
import 'dart:typed_data';

import 'package:http/http.dart';
import 'package:http_profile/http_profile.dart';
import 'package:jni/jni.dart';

import 'jni/bindings.dart' as bindings;
Expand Down Expand Up @@ -78,20 +79,57 @@ class OkHttpClient extends BaseClient {
_isClosed = true;
}

HttpClientRequestProfile? _createProfile(BaseRequest request) =>
HttpClientRequestProfile.profile(
requestStartTime: DateTime.now(),
requestMethod: request.method,
requestUri: request.url.toString());

void addProfileError(HttpClientRequestProfile? profile, String error) {
if (profile != null) {
if (profile.requestData.endTime == null) {
profile.requestData.closeWithError(error.toString());
} else {
profile.responseData.closeWithError(error.toString());
}
}
}

@override
Future<StreamedResponse> send(BaseRequest request) async {
if (_isClosed) {
throw ClientException(
'HTTP request failed. Client is already closed.', request.url);
}

final profile = _createProfile(request);
profile?.connectionInfo = {
'package': 'package:ok_http',
'client': 'OkHttpClient',
};

profile?.requestData
?..contentLength = request.contentLength
..followRedirects = request.followRedirects
..headersCommaValues = request.headers
..maxRedirects = request.maxRedirects;

if (profile != null && request.contentLength != null) {
profile.requestData.headersListValues = {
'Content-Length': ['${request.contentLength}'],
...profile.requestData.headers!
};
}

var requestUrl = request.url.toString();
var requestHeaders = request.headers;
var requestMethod = request.method;
var requestBody = await request.finalize().toBytes();
var maxRedirects = request.maxRedirects;
var followRedirects = request.followRedirects;

profile?.requestData.bodySink.add(requestBody);

final responseCompleter = Completer<StreamedResponse>();

var reqBuilder = bindings.Request_Builder().url1(requestUrl.toJString());
Expand Down Expand Up @@ -161,17 +199,23 @@ class OkHttpClient extends BaseClient {
responseBodyByteStream,
bindings.DataCallback.implement(
bindings.$DataCallbackImpl(
onDataRead: (JArray<jbyte> data) {
respBodyStreamController.sink.add(data.toUint8List());
onDataRead: (JArray<jbyte> bytesRead) {
var data = bytesRead.toUint8List();

respBodyStreamController.sink.add(data);
profile?.responseData.bodySink.add(data);
},
onFinished: () async {
reader.shutdown();
await respBodyStreamController.sink.close();
await profile?.responseData.close();
},
onError: (iOException) async {
respBodyStreamController.sink.addError(
ClientException(iOException.toString(), request.url));

addProfileError(profile, iOException.toString());

reader.shutdown();
await respBodyStreamController.sink.close();
},
Expand All @@ -188,15 +232,25 @@ class OkHttpClient extends BaseClient {
contentLength: contentLength,
isRedirect: response.isRedirect(),
));

profile?.requestData.close();
profile?.responseData
?..contentLength = contentLength
..headersCommaValues = responseHeaders
..isRedirect = false
..reasonPhrase =
response.message().toDartString(releaseOriginal: true)
..startTime = DateTime.now()
..statusCode = response.code();
},
onFailure: (bindings.Call call, JObject ioException) {
if (ioException.toString().contains('Redirect limit exceeded')) {
responseCompleter.completeError(
ClientException('Redirect limit exceeded', request.url));
return;
var msg = ioException.toString();
if (msg.contains('Redirect limit exceeded')) {
msg = 'Redirect limit exceeded';
}
responseCompleter.completeError(
ClientException(ioException.toString(), request.url));

responseCompleter.completeError(ClientException(msg, request.url));
addProfileError(profile, msg);
},
)));

Expand Down
3 changes: 2 additions & 1 deletion pkgs/ok_http/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ publish_to: none

environment:
sdk: ^3.4.0
flutter: '>=3.22.0'
flutter: ">=3.22.0"

dependencies:
flutter:
sdk: flutter
http: ^1.2.1
http_profile: ^0.1.0
jni: ^0.9.2
plugin_platform_interface: ^2.0.2

Expand Down