foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/flash): fix listening port (#15519)

Browse source
This commit is contained in:
Yoshiya Hinosawa 2022-08-21 21:27:14 +09:00 committed by GitHub
parent 906aa78af3
commit fb2aeb79a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cli/tests/unit/flash_test.ts
View file

@ -72,6 +72,23 @@ Deno.test({ permissions: { net: true } }, async function httpServerBasic() {
await server;
});
Deno.test({ permissions: { net: true } }, async function httpServerPort0() {
const ac = new AbortController();
const server = Deno.serve({
fetch() {
return new Response("Hello World");
},
port: 0,
signal: ac.signal,
onListen({ port }) {
assert(port > 0 && port < 65536);
ac.abort();
},
});
await server;
});
// https://github.com/denoland/deno/issues/15107
Deno.test(
{ permissions: { net: true } },

4
ext/flash/01_http.js
View file

@ -216,8 +216,8 @@
const serverId = core.ops.op_flash_serve(opts);
const serverPromise = core.opAsync("op_flash_drive_server", serverId);
core.opAsync("op_flash_wait_for_listening", serverId).then(() => {
onListen({ hostname: opts.hostname, port: opts.port });
core.opAsync("op_flash_wait_for_listening", serverId).then((port) => {
onListen({ hostname: opts.hostname, port });
});
const server = {

14
ext/flash/lib.rs
View file

@ -76,7 +76,7 @@ pub struct ServerContext {
rx: mpsc::Receiver<Request>,
requests: HashMap<u32, Request>,
next_token: u32,
listening_rx: Option<mpsc::Receiver<()>>,
listening_rx: Option<mpsc::Receiver<u16>>,
close_tx: mpsc::Sender<()>,
cancel_handle: Rc<CancelHandle>,
}
@ -939,7 +939,7 @@ pub struct ListenOpts {
fn run_server(
tx: mpsc::Sender<Request>,
listening_tx: mpsc::Sender<()>,
listening_tx: mpsc::Sender<u16>,
mut close_rx: mpsc::Receiver<()>,
addr: SocketAddr,
maybe_cert: Option<String>,
@ -971,7 +971,9 @@ fn run_server(
}
};
listening_tx.blocking_send(()).unwrap();
listening_tx
.blocking_send(listener.local_addr().unwrap().port())
.unwrap();
let mut sockets = HashMap::with_capacity(1000);
let mut counter: usize = 1;
let mut events = Events::with_capacity(1024);
@ -1274,7 +1276,7 @@ where
fn op_flash_wait_for_listening(
state: &mut OpState,
server_id: u32,
) -> Result<impl Future<Output = Result<(), AnyError>> + 'static, AnyError> {
) -> Result<impl Future<Output = Result<u16, AnyError>> + 'static, AnyError> {
let mut listening_rx = {
let flash_ctx = state.borrow_mut::<FlashContext>();
let server_ctx = flash_ctx
@ -1284,8 +1286,8 @@ fn op_flash_wait_for_listening(
server_ctx.listening_rx.take().unwrap()
};
Ok(async move {
listening_rx.recv().await;
Ok(())
let port = listening_rx.recv().await.unwrap();
Ok(port)
})
}