Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
21 changes: 21 additions & 0 deletions sdk/__tests__/NetworkInterceptor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ class FakeXMLHttpRequest {
}
}

removeEventListener(type: string, listener: () => void) {
if (type === 'loadend') {
this.listeners = this.listeners.filter(existing => existing !== listener);
}
}

complete() {
this.readyState = this.DONE;
this.listeners.forEach(listener => listener());
Expand Down Expand Up @@ -111,6 +117,21 @@ describe('NetworkInterceptor', () => {
expect(xhr.listenedTo).not.toContain('progress');
});

it("doesn't keep a response listener per request when an XMLHttpRequest is reused", () => {
const callbacks = createCallbacks();
installNetworkInterceptor(callbacks);

const xhr = new XMLHttpRequest() as unknown as FakeXMLHttpRequest;

for (let i = 0; i < 3; i++) {
xhr.open('GET', 'https://example.com/items');
xhr.send();
xhr.complete();
}

expect(callbacks.onResponse).toHaveBeenCalledTimes(3);
});

it('still opens and sends the request when a callback throws', () => {
installNetworkInterceptor({
onOpen: () => {
Expand Down
6 changes: 6 additions & 0 deletions sdk/__tests__/RealUserMonitor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ class FakeXMLHttpRequest {
}
}

removeEventListener(type: string, listener: () => void) {
if (type === 'loadend') {
this.listeners = this.listeners.filter(existing => existing !== listener);
}
}

complete() {
this.readyState = this.DONE;
this.listeners.forEach(listener => listener());
Expand Down
11 changes: 9 additions & 2 deletions sdk/src/NetworkInterceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,15 @@ const patchXMLHttpRequest = () => {
if (active && fetchCallDepth === 0) {
runSafely('send', () => active.onSend(this));
// loadend rather than readystatechange: in React Native, a readystatechange listener turns on incremental
// response updates from native, which completion alone doesn't need
this.addEventListener('loadend', () => runSafely('response', () => active.onResponse(this)));
// response updates from native, which completion alone doesn't need. The listener removes itself so that an
// XMLHttpRequest reused after abort() doesn't keep one per request; { once: true } can't be used, because React
// Native's XMLHttpRequest.addEventListener drops the options argument
const onLoadEnd = () => {
this.removeEventListener('loadend', onLoadEnd);
runSafely('response', () => active.onResponse(this));
};

this.addEventListener('loadend', onLoadEnd);
}

return (send as (...sendArgs: any[]) => void).apply(this, args);
Expand Down
Loading