mirror of
https://github.com/denoland/deno.git
synced 2024-11-29 16:30:56 -05:00
a411144219
Fixes https://github.com/denoland/deno/issues/18700 Timeline of the events that lead to the bug. 1. WebSocket handshake complete 2. Server on `read_frame` holding an AsyncRefCell borrow of the WebSocket stream. 3. Client sends a TXT frame after a some time 4. Server recieves the frame and goes back to `read_frame`. 5. After some time, Server starts a `write_frame` but `read_frame` is still holding a borrow! ^--- Locked. read_frame needs to complete so we can resume the write. This commit changes all writes to directly borrow the `fastwebsocket::WebSocket` resource under the assumption that it won't affect ongoing reads.
84 lines
2.3 KiB
TypeScript
84 lines
2.3 KiB
TypeScript
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
import { assertEquals, assertThrows, deferred, fail } from "./test_util.ts";
|
|
|
|
Deno.test({ permissions: "none" }, function websocketPermissionless() {
|
|
assertThrows(
|
|
() => new WebSocket("ws://localhost"),
|
|
Deno.errors.PermissionDenied,
|
|
);
|
|
});
|
|
|
|
Deno.test(async function websocketConstructorTakeURLObjectAsParameter() {
|
|
const promise = deferred();
|
|
const ws = new WebSocket(new URL("ws://localhost:4242/"));
|
|
assertEquals(ws.url, "ws://localhost:4242/");
|
|
ws.onerror = () => fail();
|
|
ws.onopen = () => ws.close();
|
|
ws.onclose = () => {
|
|
promise.resolve();
|
|
};
|
|
await promise;
|
|
});
|
|
|
|
// https://github.com/denoland/deno/pull/17762
|
|
// https://github.com/denoland/deno/issues/17761
|
|
Deno.test(async function websocketPingPong() {
|
|
const promise = deferred();
|
|
const ws = new WebSocket("ws://localhost:4245/");
|
|
assertEquals(ws.url, "ws://localhost:4245/");
|
|
ws.onerror = () => fail();
|
|
ws.onmessage = (e) => {
|
|
ws.send(e.data);
|
|
};
|
|
ws.onclose = () => {
|
|
promise.resolve();
|
|
};
|
|
await promise;
|
|
ws.close();
|
|
});
|
|
|
|
// https://github.com/denoland/deno/issues/18700
|
|
Deno.test(
|
|
{ sanitizeOps: false, sanitizeResources: false },
|
|
async function websocketWriteLock() {
|
|
const ac = new AbortController();
|
|
const listeningPromise = deferred();
|
|
|
|
const server = Deno.serve({
|
|
handler: (req) => {
|
|
const { socket, response } = Deno.upgradeWebSocket(req);
|
|
socket.onopen = function () {
|
|
setTimeout(() => socket.send("Hello"), 500);
|
|
};
|
|
socket.onmessage = function (e) {
|
|
assertEquals(e.data, "Hello");
|
|
ac.abort();
|
|
};
|
|
return response;
|
|
},
|
|
signal: ac.signal,
|
|
onListen: () => listeningPromise.resolve(),
|
|
hostname: "localhost",
|
|
port: 4246,
|
|
});
|
|
|
|
await listeningPromise;
|
|
const promise = deferred();
|
|
const ws = new WebSocket("ws://localhost:4246/");
|
|
assertEquals(ws.url, "ws://localhost:4246/");
|
|
ws.onerror = () => fail();
|
|
ws.onmessage = (e) => {
|
|
assertEquals(e.data, "Hello");
|
|
setTimeout(() => {
|
|
ws.send(e.data);
|
|
}, 1000);
|
|
promise.resolve();
|
|
};
|
|
ws.onclose = () => {
|
|
promise.resolve();
|
|
};
|
|
|
|
await Promise.all([promise, server]);
|
|
ws.close();
|
|
},
|
|
);
|