mirror of
https://github.com/denoland/deno.git
synced 2024-12-11 10:07:54 -05:00
fix(ext/websocket): don't throw exception when sending to closed socket (#26932)
[The WebSocket specification for the `send` function](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send) says: > The browser will throw an exception if you call `send()` when the connection is in the `CONNECTING` state. If you call `send()` when the connection is in the `CLOSING` or `CLOSED` states, the browser will silently discard the data. and: > ### Exceptions > > `InvalidStateError` [`DOMException`](https://developer.mozilla.org/en-US/docs/Web/API/DOMException) > > Thrown if [`WebSocket.readyState`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/readyState) is `CONNECTING`. This pull request fixes the current behavior to match the specification. Also, I believe it fixes #17586.
This commit is contained in:
parent
5d71b46153
commit
7499525ed0
3 changed files with 22 additions and 3 deletions
|
@ -330,10 +330,14 @@ class WebSocket extends EventTarget {
|
|||
webidl.requiredArguments(arguments.length, 1, prefix);
|
||||
data = webidl.converters.WebSocketSend(data, prefix, "Argument 1");
|
||||
|
||||
if (this[_readyState] !== OPEN) {
|
||||
if (this[_readyState] === CONNECTING) {
|
||||
throw new DOMException("'readyState' not OPEN", "InvalidStateError");
|
||||
}
|
||||
|
||||
if (this[_readyState] !== OPEN) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this[_sendQueue].length === 0) {
|
||||
// Fast path if the send queue is empty, for example when only synchronous
|
||||
// data is being sent.
|
||||
|
|
|
@ -806,3 +806,18 @@ Deno.test("Close connection", async () => {
|
|||
await server.finished;
|
||||
conn.close();
|
||||
});
|
||||
|
||||
Deno.test("send to a closed socket", async () => {
|
||||
const { promise, resolve } = Promise.withResolvers<void>();
|
||||
const ws = new WebSocket("ws://localhost:4242");
|
||||
const blob = new Blob(["foo"]);
|
||||
ws.onerror = () => fail();
|
||||
ws.onopen = () => {
|
||||
ws.close();
|
||||
ws.send(blob);
|
||||
};
|
||||
ws.onclose = () => {
|
||||
resolve();
|
||||
};
|
||||
await promise;
|
||||
});
|
||||
|
|
|
@ -11303,10 +11303,10 @@
|
|||
"006.html?default": true,
|
||||
"006.html?wpt_flags=h2": false,
|
||||
"006.html?wss": false,
|
||||
"007.html?default": false,
|
||||
"007.html?default": true,
|
||||
"007.html?wpt_flags=h2": false,
|
||||
"007.html?wss": false,
|
||||
"008.html?default": false,
|
||||
"008.html?default": true,
|
||||
"008.html?wss": false,
|
||||
"009.html?default": {
|
||||
"ignore": true
|
||||
|
|
Loading…
Reference in a new issue