mollusk
6ad92081aa
Scaffolding for PixelPass per ~/Documents/p2p-screenshare-plan.md §7 "Phase 1 — MVP". The full QUIC tunnel handshake works end-to-end (verified locally: host generates ticket, viewer dials through iroh's relay, open_bi succeeds, lazy capture is wired correctly). What's implemented: - Cargo project with deps locked: iroh 1.0.0-rc.0, iroh-tickets, tokio, clap, ashpd, pipewire-rs, x11rb, ashpd, anyhow, thiserror, tracing, nix, directories, uuid. - src/cli.rs: complete clap surface per plan §6 (--window, --app, --mic, --display-server, --bitrate, --framerate, --no-hwencode, --low-latency, --port, --verbose, --repair). - Mode dispatch in main.rs: EndpointTicket::from_str is the authoritative check; no regex / heuristics. - common/display.rs: WAYLAND_DISPLAY → DISPLAY → XDG_SESSION_TYPE precedence with --display-server override. - common/deps.rs: per-distro install hints (pacman/apt/dnf/zypper) parsing /etc/os-release. - common/alpn.rs: ALPN = b"pixelpass/0". - common/tunnel.rs: generic bidirectional bridge between an iroh bi-stream and any AsyncRead+AsyncWrite (typically a TCP socket). - common/signal.rs: ctrl-c -> CancellationToken; second ctrl-c hard exit. - host/mod.rs: build Endpoint, generate ticket, print banner, await first peer (lazy — no ffmpeg until peer connects), accept_bi, spawn capture, bridge to localhost ffmpeg HTTP listener. - host/capture.rs: stub returning Phase-2 error; the place X11 x11grab and Wayland ashpd+gst pipelines will land. - viewer/mod.rs: Endpoint, connect with ALPN, open_bi, TcpListener on 127.0.0.1, print copy-ready mpv/vlc commands, bridge. - repair.rs: stub for --repair PipeWire scan. iroh 1.0-rc renamed Node* -> Endpoint* and moved EndpointTicket into a sibling crate (iroh-tickets); no design impact. Plan still locked.
33 lines
912 B
Rust
33 lines
912 B
Rust
use crate::cli::DisplayServerArg;
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum DisplayServer {
|
|
Wayland,
|
|
X11,
|
|
Unknown,
|
|
}
|
|
|
|
impl DisplayServer {
|
|
pub fn detect() -> Self {
|
|
if std::env::var_os("WAYLAND_DISPLAY").is_some() {
|
|
return DisplayServer::Wayland;
|
|
}
|
|
if std::env::var_os("DISPLAY").is_some() {
|
|
return DisplayServer::X11;
|
|
}
|
|
match std::env::var("XDG_SESSION_TYPE").as_deref() {
|
|
Ok("wayland") => DisplayServer::Wayland,
|
|
Ok("x11") => DisplayServer::X11,
|
|
_ => DisplayServer::Unknown,
|
|
}
|
|
}
|
|
|
|
pub fn resolve(override_: Option<DisplayServerArg>) -> Self {
|
|
match override_ {
|
|
Some(DisplayServerArg::Wayland) => DisplayServer::Wayland,
|
|
Some(DisplayServerArg::X11) => DisplayServer::X11,
|
|
None => DisplayServer::detect(),
|
|
}
|
|
}
|
|
}
|