Nils Andreas Svee
7bea3dd54e
Rename the application Cargo package from irtt-cli to irtt-rs (crates/irtt-cli -> crates/irtt-app), and hard-rename its scriptable client binary from irtt-cli to irtt-client, now that the application also ships a first-class server and the old name reads as an umbrella CLI for both roles. Give each dedicated binary (irtt-client, irtt-tui, irtt-server) its own entry point instead of funneling through the multicall dispatcher's argv0/subcommand logic, so a dedicated binary only links the applet code for the role it implements and always runs that role regardless of the name it's invoked or copied under. irtt-rs remains the feature-selectable multicall dispatcher and is now the only binary that inspects argv0 or subcommands. Move future application releases to the irtt-rs/vX.Y.Z tag namespace (regenerated via `dist generate`), and bump the application package to 0.6.0 as a breaking distribution change. Library crate versions are unaffected.
75 lines
2.3 KiB
Rust
75 lines
2.3 KiB
Rust
use std::{
|
|
net::{IpAddr, Ipv4Addr, SocketAddr},
|
|
sync::mpsc,
|
|
thread::{self, JoinHandle},
|
|
time::Duration,
|
|
};
|
|
|
|
use irtt_server::{Server, ServerConfig};
|
|
use tokio::sync::oneshot;
|
|
|
|
const STARTUP_TIMEOUT: Duration = Duration::from_secs(2);
|
|
|
|
pub struct InTreeServer {
|
|
pub addr: SocketAddr,
|
|
shutdown: Option<oneshot::Sender<()>>,
|
|
done: Option<JoinHandle<Result<(), irtt_server::ServerRuntimeError>>>,
|
|
}
|
|
|
|
impl InTreeServer {
|
|
pub fn start() -> Self {
|
|
let (startup_tx, startup_rx) = mpsc::sync_channel(1);
|
|
let (shutdown_tx, shutdown_rx) = oneshot::channel();
|
|
let done = thread::spawn(move || {
|
|
let runtime = tokio::runtime::Builder::new_current_thread()
|
|
.enable_all()
|
|
.build()
|
|
.expect("failed to build in-tree test server runtime");
|
|
runtime.block_on(async move {
|
|
let bind_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 0);
|
|
let mut server = Server::bind(bind_addr, ServerConfig::default()).await?;
|
|
startup_tx
|
|
.send(server.local_addr()?)
|
|
.expect("test stopped waiting for in-tree server startup");
|
|
server
|
|
.run(async {
|
|
let _ = shutdown_rx.await;
|
|
})
|
|
.await
|
|
})
|
|
});
|
|
|
|
let addr = match startup_rx.recv_timeout(STARTUP_TIMEOUT) {
|
|
Ok(addr) => addr,
|
|
Err(error) => {
|
|
let _ = shutdown_tx.send(());
|
|
let result = done.join().expect("in-tree test server thread panicked");
|
|
panic!("in-tree test server failed before startup ({error}): {result:?}");
|
|
}
|
|
};
|
|
|
|
Self {
|
|
addr,
|
|
shutdown: Some(shutdown_tx),
|
|
done: Some(done),
|
|
}
|
|
}
|
|
|
|
fn stop(&mut self) {
|
|
if let Some(shutdown) = self.shutdown.take() {
|
|
let _ = shutdown.send(());
|
|
}
|
|
if let Some(done) = self.done.take() {
|
|
done.join()
|
|
.expect("in-tree test server thread panicked")
|
|
.expect("in-tree test server stopped with an error");
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Drop for InTreeServer {
|
|
fn drop(&mut self) {
|
|
self.stop();
|
|
}
|
|
}
|