-
Notifications
You must be signed in to change notification settings - Fork 4
fix: close WebSocket on pagehide to support bfcache #162
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7c31547
fix: close WebSocket on pagehide to support bfcache
FeironoX5 715f016
fix: lint
FeironoX5 8e22ce4
fix: remove log
FeironoX5 403cc47
chore: add socket test
FeironoX5 187eab4
chore: update version
FeironoX5 1935f21
fix: test update for better clarity
FeironoX5 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import { describe, it, expect, afterEach, vi } from 'vitest'; | ||
| import Socket from '../src/modules/socket'; | ||
| import type { CatcherMessage } from '@hawk.so/types'; | ||
|
|
||
| const MOCK_WEBSOCKET_URL = 'ws://localhost:1234'; | ||
|
|
||
| type MockWebSocket = { | ||
| url: string; | ||
| readyState: number; | ||
| send: ReturnType<typeof vi.fn>; | ||
| close: ReturnType<typeof vi.fn>; | ||
| onopen?: (event: Event) => void; | ||
| onclose?: (event: CloseEvent) => void; | ||
| onerror?: (event: Event) => void; | ||
| onmessage?: (event: MessageEvent) => void; | ||
| }; | ||
|
|
||
| describe('Socket', () => { | ||
| afterEach(() => { | ||
| vi.restoreAllMocks(); | ||
| }); | ||
|
|
||
| it('should close websocket on pagehide and recreate connection on next send()', async () => { | ||
| const closeSpy = vi.fn(function (this: MockWebSocket) { | ||
| this.readyState = WebSocket.CLOSED; | ||
| this.onclose?.({ code: 1000 } as CloseEvent); | ||
| }); | ||
|
|
||
| let webSocket!: MockWebSocket; | ||
| const WebSocketConstructor = vi.fn<(url: string) => void>().mockImplementation(function ( | ||
| this: MockWebSocket, | ||
| url: string | ||
| ) { | ||
| this.url = url; | ||
| this.readyState = WebSocket.CONNECTING; | ||
| this.send = vi.fn(); | ||
| this.close = closeSpy; | ||
| this.onopen = undefined; | ||
| this.onclose = undefined; | ||
| this.onerror = undefined; | ||
| this.onmessage = undefined; | ||
| webSocket = this; | ||
| }); | ||
| globalThis.WebSocket = WebSocketConstructor; | ||
|
|
||
| const addEventListenerSpy = vi.spyOn(window, 'addEventListener'); | ||
| const removeEventListenerSpy = vi.spyOn(window, 'removeEventListener'); | ||
|
|
||
| // initialize socket and open fake websocket connection | ||
| const socket = new Socket({ collectorEndpoint: MOCK_WEBSOCKET_URL }); | ||
| webSocket.readyState = WebSocket.OPEN; | ||
| webSocket.onopen?.(new Event('open')); | ||
|
|
||
| // capture pagehide handler to verify it's properly removed | ||
| const pagehideCall = addEventListenerSpy.mock.calls.find(([event]) => event === 'pagehide'); | ||
| expect(pagehideCall).toBeDefined(); | ||
| const pagehideHandler = pagehideCall![1] as EventListener; | ||
|
|
||
| // trigger pagehide event | ||
| window.dispatchEvent(new Event('pagehide')); | ||
|
|
||
| // websocket connection should be closed | ||
| expect(closeSpy).toHaveBeenCalledOnce(); | ||
| expect(removeEventListenerSpy).toHaveBeenCalledWith('pagehide', pagehideHandler, { capture: true }); | ||
|
|
||
| // send socket method should make websocket reconnect | ||
| const sendPromise = socket.send({ foo: 'bar' } as CatcherMessage); | ||
| webSocket.readyState = WebSocket.OPEN; | ||
| webSocket.onopen?.(new Event('open')); | ||
| await sendPromise; | ||
|
|
||
| expect(WebSocketConstructor).toHaveBeenCalledTimes(2); | ||
| }); | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.