mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-17 01:00:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4df95ea271 | ||
|
|
be7dba4669 |
No files matched your search
Generated
+1
-1
@@ -2649,7 +2649,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.1.13"
|
version = "0.1.14"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.1.13"
|
version = "0.1.14"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
description = "Unofficial Linux host for NetEase UU Remote: control a Linux desktop from the official clients"
|
description = "Unofficial Linux host for NetEase UU Remote: control a Linux desktop from the official clients"
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
修复手机切回终端时黑屏。/ Fixes a black terminal after returning to it on mobile.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **终端历史输出较多时,重连后黑屏**(#14,感谢 @cnetst):手机客户端切到后台再回到同一个终端时,如果之前积累的输出较多,
|
||||||
|
会整屏黑屏,连新建终端也没有输出,只能完全退出 App 重连。原因是重连时把最多 256 KB 的历史输出作为一条消息发送,
|
||||||
|
超过了 WebRTC 数据通道单条消息 64 KB 的上限,发送失败后整个终端连接卡住。现在历史输出按 16 KB 分段发送,顺序不变。
|
||||||
|
✅ 已用官方手机客户端在 3090 实机验收。
|
||||||
|
Terminal scrollback is replayed in 16 KiB chunks instead of one message over the 64 KiB SCTP limit. Verified on mobile.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux-v0.1.14-x86_64-linux.tar.gz`:X11 版可执行文件(x86_64,glibc ≥ 2.35),附带 `contrib/`。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
+42
-2
@@ -34,6 +34,7 @@ const MAGIC: &[u8; 4] = b"TERM";
|
|||||||
const HEADER: usize = 16;
|
const HEADER: usize = 16;
|
||||||
const MAX_PAYLOAD: usize = 0x10_0000;
|
const MAX_PAYLOAD: usize = 0x10_0000;
|
||||||
const SCROLLBACK: usize = 256 * 1024;
|
const SCROLLBACK: usize = 256 * 1024;
|
||||||
|
const OUTPUT_CHUNK: usize = 16 * 1024;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct Frame { pub kind: u8, pub flags: [u8; 2], pub session: u32, pub payload: Vec<u8> }
|
pub struct Frame { pub kind: u8, pub flags: [u8; 2], pub session: u32, pub payload: Vec<u8> }
|
||||||
@@ -140,7 +141,7 @@ fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result
|
|||||||
let mut reader = std::fs::File::from(session.master.try_clone().map_err(|e| format!("pty dup failed: {e}"))?);
|
let mut reader = std::fs::File::from(session.master.try_clone().map_err(|e| format!("pty dup failed: {e}"))?);
|
||||||
let worker = session.clone();
|
let worker = session.clone();
|
||||||
std::thread::Builder::new().name(format!("uu-term-{id}")).spawn(move || {
|
std::thread::Builder::new().name(format!("uu-term-{id}")).spawn(move || {
|
||||||
let mut buf = vec![0u8; 16 * 1024];
|
let mut buf = vec![0u8; OUTPUT_CHUNK];
|
||||||
loop {
|
loop {
|
||||||
match reader.read(&mut buf) {
|
match reader.read(&mut buf) {
|
||||||
Ok(0) | Err(_) => break,
|
Ok(0) | Err(_) => break,
|
||||||
@@ -222,7 +223,8 @@ impl TerminalConn {
|
|||||||
self.send(OPEN_RESP, s.id, &reply(0, "ok"));
|
self.send(OPEN_RESP, s.id, &reply(0, "ok"));
|
||||||
*sink = Some(self.out.clone());
|
*sink = Some(self.out.clone());
|
||||||
let replay: Vec<u8> = s.scrollback.lock().unwrap().iter().copied().collect();
|
let replay: Vec<u8> = s.scrollback.lock().unwrap().iter().copied().collect();
|
||||||
if !replay.is_empty() { self.send(STDOUT, s.id, &replay); }
|
// A full scrollback exceeds SCTP's 64 KiB outbound message limit.
|
||||||
|
for chunk in replay.chunks(OUTPUT_CHUNK) { self.send(STDOUT, s.id, chunk); }
|
||||||
}
|
}
|
||||||
Err(e) => { log::warn!("Terminal open failed: {}", e); self.send(OPEN_RESP, frame.session, &reply(1, &e)); }
|
Err(e) => { log::warn!("Terminal open failed: {}", e); self.send(OPEN_RESP, frame.session, &reply(1, &e)); }
|
||||||
}
|
}
|
||||||
@@ -289,6 +291,44 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
fn reconnect_replays_large_history_in_bounded_frames() {
|
||||||
|
let pty = nix::pty::openpty(None, None).unwrap();
|
||||||
|
let id = u32::MAX - 1;
|
||||||
|
let history: Vec<u8> = (0..SCROLLBACK).map(|n| (n % 251) as u8).collect();
|
||||||
|
let session = Arc::new(Session { id, shell: "/bin/sh".into(), created_ms: now_ms(),
|
||||||
|
master: pty.master, pid: 0, sink: Mutex::new(None),
|
||||||
|
scrollback: Mutex::new(history.iter().copied().collect()) });
|
||||||
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
|
struct Cleanup(u32);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { registry().lock().unwrap().remove(&self.0); } }
|
||||||
|
let _cleanup = Cleanup(id);
|
||||||
|
|
||||||
|
for _ in 0..2 {
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let conn = TerminalConn::new(tx);
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24}"#));
|
||||||
|
let opened = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!(opened.kind, OPEN_RESP);
|
||||||
|
assert_eq!(opened.session, id);
|
||||||
|
let mut replay = Vec::new();
|
||||||
|
while replay.len() < history.len() {
|
||||||
|
let packet = rx.try_recv().unwrap();
|
||||||
|
// SCTP's default outbound limit includes the TERM header.
|
||||||
|
assert!(packet.len() <= 65536, "terminal replay exceeds the SCTP message limit");
|
||||||
|
let frame = decode(&packet).unwrap();
|
||||||
|
assert_eq!(frame.kind, STDOUT);
|
||||||
|
assert_eq!(frame.session, id);
|
||||||
|
replay.extend(frame.payload);
|
||||||
|
}
|
||||||
|
assert!(replay == history, "terminal replay must preserve every byte in order");
|
||||||
|
assert!(session.emit(STDOUT, b"live output"));
|
||||||
|
assert_eq!(decode(&rx.try_recv().unwrap()).unwrap().payload, b"live output");
|
||||||
|
conn.handle(&encode(LIST_REQ, 7, &[]));
|
||||||
|
assert_eq!(decode(&rx.try_recv().unwrap()).unwrap().kind, LIST_RESP);
|
||||||
|
conn.handle(&encode(DETACH, id, &[]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
fn open_spawns_shell_and_streams_output() {
|
fn open_spawns_shell_and_streams_output() {
|
||||||
for requested_id in [0, u32::MAX] {
|
for requested_id in [0, u32::MAX] {
|
||||||
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
|||||||
Reference in new issue
Block a user