@@ -14,6 +14,7 @@ import type {
1414 EventCallback ,
1515 EventListener ,
1616} from '../../src/private/webapis/dom/events/EventTarget' ;
17+ import type { IPerformanceLogger } from '../Utilities/createPerformanceLogger' ;
1718
1819import Event from '../../src/private/webapis/dom/events/Event' ;
1920import {
@@ -26,6 +27,8 @@ import ProgressEvent from '../../src/private/webapis/xhr/events/ProgressEvent';
2627import { type EventSubscription } from '../vendor/emitter/EventEmitter' ;
2728
2829const BlobManager = require ( '../Blob/BlobManager' ) . default ;
30+ const GlobalPerformanceLogger =
31+ require ( '../Utilities/GlobalPerformanceLogger' ) . default ;
2932const RCTNetworking = require ( './RCTNetworking' ) . default ;
3033const base64 = require ( 'base64-js' ) ;
3134const invariant = require ( 'invariant' ) ;
@@ -55,17 +58,6 @@ type XHRInterceptor = interface {
5558 loadingFailed ( id : number , error : string ) : void ,
5659} ;
5760
58- /**
59- * Minimal contract for the optional performance logger that callers may attach
60- * via `setPerformanceLogger(...)`. Defined locally so this module stays
61- * self-contained and does not depend on any specific logger implementation.
62- * Any object satisfying these two methods structurally is accepted.
63- */
64- type XHRPerformanceLogger = interface {
65- startTimespan ( key : string ) : void ,
66- stopTimespan ( key : string ) : void ,
67- } ;
68-
6961// The native blob module is optional so inject it here if available.
7062if ( BlobManager . isAvailable ) {
7163 BlobManager . addNetworkingHandler ( ) ;
@@ -175,7 +167,8 @@ class XMLHttpRequest extends EventTarget {
175167 _timedOut : boolean = false ;
176168 _trackingName : ?string ;
177169 _incrementalEvents : boolean = false ;
178- _performanceLogger : ?XHRPerformanceLogger = null ;
170+ _startTime : ?number = null ;
171+ _performanceLogger : IPerformanceLogger = GlobalPerformanceLogger ;
179172
180173 static __setInterceptor_DO_NOT_USE ( interceptor : ?XHRInterceptor ) {
181174 XMLHttpRequest . _interceptor = interceptor ;
@@ -341,10 +334,8 @@ class XMLHttpRequest extends EventTarget {
341334 responseURL : ?string ,
342335 ) : void {
343336 if ( requestId === this . _requestId ) {
344- const performanceLogger = this . _performanceLogger ;
345- if ( this . _perfKey != null && performanceLogger != null ) {
346- performanceLogger . stopTimespan ( this . _perfKey ) ;
347- }
337+ this . _perfKey != null &&
338+ this . _performanceLogger . stopTimespan ( this . _perfKey ) ;
348339 this . status = status ;
349340 this . setResponseHeaders ( responseHeaders ) ;
350341 this . setReadyState ( this . HEADERS_RECEIVED ) ;
@@ -530,15 +521,9 @@ class XMLHttpRequest extends EventTarget {
530521 }
531522
532523 /**
533- * Custom extension that lets callers attach a performance logger receiving
534- * a `network_XMLHttpRequest_<friendlyName>` start/stop timespan around each
535- * dispatched request. The logger only needs to implement
536- * `startTimespan(key)` / `stopTimespan(key)` (see the `XHRPerformanceLogger`
537- * interface above). When no logger is set the timespan is not emitted.
524+ * Custom extension for setting a custom performance logger
538525 */
539- setPerformanceLogger (
540- performanceLogger : XHRPerformanceLogger ,
541- ) : XMLHttpRequest {
526+ setPerformanceLogger ( performanceLogger : IPerformanceLogger ) : XMLHttpRequest {
542527 this . _performanceLogger = performanceLogger ;
543528 return this ;
544529 }
@@ -613,11 +598,9 @@ class XMLHttpRequest extends EventTarget {
613598
614599 const doSend = ( ) => {
615600 const friendlyName = this . _trackingName ?? this . _url ;
616- const performanceLogger = this . _performanceLogger ;
617- if ( performanceLogger != null ) {
618- this . _perfKey = 'network_XMLHttpRequest_' + String ( friendlyName ) ;
619- performanceLogger . startTimespan ( this . _perfKey ) ;
620- }
601+ this . _perfKey = 'network_XMLHttpRequest_' + String ( friendlyName ) ;
602+ this . _performanceLogger . startTimespan ( this . _perfKey ) ;
603+ this . _startTime = performance . now ( ) ;
621604 invariant (
622605 this . _method ,
623606 'XMLHttpRequest method needs to be defined (%s).' ,
0 commit comments