@@ -11,6 +11,39 @@ const int _versionMinor = 0;
1111const String _tcpSocket = 'tcp' ;
1212const String _udpSocket = 'udp' ;
1313
14+ // Creates a Map conforming to the HttpProfileRequest type defined in the
15+ // dart:io service extension spec from an element of dart:developer's
16+ // [_developerProfilingData].
17+ Future <Map <String , dynamic >> _createHttpProfileRequestFromProfileMap (
18+ Map <String , dynamic > requestProfile,
19+ {required bool ref}) async {
20+ final responseData = requestProfile['responseData' ] as Map <String , dynamic >;
21+
22+ return < String , dynamic > {
23+ 'type' : '${ref ? '@' : '' }HttpProfileRequest' ,
24+ 'id' : requestProfile['id' ]! ,
25+ 'isolateId' : requestProfile['isolateId' ]! ,
26+ 'method' : requestProfile['requestMethod' ]! ,
27+ 'uri' : requestProfile['requestUri' ]! ,
28+ 'events' : requestProfile['events' ]! ,
29+ 'startTime' : requestProfile['requestStartTimestamp' ]! ,
30+ if (requestProfile['requestEndTimestamp' ] != null )
31+ 'endTime' : requestProfile['requestEndTimestamp' ],
32+ 'request' : requestProfile['requestData' ]! ,
33+ 'response' : responseData,
34+ if (! ref && requestProfile['requestEndTimestamp' ] != null )
35+ 'requestBody' :
36+ await (requestProfile['_requestBodyStream' ] as Stream <List <int >>)
37+ .expand ((List <int > i) => i)
38+ .toList (),
39+ if (! ref && responseData['endTime' ] != null )
40+ 'responseBody' :
41+ await (requestProfile['_responseBodyStream' ] as Stream <List <int >>)
42+ .expand ((List <int > i) => i)
43+ .toList (),
44+ };
45+ }
46+
1447@pragma ('vm:entry-point' , ! const bool .fromEnvironment ("dart.vm.product" ))
1548abstract class _NetworkProfiling {
1649 // Http relative RPCs
@@ -43,7 +76,7 @@ abstract class _NetworkProfiling {
4376 }
4477
4578 static Future <ServiceExtensionResponse > _serviceExtensionHandler (
46- String method, Map <String , String > parameters) {
79+ String method, Map <String , String > parameters) async {
4780 try {
4881 String responseJson;
4982 switch (method) {
@@ -54,14 +87,25 @@ abstract class _NetworkProfiling {
5487 responseJson = _getHttpEnableTimelineLogging ();
5588 break ;
5689 case _kGetHttpProfileRPC:
57- responseJson = HttpProfiler .toJson (
58- parameters.containsKey ('updatedSince' )
59- ? int .tryParse (parameters['updatedSince' ]! )
60- : null ,
61- );
90+ final updatedSince = parameters.containsKey ('updatedSince' )
91+ ? int .tryParse (parameters['updatedSince' ]! )
92+ : null ;
93+ responseJson = json.encode ({
94+ 'type' : 'HttpProfile' ,
95+ 'timestamp' : DateTime .now ().microsecondsSinceEpoch,
96+ 'requests' : [
97+ ...HttpProfiler .serializeHttpProfileRequests (updatedSince),
98+ ...await Future .wait (getHttpClientProfilingData ()
99+ .where ((final Map <String , dynamic > p) =>
100+ updatedSince == null ||
101+ (p['_lastUpdateTime' ] as int ) >= updatedSince)
102+ .map ((p) =>
103+ _createHttpProfileRequestFromProfileMap (p, ref: true )))
104+ ],
105+ });
62106 break ;
63107 case _kGetHttpProfileRequestRPC:
64- responseJson = _getHttpProfileRequest (parameters);
108+ responseJson = await _getHttpProfileRequest (parameters);
65109 break ;
66110 case _kClearHttpProfileRPC:
67111 HttpProfiler .clear ();
@@ -80,22 +124,16 @@ abstract class _NetworkProfiling {
80124 responseJson = getVersion ();
81125 break ;
82126 default :
83- return Future .value (
84- ServiceExtensionResponse .error (
85- ServiceExtensionResponse .extensionError,
86- 'Method $method does not exist' ,
87- ),
127+ return ServiceExtensionResponse .error (
128+ ServiceExtensionResponse .extensionError,
129+ 'Method $method does not exist' ,
88130 );
89131 }
90- return Future .value (
91- ServiceExtensionResponse .result (responseJson),
92- );
132+ return ServiceExtensionResponse .result (responseJson);
93133 } catch (errorMessage) {
94- return Future .value (
95- ServiceExtensionResponse .error (
96- ServiceExtensionResponse .invalidParams,
97- errorMessage.toString (),
98- ),
134+ return ServiceExtensionResponse .error (
135+ ServiceExtensionResponse .invalidParams,
136+ errorMessage.toString (),
99137 );
100138 }
101139 }
@@ -134,19 +172,26 @@ String _setHttpEnableTimelineLogging(Map<String, String> parameters) {
134172 return _success ();
135173}
136174
137- String _getHttpProfileRequest (Map <String , String > parameters) {
175+ Future < String > _getHttpProfileRequest (Map <String , String > parameters) async {
138176 if (! parameters.containsKey ('id' )) {
139177 throw _missingArgument ('id' );
140178 }
141- String id = parameters['id' ]! ;
179+ final id = parameters['id' ]! ;
180+ final request;
181+ if (id.startsWith ('from_package/' )) {
182+ final profileMap = getHttpClientProfilingData ()
183+ .elementAtOrNull (int .parse (id.substring ('from_package/' .length)) - 1 );
184+ request = profileMap == null
185+ ? null
186+ : await _createHttpProfileRequestFromProfileMap (profileMap, ref: false );
187+ } else {
188+ request = HttpProfiler .getHttpProfileRequest (id)? .toJson (ref: false );
189+ }
142190
143- final request = HttpProfiler .getHttpProfileRequest (id);
144191 if (request == null ) {
145192 throw "Unable to find request with id: '$id '" ;
146193 }
147- return json.encode (
148- request.toJson (ref: false ),
149- );
194+ return json.encode (request);
150195}
151196
152197String _socketProfilingEnabled (Map <String , String > parameters) {
0 commit comments