mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac9606b872 | ||
|
|
4e91126561 | ||
|
|
10825c1fe0 | ||
|
|
36fd51a9d6 | ||
|
|
9271904be6 | ||
|
|
1004806035 |
No files matched your search
Generated
+1
-1
@@ -2804,7 +2804,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.53"
|
version = "0.2.55"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.53"
|
version = "0.2.55"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
|
|||||||
+2
-2
@@ -80,8 +80,8 @@ Protocol strings and messages that come from the UU servers are shown as the ser
|
|||||||
| Viewer annotation | Strokes drawn with 「批注」 (annotate) in the viewer's watch mode appear on the Linux screen and stream back to the viewer (X11, needs a compositing manager; the overlay lets clicks through); cleared when annotation is turned off or the viewer disconnects. Verified with the Mac viewer 4.42.0; mobile viewers untested |
|
| Viewer annotation | Strokes drawn with 「批注」 (annotate) in the viewer's watch mode appear on the Linux screen and stream back to the viewer (X11, needs a compositing manager; the overlay lets clicks through); cleared when annotation is turned off or the viewer disconnects. Verified with the Mac viewer 4.42.0; mobile viewers untested |
|
||||||
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; on X11 a resolution choice changes the desktop resolution itself like the official Windows host (xrandr, adding the mode when missing; restored for "original" or on disconnect), `UU_DESKTOP_RESIZE=0` scales in the encoder instead; Wayland scales in the encoder |
|
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; on X11 a resolution choice changes the desktop resolution itself like the official Windows host (xrandr, adding the mode when missing; restored for "original" or on disconnect), `UU_DESKTOP_RESIZE=0` scales in the encoder instead; Wayland scales in the encoder |
|
||||||
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
|
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
|
||||||
| File transfer | Upload, download (including folders), create folder, rename, delete |
|
| File transfer | Upload, download (including folders), create folder, rename, delete; iOS quick uploads use the default receive directory (the current user’s home) |
|
||||||
| Terminal | The official "Terminal" tool, PTY sessions, multiple sessions, rename |
|
| Terminal | The official "Terminal" tool, PTY sessions, multiple sessions, rename, termination and automatic list refresh; input and detach messages from an old connection cannot affect a reattached session |
|
||||||
| Lock state and auto unlock | Lock state is reported to the viewer; with "auto unlock" enabled in the client, the password is verified with PAM and the session is unlocked |
|
| Lock state and auto unlock | Lock state is reported to the viewer; with "auto unlock" enabled in the client, the password is verified with PAM and the session is unlocked |
|
||||||
| Lock after remote session | Stored on the host, so it still applies after reconnecting |
|
| Lock after remote session | Stored on the host, so it still applies after reconnecting |
|
||||||
| Mute host while controlled | Host speakers are muted while the viewer still hears the sound; the previous mute state is restored afterwards |
|
| Mute host while controlled | Host speakers are muted while the viewer still hears the sound; the previous mute state is restored afterwards |
|
||||||
|
|||||||
@@ -69,8 +69,8 @@ UU_LANG=en uuremote-server
|
|||||||
| 观看模式批注 | 控制端观看模式下开启「批注」后画的笔迹显示在 Linux 屏幕上,并随画面传回控制端(X11,需要合成器;覆盖层不拦截鼠标);关闭批注或断开连接时清除。已用 Mac 控制端 4.42.0 实测,手机控制端未测 |
|
| 观看模式批注 | 控制端观看模式下开启「批注」后画的笔迹显示在 Linux 屏幕上,并随画面传回控制端(X11,需要合成器;覆盖层不拦截鼠标);关闭批注或断开连接时清除。已用 Mac 控制端 4.42.0 实测,手机控制端未测 |
|
||||||
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;X11 下切换分辨率会像官方 Windows 被控端一样真正修改桌面分辨率(xrandr,缺少该模式时自动添加;选「原始」或断开后恢复),`UU_DESKTOP_RESIZE=0` 改为仅由编码器缩放;Wayland 仍由编码器缩放 |
|
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;X11 下切换分辨率会像官方 Windows 被控端一样真正修改桌面分辨率(xrandr,缺少该模式时自动添加;选「原始」或断开后恢复),`UU_DESKTOP_RESIZE=0` 改为仅由编码器缩放;Wayland 仍由编码器缩放 |
|
||||||
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
|
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
|
||||||
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
|
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除;iOS 直接上传使用默认接收目录(当前用户的主目录) |
|
||||||
| 终端 | 官方「终端」工具,PTY 会话,支持多会话和重命名 |
|
| 终端 | 官方「终端」工具,PTY 会话,支持多会话、重命名、结束会话和列表自动刷新;重连后旧连接的输入和断开消息不会影响当前会话 |
|
||||||
| 锁屏与自动解锁 | 向控制端上报锁屏状态;开启「自动解锁被控端」后,通过 PAM 校验密码并解锁当前会话 |
|
| 锁屏与自动解锁 | 向控制端上报锁屏状态;开启「自动解锁被控端」后,通过 PAM 校验密码并解锁当前会话 |
|
||||||
| 远程结束后自动锁屏 | 设置保存在本机,重连后依然生效 |
|
| 远程结束后自动锁屏 | 设置保存在本机,重连后依然生效 |
|
||||||
| 被控端静音运行 | 主机扬声器静音,控制端照常能听到声音;结束后恢复原来的音量设置 |
|
| 被控端静音运行 | 主机扬声器静音,控制端照常能听到声音;结束后恢复原来的音量设置 |
|
||||||
|
|||||||
@@ -79,6 +79,8 @@ is aimed at the virtual output's region. Needs GTK3.
|
|||||||
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
|
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
|
||||||
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
|
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
|
||||||
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
|
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
|
||||||
|
- iOS 控制端选“关闭显示器”发 `enable=0, privacy_type=3`:iOS 的 `enable` 是图片模式开关,关屏意图由 `type=3` 表达;iOS“不启用”发 `enable=0, privacy_type=1`。主机只对 iOS 控制端把 `0/3` 归一化为开屏保关屏(日志 `iOS screen-off encoding normalized`),其他控制端(包括已验收的 Android 4.43.0)保持字段 1 的语义。
|
||||||
|
The iOS viewer sends `enable=0, privacy_type=3` for "turn off the display": its `enable` is the picture-mode switch and `type=3` carries the intent; iOS "off" is `enable=0, privacy_type=1`. The host normalizes `0/3` to screen-off for iOS controllers only (log: `iOS screen-off encoding normalized`); other controllers, including the verified Android 4.43.0, keep the field-1 semantics.
|
||||||
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
|
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
|
||||||
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
|
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
|
||||||
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
|
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
修复版:终端会话结束/重连归属与列表通知,iOS 上传默认目录与关闭显示器兼容。/ Fix release: terminal session termination, reconnect ownership and list notifications; iOS default upload directory and screen-off compatibility.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **终端会话生命周期(#197)**:结束会话按 JSON `session_id` 选择目标(不再误用帧头请求编号),并清理该 PTY 会话内的全部进程组;Ctrl+C 发往前台进程组;重连后只接受当前附着连接的输入/缩放/信号;会话列表补齐 shell 名称、连接状态与 `last_active_ms`,变更时发送列表通知。/ Terminal close now targets the JSON `session_id` and cleans up all process groups of that PTY session; signals go to the foreground process group; after reconnect only the attached channel may drive the session; the session list gains shell name, attach state and `last_active_ms`, with change notifications.
|
||||||
|
- **iOS 上传默认目录(#198)**:iOS 直接上传时解析 `:/Default` 默认接收目录。/ iOS direct uploads resolve the `:/Default` receive-directory alias.
|
||||||
|
- **iOS 关闭显示器(#199)**:兼容 iOS 端 `enable=0,type=3` 的关闭显示器编码。/ Accept the iOS screen-off encoding (`enable=0,type=3`).
|
||||||
|
|
||||||
|
感谢 @cnetst、@RiverOnVenus 的贡献。/ Thanks to @cnetst and @RiverOnVenus.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#197 作者在 Ubuntu ARM64 上与官方客户端实测,#199 附 iOS 实机日志。维护方未做 Mac/手机客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.54_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.54-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.54`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
修复版:Linux → Windows 文本剪贴板。/ Fix release: Linux → Windows text clipboard.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Windows 文本剪贴板(#200,修 #151)**:主机提供 Windows Unicode 文本(预定义格式 id 13)时不再附带格式名字段,避免 Windows 控制端把它注册成自定义格式、导致无法粘贴。Mac 格式名、UTF-16LE 编码、CRLF 与结尾 NUL 不变。/ The host now offers predefined Windows Unicode text (id 13) without a format name, so the Windows viewer no longer registers it as a custom format and standard paste works. Mac format names, UTF-16LE encoding, CRLF and the terminating NUL are unchanged.
|
||||||
|
|
||||||
|
感谢 @max2787 的贡献。/ Thanks to @max2787.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#200 作者在 Debian 13 / Xfce 上与官方 Windows 控制端实测双向复制粘贴(中文、多行、emoji)。维护方未做 Windows/Mac 客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.55_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.55-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.55`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
+35
-6
@@ -17,9 +17,9 @@ impl TextFormat {
|
|||||||
}
|
}
|
||||||
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
||||||
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
||||||
/// Name in a format-list offer. Official Windows peers name predefined formats `predefined_<id>`; a plain
|
/// Issue #151 reports that Windows registers even `predefined_13` as a custom format.
|
||||||
/// `CF_UNICODETEXT` makes the Windows viewer register a custom format instead of id 13 (issue #151).
|
/// Omit the name for predefined id 13; verified with the official Windows viewer on an X11 host.
|
||||||
fn offer_name(self)->&'static str{match self{Self::Windows=>WINDOWS_OFFER_NAME,Self::Mac=>MAC_TEXT}}
|
fn offer_name(self)->Option<&'static str>{match self{Self::Windows=>None,Self::Mac=>Some(MAC_TEXT)}}
|
||||||
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
||||||
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
||||||
match self{
|
match self{
|
||||||
@@ -34,7 +34,6 @@ impl TextFormat {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const WINDOWS_OFFER_NAME:&str="predefined_13";
|
|
||||||
const BLOCK_BYTES:usize=0x20000;
|
const BLOCK_BYTES:usize=0x20000;
|
||||||
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
||||||
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
||||||
@@ -100,7 +99,7 @@ impl State{
|
|||||||
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
||||||
self.local=Some(text);
|
self.local=Some(text);
|
||||||
let mut list=Vec::new();
|
let mut list=Vec::new();
|
||||||
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);string(2,kind.offer_name(),&mut format);nested(1,&format,&mut list);}
|
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);if let Some(name)=kind.offer_name(){string(2,name,&mut format);}nested(1,&format,&mut list);}
|
||||||
Ok(request(id,1,&list))
|
Ok(request(id,1,&list))
|
||||||
}
|
}
|
||||||
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
||||||
@@ -192,6 +191,36 @@ impl State{
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests{
|
mod tests{
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn windows_format_offer_omits_name_field_entirely(){
|
||||||
|
for offer in [State::default().offer(42,"hi".into()).unwrap(),State::default().offer_any_host(42,"hi".into()).unwrap()]{
|
||||||
|
assert_eq!(number(header(&offer).unwrap(),1),Ok(42));
|
||||||
|
let list=bytes(bytes(&offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||||
|
let formats=decode_wire(list).unwrap();
|
||||||
|
let WireValue::Bytes(windows)=formats[0].value else{panic!("missing Windows format")};
|
||||||
|
assert_eq!(windows,&[8,13]); // Only field 1: not even an empty field 2.
|
||||||
|
assert!(decode_wire(windows).unwrap().iter().all(|field|field.number!=2));
|
||||||
|
if formats.len()==2{
|
||||||
|
let WireValue::Bytes(mac)=formats[1].value else{panic!("missing Mac format")};
|
||||||
|
assert_eq!(number(mac,1),Ok(0));
|
||||||
|
assert_eq!(bytes(mac,2),Ok(Some(MAC_TEXT.as_bytes())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn unnamed_windows_offer_still_serves_utf16le_with_crlf_and_nul(){
|
||||||
|
let mut provider=State::default();
|
||||||
|
provider.offer(1,"A中🙂\nB\r\n".into()).unwrap();
|
||||||
|
let mut ask=Vec::new();int(1,13,&mut ask);string(2,"test-key",&mut ask);
|
||||||
|
let out=provider.request(&request(2,2,&ask),&mut||3).unwrap();
|
||||||
|
assert_eq!(out.messages.iter().map(|m|m.0).collect::<Vec<_>>(),vec![22,21]);
|
||||||
|
let confirm=bytes(bytes(&out.messages[0].1,5).unwrap().unwrap(),2).unwrap().unwrap();
|
||||||
|
assert_eq!(number(confirm,1),Ok(1));assert_eq!(number(confirm,3),Ok(1));
|
||||||
|
let block=bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap();
|
||||||
|
assert_eq!(text_field(block,1),Ok("test-key"));
|
||||||
|
assert_eq!(number(block,2),Ok(0));
|
||||||
|
assert_eq!(bytes(block,3).unwrap().unwrap(),&[0x41,0,0x2d,0x4e,0x3d,0xd8,0x42,0xde,13,0,10,0,0x42,0,13,0,10,0,0,0]);
|
||||||
|
}
|
||||||
#[test] fn mac_utf8_text_round_trips_both_directions(){
|
#[test] fn mac_utf8_text_round_trips_both_directions(){
|
||||||
// Mac host offer: format list {1 id 0, 2 "public.utf8-plain-text"} (observed live).
|
// Mac host offer: format list {1 id 0, 2 "public.utf8-plain-text"} (observed live).
|
||||||
let mut mac=Vec::new();int(1,0,&mut mac);string(2,MAC_TEXT,&mut mac);
|
let mut mac=Vec::new();int(1,0,&mut mac);string(2,MAC_TEXT,&mut mac);
|
||||||
@@ -218,7 +247,7 @@ mod tests{
|
|||||||
assert_eq!(format_ids(&host_offer),vec![13]);
|
assert_eq!(format_ids(&host_offer),vec![13]);
|
||||||
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||||
let format=bytes(list,1).unwrap().unwrap();
|
let format=bytes(list,1).unwrap().unwrap();
|
||||||
assert_eq!(text_field(format,2),Ok(WINDOWS_OFFER_NAME));
|
assert_eq!(bytes(format,2),Ok(None));
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
||||||
|
|||||||
+63
-1
@@ -147,6 +147,10 @@ fn io_error(e: &std::io::Error) -> u64 {
|
|||||||
/// anything else is rooted at "/".
|
/// anything else is rooted at "/".
|
||||||
pub fn normalize(path: &str) -> PathBuf {
|
pub fn normalize(path: &str) -> PathBuf {
|
||||||
let p = path.replace('\\', "/");
|
let p = path.replace('\\', "/");
|
||||||
|
// Official Mac 4.46.0 UURemoteServer (x86_64, 0x10019f8a5–0x10019f9f7)
|
||||||
|
// resolves :/Default to its receive directory. iOS quick upload sends this alias;
|
||||||
|
// our receive directory is HOME, also reported in SystemMetrics/RemoteDownloadPath.
|
||||||
|
if p.trim_end_matches('/') == ":/Default" { return home(); }
|
||||||
// The host registers as a PC, so the viewer builds drive paths ("C:/x", or ":/" when it
|
// The host registers as a PC, so the viewer builds drive paths ("C:/x", or ":/" when it
|
||||||
// knows no drive letter). Linux has a single root: any drive prefix maps to "/".
|
// knows no drive letter). Linux has a single root: any drive prefix maps to "/".
|
||||||
let p = match p.split_once(':') {
|
let p = match p.split_once(':') {
|
||||||
@@ -455,7 +459,10 @@ impl FileSession {
|
|||||||
/// Upload to this host. receive_request{1 id,2 path,3 files,4 strategy,5 folder_name,6 list_data,7 task_unique_id}
|
/// Upload to this host. receive_request{1 id,2 path,3 files,4 strategy,5 folder_name,6 list_data,7 task_unique_id}
|
||||||
fn receive_request(&self, rid: u64, f: &[WireField]) {
|
fn receive_request(&self, rid: u64, f: &[WireField]) {
|
||||||
let id = TaskId::parse(f);
|
let id = TaskId::parse(f);
|
||||||
let target = normalize(&get_text(f, 2));
|
let raw_target = get_text(f, 2);
|
||||||
|
let target = normalize(&raw_target);
|
||||||
|
log::info!("File transfer upload destination: default={} exists={}",
|
||||||
|
raw_target.replace('\\', "/").trim_end_matches('/') == ":/Default", target.is_dir());
|
||||||
let folder = get_text(f, 5);
|
let folder = get_text(f, 5);
|
||||||
let strategy = get_uint(f, 4);
|
let strategy = get_uint(f, 4);
|
||||||
let files = parse_files(get_all(f, 3), get_bytes(f, 6));
|
let files = parse_files(get_all(f, 3), get_bytes(f, 6));
|
||||||
@@ -715,6 +722,61 @@ mod tests {
|
|||||||
assert_eq!(parse_files(vec![], Some(&gz.finish().unwrap())), files);
|
assert_eq!(parse_files(vec![], Some(&gz.finish().unwrap())), files);
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
fn ios_default_path_resolves_to_the_advertised_receive_directory() {
|
||||||
|
for path in [":/Default", ":\\Default", ":/Default/"] {
|
||||||
|
assert_eq!(normalize(path), home());
|
||||||
|
assert!(!is_this_pc(path));
|
||||||
|
}
|
||||||
|
assert_eq!(normalize("/Default"), PathBuf::from("/Default"));
|
||||||
|
assert_eq!(normalize("C:/Default"), PathBuf::from("/Default"));
|
||||||
|
assert_eq!(normalize(":/Default-other"), PathBuf::from("/Default-other"));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn ios_quick_upload_checks_conflicts_writes_and_completes_in_default_directory() {
|
||||||
|
let name = format!(".uu-ios-test-{}-{}", std::process::id(),
|
||||||
|
std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos());
|
||||||
|
let dir = home().join(&name);
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
struct Cleanup(PathBuf);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { let _ = std::fs::remove_dir_all(&self.0); } }
|
||||||
|
let _cleanup = Cleanup(dir.clone());
|
||||||
|
let rel = format!("{name}/x.bin");
|
||||||
|
std::fs::write(dir.join("x.bin"), b"old").unwrap();
|
||||||
|
let (tx, mut rx) = mpsc::unbounded_channel();
|
||||||
|
let s = FileSession::new(tx, Arc::new(AtomicU64::new(1)));
|
||||||
|
let call = |case: u32, body: Enc| {
|
||||||
|
let rpc = Enc::default().msg(1, Enc::default().uint(1, 17)).msg(8, Enc::default().msg(case, body));
|
||||||
|
assert!(s.handle(&decode_wire(&crate::initialization::envelope(1, 1, 21, &rpc.0)).unwrap()));
|
||||||
|
};
|
||||||
|
let response = |m: Vec<u8>, case: u32| {
|
||||||
|
let outer = decode_wire(&m).unwrap();
|
||||||
|
let rpc = decode_wire(get_bytes(&outer, 22).unwrap()).unwrap();
|
||||||
|
assert_eq!(get_uint(&decode_wire(get_bytes(&rpc, 1).unwrap()).unwrap(), 1), 17);
|
||||||
|
let ftp = decode_wire(get_bytes(&rpc, 4).unwrap()).unwrap();
|
||||||
|
get_bytes(&ftp, case).unwrap().to_vec()
|
||||||
|
};
|
||||||
|
call(11, Enc::default().text(1, ":/Default").text(2, &rel));
|
||||||
|
let exist = response(rx.try_recv().unwrap(), 8);
|
||||||
|
let exist = decode_wire(&exist).unwrap();
|
||||||
|
assert_eq!(get_text(&exist, 1), ":/Default");
|
||||||
|
assert_eq!(get_uint(&decode_wire(get_bytes(&exist, 2).unwrap()).unwrap(), 2), 1);
|
||||||
|
let id = TaskId { task: 991, index: 1 };
|
||||||
|
let info = FileInfo { rel_path: rel, size: 6, modified: 0 };
|
||||||
|
call(1, Enc::default().msg(1, id.enc()).text(2, ":/Default").bytes(6, &list_data(&[info])));
|
||||||
|
let received = response(rx.try_recv().unwrap(), 1);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&received).unwrap(), 3), FT_SUCCEEDED);
|
||||||
|
call(3, Enc::default().msg(1, id.enc()).uint(3, 6));
|
||||||
|
let confirmed = response(rx.try_recv().unwrap(), 3);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&confirmed).unwrap(), 3), FT_SUCCEEDED);
|
||||||
|
call(4, Enc::default().msg(1, id.enc()).bytes(3, b"abcdef"));
|
||||||
|
let block = response(rx.try_recv().unwrap(), 4);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&block).unwrap(), 3), FT_SUCCEEDED);
|
||||||
|
call(9, Enc::default().msg(1, id.enc()).uint(2, FT_SUCCEEDED));
|
||||||
|
let done = response(rx.try_recv().unwrap(), 6);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&done).unwrap(), 2), FT_SUCCEEDED);
|
||||||
|
assert_eq!(std::fs::read(dir.join("x.bin")).unwrap(), b"abcdef");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
fn upload_writes_blocks_and_confirms() {
|
fn upload_writes_blocks_and_confirms() {
|
||||||
let dir = std::env::temp_dir().join(format!("uu-up-{}", std::process::id()));
|
let dir = std::env::temp_dir().join(format!("uu-up-{}", std::process::id()));
|
||||||
std::fs::create_dir_all(&dir).unwrap();
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
|||||||
+17
-6
@@ -81,15 +81,20 @@ fn finger_held(finger: Finger, now: std::time::Instant) -> Option<(i32,i32)> {
|
|||||||
/// Viewer platform from the connect header `controller_platform` (website enum: 1 windows, 2 android,
|
/// Viewer platform from the connect header `controller_platform` (website enum: 1 windows, 2 android,
|
||||||
/// 3 ios, 4 macos, 5 tv).
|
/// 3 ios, 4 macos, 5 tv).
|
||||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||||
pub enum Controller { #[default] Other, Mac, Mobile }
|
pub enum Controller { #[default] Other, Mac, Mobile, Ios }
|
||||||
impl Controller {
|
impl Controller {
|
||||||
|
/// Touch semantics cover both mobile platforms; the iOS RPC 7 screen-off encoding is its own quirk.
|
||||||
|
pub fn is_mobile(self) -> bool { matches!(self, Self::Mobile | Self::Ios) }
|
||||||
pub fn from_platform(platform: Option<&serde_json::Value>) -> Self {
|
pub fn from_platform(platform: Option<&serde_json::Value>) -> Self {
|
||||||
let Some(v) = platform else { return Self::Other };
|
let Some(v) = platform else { return Self::Other };
|
||||||
let text = v.as_str().map(str::to_ascii_lowercase);
|
let text = v.as_str().map(str::to_ascii_lowercase);
|
||||||
match v.as_i64().or_else(|| text.as_deref().and_then(|s| s.parse().ok())) {
|
match v.as_i64().or_else(|| text.as_deref().and_then(|s| s.parse().ok())) {
|
||||||
Some(4) => Self::Mac,
|
Some(4) => Self::Mac,
|
||||||
Some(2 | 3) => Self::Mobile,
|
Some(3) => Self::Ios,
|
||||||
_ if text.is_some_and(|s| s.contains("mac") || s.contains("darwin")) => Self::Mac,
|
Some(2) => Self::Mobile,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("mac") || s.contains("darwin")) => Self::Mac,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("ios") || s.contains("iphone") || s.contains("ipad")) => Self::Ios,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("android")) => Self::Mobile,
|
||||||
_ => Self::Other,
|
_ => Self::Other,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -303,7 +308,7 @@ impl InputInjector {
|
|||||||
*self.cmd.lock().unwrap() = CmdState::default();
|
*self.cmd.lock().unwrap() = CmdState::default();
|
||||||
let mut touch = self.touch.lock().unwrap();
|
let mut touch = self.touch.lock().unwrap();
|
||||||
self.lift_finger(&mut touch);
|
self.lift_finger(&mut touch);
|
||||||
let mode = if controller != Controller::Mobile || self.uinput_pointer { TouchMode::Mouse } else {
|
let mode = if !controller.is_mobile() || self.uinput_pointer { TouchMode::Mouse } else {
|
||||||
match std::env::var("UU_TOUCH_INPUT").as_deref() { Ok("0") => TouchMode::Mouse, Ok("touch") => TouchMode::Touch, _ => TouchMode::Gesture }
|
match std::env::var("UU_TOUCH_INPUT").as_deref() { Ok("0") => TouchMode::Mouse, Ok("touch") => TouchMode::Touch, _ => TouchMode::Gesture }
|
||||||
};
|
};
|
||||||
*touch = TouchDrag { mode, ..TouchDrag::default() };
|
*touch = TouchDrag { mode, ..TouchDrag::default() };
|
||||||
@@ -1047,7 +1052,7 @@ mod kernel_pointer_tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn full_uinput_bypasses_portal_binding_and_preserves_move_click_order() {
|
fn full_uinput_bypasses_portal_binding_and_preserves_move_click_order() {
|
||||||
for controller in [Controller::Other, Controller::Mobile] {
|
for controller in [Controller::Other, Controller::Mobile, Controller::Ios] {
|
||||||
let (devices, mut keyboard, mut pointer) = crate::uinput::Devices::recording_for_test();
|
let (devices, mut keyboard, mut pointer) = crate::uinput::Devices::recording_for_test();
|
||||||
let mut input = InputInjector::without_desktop();
|
let mut input = InputInjector::without_desktop();
|
||||||
input.uinput = Some(devices);
|
input.uinput = Some(devices);
|
||||||
@@ -1296,7 +1301,13 @@ mod touch_tests {
|
|||||||
fn controller_from_platform_numbers_and_mac_strings() {
|
fn controller_from_platform_numbers_and_mac_strings() {
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
assert_eq!(Controller::from_platform(Some(&json!(2))), Controller::Mobile);
|
assert_eq!(Controller::from_platform(Some(&json!(2))), Controller::Mobile);
|
||||||
assert_eq!(Controller::from_platform(Some(&json!("3"))), Controller::Mobile);
|
assert_eq!(Controller::from_platform(Some(&json!("3"))), Controller::Ios);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("ios"))), Controller::Ios);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("Android"))), Controller::Mobile);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("iPadOS"))), Controller::Ios);
|
||||||
|
assert!(Controller::Ios.is_mobile());
|
||||||
|
assert!(Controller::Mobile.is_mobile());
|
||||||
|
assert!(!Controller::Mac.is_mobile());
|
||||||
assert_eq!(Controller::from_platform(Some(&json!(4))), Controller::Mac);
|
assert_eq!(Controller::from_platform(Some(&json!(4))), Controller::Mac);
|
||||||
assert_eq!(Controller::from_platform(Some(&json!("MacOS"))), Controller::Mac);
|
assert_eq!(Controller::from_platform(Some(&json!("MacOS"))), Controller::Mac);
|
||||||
assert_eq!(Controller::from_platform(Some(&json!(1))), Controller::Other);
|
assert_eq!(Controller::from_platform(Some(&json!(1))), Controller::Other);
|
||||||
|
|||||||
@@ -1038,6 +1038,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
if desktop { portal_desktop.clone() } else { None }).await {
|
if desktop { portal_desktop.clone() } else { None }).await {
|
||||||
Ok(mut sess) => {
|
Ok(mut sess) => {
|
||||||
sess.controller = controller;
|
sess.controller = controller;
|
||||||
|
if desktop { crate::privacy_screen::set_viewer_controller(controller); }
|
||||||
if !desktop {
|
if !desktop {
|
||||||
let (requests, peer) = (desktop_requests.clone(), ice.clone());
|
let (requests, peer) = (desktop_requests.clone(), ice.clone());
|
||||||
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
|
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
|
||||||
@@ -1119,6 +1120,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
} else { None };
|
} else { None };
|
||||||
video::warm_auto_probe(); video::check_ffmpeg_usable();
|
video::warm_auto_probe(); video::check_ffmpeg_usable();
|
||||||
input.set_controller(controller);
|
input.set_controller(controller);
|
||||||
|
crate::privacy_screen::set_viewer_controller(controller);
|
||||||
input.bind_portal(screen.as_ref().map_or_else(|| sessions[&ice].capture.portal.clone(), |screen| screen.portal.clone()));
|
input.bind_portal(screen.as_ref().map_or_else(|| sessions[&ice].capture.portal.clone(), |screen| screen.portal.clone()));
|
||||||
// One desktop at a time, as for a new desktop offer. Peers offered as desktops
|
// One desktop at a time, as for a new desktop offer. Peers offered as desktops
|
||||||
// close; a promoted tool peer only stops its desktop and keeps its tools.
|
// close; a promoted tool peer only stops its desktop and keeps its tools.
|
||||||
|
|||||||
@@ -25,8 +25,15 @@ static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
|||||||
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
||||||
/// opens but before `session_started` bumps the counter.
|
/// opens but before `session_started` bumps the counter.
|
||||||
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
||||||
|
/// iOS viewers encode "screen off" as `enable=0, type=3`; see
|
||||||
|
/// `protocol::Request::normalize_ios_screen_off`.
|
||||||
|
static VIEWER_IOS: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
pub fn supported() -> bool { backend::detect().is_some() }
|
pub fn supported() -> bool { backend::detect().is_some() }
|
||||||
|
/// Record the desktop controller's platform for the iOS RPC 7 encoder quirk.
|
||||||
|
pub fn set_viewer_controller(controller: crate::input::Controller) {
|
||||||
|
VIEWER_IOS.store(controller == crate::input::Controller::Ios, Ordering::Relaxed);
|
||||||
|
}
|
||||||
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
||||||
/// The viewer's privacy_type now in effect.
|
/// The viewer's privacy_type now in effect.
|
||||||
pub fn current_type() -> u8 {
|
pub fn current_type() -> u8 {
|
||||||
@@ -112,7 +119,13 @@ pub struct Accepted { enable: bool, mode: Option<Mode> }
|
|||||||
/// (error 9998 + n in its RPC failure handler) and a switch takes longer. A later failure is
|
/// (error 9998 + n in its RPC failure handler) and a switch takes longer. A later failure is
|
||||||
/// reported as ReportError -7, which the viewer handles by resetting its privacy menu.
|
/// reported as ReportError -7, which the viewer handles by resetting its privacy menu.
|
||||||
pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option<Accepted>)> {
|
pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option<Accepted>)> {
|
||||||
let (header, request) = protocol::parse(rpc)?;
|
let (header, mut request) = protocol::parse(rpc)?;
|
||||||
|
if request.normalize_ios_screen_off(VIEWER_IOS.load(Ordering::Relaxed)) {
|
||||||
|
// The viewer chose a mode even if the switch is refused below; cancel a pending auto-enable
|
||||||
|
// as an accepted request would.
|
||||||
|
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
|
||||||
|
log::info!("Privacy request: iOS screen-off encoding normalized (enable=0 type=3)");
|
||||||
|
}
|
||||||
if let Some(e) = refuse(request.enable, request.mode) {
|
if let Some(e) = refuse(request.enable, request.mode) {
|
||||||
log::warn!("Privacy request refused: enable={} mode={:?}: {e}", request.enable, request.mode);
|
log::warn!("Privacy request refused: enable={} mode={:?}: {e}", request.enable, request.mode);
|
||||||
return Some((protocol::response(&header, &request, true, current_type()), None));
|
return Some((protocol::response(&header, &request, true, current_type()), None));
|
||||||
|
|||||||
@@ -5,6 +5,20 @@ use super::Mode;
|
|||||||
|
|
||||||
pub struct Request { pub enable: bool, pub mode: Option<Mode>, requested: u64 }
|
pub struct Request { pub enable: bool, pub mode: Option<Mode>, requested: u64 }
|
||||||
|
|
||||||
|
impl Request {
|
||||||
|
/// iOS viewers encode "turn off the display" as `enable=0, privacy_type=3`: their enable bit is
|
||||||
|
/// the picture-mode switch, and the explicit screen-off type carries the intent. iOS "off" is
|
||||||
|
/// `enable=0, type=1` (seen live), so rewrite only this exact combination. Android 4.43.0 was
|
||||||
|
/// verified with the field-1 semantics, so the rewrite is iOS-only.
|
||||||
|
pub fn normalize_ios_screen_off(&mut self, ios: bool) -> bool {
|
||||||
|
if ios && !self.enable && self.mode == Some(Mode::ScreenOff) {
|
||||||
|
self.enable = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn parse(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Request)> {
|
pub fn parse(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Request)> {
|
||||||
use crate::protocol::{decode_wire, WireValue};
|
use crate::protocol::{decode_wire, WireValue};
|
||||||
let body = |n| rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == n => Some(*b), _ => None });
|
let body = |n| rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == n => Some(*b), _ => None });
|
||||||
@@ -71,4 +85,25 @@ mod tests {
|
|||||||
let saver = crate::protocol::decode_wire(&[10, 2, 8, 7, 0xca, 1, 0]).unwrap();
|
let saver = crate::protocol::decode_wire(&[10, 2, 8, 7, 0xca, 1, 0]).unwrap();
|
||||||
assert_eq!(screensaver_response(&saver).unwrap(), [10, 2, 8, 7, 0xaa, 1, 0]);
|
assert_eq!(screensaver_response(&saver).unwrap(), [10, 2, 8, 7, 0xaa, 1, 0]);
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn normalizes_ios_screen_off_only() {
|
||||||
|
let screen_off = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 0, 16, 3]).unwrap();
|
||||||
|
let (_, mut request) = parse(&screen_off).unwrap();
|
||||||
|
assert!(request.normalize_ios_screen_off(true));
|
||||||
|
assert!(request.enable);
|
||||||
|
assert_eq!(request.mode, Some(Mode::ScreenOff));
|
||||||
|
let (_, mut request) = parse(&screen_off).unwrap();
|
||||||
|
assert!(!request.normalize_ios_screen_off(false));
|
||||||
|
assert!(!request.enable);
|
||||||
|
|
||||||
|
// An iOS "off" (type 1) and a Mac-style enable (1,3) must stay untouched.
|
||||||
|
let off = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 0, 16, 1]).unwrap();
|
||||||
|
let (_, mut request) = parse(&off).unwrap();
|
||||||
|
assert!(!request.normalize_ios_screen_off(true));
|
||||||
|
assert!(!request.enable);
|
||||||
|
let mac = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 1, 16, 3]).unwrap();
|
||||||
|
let (_, mut request) = parse(&mac).unwrap();
|
||||||
|
assert!(!request.normalize_ios_screen_off(true));
|
||||||
|
assert!(request.enable);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+306
-21
@@ -9,7 +9,7 @@
|
|||||||
use std::collections::{HashMap, VecDeque};
|
use std::collections::{HashMap, VecDeque};
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::os::fd::{AsRawFd, OwnedFd};
|
use std::os::fd::{AsRawFd, OwnedFd};
|
||||||
use std::sync::atomic::{AtomicU32, Ordering};
|
use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering};
|
||||||
use std::sync::{Arc, Mutex, OnceLock};
|
use std::sync::{Arc, Mutex, OnceLock};
|
||||||
use tokio::sync::mpsc::UnboundedSender;
|
use tokio::sync::mpsc::UnboundedSender;
|
||||||
|
|
||||||
@@ -67,6 +67,7 @@ struct Session {
|
|||||||
id: u32,
|
id: u32,
|
||||||
shell: String,
|
shell: String,
|
||||||
created_ms: u64,
|
created_ms: u64,
|
||||||
|
last_active_ms: AtomicU64,
|
||||||
master: OwnedFd,
|
master: OwnedFd,
|
||||||
pid: i32,
|
pid: i32,
|
||||||
sink: Mutex<Option<UnboundedSender<Vec<u8>>>>,
|
sink: Mutex<Option<UnboundedSender<Vec<u8>>>>,
|
||||||
@@ -75,9 +76,11 @@ struct Session {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Session {
|
impl Session {
|
||||||
|
fn touch(&self) { self.last_active_ms.fetch_max(now_ms(), Ordering::Relaxed); }
|
||||||
/// Lock order sink → scrollback matches OPEN, so a reattach snapshot sees each
|
/// Lock order sink → scrollback matches OPEN, so a reattach snapshot sees each
|
||||||
/// chunk either in the replay or live, never both.
|
/// chunk either in the replay or live, never both.
|
||||||
fn record_output(&self, data: &[u8]) {
|
fn record_output(&self, data: &[u8]) {
|
||||||
|
self.touch();
|
||||||
let mut sink = self.sink.lock().unwrap();
|
let mut sink = self.sink.lock().unwrap();
|
||||||
{
|
{
|
||||||
let mut sb = self.scrollback.lock().unwrap();
|
let mut sb = self.scrollback.lock().unwrap();
|
||||||
@@ -123,6 +126,7 @@ impl Session {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
fn write(&self, data: &[u8]) {
|
fn write(&self, data: &[u8]) {
|
||||||
|
if !data.is_empty() { self.touch(); }
|
||||||
let mut off = 0;
|
let mut off = 0;
|
||||||
while off < data.len() {
|
while off < data.len() {
|
||||||
let n = unsafe { libc::write(self.master.as_raw_fd(), data[off..].as_ptr().cast(), data.len() - off) };
|
let n = unsafe { libc::write(self.master.as_raw_fd(), data[off..].as_ptr().cast(), data.len() - off) };
|
||||||
@@ -131,6 +135,31 @@ impl Session {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn signal(&self, sig: i32) { unsafe { libc::kill(-self.pid, sig); } }
|
fn signal(&self, sig: i32) { unsafe { libc::kill(-self.pid, sig); } }
|
||||||
|
fn signal_foreground(&self, sig: i32) {
|
||||||
|
self.touch();
|
||||||
|
// Job-control shells put commands such as top in their own process group.
|
||||||
|
let pgid = unsafe { libc::tcgetpgrp(self.master.as_raw_fd()) };
|
||||||
|
if pgid > 0 { unsafe { libc::kill(-pgid, sig); } } else { self.signal(sig); }
|
||||||
|
}
|
||||||
|
fn terminate(&self) {
|
||||||
|
// Job-control shells give foreground/background jobs separate process groups.
|
||||||
|
// Limit cleanup to this PTY's POSIX session, never other desktop/tool peers.
|
||||||
|
if self.pid <= 0 { return; }
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
if let Ok(entries) = std::fs::read_dir("/proc") {
|
||||||
|
let mut groups = std::collections::HashSet::new();
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
let Some(pid) = entry.file_name().to_str().and_then(|s| s.parse::<i32>().ok()) else { continue; };
|
||||||
|
if unsafe { libc::getsid(pid) } == self.pid {
|
||||||
|
let group = unsafe { libc::getpgid(pid) };
|
||||||
|
if group > 0 && group != self.pid { groups.insert(group); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for group in groups { unsafe { libc::kill(-group, libc::SIGKILL); } }
|
||||||
|
}
|
||||||
|
self.signal_foreground(libc::SIGKILL);
|
||||||
|
self.signal(libc::SIGKILL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn registry() -> &'static Mutex<HashMap<u32, Arc<Session>>> {
|
fn registry() -> &'static Mutex<HashMap<u32, Arc<Session>>> {
|
||||||
@@ -139,6 +168,28 @@ fn registry() -> &'static Mutex<HashMap<u32, Arc<Session>>> {
|
|||||||
}
|
}
|
||||||
static NEXT_ID: AtomicU32 = AtomicU32::new(1);
|
static NEXT_ID: AtomicU32 = AtomicU32::new(1);
|
||||||
|
|
||||||
|
fn changes() -> &'static tokio::sync::watch::Sender<u64> {
|
||||||
|
static CHANGES: OnceLock<tokio::sync::watch::Sender<u64>> = OnceLock::new();
|
||||||
|
CHANGES.get_or_init(|| tokio::sync::watch::channel(0).0)
|
||||||
|
}
|
||||||
|
fn notify_changes() { changes().send_modify(|revision| *revision = revision.wrapping_add(1)); }
|
||||||
|
pub fn subscribe_changes() -> tokio::sync::watch::Receiver<u64> { changes().subscribe() }
|
||||||
|
pub fn changed_message(sequence: u64, timestamp: u64) -> Vec<u8> {
|
||||||
|
// Official Mac 4.42.0: Message name map 0x100a1eb98 gives field 28;
|
||||||
|
// notifyTerminalListInvalidated (0x1001a341c) sends the empty message on BINARY (channel 3).
|
||||||
|
crate::initialization::envelope(sequence, timestamp, 28, &[])
|
||||||
|
}
|
||||||
|
|
||||||
|
fn remove_session(session: &Arc<Session>) -> bool {
|
||||||
|
let mut sessions = registry().lock().unwrap();
|
||||||
|
// An old reader may finish after OPEN has reused the same requested ID.
|
||||||
|
if sessions.get(&session.id).is_some_and(|current| Arc::ptr_eq(current, session)) {
|
||||||
|
sessions.remove(&session.id);
|
||||||
|
drop(sessions);
|
||||||
|
notify_changes(); true
|
||||||
|
} else { false }
|
||||||
|
}
|
||||||
|
|
||||||
fn now_ms() -> u64 { std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_millis() as u64 }
|
fn now_ms() -> u64 { std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_millis() as u64 }
|
||||||
|
|
||||||
fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result<Arc<Session>, String> {
|
fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result<Arc<Session>, String> {
|
||||||
@@ -172,9 +223,11 @@ fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result
|
|||||||
if id != 0 && !registry().lock().unwrap().contains_key(&id) { break id; }
|
if id != 0 && !registry().lock().unwrap().contains_key(&id) { break id; }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let session = Arc::new(Session { id, shell: shell.clone(), created_ms: now_ms(), pid: child.id() as i32,
|
let created_ms = now_ms();
|
||||||
|
let session = Arc::new(Session { id, shell: shell.clone(), created_ms, last_active_ms: AtomicU64::new(created_ms), pid: child.id() as i32,
|
||||||
master: pty.master, sink: Mutex::new(None), scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((cols, rows)) });
|
master: pty.master, sink: Mutex::new(None), scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((cols, rows)) });
|
||||||
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}"))?);
|
||||||
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
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; OUTPUT_CHUNK];
|
let mut buf = vec![0u8; OUTPUT_CHUNK];
|
||||||
@@ -187,9 +240,10 @@ fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result
|
|||||||
let code = child.wait().ok().and_then(|s| s.code()).unwrap_or(-1);
|
let code = child.wait().ok().and_then(|s| s.code()).unwrap_or(-1);
|
||||||
log::info!("Terminal session exited: id={} exit_code={}", worker.id, code);
|
log::info!("Terminal session exited: id={} exit_code={}", worker.id, code);
|
||||||
worker.emit(EXIT, serde_json::json!({"exit_code": code}).to_string().as_bytes());
|
worker.emit(EXIT, serde_json::json!({"exit_code": code}).to_string().as_bytes());
|
||||||
registry().lock().unwrap().remove(&worker.id);
|
remove_session(&worker);
|
||||||
}).map_err(|e| format!("reader thread failed: {e}"))?;
|
}).map_err(|e| {
|
||||||
registry().lock().unwrap().insert(id, session.clone());
|
remove_session(&session); session.terminate(); format!("reader thread failed: {e}")
|
||||||
|
})?;
|
||||||
log::info!("Terminal session spawned: id={} cols={} rows={}", id, cols, rows);
|
log::info!("Terminal session spawned: id={} cols={} rows={}", id, cols, rows);
|
||||||
Ok(session)
|
Ok(session)
|
||||||
}
|
}
|
||||||
@@ -201,7 +255,7 @@ pub fn shutdown_all() {
|
|||||||
for s in &sessions { s.signal(libc::SIGHUP); }
|
for s in &sessions { s.signal(libc::SIGHUP); }
|
||||||
if !sessions.is_empty() {
|
if !sessions.is_empty() {
|
||||||
std::thread::sleep(std::time::Duration::from_millis(300));
|
std::thread::sleep(std::time::Duration::from_millis(300));
|
||||||
for s in &sessions { s.signal(libc::SIGKILL); }
|
for s in &sessions { s.terminate(); }
|
||||||
log::info!("Terminal sessions closed on shutdown: count={}", sessions.len());
|
log::info!("Terminal sessions closed on shutdown: count={}", sessions.len());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -226,13 +280,26 @@ fn signal_number(payload: &[u8]) -> i32 {
|
|||||||
fn reply(code: i64, message: &str) -> Vec<u8> { serde_json::json!({"code": code, "message": message}).to_string().into_bytes() }
|
fn reply(code: i64, message: &str) -> Vec<u8> { serde_json::json!({"code": code, "message": message}).to_string().into_bytes() }
|
||||||
|
|
||||||
/// One viewer connection's terminal endpoint; `out` sends complete frames on BINARY_DATA_CHANNEL.
|
/// One viewer connection's terminal endpoint; `out` sends complete frames on BINARY_DATA_CHANNEL.
|
||||||
pub struct TerminalConn { out: UnboundedSender<Vec<u8>> }
|
pub struct TerminalConn { out: UnboundedSender<Vec<u8>>, closed: AtomicBool }
|
||||||
|
|
||||||
impl TerminalConn {
|
impl TerminalConn {
|
||||||
pub fn new(out: UnboundedSender<Vec<u8>>) -> Self { Self { out } }
|
pub fn new(out: UnboundedSender<Vec<u8>>) -> Self { Self { out, closed: AtomicBool::new(false) } }
|
||||||
fn send(&self, kind: u8, session: u32, payload: &[u8]) { let _ = self.out.send(encode(kind, session, payload)); }
|
fn send(&self, kind: u8, session: u32, payload: &[u8]) { let _ = self.out.send(encode(kind, session, payload)); }
|
||||||
|
pub fn disconnect(&self) {
|
||||||
|
self.closed.store(true, Ordering::Release);
|
||||||
|
let sessions: Vec<_> = registry().lock().unwrap().values().cloned().collect();
|
||||||
|
let mut changed = false;
|
||||||
|
for s in sessions {
|
||||||
|
let mut sink = s.sink.lock().unwrap();
|
||||||
|
if sink.as_ref().is_some_and(|tx| tx.same_channel(&self.out)) {
|
||||||
|
*sink = None; s.touch(); changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if changed { notify_changes(); }
|
||||||
|
}
|
||||||
|
|
||||||
pub fn handle(&self, data: &[u8]) {
|
pub fn handle(&self, data: &[u8]) {
|
||||||
|
if self.closed.load(Ordering::Acquire) { return; }
|
||||||
let Some(frame) = decode(data) else { log::warn!("Terminal frame rejected: bytes={}", data.len()); return; };
|
let Some(frame) = decode(data) else { log::warn!("Terminal frame rejected: bytes={}", data.len()); return; };
|
||||||
if frame.kind != STDIN { log::info!("Terminal frame: type={} session={} payload_bytes={}", frame.kind, frame.session, frame.payload.len()); }
|
if frame.kind != STDIN { log::info!("Terminal frame: type={} session={} payload_bytes={}", frame.kind, frame.session, frame.payload.len()); }
|
||||||
let existing = registry().lock().unwrap().get(&frame.session).cloned();
|
let existing = registry().lock().unwrap().get(&frame.session).cloned();
|
||||||
@@ -247,6 +314,7 @@ impl TerminalConn {
|
|||||||
};
|
};
|
||||||
match session {
|
match session {
|
||||||
Ok(s) => {
|
Ok(s) => {
|
||||||
|
s.touch();
|
||||||
// Queue the acknowledgement before the PTY reader can emit live output.
|
// Queue the acknowledgement before the PTY reader can emit live output.
|
||||||
let mut sink = s.sink.lock().unwrap();
|
let mut sink = s.sink.lock().unwrap();
|
||||||
self.send(OPEN_RESP, s.id, &reply(0, "ok"));
|
self.send(OPEN_RESP, s.id, &reply(0, "ok"));
|
||||||
@@ -257,30 +325,55 @@ impl TerminalConn {
|
|||||||
drop(sink);
|
drop(sink);
|
||||||
// The replay tail starts mid-redraw for full-screen programs.
|
// The replay tail starts mid-redraw for full-screen programs.
|
||||||
if reattach { s.force_redraw(); }
|
if reattach { s.force_redraw(); }
|
||||||
|
notify_changes();
|
||||||
}
|
}
|
||||||
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)); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
STDIN => if let Some(s) = existing { s.write(&frame.payload) },
|
STDIN | RESIZE | SIGNAL | CLOSE | DETACH => if let Some(s) = existing {
|
||||||
RESIZE => if let Some(s) = existing { let (c, r) = dims(&json(&frame.payload)); s.resize(c, r) },
|
let mut sink = s.sink.lock().unwrap();
|
||||||
SIGNAL => if let Some(s) = existing { s.signal(signal_number(&frame.payload)) },
|
// Reattach transfers ownership. Late input/DETACH from the old viewer
|
||||||
CLOSE => if let Some(s) = existing { *s.sink.lock().unwrap() = None; s.signal(libc::SIGHUP); },
|
// must not affect the new attachment or inject a second copy of input.
|
||||||
DETACH => if let Some(s) = existing { *s.sink.lock().unwrap() = None },
|
if !sink.as_ref().is_some_and(|tx| tx.same_channel(&self.out)) { return; }
|
||||||
|
match frame.kind {
|
||||||
|
// PTY writes may block during a large paste. Keep output draining.
|
||||||
|
STDIN => { drop(sink); s.write(&frame.payload); }
|
||||||
|
RESIZE => { let (c, r) = dims(&json(&frame.payload)); s.resize(c, r); }
|
||||||
|
SIGNAL => s.signal_foreground(signal_number(&frame.payload)),
|
||||||
|
CLOSE | DETACH => {
|
||||||
|
*sink = None; s.touch();
|
||||||
|
if frame.kind == CLOSE { s.signal(libc::SIGHUP); }
|
||||||
|
notify_changes();
|
||||||
|
}
|
||||||
|
_ => unreachable!(),
|
||||||
|
}
|
||||||
|
},
|
||||||
KILL_REQ => {
|
KILL_REQ => {
|
||||||
let id = if frame.session != 0 { frame.session } else {
|
// Official Mac 4.42.0 handleKillSessionReq (0x100189ca0, 0x10018be64):
|
||||||
json(&frame.payload).get("session_id").and_then(|x| x.as_u64()).unwrap_or(0) as u32
|
// JSON session_id selects the target; the frame header correlates the reply.
|
||||||
|
let Some(id) = json(&frame.payload).get("session_id").and_then(|x| x.as_u64()).and_then(|id| u32::try_from(id).ok()) else {
|
||||||
|
self.send(KILL_RESP, frame.session, &reply(400, "Invalid payload")); return;
|
||||||
};
|
};
|
||||||
let target = registry().lock().unwrap().get(&id).cloned();
|
let target = registry().lock().unwrap().remove(&id);
|
||||||
match target {
|
match target {
|
||||||
Some(s) => { *s.sink.lock().unwrap() = None; s.signal(libc::SIGHUP); s.signal(libc::SIGKILL); self.send(KILL_RESP, id, &reply(0, "ok")); }
|
Some(s) => {
|
||||||
None => self.send(KILL_RESP, id, &reply(1, "Session not found")),
|
s.terminate();
|
||||||
|
self.send(KILL_RESP, frame.session, &reply(0, "ok"));
|
||||||
|
notify_changes();
|
||||||
|
log::info!("Terminal session terminated: id={} request={}", id, frame.session);
|
||||||
|
}
|
||||||
|
None => self.send(KILL_RESP, frame.session, &reply(404, "Session not found")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LIST_REQ => {
|
LIST_REQ => {
|
||||||
let sessions: Vec<serde_json::Value> = registry().lock().unwrap().values().map(|s| {
|
let sessions: Vec<serde_json::Value> = registry().lock().unwrap().values().map(|s| {
|
||||||
let attached = s.sink.lock().unwrap().is_some();
|
let attached = s.sink.lock().unwrap().as_ref().is_some_and(|tx| !tx.is_closed());
|
||||||
serde_json::json!({"session_id": s.id, "name": format!("bash-{}", s.id), "shell": s.shell,
|
let name = std::path::Path::new(&s.shell).file_name().and_then(|n| n.to_str()).unwrap_or("shell");
|
||||||
"state": if attached { "running" } else { "detached" }, "created_at_ms": s.created_ms})
|
// Official Mac 4.42.0 snapshot at 0x1001b82c8–0x1001b8524
|
||||||
|
// includes last_active_ms even when the session is detached.
|
||||||
|
serde_json::json!({"session_id": s.id, "name": format!("{}-{}", name, s.id), "shell": s.shell,
|
||||||
|
"state": if attached { "running" } else { "detached" }, "created_at_ms": s.created_ms,
|
||||||
|
"last_active_ms": s.last_active_ms.load(Ordering::Relaxed)})
|
||||||
}).collect();
|
}).collect();
|
||||||
log::info!("Terminal list sessions: count={}", sessions.len());
|
log::info!("Terminal list sessions: count={}", sessions.len());
|
||||||
// Official Mac 4.42.0 (handleListSessionsReq) sends a bare array with the request's header ID.
|
// Official Mac 4.42.0 (handleListSessionsReq) sends a bare array with the request's header ID.
|
||||||
@@ -323,9 +416,200 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
fn kill_uses_payload_id_preserves_request_id_and_updates_list_before_reply() {
|
||||||
|
let victim = spawn(u32::MAX - 5, 80, 24, Some("/bin/sh")).unwrap();
|
||||||
|
let decoy = spawn(u32::MAX - 6, 80, 24, Some("/bin/sh")).unwrap();
|
||||||
|
struct Cleanup(Vec<Arc<Session>>);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) { for s in &self.0 { s.signal(libc::SIGHUP); s.signal(libc::SIGKILL); } }
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(vec![victim.clone(), decoy.clone()]);
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let conn = TerminalConn::new(tx);
|
||||||
|
let payload = serde_json::json!({"session_id": victim.id}).to_string();
|
||||||
|
// A request ID may happen to equal another live session ID. Never kill it.
|
||||||
|
conn.handle(&encode(KILL_REQ, decoy.id, payload.as_bytes()));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!((response.kind, response.session), (KILL_RESP, decoy.id));
|
||||||
|
assert_eq!(json(&response.payload)["code"], 0);
|
||||||
|
conn.handle(&encode(LIST_REQ, 123, &[]));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
let list = json(&response.payload);
|
||||||
|
assert!(!list.as_array().unwrap().iter().any(|s| s["session_id"] == victim.id), "terminated session must be absent before acknowledgement");
|
||||||
|
assert!(list.as_array().unwrap().iter().any(|s| s["session_id"] == decoy.id), "request correlation must not select a session");
|
||||||
|
assert_eq!(unsafe { libc::kill(decoy.pid, 0) }, 0);
|
||||||
|
conn.handle(&encode(KILL_REQ, 123, payload.as_bytes()));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!(response.session, 123);
|
||||||
|
assert_eq!(json(&response.payload)["code"], 404);
|
||||||
|
for invalid in [b"{}".as_slice(), b"", br#"{"session_id":-1}"#, br#"{"session_id":4294967296}"#] {
|
||||||
|
conn.handle(&encode(KILL_REQ, decoy.id, invalid));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!(response.session, decoy.id);
|
||||||
|
assert_eq!(json(&response.payload)["code"], 400);
|
||||||
|
assert!(registry().lock().unwrap().contains_key(&decoy.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn session_changed_matches_official_empty_binary_notification() {
|
||||||
|
use crate::protocol::WireValue;
|
||||||
|
let message = changed_message(17, 1234);
|
||||||
|
let fields = crate::protocol::decode_wire(&message).unwrap();
|
||||||
|
assert_eq!(fields.iter().map(|f| f.number).collect::<Vec<_>>(), vec![1, 2, 28]);
|
||||||
|
assert_eq!(fields[2].value, WireValue::Bytes(&[]));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
fn kill_ends_foreground_and_background_jobs() {
|
||||||
|
let session = spawn(u32::MAX - 8, 80, 24, Some("/bin/sh")).unwrap();
|
||||||
|
struct Cleanup(Arc<Session>);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { self.0.terminate(); } }
|
||||||
|
let _cleanup = Cleanup(session.clone());
|
||||||
|
session.write(b"sleep 30 & sleep 30\n");
|
||||||
|
let mut jobs = Vec::new();
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline {
|
||||||
|
jobs = std::fs::read_to_string(format!("/proc/{}/task/{}/children", session.pid, session.pid)).unwrap_or_default()
|
||||||
|
.split_whitespace().filter_map(|s| s.parse::<i32>().ok())
|
||||||
|
.filter(|pid| std::fs::read_to_string(format!("/proc/{pid}/comm")).is_ok_and(|s| s.trim() == "sleep")).collect();
|
||||||
|
if jobs.len() == 2 { break; }
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert_eq!(jobs.len(), 2, "foreground and background jobs must be running");
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&encode(KILL_REQ, 123, serde_json::json!({"session_id":session.id}).to_string().as_bytes()));
|
||||||
|
assert_eq!(json(&decode(&rx.try_recv().unwrap()).unwrap().payload)["code"], 0);
|
||||||
|
jobs.push(session.pid);
|
||||||
|
let alive = |pid| std::fs::read_to_string(format!("/proc/{pid}/stat"))
|
||||||
|
.is_ok_and(|s| s.rsplit_once(") ").is_some_and(|(_, fields)| !fields.starts_with('Z')));
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline && jobs.iter().any(|pid| alive(*pid)) {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert!(!jobs.iter().any(|pid| alive(*pid)), "termination must end all job-control groups");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn reattach_rejects_old_input_and_detach_but_preserves_intentional_repeats() {
|
||||||
|
let pty = nix::pty::openpty(None, None).unwrap();
|
||||||
|
let id = u32::MAX - 7;
|
||||||
|
let mut termios = nix::sys::termios::tcgetattr(&pty.slave).unwrap();
|
||||||
|
nix::sys::termios::cfmakeraw(&mut termios);
|
||||||
|
nix::sys::termios::tcsetattr(&pty.slave, nix::sys::termios::SetArg::TCSANOW, &termios).unwrap();
|
||||||
|
let session = Arc::new(Session { id, shell: "/bin/sh".into(), created_ms: now_ms(), last_active_ms: AtomicU64::new(now_ms()),
|
||||||
|
master: pty.master, pid: 0, sink: Mutex::new(None), scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((80, 24)) });
|
||||||
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
|
struct Cleanup(Arc<Session>);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { remove_session(&self.0); } }
|
||||||
|
let _cleanup = Cleanup(session.clone());
|
||||||
|
let (old_tx, _old_rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let old = TerminalConn::new(old_tx);
|
||||||
|
let (new_tx, _new_rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let new = TerminalConn::new(new_tx);
|
||||||
|
old.handle(&encode(OPEN, id, b"{}"));
|
||||||
|
new.handle(&encode(OPEN, id, b"{}"));
|
||||||
|
old.handle(&encode(STDIN, id, b"stale"));
|
||||||
|
old.handle(&encode(DETACH, id, &[]));
|
||||||
|
old.disconnect();
|
||||||
|
let input = b"\x1b[A";
|
||||||
|
new.handle(&encode(STDIN, id, input));
|
||||||
|
new.handle(&encode(STDIN, id, input));
|
||||||
|
let mut slave = std::fs::File::from(pty.slave);
|
||||||
|
let mut bytes = [0; 6];
|
||||||
|
slave.read_exact(&mut bytes).unwrap();
|
||||||
|
assert!(bytes == input.repeat(2).as_slice(), "only current input should arrive, including intentional repeats");
|
||||||
|
assert!(session.sink.lock().unwrap().as_ref().is_some_and(|tx| tx.same_channel(&new.out)));
|
||||||
|
new.disconnect();
|
||||||
|
assert!(session.sink.lock().unwrap().is_none());
|
||||||
|
new.handle(&encode(OPEN, id, b"{}"));
|
||||||
|
assert!(session.sink.lock().unwrap().is_none(), "a closed connection must not reattach");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn nonempty_list_matches_official_snapshot_and_survives_reattach() {
|
||||||
|
// Official Mac 4.42.0 TerminalSession snapshot (0x1001b82c8–0x1001b8524):
|
||||||
|
// all six fields exist, including the Int64 last_active_ms timestamp.
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
struct Snapshot { session_id: u32, name: String, shell: String, state: String,
|
||||||
|
created_at_ms: i64, last_active_ms: i64 }
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let mut conn = TerminalConn::new(tx);
|
||||||
|
let id = u32::MAX - 3;
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24,"shell":"/bin/sh"}"#));
|
||||||
|
assert_eq!(decode(&rx.blocking_recv().unwrap()).unwrap().kind, OPEN_RESP);
|
||||||
|
struct Cleanup(u32);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
if let Some(s) = registry().lock().unwrap().get(&self.0).cloned() { s.signal(libc::SIGHUP); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(id);
|
||||||
|
let snapshot = |request| {
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&encode(LIST_REQ, request, &[]));
|
||||||
|
let reply = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!((reply.kind, reply.session), (LIST_RESP, request));
|
||||||
|
serde_json::from_slice::<Vec<Snapshot>>(&reply.payload).expect("official nonempty session schema")
|
||||||
|
.into_iter().find(|s| s.session_id == id).unwrap()
|
||||||
|
};
|
||||||
|
let first = snapshot(100);
|
||||||
|
assert_eq!(first.state, "running");
|
||||||
|
assert_eq!(first.shell, "/bin/sh");
|
||||||
|
assert_eq!(first.name, format!("sh-{id}"));
|
||||||
|
assert!(first.created_at_ms > 0 && first.last_active_ms >= first.created_at_ms);
|
||||||
|
for request in [101, 102] {
|
||||||
|
conn.handle(&encode(DETACH, id, &[]));
|
||||||
|
let detached = snapshot(request);
|
||||||
|
assert_eq!(detached.state, "detached");
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(5));
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
conn = TerminalConn::new(tx);
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24}"#));
|
||||||
|
assert_eq!(decode(&rx.blocking_recv().unwrap()).unwrap().kind, OPEN_RESP);
|
||||||
|
let attached = snapshot(request + 100);
|
||||||
|
assert_eq!(attached.state, "running");
|
||||||
|
assert_eq!(attached.created_at_ms, first.created_at_ms);
|
||||||
|
assert!(attached.last_active_ms > detached.last_active_ms);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
fn interrupt_reaches_foreground_job_without_exiting_shell() {
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let conn = TerminalConn::new(tx);
|
||||||
|
let id = u32::MAX - 4;
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24,"shell":"/bin/sh"}"#));
|
||||||
|
assert_eq!(decode(&rx.blocking_recv().unwrap()).unwrap().kind, OPEN_RESP);
|
||||||
|
let session = registry().lock().unwrap().get(&id).unwrap().clone();
|
||||||
|
struct Cleanup(Arc<Session>);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) { self.0.signal_foreground(libc::SIGKILL); self.0.signal(libc::SIGHUP); }
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(session.clone());
|
||||||
|
let foreground = || unsafe { libc::tcgetpgrp(session.master.as_raw_fd()) };
|
||||||
|
// The shell can foreground its child before exec resets inherited signals.
|
||||||
|
let job_ready = || {
|
||||||
|
let pgid = foreground();
|
||||||
|
pgid > 0 && pgid != session.pid &&
|
||||||
|
std::fs::read_to_string(format!("/proc/{pgid}/comm")).is_ok_and(|name| name.trim() == "sleep")
|
||||||
|
};
|
||||||
|
conn.handle(&encode(STDIN, id, b"sleep 30\n"));
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline && !job_ready() {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert!(job_ready(), "job must be executing in a separate foreground group");
|
||||||
|
conn.handle(&encode(SIGNAL, id, br#"{"signal":"SIGINT"}"#));
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline && foreground() != session.pid {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert_eq!(foreground(), session.pid, "interrupt must return control to the shell");
|
||||||
|
assert_eq!(unsafe { libc::kill(session.pid, 0) }, 0, "shell must stay alive");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
fn force_redraw_shrinks_then_restores_latest_size() {
|
fn force_redraw_shrinks_then_restores_latest_size() {
|
||||||
let pty = nix::pty::openpty(None, None).unwrap();
|
let pty = nix::pty::openpty(None, None).unwrap();
|
||||||
let session = Arc::new(Session { id: u32::MAX - 2, shell: "/bin/sh".into(), created_ms: now_ms(),
|
let session = Arc::new(Session { id: u32::MAX - 2, shell: "/bin/sh".into(), created_ms: now_ms(),
|
||||||
|
last_active_ms: AtomicU64::new(now_ms()),
|
||||||
master: pty.master, pid: 0, sink: Mutex::new(None),
|
master: pty.master, pid: 0, sink: Mutex::new(None),
|
||||||
scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((80, 24)) });
|
scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((80, 24)) });
|
||||||
let rows = |s: &Session| {
|
let rows = |s: &Session| {
|
||||||
@@ -346,6 +630,7 @@ mod tests {
|
|||||||
let id = u32::MAX - 1;
|
let id = u32::MAX - 1;
|
||||||
let history: Vec<u8> = (0..SCROLLBACK).map(|n| (n % 251) as u8).collect();
|
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(),
|
let session = Arc::new(Session { id, shell: "/bin/sh".into(), created_ms: now_ms(),
|
||||||
|
last_active_ms: AtomicU64::new(now_ms()),
|
||||||
master: pty.master, pid: 0, sink: Mutex::new(None),
|
master: pty.master, pid: 0, sink: Mutex::new(None),
|
||||||
scrollback: Mutex::new(history.iter().copied().collect()), size: Mutex::new((80, 24)) });
|
scrollback: Mutex::new(history.iter().copied().collect()), size: Mutex::new((80, 24)) });
|
||||||
registry().lock().unwrap().insert(id, session.clone());
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
|
|||||||
+27
-1
@@ -604,14 +604,33 @@ impl WebRtcSession {
|
|||||||
let out_channel = d.clone();
|
let out_channel = d.clone();
|
||||||
let out_label = label.clone();
|
let out_label = label.clone();
|
||||||
let outbound_rx = outbound_rx.clone();
|
let outbound_rx = outbound_rx.clone();
|
||||||
|
let change_sequence = out_sequence.clone();
|
||||||
|
let terminal_changes = crate::terminal::subscribe_changes();
|
||||||
let start_drain = move || {
|
let start_drain = move || {
|
||||||
let out_channel = out_channel.clone();
|
let out_channel = out_channel.clone();
|
||||||
let out_label = out_label.clone();
|
let out_label = out_label.clone();
|
||||||
let outbound_rx = outbound_rx.clone();
|
let outbound_rx = outbound_rx.clone();
|
||||||
|
let change_sequence = change_sequence.clone();
|
||||||
|
let mut terminal_changes = terminal_changes.clone();
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
let Some(mut outbound_rx) = take_outbound_once(&outbound_rx).await else { return; };
|
let Some(mut outbound_rx) = take_outbound_once(&outbound_rx).await else { return; };
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
while let Some(message) = outbound_rx.recv().await {
|
let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
|
||||||
|
loop {
|
||||||
|
let message = tokio::select! {
|
||||||
|
message = outbound_rx.recv() => match message { Some(message) => message, None => break },
|
||||||
|
changed = terminal_changes.changed(), if out_label == "BINARY_DATA_CHANNEL" => {
|
||||||
|
if changed.is_err() { break; }
|
||||||
|
if out_channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { continue; }
|
||||||
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
|
crate::terminal::changed_message(change_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts)
|
||||||
|
},
|
||||||
|
_ = health.tick(), if out_label == "BINARY_DATA_CHANNEL" => {
|
||||||
|
use webrtc::data_channel::data_channel_state::RTCDataChannelState;
|
||||||
|
if matches!(out_channel.ready_state(), RTCDataChannelState::Closing | RTCDataChannelState::Closed) { break; }
|
||||||
|
continue;
|
||||||
|
},
|
||||||
|
};
|
||||||
if let Err(e) = out_channel.send(&bytes::Bytes::from(message)).await {
|
if let Err(e) = out_channel.send(&bytes::Bytes::from(message)).await {
|
||||||
log::warn!("{} send failed: {}", out_label, e); break;
|
log::warn!("{} send failed: {}", out_label, e); break;
|
||||||
}
|
}
|
||||||
@@ -796,6 +815,13 @@ impl WebRtcSession {
|
|||||||
(Outbound::Other(tx), "BINARY_DATA_CHANNEL") => Some(Arc::new(crate::terminal::TerminalConn::new(tx.clone()))),
|
(Outbound::Other(tx), "BINARY_DATA_CHANNEL") => Some(Arc::new(crate::terminal::TerminalConn::new(tx.clone()))),
|
||||||
_ => None,
|
_ => None,
|
||||||
};
|
};
|
||||||
|
if let Some(terminal) = &terminal_conn {
|
||||||
|
let closing = terminal.clone();
|
||||||
|
d.on_close(Box::new(move || {
|
||||||
|
let closing = closing.clone();
|
||||||
|
Box::pin(async move { closing.disconnect(); })
|
||||||
|
}));
|
||||||
|
}
|
||||||
if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" {
|
if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" {
|
||||||
let channel = d.clone();
|
let channel = d.clone();
|
||||||
let initial_sequence = out_sequence.clone();
|
let initial_sequence = out_sequence.clone();
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ struct Viewer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>)
|
async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>)
|
||||||
|
-> (WebRtcSession, Viewer) {
|
||||||
|
connect_channels(desktop, portal, &["CONTROL_DATA_CHANNEL"]).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn connect_channels(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>, labels: &[&str])
|
||||||
-> (WebRtcSession, Viewer) {
|
-> (WebRtcSession, Viewer) {
|
||||||
let input = Arc::new(InputInjector::without_desktop());
|
let input = Arc::new(InputInjector::without_desktop());
|
||||||
let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await;
|
let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await;
|
||||||
@@ -26,7 +31,7 @@ async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::Porta
|
|||||||
let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
|
let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
|
||||||
let (tx, messages) = mpsc::unbounded_channel();
|
let (tx, messages) = mpsc::unbounded_channel();
|
||||||
let mut channels = HashMap::new();
|
let mut channels = HashMap::new();
|
||||||
for label in ["CONTROL_DATA_CHANNEL"] {
|
for &label in labels {
|
||||||
let channel = pc.create_data_channel(label, None).await.unwrap();
|
let channel = pc.create_data_channel(label, None).await.unwrap();
|
||||||
let (tx, name) = (tx.clone(), label.to_string());
|
let (tx, name) = (tx.clone(), label.to_string());
|
||||||
channel.on_message(Box::new(move |message| {
|
channel.on_message(Box::new(move |message| {
|
||||||
@@ -227,3 +232,57 @@ async fn tool_peer_applies_capture_settings_without_a_desktop() {
|
|||||||
viewer.router.lock().await.stop().await.unwrap();
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
}).await.expect("tool capture-setting regression exceeded deadline");
|
}).await.expect("tool capture-setting regression exceeded deadline");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Exercise the locally patched notifications and close handler through real SCTP,
|
||||||
|
/// alongside the upstream CONTROL drain. No cloud or live host session is used.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn terminal_notifications_and_disconnect_preserve_control_channel() {
|
||||||
|
use crate::terminal::{self, TerminalConn};
|
||||||
|
tokio::time::timeout(Duration::from_secs(20), async {
|
||||||
|
let id = u32::MAX - 100;
|
||||||
|
struct Cleanup(u32);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let (tx, _rx) = mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&terminal::encode(terminal::KILL_REQ, 999,
|
||||||
|
serde_json::json!({"session_id": self.0}).to_string().as_bytes()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(id);
|
||||||
|
let (host, mut viewer) = connect_channels(false, None,
|
||||||
|
&["CONTROL_DATA_CHANNEL", "BINARY_DATA_CHANNEL"]).await;
|
||||||
|
viewer.channels["BINARY_DATA_CHANNEL"].send(&terminal::encode(terminal::OPEN, id,
|
||||||
|
br#"{"cols":80,"rows":24,"shell":"/bin/sh"}"#).into()).await.unwrap();
|
||||||
|
tokio::time::timeout(Duration::from_secs(3), async {
|
||||||
|
let (mut opened, mut notified) = (false, false);
|
||||||
|
while !(opened && notified) {
|
||||||
|
let (label, bytes) = viewer.messages.recv().await.expect("terminal channel closed");
|
||||||
|
if label != "BINARY_DATA_CHANNEL" { continue; }
|
||||||
|
if let Some(frame) = terminal::decode(&bytes) {
|
||||||
|
if frame.kind == terminal::OPEN_RESP && frame.session == id {
|
||||||
|
assert_eq!(serde_json::from_slice::<serde_json::Value>(&frame.payload).unwrap()["code"], 0);
|
||||||
|
opened = true;
|
||||||
|
}
|
||||||
|
} else if body(&bytes, 28) == Some(&[][..]) { notified = true; }
|
||||||
|
}
|
||||||
|
}).await.expect("open response and list notification must both reach the viewer");
|
||||||
|
let state = || {
|
||||||
|
let (tx, mut rx) = mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&terminal::encode(terminal::LIST_REQ, 998, &[]));
|
||||||
|
let frame = terminal::decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
serde_json::from_slice::<Vec<serde_json::Value>>(&frame.payload).unwrap().into_iter()
|
||||||
|
.find(|s| s["session_id"] == id).unwrap()["state"].as_str().unwrap().to_owned()
|
||||||
|
};
|
||||||
|
assert_eq!(state(), "running");
|
||||||
|
viewer.channels["BINARY_DATA_CHANNEL"].close().await.unwrap();
|
||||||
|
tokio::time::timeout(Duration::from_secs(3), async {
|
||||||
|
while state() != "detached" { tokio::time::sleep(Duration::from_millis(20)).await; }
|
||||||
|
}).await.expect("channel closure must detach its terminal session");
|
||||||
|
viewer.channels["CONTROL_DATA_CHANNEL"].send(&echo_request(123).into()).await.unwrap();
|
||||||
|
assert!(receive(&mut viewer.messages, 3, Duration::from_secs(3)).await.is_some(),
|
||||||
|
"terminal closure must leave CONTROL responsive");
|
||||||
|
viewer.pc.close().await.unwrap();
|
||||||
|
host.pc.close().await.unwrap();
|
||||||
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
|
}).await.expect("terminal lifecycle regression exceeded deadline");
|
||||||
|
}
|
||||||
Reference in new issue
Block a user