Allow input capture & emulation being disabled (#158)

* Input capture and emulation can now be disabled and will prompt the user to enable again.

* Improved error handling to deliver more useful error messages

Cargo.lock

@@ -1194,8 +1194,8 @@ dependencies = [
 name = "input-capture"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "ashpd",
+ "async-trait",
  "core-graphics",
  "futures",
  "futures-core",
@@ -1207,6 +1207,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
+ "tokio-util",
  "wayland-client",
  "wayland-protocols",
  "wayland-protocols-wlr",
@@ -1244,6 +1245,7 @@ dependencies = [
  "futures-core",
  "log",
  "num_enum",
+ "reis",
  "serde",
  "thiserror",
 ]
@@ -1327,6 +1329,7 @@ dependencies = [
  "slab",
  "thiserror",
  "tokio",
+ "tokio-util",
  "toml",
 ]
 
@@ -2048,6 +2051,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "toml"
 version = "0.8.14"

Cargo.toml

@@ -1,9 +1,5 @@
 [workspace]
-members = [
+members = ["input-capture", "input-emulation", "input-event"]
-    "input-capture",
-    "input-emulation",
-    "input-event",
-]
 
 [package]
 name = "lan-mouse"
@@ -29,16 +25,30 @@ anyhow = "1.0.71"
 log = "0.4.20"
 env_logger = "0.11.3"
 serde_json = "1.0.107"
-tokio = {version = "1.32.0", features = ["io-util", "io-std", "macros", "net", "process", "rt", "sync", "signal"] }
+tokio = { version = "1.32.0", features = [
+    "io-util",
+    "io-std",
+    "macros",
+    "net",
+    "process",
+    "rt",
+    "sync",
+    "signal",
+] }
 futures = "0.3.28"
-clap = { version="4.4.11", features = ["derive"] }
+clap = { version = "4.4.11", features = ["derive"] }
-gtk = { package = "gtk4", version = "0.8.1", features = ["v4_2"], optional = true }
+gtk = { package = "gtk4", version = "0.8.1", features = [
-adw = { package = "libadwaita", version = "0.6.0", features = ["v1_1"], optional = true }
+    "v4_2",
+], optional = true }
+adw = { package = "libadwaita", version = "0.6.0", features = [
+    "v1_1",
+], optional = true }
 async-channel = { version = "2.1.1", optional = true }
 hostname = "0.4.0"
 slab = "0.4.9"
 endi = "1.1.0"
 thiserror = "1.0.61"
+tokio-util = "0.7.11"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.148"
@@ -47,9 +57,9 @@ libc = "0.2.148"
 glib-build-tools = { version = "0.19.0", optional = true }
 
 [features]
-default = [ "wayland", "x11", "xdg_desktop_portal", "libei", "gtk" ]
+default = ["wayland", "x11", "xdg_desktop_portal", "libei", "gtk"]
-wayland = [ "input-capture/wayland", "input-emulation/wayland" ]
+wayland = ["input-capture/wayland", "input-emulation/wayland"]
-x11 = [ "input-capture/x11", "input-emulation/x11" ]
+x11 = ["input-capture/x11", "input-emulation/x11"]
-xdg_desktop_portal = [ "input-emulation/xdg_desktop_portal" ]
+xdg_desktop_portal = ["input-emulation/xdg_desktop_portal"]
-libei = [ "input-capture/libei", "input-emulation/libei" ]
+libei = ["input-event/libei", "input-capture/libei", "input-emulation/libei"]
 gtk = ["dep:gtk", "dep:adw", "dep:async-channel", "dep:glib-build-tools"]

input-capture/Cargo.toml

@@ -7,7 +7,6 @@ license = "GPL-3.0-or-later"
 repository = "https://github.com/ferdinandschober/lan-mouse"
 
 [dependencies]
-anyhow = "1.0.86"
 futures = "0.3.28"
 futures-core = "0.3.30"
 log = "0.4.22"
@@ -15,23 +14,42 @@ input-event = { path = "../input-event", version = "0.1.0" }
 memmap = "0.7"
 tempfile = "3.8"
 thiserror = "1.0.61"
-tokio = { version = "1.32.0", features = ["io-util", "io-std", "macros", "net", "process", "rt", "sync", "signal"] }
+tokio = { version = "1.32.0", features = [
+    "io-util",
+    "io-std",
+    "macros",
+    "net",
+    "process",
+    "rt",
+    "sync",
+    "signal",
+] }
 once_cell = "1.19.0"
+async-trait = "0.1.81"
+tokio-util = "0.7.11"
 
 
 [target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
-wayland-client = { version="0.31.1", optional = true }
+wayland-client = { version = "0.31.1", optional = true }
-wayland-protocols = { version="0.32.1", features=["client", "staging", "unstable"], optional = true }
+wayland-protocols = { version = "0.32.1", features = [
-wayland-protocols-wlr = { version="0.3.1", features=["client"], optional = true }
+    "client",
+    "staging",
+    "unstable",
+], optional = true }
+wayland-protocols-wlr = { version = "0.3.1", features = [
+    "client",
+], optional = true }
 x11 = { version = "2.21.0", features = ["xlib", "xtest"], optional = true }
-ashpd = { version = "0.8", default-features = false, features = ["tokio"], optional = true }
+ashpd = { version = "0.8", default-features = false, features = [
-reis = { version = "0.2", features = [ "tokio" ], optional = true }
+    "tokio",
+], optional = true }
+reis = { version = "0.2", features = ["tokio"], optional = true }
 
 [target.'cfg(target_os="macos")'.dependencies]
 core-graphics = { version = "0.23", features = ["highsierra"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = {  version = "0.57.0", features = [
+windows = { version = "0.57.0", features = [
     "Win32_System_LibraryLoader",
     "Win32_System_Threading",
     "Win32_Foundation",
@@ -43,6 +61,10 @@ windows = {  version = "0.57.0", features = [
 
 [features]
 default = ["wayland", "x11", "libei"]
-wayland = ["dep:wayland-client", "dep:wayland-protocols", "dep:wayland-protocols-wlr" ]
+wayland = [
+    "dep:wayland-client",
+    "dep:wayland-protocols",
+    "dep:wayland-protocols-wlr",
+]
 x11 = ["dep:x11"]
 libei = ["dep:reis", "dep:ashpd"]

input-capture/src/dummy.rs

@@ -1,11 +1,13 @@
-use std::io;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
+use async_trait::async_trait;
 use futures_core::Stream;
 
 use input_event::Event;
 
+use crate::CaptureError;
+
 use super::{CaptureHandle, InputCapture, Position};
 
 pub struct DummyInputCapture {}
@@ -22,22 +24,27 @@ impl Default for DummyInputCapture {
     }
 }
 
+#[async_trait]
 impl InputCapture for DummyInputCapture {
-    fn create(&mut self, _handle: CaptureHandle, _pos: Position) -> io::Result<()> {
+    async fn create(&mut self, _handle: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
         Ok(())
     }
 
-    fn destroy(&mut self, _handle: CaptureHandle) -> io::Result<()> {
+    async fn destroy(&mut self, _handle: CaptureHandle) -> Result<(), CaptureError> {
         Ok(())
     }
 
-    fn release(&mut self) -> io::Result<()> {
+    async fn release(&mut self) -> Result<(), CaptureError> {
+        Ok(())
+    }
+
+    async fn terminate(&mut self) -> Result<(), CaptureError> {
         Ok(())
     }
 }
 
 impl Stream for DummyInputCapture {
-    type Item = io::Result<(CaptureHandle, Event)>;
+    type Item = Result<(CaptureHandle, Event), CaptureError>;
 
     fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         Poll::Pending

input-capture/src/error.rs

@@ -1,5 +1,13 @@
 use thiserror::Error;
 
+#[derive(Debug, Error)]
+pub enum InputCaptureError {
+    #[error("error creating input-capture: `{0}`")]
+    Create(#[from] CaptureCreationError),
+    #[error("error while capturing input: `{0}`")]
+    Capture(#[from] CaptureError),
+}
+
 #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
 use std::io;
 #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
@@ -9,6 +17,8 @@ use wayland_client::{
     ConnectError, DispatchError,
 };
 
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+use ashpd::desktop::ResponseError;
 #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
 use reis::tokio::{EiConvertEventStreamError, HandshakeError};
 
@@ -43,6 +53,9 @@ pub enum CaptureError {
     #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
     #[error(transparent)]
     Portal(#[from] ashpd::Error),
+    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+    #[error("libei disconnected - reason: `{0}`")]
+    Disconnected(String),
 }
 
 #[derive(Debug, Error)]
@@ -66,6 +79,23 @@ pub enum CaptureCreationError {
     Windows,
 }
 
+impl CaptureCreationError {
+    /// request was intentionally denied by the user
+    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+    pub(crate) fn cancelled_by_user(&self) -> bool {
+        matches!(
+            self,
+            CaptureCreationError::Libei(LibeiCaptureCreationError::Ashpd(ashpd::Error::Response(
+                ResponseError::Cancelled
+            )))
+        )
+    }
+    #[cfg(not(all(unix, feature = "libei", not(target_os = "macos"))))]
+    pub(crate) fn cancelled_by_user(&self) -> bool {
+        false
+    }
+}
+
 #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
 #[derive(Debug, Error)]
 pub enum LibeiCaptureCreationError {

input-capture/src/lib.rs

@@ -1,10 +1,11 @@
-use std::{fmt::Display, io};
+use std::fmt::Display;
 
+use async_trait::async_trait;
 use futures_core::Stream;
 
 use input_event::Event;
 
-pub use error::{CaptureCreationError, CaptureError};
+pub use error::{CaptureCreationError, CaptureError, InputCaptureError};
 
 pub mod error;
 
@@ -92,21 +93,29 @@ impl Display for Backend {
     }
 }
 
-pub trait InputCapture: Stream<Item = io::Result<(CaptureHandle, Event)>> + Unpin {
+#[async_trait]
+pub trait InputCapture:
+    Stream<Item = Result<(CaptureHandle, Event), CaptureError>> + Unpin
+{
     /// create a new client with the given id
-    fn create(&mut self, id: CaptureHandle, pos: Position) -> io::Result<()>;
+    async fn create(&mut self, id: CaptureHandle, pos: Position) -> Result<(), CaptureError>;
 
     /// destroy the client with the given id, if it exists
-    fn destroy(&mut self, id: CaptureHandle) -> io::Result<()>;
+    async fn destroy(&mut self, id: CaptureHandle) -> Result<(), CaptureError>;
 
     /// release mouse
-    fn release(&mut self) -> io::Result<()>;
+    async fn release(&mut self) -> Result<(), CaptureError>;
+
+    /// destroy the input capture
+    async fn terminate(&mut self) -> Result<(), CaptureError>;
 }
 
 pub async fn create_backend(
     backend: Backend,
-) -> Result<Box<dyn InputCapture<Item = io::Result<(CaptureHandle, Event)>>>, CaptureCreationError>
+) -> Result<
-{
+    Box<dyn InputCapture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
+    CaptureCreationError,
+> {
     match backend {
         #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
         Backend::InputCapturePortal => Ok(Box::new(libei::LibeiInputCapture::new().await?)),
@@ -124,8 +133,10 @@ pub async fn create_backend(
 
 pub async fn create(
     backend: Option<Backend>,
-) -> Result<Box<dyn InputCapture<Item = io::Result<(CaptureHandle, Event)>>>, CaptureCreationError>
+) -> Result<
-{
+    Box<dyn InputCapture<Item = Result<(CaptureHandle, Event), CaptureError>>>,
+    CaptureCreationError,
+> {
     if let Some(backend) = backend {
         let b = create_backend(backend).await;
         if b.is_ok() {
@@ -145,13 +156,13 @@ pub async fn create(
         Backend::Windows,
         #[cfg(target_os = "macos")]
         Backend::MacOs,
-        Backend::Dummy,
     ] {
         match create_backend(backend).await {
             Ok(b) => {
                 log::info!("using capture backend: {backend}");
                 return Ok(b);
             }
+            Err(e) if e.cancelled_by_user() => return Err(e),
             Err(e) => log::warn!("{backend} input capture backend unavailable: {e}"),
         }
     }

input-capture/src/libei.rs

@@ -1,14 +1,14 @@
 use ashpd::{
     desktop::{
         input_capture::{Activated, Barrier, BarrierID, Capabilities, InputCapture, Region, Zones},
-        ResponseError, Session,
+        Session,
     },
     enumflags2::BitFlags,
 };
-use futures::StreamExt;
+use async_trait::async_trait;
+use futures::{FutureExt, StreamExt};
 use reis::{
-    ei::{self, keyboard::KeyState},
+    ei,
-    eis::button::ButtonState,
     event::{DeviceCapability, EiEvent},
     tokio::{EiConvertEventStream, EiEventStream},
 };
@@ -19,27 +19,35 @@ use std::{
     os::unix::net::UnixStream,
     pin::Pin,
     rc::Rc,
-    task::{ready, Context, Poll},
+    sync::Arc,
+    task::{Context, Poll},
 };
 use tokio::{
-    sync::mpsc::{Receiver, Sender},
+    sync::{
+        mpsc::{self, Receiver, Sender},
+        Notify,
+    },
     task::JoinHandle,
 };
+use tokio_util::sync::CancellationToken;
 
 use futures_core::Stream;
 use once_cell::sync::Lazy;
 
-use input_event::{Event, KeyboardEvent, PointerEvent};
+use input_event::Event;
-
-use crate::error::{CaptureError, ReisConvertEventStreamError};
 
 use super::{
-    error::LibeiCaptureCreationError, CaptureHandle, InputCapture as LanMouseInputCapture, Position,
+    error::{CaptureError, LibeiCaptureCreationError, ReisConvertEventStreamError},
+    CaptureHandle, InputCapture as LanMouseInputCapture, Position,
 };
 
-#[derive(Debug)]
+/* there is a bug in xdg-remote-desktop-portal-gnome / mutter that
-enum ProducerEvent {
+ * prevents receiving further events after a session has been disabled once.
-    Release,
+ * Therefore the session needs to be recreated when the barriers are updated */
+
+/// events that necessitate restarting the capture session
+#[derive(Clone, Copy, Debug)]
+enum LibeiNotifyEvent {
     Create(CaptureHandle, Position),
     Destroy(CaptureHandle),
 }
@@ -47,9 +55,12 @@ enum ProducerEvent {
 #[allow(dead_code)]
 pub struct LibeiInputCapture<'a> {
     input_capture: Pin<Box<InputCapture<'a>>>,
-    libei_task: JoinHandle<Result<(), CaptureError>>,
+    capture_task: JoinHandle<Result<(), CaptureError>>,
-    event_rx: tokio::sync::mpsc::Receiver<(CaptureHandle, Event)>,
+    event_rx: Receiver<(CaptureHandle, Event)>,
-    notify_tx: tokio::sync::mpsc::Sender<ProducerEvent>,
+    notify_capture: Sender<LibeiNotifyEvent>,
+    notify_release: Arc<Notify>,
+    cancellation_token: CancellationToken,
+    terminated: bool,
 }
 
 static INTERFACES: Lazy<HashMap<&'static str, u32>> = Lazy::new(|| {
@@ -68,14 +79,15 @@ static INTERFACES: Lazy<HashMap<&'static str, u32>> = Lazy::new(|| {
     m
 });
 
+/// returns (start pos, end pos), inclusive
 fn pos_to_barrier(r: &Region, pos: Position) -> (i32, i32, i32, i32) {
     let (x, y) = (r.x_offset(), r.y_offset());
-    let (width, height) = (r.width() as i32, r.height() as i32);
+    let (w, h) = (r.width() as i32, r.height() as i32);
     match pos {
-        Position::Left => (x, y, x, y + height - 1), // start pos, end pos, inclusive
+        Position::Left => (x, y, x, y + h - 1),
-        Position::Right => (x + width, y, x + width, y + height - 1),
+        Position::Right => (x + w, y, x + w, y + h - 1),
-        Position::Top => (x, y, x + width - 1, y),
+        Position::Top => (x, y, x + w - 1, y),
-        Position::Bottom => (x, y + height, x + width - 1, y + height),
+        Position::Bottom => (x, y + h, x + w - 1, y + h),
     }
 }
 
@@ -125,31 +137,16 @@ async fn update_barriers(
     Ok(id_map)
 }
 
-impl<'a> Drop for LibeiInputCapture<'a> {
-    fn drop(&mut self) {
-        self.libei_task.abort();
-    }
-}
-
 async fn create_session<'a>(
     input_capture: &'a InputCapture<'a>,
 ) -> std::result::Result<(Session<'a>, BitFlags<Capabilities>), ashpd::Error> {
     log::debug!("creating input capture session");
-    let (session, capabilities) = loop {
+    input_capture
-        match input_capture
+        .create_session(
-            .create_session(
+            &ashpd::WindowIdentifier::default(),
-                &ashpd::WindowIdentifier::default(),
+            Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
-                Capabilities::Keyboard | Capabilities::Pointer | Capabilities::Touchscreen,
+        )
-            )
+        .await
-            .await
-        {
-            Ok(s) => break s,
-            Err(ashpd::Error::Response(ResponseError::Cancelled)) => continue,
-            o => o?,
-        };
-    };
-    log::debug!("capabilities: {capabilities:?}");
-    Ok((session, capabilities))
 }
 
 async fn connect_to_eis(
@@ -182,6 +179,7 @@ async fn libei_event_handler(
     mut ei_event_stream: EiConvertEventStream,
     context: ei::Context,
     event_tx: Sender<(CaptureHandle, Event)>,
+    release_session: Arc<Notify>,
     current_client: Rc<Cell<Option<CaptureHandle>>>,
 ) -> Result<(), CaptureError> {
     loop {
@@ -192,20 +190,7 @@ async fn libei_event_handler(
             .map_err(ReisConvertEventStreamError::from)?;
         log::trace!("from ei: {ei_event:?}");
         let client = current_client.get();
-        handle_ei_event(ei_event, client, &context, &event_tx).await;
+        handle_ei_event(ei_event, client, &context, &event_tx, &release_session).await?;
-    }
-}
-
-async fn wait_for_active_client(
-    notify_rx: &mut Receiver<ProducerEvent>,
-    active_clients: &mut Vec<(CaptureHandle, Position)>,
-) {
-    // wait for a client update
-    while let Some(producer_event) = notify_rx.recv().await {
-        if let ProducerEvent::Create(c, p) = producer_event {
-            handle_producer_event(ProducerEvent::Create(c, p), active_clients);
-            break;
-        }
     }
 }
 
@@ -215,16 +200,30 @@ impl<'a> LibeiInputCapture<'a> {
         let input_capture_ptr = input_capture.as_ref().get_ref() as *const InputCapture<'static>;
         let first_session = Some(create_session(unsafe { &*input_capture_ptr }).await?);
 
-        let (event_tx, event_rx) = tokio::sync::mpsc::channel(32);
+        let (event_tx, event_rx) = mpsc::channel(1);
-        let (notify_tx, notify_rx) = tokio::sync::mpsc::channel(32);
+        let (notify_capture, notify_rx) = mpsc::channel(1);
-        let capture = do_capture(input_capture_ptr, notify_rx, first_session, event_tx);
+        let notify_release = Arc::new(Notify::new());
-        let libei_task = tokio::task::spawn_local(capture);
+
+        let cancellation_token = CancellationToken::new();
+
+        let capture = do_capture(
+            input_capture_ptr,
+            notify_rx,
+            notify_release.clone(),
+            first_session,
+            event_tx,
+            cancellation_token.clone(),
+        );
+        let capture_task = tokio::task::spawn_local(capture);
 
         let producer = Self {
             input_capture,
             event_rx,
-            libei_task,
+            capture_task,
-            notify_tx,
+            notify_capture,
+            notify_release,
+            cancellation_token,
+            terminated: false,
         };
 
         Ok(producer)
@@ -232,67 +231,157 @@ impl<'a> LibeiInputCapture<'a> {
 }
 
 async fn do_capture<'a>(
-    input_capture_ptr: *const InputCapture<'static>,
+    input_capture: *const InputCapture<'a>,
-    mut notify_rx: Receiver<ProducerEvent>,
+    mut capture_event: Receiver<LibeiNotifyEvent>,
-    mut first_session: Option<(Session<'a>, BitFlags<Capabilities>)>,
+    notify_release: Arc<Notify>,
+    session: Option<(Session<'a>, BitFlags<Capabilities>)>,
     event_tx: Sender<(CaptureHandle, Event)>,
+    cancellation_token: CancellationToken,
 ) -> Result<(), CaptureError> {
-    /* safety: libei_task does not outlive Self */
+    let mut session = session.map(|s| s.0);
-    let input_capture = unsafe { &*input_capture_ptr };
 
+    /* safety: libei_task does not outlive Self */
+    let input_capture = unsafe { &*input_capture };
     let mut active_clients: Vec<(CaptureHandle, Position)> = vec![];
     let mut next_barrier_id = 1u32;
 
-    /* there is a bug in xdg-remote-desktop-portal-gnome / mutter that
+    let mut zones_changed = input_capture.receive_zones_changed().await?;
-     * prevents receiving further events after a session has been disabled once.
-     * Therefore the session needs to recreated when the barriers are updated */
 
     loop {
-        // otherwise it asks to capture input even with no active clients
+        // do capture session
-        if active_clients.is_empty() {
+        let cancel_session = CancellationToken::new();
-            wait_for_active_client(&mut notify_rx, &mut active_clients).await;
+        let cancel_update = CancellationToken::new();
-            if notify_rx.is_closed() {
+
-                break Ok(());
+        let mut capture_event_occured: Option<LibeiNotifyEvent> = None;
-            } else {
+        let mut zones_have_changed = false;
-                continue;
+
+        // kill session if clients need to be updated
+        let handle_session_update_request = async {
+            tokio::select! {
+                _ = cancellation_token.cancelled() => {
+                    log::debug!("cancelled")
+                }, /* exit requested */
+                _ = cancel_update.cancelled() => {
+                    log::debug!("update task cancelled");
+                }, /* session exited */
+                _ = zones_changed.next() => {
+                    log::debug!("zones changed!");
+                    zones_have_changed = true
+                }, /* zones have changed */
+                e = capture_event.recv() => if let Some(e) = e { /* clients changed */
+                    log::debug!("capture event: {e:?}");
+                    capture_event_occured.replace(e);
+                },
+            }
+            // kill session (might already be dead!)
+            log::debug!("=> cancelling session");
+            cancel_session.cancel();
+        };
+
+        if !active_clients.is_empty() {
+            // create session
+            let mut session = match session.take() {
+                Some(s) => s,
+                None => create_session(input_capture).await?.0,
+            };
+
+            let capture_session = do_capture_session(
+                input_capture,
+                &mut session,
+                &event_tx,
+                &mut active_clients,
+                &mut next_barrier_id,
+                &notify_release,
+                (cancel_session.clone(), cancel_update.clone()),
+            );
+
+            let (capture_result, ()) = tokio::join!(capture_session, handle_session_update_request);
+            log::debug!("capture session + session_update task done!");
+
+            // disable capture
+            log::debug!("disabling input capture");
+            if let Err(e) = input_capture.disable(&session).await {
+                log::warn!("input_capture.disable(&session) {e}");
+            }
+            if let Err(e) = session.close().await {
+                log::warn!("session.close(): {e}");
+            }
+
+            // propagate error from capture session
+            capture_result?;
+        } else {
+            handle_session_update_request.await;
+        }
+
+        // update clients if requested
+        if let Some(event) = capture_event_occured.take() {
+            match event {
+                LibeiNotifyEvent::Create(c, p) => active_clients.push((c, p)),
+                LibeiNotifyEvent::Destroy(c) => active_clients.retain(|(h, _)| *h != c),
             }
         }
 
-        let current_client = Rc::new(Cell::new(None));
+        // break
+        if cancellation_token.is_cancelled() {
+            break Ok(());
+        }
+    }
+}
 
-        // create session
+async fn do_capture_session(
-        let (session, _) = match first_session.take() {
+    input_capture: &InputCapture<'_>,
-            Some(s) => s,
+    session: &mut Session<'_>,
-            _ => create_session(input_capture).await?,
+    event_tx: &Sender<(CaptureHandle, Event)>,
-        };
+    active_clients: &mut Vec<(CaptureHandle, Position)>,
+    next_barrier_id: &mut u32,
+    notify_release: &Notify,
+    cancel: (CancellationToken, CancellationToken),
+) -> Result<(), CaptureError> {
+    let (cancel_session, cancel_update) = cancel;
+    // current client
+    let current_client = Rc::new(Cell::new(None));
 
-        // connect to eis server
+    // connect to eis server
-        let (context, ei_event_stream) = connect_to_eis(input_capture, &session).await?;
+    let (context, ei_event_stream) = connect_to_eis(input_capture, session).await?;
 
-        // async event task
+    // set barriers
-        let mut ei_task: JoinHandle<Result<(), CaptureError>> =
+    let client_for_barrier_id =
-            tokio::task::spawn_local(libei_event_handler(
+        update_barriers(input_capture, session, active_clients, next_barrier_id).await?;
+
+    log::debug!("enabling session");
+    input_capture.enable(session).await?;
+
+    // cancellation token to release session
+    let release_session = Arc::new(Notify::new());
+
+    // async event task
+    let cancel_ei_handler = CancellationToken::new();
+    let event_chan = event_tx.clone();
+    let client = current_client.clone();
+    let cancel_session_clone = cancel_session.clone();
+    let release_session_clone = release_session.clone();
+    let cancel_ei_handler_clone = cancel_ei_handler.clone();
+    let ei_task = async move {
+        tokio::select! {
+            r = libei_event_handler(
                 ei_event_stream,
                 context,
-                event_tx.clone(),
+                event_chan,
-                current_client.clone(),
+                release_session_clone,
-            ));
+                client,
+            ) => {
+                log::debug!("libei exited: {r:?} cancelling session task");
+                cancel_session_clone.cancel();
+            }
+            _ = cancel_ei_handler_clone.cancelled() => {},
+        }
+        Ok::<(), CaptureError>(())
+    };
 
+    let capture_session_task = async {
+        // receiver for activation tokens
         let mut activated = input_capture.receive_activated().await?;
-        let mut zones_changed = input_capture.receive_zones_changed().await?;
+        let mut ei_devices_changed = false;
-
-        // set barriers
-        let client_for_barrier_id = update_barriers(
-            input_capture,
-            &session,
-            &active_clients,
-            &mut next_barrier_id,
-        )
-        .await?;
-
-        log::debug!("enabling session");
-        input_capture.enable(&session).await?;
-
         loop {
             tokio::select! {
                 activated = activated.next() => {
@@ -304,57 +393,60 @@ async fn do_capture<'a>(
                         .expect("invalid barrier id");
                     current_client.replace(Some(client));
 
-                    if event_tx.send((client, Event::Enter())).await.is_err() {
+                    // client entered => send event
-                        break;
+                    event_tx.send((client, Event::Enter())).await.expect("no channel");
-                    };
 
                     tokio::select! {
-                        producer_event = notify_rx.recv() => {
+                        _ = notify_release.notified() => { /* capture release */
-                            let producer_event = producer_event.expect("channel closed");
+                            log::debug!("release session requested");
-                            if handle_producer_event(producer_event, &mut active_clients) {
+                        },
-                                break; /* clients updated */
+                        _ = release_session.notified() => { /* release session */
-                            }
+                            log::debug!("ei devices changed");
-                        }
+                            ei_devices_changed = true;
-                        zones_changed = zones_changed.next() => {
+                        },
-                            log::debug!("zones changed: {zones_changed:?}");
+                        _ = cancel_session.cancelled() => { /* kill session notify */
-                            break;
+                            log::debug!("session cancel requested");
-                        }
+                            break
-                        res = &mut ei_task => {
+                        },
-                            if let Err(e) = res.expect("ei task paniced") {
-                                log::warn!("libei task exited: {e}");
-                            }
-                            break;
-                        }
                     }
-                    release_capture(
+
-                        input_capture,
+                    release_capture(input_capture, session, activated, client, active_clients).await?;
-                        &session,
+
-                        activated,
-                        client,
-                        &active_clients,
-                    ).await?;
                 }
-                producer_event = notify_rx.recv() => {
+                _ = notify_release.notified() => { /* capture release -> we are not capturing anyway, so ignore */
-                    let producer_event = producer_event.expect("channel closed");
+                    log::debug!("release session requested");
-                    if handle_producer_event(producer_event, &mut active_clients) {
-                        /* clients updated */
-                        break;
-                    }
                 },
-                res = &mut ei_task => {
+                _ = release_session.notified() => { /* release session */
-                    if let Err(e) = res.expect("ei task paniced") {
+                    log::debug!("ei devices changed");
-                        log::warn!("libei task exited: {e}");
+                    ei_devices_changed = true;
-                    }
+                },
-                    break;
+                _ = cancel_session.cancelled() => { /* kill session notify */
-                }
+                    log::debug!("session cancel requested");
+                    break
+                },
+            }
+            if ei_devices_changed {
+                /* for whatever reason, GNOME seems to kill the session
+                 * as soon as devices are added or removed, so we need
+                 * to cancel */
+                break;
             }
         }
-        ei_task.abort();
+        // cancel libei task
-        input_capture.disable(&session).await?;
+        log::debug!("session exited: killing libei task");
-        if event_tx.is_closed() {
+        cancel_ei_handler.cancel();
-            break Ok(());
+        Ok::<(), CaptureError>(())
-        }
+    };
-    }
+
+    let (a, b) = tokio::join!(ei_task, capture_session_task);
+
+    cancel_update.cancel();
+
+    log::debug!("both session and ei task finished!");
+    a?;
+    b?;
+
+    Ok(())
 }
 
 async fn release_capture(
@@ -387,209 +479,101 @@ async fn release_capture(
     Ok(())
 }
 
-fn handle_producer_event(
+static ALL_CAPABILITIES: &[DeviceCapability] = &[
-    producer_event: ProducerEvent,
+    DeviceCapability::Pointer,
-    active_clients: &mut Vec<(CaptureHandle, Position)>,
+    DeviceCapability::PointerAbsolute,
-) -> bool {
+    DeviceCapability::Keyboard,
-    log::debug!("handling event: {producer_event:?}");
+    DeviceCapability::Touch,
-    match producer_event {
+    DeviceCapability::Scroll,
-        ProducerEvent::Release => false,
+    DeviceCapability::Button,
-        ProducerEvent::Create(c, p) => {
+];
-            active_clients.push((c, p));
-            true
-        }
-        ProducerEvent::Destroy(c) => {
-            active_clients.retain(|(h, _)| *h != c);
-            true
-        }
-    }
-}
 
 async fn handle_ei_event(
     ei_event: EiEvent,
     current_client: Option<CaptureHandle>,
     context: &ei::Context,
     event_tx: &Sender<(CaptureHandle, Event)>,
-) {
+    release_session: &Notify,
+) -> Result<(), CaptureError> {
     match ei_event {
         EiEvent::SeatAdded(s) => {
-            s.seat.bind_capabilities(&[
+            s.seat.bind_capabilities(ALL_CAPABILITIES);
-                DeviceCapability::Pointer,
+            context.flush().map_err(|e| io::Error::new(e.kind(), e))?;
-                DeviceCapability::PointerAbsolute,
-                DeviceCapability::Keyboard,
-                DeviceCapability::Touch,
-                DeviceCapability::Scroll,
-                DeviceCapability::Button,
-            ]);
-            context.flush().unwrap();
         }
-        EiEvent::SeatRemoved(_) => {}
+        EiEvent::SeatRemoved(_) | /* EiEvent::DeviceAdded(_) | */ EiEvent::DeviceRemoved(_) => {
-        EiEvent::DeviceAdded(_) => {}
+            log::debug!("releasing session: {ei_event:?}");
-        EiEvent::DeviceRemoved(_) => {}
+            release_session.notify_waiters();
-        EiEvent::DevicePaused(_) => {}
-        EiEvent::DeviceResumed(_) => {}
-        EiEvent::KeyboardModifiers(mods) => {
-            let modifier_event = KeyboardEvent::Modifiers {
-                mods_depressed: mods.depressed,
-                mods_latched: mods.latched,
-                mods_locked: mods.locked,
-                group: mods.group,
-            };
-            if let Some(current_client) = current_client {
-                event_tx
-                    .send((current_client, Event::Keyboard(modifier_event)))
-                    .await
-                    .unwrap();
-            }
         }
-        EiEvent::Frame(_) => {}
+        EiEvent::DevicePaused(_) | EiEvent::DeviceResumed(_) => {}
-        EiEvent::DeviceStartEmulating(_) => {
+        EiEvent::DeviceStartEmulating(_) => log::debug!("START EMULATING"),
-            log::debug!("START EMULATING =============>");
+        EiEvent::DeviceStopEmulating(_) => log::debug!("STOP EMULATING"),
-        }
-        EiEvent::DeviceStopEmulating(_) => {
-            log::debug!("==================> STOP EMULATING");
-        }
-        EiEvent::PointerMotion(motion) => {
-            let motion_event = PointerEvent::Motion {
-                time: motion.time as u32,
-                dx: motion.dx as f64,
-                dy: motion.dy as f64,
-            };
-            if let Some(current_client) = current_client {
-                event_tx
-                    .send((current_client, Event::Pointer(motion_event)))
-                    .await
-                    .unwrap();
-            }
-        }
-        EiEvent::PointerMotionAbsolute(_) => {}
-        EiEvent::Button(button) => {
-            let button_event = PointerEvent::Button {
-                time: button.time as u32,
-                button: button.button,
-                state: match button.state {
-                    ButtonState::Released => 0,
-                    ButtonState::Press => 1,
-                },
-            };
-            if let Some(current_client) = current_client {
-                event_tx
-                    .send((current_client, Event::Pointer(button_event)))
-                    .await
-                    .unwrap();
-            }
-        }
-        EiEvent::ScrollDelta(delta) => {
-            if let Some(handle) = current_client {
-                let mut events = vec![];
-                if delta.dy != 0. {
-                    events.push(PointerEvent::Axis {
-                        time: 0,
-                        axis: 0,
-                        value: delta.dy as f64,
-                    });
-                }
-                if delta.dx != 0. {
-                    events.push(PointerEvent::Axis {
-                        time: 0,
-                        axis: 1,
-                        value: delta.dx as f64,
-                    });
-                }
-                for event in events {
-                    event_tx
-                        .send((handle, Event::Pointer(event)))
-                        .await
-                        .unwrap();
-                }
-            }
-        }
-        EiEvent::ScrollStop(_) => {}
-        EiEvent::ScrollCancel(_) => {}
-        EiEvent::ScrollDiscrete(scroll) => {
-            if scroll.discrete_dy != 0 {
-                let event = PointerEvent::AxisDiscrete120 {
-                    axis: 0,
-                    value: scroll.discrete_dy,
-                };
-                if let Some(current_client) = current_client {
-                    event_tx
-                        .send((current_client, Event::Pointer(event)))
-                        .await
-                        .unwrap();
-                }
-            }
-            if scroll.discrete_dx != 0 {
-                let event = PointerEvent::AxisDiscrete120 {
-                    axis: 1,
-                    value: scroll.discrete_dx,
-                };
-                if let Some(current_client) = current_client {
-                    event_tx
-                        .send((current_client, Event::Pointer(event)))
-                        .await
-                        .unwrap();
-                }
-            };
-        }
-        EiEvent::KeyboardKey(key) => {
-            let key_event = KeyboardEvent::Key {
-                key: key.key,
-                state: match key.state {
-                    KeyState::Press => 1,
-                    KeyState::Released => 0,
-                },
-                time: key.time as u32,
-            };
-            if let Some(current_client) = current_client {
-                event_tx
-                    .send((current_client, Event::Keyboard(key_event)))
-                    .await
-                    .unwrap();
-            }
-        }
-        EiEvent::TouchDown(_) => {}
-        EiEvent::TouchUp(_) => {}
-        EiEvent::TouchMotion(_) => {}
         EiEvent::Disconnected(d) => {
-            log::error!("disconnect: {d:?}");
+            return Err(CaptureError::Disconnected(format!("{:?}", d.reason)))
         }
+        _ => {
+            if let Some(handle) = current_client {
+                for event in Event::from_ei_event(ei_event) {
+                    event_tx.send((handle, event)).await.expect("no channel");
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+#[async_trait]
+impl<'a> LanMouseInputCapture for LibeiInputCapture<'a> {
+    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
+        let _ = self
+            .notify_capture
+            .send(LibeiNotifyEvent::Create(handle, pos))
+            .await;
+        Ok(())
+    }
+
+    async fn destroy(&mut self, handle: CaptureHandle) -> Result<(), CaptureError> {
+        let _ = self
+            .notify_capture
+            .send(LibeiNotifyEvent::Destroy(handle))
+            .await;
+        Ok(())
+    }
+
+    async fn release(&mut self) -> Result<(), CaptureError> {
+        self.notify_release.notify_waiters();
+        Ok(())
+    }
+
+    async fn terminate(&mut self) -> Result<(), CaptureError> {
+        self.cancellation_token.cancel();
+        let task = &mut self.capture_task;
+        log::debug!("waiting for capture to terminate...");
+        let res = task.await.expect("libei task panic");
+        log::debug!("done!");
+        self.terminated = true;
+        res
     }
 }
 
-impl<'a> LanMouseInputCapture for LibeiInputCapture<'a> {
+impl<'a> Drop for LibeiInputCapture<'a> {
-    fn create(&mut self, handle: super::CaptureHandle, pos: super::Position) -> io::Result<()> {
+    fn drop(&mut self) {
-        let notify_tx = self.notify_tx.clone();
+        if !self.terminated {
-        tokio::task::spawn_local(async move {
+            /* this workaround is needed until async drop is stabilized */
-            let _ = notify_tx.send(ProducerEvent::Create(handle, pos)).await;
+            panic!("LibeiInputCapture dropped without being terminated!");
-        });
+        }
-        Ok(())
-    }
-
-    fn destroy(&mut self, handle: super::CaptureHandle) -> io::Result<()> {
-        let notify_tx = self.notify_tx.clone();
-        tokio::task::spawn_local(async move {
-            let _ = notify_tx.send(ProducerEvent::Destroy(handle)).await;
-        });
-        Ok(())
-    }
-
-    fn release(&mut self) -> io::Result<()> {
-        let notify_tx = self.notify_tx.clone();
-        tokio::task::spawn_local(async move {
-            let _ = notify_tx.send(ProducerEvent::Release).await;
-        });
-        Ok(())
     }
 }
 
 impl<'a> Stream for LibeiInputCapture<'a> {
-    type Item = io::Result<(CaptureHandle, Event)>;
+    type Item = Result<(CaptureHandle, Event), CaptureError>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        match ready!(self.event_rx.poll_recv(cx)) {
+        match self.capture_task.poll_unpin(cx) {
-            None => Poll::Ready(None),
+            Poll::Ready(r) => match r.expect("failed to join") {
-            Some(e) => Poll::Ready(Some(Ok(e))),
+                Ok(()) => Poll::Ready(None),
+                Err(e) => Poll::Ready(Some(Err(e))),
+            },
+            Poll::Pending => self.event_rx.poll_recv(cx).map(|e| e.map(Result::Ok)),
         }
     }
 }

input-capture/src/macos.rs

@@ -1,8 +1,11 @@
-use crate::{error::MacOSInputCaptureCreationError, CaptureHandle, InputCapture, Position};
+use crate::{
+    error::MacOSInputCaptureCreationError, CaptureError, CaptureHandle, InputCapture, Position,
+};
+use async_trait::async_trait;
 use futures_core::Stream;
 use input_event::Event;
+use std::pin::Pin;
 use std::task::{Context, Poll};
-use std::{io, pin::Pin};
 
 pub struct MacOSInputCapture;
 
@@ -13,23 +16,28 @@ impl MacOSInputCapture {
 }
 
 impl Stream for MacOSInputCapture {
-    type Item = io::Result<(CaptureHandle, Event)>;
+    type Item = Result<(CaptureHandle, Event), CaptureError>;
 
     fn poll_next(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         Poll::Pending
     }
 }
 
+#[async_trait]
 impl InputCapture for MacOSInputCapture {
-    fn create(&mut self, _id: CaptureHandle, _pos: Position) -> io::Result<()> {
+    async fn create(&mut self, _id: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
         Ok(())
     }
 
-    fn destroy(&mut self, _id: CaptureHandle) -> io::Result<()> {
+    async fn destroy(&mut self, _id: CaptureHandle) -> Result<(), CaptureError> {
         Ok(())
     }
 
-    fn release(&mut self) -> io::Result<()> {
+    async fn release(&mut self) -> Result<(), CaptureError> {
+        Ok(())
+    }
+
+    async fn terminate(&mut self) -> Result<(), CaptureError> {
         Ok(())
     }
 }

input-capture/src/wayland.rs

@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use futures_core::Stream;
 use memmap::MmapOptions;
 use std::{
@@ -14,7 +15,7 @@ use std::{
     fs::File,
     io::{BufWriter, Write},
     os::unix::prelude::{AsRawFd, FromRawFd},
-    rc::Rc,
+    sync::Arc,
 };
 
 use wayland_protocols::{
@@ -62,6 +63,8 @@ use tempfile;
 
 use input_event::{Event, KeyboardEvent, PointerEvent};
 
+use crate::CaptureError;
+
 use super::{
     error::{LayerShellCaptureCreationError, WaylandBindError},
     CaptureHandle, InputCapture, Position,
@@ -102,8 +105,8 @@ struct State {
     pointer_lock: Option<ZwpLockedPointerV1>,
     rel_pointer: Option<ZwpRelativePointerV1>,
     shortcut_inhibitor: Option<ZwpKeyboardShortcutsInhibitorV1>,
-    client_for_window: Vec<(Rc<Window>, CaptureHandle)>,
+    client_for_window: Vec<(Arc<Window>, CaptureHandle)>,
-    focused: Option<(Rc<Window>, CaptureHandle)>,
+    focused: Option<(Arc<Window>, CaptureHandle)>,
     g: Globals,
     wayland_fd: OwnedFd,
     read_guard: Option<ReadEventsGuard>,
@@ -475,7 +478,7 @@ impl State {
         log::debug!("outputs: {outputs:?}");
         outputs.iter().for_each(|(o, i)| {
             let window = Window::new(self, &self.qh, o, pos, i.size);
-            let window = Rc::new(window);
+            let window = Arc::new(window);
             self.client_for_window.push((window, client));
         });
     }
@@ -561,28 +564,34 @@ impl Inner {
     }
 }
 
+#[async_trait]
 impl InputCapture for WaylandInputCapture {
-    fn create(&mut self, handle: CaptureHandle, pos: Position) -> io::Result<()> {
+    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
         self.add_client(handle, pos);
         let inner = self.0.get_mut();
-        inner.flush_events()
+        Ok(inner.flush_events()?)
-    }
-    fn destroy(&mut self, handle: CaptureHandle) -> io::Result<()> {
-        self.delete_client(handle);
-        let inner = self.0.get_mut();
-        inner.flush_events()
     }
 
-    fn release(&mut self) -> io::Result<()> {
+    async fn destroy(&mut self, handle: CaptureHandle) -> Result<(), CaptureError> {
+        self.delete_client(handle);
+        let inner = self.0.get_mut();
+        Ok(inner.flush_events()?)
+    }
+
+    async fn release(&mut self) -> Result<(), CaptureError> {
         log::debug!("releasing pointer");
         let inner = self.0.get_mut();
         inner.state.ungrab();
-        inner.flush_events()
+        Ok(inner.flush_events()?)
+    }
+
+    async fn terminate(&mut self) -> Result<(), CaptureError> {
+        Ok(())
     }
 }
 
 impl Stream for WaylandInputCapture {
-    type Item = io::Result<(CaptureHandle, Event)>;
+    type Item = Result<(CaptureHandle, Event), CaptureError>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         if let Some(event) = self.0.get_mut().state.pending_events.pop_front() {
@@ -600,7 +609,7 @@ impl Stream for WaylandInputCapture {
                     // prepare next read
                     match inner.prepare_read() {
                         Ok(_) => {}
-                        Err(e) => return Poll::Ready(Some(Err(e))),
+                        Err(e) => return Poll::Ready(Some(Err(e.into()))),
                     }
                 }
 
@@ -610,14 +619,14 @@ impl Stream for WaylandInputCapture {
                 // flush outgoing events
                 if let Err(e) = inner.flush_events() {
                     if e.kind() != ErrorKind::WouldBlock {
-                        return Poll::Ready(Some(Err(e)));
+                        return Poll::Ready(Some(Err(e.into())));
                     }
                 }
 
                 // prepare for the next read
                 match inner.prepare_read() {
                     Ok(_) => {}
-                    Err(e) => return Poll::Ready(Some(Err(e))),
+                    Err(e) => return Poll::Ready(Some(Err(e.into()))),
                 }
             }
 

input-capture/src/windows.rs

@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use core::task::{Context, Poll};
 use futures::Stream;
 use once_cell::unsync::Lazy;
@@ -10,7 +11,7 @@ use std::default::Default;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::{mpsc, Mutex};
 use std::task::ready;
-use std::{io, pin::Pin, thread};
+use std::{pin::Pin, thread};
 use tokio::sync::mpsc::{channel, Receiver, Sender};
 use windows::core::{w, PCWSTR};
 use windows::Win32::Foundation::{FALSE, HINSTANCE, HWND, LPARAM, LRESULT, RECT, WPARAM};
@@ -36,7 +37,7 @@ use input_event::{
     Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT,
 };
 
-use super::{CaptureHandle, InputCapture, Position};
+use super::{CaptureError, CaptureHandle, InputCapture, Position};
 
 enum Request {
     Create(CaptureHandle, Position),
@@ -62,8 +63,9 @@ unsafe fn signal_message_thread(event_type: EventType) {
     }
 }
 
+#[async_trait]
 impl InputCapture for WindowsInputCapture {
-    fn create(&mut self, handle: CaptureHandle, pos: Position) -> io::Result<()> {
+    async fn create(&mut self, handle: CaptureHandle, pos: Position) -> Result<(), CaptureError> {
         unsafe {
             {
                 let mut requests = REQUEST_BUFFER.lock().unwrap();
@@ -73,7 +75,8 @@ impl InputCapture for WindowsInputCapture {
         }
         Ok(())
     }
-    fn destroy(&mut self, handle: CaptureHandle) -> io::Result<()> {
+
+    async fn destroy(&mut self, handle: CaptureHandle) -> Result<(), CaptureError> {
         unsafe {
             {
                 let mut requests = REQUEST_BUFFER.lock().unwrap();
@@ -84,10 +87,14 @@ impl InputCapture for WindowsInputCapture {
         Ok(())
     }
 
-    fn release(&mut self) -> io::Result<()> {
+    async fn release(&mut self) -> Result<(), CaptureError> {
         unsafe { signal_message_thread(EventType::Release) };
         Ok(())
     }
+
+    async fn terminate(&mut self) -> Result<(), CaptureError> {
+        Ok(())
+    }
 }
 
 static mut REQUEST_BUFFER: Mutex<Vec<Request>> = Mutex::new(Vec::new());
@@ -609,7 +616,7 @@ impl WindowsInputCapture {
 }
 
 impl Stream for WindowsInputCapture {
-    type Item = io::Result<(CaptureHandle, Event)>;
+    type Item = Result<(CaptureHandle, Event), CaptureError>;
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         match ready!(self.event_rx.poll_recv(cx)) {
             None => Poll::Ready(None),

input-capture/src/x11.rs

@@ -1,8 +1,10 @@
-use std::io;
 use std::task::Poll;
 
+use async_trait::async_trait;
 use futures_core::Stream;
 
+use crate::CaptureError;
+
 use super::InputCapture;
 use input_event::Event;
 
@@ -17,22 +19,27 @@ impl X11InputCapture {
     }
 }
 
+#[async_trait]
 impl InputCapture for X11InputCapture {
-    fn create(&mut self, _id: CaptureHandle, _pos: Position) -> io::Result<()> {
+    async fn create(&mut self, _id: CaptureHandle, _pos: Position) -> Result<(), CaptureError> {
         Ok(())
     }
 
-    fn destroy(&mut self, _id: CaptureHandle) -> io::Result<()> {
+    async fn destroy(&mut self, _id: CaptureHandle) -> Result<(), CaptureError> {
         Ok(())
     }
 
-    fn release(&mut self) -> io::Result<()> {
+    async fn release(&mut self) -> Result<(), CaptureError> {
+        Ok(())
+    }
+
+    async fn terminate(&mut self) -> Result<(), CaptureError> {
         Ok(())
     }
 }
 
 impl Stream for X11InputCapture {
-    type Item = io::Result<(CaptureHandle, Event)>;
+    type Item = Result<(CaptureHandle, Event), CaptureError>;
 
     fn poll_next(
         self: std::pin::Pin<&mut Self>,

input-emulation/src/dummy.rs

@@ -26,4 +26,7 @@ impl InputEmulation for DummyEmulation {
     }
     async fn create(&mut self, _: EmulationHandle) {}
     async fn destroy(&mut self, _: EmulationHandle) {}
+    async fn terminate(&mut self) {
+        /* nothing to do */
+    }
 }

input-emulation/src/error.rs

@@ -1,3 +1,13 @@
+#[derive(Debug, Error)]
+pub enum InputEmulationError {
+    #[error("error creating input-emulation: `{0}`")]
+    Create(#[from] EmulationCreationError),
+    #[error("error emulating input: `{0}`")]
+    Emulate(#[from] EmulationError),
+}
+
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+use ashpd::{desktop::ResponseError, Error::Response};
 #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
 use reis::tokio::EiConvertEventStreamError;
 use std::io;
@@ -75,6 +85,25 @@ pub enum EmulationCreationError {
     NoAvailableBackend,
 }
 
+impl EmulationCreationError {
+    /// request was intentionally denied by the user
+    #[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+    pub(crate) fn cancelled_by_user(&self) -> bool {
+        matches!(
+            self,
+            EmulationCreationError::Libei(LibeiEmulationCreationError::Ashpd(Response(
+                ResponseError::Cancelled,
+            ))) | EmulationCreationError::Xdp(XdpEmulationCreationError::Ashpd(Response(
+                ResponseError::Cancelled,
+            )))
+        )
+    }
+    #[cfg(not(all(unix, feature = "libei", not(target_os = "macos"))))]
+    pub(crate) fn cancelled_by_user(&self) -> bool {
+        false
+    }
+}
+
 #[cfg(all(unix, feature = "wayland", not(target_os = "macos")))]
 #[derive(Debug, Error)]
 pub enum WlrootsEmulationCreationError {

input-emulation/src/lib.rs

@@ -1,10 +1,9 @@
 use async_trait::async_trait;
-use error::EmulationError;
 use std::fmt::Display;
 
 use input_event::Event;
 
-use self::error::EmulationCreationError;
+pub use self::error::{EmulationCreationError, EmulationError, InputEmulationError};
 
 #[cfg(windows)]
 pub mod windows;
@@ -76,6 +75,7 @@ pub trait InputEmulation: Send {
     ) -> Result<(), EmulationError>;
     async fn create(&mut self, handle: EmulationHandle);
     async fn destroy(&mut self, handle: EmulationHandle);
+    async fn terminate(&mut self);
 }
 
 pub async fn create_backend(
@@ -131,6 +131,7 @@ pub async fn create(
                 log::info!("using emulation backend: {backend}");
                 return Ok(b);
             }
+            Err(e) if e.cancelled_by_user() => return Err(e),
             Err(e) => log::warn!("{e}"),
         }
     }

input-emulation/src/libei.rs

@@ -1,12 +1,12 @@
-use futures::StreamExt;
+use futures::{future, StreamExt};
 use once_cell::sync::Lazy;
 use std::{
     collections::HashMap,
     io,
     os::{fd::OwnedFd, unix::net::UnixStream},
     sync::{
-        atomic::{AtomicU32, Ordering},
+        atomic::{AtomicBool, AtomicU32, Ordering},
-        Arc, RwLock,
+        Arc, Mutex, RwLock,
     },
     time::{SystemTime, UNIX_EPOCH},
 };
@@ -15,7 +15,7 @@ use tokio::task::JoinHandle;
 use ashpd::{
     desktop::{
         remote_desktop::{DeviceType, RemoteDesktop},
-        ResponseError,
+        Session,
     },
     WindowIdentifier,
 };
@@ -60,51 +60,44 @@ struct Devices {
     keyboard: Arc<RwLock<Option<(ei::Device, ei::Keyboard)>>>,
 }
 
-pub struct LibeiEmulation {
+pub struct LibeiEmulation<'a> {
     context: ei::Context,
     devices: Devices,
+    ei_task: JoinHandle<()>,
+    error: Arc<Mutex<Option<EmulationError>>>,
+    libei_error: Arc<AtomicBool>,
     serial: AtomicU32,
-    ei_task: JoinHandle<Result<(), EmulationError>>,
+    _remote_desktop: RemoteDesktop<'a>,
+    session: Session<'a>,
 }
 
-async fn get_ei_fd() -> Result<OwnedFd, ashpd::Error> {
+async fn get_ei_fd<'a>() -> Result<(RemoteDesktop<'a>, Session<'a>, OwnedFd), ashpd::Error> {
-    let proxy = RemoteDesktop::new().await?;
+    let remote_desktop = RemoteDesktop::new().await?;
 
-    // retry when user presses the cancel button
+    log::debug!("creating session ...");
-    let (session, _) = loop {
+    let session = remote_desktop.create_session().await?;
-        log::debug!("creating session ...");
-        let session = proxy.create_session().await?;
 
-        log::debug!("selecting devices ...");
+    log::debug!("selecting devices ...");
-        proxy
+    remote_desktop
-            .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
+        .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
-            .await?;
+        .await?;
 
-        log::info!("requesting permission for input emulation");
+    log::info!("requesting permission for input emulation");
-        match proxy
+    let _devices = remote_desktop
-            .start(&session, &WindowIdentifier::default())
+        .start(&session, &WindowIdentifier::default())
-            .await?
+        .await?
-            .response()
+        .response()?;
-        {
-            Ok(d) => break (session, d),
-            Err(ashpd::Error::Response(ResponseError::Cancelled)) => {
-                log::warn!("request cancelled!");
-                continue;
-            }
-            e => e?,
-        };
-    };
 
-    proxy.connect_to_eis(&session).await
+    let fd = remote_desktop.connect_to_eis(&session).await?;
+    Ok((remote_desktop, session, fd))
 }
 
-impl LibeiEmulation {
+impl<'a> LibeiEmulation<'a> {
     pub async fn new() -> Result<Self, LibeiEmulationCreationError> {
-        let eifd = get_ei_fd().await?;
+        let (_remote_desktop, session, eifd) = get_ei_fd().await?;
         let stream = UnixStream::from(eifd);
         stream.set_nonblocking(true)?;
         let context = ei::Context::new(stream)?;
-        context.flush().map_err(|e| io::Error::new(e.kind(), e))?;
         let mut events = EiEventStream::new(context.clone())?;
         let handshake = ei_handshake(
             &mut events,
@@ -115,28 +108,40 @@ impl LibeiEmulation {
         .await?;
         let events = EiConvertEventStream::new(events, handshake.serial);
         let devices = Devices::default();
-        let ei_handler = ei_event_handler(events, context.clone(), devices.clone());
+        let libei_error = Arc::new(AtomicBool::default());
+        let error = Arc::new(Mutex::new(None));
+        let ei_handler = ei_task(
+            events,
+            context.clone(),
+            devices.clone(),
+            libei_error.clone(),
+            error.clone(),
+        );
         let ei_task = tokio::task::spawn_local(ei_handler);
 
         let serial = AtomicU32::new(handshake.serial);
 
         Ok(Self {
-            serial,
             context,
-            ei_task,
             devices,
+            ei_task,
+            error,
+            libei_error,
+            serial,
+            _remote_desktop,
+            session,
         })
     }
 }
 
-impl Drop for LibeiEmulation {
+impl<'a> Drop for LibeiEmulation<'a> {
     fn drop(&mut self) {
         self.ei_task.abort();
     }
 }
 
 #[async_trait]
-impl InputEmulation for LibeiEmulation {
+impl<'a> InputEmulation for LibeiEmulation<'a> {
     async fn consume(
         &mut self,
         event: Event,
@@ -146,6 +151,12 @@ impl InputEmulation for LibeiEmulation {
             .duration_since(UNIX_EPOCH)
             .unwrap()
             .as_micros() as u64;
+        if self.libei_error.load(Ordering::SeqCst) {
+            // don't break sending additional events but signal error
+            if let Some(e) = self.error.lock().unwrap().take() {
+                return Err(e);
+            }
+        }
         match event {
             Event::Pointer(p) => match p {
                 PointerEvent::Motion { time: _, dx, dy } => {
@@ -228,12 +239,37 @@ impl InputEmulation for LibeiEmulation {
 
     async fn create(&mut self, _: EmulationHandle) {}
     async fn destroy(&mut self, _: EmulationHandle) {}
+
+    async fn terminate(&mut self) {
+        let _ = self.session.close().await;
+        self.ei_task.abort();
+    }
 }
 
-async fn ei_event_handler(
+async fn ei_task(
     mut events: EiConvertEventStream,
     context: ei::Context,
     devices: Devices,
+    libei_error: Arc<AtomicBool>,
+    error: Arc<Mutex<Option<EmulationError>>>,
+) {
+    loop {
+        match ei_event_handler(&mut events, &context, &devices).await {
+            Ok(()) => {}
+            Err(e) => {
+                libei_error.store(true, Ordering::SeqCst);
+                error.lock().unwrap().replace(e);
+                // wait for termination -> otherwise we will loop forever
+                future::pending::<()>().await;
+            }
+        }
+    }
+}
+
+async fn ei_event_handler(
+    events: &mut EiConvertEventStream,
+    context: &ei::Context,
+    devices: &Devices,
 ) -> Result<(), EmulationError> {
     loop {
         let event = events
@@ -253,7 +289,7 @@ async fn ei_event_handler(
         match event {
             EiEvent::Disconnected(e) => {
                 log::debug!("ei disconnected: {e:?}");
-                break;
+                return Err(EmulationError::EndOfStream);
             }
             EiEvent::SeatAdded(e) => {
                 e.seat().bind_capabilities(CAPABILITIES);
@@ -327,5 +363,4 @@ async fn ei_event_handler(
         }
         context.flush().map_err(|e| io::Error::new(e.kind(), e))?;
     }
-    Ok(())
 }

input-emulation/src/macos.rs

@@ -295,4 +295,6 @@ impl InputEmulation for MacOSEmulation {
     async fn create(&mut self, _handle: EmulationHandle) {}
 
     async fn destroy(&mut self, _handle: EmulationHandle) {}
+
+    async fn terminate(&mut self) {}
 }

input-emulation/src/windows.rs

@@ -80,6 +80,8 @@ impl InputEmulation for WindowsEmulation {
     async fn create(&mut self, _handle: EmulationHandle) {}
 
     async fn destroy(&mut self, _handle: EmulationHandle) {}
+
+    async fn terminate(&mut self) {}
 }
 
 impl WindowsEmulation {

input-emulation/src/wlroots.rs

@@ -165,6 +165,9 @@ impl InputEmulation for WlrootsEmulation {
             log::error!("{}", e);
         }
     }
+    async fn terminate(&mut self) {
+        /* nothing to do */
+    }
 }
 
 struct VirtualInput {

input-emulation/src/x11.rs

@@ -148,4 +148,8 @@ impl InputEmulation for X11Emulation {
     async fn destroy(&mut self, _: EmulationHandle) {
         // for our purposes it does not matter what client sent the event
     }
+
+    async fn terminate(&mut self) {
+        /* nothing to do */
+    }
 }

input-emulation/src/xdg_desktop_portal.rs

@@ -1,7 +1,7 @@
 use ashpd::{
     desktop::{
         remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop},
-        ResponseError, Session,
+        Session,
     },
     zbus::AsyncDrop,
     WindowIdentifier,
@@ -29,29 +29,19 @@ impl<'a> DesktopPortalEmulation<'a> {
         let proxy = RemoteDesktop::new().await?;
 
         // retry when user presses the cancel button
-        let (session, _) = loop {
+        log::debug!("creating session ...");
-            log::debug!("creating session ...");
+        let session = proxy.create_session().await?;
-            let session = proxy.create_session().await?;
 
-            log::debug!("selecting devices ...");
+        log::debug!("selecting devices ...");
-            proxy
+        proxy
-                .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
+            .select_devices(&session, DeviceType::Keyboard | DeviceType::Pointer)
-                .await?;
+            .await?;
 
-            log::info!("requesting permission for input emulation");
+        log::info!("requesting permission for input emulation");
-            match proxy
+        let _devices = proxy
-                .start(&session, &WindowIdentifier::default())
+            .start(&session, &WindowIdentifier::default())
-                .await?
+            .await?
-                .response()
+            .response()?;
-            {
-                Ok(d) => break (session, d),
-                Err(ashpd::Error::Response(ResponseError::Cancelled)) => {
-                    log::warn!("request cancelled!");
-                    continue;
-                }
-                e => e?,
-            };
-        };
 
         log::debug!("started session");
         let session = session;
@@ -142,6 +132,14 @@ impl<'a> InputEmulation for DesktopPortalEmulation<'a> {
 
     async fn create(&mut self, _client: EmulationHandle) {}
     async fn destroy(&mut self, _client: EmulationHandle) {}
+    async fn terminate(&mut self) {
+        if let Err(e) = self.session.close().await {
+            log::warn!("session.close(): {e}");
+        };
+        if let Err(e) = self.session.receive_closed().await {
+            log::warn!("session.receive_closed(): {e}");
+        };
+    }
 }
 
 impl<'a> AsyncDrop for DesktopPortalEmulation<'a> {

input-event/Cargo.toml

@@ -12,3 +12,10 @@ log = "0.4.22"
 num_enum = "0.7.2"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0.61"
+
+[target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
+reis = { version = "0.2.0", optional = true }
+
+[features]
+default = ["libei"]
+libei = ["dep:reis"]

input-event/src/lib.rs

@@ -5,6 +5,9 @@ pub mod error;
 pub mod proto;
 pub mod scancode;
 
+#[cfg(all(unix, feature = "libei", not(target_os = "macos")))]
+mod libei;
+
 // FIXME
 pub const BTN_LEFT: u32 = 0x110;
 pub const BTN_RIGHT: u32 = 0x111;

input-event/src/libei.rs

@@ -0,0 +1,146 @@
+use reis::{
+    ei::{button::ButtonState, keyboard::KeyState},
+    event::EiEvent,
+};
+
+use crate::{Event, KeyboardEvent, PointerEvent};
+
+impl Event {
+    pub fn from_ei_event(ei_event: EiEvent) -> impl Iterator<Item = Self> {
+        to_input_events(ei_event).into_iter()
+    }
+}
+
+enum Events {
+    None,
+    One(Event),
+    Two(Event, Event),
+}
+
+impl Events {
+    fn into_iter(self) -> impl Iterator<Item = Event> {
+        EventIterator::new(self)
+    }
+}
+
+struct EventIterator {
+    events: [Option<Event>; 2],
+    pos: usize,
+}
+
+impl EventIterator {
+    fn new(events: Events) -> Self {
+        let events = match events {
+            Events::None => [None, None],
+            Events::One(e) => [Some(e), None],
+            Events::Two(e, f) => [Some(e), Some(f)],
+        };
+        Self { events, pos: 0 }
+    }
+}
+
+impl Iterator for EventIterator {
+    type Item = Event;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let res = if self.pos >= self.events.len() {
+            None
+        } else {
+            self.events[self.pos]
+        };
+        self.pos += 1;
+        res
+    }
+}
+
+fn to_input_events(ei_event: EiEvent) -> Events {
+    match ei_event {
+        EiEvent::KeyboardModifiers(mods) => {
+            let modifier_event = KeyboardEvent::Modifiers {
+                mods_depressed: mods.depressed,
+                mods_latched: mods.latched,
+                mods_locked: mods.locked,
+                group: mods.group,
+            };
+            Events::One(Event::Keyboard(modifier_event))
+        }
+        EiEvent::Frame(_) => Events::None, /* FIXME */
+        EiEvent::PointerMotion(motion) => {
+            let motion_event = PointerEvent::Motion {
+                time: motion.time as u32,
+                dx: motion.dx as f64,
+                dy: motion.dy as f64,
+            };
+            Events::One(Event::Pointer(motion_event))
+        }
+        EiEvent::PointerMotionAbsolute(_) => Events::None,
+        EiEvent::Button(button) => {
+            let button_event = PointerEvent::Button {
+                time: button.time as u32,
+                button: button.button,
+                state: match button.state {
+                    ButtonState::Released => 0,
+                    ButtonState::Press => 1,
+                },
+            };
+            Events::One(Event::Pointer(button_event))
+        }
+        EiEvent::ScrollDelta(delta) => {
+            let dy = Event::Pointer(PointerEvent::Axis {
+                time: 0,
+                axis: 0,
+                value: delta.dy as f64,
+            });
+            let dx = Event::Pointer(PointerEvent::Axis {
+                time: 0,
+                axis: 1,
+                value: delta.dx as f64,
+            });
+            if delta.dy != 0. && delta.dx != 0. {
+                Events::Two(dy, dx)
+            } else if delta.dy != 0. {
+                Events::One(dy)
+            } else if delta.dx != 0. {
+                Events::One(dx)
+            } else {
+                Events::None
+            }
+        }
+        EiEvent::ScrollStop(_) => Events::None,   /* TODO */
+        EiEvent::ScrollCancel(_) => Events::None, /* TODO */
+        EiEvent::ScrollDiscrete(scroll) => {
+            let dy = Event::Pointer(PointerEvent::AxisDiscrete120 {
+                axis: 0,
+                value: scroll.discrete_dy,
+            });
+            let dx = Event::Pointer(PointerEvent::AxisDiscrete120 {
+                axis: 1,
+                value: scroll.discrete_dx,
+            });
+            if scroll.discrete_dy != 0 && scroll.discrete_dx != 0 {
+                Events::Two(dy, dx)
+            } else if scroll.discrete_dy != 0 {
+                Events::One(dy)
+            } else if scroll.discrete_dx != 0 {
+                Events::One(dx)
+            } else {
+                Events::None
+            }
+        }
+        EiEvent::KeyboardKey(key) => {
+            let key_event = KeyboardEvent::Key {
+                key: key.key,
+                state: match key.state {
+                    KeyState::Press => 1,
+                    KeyState::Released => 0,
+                },
+                time: key.time as u32,
+            };
+            Events::One(Event::Keyboard(key_event))
+        }
+        EiEvent::TouchDown(_) => Events::None,   /* TODO */
+        EiEvent::TouchUp(_) => Events::None,     /* TODO */
+        EiEvent::TouchMotion(_) => Events::None, /* TODO */
+        _ => Events::None,
+    }
+}

resources/client_row.ui

@@ -44,6 +44,7 @@
 				<child>
 					<object class="GtkEntry" id="port">
 						<!-- <property name="title" translatable="yes">port</property> -->
+                        <property name="max-width-chars">5</property>
 						<property name="input_purpose">GTK_INPUT_PURPOSE_NUMBER</property>
 						<property name="xalign">0.5</property>
 						<property name="valign">center</property>

resources/window.ui

@@ -1,167 +1,227 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-	<requires lib="gtk" version="4.0"/>
+  <requires lib="gtk" version="4.0"/>
-	<requires lib="libadwaita" version="1.0"/>
+  <requires lib="libadwaita" version="1.0"/>
-	<menu id="main-menu">
+  <menu id="main-menu">
-		<item>
+    <item>
-			<attribute name="label" translatable="yes">_Close window</attribute>
+      <attribute name="label" translatable="yes">_Close window</attribute>
-			<attribute name="action">window.close</attribute>
+      <attribute name="action">window.close</attribute>
-		</item>
+    </item>
-	</menu>
+  </menu>
-	<template class="LanMouseWindow" parent="AdwApplicationWindow">
+  <template class="LanMouseWindow" parent="AdwApplicationWindow">
-		<property name="width-request">600</property>
+    <property name="width-request">600</property>
-		<property name="height-request">700</property>
+    <property name="height-request">700</property>
-		<property name="title" translatable="yes">Lan Mouse</property>
+    <property name="title" translatable="yes">Lan Mouse</property>
-		<property name="show-menubar">True</property>
+    <property name="show-menubar">True</property>
-		<property name="content">
+    <property name="content">
-			<object class="GtkBox">
+      <object class="GtkBox">
-				<property name="orientation">vertical</property>
+        <property name="orientation">vertical</property>
-				<child type="top">
+        <child type="top">
-					<object class="AdwHeaderBar">
+          <object class="AdwHeaderBar">
-						<child type ="end">
+            <child type ="end">
-							<object class="GtkMenuButton">
+              <object class="GtkMenuButton">
-								<property name="icon-name">open-menu-symbolic</property>
+                <property name="icon-name">open-menu-symbolic</property>
-								<property name="menu-model">main-menu</property>
+                <property name="menu-model">main-menu</property>
-							</object>
+              </object>
-						</child>
+            </child>
-						<style>
+            <style>
-							<class name="flat"/>
+              <class name="flat"/>
-						</style>
+            </style>
-					</object>
+          </object>
-				</child>
+        </child>
-				<child>
+        <child>
-					<object class="AdwToastOverlay" id="toast_overlay">
+          <object class="AdwToastOverlay" id="toast_overlay">
-						<child>
+            <child>
-							<object class="AdwStatusPage">
+              <object class="AdwStatusPage">
-								<property name="title" translatable="yes">Lan Mouse</property>
+                <property name="title" translatable="yes">Lan Mouse</property>
-								<property name="description" translatable="yes">easily use your mouse and keyboard on multiple computers</property>
+                <property name="description" translatable="yes">easily use your mouse and keyboard on multiple computers</property>
-								<property name="icon-name">de.feschber.LanMouse</property>
+                <property name="icon-name">de.feschber.LanMouse</property>
-								<property name="child">
+                <property name="child">
-								  <object class="AdwClamp">
+                  <object class="AdwClamp">
-									<property name="maximum-size">600</property>
+                  <property name="maximum-size">600</property>
-									<property name="tightening-threshold">0</property>
+                  <property name="tightening-threshold">0</property>
-									<property name="child">
+                  <property name="child">
-									  <object class="GtkBox">
+                    <object class="GtkBox">
-										<property name="orientation">vertical</property>
+                    <property name="orientation">vertical</property>
-										<property name="spacing">12</property>
+                    <property name="spacing">12</property>
-										<child>
+                    <child>
-											<object class="AdwPreferencesGroup">
+                      <object class="AdwPreferencesGroup" id="capture_emulation_group">
-												<property name="title" translatable="yes">General</property>
+                      <property name="title" translatable="yes">Capture / Emulation Status</property>
-												<!--
+                        <child>
-												<child>
+                          <object class="AdwActionRow" id="capture_status_row">
-													<object class="AdwActionRow">
+                            <property name="title">input capture is disabled</property>
-														<property name="title" translatable="yes">enable</property>
+                            <property name="subtitle">required for outgoing and incoming connections</property>
-														<child type="suffix">
+                            <property name="icon-name">dialog-warning-symbolic</property>
-															<object class="GtkSwitch">
+                            <child>
-																<property name="valign">center</property>
+                              <object class="GtkButton" id="input_capture_button">
-																<property name="tooltip-text" translatable="yes">enable</property>
+                                <property name="child">
-															</object>
+                                  <object class="AdwButtonContent">
-														</child>
+                                    <property name="icon-name">object-rotate-right-symbolic</property>
-													</object>
+                                    <property name="label" translatable="yes">Reenable</property>
-												</child>
+                                  </object>
-												-->
+                                </property>
-												<child>
+                                <signal name="clicked" handler="handle_capture" swapped="true"/>
-													<object class="AdwActionRow">
+                                <property name="valign">center</property>
-														<property name="title">port</property>
+                                <style>
-														<child>
+                                  <class name="circular"/>
-															<object class="GtkEntry" id="port_entry">
+                                  <class name="flat"/>
-																<signal name="activate" handler="handle_port_edit_apply" swapped="true"/>
+                                </style>
-																<signal name="changed" handler="handle_port_changed" swapped="true"/>
+                              </object>
-																<!-- <signal name="delete-text" handler="handle_port_changed" swapped="true"/> -->
+                            </child>
-																<!-- <property name="title" translatable="yes">port</property> -->
+                            <style>
-																<property name="placeholder-text">4242</property>
+                              <class name="warning"/>
-																<property name="width-chars">5</property>
+                            </style>
-																<property name="xalign">0.5</property>
+                          </object>
-																<property name="valign">center</property>
+                        </child>
-																<!-- <property name="show-apply-button">True</property> -->
+                        <child>
-																<property name="input-purpose">GTK_INPUT_PURPOSE_DIGITS</property>
+                          <object class="AdwActionRow" id="emulation_status_row">
-															</object>
+                            <property name="title">input emulation is disabled</property>
-														</child>
+                            <property name="subtitle">required for incoming connections</property>
-														<child>
+                            <property name="icon-name">dialog-warning-symbolic</property>
-															<object class="GtkButton" id="port_edit_apply">
+                            <child>
-																<signal name="clicked" handler="handle_port_edit_apply" swapped="true"/>
+                              <object class="GtkButton" id="input_emulation_button">
-																<property name="icon-name">object-select-symbolic</property>
+                                <property name="child">
-																<property name="valign">center</property>
+                                  <object class="AdwButtonContent">
-																<property name="visible">false</property>
+                                    <property name="icon-name">object-rotate-right-symbolic</property>
-																<property name="name">port-edit-apply</property>
+                                    <property name="label" translatable="yes">Reenable</property>
-																<style><class name="success"/></style>
+                                  </object>
-															</object>
+                                </property>
-														</child>
+                                <property name="valign">center</property>
-														<child>
+                                <signal name="clicked" handler="handle_emulation" swapped="true"/>
-															<object class="GtkButton" id="port_edit_cancel">
+                                <style>
-																<signal name="clicked" handler="handle_port_edit_cancel" swapped="true"/>
+                                  <class name="circular"/>
-																<property name="icon-name">process-stop-symbolic</property>
+                                  <class name="flat"/>
-																<property name="valign">center</property>
+                                </style>
-																<property name="visible">false</property>
+                              </object>
-																<property name="name">port-edit-cancel</property>
+                            </child>
-																<style><class name="error"/></style>
+                            <child>
-															</object>
+                            </child>
-														</child>
+                            <style>
-													</object>
+                              <class name="warning"/>
-												</child>
+                            </style>
-												<child>
+                          </object>
-													<object class="AdwActionRow">
+                        </child>
-														<property name="title">hostname</property>
+                      </object>
-														<child>
+                    </child>
-															<object class="GtkLabel" id="hostname_label">
+                    <child>
-																<property name="label">&lt;span font_style=&quot;italic&quot; font_weight=&quot;light&quot; foreground=&quot;darkgrey&quot;&gt;could not determine hostname&lt;/span&gt;</property>
+                      <object class="AdwPreferencesGroup">
-																<property name="use-markup">true</property>
+                        <property name="title" translatable="yes">General</property>
-																<property name="valign">center</property>
+                        <!--
-															</object>
+                        <child>
-														</child>
+                          <object class="AdwActionRow">
-														<child>
+                            <property name="title" translatable="yes">enable</property>
-															<object class="GtkButton" id="copy-hostname-button">
+                            <child type="suffix">
-																<property name="icon-name">edit-copy-symbolic</property>
+                              <object class="GtkSwitch">
-																<property name="valign">center</property>
+                                <property name="valign">center</property>
-																<signal name="clicked" handler="handle_copy_hostname" swapped="true"/>
+                                <property name="tooltip-text" translatable="yes">enable</property>
-															</object>
+                              </object>
-														</child>
+                            </child>
-													</object>
+                          </object>
-												</child>
+                        </child>
-											</object>
+                        -->
-										</child>
+                        <child>
-										<child>
+                          <object class="AdwActionRow">
-											<object class="AdwPreferencesGroup">
+                            <property name="title">port</property>
-												<property name="title" translatable="yes">Connections</property>
+                            <child>
-												<property name="header-suffix">
+                              <object class="GtkEntry" id="port_entry">
-													<object class="GtkButton">
+                                <property name="max-width-chars">5</property>
-														<signal name="clicked" handler="handle_add_client_pressed" swapped="true"/>
+                                <signal name="activate" handler="handle_port_edit_apply" swapped="true"/>
-														<property name="child">
+                                <signal name="changed" handler="handle_port_changed" swapped="true"/>
-															<object class="AdwButtonContent">
+                                <!-- <signal name="delete-text" handler="handle_port_changed" swapped="true"/> -->
-																<property name="icon-name">list-add-symbolic</property>
+                                <!-- <property name="title" translatable="yes">port</property> -->
-																<property name="label" translatable="yes">Add</property>
+                                <property name="placeholder-text">4242</property>
-															</object>
+                                <property name="width-chars">5</property>
-														</property>
+                                <property name="xalign">0.5</property>
-													<style>
+                                <property name="valign">center</property>
-														<class name="flat"/>
+                                <!-- <property name="show-apply-button">True</property> -->
-													</style>
+                                <property name="input-purpose">GTK_INPUT_PURPOSE_DIGITS</property>
-													</object>
+                              </object>
-												</property>
+                            </child>
-												<child>
+                            <child>
-												  <object class="GtkListBox" id="client_list">
+                              <object class="GtkButton" id="port_edit_apply">
-														<property name="selection-mode">none</property>
+                                <signal name="clicked" handler="handle_port_edit_apply" swapped="true"/>
-														<child type="placeholder">
+                                <property name="icon-name">object-select-symbolic</property>
-															<object class="AdwActionRow" id="client_placeholder">
+                                <property name="valign">center</property>
-																<property name="title">No connections!</property>
+                                <property name="visible">false</property>
-																<property name="subtitle">add a new client via the + button</property>
+                                <property name="name">port-edit-apply</property>
-															</object>
+                                <style><class name="success"/></style>
-														</child>
+                              </object>
-														<style>
+                            </child>
-															<class name="boxed-list" />
+                            <child>
-														</style>
+                              <object class="GtkButton" id="port_edit_cancel">
-												  </object>
+                                <signal name="clicked" handler="handle_port_edit_cancel" swapped="true"/>
-												</child>
+                                <property name="icon-name">process-stop-symbolic</property>
-											</object>
+                                <property name="valign">center</property>
-										</child>
+                                <property name="visible">false</property>
-									  </object>
+                                <property name="name">port-edit-cancel</property>
-									</property>
+                                <style><class name="error"/></style>
-								  </object>
+                              </object>
-							  </property>
+                            </child>
-							</object>
+                          </object>
-						</child>
+                        </child>
-					</object>
+                        <child>
-				</child>
+                          <object class="AdwActionRow">
-			</object>
+                            <property name="title">hostname</property>
-		</property>
+                            <child>
-	</template>
+                              <object class="GtkLabel" id="hostname_label">
+                                <property name="label">&lt;span font_style=&quot;italic&quot; font_weight=&quot;light&quot; foreground=&quot;darkgrey&quot;&gt;could not determine hostname&lt;/span&gt;</property>
+                                <property name="use-markup">true</property>
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="copy-hostname-button">
+                                <property name="icon-name">edit-copy-symbolic</property>
+                                <property name="valign">center</property>
+                                <signal name="clicked" handler="handle_copy_hostname" swapped="true"/>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwPreferencesGroup">
+                        <property name="title" translatable="yes">Connections</property>
+                        <property name="header-suffix">
+                          <object class="GtkButton">
+                            <signal name="clicked" handler="handle_add_client_pressed" swapped="true"/>
+                            <property name="child">
+                              <object class="AdwButtonContent">
+                                <property name="icon-name">list-add-symbolic</property>
+                                <property name="label" translatable="yes">Add</property>
+                              </object>
+                            </property>
+                          <style>
+                            <class name="flat"/>
+                          </style>
+                          </object>
+                        </property>
+                        <child>
+                          <object class="GtkListBox" id="client_list">
+                            <property name="selection-mode">none</property>
+                            <child type="placeholder">
+                              <object class="AdwActionRow" id="client_placeholder">
+                                <property name="title">No connections!</property>
+                                <property name="subtitle">add a new client via the + button</property>
+                              </object>
+                            </child>
+                            <style>
+                              <class name="boxed-list" />
+                            </style>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    </object>
+                  </property>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </property>
+  </template>
 </interface>

src/capture_test.rs

@@ -1,11 +1,10 @@
 use crate::config::Config;
-use anyhow::{anyhow, Result};
 use futures::StreamExt;
-use input_capture::{self, Position};
+use input_capture::{self, CaptureError, InputCapture, InputCaptureError, Position};
 use input_event::{Event, KeyboardEvent};
 use tokio::task::LocalSet;
 
-pub fn run() -> Result<()> {
+pub fn run() -> anyhow::Result<()> {
     log::info!("running input capture test");
     let runtime = tokio::runtime::Builder::new_current_thread()
         .enable_io()
@@ -14,23 +13,32 @@ pub fn run() -> Result<()> {
 
     let config = Config::new()?;
 
-    runtime.block_on(LocalSet::new().run_until(input_capture_test(config)))
+    Ok(runtime.block_on(LocalSet::new().run_until(input_capture_test(config)))?)
 }
 
-async fn input_capture_test(config: Config) -> Result<()> {
+async fn input_capture_test(config: Config) -> Result<(), InputCaptureError> {
     log::info!("creating input capture");
     let backend = config.capture_backend.map(|b| b.into());
-    let mut input_capture = input_capture::create(backend).await?;
+    loop {
-    log::info!("creating clients");
+        let mut input_capture = input_capture::create(backend).await?;
-    input_capture.create(0, Position::Left)?;
+        log::info!("creating clients");
-    input_capture.create(1, Position::Right)?;
+        input_capture.create(0, Position::Left).await?;
-    input_capture.create(2, Position::Top)?;
+        input_capture.create(1, Position::Right).await?;
-    input_capture.create(3, Position::Bottom)?;
+        input_capture.create(2, Position::Top).await?;
+        input_capture.create(3, Position::Bottom).await?;
+        if let Err(e) = do_capture(&mut input_capture).await {
+            log::warn!("{e} - recreating capture");
+        }
+        let _ = input_capture.terminate().await;
+    }
+}
+
+async fn do_capture(input_capture: &mut Box<dyn InputCapture>) -> Result<(), CaptureError> {
     loop {
         let (client, event) = input_capture
             .next()
             .await
-            .ok_or(anyhow!("capture stream closed"))??;
+            .ok_or(CaptureError::EndOfStream)??;
         let pos = match client {
             0 => Position::Left,
             1 => Position::Right,
@@ -39,7 +47,8 @@ async fn input_capture_test(config: Config) -> Result<()> {
         };
         log::info!("position: {pos}, event: {event}");
         if let Event::Keyboard(KeyboardEvent::Key { key: 1, .. }) = event {
-            input_capture.release()?;
+            input_capture.release().await?;
+            break Ok(());
         }
     }
 }

src/client.rs

@@ -1,6 +1,5 @@
 use std::{
     collections::HashSet,
-    error::Error,
     fmt::Display,
     net::{IpAddr, SocketAddr},
     str::FromStr,
@@ -8,24 +7,20 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 use slab::Slab;
+use thiserror::Error;
 
 use crate::config::DEFAULT_PORT;
 use input_capture;
 
-#[derive(Debug, Eq, Hash, PartialEq, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Default, Eq, Hash, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub enum Position {
+    #[default]
     Left,
     Right,
     Top,
     Bottom,
 }
 
-impl Default for Position {
-    fn default() -> Self {
-        Self::Left
-    }
-}
-
 impl From<Position> for input_capture::Position {
     fn from(position: Position) -> input_capture::Position {
         match position {
@@ -37,19 +32,12 @@ impl From<Position> for input_capture::Position {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
+#[error("not a valid position: {pos}")]
 pub struct PositionParseError {
-    string: String,
+    pos: String,
 }
 
-impl Display for PositionParseError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "not a valid position: {}", self.string)
-    }
-}
-
-impl Error for PositionParseError {}
-
 impl FromStr for Position {
     type Err = PositionParseError;
 
@@ -59,7 +47,7 @@ impl FromStr for Position {
             "right" => Ok(Self::Right),
             "top" => Ok(Self::Top),
             "bottom" => Ok(Self::Bottom),
-            _ => Err(PositionParseError { string: s.into() }),
+            _ => Err(PositionParseError { pos: s.into() }),
         }
     }
 }
@@ -131,6 +119,8 @@ pub struct ClientState {
     pub active_addr: Option<SocketAddr>,
     /// tracks whether or not the client is responding to pings
     pub alive: bool,
+    /// ips from dns
+    pub dns_ips: Vec<IpAddr>,
     /// all ip addresses associated with a particular client
     /// e.g. Laptops usually have at least an ethernet and a wifi port
     /// which have different ip addresses
@@ -141,27 +131,15 @@ pub struct ClientState {
     pub resolving: bool,
 }
 
+#[derive(Default)]
 pub struct ClientManager {
     clients: Slab<(ClientConfig, ClientState)>,
 }
 
-impl Default for ClientManager {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl ClientManager {
-    pub fn new() -> Self {
-        let clients = Slab::new();
-        Self { clients }
-    }
-
     /// add a new client to this manager
     pub fn add_client(&mut self) -> ClientHandle {
-        let client_config = Default::default();
+        self.clients.insert(Default::default()) as ClientHandle
-        let client_state = Default::default();
-        self.clients.insert((client_config, client_state)) as ClientHandle
     }
 
     /// find a client by its address

src/dns.rs

@@ -1,23 +1,62 @@
-use anyhow::Result;
+use std::net::IpAddr;
-use std::{error::Error, net::IpAddr};
+use tokio::sync::mpsc::Receiver;
 
-use hickory_resolver::TokioAsyncResolver;
+use hickory_resolver::{error::ResolveError, TokioAsyncResolver};
 
-pub struct DnsResolver {
+use crate::{client::ClientHandle, server::Server};
+
+pub(crate) struct DnsResolver {
     resolver: TokioAsyncResolver,
+    dns_request: Receiver<ClientHandle>,
 }
+
 impl DnsResolver {
-    pub(crate) async fn new() -> Result<Self> {
+    pub(crate) fn new(dns_request: Receiver<ClientHandle>) -> Result<Self, ResolveError> {
         let resolver = TokioAsyncResolver::tokio_from_system_conf()?;
-        Ok(Self { resolver })
+        Ok(Self {
+            resolver,
+            dns_request,
+        })
     }
 
-    pub(crate) async fn resolve(&self, host: &str) -> Result<Vec<IpAddr>, Box<dyn Error>> {
+    async fn resolve(&self, host: &str) -> Result<Vec<IpAddr>, ResolveError> {
-        log::info!("resolving {host} ...");
         let response = self.resolver.lookup_ip(host).await?;
         for ip in response.iter() {
             log::info!("{host}: adding ip {ip}");
         }
         Ok(response.iter().collect())
     }
+
+    pub(crate) async fn run(mut self, server: Server) {
+        tokio::select! {
+            _ = server.cancelled() => {},
+            _ = self.do_dns(&server) => {},
+        }
+    }
+
+    async fn do_dns(&mut self, server: &Server) {
+        loop {
+            let handle = self.dns_request.recv().await.expect("channel closed");
+
+            /* update resolving status */
+            let hostname = match server.get_hostname(handle) {
+                Some(hostname) => hostname,
+                None => continue,
+            };
+
+            log::info!("resolving ({handle}) `{hostname}` ...");
+            server.set_resolving(handle, true);
+
+            let ips = match self.resolve(&hostname).await {
+                Ok(ips) => ips,
+                Err(e) => {
+                    log::warn!("could not resolve host '{hostname}': {e}");
+                    vec![]
+                }
+            };
+
+            server.update_dns_ips(handle, ips);
+            server.set_resolving(handle, false);
+        }
+    }
 }

src/frontend.rs

@@ -97,8 +97,6 @@ pub enum FrontendRequest {
     Enumerate(),
     /// resolve dns
     ResolveDns(ClientHandle),
-    /// service shutdown
-    Terminate(),
     /// update hostname
     UpdateHostname(ClientHandle, Option<String>),
     /// update port
@@ -109,6 +107,26 @@ pub enum FrontendRequest {
     UpdateFixIps(ClientHandle, Vec<IpAddr>),
     /// request the state of the given client
     GetState(ClientHandle),
+    /// request reenabling input capture
+    EnableCapture,
+    /// request reenabling input emulation
+    EnableEmulation,
+}
+
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
+pub enum Status {
+    #[default]
+    Disabled,
+    Enabled,
+}
+
+impl From<Status> for bool {
+    fn from(status: Status) -> Self {
+        match status {
+            Status::Enabled => true,
+            Status::Disabled => false,
+        }
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -127,6 +145,10 @@ pub enum FrontendEvent {
     Enumerate(Vec<(ClientHandle, ClientConfig, ClientState)>),
     /// an error occured
     Error(String),
+    /// capture status
+    CaptureStatus(Status),
+    /// emulation status
+    EmulationStatus(Status),
 }
 
 pub struct FrontendListener {
@@ -232,7 +254,7 @@ impl FrontendListener {
         Ok(rx)
     }
 
-    pub(crate) async fn broadcast_event(&mut self, notify: FrontendEvent) -> Result<()> {
+    pub(crate) async fn broadcast(&mut self, notify: FrontendEvent) {
         // encode event
         let json = serde_json::to_string(&notify).unwrap();
         let payload = json.as_bytes();
@@ -256,7 +278,6 @@ impl FrontendListener {
         // could not find a better solution because async
         let mut keep = keep.into_iter();
         self.tx_streams.retain(|_| keep.next().unwrap());
-        Ok(())
     }
 }
 

src/frontend/cli.rs

@@ -273,6 +273,12 @@ impl<'a> Cli<'a> {
             FrontendEvent::Error(e) => {
                 eprintln!("ERROR: {e}");
             }
+            FrontendEvent::CaptureStatus(s) => {
+                eprintln!("capture status: {s:?}")
+            }
+            FrontendEvent::EmulationStatus(s) => {
+                eprintln!("emulation status: {s:?}")
+            }
         }
     }
 

src/frontend/gtk.rs

@@ -8,7 +8,7 @@ use std::{
     process, str,
 };
 
-use crate::frontend::{gtk::window::Window, FrontendRequest};
+use crate::frontend::gtk::window::Window;
 
 use adw::Application;
 use endi::{Endian, ReadBytes};
@@ -113,7 +113,6 @@ fn build_ui(app: &Application) {
     });
 
     let window = Window::new(app, tx);
-    window.request(FrontendRequest::Enumerate());
 
     glib::spawn_future_local(clone!(@weak window => async move {
         loop {
@@ -150,6 +149,12 @@ fn build_ui(app: &Application) {
                     }
                     window.imp().set_port(port);
                 }
+                FrontendEvent::CaptureStatus(s) => {
+                    window.set_capture(s.into());
+                }
+                FrontendEvent::EmulationStatus(s) => {
+                    window.set_emulation(s.into());
+                }
             }
         }
     }));

src/frontend/gtk/window.rs

@@ -207,29 +207,35 @@ impl Window {
     }
 
     pub fn request_port_change(&self) {
-        let port = self.imp().port_entry.get().text().to_string();
+        let port = self
-        if let Ok(port) = port.as_str().parse::<u16>() {
+            .imp()
-            self.request(FrontendRequest::ChangePort(port));
+            .port_entry
-        } else {
+            .get()
-            self.request(FrontendRequest::ChangePort(DEFAULT_PORT));
+            .text()
-        }
+            .as_str()
+            .parse::<u16>()
+            .unwrap_or(DEFAULT_PORT);
+        self.request(FrontendRequest::ChangePort(port));
+    }
+
+    pub fn request_capture(&self) {
+        self.request(FrontendRequest::EnableCapture);
+    }
+
+    pub fn request_emulation(&self) {
+        self.request(FrontendRequest::EnableEmulation);
     }
 
     pub fn request_client_state(&self, client: &ClientObject) {
-        let handle = client.handle();
+        self.request(FrontendRequest::GetState(client.handle()));
-        let event = FrontendRequest::GetState(handle);
-        self.request(event);
     }
 
     pub fn request_client_create(&self) {
-        let event = FrontendRequest::Create;
+        self.request(FrontendRequest::Create);
-        self.request(event);
     }
 
     pub fn request_dns(&self, client: &ClientObject) {
-        let data = client.get_data();
+        self.request(FrontendRequest::ResolveDns(client.get_data().handle));
-        let event = FrontendRequest::ResolveDns(data.handle);
-        self.request(event);
     }
 
     pub fn request_client_update(&self, client: &ClientObject) {
@@ -249,15 +255,11 @@ impl Window {
     }
 
     pub fn request_client_activate(&self, client: &ClientObject, active: bool) {
-        let handle = client.handle();
+        self.request(FrontendRequest::Activate(client.handle(), active));
-        let event = FrontendRequest::Activate(handle, active);
-        self.request(event);
     }
 
     pub fn request_client_delete(&self, client: &ClientObject) {
-        let handle = client.handle();
+        self.request(FrontendRequest::Delete(client.handle()));
-        let event = FrontendRequest::Delete(handle);
-        self.request(event);
     }
 
     pub fn request(&self, event: FrontendRequest) {
@@ -279,4 +281,24 @@ impl Window {
         let toast_overlay = &self.imp().toast_overlay;
         toast_overlay.add_toast(toast);
     }
+
+    pub fn set_capture(&self, active: bool) {
+        self.imp().capture_active.replace(active);
+        self.update_capture_emulation_status();
+    }
+
+    pub fn set_emulation(&self, active: bool) {
+        self.imp().emulation_active.replace(active);
+        self.update_capture_emulation_status();
+    }
+
+    fn update_capture_emulation_status(&self) {
+        let capture = self.imp().capture_active.get();
+        let emulation = self.imp().emulation_active.get();
+        self.imp().capture_status_row.set_visible(!capture);
+        self.imp().emulation_status_row.set_visible(!emulation);
+        self.imp()
+            .capture_emulation_group
+            .set_visible(!capture || !emulation);
+    }
 }

src/frontend/gtk/window/imp.rs

@@ -6,7 +6,7 @@ use std::net::TcpStream;
 use std::os::unix::net::UnixStream;
 
 use adw::subclass::prelude::*;
-use adw::{prelude::*, ActionRow, ToastOverlay};
+use adw::{prelude::*, ActionRow, PreferencesGroup, ToastOverlay};
 use glib::subclass::InitializingObject;
 use gtk::glib::clone;
 use gtk::{gdk, gio, glib, Button, CompositeTemplate, Entry, Label, ListBox};
@@ -30,12 +30,24 @@ pub struct Window {
     pub hostname_label: TemplateChild<Label>,
     #[template_child]
     pub toast_overlay: TemplateChild<ToastOverlay>,
+    #[template_child]
+    pub capture_emulation_group: TemplateChild<PreferencesGroup>,
+    #[template_child]
+    pub capture_status_row: TemplateChild<ActionRow>,
+    #[template_child]
+    pub emulation_status_row: TemplateChild<ActionRow>,
+    #[template_child]
+    pub input_emulation_button: TemplateChild<Button>,
+    #[template_child]
+    pub input_capture_button: TemplateChild<Button>,
     pub clients: RefCell<Option<gio::ListStore>>,
     #[cfg(unix)]
     pub stream: RefCell<Option<UnixStream>>,
     #[cfg(windows)]
     pub stream: RefCell<Option<TcpStream>>,
     pub port: Cell<u16>,
+    pub capture_active: Cell<bool>,
+    pub emulation_active: Cell<bool>,
 }
 
 #[glib::object_subclass]
@@ -100,6 +112,16 @@ impl Window {
         self.port_edit_cancel.set_visible(false);
     }
 
+    #[template_callback]
+    fn handle_emulation(&self) {
+        self.obj().request_emulation();
+    }
+
+    #[template_callback]
+    fn handle_capture(&self) {
+        self.obj().request_capture();
+    }
+
     pub fn set_port(&self, port: u16) {
         self.port.set(port);
         if port == DEFAULT_PORT {

src/main.rs

@@ -37,7 +37,7 @@ pub fn run() -> Result<()> {
         emulation_test::run()?;
     } else if config.daemon {
         // if daemon is specified we run the service
-        run_service(&config)?;
+        run_service(config)?;
     } else {
         //  otherwise start the service as a child process and
         //  run a frontend
@@ -58,7 +58,7 @@ pub fn run() -> Result<()> {
     anyhow::Ok(())
 }
 
-fn run_service(config: &Config) -> Result<()> {
+fn run_service(config: Config) -> Result<()> {
     // create single threaded tokio runtime
     let runtime = tokio::runtime::Builder::new_current_thread()
         .enable_io()
@@ -70,10 +70,8 @@ fn run_service(config: &Config) -> Result<()> {
         // run main loop
         log::info!("Press {:?} to release the mouse", config.release_bind);
 
-        let server = Server::new(config);
+        let mut server = Server::new(config);
-        server
+        server.run().await?;
-            .run(config.capture_backend, config.emulation_backend)
-            .await?;
 
         log::debug!("service exiting");
         anyhow::Ok(())

src/server.rs

@@ -1,27 +1,41 @@
+use capture_task::CaptureEvent;
+use emulation_task::EmulationEvent;
 use log;
 use std::{
     cell::{Cell, RefCell},
-    collections::HashSet,
+    collections::{HashSet, VecDeque},
+    io::ErrorKind,
+    net::{IpAddr, SocketAddr},
     rc::Rc,
 };
-use tokio::signal;
+use tokio::{
+    io::ReadHalf,
+    join, signal,
+    sync::{
+        mpsc::{channel, Sender},
+        Notify,
+    },
+    task::JoinHandle,
+};
+use tokio_util::sync::CancellationToken;
 
 use crate::{
-    client::{ClientConfig, ClientHandle, ClientManager, ClientState},
+    client::{ClientConfig, ClientHandle, ClientManager, ClientState, Position},
-    config::{CaptureBackend, Config, EmulationBackend},
+    config::Config,
-    dns,
+    dns::DnsResolver,
-    frontend::{FrontendListener, FrontendRequest},
+    frontend::{self, FrontendEvent, FrontendListener, FrontendRequest, Status},
-    server::capture_task::CaptureEvent,
 };
 
-use self::{emulation_task::EmulationEvent, resolver_task::DnsRequest};
+#[cfg(unix)]
+use tokio::net::UnixStream;
+
+#[cfg(windows)]
+use tokio::net::TcpStream;
 
 mod capture_task;
 mod emulation_task;
-mod frontend_task;
 mod network_task;
 mod ping_task;
-mod resolver_task;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 enum State {
@@ -37,16 +51,33 @@ enum State {
 #[derive(Clone)]
 pub struct Server {
     active_client: Rc<Cell<Option<ClientHandle>>>,
-    client_manager: Rc<RefCell<ClientManager>>,
+    pub(crate) client_manager: Rc<RefCell<ClientManager>>,
     port: Rc<Cell<u16>>,
     state: Rc<Cell<State>>,
     release_bind: Vec<input_event::scancode::Linux>,
+    notifies: Rc<Notifies>,
+    config: Rc<Config>,
+    pending_frontend_events: Rc<RefCell<VecDeque<FrontendEvent>>>,
+    pending_dns_requests: Rc<RefCell<VecDeque<ClientHandle>>>,
+    capture_status: Rc<Cell<Status>>,
+    emulation_status: Rc<Cell<Status>>,
+}
+
+#[derive(Default)]
+struct Notifies {
+    capture: Notify,
+    emulation: Notify,
+    ping: Notify,
+    port_changed: Notify,
+    frontend_event_pending: Notify,
+    dns_request_pending: Notify,
+    cancel: CancellationToken,
 }
 
 impl Server {
-    pub fn new(config: &Config) -> Self {
+    pub fn new(config: Config) -> Self {
         let active_client = Rc::new(Cell::new(None));
-        let client_manager = Rc::new(RefCell::new(ClientManager::new()));
+        let client_manager = Rc::new(RefCell::new(ClientManager::default()));
         let state = Rc::new(Cell::new(State::Receiving));
         let port = Rc::new(Cell::new(config.port));
         for config_client in config.get_clients() {
@@ -67,153 +98,502 @@ impl Server {
             let c = client_manager.get_mut(handle).expect("invalid handle");
             *c = (client, state);
         }
+
+        // task notification tokens
+        let notifies = Rc::new(Notifies::default());
         let release_bind = config.release_bind.clone();
+
+        let config = Rc::new(config);
+
         Self {
+            config,
             active_client,
             client_manager,
             port,
             state,
             release_bind,
+            notifies,
+            pending_frontend_events: Rc::new(RefCell::new(VecDeque::new())),
+            pending_dns_requests: Rc::new(RefCell::new(VecDeque::new())),
+            capture_status: Default::default(),
+            emulation_status: Default::default(),
         }
     }
 
-    pub async fn run(
+    pub async fn run(&mut self) -> anyhow::Result<()> {
-        &self,
+        // create frontend communication adapter, exit if already running
-        capture_backend: Option<CaptureBackend>,
+        let mut frontend = match FrontendListener::new().await {
-        emulation_backend: Option<EmulationBackend>,
-    ) -> anyhow::Result<()> {
-        // create frontend communication adapter
-        let frontend = match FrontendListener::new().await {
             Some(f) => f?,
             None => {
-                // none means some other instance is already running
                 log::info!("service already running, exiting");
-                return anyhow::Ok(());
+                return Ok(());
             }
         };
 
-        let (timer_tx, timer_rx) = tokio::sync::mpsc::channel(1);
+        let (capture_tx, capture_rx) = channel(1); /* requests for input capture */
-        let (frontend_notify_tx, frontend_notify_rx) = tokio::sync::mpsc::channel(1);
+        let (emulation_tx, emulation_rx) = channel(1); /* emulation requests */
+        let (udp_recv_tx, udp_recv_rx) = channel(1); /* udp receiver */
+        let (udp_send_tx, udp_send_rx) = channel(1); /* udp sender */
+        let (request_tx, mut request_rx) = channel(1); /* frontend requests */
+        let (dns_tx, dns_rx) = channel(1); /* dns requests */
 
         // udp task
-        let (mut udp_task, sender_tx, receiver_rx, port_tx) =
+        let network = network_task::new(self.clone(), udp_recv_tx.clone(), udp_send_rx).await?;
-            network_task::new(self.clone(), frontend_notify_tx.clone()).await?;
 
         // input capture
-        let (mut capture_task, capture_channel) = capture_task::new(
+        let capture = capture_task::new(self.clone(), capture_rx, udp_send_tx.clone());
-            capture_backend,
-            self.clone(),
-            sender_tx.clone(),
-            timer_tx.clone(),
-            self.release_bind.clone(),
-        )?;
 
         // input emulation
-        let (mut emulation_task, emulate_channel) = emulation_task::new(
+        let emulation = emulation_task::new(
-            emulation_backend,
             self.clone(),
-            receiver_rx,
+            emulation_rx,
-            sender_tx.clone(),
+            udp_recv_rx,
-            capture_channel.clone(),
+            udp_send_tx.clone(),
-            timer_tx,
+            capture_tx.clone(),
         );
 
         // create dns resolver
-        let resolver = dns::DnsResolver::new().await?;
+        let resolver = DnsResolver::new(dns_rx)?;
-        let (mut resolver_task, resolve_tx) =
+        let dns_task = tokio::task::spawn_local(resolver.run(self.clone()));
-            resolver_task::new(resolver, self.clone(), frontend_notify_tx);
-
-        // frontend listener
-        let (mut frontend_task, frontend_tx) = frontend_task::new(
-            frontend,
-            frontend_notify_rx,
-            self.clone(),
-            capture_channel.clone(),
-            emulate_channel.clone(),
-            resolve_tx.clone(),
-            port_tx,
-        );
 
         // task that pings clients to see if they are responding
-        let mut ping_task = ping_task::new(
+        let ping = ping_task::new(
             self.clone(),
-            sender_tx.clone(),
+            udp_send_tx.clone(),
-            emulate_channel.clone(),
+            emulation_tx.clone(),
-            capture_channel.clone(),
+            capture_tx.clone(),
-            timer_rx,
         );
 
-        let active = self
+        for handle in self.active_clients() {
-            .client_manager
+            self.request_dns(handle);
-            .borrow()
-            .get_client_states()
-            .filter_map(|(h, (c, s))| {
-                if s.active {
-                    Some((h, c.hostname.clone()))
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        for (handle, hostname) in active {
-            frontend_tx
-                .send(FrontendRequest::Activate(handle, true))
-                .await?;
-            if let Some(hostname) = hostname {
-                let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
-            }
         }
+
         log::info!("running service");
 
-        tokio::select! {
+        let mut join_handles = vec![];
-            _ = signal::ctrl_c() => {
+
-                log::info!("terminating service");
+        loop {
-            }
+            tokio::select! {
-            e = &mut capture_task => {
+                stream = frontend.accept() => {
-                if let Ok(Err(e)) = e {
+                    match stream {
-                    log::error!("error in input capture task: {e}");
+                        Ok(s) => join_handles.push(handle_frontend_stream(self.notifies.cancel.clone(), s, request_tx.clone())),
+                        Err(e) => log::warn!("error accepting frontend connection: {e}"),
+                    };
+                    self.enumerate();
+                    self.notify_frontend(FrontendEvent::EmulationStatus(self.emulation_status.get()));
+                    self.notify_frontend(FrontendEvent::CaptureStatus(self.capture_status.get()));
+                    self.notify_frontend(FrontendEvent::PortChanged(self.port.get(), None));
+                }
+                request = request_rx.recv() => {
+                    let request = request.expect("channel closed");
+                    log::debug!("received frontend request: {request:?}");
+                    self.handle_request(&capture_tx.clone(), &emulation_tx.clone(), request).await;
+                    log::debug!("handled frontend request");
+                }
+                _ = self.notifies.frontend_event_pending.notified() => {
+                    while let Some(event) = {
+                        /* need to drop borrow before next iteration! */
+                        let event = self.pending_frontend_events.borrow_mut().pop_front();
+                        event
+                    } {
+                        frontend.broadcast(event).await;
+                    }
+                },
+                _ = self.notifies.dns_request_pending.notified() => {
+                    while let Some(request) = {
+                        /* need to drop borrow before next iteration! */
+                        let request = self.pending_dns_requests.borrow_mut().pop_front();
+                        request
+                    } {
+                        dns_tx.send(request).await.expect("channel closed");
+                    }
+                }
+                _ = self.cancelled() => break,
+                r = signal::ctrl_c() => {
+                    r.expect("failed to wait for CTRL+C");
+                    break;
                 }
             }
-            e = &mut emulation_task => {
-                if let Ok(Err(e)) = e {
-                    log::error!("error in input emulation task: {e}");
-                }
-            }
-            e = &mut frontend_task => {
-                if let Ok(Err(e)) = e {
-                    log::error!("error in frontend listener: {e}");
-                }
-            }
-            _ = &mut resolver_task => { }
-            _ = &mut udp_task => { }
-            _ = &mut ping_task => { }
         }
 
-        let _ = emulate_channel.send(EmulationEvent::Terminate).await;
+        log::info!("terminating service");
-        let _ = capture_channel.send(CaptureEvent::Terminate).await;
-        let _ = frontend_tx.send(FrontendRequest::Terminate()).await;
 
-        if !capture_task.is_finished() {
+        assert!(!capture_tx.is_closed());
-            if let Err(e) = capture_task.await {
+        assert!(!emulation_tx.is_closed());
-                log::error!("error in input capture task: {e}");
+        assert!(!udp_recv_tx.is_closed());
-            }
+        assert!(!udp_send_tx.is_closed());
-        }
+        assert!(!request_tx.is_closed());
-        if !emulation_task.is_finished() {
+        assert!(!dns_tx.is_closed());
-            if let Err(e) = emulation_task.await {
-                log::error!("error in input emulation task: {e}");
-            }
-        }
 
-        if !frontend_task.is_finished() {
+        self.cancel();
-            if let Err(e) = frontend_task.await {
+        futures::future::join_all(join_handles).await;
-                log::error!("error in frontend listener: {e}");
+        let _ = join!(capture, dns_task, emulation, network, ping);
-            }
-        }
-
-        resolver_task.abort();
-        udp_task.abort();
-        ping_task.abort();
 
         Ok(())
     }
+
+    fn notify_frontend(&self, event: FrontendEvent) {
+        self.pending_frontend_events.borrow_mut().push_back(event);
+        self.notifies.frontend_event_pending.notify_one();
+    }
+
+    fn cancel(&self) {
+        self.notifies.cancel.cancel();
+    }
+
+    pub(crate) async fn cancelled(&self) {
+        self.notifies.cancel.cancelled().await
+    }
+
+    fn is_cancelled(&self) -> bool {
+        self.notifies.cancel.is_cancelled()
+    }
+
+    fn notify_capture(&self) {
+        self.notifies.capture.notify_waiters()
+    }
+
+    async fn capture_notified(&self) {
+        self.notifies.capture.notified().await
+    }
+
+    fn notify_emulation(&self) {
+        self.notifies.emulation.notify_waiters()
+    }
+
+    async fn emulation_notified(&self) {
+        self.notifies.emulation.notified().await
+    }
+
+    fn restart_ping_timer(&self) {
+        self.notifies.ping.notify_waiters()
+    }
+
+    async fn ping_timer_notified(&self) {
+        self.notifies.ping.notified().await
+    }
+
+    fn request_port_change(&self, port: u16) {
+        self.port.replace(port);
+        self.notifies.port_changed.notify_one();
+    }
+
+    fn notify_port_changed(&self, port: u16, msg: Option<String>) {
+        self.port.replace(port);
+        self.notify_frontend(FrontendEvent::PortChanged(port, msg));
+    }
+
+    pub(crate) fn client_updated(&self, handle: ClientHandle) {
+        let state = self.client_manager.borrow().get(handle).cloned();
+        if let Some((config, state)) = state {
+            self.notify_frontend(FrontendEvent::State(handle, config, state));
+        }
+    }
+
+    fn active_clients(&self) -> Vec<ClientHandle> {
+        self.client_manager
+            .borrow()
+            .get_client_states()
+            .filter(|(_, (_, s))| s.active)
+            .map(|(h, _)| h)
+            .collect()
+    }
+
+    fn request_dns(&self, handle: ClientHandle) {
+        self.pending_dns_requests.borrow_mut().push_back(handle);
+        self.notifies.dns_request_pending.notify_one();
+    }
+
+    async fn handle_request(
+        &self,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
+        event: FrontendRequest,
+    ) -> bool {
+        log::debug!("frontend: {event:?}");
+        match event {
+            FrontendRequest::EnableCapture => {
+                log::info!("received capture enable request");
+                self.notify_capture();
+            }
+            FrontendRequest::EnableEmulation => {
+                log::info!("received emulation enable request");
+                self.notify_emulation();
+            }
+            FrontendRequest::Create => {
+                let handle = self.add_client().await;
+                self.request_dns(handle);
+            }
+            FrontendRequest::Activate(handle, active) => {
+                if active {
+                    self.activate_client(capture, emulate, handle).await;
+                } else {
+                    self.deactivate_client(capture, emulate, handle).await;
+                }
+            }
+            FrontendRequest::ChangePort(port) => self.request_port_change(port),
+            FrontendRequest::Delete(handle) => {
+                self.remove_client(capture, emulate, handle).await;
+                self.notify_frontend(FrontendEvent::Deleted(handle));
+            }
+            FrontendRequest::Enumerate() => self.enumerate(),
+            FrontendRequest::GetState(handle) => self.broadcast_client(handle),
+            FrontendRequest::UpdateFixIps(handle, fix_ips) => {
+                self.update_fix_ips(handle, fix_ips);
+                self.request_dns(handle);
+            }
+            FrontendRequest::UpdateHostname(handle, host) => self.update_hostname(handle, host),
+            FrontendRequest::UpdatePort(handle, port) => self.update_port(handle, port),
+            FrontendRequest::UpdatePosition(handle, pos) => {
+                self.update_pos(handle, capture, emulate, pos).await;
+            }
+            FrontendRequest::ResolveDns(handle) => self.request_dns(handle),
+        };
+        false
+    }
+
+    fn enumerate(&self) {
+        let clients = self
+            .client_manager
+            .borrow()
+            .get_client_states()
+            .map(|(h, (c, s))| (h, c.clone(), s.clone()))
+            .collect();
+        self.notify_frontend(FrontendEvent::Enumerate(clients));
+    }
+
+    async fn add_client(&self) -> ClientHandle {
+        let handle = self.client_manager.borrow_mut().add_client();
+        log::info!("added client {handle}");
+        let (c, s) = self.client_manager.borrow().get(handle).unwrap().clone();
+        self.notify_frontend(FrontendEvent::Created(handle, c, s));
+        handle
+    }
+
+    async fn deactivate_client(
+        &self,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
+        handle: ClientHandle,
+    ) {
+        log::debug!("deactivating client {handle}");
+        match self.client_manager.borrow_mut().get_mut(handle) {
+            Some((_, s)) => s.active = false,
+            None => return,
+        };
+
+        let _ = capture.send(CaptureEvent::Destroy(handle)).await;
+        let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
+        log::debug!("deactivating client {handle} done");
+    }
+
+    async fn activate_client(
+        &self,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
+        handle: ClientHandle,
+    ) {
+        log::debug!("activating client");
+        /* deactivate potential other client at this position */
+        let pos = match self.client_manager.borrow().get(handle) {
+            Some((client, _)) => client.pos,
+            None => return,
+        };
+
+        let other = self.client_manager.borrow_mut().find_client(pos);
+        if let Some(other) = other {
+            if other != handle {
+                self.deactivate_client(capture, emulate, other).await;
+            }
+        }
+
+        /* activate the client */
+        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
+            s.active = true;
+        } else {
+            return;
+        };
+
+        /* notify emulation, capture and frontends */
+        let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
+        let _ = emulate.send(EmulationEvent::Create(handle)).await;
+        log::debug!("activating client {handle} done");
+    }
+
+    async fn remove_client(
+        &self,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
+        handle: ClientHandle,
+    ) {
+        let Some(active) = self
+            .client_manager
+            .borrow_mut()
+            .remove_client(handle)
+            .map(|(_, s)| s.active)
+        else {
+            return;
+        };
+
+        if active {
+            let _ = capture.send(CaptureEvent::Destroy(handle)).await;
+            let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
+        }
+    }
+
+    fn update_fix_ips(&self, handle: ClientHandle, fix_ips: Vec<IpAddr>) {
+        if let Some((c, _)) = self.client_manager.borrow_mut().get_mut(handle) {
+            c.fix_ips = fix_ips;
+        };
+        self.update_ips(handle);
+    }
+
+    pub(crate) fn update_dns_ips(&self, handle: ClientHandle, dns_ips: Vec<IpAddr>) {
+        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
+            s.dns_ips = dns_ips;
+        };
+        self.update_ips(handle);
+    }
+
+    fn update_ips(&self, handle: ClientHandle) {
+        if let Some((c, s)) = self.client_manager.borrow_mut().get_mut(handle) {
+            s.ips = c
+                .fix_ips
+                .iter()
+                .cloned()
+                .chain(s.dns_ips.iter().cloned())
+                .collect::<HashSet<_>>();
+        }
+    }
+
+    fn update_hostname(&self, handle: ClientHandle, hostname: Option<String>) {
+        let mut client_manager = self.client_manager.borrow_mut();
+        let Some((c, s)) = client_manager.get_mut(handle) else {
+            return;
+        };
+
+        // hostname changed
+        if c.hostname != hostname {
+            c.hostname = hostname;
+            s.ips = HashSet::from_iter(c.fix_ips.iter().cloned());
+            s.active_addr = None;
+            self.request_dns(handle);
+        }
+    }
+
+    fn update_port(&self, handle: ClientHandle, port: u16) {
+        let mut client_manager = self.client_manager.borrow_mut();
+        let Some((c, s)) = client_manager.get_mut(handle) else {
+            return;
+        };
+
+        if c.port != port {
+            c.port = port;
+            s.active_addr = s.active_addr.map(|a| SocketAddr::new(a.ip(), port));
+        }
+    }
+
+    async fn update_pos(
+        &self,
+        handle: ClientHandle,
+        capture: &Sender<CaptureEvent>,
+        emulate: &Sender<EmulationEvent>,
+        pos: Position,
+    ) {
+        let (changed, active) = {
+            let mut client_manager = self.client_manager.borrow_mut();
+            let Some((c, s)) = client_manager.get_mut(handle) else {
+                return;
+            };
+
+            let changed = c.pos != pos;
+            c.pos = pos;
+            (changed, s.active)
+        };
+
+        // update state in event input emulator & input capture
+        if changed {
+            if active {
+                let _ = capture.send(CaptureEvent::Destroy(handle)).await;
+                let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
+            }
+            let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
+            let _ = emulate.send(EmulationEvent::Create(handle)).await;
+        }
+    }
+
+    fn broadcast_client(&self, handle: ClientHandle) {
+        let client = self.client_manager.borrow().get(handle).cloned();
+        let event = if let Some((config, state)) = client {
+            FrontendEvent::State(handle, config, state)
+        } else {
+            FrontendEvent::NoSuchClient(handle)
+        };
+        self.notify_frontend(event);
+    }
+
+    fn set_emulation_status(&self, status: Status) {
+        self.emulation_status.replace(status);
+        let status = FrontendEvent::EmulationStatus(status);
+        self.notify_frontend(status);
+    }
+
+    fn set_capture_status(&self, status: Status) {
+        self.capture_status.replace(status);
+        let status = FrontendEvent::CaptureStatus(status);
+        self.notify_frontend(status);
+    }
+
+    pub(crate) fn set_resolving(&self, handle: ClientHandle, status: bool) {
+        if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
+            s.resolving = status;
+        }
+        self.client_updated(handle);
+    }
+
+    pub(crate) fn get_hostname(&self, handle: u64) -> Option<String> {
+        self.client_manager
+            .borrow_mut()
+            .get_mut(handle)
+            .and_then(|(c, _)| c.hostname.clone())
+    }
+}
+
+async fn listen_frontend(
+    request_tx: Sender<FrontendRequest>,
+    #[cfg(unix)] mut stream: ReadHalf<UnixStream>,
+    #[cfg(windows)] mut stream: ReadHalf<TcpStream>,
+) {
+    use std::io;
+    loop {
+        let request = frontend::wait_for_request(&mut stream).await;
+        match request {
+            Ok(request) => {
+                let _ = request_tx.send(request).await;
+            }
+            Err(e) => {
+                if let Some(e) = e.downcast_ref::<io::Error>() {
+                    if e.kind() == ErrorKind::UnexpectedEof {
+                        return;
+                    }
+                }
+                log::error!("error reading frontend event: {e}");
+                return;
+            }
+        }
+    }
+}
+
+fn handle_frontend_stream(
+    cancel: CancellationToken,
+    #[cfg(unix)] stream: ReadHalf<UnixStream>,
+    #[cfg(windows)] stream: ReadHalf<TcpStream>,
+    request_tx: Sender<FrontendRequest>,
+) -> JoinHandle<()> {
+    tokio::task::spawn_local(async move {
+        tokio::select! {
+            _ = listen_frontend(request_tx, stream) => {},
+            _ = cancel.cancelled() => {},
+        }
+    })
 }

src/server/capture_task.rs

@@ -1,70 +1,122 @@
-use anyhow::{anyhow, Result};
 use futures::StreamExt;
 use std::{collections::HashSet, net::SocketAddr};
 
-use tokio::{process::Command, sync::mpsc::Sender, task::JoinHandle};
+use tokio::{
+    process::Command,
+    sync::mpsc::{Receiver, Sender},
+    task::JoinHandle,
+};
 
-use input_capture::{self, error::CaptureCreationError, CaptureHandle, InputCapture, Position};
+use input_capture::{self, CaptureError, CaptureHandle, InputCapture, InputCaptureError, Position};
 
 use input_event::{scancode, Event, KeyboardEvent};
 
-use crate::{client::ClientHandle, config::CaptureBackend, server::State};
+use crate::{client::ClientHandle, frontend::Status, server::State};
 
 use super::Server;
 
 #[derive(Clone, Copy, Debug)]
-pub enum CaptureEvent {
+pub(crate) enum CaptureEvent {
     /// capture must release the mouse
     Release,
     /// add a capture client
     Create(CaptureHandle, Position),
     /// destory a capture client
     Destroy(CaptureHandle),
-    /// termination signal
-    Terminate,
 }
 
-pub fn new(
+pub(crate) fn new(
-    backend: Option<CaptureBackend>,
     server: Server,
+    capture_rx: Receiver<CaptureEvent>,
+    udp_send: Sender<(Event, SocketAddr)>,
+) -> JoinHandle<()> {
+    let backend = server.config.capture_backend.map(|b| b.into());
+    tokio::task::spawn_local(capture_task(server, backend, udp_send, capture_rx))
+}
+
+async fn capture_task(
+    server: Server,
+    backend: Option<input_capture::Backend>,
     sender_tx: Sender<(Event, SocketAddr)>,
-    timer_tx: Sender<()>,
+    mut notify_rx: Receiver<CaptureEvent>,
-    release_bind: Vec<scancode::Linux>,
+) {
-) -> Result<(JoinHandle<Result<()>>, Sender<CaptureEvent>), CaptureCreationError> {
+    loop {
-    let (tx, mut rx) = tokio::sync::mpsc::channel(32);
+        if let Err(e) = do_capture(backend, &server, &sender_tx, &mut notify_rx).await {
-    let backend = backend.map(|b| b.into());
+            log::warn!("input capture exited: {e}");
-    let task = tokio::task::spawn_local(async move {
+        }
-        let mut capture = input_capture::create(backend).await?;
+        server.set_capture_status(Status::Disabled);
-        let mut pressed_keys = HashSet::new();
+        if server.is_cancelled() {
+            break;
+        }
+
+        // allow cancellation
         loop {
             tokio::select! {
-                event = capture.next() => {
+                _ = notify_rx.recv() => continue, /* need to ignore requests here! */
-                    match event {
+                _ = server.capture_notified() => break,
-                        Some(Ok(event)) => handle_capture_event(&server, &mut capture, &sender_tx, &timer_tx, event, &mut pressed_keys, &release_bind).await?,
+                _ = server.cancelled() => return,
-                        Some(Err(e)) => return Err(anyhow!("input capture: {e:?}")),
-                        None => return Err(anyhow!("input capture terminated")),
-                    }
-                }
-                e = rx.recv() => {
-                    log::debug!("input capture notify rx: {e:?}");
-                    match e {
-                        Some(e) => match e {
-                            CaptureEvent::Release => {
-                                capture.release()?;
-                                server.state.replace(State::Receiving);
-                            }
-                            CaptureEvent::Create(h, p) => capture.create(h, p)?,
-                            CaptureEvent::Destroy(h) => capture.destroy(h)?,
-                            CaptureEvent::Terminate => break,
-                        },
-                        None => break,
-                    }
-                }
             }
         }
-        anyhow::Ok(())
+    }
-    });
+}
-    Ok((task, tx))
+
+async fn do_capture(
+    backend: Option<input_capture::Backend>,
+    server: &Server,
+    sender_tx: &Sender<(Event, SocketAddr)>,
+    notify_rx: &mut Receiver<CaptureEvent>,
+) -> Result<(), InputCaptureError> {
+    /* allow cancelling capture request */
+    let mut capture = tokio::select! {
+        r = input_capture::create(backend) => {
+            r?
+        },
+        _ = server.cancelled() => return Ok(()),
+    };
+
+    server.set_capture_status(Status::Enabled);
+
+    // FIXME DUPLICATES
+    let clients = server
+        .client_manager
+        .borrow()
+        .get_client_states()
+        .map(|(h, s)| (h, s.clone()))
+        .collect::<Vec<_>>();
+    log::info!("{clients:?}");
+    for (handle, (config, _state)) in clients {
+        capture.create(handle, config.pos.into()).await?;
+    }
+
+    let mut pressed_keys = HashSet::new();
+    loop {
+        tokio::select! {
+            event = capture.next() => {
+                match event {
+                    Some(Ok(event)) => handle_capture_event(server, &mut capture, sender_tx, event, &mut pressed_keys).await?,
+                    Some(Err(e)) => return Err(e.into()),
+                    None => return Ok(()),
+                }
+            }
+            e = notify_rx.recv() => {
+                log::debug!("input capture notify rx: {e:?}");
+                match e {
+                    Some(e) => match e {
+                        CaptureEvent::Release => {
+                            capture.release().await?;
+                            server.state.replace(State::Receiving);
+                        }
+                        CaptureEvent::Create(h, p) => capture.create(h, p).await?,
+                        CaptureEvent::Destroy(h) => capture.destroy(h).await?,
+                    },
+                    None => break,
+                }
+            }
+            _ = server.cancelled() => break,
+        }
+    }
+    capture.terminate().await?;
+    Ok(())
 }
 
 fn update_pressed_keys(pressed_keys: &mut HashSet<scancode::Linux>, key: u32, state: u8) {
@@ -81,21 +133,19 @@ async fn handle_capture_event(
     server: &Server,
     capture: &mut Box<dyn InputCapture>,
     sender_tx: &Sender<(Event, SocketAddr)>,
-    timer_tx: &Sender<()>,
     event: (CaptureHandle, Event),
     pressed_keys: &mut HashSet<scancode::Linux>,
-    release_bind: &[scancode::Linux],
+) -> Result<(), CaptureError> {
-) -> Result<()> {
     let (handle, mut e) = event;
     log::trace!("({handle}) {e:?}");
 
     if let Event::Keyboard(KeyboardEvent::Key { key, state, .. }) = e {
         update_pressed_keys(pressed_keys, key, state);
         log::debug!("{pressed_keys:?}");
-        if release_bind.iter().all(|k| pressed_keys.contains(k)) {
+        if server.release_bind.iter().all(|k| pressed_keys.contains(k)) {
             pressed_keys.clear();
             log::info!("releasing pointer");
-            capture.release()?;
+            capture.release().await?;
             server.state.replace(State::Receiving);
             log::trace!("STATE ===> Receiving");
             // send an event to release all the modifiers
@@ -103,44 +153,49 @@ async fn handle_capture_event(
         }
     }
 
-    let (addr, enter, start_timer) = {
+    let info = {
         let mut enter = false;
         let mut start_timer = false;
 
         // get client state for handle
         let mut client_manager = server.client_manager.borrow_mut();
-        let client_state = match client_manager.get_mut(handle) {
+        let client_state = client_manager.get_mut(handle).map(|(_, s)| s);
-            Some((_, s)) => s,
+        if let Some(client_state) = client_state {
-            None => {
+            // if we just entered the client we want to send additional enter events until
-                // should not happen
+            // we get a leave event
-                log::warn!("unknown client!");
+            if let Event::Enter() = e {
-                capture.release()?;
+                server.state.replace(State::AwaitingLeave);
-                server.state.replace(State::Receiving);
+                server.active_client.replace(Some(handle));
-                log::trace!("STATE ===> Receiving");
+                log::trace!("Active client => {}", handle);
-                return Ok(());
+                start_timer = true;
+                log::trace!("STATE ===> AwaitingLeave");
+                enter = true;
+            } else {
+                // ignore any potential events in receiving mode
+                if server.state.get() == State::Receiving && e != Event::Disconnect() {
+                    return Ok(());
+                }
             }
-        };
+            Some((client_state.active_addr, enter, start_timer))
-
-        // if we just entered the client we want to send additional enter events until
-        // we get a leave event
-        if let Event::Enter() = e {
-            server.state.replace(State::AwaitingLeave);
-            server.active_client.replace(Some(handle));
-            log::trace!("Active client => {}", handle);
-            start_timer = true;
-            log::trace!("STATE ===> AwaitingLeave");
-            enter = true;
         } else {
-            // ignore any potential events in receiving mode
+            None
-            if server.state.get() == State::Receiving && e != Event::Disconnect() {
-                return Ok(());
-            }
         }
-
-        (client_state.active_addr, enter, start_timer)
     };
+
+    let (addr, enter, start_timer) = match info {
+        Some(i) => i,
+        None => {
+            // should not happen
+            log::warn!("unknown client!");
+            capture.release().await?;
+            server.state.replace(State::Receiving);
+            log::trace!("STATE ===> Receiving");
+            return Ok(());
+        }
+    };
+
     if start_timer {
-        let _ = timer_tx.try_send(());
+        server.restart_ping_timer();
     }
     if enter {
         spawn_hook_command(server, handle);

src/server/emulation_task.rs

@@ -1,6 +1,5 @@
 use std::net::SocketAddr;
 
-use thiserror::Error;
 use tokio::{
     sync::mpsc::{Receiver, Sender},
     task::JoinHandle,
@@ -8,102 +7,130 @@ use tokio::{
 
 use crate::{
     client::{ClientHandle, ClientManager},
-    config::EmulationBackend,
+    frontend::Status,
     server::State,
 };
-use input_emulation::{
+use input_emulation::{self, EmulationError, EmulationHandle, InputEmulation, InputEmulationError};
-    self,
-    error::{EmulationCreationError, EmulationError},
-    EmulationHandle, InputEmulation,
-};
 use input_event::{Event, KeyboardEvent};
 
 use super::{network_task::NetworkError, CaptureEvent, Server};
 
 #[derive(Clone, Debug)]
-pub enum EmulationEvent {
+pub(crate) enum EmulationEvent {
     /// create a new client
     Create(EmulationHandle),
     /// destroy a client
     Destroy(EmulationHandle),
     /// input emulation must release keys for client
     ReleaseKeys(ClientHandle),
-    /// termination signal
-    Terminate,
 }
 
-pub fn new(
+pub(crate) fn new(
-    backend: Option<EmulationBackend>,
     server: Server,
+    emulation_rx: Receiver<EmulationEvent>,
     udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,
     sender_tx: Sender<(Event, SocketAddr)>,
     capture_tx: Sender<CaptureEvent>,
-    timer_tx: Sender<()>,
+) -> JoinHandle<()> {
-) -> (
+    let emulation_task = emulation_task(server, emulation_rx, udp_rx, sender_tx, capture_tx);
-    JoinHandle<Result<(), LanMouseEmulationError>>,
+    tokio::task::spawn_local(emulation_task)
-    Sender<EmulationEvent>,
-) {
-    let (tx, rx) = tokio::sync::mpsc::channel(32);
-    let emulation_task =
-        emulation_task(backend, rx, server, udp_rx, sender_tx, capture_tx, timer_tx);
-    let emulate_task = tokio::task::spawn_local(emulation_task);
-    (emulate_task, tx)
-}
-
-#[derive(Debug, Error)]
-pub enum LanMouseEmulationError {
-    #[error("error creating input-emulation: `{0}`")]
-    Create(#[from] EmulationCreationError),
-    #[error("error emulating input: `{0}`")]
-    Emulate(#[from] EmulationError),
 }
 
 async fn emulation_task(
-    backend: Option<EmulationBackend>,
-    mut rx: Receiver<EmulationEvent>,
     server: Server,
+    mut rx: Receiver<EmulationEvent>,
     mut udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,
     sender_tx: Sender<(Event, SocketAddr)>,
     capture_tx: Sender<CaptureEvent>,
-    timer_tx: Sender<()>,
+) {
-) -> Result<(), LanMouseEmulationError> {
-    let backend = backend.map(|b| b.into());
-    let mut emulation = input_emulation::create(backend).await?;
-
-    let mut last_ignored = None;
     loop {
-        tokio::select! {
+        if let Err(e) = do_emulation(&server, &mut rx, &mut udp_rx, &sender_tx, &capture_tx).await {
-            udp_event = udp_rx.recv() => {
+            log::warn!("input emulation exited: {e}");
-                let udp_event = match udp_event {
+        }
-                    Some(Ok(e)) => e,
+        server.set_emulation_status(Status::Disabled);
-                    Some(Err(e)) => {
+        if server.is_cancelled() {
-                        log::warn!("network error: {e}");
+            break;
-                        continue;
+        }
-                    }
+
-                    None => break,
+        // allow cancellation
-                };
+        loop {
-                handle_udp_rx(&server, &capture_tx, &mut emulation, &sender_tx, &mut last_ignored, udp_event, &timer_tx).await?;
+            tokio::select! {
-            }
+                _ = rx.recv() => continue, /* need to ignore requests here! */
-            emulate_event = rx.recv() => {
+                _ = server.emulation_notified() => break,
-                match emulate_event {
+                _ = server.cancelled() => return,
-                    Some(e) => match e {
-                        EmulationEvent::Create(h) => emulation.create(h).await,
-                        EmulationEvent::Destroy(h) => emulation.destroy(h).await,
-                        EmulationEvent::ReleaseKeys(c) => release_keys(&server, &mut emulation, c).await?,
-                        EmulationEvent::Terminate => break,
-                    },
-                    None => break,
-                }
             }
         }
     }
+}
+
+async fn do_emulation(
+    server: &Server,
+    rx: &mut Receiver<EmulationEvent>,
+    udp_rx: &mut Receiver<Result<(Event, SocketAddr), NetworkError>>,
+    sender_tx: &Sender<(Event, SocketAddr)>,
+    capture_tx: &Sender<CaptureEvent>,
+) -> Result<(), InputEmulationError> {
+    let backend = server.config.emulation_backend.map(|b| b.into());
+    log::info!("creating input emulation...");
+    let mut emulation = tokio::select! {
+        r = input_emulation::create(backend) => {
+            r?
+        }
+        _ = server.cancelled() => return Ok(()),
+    };
+
+    server.set_emulation_status(Status::Enabled);
+
+    // add clients
+    for handle in server.active_clients() {
+        emulation.create(handle).await;
+    }
+
+    let res = do_emulation_session(server, &mut emulation, rx, udp_rx, sender_tx, capture_tx).await;
+
+    emulation.terminate().await;
+    res?;
 
     // release potentially still pressed keys
-    release_all_keys(&server, &mut emulation).await?;
+    release_all_keys(server, &mut emulation).await?;
 
     Ok(())
 }
 
+async fn do_emulation_session(
+    server: &Server,
+    emulation: &mut Box<dyn InputEmulation>,
+    rx: &mut Receiver<EmulationEvent>,
+    udp_rx: &mut Receiver<Result<(Event, SocketAddr), NetworkError>>,
+    sender_tx: &Sender<(Event, SocketAddr)>,
+    capture_tx: &Sender<CaptureEvent>,
+) -> Result<(), InputEmulationError> {
+    let mut last_ignored = None;
+
+    loop {
+        tokio::select! {
+            udp_event = udp_rx.recv() => {
+                let udp_event = match udp_event.expect("channel closed") {
+                    Ok(e) => e,
+                    Err(e) => {
+                        log::warn!("network error: {e}");
+                        continue;
+                    }
+                };
+                handle_udp_rx(server, capture_tx, emulation, sender_tx, &mut last_ignored, udp_event).await?;
+            }
+            emulate_event = rx.recv() => {
+                match emulate_event.expect("channel closed") {
+                    EmulationEvent::Create(h) => emulation.create(h).await,
+                    EmulationEvent::Destroy(h) => emulation.destroy(h).await,
+                    EmulationEvent::ReleaseKeys(c) => release_keys(server, emulation, c).await?,
+                }
+            }
+            _ = server.notifies.cancel.cancelled() => break Ok(()),
+        }
+    }
+}
+
 async fn handle_udp_rx(
     server: &Server,
     capture_tx: &Sender<CaptureEvent>,
@@ -111,7 +138,6 @@ async fn handle_udp_rx(
     sender_tx: &Sender<(Event, SocketAddr)>,
     last_ignored: &mut Option<SocketAddr>,
     event: (Event, SocketAddr),
-    timer_tx: &Sender<()>,
 ) -> Result<(), EmulationError> {
     let (event, addr) = event;
 
@@ -161,7 +187,7 @@ async fn handle_udp_rx(
                             );
                             // restart timer if necessary
                             if restart_timer {
-                                let _ = timer_tx.try_send(());
+                                server.restart_ping_timer();
                             }
                             ignore_event
                         } else {

src/server/frontend_task.rs

@@ -1,350 +0,0 @@
-use std::{
-    collections::HashSet,
-    io::ErrorKind,
-    net::{IpAddr, SocketAddr},
-};
-#[cfg(unix)]
-use tokio::net::UnixStream;
-
-#[cfg(windows)]
-use tokio::net::TcpStream;
-
-use anyhow::{anyhow, Result};
-use tokio::{
-    io::ReadHalf,
-    sync::mpsc::{Receiver, Sender},
-    task::JoinHandle,
-};
-
-use crate::{
-    client::{ClientHandle, Position},
-    frontend::{self, FrontendEvent, FrontendListener, FrontendRequest},
-};
-
-use super::{
-    capture_task::CaptureEvent, emulation_task::EmulationEvent, resolver_task::DnsRequest, Server,
-};
-
-pub(crate) fn new(
-    mut frontend: FrontendListener,
-    mut notify_rx: Receiver<FrontendEvent>,
-    server: Server,
-    capture: Sender<CaptureEvent>,
-    emulate: Sender<EmulationEvent>,
-    resolve_ch: Sender<DnsRequest>,
-    port_tx: Sender<u16>,
-) -> (JoinHandle<Result<()>>, Sender<FrontendRequest>) {
-    let (event_tx, mut event_rx) = tokio::sync::mpsc::channel(32);
-    let event_tx_clone = event_tx.clone();
-    let frontend_task = tokio::task::spawn_local(async move {
-        loop {
-            tokio::select! {
-                stream = frontend.accept() => {
-                    let stream = match stream {
-                        Ok(s) => s,
-                        Err(e) => {
-                            log::warn!("error accepting frontend connection: {e}");
-                            continue;
-                        }
-                    };
-                    handle_frontend_stream(&event_tx_clone, stream).await;
-                }
-                event = event_rx.recv() => {
-                    let frontend_event = event.ok_or(anyhow!("frontend channel closed"))?;
-                    if handle_frontend_event(&server, &capture, &emulate, &resolve_ch, &mut frontend, &port_tx, frontend_event).await {
-                        break;
-                    }
-                }
-                notify = notify_rx.recv() => {
-                    let notify = notify.ok_or(anyhow!("frontend notify closed"))?;
-                    let _ = frontend.broadcast_event(notify).await;
-                }
-            }
-        }
-        anyhow::Ok(())
-    });
-    (frontend_task, event_tx)
-}
-
-async fn handle_frontend_stream(
-    frontend_tx: &Sender<FrontendRequest>,
-    #[cfg(unix)] mut stream: ReadHalf<UnixStream>,
-    #[cfg(windows)] mut stream: ReadHalf<TcpStream>,
-) {
-    use std::io;
-
-    let tx = frontend_tx.clone();
-    tokio::task::spawn_local(async move {
-        loop {
-            let request = frontend::wait_for_request(&mut stream).await;
-            match request {
-                Ok(request) => {
-                    let _ = tx.send(request).await;
-                }
-                Err(e) => {
-                    if let Some(e) = e.downcast_ref::<io::Error>() {
-                        if e.kind() == ErrorKind::UnexpectedEof {
-                            return;
-                        }
-                    }
-                    log::error!("error reading frontend event: {e}");
-                    return;
-                }
-            }
-        }
-    });
-}
-
-async fn handle_frontend_event(
-    server: &Server,
-    capture: &Sender<CaptureEvent>,
-    emulate: &Sender<EmulationEvent>,
-    resolve_tx: &Sender<DnsRequest>,
-    frontend: &mut FrontendListener,
-    port_tx: &Sender<u16>,
-    event: FrontendRequest,
-) -> bool {
-    log::debug!("frontend: {event:?}");
-    match event {
-        FrontendRequest::Create => {
-            let handle = add_client(server, frontend).await;
-            resolve_dns(server, resolve_tx, handle).await;
-        }
-        FrontendRequest::Activate(handle, active) => {
-            if active {
-                activate_client(server, capture, emulate, handle).await;
-            } else {
-                deactivate_client(server, capture, emulate, handle).await;
-            }
-        }
-        FrontendRequest::ChangePort(port) => {
-            let _ = port_tx.send(port).await;
-        }
-        FrontendRequest::Delete(handle) => {
-            remove_client(server, capture, emulate, handle).await;
-            broadcast(frontend, FrontendEvent::Deleted(handle)).await;
-        }
-        FrontendRequest::Enumerate() => {
-            let clients = server
-                .client_manager
-                .borrow()
-                .get_client_states()
-                .map(|(h, (c, s))| (h, c.clone(), s.clone()))
-                .collect();
-            broadcast(frontend, FrontendEvent::Enumerate(clients)).await;
-        }
-        FrontendRequest::GetState(handle) => {
-            broadcast_client(server, frontend, handle).await;
-        }
-        FrontendRequest::Terminate() => {
-            log::info!("terminating gracefully...");
-            return true;
-        }
-        FrontendRequest::UpdateFixIps(handle, fix_ips) => {
-            update_fix_ips(server, handle, fix_ips).await;
-            resolve_dns(server, resolve_tx, handle).await;
-        }
-        FrontendRequest::UpdateHostname(handle, hostname) => {
-            update_hostname(server, resolve_tx, handle, hostname).await;
-            resolve_dns(server, resolve_tx, handle).await;
-        }
-        FrontendRequest::UpdatePort(handle, port) => {
-            update_port(server, handle, port).await;
-        }
-        FrontendRequest::UpdatePosition(handle, pos) => {
-            update_pos(server, handle, capture, emulate, pos).await;
-        }
-        FrontendRequest::ResolveDns(handle) => {
-            resolve_dns(server, resolve_tx, handle).await;
-        }
-    };
-    false
-}
-
-async fn resolve_dns(server: &Server, resolve_tx: &Sender<DnsRequest>, handle: ClientHandle) {
-    let hostname = server
-        .client_manager
-        .borrow()
-        .get(handle)
-        .and_then(|(c, _)| c.hostname.clone());
-    if let Some(hostname) = hostname {
-        let _ = resolve_tx
-            .send(DnsRequest {
-                hostname: hostname.clone(),
-                handle,
-            })
-            .await;
-    }
-}
-
-async fn broadcast(frontend: &mut FrontendListener, event: FrontendEvent) {
-    if let Err(e) = frontend.broadcast_event(event).await {
-        log::error!("error notifying frontend: {e}");
-    }
-}
-
-pub async fn add_client(server: &Server, frontend: &mut FrontendListener) -> ClientHandle {
-    let handle = server.client_manager.borrow_mut().add_client();
-    log::info!("added client {handle}");
-
-    let (c, s) = server.client_manager.borrow().get(handle).unwrap().clone();
-    broadcast(frontend, FrontendEvent::Created(handle, c, s)).await;
-    handle
-}
-
-pub async fn deactivate_client(
-    server: &Server,
-    capture: &Sender<CaptureEvent>,
-    emulate: &Sender<EmulationEvent>,
-    handle: ClientHandle,
-) {
-    match server.client_manager.borrow_mut().get_mut(handle) {
-        Some((_, s)) => {
-            s.active = false;
-        }
-        None => return,
-    };
-
-    let _ = capture.send(CaptureEvent::Destroy(handle)).await;
-    let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
-}
-
-pub async fn activate_client(
-    server: &Server,
-    capture: &Sender<CaptureEvent>,
-    emulate: &Sender<EmulationEvent>,
-    handle: ClientHandle,
-) {
-    /* deactivate potential other client at this position */
-    let pos = match server.client_manager.borrow().get(handle) {
-        Some((client, _)) => client.pos,
-        None => return,
-    };
-
-    let other = server.client_manager.borrow_mut().find_client(pos);
-    if let Some(other) = other {
-        if other != handle {
-            deactivate_client(server, capture, emulate, other).await;
-        }
-    }
-
-    /* activate the client */
-    if let Some((_, s)) = server.client_manager.borrow_mut().get_mut(handle) {
-        s.active = true;
-    } else {
-        return;
-    };
-
-    /* notify emulation, capture and frontends */
-    let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
-    let _ = emulate.send(EmulationEvent::Create(handle)).await;
-}
-
-pub async fn remove_client(
-    server: &Server,
-    capture: &Sender<CaptureEvent>,
-    emulate: &Sender<EmulationEvent>,
-    handle: ClientHandle,
-) {
-    let Some(active) = server
-        .client_manager
-        .borrow_mut()
-        .remove_client(handle)
-        .map(|(_, s)| s.active)
-    else {
-        return;
-    };
-
-    if active {
-        let _ = capture.send(CaptureEvent::Destroy(handle)).await;
-        let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
-    }
-}
-
-async fn update_fix_ips(server: &Server, handle: ClientHandle, fix_ips: Vec<IpAddr>) {
-    let mut client_manager = server.client_manager.borrow_mut();
-    let Some((c, _)) = client_manager.get_mut(handle) else {
-        return;
-    };
-
-    c.fix_ips = fix_ips;
-}
-
-async fn update_hostname(
-    server: &Server,
-    resolve_tx: &Sender<DnsRequest>,
-    handle: ClientHandle,
-    hostname: Option<String>,
-) {
-    let hostname = {
-        let mut client_manager = server.client_manager.borrow_mut();
-        let Some((c, s)) = client_manager.get_mut(handle) else {
-            return;
-        };
-
-        // update hostname
-        if c.hostname != hostname {
-            c.hostname = hostname;
-            s.ips = HashSet::from_iter(c.fix_ips.iter().cloned());
-            s.active_addr = None;
-            c.hostname.clone()
-        } else {
-            None
-        }
-    };
-
-    // resolve to update ips in state
-    if let Some(hostname) = hostname {
-        let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
-    }
-}
-
-async fn update_port(server: &Server, handle: ClientHandle, port: u16) {
-    let mut client_manager = server.client_manager.borrow_mut();
-    let Some((c, s)) = client_manager.get_mut(handle) else {
-        return;
-    };
-
-    if c.port != port {
-        c.port = port;
-        s.active_addr = s.active_addr.map(|a| SocketAddr::new(a.ip(), port));
-    }
-}
-
-async fn update_pos(
-    server: &Server,
-    handle: ClientHandle,
-    capture: &Sender<CaptureEvent>,
-    emulate: &Sender<EmulationEvent>,
-    pos: Position,
-) {
-    let (changed, active) = {
-        let mut client_manager = server.client_manager.borrow_mut();
-        let Some((c, s)) = client_manager.get_mut(handle) else {
-            return;
-        };
-
-        let changed = c.pos != pos;
-        c.pos = pos;
-        (changed, s.active)
-    };
-
-    // update state in event input emulator & input capture
-    if changed {
-        if active {
-            let _ = capture.send(CaptureEvent::Destroy(handle)).await;
-            let _ = emulate.send(EmulationEvent::Destroy(handle)).await;
-        }
-        let _ = capture.send(CaptureEvent::Create(handle, pos.into())).await;
-        let _ = emulate.send(EmulationEvent::Create(handle)).await;
-    }
-}
-
-async fn broadcast_client(server: &Server, frontend: &mut FrontendListener, handle: ClientHandle) {
-    let client = server.client_manager.borrow().get(handle).cloned();
-    if let Some((config, state)) = client {
-        broadcast(frontend, FrontendEvent::State(handle, config, state)).await;
-    } else {
-        broadcast(frontend, FrontendEvent::NoSuchClient(handle)).await;
-    }
-}

src/server/network_task.rs

@@ -7,71 +7,57 @@ use tokio::{
     task::JoinHandle,
 };
 
-use crate::frontend::FrontendEvent;
 use input_event::{Event, ProtocolError};
 
 use super::Server;
 
-pub async fn new(
+pub(crate) async fn new(
     server: Server,
-    frontend_notify_tx: Sender<FrontendEvent>,
+    udp_recv_tx: Sender<Result<(Event, SocketAddr), NetworkError>>,
-) -> io::Result<(
+    udp_send_rx: Receiver<(Event, SocketAddr)>,
-    JoinHandle<()>,
+) -> io::Result<JoinHandle<()>> {
-    Sender<(Event, SocketAddr)>,
-    Receiver<Result<(Event, SocketAddr), NetworkError>>,
-    Sender<u16>,
-)> {
     // bind the udp socket
     let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), server.port.get());
     let mut socket = UdpSocket::bind(listen_addr).await?;
-    let (receiver_tx, receiver_rx) = tokio::sync::mpsc::channel(32);
-    let (sender_tx, sender_rx) = tokio::sync::mpsc::channel(32);
-    let (port_tx, mut port_rx) = tokio::sync::mpsc::channel(32);
 
-    let udp_task = tokio::task::spawn_local(async move {
+    Ok(tokio::task::spawn_local(async move {
-        let mut sender_rx = sender_rx;
+        let mut sender_rx = udp_send_rx;
         loop {
-            let udp_receiver = udp_receiver(&socket, &receiver_tx);
+            let udp_receiver = udp_receiver(&socket, &udp_recv_tx);
             let udp_sender = udp_sender(&socket, &mut sender_rx);
             tokio::select! {
                 _ = udp_receiver => break, /* channel closed */
                 _ = udp_sender => break, /* channel closed */
-                port = port_rx.recv() => match port {
+                _ = server.notifies.port_changed.notified() => update_port(&server, &mut socket).await,
-                    Some(port) => update_port(&server, &frontend_notify_tx, &mut socket, port).await,
+                _ = server.cancelled() => break, /* cancellation requested */
-                    _ => break,
-                }
             }
         }
-    });
+    }))
-    Ok((udp_task, sender_tx, receiver_rx, port_tx))
 }
 
-async fn update_port(
+async fn update_port(server: &Server, socket: &mut UdpSocket) {
-    server: &Server,
+    let new_port = server.port.get();
-    frontend_chan: &Sender<FrontendEvent>,
+    let current_port = socket.local_addr().expect("socket not bound").port();
-    socket: &mut UdpSocket,
+
-    port: u16,
-) {
     // if port is the same, we dont need to change it
-    if socket.local_addr().unwrap().port() == port {
+    if current_port == new_port {
         return;
     }
 
-    // create new socket
+    // bind new socket
-    let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), port);
+    let listen_addr = SocketAddr::new("0.0.0.0".parse().unwrap(), new_port);
-    let frontend_event = match UdpSocket::bind(listen_addr).await {
+    let new_socket = UdpSocket::bind(listen_addr).await;
+    let err = match new_socket {
         Ok(new_socket) => {
             *socket = new_socket;
-            server.port.replace(port);
+            None
-            FrontendEvent::PortChanged(port, None)
-        }
-        Err(e) => {
-            log::warn!("could not change port: {e}");
-            let port = socket.local_addr().unwrap().port();
-            FrontendEvent::PortChanged(port, Some(format!("could not change port: {e}")))
         }
+        Err(e) => Some(e.to_string()),
     };
-    let _ = frontend_chan.send(frontend_event).await;
+
+    // notify frontend of the actual port
+    let port = socket.local_addr().expect("socket not bound").port();
+    server.notify_port_changed(port, err);
 }
 
 async fn udp_receiver(
@@ -80,18 +66,13 @@ async fn udp_receiver(
 ) {
     loop {
         let event = receive_event(socket).await;
-        if receiver_tx.send(event).await.is_err() {
+        receiver_tx.send(event).await.expect("channel closed");
-            break;
-        }
     }
 }
 
 async fn udp_sender(socket: &UdpSocket, rx: &mut Receiver<(Event, SocketAddr)>) {
     loop {
-        let (event, addr) = match rx.recv().await {
+        let (event, addr) = rx.recv().await.expect("channel closed");
-            Some(e) => e,
-            None => return,
-        };
         if let Err(e) = send_event(socket, event, addr) {
             log::warn!("udp send failed: {e}");
         };

src/server/ping_task.rs

@@ -1,9 +1,6 @@
 use std::{net::SocketAddr, time::Duration};
 
-use tokio::{
+use tokio::{sync::mpsc::Sender, task::JoinHandle};
-    sync::mpsc::{Receiver, Sender},
-    task::JoinHandle,
-};
 
 use input_event::Event;
 
@@ -13,119 +10,129 @@ use super::{capture_task::CaptureEvent, emulation_task::EmulationEvent, Server,
 
 const MAX_RESPONSE_TIME: Duration = Duration::from_millis(500);
 
-pub fn new(
+pub(crate) fn new(
     server: Server,
     sender_ch: Sender<(Event, SocketAddr)>,
     emulate_notify: Sender<EmulationEvent>,
     capture_notify: Sender<CaptureEvent>,
-    mut timer_rx: Receiver<()>,
 ) -> JoinHandle<()> {
     // timer task
-    let ping_task = tokio::task::spawn_local(async move {
+    tokio::task::spawn_local(async move {
+        tokio::select! {
+            _ = server.notifies.cancel.cancelled() => {}
+            _ = ping_task(&server, sender_ch, emulate_notify, capture_notify) => {}
+        }
+    })
+}
+
+async fn ping_task(
+    server: &Server,
+    sender_ch: Sender<(Event, SocketAddr)>,
+    emulate_notify: Sender<EmulationEvent>,
+    capture_notify: Sender<CaptureEvent>,
+) {
+    loop {
+        // wait for wake up signal
+        server.ping_timer_notified().await;
         loop {
-            // wait for wake up signal
+            let receiving = server.state.get() == State::Receiving;
-            let Some(_): Option<()> = timer_rx.recv().await else {
+            let (ping_clients, ping_addrs) = {
-                break;
+                let mut client_manager = server.client_manager.borrow_mut();
-            };
-            loop {
-                let receiving = server.state.get() == State::Receiving;
-                let (ping_clients, ping_addrs) = {
-                    let mut client_manager = server.client_manager.borrow_mut();
 
-                    let ping_clients: Vec<ClientHandle> = if receiving {
+                let ping_clients: Vec<ClientHandle> = if receiving {
-                        // if receiving we care about clients with pressed keys
+                    // if receiving we care about clients with pressed keys
-                        client_manager
+                    client_manager
-                            .get_client_states_mut()
+                        .get_client_states_mut()
-                            .filter(|(_, (_, s))| !s.pressed_keys.is_empty())
+                        .filter(|(_, (_, s))| !s.pressed_keys.is_empty())
-                            .map(|(h, _)| h)
+                        .map(|(h, _)| h)
-                            .collect()
+                        .collect()
-                    } else {
+                } else {
-                        // if sending we care about the active client
+                    // if sending we care about the active client
-                        server.active_client.get().iter().cloned().collect()
+                    server.active_client.get().iter().cloned().collect()
-                    };
-
-                    // get relevant socket addrs for clients
-                    let ping_addrs: Vec<SocketAddr> = {
-                        ping_clients
-                            .iter()
-                            .flat_map(|&h| client_manager.get(h))
-                            .flat_map(|(c, s)| {
-                                if s.alive && s.active_addr.is_some() {
-                                    vec![s.active_addr.unwrap()]
-                                } else {
-                                    s.ips
-                                        .iter()
-                                        .cloned()
-                                        .map(|ip| SocketAddr::new(ip, c.port))
-                                        .collect()
-                                }
-                            })
-                            .collect()
-                    };
-
-                    // reset alive
-                    for (_, (_, s)) in client_manager.get_client_states_mut() {
-                        s.alive = false;
-                    }
-
-                    (ping_clients, ping_addrs)
                 };
 
-                if receiving && ping_clients.is_empty() {
+                // get relevant socket addrs for clients
-                    // receiving and no client has pressed keys
+                let ping_addrs: Vec<SocketAddr> = {
-                    // -> no need to keep pinging
-                    break;
-                }
-
-                // ping clients
-                for addr in ping_addrs {
-                    if sender_ch.send((Event::Ping(), addr)).await.is_err() {
-                        break;
-                    }
-                }
-
-                // give clients time to resond
-                if receiving {
-                    log::trace!("waiting {MAX_RESPONSE_TIME:?} for response from client with pressed keys ...");
-                } else {
-                    log::trace!(
-                        "state: {:?} => waiting {MAX_RESPONSE_TIME:?} for client to respond ...",
-                        server.state.get()
-                    );
-                }
-
-                tokio::time::sleep(MAX_RESPONSE_TIME).await;
-
-                // when anything is received from a client,
-                // the alive flag gets set
-                let unresponsive_clients: Vec<_> = {
-                    let client_manager = server.client_manager.borrow();
                     ping_clients
                         .iter()
-                        .filter_map(|&h| match client_manager.get(h) {
+                        .flat_map(|&h| client_manager.get(h))
-                            Some((_, s)) if !s.alive => Some(h),
+                        .flat_map(|(c, s)| {
-                            _ => None,
+                            if s.alive && s.active_addr.is_some() {
+                                vec![s.active_addr.unwrap()]
+                            } else {
+                                s.ips
+                                    .iter()
+                                    .cloned()
+                                    .map(|ip| SocketAddr::new(ip, c.port))
+                                    .collect()
+                            }
                         })
                         .collect()
                 };
 
-                // we may not be receiving anymore but we should respond
+                // reset alive
-                // to the original state and not the "new" one
+                for (_, (_, s)) in client_manager.get_client_states_mut() {
-                if receiving {
+                    s.alive = false;
-                    for h in unresponsive_clients {
+                }
-                        log::warn!("device not responding, releasing keys!");
+
-                        let _ = emulate_notify.send(EmulationEvent::ReleaseKeys(h)).await;
+                (ping_clients, ping_addrs)
-                    }
+            };
-                } else {
+
-                    // release pointer if the active client has not responded
+            if receiving && ping_clients.is_empty() {
-                    if !unresponsive_clients.is_empty() {
+                // receiving and no client has pressed keys
-                        log::warn!("client not responding, releasing pointer!");
+                // -> no need to keep pinging
-                        server.state.replace(State::Receiving);
+                break;
-                        let _ = capture_notify.send(CaptureEvent::Release).await;
+            }
-                    }
+
+            // ping clients
+            for addr in ping_addrs {
+                if sender_ch.send((Event::Ping(), addr)).await.is_err() {
+                    break;
+                }
+            }
+
+            // give clients time to resond
+            if receiving {
+                log::trace!(
+                    "waiting {MAX_RESPONSE_TIME:?} for response from client with pressed keys ..."
+                );
+            } else {
+                log::trace!(
+                    "state: {:?} => waiting {MAX_RESPONSE_TIME:?} for client to respond ...",
+                    server.state.get()
+                );
+            }
+
+            tokio::time::sleep(MAX_RESPONSE_TIME).await;
+
+            // when anything is received from a client,
+            // the alive flag gets set
+            let unresponsive_clients: Vec<_> = {
+                let client_manager = server.client_manager.borrow();
+                ping_clients
+                    .iter()
+                    .filter_map(|&h| match client_manager.get(h) {
+                        Some((_, s)) if !s.alive => Some(h),
+                        _ => None,
+                    })
+                    .collect()
+            };
+
+            // we may not be receiving anymore but we should respond
+            // to the original state and not the "new" one
+            if receiving {
+                for h in unresponsive_clients {
+                    log::warn!("device not responding, releasing keys!");
+                    let _ = emulate_notify.send(EmulationEvent::ReleaseKeys(h)).await;
+                }
+            } else {
+                // release pointer if the active client has not responded
+                if !unresponsive_clients.is_empty() {
+                    log::warn!("client not responding, releasing pointer!");
+                    server.state.replace(State::Receiving);
+                    let _ = capture_notify.send(CaptureEvent::Release).await;
                 }
             }
         }
-    });
+    }
-    ping_task
 }

src/server/resolver_task.rs

@@ -1,68 +0,0 @@
-use std::collections::HashSet;
-
-use tokio::{sync::mpsc::Sender, task::JoinHandle};
-
-use crate::{client::ClientHandle, dns::DnsResolver, frontend::FrontendEvent};
-
-use super::Server;
-
-#[derive(Clone)]
-pub struct DnsRequest {
-    pub hostname: String,
-    pub handle: ClientHandle,
-}
-
-pub fn new(
-    resolver: DnsResolver,
-    mut server: Server,
-    mut frontend: Sender<FrontendEvent>,
-) -> (JoinHandle<()>, Sender<DnsRequest>) {
-    let (dns_tx, mut dns_rx) = tokio::sync::mpsc::channel::<DnsRequest>(32);
-    let resolver_task = tokio::task::spawn_local(async move {
-        loop {
-            let (host, handle) = match dns_rx.recv().await {
-                Some(r) => (r.hostname, r.handle),
-                None => break,
-            };
-
-            /* update resolving status */
-            if let Some((_, s)) = server.client_manager.borrow_mut().get_mut(handle) {
-                s.resolving = true;
-            }
-            notify_state_change(&mut frontend, &mut server, handle).await;
-
-            let ips = match resolver.resolve(&host).await {
-                Ok(ips) => ips,
-                Err(e) => {
-                    log::warn!("could not resolve host '{host}': {e}");
-                    vec![]
-                }
-            };
-
-            /* update ips and resolving state */
-            if let Some((c, s)) = server.client_manager.borrow_mut().get_mut(handle) {
-                let mut addrs = HashSet::from_iter(c.fix_ips.iter().cloned());
-                for ip in ips {
-                    addrs.insert(ip);
-                }
-                s.ips = addrs;
-                s.resolving = false;
-            }
-            notify_state_change(&mut frontend, &mut server, handle).await;
-        }
-    });
-    (resolver_task, dns_tx)
-}
-
-async fn notify_state_change(
-    frontend: &mut Sender<FrontendEvent>,
-    server: &mut Server,
-    handle: ClientHandle,
-) {
-    let state = server.client_manager.borrow_mut().get_mut(handle).cloned();
-    if let Some((config, state)) = state {
-        let _ = frontend
-            .send(FrontendEvent::State(handle, config, state))
-            .await;
-    }
-}