mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-04-10 02:21:29 +03:00
remove cli frontend in favour of cli subcommand (#278)
this removes the cli frontend entirely, replacing it with a subcommand instead
This commit is contained in:
committed by
GitHub
parent
7898f2362c
commit
2f6a3629ad
@@ -1,7 +1,6 @@
|
||||
use crate::{ConnectionError, FrontendEvent, FrontendRequest, IpcError};
|
||||
use std::{
|
||||
cmp::min,
|
||||
io,
|
||||
task::{ready, Poll},
|
||||
time::Duration,
|
||||
};
|
||||
@@ -47,7 +46,7 @@ impl Stream for AsyncFrontendEventReader {
|
||||
}
|
||||
|
||||
impl AsyncFrontendRequestWriter {
|
||||
pub async fn request(&mut self, request: FrontendRequest) -> Result<(), io::Error> {
|
||||
pub async fn request(&mut self, request: FrontendRequest) -> Result<(), IpcError> {
|
||||
let mut json = serde_json::to_string(&request).unwrap();
|
||||
log::debug!("requesting: {json}");
|
||||
json.push('\n');
|
||||
@@ -57,8 +56,16 @@ impl AsyncFrontendRequestWriter {
|
||||
}
|
||||
|
||||
pub async fn connect_async(
|
||||
timeout: Option<Duration>,
|
||||
) -> Result<(AsyncFrontendEventReader, AsyncFrontendRequestWriter), ConnectionError> {
|
||||
let stream = wait_for_service().await?;
|
||||
let stream = if let Some(duration) = timeout {
|
||||
tokio::select! {
|
||||
s = wait_for_service() => s?,
|
||||
_ = tokio::time::sleep(duration) => return Err(ConnectionError::Timeout),
|
||||
}
|
||||
} else {
|
||||
wait_for_service().await?
|
||||
};
|
||||
#[cfg(unix)]
|
||||
let (rx, tx): (ReadHalf<UnixStream>, WriteHalf<UnixStream>) = tokio::io::split(stream);
|
||||
#[cfg(windows)]
|
||||
|
||||
@@ -30,6 +30,8 @@ pub enum ConnectionError {
|
||||
SocketPath(#[from] SocketPathError),
|
||||
#[error(transparent)]
|
||||
Io(#[from] io::Error),
|
||||
#[error("connection timed out")]
|
||||
Timeout,
|
||||
}
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
@@ -237,6 +239,8 @@ pub enum FrontendRequest {
|
||||
AuthorizeKey(String, String),
|
||||
/// remove fingerprint (fingerprint)
|
||||
RemoveAuthorizedKey(String),
|
||||
/// change the hook command
|
||||
UpdateEnterHook(u64, Option<String>),
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default, Serialize, Deserialize)]
|
||||
|
||||
Reference in New Issue
Block a user