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

chore: Small tweaks after making fetch the default request implementation #1610

Merged
Merged
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
12 changes: 7 additions & 5 deletions cypress/e2e/session-recording.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ describe('Session recording', () => {
[/https:\/\/example.com/, 'fetch'],
]

// yay, includes expected type 6 network data
// yay, includes expected network data
expect(capturedRequests.length).to.equal(expectedCaptureds.length)
expectedCaptureds.forEach(([url, initiatorType], index) => {
expect(capturedRequests[index].name).to.match(url)
Expand All @@ -281,7 +281,7 @@ describe('Session recording', () => {
})
})

it('it captures XHR method correctly', () => {
it('it captures XHR/fetch methods correctly', () => {
cy.get('[data-cy-xhr-call-button]').click()
cy.wait('@example.com')
cy.wait('@session-recording')
Expand Down Expand Up @@ -310,11 +310,13 @@ describe('Session recording', () => {
[/https:\/\/example.com/, 'xmlhttprequest'],
]

// yay, includes expected type 6 network data
// yay, includes expected network data
expect(capturedRequests.length).to.equal(expectedCaptureds.length)
expectedCaptureds.forEach(([url, initiatorType], index) => {
expect(capturedRequests[index].name).to.match(url)
expect(capturedRequests[index].initiatorType).to.equal(initiatorType)
const capturedRequest = capturedRequests[index]

expect(capturedRequest.name).to.match(url)
expect(capturedRequest.initiatorType).to.equal(initiatorType)
})

// the HTML file that cypress is operating on (playground/cypress/index.html)
Expand Down
10 changes: 5 additions & 5 deletions src/posthog-core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,8 @@ export class PostHog {
this.compression = includes(config['supportedCompression'], Compression.GZipJS)
? Compression.GZipJS
: includes(config['supportedCompression'], Compression.Base64)
? Compression.Base64
: undefined
? Compression.Base64
: undefined
}

if (config.analytics?.endpoint) {
Expand All @@ -586,8 +586,8 @@ export class PostHog {
person_profiles: this._initialPersonProfilesConfig
? this._initialPersonProfilesConfig
: config['defaultIdentifiedOnly']
? 'identified_only'
: 'always',
? 'identified_only'
: 'always',
})

this.siteApps?.onRemoteConfig(config)
Expand Down Expand Up @@ -1709,7 +1709,7 @@ export class PostHog {
* // Capture rage clicks
* rageclick: true
*
* // transport for sending requests ('XHR' or 'sendBeacon')
* // transport for sending requests ('XHR' | 'fetch' | 'sendBeacon')
* // NB: sendBeacon should only be used for scenarios such as
* // page unload where a "best-effort" attempt to send is
* // acceptable; the sendBeacon API does not support callbacks
Expand Down
13 changes: 6 additions & 7 deletions src/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,18 +218,17 @@ const _sendBeacon = (options: RequestOptions) => {
const AVAILABLE_TRANSPORTS: { transport: RequestOptions['transport']; method: (options: RequestOptions) => void }[] = []

// We add the transports in order of preference

if (XMLHttpRequest) {
if (fetch) {
AVAILABLE_TRANSPORTS.push({
transport: 'XHR',
method: xhr,
transport: 'fetch',
method: _fetch,
})
}

if (fetch) {
if (XMLHttpRequest) {
AVAILABLE_TRANSPORTS.push({
transport: 'fetch',
method: _fetch,
transport: 'XHR',
method: xhr,
})
}

Expand Down
Loading