language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-26 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(ext/websocket): cancel in-flight handshake on close() (#28598)

Browse source 
Fixes https://github.com/denoland/deno/issues/25126

---------

Co-authored-by: Ryan Dahl <ry@tinyclouds.org>
This commit is contained in:
Divy Srivastava 2025-03-27 20:43:32 -07:00 • committed by GitHub
parent f42b39d2cf
commit 66e03a39a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 92 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ext/websocket/01_websocket.js
View file

@ -116,6 +116,7 @@ const _binaryType = Symbol("[[binaryType]]");
const _eventLoop = Symbol("[[eventLoop]]");
const _sendQueue = Symbol("[[sendQueue]]");
const _queueSend = Symbol("[[queueSend]]");
const _cancelHandle = Symbol("[[cancelHandle]]");
const _server = Symbol("[[server]]");
const _idleTimeoutDuration = Symbol("[[idleTimeout]]");
@ -136,6 +137,7 @@ class WebSocket extends EventTarget {
this[_idleTimeoutDuration] = 0;
this[_idleTimeoutTimeout] = undefined;
this[_sendQueue] = [];
this[_cancelHandle] = undefined;
const prefix = "Failed to construct 'WebSocket'";
webidl.requiredArguments(arguments.length, 1, prefix);
@ -177,12 +179,6 @@ class WebSocket extends EventTarget {
this[_url] = wsURL.href;
this[_role] = CLIENT;
op_ws_check_permission_and_cancel_handle(
"WebSocket.abort()",
this[_url],
false,
);
if (typeof protocols === "string") {
protocols = [protocols];
}
@ -214,11 +210,20 @@ class WebSocket extends EventTarget {
);
}
const cancelRid = op_ws_check_permission_and_cancel_handle(
"WebSocket.abort()",
this[_url],
true,
);
this[_cancelHandle] = cancelRid;
PromisePrototypeThen(
op_ws_create(
"new WebSocket()",
wsURL.href,
ArrayPrototypeJoin(protocols, ", "),
cancelRid,
),
(create) => {
this[_rid] = create.rid;
@ -256,6 +261,12 @@ class WebSocket extends EventTarget {
);
this.dispatchEvent(errorEv);
if (this[_cancelHandle]) {
core.tryClose(this[_cancelHandle]);
this[_cancelHandle] = undefined;
}
const closeEv = new CloseEvent("close");
this.dispatchEvent(closeEv);
},
@ -397,6 +408,13 @@ class WebSocket extends EventTarget {
);
}
if (this[_cancelHandle]) {
// Cancel ongoing handshake.
core.tryClose(this[_cancelHandle]);
this[_cancelHandle] = undefined;
}
if (this[_readyState] === CONNECTING) {
this[_readyState] = CLOSING;
} else if (this[_readyState] === OPEN) {