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.

Sign up for GitHub

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

feat: Fetch support #898

Merged
merged 17 commits into from
Jan 31, 2024
Merged

feat: Fetch support #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4302935
Fixed up window/document access
benjackwhite Nov 15, 2023
0564a68
Fixes
benjackwhite Nov 15, 2023
358e5af
Merge branch 'master' into fix/window-access
benjackwhite Nov 15, 2023
21e4127
Fix
benjackwhite Nov 15, 2023
4dc6e5f
Merge branch 'master' into fix/window-access
benjackwhite Nov 15, 2023
4d23f2d
fix: Allow window to be truly undefined (#895)
benjackwhite Nov 15, 2023
4033893
Attempted to add fetch support
benjackwhite Nov 15, 2023
5f28c2e
Merge branch 'master' into feat/fetch-support
benjackwhite Nov 15, 2023
f0f7c83
Fix
benjackwhite Nov 15, 2023
13659ae
Change
benjackwhite Dec 7, 2023
3cf625b
Merge branch 'master' into feat/fetch-support
benjackwhite Jan 31, 2024
5b6f355
More interop stuff
benjackwhite Jan 31, 2024
c0849ff
Fixes all round
benjackwhite Jan 31, 2024
94a1b3d
Fix up to use the existing `api_transport` config option
benjackwhite Jan 31, 2024
c5a93b6
Fixes
benjackwhite Jan 31, 2024
17aa7ca
Fix up tests
benjackwhite Jan 31, 2024
21be07a
Fixed up send request
benjackwhite Jan 31, 2024
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
4 changes: 0 additions & 4 deletions src/__tests__/extensions/replay/sessionrecording.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@ describe('SessionRecording', () => {
$window_id: 'windowId',
},
{
transport: 'XHR',
method: 'POST',
endpoint: '/s/',
_noTruncate: true,
Expand Down Expand Up @@ -575,7 +574,6 @@ describe('SessionRecording', () => {
},
{
method: 'POST',
transport: 'XHR',
endpoint: '/s/',
_noTruncate: true,
_batchKey: 'recordings',
Expand Down Expand Up @@ -660,7 +658,6 @@ describe('SessionRecording', () => {
},
{
method: 'POST',
transport: 'XHR',
endpoint: '/s/',
_noTruncate: true,
_batchKey: 'recordings',
Expand Down Expand Up @@ -1288,7 +1285,6 @@ describe('SessionRecording', () => {
_noTruncate: true,
endpoint: '/s/',
method: 'POST',
transport: 'XHR',
}
)
expect(sessionRecording['buffer']).toEqual({
Expand Down
18 changes: 9 additions & 9 deletions src/__tests__/retry-queue.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const defaultRequestOptions: CaptureOptions = {
}

describe('RetryQueue', () => {
const onXHRError = jest.fn().mockImplementation(console.error)
const onRequestError = jest.fn().mockImplementation(console.error)
const rateLimiter = new RateLimiter()
let retryQueue: RetryQueue

Expand All @@ -26,7 +26,7 @@ describe('RetryQueue', () => {
})

beforeEach(() => {
retryQueue = new RetryQueue(onXHRError, rateLimiter)
retryQueue = new RetryQueue(onRequestError, rateLimiter)
assignableWindow.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass)
assignableWindow.navigator.sendBeacon = jest.fn()

Expand Down Expand Up @@ -112,7 +112,7 @@ describe('RetryQueue', () => {
expect(retryQueue.queue.length).toEqual(0)

expect(assignableWindow.XMLHttpRequest).toHaveBeenCalledTimes(4)
expect(onXHRError).toHaveBeenCalledTimes(0)
expect(onRequestError).toHaveBeenCalledTimes(0)
})

it('does not process event retry requests when events are rate limited', () => {
Expand Down Expand Up @@ -144,7 +144,7 @@ describe('RetryQueue', () => {
// clears queue
expect(retryQueue.queue.length).toEqual(0)
expect(assignableWindow.XMLHttpRequest).toHaveBeenCalledTimes(1)
expect(onXHRError).toHaveBeenCalledTimes(0)
expect(onRequestError).toHaveBeenCalledTimes(0)
})

it('does not process recording retry requests when they are rate limited', () => {
Expand Down Expand Up @@ -176,7 +176,7 @@ describe('RetryQueue', () => {
// clears queue
expect(retryQueue.queue.length).toEqual(0)
expect(assignableWindow.XMLHttpRequest).toHaveBeenCalledTimes(2)
expect(onXHRError).toHaveBeenCalledTimes(0)
expect(onRequestError).toHaveBeenCalledTimes(0)
})

it('tries to send requests via beacon on unload', () => {
Expand All @@ -201,12 +201,12 @@ describe('RetryQueue', () => {
expect(assignableWindow.navigator.sendBeacon).toHaveBeenCalledTimes(0)
})

it('when you flush the queue onXHRError is passed to xhr', () => {
const xhrSpy = jest.spyOn(SendRequest, 'xhr')
it('when you flush the queue onError is passed to xhr', () => {
const xhrSpy = jest.spyOn(SendRequest, 'request')
enqueueRequests()
retryQueue.flush()
fastForwardTimeAndRunTimer()
expect(xhrSpy).toHaveBeenCalledWith(expect.objectContaining({ onXHRError: onXHRError }))
expect(xhrSpy).toHaveBeenCalledWith(expect.objectContaining({ onError: onRequestError }))
})

it('enqueues requests when offline and flushes immediately when online again', () => {
Expand All @@ -220,7 +220,7 @@ describe('RetryQueue', () => {
// requests aren't attempted when we're offline
expect(assignableWindow.XMLHttpRequest).toHaveBeenCalledTimes(0)
// doesn't log that it is offline from the retry queue
expect(onXHRError).toHaveBeenCalledTimes(0)
expect(onRequestError).toHaveBeenCalledTimes(0)

// queue stays the same
expect(retryQueue.queue.length).toEqual(4)
Expand Down
Loading
Loading