mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Consider errors on next_line()

Browse source
This commit is contained in:
sxyazi 2026-05-29 14:32:48 +08:00
parent a81566fb04
commit b0d0dfb358
No known key found for this signature in database
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yazi-dds/src/client.rs
View file

@ -48,8 +48,8 @@ impl Client {
writer.write_all(payload.as_bytes()).await.ok(); // Retry once
}
}
Ok(next) = lines.next_line() => {
let Some(line) = next else {
next = lines.next_line() => {
let Ok(Some(line)) = next else {
(lines, writer) = Self::reconnect(&mut server).await;
continue;
};

19
yazi-dds/src/stream.rs
View file

@ -48,9 +48,12 @@ impl Stream {
#[cfg(windows)]
pub(super) async fn bind() -> io::Result<ServerListener> {
let p = Self::socket_file().await?;
Local::regular(&p).remove_file().await.ok();
Ok(WinUnixListener(uds_windows::UnixListener::bind(p)?))
let listener = uds_windows::UnixListener::bind(p)?;
listener.set_nonblocking(true)?;
Ok(WinUnixListener(listener))
}
async fn socket_file() -> io::Result<&'static PathBuf> {
@ -75,9 +78,15 @@ impl WinUnixListener {
pub(super) async fn accept(
&self,
) -> io::Result<(tokio::net::TcpStream, uds_windows::SocketAddr)> {
let listener = self.0.try_clone()?;
let (stream, addr) = tokio::task::spawn_blocking(move || listener.accept()).await??;
Ok((Self::into_tokio(stream)?, addr))
loop {
match self.0.accept() {
Ok((stream, addr)) => return Ok((Self::into_tokio(stream)?, addr)),
Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
tokio::time::sleep(std::time::Duration::from_millis(20)).await;
}
Err(e) => return Err(e),
}
}
}
fn into_tokio(uds: uds_windows::UnixStream) -> io::Result<tokio::net::TcpStream> {