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

Calling close in the CONNECTING state should not cause onopen to be called #383

Merged
merged 2 commits into from
Sep 11, 2023
Merged

Calling close in the CONNECTING state should not cause onopen to be called #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29200f7
test: assert that calling `close` in the `CONNECTING` state does not …
steveluscher Sep 8, 2023
693b9bc
fix: bail from the `WebSocket` constructor's delayed setup if the `re…
steveluscher Sep 8, 2023
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
3 changes: 3 additions & 0 deletions src/websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ class WebSocket extends EventTarget {
* registered :-)
*/
delay(function delayCallback() {
if (this.readyState !== WebSocket.CONNECTING) {
return;
}
if (server) {
if (
server.options.verifyClient &&
Expand Down
4 changes: 4 additions & 0 deletions tests/functional/close-algorithm.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ test.cb('that if the readyState is CONNECTING we fail the connection and close',

mockSocket.readyState = WebSocket.CONNECTING;

mockSocket.onopen = () => {
t.fail('open should not have been called');
};

mockSocket.onerror = () => {
t.is(mockSocket.readyState, WebSocket.CLOSED);
};
Expand Down