mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df9429495f | ||
|
|
ba82bc432a | ||
|
|
648eeca03d | ||
|
|
f97370782f | ||
|
|
8792fb4eca |
No files matched your search
Generated
+1
-1
@@ -2741,7 +2741,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.29"
|
version = "0.2.31"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.29"
|
version = "0.2.31"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
|
|||||||
@@ -348,6 +348,7 @@ Common environment variables:
|
|||||||
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
||||||
|
| `UU_NVENC_BUFFER_MS` | NVENC VBV buffer in ms (10-1000, NVENC only, including the in-process engine); the default is 100-500 kbit, set `1000` when high-resolution keyframes blur and flicker once per GOP (#103) |
|
||||||
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
||||||
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
||||||
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
||||||
|
|||||||
@@ -316,6 +316,7 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
||||||
|
| `UU_NVENC_BUFFER_MS` | NVENC 的 VBV 缓冲(10–1000 ms,仅 NVENC 生效,含进程内引擎);默认 100–500 kbit,1440p 等高分辨率下关键帧被压糊、按 GOP 周期闪烁时设 `1000`(#103) |
|
||||||
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
||||||
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
||||||
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
||||||
|
|||||||
@@ -732,7 +732,9 @@ int vaapi_encode_frame(
|
|||||||
rc.window_size = 1000;
|
rc.window_size = 1000;
|
||||||
rc.initial_qp = 28;
|
rc.initial_qp = 28;
|
||||||
rc.min_qp = 16;
|
rc.min_qp = 16;
|
||||||
rc.max_qp = 44;
|
// The driver's VBR raises QP only up to max_qp; 44 blocked the capped presets from reaching
|
||||||
|
// the QP 51 hardware floor on hard content (2560x1600 testsrc2: 4.16 -> 2.60 Mbps, #33)
|
||||||
|
rc.max_qp = 51;
|
||||||
rc.rc_flags.bits.disable_frame_skip = 1; // a remote desktop must not drop frames silently
|
rc.rc_flags.bits.disable_frame_skip = 1; // a remote desktop must not drop frames silently
|
||||||
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeRateControl, &rc, sizeof(rc));
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeRateControl, &rc, sizeof(rc));
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
先开端口映射再打开桌面时不再黑屏;VAAPI 低码率档能压到更低码率。/ Opening the desktop after a port mapping no longer shows a black screen; VAAPI low-bitrate presets go lower.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **端口映射后打开桌面黑屏(#99)**:已有端口映射连接时,Mac 控制端打开桌面不会新建连接,而是在原连接上发送 `capture_desktop`。
|
||||||
|
宿主现在会把这条连接转为桌面:画面、光标、剪贴板和会话计数都会启动,剪贴板能力也会重新通告。之后再打开新的桌面时,旧连接只停掉桌面,
|
||||||
|
端口映射照常可用。若此前 X11 分辨率有变化,会按新尺寸重建采集。限制:Wayland Portal 后端暂不支持这种方式;这条连接上没有声音。
|
||||||
|
- **VAAPI 低档码率(#33,#102,感谢 @ferstar)**:in-process VAAPI 编码的最大 QP 从 44 放宽到 51,复杂画面下低档可降到硬件能达到的最低码率;中高档不受影响。
|
||||||
|
- A viewer that opens the desktop on an existing port-mapping connection (`capture_desktop`) now gets video, cursor, clipboard and session handling on that connection;
|
||||||
|
a later desktop stops it without closing the port mappings. In-process VAAPI `max_qp` raised from 44 to 51.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
#99:根因由报告者日志证实;修复只有单元测试与 CI,官方 Mac 控制端下尚未实机验证,欢迎反馈。#102:贡献者在 AMD 核显上实测(2560×1600 复杂画面最低档 4.16→2.60 Mbps,
|
||||||
|
中高档输出一致),我们这边仅 CI。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.30_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.30-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.30`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
NVENC 新增可选 VBV 缓冲开关,缓解高分辨率下关键帧按 GOP 周期闪烁。/ Opt-in NVENC VBV buffer for high-resolution keyframe pulsing.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **`UU_NVENC_BUFFER_MS`(#103,感谢 @zhl-HFUT 的分析)**:NVENC 的 VBV 缓冲(10–1000 ms,缓冲 = 码率上限 × 毫秒 / 1000),FFmpeg 进程管线和进程内引擎都生效。
|
||||||
|
默认缓冲(100–500 kbit)在 1440p 等高分辨率下会把关键帧压糊,画面按 GOP 周期“糊一下再变清”;遇到时可设 `UU_NVENC_BUFFER_MS=1000`。默认行为不变。
|
||||||
|
- New `UU_NVENC_BUFFER_MS` (10–1000 ms of the bitrate cap) for NVENC, applied to both the FFmpeg pipeline and the in-process engine. Default unchanged.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
仅单元测试与 CI,尚未在 NVENC 实机上验证,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.31_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.31-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.31`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -215,3 +215,47 @@ async fn locked_control_unlock_requests_and_tools_work_without_a_video_frame() {
|
|||||||
drop(lock);
|
drop(lock);
|
||||||
}).await.expect("locked bootstrap/tool regression exceeded deadline");
|
}).await.expect("locked bootstrap/tool regression exceeded deadline");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn capture_desktop_on_a_port_mapping_peer_promotes_it_once() {
|
||||||
|
tokio::time::timeout(Duration::from_secs(25), async {
|
||||||
|
let input = Arc::new(InputInjector::without_desktop());
|
||||||
|
let (host, mut viewer) = connect(input.clone(), false, None, &["CONTROL_DATA_CHANNEL", "FILE_DATA_CHANNEL"]).await;
|
||||||
|
let (requests, mut requested) = mpsc::unbounded_channel();
|
||||||
|
host.on_desktop_request(move || { let _ = requests.send(()); });
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
assert!(!host.role.is_desktop() && host.role.input().is_none());
|
||||||
|
// The Mac viewer opens the desktop on its existing port-mapping peer (#99).
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(5, 0, 3, &[8, 4])).await;
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), requested.recv()).await.unwrap().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(host.role.is_desktop());
|
||||||
|
assert!(host.role.input().is_some_and(|session| session.is_current()));
|
||||||
|
// CONTROL repeats the desktop initialization for the same viewer.
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
// The port-mapping session on this peer still answers.
|
||||||
|
send(&viewer, "FILE_DATA_CHANNEL", mapping(2, b"still mapped")).await;
|
||||||
|
receive(&mut viewer.messages, "FILE_DATA_CHANNEL", 27).await;
|
||||||
|
// A repeated capture_desktop does not ask again, and a later promote is a no-op.
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(6, 0, 3, &[8, 4])).await;
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(7, 0, 3, &[8, 0])).await;
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
|
||||||
|
assert!(requested.try_recv().is_err());
|
||||||
|
let lease = host.role.input().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(lease.is_current());
|
||||||
|
// A newer desktop demotes it; the port mapping stays, and capture_desktop promotes it again.
|
||||||
|
host.demote();
|
||||||
|
assert!(!host.role.is_desktop() && host.role.input().is_none());
|
||||||
|
send(&viewer, "FILE_DATA_CHANNEL", mapping(2, b"after demotion")).await;
|
||||||
|
receive(&mut viewer.messages, "FILE_DATA_CHANNEL", 27).await;
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(8, 0, 3, &[8, 4])).await;
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), requested.recv()).await.unwrap().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(host.role.is_desktop() && host.role.input().is_some_and(|session| session.is_current()));
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
host.pc.close().await.unwrap();
|
||||||
|
viewer.pc.close().await.unwrap();
|
||||||
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
|
}).await.expect("capture_desktop promotion exceeded deadline");
|
||||||
|
}
|
||||||
+54
-7
@@ -737,6 +737,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
||||||
let mut mac_by_ice: HashMap<String, bool> = HashMap::new();
|
let mut mac_by_ice: HashMap<String, bool> = HashMap::new();
|
||||||
let mut next_mac = false;
|
let mut next_mac = false;
|
||||||
|
// Tool peers ask here to become the desktop (capture_desktop on an existing connection, #99).
|
||||||
|
let (desktop_requests, mut desktop_requested) = mpsc::unbounded_channel::<String>();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
if *shutdown.borrow() {
|
if *shutdown.borrow() {
|
||||||
@@ -821,6 +823,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
_ = shutdown.changed() => Some(SignalingEvent::Stop),
|
_ = shutdown.changed() => Some(SignalingEvent::Stop),
|
||||||
command = commands.recv(), if assist.is_some() => Some(SignalingEvent::AssistCommand(command.unwrap_or(assist::Command::Stop))),
|
command = commands.recv(), if assist.is_some() => Some(SignalingEvent::AssistCommand(command.unwrap_or(assist::Command::Stop))),
|
||||||
_ = assist_tick.tick(), if assist.is_some() => Some(SignalingEvent::AssistTick),
|
_ = assist_tick.tick(), if assist.is_some() => Some(SignalingEvent::AssistTick),
|
||||||
|
Some(ice) = desktop_requested.recv() => Some(SignalingEvent::DesktopRequested(ice)),
|
||||||
event = rx_event.recv() => event,
|
event = rx_event.recv() => event,
|
||||||
};
|
};
|
||||||
let Some(evt) = event else { break; };
|
let Some(evt) = event else { break; };
|
||||||
@@ -855,8 +858,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(id, _)| id.clone()).collect();
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(id, _)| id.clone()).collect();
|
||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.desktop; let _ = s.pc.close().await; } }
|
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.role.is_desktop(); let _ = s.pc.close().await; } }
|
||||||
if desktop_ended && !sessions.values().any(|s| s.desktop) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
}
|
}
|
||||||
SignalingEvent::Connected => {
|
SignalingEvent::Connected => {
|
||||||
@@ -943,8 +946,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(k, _)| k.clone()).collect();
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(k, _)| k.clone()).collect();
|
||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for k in ended { if let Some(old) = sessions.remove(&k) { desktop_ended |= old.desktop; let _ = old.pc.close().await; } }
|
for k in ended { if let Some(old) = sessions.remove(&k) { desktop_ended |= old.role.is_desktop(); let _ = old.pc.close().await; } }
|
||||||
if desktop_ended && !sessions.values().any(|s| s.desktop) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
|
|
||||||
if soac.msg_type == "offer" {
|
if soac.msg_type == "offer" {
|
||||||
@@ -960,6 +963,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
for id in superseded_peer_ids(&sessions, &ice, desktop) {
|
for id in superseded_peer_ids(&sessions, &ice, desktop) {
|
||||||
if let Some(old) = sessions.remove(&id) { let _ = old.pc.close().await; }
|
if let Some(old) = sessions.remove(&id) { let _ = old.pc.close().await; }
|
||||||
}
|
}
|
||||||
|
// A tool peer promoted by capture_desktop stops its desktop but keeps its tools.
|
||||||
|
if desktop { for old in sessions.values() { old.demote(); } }
|
||||||
if desktop && desktop_backend::headless() {
|
if desktop && desktop_backend::headless() {
|
||||||
log::info!("Desktop connection ignored: headless mode (terminal, file transfer and port mapping remain available)");
|
log::info!("Desktop connection ignored: headless mode (terminal, file transfer and port mapping remain available)");
|
||||||
continue;
|
continue;
|
||||||
@@ -981,7 +986,12 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
if desktop { if let Some(portal) = &portal_desktop { portal.begin(); } }
|
if desktop { if let Some(portal) = &portal_desktop { portal.begin(); } }
|
||||||
match WebRtcSession::new(session_capture, input.clone(), signaling_client.clone(), desktop, transport,
|
match WebRtcSession::new(session_capture, input.clone(), signaling_client.clone(), desktop, transport,
|
||||||
if desktop { portal_desktop.clone() } else { None }).await {
|
if desktop { portal_desktop.clone() } else { None }).await {
|
||||||
Ok(sess) => {
|
Ok(mut sess) => {
|
||||||
|
sess.controller_mac = controller_mac;
|
||||||
|
if !desktop {
|
||||||
|
let (requests, peer) = (desktop_requests.clone(), ice.clone());
|
||||||
|
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
|
||||||
|
}
|
||||||
// Register before awaiting SDP: shutdown can always close
|
// Register before awaiting SDP: shutdown can always close
|
||||||
// a peer whose answer may already be queued to the viewer.
|
// a peer whose answer may already be queued to the viewer.
|
||||||
sessions.insert(ice.clone(), sess);
|
sessions.insert(ice.clone(), sess);
|
||||||
@@ -1026,13 +1036,50 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for k in targets {
|
for k in targets {
|
||||||
if let Some(old) = sessions.remove(&k) {
|
if let Some(old) = sessions.remove(&k) {
|
||||||
desktop_ended |= old.desktop;
|
desktop_ended |= old.role.is_desktop();
|
||||||
if let Err(e) = old.pc.close().await { log::warn!("Close released peer failed: {}", e); }
|
if let Err(e) = old.pc.close().await { log::warn!("Close released peer failed: {}", e); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if desktop_ended && !sessions.values().any(|s| s.desktop) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
}
|
}
|
||||||
|
SignalingEvent::DesktopRequested(ice) => {
|
||||||
|
let mut sessions = webrtc_sessions.lock().await;
|
||||||
|
let Some(peer) = sessions.get(&ice).filter(|peer| !peer.role.is_desktop()) else { continue; };
|
||||||
|
if desktop_backend::headless() {
|
||||||
|
log::info!("Desktop request on a tool connection ignored: headless mode");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if portal_desktop.is_some() {
|
||||||
|
log::info!("Desktop request on a tool connection not supported with the Portal backend; open the desktop before port mapping");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let controller_mac = peer.controller_mac;
|
||||||
|
let current = peer.desktop_capture();
|
||||||
|
// Same recovery as a desktop offer: the display may have come up or been resized after this peer.
|
||||||
|
let resized = current.init_error.is_none() && current.backend == desktop_backend::DesktopBackend::X11
|
||||||
|
&& tokio::task::spawn_blocking(crate::capture::x11_size).await.ok().flatten().is_some_and(|size| size != (current.width, current.height));
|
||||||
|
if resized { log::info!("Desktop geometry changed since this connection opened; reinitializing capture"); }
|
||||||
|
let screen = if current.init_error.is_some() || resized {
|
||||||
|
match tokio::task::spawn_blocking(ScreenCapture::new).await {
|
||||||
|
Ok(Ok(screen)) => { capture = Arc::new(screen); Some(capture.clone()) },
|
||||||
|
Ok(Err(error)) => { log::info!("Desktop request on a tool connection ignored: {error}"); continue; },
|
||||||
|
Err(_) => { log::warn!("Desktop initialization worker failed"); continue; },
|
||||||
|
}
|
||||||
|
} else { None };
|
||||||
|
video::warm_auto_probe(); video::check_ffmpeg_usable();
|
||||||
|
input.set_mac_controller(controller_mac);
|
||||||
|
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
|
||||||
|
// close; a promoted tool peer only stops its desktop and keeps its tools.
|
||||||
|
let superseded: Vec<String> = sessions.iter().filter(|(id, old)| id.as_str() != ice && old.role.is_desktop())
|
||||||
|
.map(|(id, _)| id.clone()).collect();
|
||||||
|
for id in superseded {
|
||||||
|
if sessions[&id].desktop { if let Some(old) = sessions.remove(&id) { let _ = old.pc.close().await; } }
|
||||||
|
else { sessions[&id].demote(); }
|
||||||
|
}
|
||||||
|
if let Some(peer) = sessions.get(&ice) { peer.promote(screen); }
|
||||||
|
}
|
||||||
SignalingEvent::Disconnected => {
|
SignalingEvent::Disconnected => {
|
||||||
capture_types.clear();
|
capture_types.clear();
|
||||||
next_capture_type=None;
|
next_capture_type=None;
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ pub enum SignalingEvent {
|
|||||||
Released(Value),
|
Released(Value),
|
||||||
Left(Value),
|
Left(Value),
|
||||||
Disconnected,
|
Disconnected,
|
||||||
|
/// capture_desktop on this tool peer (ice_id); raised by the peer, not by signaling.
|
||||||
|
DesktopRequested(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct SignalingClient {
|
pub struct SignalingClient {
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ pub const FF_SIMPLE_ACTION: u8 = 2;
|
|||||||
pub const FF_SYSTEM_METRICS: u8 = 2;
|
pub const FF_SYSTEM_METRICS: u8 = 2;
|
||||||
|
|
||||||
pub const SHOW_DESKTOP: u64 = 2;
|
pub const SHOW_DESKTOP: u64 = 2;
|
||||||
|
/// Opens the desktop on an existing connection (the viewer's port mapping reuses its peer, #99).
|
||||||
|
pub const CAPTURE_DESKTOP: u64 = 4;
|
||||||
pub const REBOOT_SYSTEM: u64 = 9;
|
pub const REBOOT_SYSTEM: u64 = 9;
|
||||||
pub const LOCK_SYSTEM: u64 = 10;
|
pub const LOCK_SYSTEM: u64 = 10;
|
||||||
pub const SHUTDOWN_SYSTEM: u64 = 12;
|
pub const SHUTDOWN_SYSTEM: u64 = 12;
|
||||||
|
|||||||
+18
-17
@@ -780,19 +780,20 @@ async fn read_inprocess(
|
|||||||
/// whole IDR frame, otherwise large desktops get near-grey keyframes that sharpen over the GOP (#8).
|
/// whole IDR frame, otherwise large desktops get near-grey keyframes that sharpen over the GOP (#8).
|
||||||
/// Half a second of bitrate still starved repeated 0.5 s-GOP keyframes at 3296x2036/2M; one second did not.
|
/// Half a second of bitrate still starved repeated 0.5 s-GOP keyframes at 3296x2036/2M; one second did not.
|
||||||
fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
||||||
if encoder == Encoder::Cpu { max_kbps.clamp(500, 8000) }
|
let env = match encoder {
|
||||||
else if encoder == Encoder::Vaapi {
|
Encoder::Cpu => return max_kbps.clamp(500, 8000),
|
||||||
let requested = std::env::var("UU_VAAPI_BUFFER_MS").ok();
|
Encoder::Vaapi => "UU_VAAPI_BUFFER_MS",
|
||||||
vaapi_buffer_kbits(max_kbps, requested.as_deref()).unwrap_or((max_kbps / 8).clamp(100, 500))
|
Encoder::Nvenc => "UU_NVENC_BUFFER_MS",
|
||||||
}
|
};
|
||||||
else { (max_kbps / 8).clamp(100, 500) }
|
let requested = std::env::var(env).ok();
|
||||||
|
buffer_ms_kbits(max_kbps, requested.as_deref()).unwrap_or((max_kbps / 8).clamp(100, 500))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Opt-in VAAPI VBV buffer: `码率上限 × 毫秒 / 1000` for `UU_VAAPI_BUFFER_MS` in 10-1000 ms.
|
/// Opt-in hardware VBV buffer: `码率上限 × 毫秒 / 1000` for `UU_VAAPI_BUFFER_MS` /
|
||||||
/// The 100-500 kbit default is sized for NVENC; VAAPI quantizes a whole desktop keyframe when
|
/// `UU_NVENC_BUFFER_MS` in 10-1000 ms. With the 100-500 kbit default the encoder quantizes a
|
||||||
/// the buffer is that small, which reads as a blur that sharpens over each GOP (#42).
|
/// whole desktop keyframe, which reads as a blur that sharpens over each GOP (#42 VAAPI, #103 NVENC).
|
||||||
/// Unset, out of range or unparsable values keep the default buffer.
|
/// Unset, out of range or unparsable values keep the default buffer.
|
||||||
fn vaapi_buffer_kbits(max_kbps: u32, value: Option<&str>) -> Option<u32> {
|
fn buffer_ms_kbits(max_kbps: u32, value: Option<&str>) -> Option<u32> {
|
||||||
let ms = value?.trim().parse::<u32>().ok().filter(|ms| (10..=1000).contains(ms))?;
|
let ms = value?.trim().parse::<u32>().ok().filter(|ms| (10..=1000).contains(ms))?;
|
||||||
Some((max_kbps.saturating_mul(ms) / 1000).max(1))
|
Some((max_kbps.saturating_mul(ms) / 1000).max(1))
|
||||||
}
|
}
|
||||||
@@ -1570,17 +1571,17 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn vaapi_buffer_env_is_opt_in_and_bounded() {
|
fn hw_buffer_env_is_opt_in_and_bounded() {
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, None), None);
|
assert_eq!(buffer_ms_kbits(30_000, None), None);
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some("250")), Some(7500));
|
assert_eq!(buffer_ms_kbits(30_000, Some("250")), Some(7500));
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some(" 10 ")), Some(300));
|
assert_eq!(buffer_ms_kbits(30_000, Some(" 10 ")), Some(300));
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some("1000")), Some(30_000));
|
assert_eq!(buffer_ms_kbits(30_000, Some("1000")), Some(30_000));
|
||||||
// Out of the documented range, empty or unparsable keeps the default buffer.
|
// Out of the documented range, empty or unparsable keeps the default buffer.
|
||||||
for value in ["", "9", "1001", "0", "abc", "-250", "250ms"] {
|
for value in ["", "9", "1001", "0", "abc", "-250", "250ms"] {
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some(value)), None, "{value}");
|
assert_eq!(buffer_ms_kbits(30_000, Some(value)), None, "{value}");
|
||||||
}
|
}
|
||||||
// A tiny cap must not produce a zero-sized buffer.
|
// A tiny cap must not produce a zero-sized buffer.
|
||||||
assert_eq!(vaapi_buffer_kbits(1, Some("10")), Some(1));
|
assert_eq!(buffer_ms_kbits(1, Some("10")), Some(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
+377
-181
@@ -42,12 +42,170 @@ pub struct SessionContext {
|
|||||||
pub bundle_media: Option<(String, u16)>,
|
pub bundle_media: Option<(String, u16)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Desktop role of one peer. A tool peer (file transfer, terminal, port mapping) gains it
|
||||||
|
/// when the viewer opens the desktop on that same connection with SimpleAction 4
|
||||||
|
/// capture_desktop instead of a new desktop offer (#99).
|
||||||
|
pub struct DesktopRole {
|
||||||
|
active: tokio::sync::watch::Sender<bool>,
|
||||||
|
input: std::sync::Mutex<Option<Arc<crate::input::DesktopInputSession>>>,
|
||||||
|
stream: std::sync::Mutex<Option<DesktopStream>>,
|
||||||
|
/// The running stream of a promoted peer; aborted on demotion so a quick re-promotion
|
||||||
|
/// never leaves two encoders on one track.
|
||||||
|
stream_task: std::sync::Mutex<Option<tokio::task::AbortHandle>>,
|
||||||
|
/// Capture reinitialized at promotion; the peer's own capture was unavailable when offered.
|
||||||
|
screen: std::sync::Mutex<Option<Arc<ScreenCapture>>>,
|
||||||
|
/// One session tracker per peer follows every promotion and demotion.
|
||||||
|
tracking: std::sync::atomic::AtomicBool,
|
||||||
|
request: std::sync::OnceLock<Box<dyn Fn() + Send + Sync>>,
|
||||||
|
}
|
||||||
|
impl DesktopRole {
|
||||||
|
fn new(desktop: bool) -> Self {
|
||||||
|
Self { active: tokio::sync::watch::channel(desktop).0, input: Default::default(),
|
||||||
|
stream: Default::default(), stream_task: Default::default(), screen: Default::default(), tracking: Default::default(), request: Default::default() }
|
||||||
|
}
|
||||||
|
pub fn is_desktop(&self) -> bool { *self.active.borrow() }
|
||||||
|
fn input(&self) -> Option<Arc<crate::input::DesktopInputSession>> { self.input.lock().unwrap().clone() }
|
||||||
|
fn screen_or(&self, screen: &Arc<ScreenCapture>) -> Arc<ScreenCapture> {
|
||||||
|
self.screen.lock().unwrap().clone().unwrap_or_else(|| screen.clone())
|
||||||
|
}
|
||||||
|
/// Waits until this peer is a desktop; false once the channel closes first.
|
||||||
|
async fn wait_desktop(&self, channel: &RTCDataChannel) -> bool {
|
||||||
|
let mut active = self.active.subscribe();
|
||||||
|
loop {
|
||||||
|
if *active.borrow_and_update() { return true; }
|
||||||
|
tokio::select! {
|
||||||
|
changed = active.changed() => if changed.is_err() { return false; },
|
||||||
|
_ = tokio::time::sleep(std::time::Duration::from_millis(200)) => {
|
||||||
|
if matches!(channel.ready_state(), webrtc::data_channel::data_channel_state::RTCDataChannelState::Closing
|
||||||
|
| webrtc::data_channel::data_channel_state::RTCDataChannelState::Closed) { return false; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Live desktop video for one peer; a tool peer keeps it unstarted until it becomes a desktop.
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct DesktopStream {
|
||||||
|
pc: std::sync::Weak<RTCPeerConnection>,
|
||||||
|
track: Arc<crate::video_track::VideoTrack>,
|
||||||
|
portal_desktop: Option<Arc<crate::desktop_session::PortalDesktop>>,
|
||||||
|
capture_size: (u32, u32),
|
||||||
|
capture_display: String,
|
||||||
|
portal: Option<Arc<crate::portal::PortalSession>>,
|
||||||
|
settings_rx: tokio::sync::watch::Receiver<crate::capture_setting::VideoSettings>,
|
||||||
|
settings: Arc<tokio::sync::watch::Sender<crate::capture_setting::VideoSettings>>,
|
||||||
|
idr_request: Arc<std::sync::atomic::AtomicBool>,
|
||||||
|
selection: crate::video_select::Selection,
|
||||||
|
chroma_sync: Option<tokio::sync::mpsc::UnboundedSender<Vec<u8>>>,
|
||||||
|
reload_at_session: u64,
|
||||||
|
}
|
||||||
|
|
||||||
pub struct WebRtcSession {
|
pub struct WebRtcSession {
|
||||||
pub pc: Arc<RTCPeerConnection>,
|
pub pc: Arc<RTCPeerConnection>,
|
||||||
pub capture: Arc<ScreenCapture>,
|
pub capture: Arc<ScreenCapture>,
|
||||||
pub input: Arc<InputInjector>,
|
pub input: Arc<InputInjector>,
|
||||||
|
/// The role this peer was offered with; `role` also covers a later capture_desktop.
|
||||||
pub desktop: bool,
|
pub desktop: bool,
|
||||||
|
pub role: Arc<DesktopRole>,
|
||||||
|
pub controller_mac: bool,
|
||||||
pub context: Arc<Mutex<SessionContext>>,
|
pub context: Arc<Mutex<SessionContext>>,
|
||||||
|
actions: Arc<crate::system_actions::PeerActions>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Counts a desktop session once it is connected (a failed offer is not a session), while the
|
||||||
|
/// peer is the desktop. Started once per peer, so a quick demote and re-promote cannot end the
|
||||||
|
/// count of a session that is still streaming.
|
||||||
|
fn track_session(end_pc: Arc<RTCPeerConnection>, actions: Arc<crate::system_actions::PeerActions>, role: &DesktopRole) {
|
||||||
|
if role.tracking.swap(true, std::sync::atomic::Ordering::AcqRel) { return; }
|
||||||
|
let active = role.active.subscribe();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState as State;
|
||||||
|
loop {
|
||||||
|
while end_pc.connection_state() != State::Connected || !*active.borrow() {
|
||||||
|
if matches!(end_pc.connection_state(), State::Closed | State::Failed) { return; }
|
||||||
|
tokio::time::sleep(std::time::Duration::from_millis(200)).await;
|
||||||
|
}
|
||||||
|
let starting = actions.clone();
|
||||||
|
let _ = tokio::task::spawn_blocking(move || starting.session_started()).await;
|
||||||
|
while !matches!(end_pc.connection_state(), State::Closed | State::Failed) && *active.borrow() {
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
|
||||||
|
}
|
||||||
|
let closed = matches!(end_pc.connection_state(), State::Closed | State::Failed);
|
||||||
|
let ending = actions.clone();
|
||||||
|
let _ = tokio::task::spawn_blocking(move || ending.session_ended()).await;
|
||||||
|
if closed { return; }
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
type EchoReplay = (Arc<std::sync::atomic::AtomicU64>, Arc<std::sync::atomic::AtomicBool>, Arc<std::sync::atomic::AtomicBool>);
|
||||||
|
|
||||||
|
/// A promoted tool peer starts its TEXT clipboard after the viewer's echo was answered without
|
||||||
|
/// ff_clipboard; declare it again on CONTROL once the bridge is ready, as the Portal path does.
|
||||||
|
fn replay_clipboard_echo(channel: Arc<RTCDataChannel>, sequence: Arc<std::sync::atomic::AtomicU64>,
|
||||||
|
(echo_request, echo_seen, clipboard_ready): EchoReplay, role: Arc<DesktopRole>) {
|
||||||
|
tokio::spawn(async move {
|
||||||
|
for _ in 0..100 {
|
||||||
|
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
|
||||||
|
if !role.is_desktop() || channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { return; }
|
||||||
|
if !clipboard_ready.load(std::sync::atomic::Ordering::Acquire) { continue; }
|
||||||
|
// echo_seen is published after the request seq, so reading it first gives a current seq.
|
||||||
|
if echo_seen.load(std::sync::atomic::Ordering::Acquire) {
|
||||||
|
let request_seq = echo_request.load(std::sync::atomic::Ordering::Acquire);
|
||||||
|
let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
|
let response = crate::control_protocol::encode_echo_response_with_clipboard(
|
||||||
|
sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), timestamp, request_seq, true);
|
||||||
|
let _ = channel.send(&bytes::Bytes::from(response)).await;
|
||||||
|
log::info!("CONTROL clipboard capability declared after capture_desktop");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DesktopStream {
|
||||||
|
/// Encode current frames only while the peer is connected and still the desktop.
|
||||||
|
fn spawn(self, screen: Option<Arc<ScreenCapture>>, mut active: tokio::sync::watch::Receiver<bool>) -> Option<tokio::task::AbortHandle> {
|
||||||
|
let streaming_pc = self.pc.upgrade()?;
|
||||||
|
let DesktopStream { track: video_track, portal_desktop, capture_size, capture_display, portal,
|
||||||
|
settings_rx, settings, idr_request, selection, chroma_sync, reload_at_session, .. } = self;
|
||||||
|
let (capture_size, capture_display, portal) = screen.map_or((capture_size, capture_display, portal),
|
||||||
|
|screen| ((screen.width, screen.height), screen.display.clone(), screen.portal.clone()));
|
||||||
|
Some(tokio::spawn(async move { tokio::select! {
|
||||||
|
_ = active.wait_for(|active| !*active) => log::info!("Live desktop stream stopped: a newer desktop took over"),
|
||||||
|
_ = async move {
|
||||||
|
let screen = if let Some(desktop) = portal_desktop {
|
||||||
|
if let Err(error) = crate::locked_video::run(&streaming_pc, &video_track, &desktop, selection).await {
|
||||||
|
log::warn!("Locked desktop video unavailable: {error}");
|
||||||
|
}
|
||||||
|
let mut updates = desktop.subscribe();
|
||||||
|
loop {
|
||||||
|
let state = updates.borrow_and_update().clone();
|
||||||
|
if state.ready() { break Some(state.screen); }
|
||||||
|
if !state.waiting { return; }
|
||||||
|
if crate::video::transport_closed(&streaming_pc) { return; }
|
||||||
|
tokio::select! {
|
||||||
|
changed = updates.changed() => if changed.is_err() { return; },
|
||||||
|
_ = tokio::time::sleep(std::time::Duration::from_millis(100)) => {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else { None };
|
||||||
|
let (capture_size, capture_display, portal) = screen.as_ref().map_or(
|
||||||
|
(capture_size, capture_display, portal),
|
||||||
|
|screen| ((screen.width, screen.height), screen.display.clone(), screen.portal.clone()));
|
||||||
|
let state_pc = streaming_pc.clone();
|
||||||
|
if let Err(e) = crate::video::stream_desktop_at(streaming_pc, video_track, capture_size, capture_display, portal, settings_rx, settings, idr_request, selection, chroma_sync, reload_at_session).await {
|
||||||
|
// A send racing the viewer's close fails with a misleading track error.
|
||||||
|
if matches!(state_pc.connection_state(), RTCPeerConnectionState::Closed | RTCPeerConnectionState::Failed) {
|
||||||
|
log::info!("Live desktop stream ended: peer connection closed ({})", e);
|
||||||
|
} else {
|
||||||
|
log::error!("Live desktop stream stopped: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} => {},
|
||||||
|
} }).abort_handle())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WebRtcSession {
|
impl WebRtcSession {
|
||||||
@@ -106,7 +264,8 @@ impl WebRtcSession {
|
|||||||
.map_err(|e| format!("Create PeerConnection failed: {}", e))?,
|
.map_err(|e| format!("Create PeerConnection failed: {}", e))?,
|
||||||
);
|
);
|
||||||
|
|
||||||
let input_session=desktop.then(||input.desktop_session());
|
let role = Arc::new(DesktopRole::new(desktop));
|
||||||
|
if desktop { *role.input.lock().unwrap() = Some(input.desktop_session()); }
|
||||||
let context = Arc::new(Mutex::new(SessionContext::default()));
|
let context = Arc::new(Mutex::new(SessionContext::default()));
|
||||||
crate::network_diagnostics::start(Arc::downgrade(&pc));
|
crate::network_diagnostics::start(Arc::downgrade(&pc));
|
||||||
|
|
||||||
@@ -164,13 +323,13 @@ impl WebRtcSession {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
let connected_context = context.clone();
|
let connected_context = context.clone();
|
||||||
let connection_input=input_session.clone();
|
let connection_role=role.clone();
|
||||||
let connected_signal = signaling_client.clone();
|
let connected_signal = signaling_client.clone();
|
||||||
let notified = Arc::new(std::sync::atomic::AtomicBool::new(false));
|
let notified = Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||||
let connected_selection = video_selection;
|
let connected_selection = video_selection;
|
||||||
pc.on_peer_connection_state_change(Box::new(move |state| {
|
pc.on_peer_connection_state_change(Box::new(move |state| {
|
||||||
let ctx = connected_context.clone();
|
let ctx = connected_context.clone();
|
||||||
let input=connection_input.clone();
|
let input=connection_role.input();
|
||||||
let sig = connected_signal.clone();
|
let sig = connected_signal.clone();
|
||||||
let notified = notified.clone();
|
let notified = notified.clone();
|
||||||
let video_selection = connected_selection;
|
let video_selection = connected_selection;
|
||||||
@@ -282,72 +441,24 @@ impl WebRtcSession {
|
|||||||
let video_settings = Arc::new(video_settings);
|
let video_settings = Arc::new(video_settings);
|
||||||
// Per-connection mute / lock-after-session settings (安全 menu).
|
// Per-connection mute / lock-after-session settings (安全 menu).
|
||||||
let peer_actions = Arc::new(crate::system_actions::PeerActions::default());
|
let peer_actions = Arc::new(crate::system_actions::PeerActions::default());
|
||||||
|
let session_actions = peer_actions.clone();
|
||||||
let desktop_sound = desktop && crate::audio::enabled();
|
let desktop_sound = desktop && crate::audio::enabled();
|
||||||
if desktop && !cfg!(test) {
|
if desktop && !cfg!(test) { track_session(pc.clone(), peer_actions.clone(), &role); }
|
||||||
let (end_pc, actions) = (pc.clone(), peer_actions.clone());
|
|
||||||
tokio::spawn(async move {
|
|
||||||
{
|
|
||||||
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState as State;
|
|
||||||
// Count the session once it is actually connected (a failed offer is not a session).
|
|
||||||
while end_pc.connection_state() != State::Connected {
|
|
||||||
if matches!(end_pc.connection_state(), State::Closed | State::Failed) { return; }
|
|
||||||
tokio::time::sleep(std::time::Duration::from_millis(200)).await;
|
|
||||||
}
|
|
||||||
let starting = actions.clone();
|
|
||||||
let _ = tokio::task::spawn_blocking(move || starting.session_started()).await;
|
|
||||||
}
|
|
||||||
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState as State;
|
|
||||||
while !matches!(end_pc.connection_state(), State::Closed | State::Failed) {
|
|
||||||
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
|
|
||||||
}
|
|
||||||
drop(end_pc);
|
|
||||||
let _ = tokio::task::spawn_blocking(move || actions.session_ended()).await;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
let portal=capture.portal.clone();
|
|
||||||
let stream_desktop = portal_desktop.clone();
|
|
||||||
let stream_selection = video_selection;
|
|
||||||
// Live encoder switch (SIGUSR2) sends CaptureSettingSync when chroma is downgraded.
|
// Live encoder switch (SIGUSR2) sends CaptureSettingSync when chroma is downgraded.
|
||||||
let (chroma_sync_tx, chroma_sync_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
|
let (chroma_sync_tx, chroma_sync_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
|
||||||
let chroma_sync = (desktop && !cfg!(test)).then_some(chroma_sync_tx);
|
|
||||||
let chroma_sync_rx = Arc::new(std::sync::Mutex::new((!cfg!(test)).then_some(chroma_sync_rx)));
|
let chroma_sync_rx = Arc::new(std::sync::Mutex::new((!cfg!(test)).then_some(chroma_sync_rx)));
|
||||||
// File/terminal/port-mapping connections carry no desktop video.
|
// File/terminal/port-mapping connections carry no desktop video until capture_desktop.
|
||||||
let control_video_track = video_track.clone();
|
let control_video_track = video_track.clone();
|
||||||
let stream_settings = video_settings.clone();
|
let stream = DesktopStream {
|
||||||
if desktop && !cfg!(test) {
|
pc: Arc::downgrade(&streaming_pc), track: video_track, portal_desktop: portal_desktop.clone(),
|
||||||
let state_pc = streaming_pc.clone();
|
capture_size, capture_display, portal: capture.portal.clone(), settings_rx: video_settings_rx,
|
||||||
tokio::spawn(async move {
|
settings: video_settings.clone(), idr_request, selection: video_selection,
|
||||||
let screen = if let Some(desktop) = stream_desktop {
|
chroma_sync: (!cfg!(test)).then_some(chroma_sync_tx), reload_at_session,
|
||||||
if let Err(error) = crate::locked_video::run(&streaming_pc, &video_track, &desktop, stream_selection).await {
|
};
|
||||||
log::warn!("Locked desktop video unavailable: {error}");
|
drop(streaming_pc);
|
||||||
}
|
if cfg!(test) { drop(stream); }
|
||||||
let mut updates = desktop.subscribe();
|
else if desktop { let _ = stream.spawn(None, role.active.subscribe()); }
|
||||||
loop {
|
else { *role.stream.lock().unwrap() = Some(stream); }
|
||||||
let state = updates.borrow_and_update().clone();
|
|
||||||
if state.ready() { break Some(state.screen); }
|
|
||||||
if !state.waiting { return; }
|
|
||||||
if crate::video::transport_closed(&streaming_pc) { return; }
|
|
||||||
tokio::select! {
|
|
||||||
changed = updates.changed() => if changed.is_err() { return; },
|
|
||||||
_ = tokio::time::sleep(std::time::Duration::from_millis(100)) => {},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else { None };
|
|
||||||
let (capture_size, capture_display, portal) = screen.as_ref().map_or(
|
|
||||||
(capture_size, capture_display, portal),
|
|
||||||
|screen| ((screen.width, screen.height), screen.display.clone(), screen.portal.clone()));
|
|
||||||
if let Err(e) = crate::video::stream_desktop_at(streaming_pc, video_track, capture_size, capture_display, portal, video_settings_rx, stream_settings, idr_request, stream_selection, chroma_sync.clone(), reload_at_session).await {
|
|
||||||
// A send racing the viewer's close fails with a misleading track error.
|
|
||||||
if matches!(state_pc.connection_state(), RTCPeerConnectionState::Closed | RTCPeerConnectionState::Failed) {
|
|
||||||
log::info!("Live desktop stream ended: peer connection closed ({})", e);
|
|
||||||
} else {
|
|
||||||
log::error!("Live desktop stream stopped: {}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
drop((streaming_pc, video_track, capture_size, capture_display, video_settings_rx));
|
|
||||||
}
|
|
||||||
let input_clone = input.clone();
|
let input_clone = input.clone();
|
||||||
let control_capture = capture.clone();
|
let control_capture = capture.clone();
|
||||||
let desktop_pc = Arc::downgrade(&pc);
|
let desktop_pc = Arc::downgrade(&pc);
|
||||||
@@ -405,6 +516,7 @@ impl WebRtcSession {
|
|||||||
|
|
||||||
// Settings arrive on CONTROL or TEXT; serialize both queues for this peer.
|
// Settings arrive on CONTROL or TEXT; serialize both queues for this peer.
|
||||||
let settings_serial=Arc::new(Mutex::new(()));
|
let settings_serial=Arc::new(Mutex::new(()));
|
||||||
|
let data_role = role.clone();
|
||||||
// 监听 DataChannel
|
// 监听 DataChannel
|
||||||
pc.on_data_channel(Box::new(move |d: Arc<RTCDataChannel>| {
|
pc.on_data_channel(Box::new(move |d: Arc<RTCDataChannel>| {
|
||||||
let label = d.label().to_string();
|
let label = d.label().to_string();
|
||||||
@@ -412,7 +524,7 @@ impl WebRtcSession {
|
|||||||
|
|
||||||
let peer_settings_serial=settings_serial.clone();
|
let peer_settings_serial=settings_serial.clone();
|
||||||
let input_inst = input_clone.clone();
|
let input_inst = input_clone.clone();
|
||||||
let channel_input_session=input_session.clone();
|
let channel_role=data_role.clone();
|
||||||
let screen = control_capture.clone();
|
let screen = control_capture.clone();
|
||||||
let portal_desktop = portal_desktop.clone();
|
let portal_desktop = portal_desktop.clone();
|
||||||
let desktop_pc = desktop_pc.clone();
|
let desktop_pc = desktop_pc.clone();
|
||||||
@@ -442,9 +554,9 @@ impl WebRtcSession {
|
|||||||
let rich_state=Arc::new(std::sync::Mutex::new(crate::clipboard_rich::State::default()));
|
let rich_state=Arc::new(std::sync::Mutex::new(crate::clipboard_rich::State::default()));
|
||||||
let clipboard_enabled = shared_clipboard_ready.clone();
|
let clipboard_enabled = shared_clipboard_ready.clone();
|
||||||
if label=="CONTROL_DATA_CHANNEL" {
|
if label=="CONTROL_DATA_CHANNEL" {
|
||||||
let closing=channel_input_session.clone();
|
let closing=channel_role.clone();
|
||||||
d.on_close(Box::new(move || {
|
d.on_close(Box::new(move || {
|
||||||
let closing=closing.clone();
|
let closing=closing.input();
|
||||||
Box::pin(async move {if let Some(session)=closing {session.disconnected();}})
|
Box::pin(async move {if let Some(session)=closing {session.disconnected();}})
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@@ -500,7 +612,7 @@ impl WebRtcSession {
|
|||||||
let manager = portal_desktop.clone();
|
let manager = portal_desktop.clone();
|
||||||
let channel = Arc::downgrade(&d);
|
let channel = Arc::downgrade(&d);
|
||||||
let initial_screen = screen.clone();
|
let initial_screen = screen.clone();
|
||||||
let switch_owner=channel_input_session.clone();
|
let capture_role=channel_role.clone();
|
||||||
let settings_serial=peer_settings_serial.clone();
|
let settings_serial=peer_settings_serial.clone();
|
||||||
let capture_selection = peer_selection;
|
let capture_selection = peer_selection;
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
@@ -518,6 +630,7 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
let _serial=settings_serial.lock().await;
|
let _serial=settings_serial.lock().await;
|
||||||
|
let (desktop,switch_owner)=(capture_role.is_desktop(),capture_role.input());
|
||||||
if desktop && switch_owner.as_ref().is_none_or(|owner|!owner.is_current()) {continue;}
|
if desktop && switch_owner.as_ref().is_none_or(|owner|!owner.is_current()) {continue;}
|
||||||
let reject=|reason:&str| {
|
let reject=|reason:&str| {
|
||||||
if let Some(response)=crate::capture_setting::rejected_request(&request,reason) {
|
if let Some(response)=crate::capture_setting::rejected_request(&request,reason) {
|
||||||
@@ -563,10 +676,10 @@ impl WebRtcSession {
|
|||||||
if channel.upgrade().is_none_or(|channel| channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open) { return; }
|
if channel.upgrade().is_none_or(|channel| channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open) { return; }
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Some(initial_screen.clone())
|
Some(capture_role.screen_or(&initial_screen))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Some(initial_screen.clone())
|
Some(capture_role.screen_or(&initial_screen))
|
||||||
};
|
};
|
||||||
let Some(active_screen) = active_screen else { continue; };
|
let Some(active_screen) = active_screen else { continue; };
|
||||||
let input_size = if active_screen.init_error.is_none() {
|
let input_size = if active_screen.init_error.is_none() {
|
||||||
@@ -675,7 +788,8 @@ impl WebRtcSession {
|
|||||||
let open_video = channel_video_settings.clone();
|
let open_video = channel_video_settings.clone();
|
||||||
let open_track = peer_video_track.clone();
|
let open_track = peer_video_track.clone();
|
||||||
let open_desktop = portal_desktop.clone();
|
let open_desktop = portal_desktop.clone();
|
||||||
let open_owner = channel_input_session.clone();
|
let open_owner = channel_role.input();
|
||||||
|
let open_role = channel_role.clone();
|
||||||
let open_screen = screen.clone();
|
let open_screen = screen.clone();
|
||||||
let open_selection = peer_selection;
|
let open_selection = peer_selection;
|
||||||
d.on_open(Box::new(move || {
|
d.on_open(Box::new(move || {
|
||||||
@@ -691,82 +805,91 @@ impl WebRtcSession {
|
|||||||
let rich_outgoing=rich_outgoing.clone();
|
let rich_outgoing=rich_outgoing.clone();
|
||||||
let portal_desktop = open_desktop.clone();
|
let portal_desktop = open_desktop.clone();
|
||||||
let owner = open_owner.clone();
|
let owner = open_owner.clone();
|
||||||
|
let role = open_role.clone();
|
||||||
let pc = desktop_pc.upgrade();
|
let pc = desktop_pc.upgrade();
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
// Permission dialogs and first-frame waits must not occupy the
|
// Permission dialogs and first-frame waits must not occupy the
|
||||||
// channel-open callback or delay CONTROL message dispatch.
|
// channel-open callback or delay CONTROL message dispatch.
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
if channel.label() == "TEXT_DATA_CHANNEL" {
|
if channel.label() == "TEXT_DATA_CHANNEL" {
|
||||||
if !desktop { return; }
|
loop {
|
||||||
let screen = if let Some(desktop) = &portal_desktop {
|
if !role.is_desktop() && !role.wait_desktop(&channel).await { return; }
|
||||||
let mut updates = desktop.subscribe();
|
let screen = if let Some(desktop) = &portal_desktop {
|
||||||
let Some(_) = crate::desktop_session::wait_ready(&mut updates, &channel).await else { return; };
|
let mut updates = desktop.subscribe();
|
||||||
let mut locked = desktop.lock_state();
|
let Some(_) = crate::desktop_session::wait_ready(&mut updates, &channel).await else { return; };
|
||||||
loop {
|
let mut locked = desktop.lock_state();
|
||||||
let state = desktop.snapshot();
|
loop {
|
||||||
if !state.waiting && state.screen.init_error.is_some() { return; }
|
let state = desktop.snapshot();
|
||||||
if let Some(session) = state.screen.portal.as_ref() {
|
if !state.waiting && state.screen.init_error.is_some() { return; }
|
||||||
if session.is_alive() && *locked.borrow() == Some(false) {
|
if let Some(session) = state.screen.portal.as_ref() {
|
||||||
break state.screen;
|
if session.is_alive() && *locked.borrow() == Some(false) {
|
||||||
}
|
break state.screen;
|
||||||
}
|
}
|
||||||
tokio::select! {
|
}
|
||||||
_ = tokio::time::sleep(std::time::Duration::from_millis(100)) => {},
|
tokio::select! {
|
||||||
changed = locked.changed() => if changed.is_err() { return; },
|
_ = tokio::time::sleep(std::time::Duration::from_millis(100)) => {},
|
||||||
_ = async {
|
changed = locked.changed() => if changed.is_err() { return; },
|
||||||
loop {
|
_ = async {
|
||||||
if matches!(channel.ready_state(), webrtc::data_channel::data_channel_state::RTCDataChannelState::Closing
|
loop {
|
||||||
| webrtc::data_channel::data_channel_state::RTCDataChannelState::Closed) { return; }
|
if matches!(channel.ready_state(), webrtc::data_channel::data_channel_state::RTCDataChannelState::Closing
|
||||||
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
|
| webrtc::data_channel::data_channel_state::RTCDataChannelState::Closed) { return; }
|
||||||
}
|
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
|
||||||
} => return,
|
}
|
||||||
}
|
} => return,
|
||||||
}
|
}
|
||||||
} else { screen };
|
}
|
||||||
let bridge = if let Some(session)=screen.portal.clone() { crate::clipboard::start_portal(session) } else { crate::clipboard::start(screen.display.clone()) };
|
} else { role.screen_or(&screen) };
|
||||||
*clipboard_sink.lock().unwrap() = Some(bridge.incoming);
|
let bridge = if let Some(session)=screen.portal.clone() { crate::clipboard::start_portal(session) } else { crate::clipboard::start(screen.display.clone()) };
|
||||||
let clipboard_channel = channel.clone();
|
*clipboard_sink.lock().unwrap() = Some(bridge.incoming);
|
||||||
let clipboard_sequence = sequence.clone();
|
let clipboard_channel = channel.clone();
|
||||||
let clipboard_cleanup = clipboard_sink.clone();
|
let clipboard_sequence = sequence.clone();
|
||||||
let ready = bridge.ready.await.unwrap_or(false);
|
let clipboard_cleanup = clipboard_sink.clone();
|
||||||
clipboard_ready.store(ready,std::sync::atomic::Ordering::Relaxed);
|
let rich_outgoing = rich_outgoing.clone();
|
||||||
tokio::spawn(async move {
|
let ready = bridge.ready.await.unwrap_or(false);
|
||||||
if !ready {
|
clipboard_ready.store(ready,std::sync::atomic::Ordering::Relaxed);
|
||||||
*clipboard_cleanup.lock().unwrap() = None;
|
{
|
||||||
log::warn!("Native text clipboard unavailable"); return;
|
if !ready {
|
||||||
}
|
*clipboard_cleanup.lock().unwrap() = None;
|
||||||
log::info!("Native text clipboard bridge ready");
|
log::warn!("Native text clipboard unavailable"); return;
|
||||||
let mut updates = bridge.outgoing;
|
}
|
||||||
let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
|
log::info!("Native text clipboard bridge ready");
|
||||||
loop {
|
let mut updates = bridge.outgoing;
|
||||||
tokio::select! {
|
let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
|
||||||
_ = health.tick() => {
|
let mut active = role.active.subscribe();
|
||||||
if clipboard_channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { break; }
|
loop {
|
||||||
},
|
tokio::select! {
|
||||||
changed = updates.changed() => {
|
_ = health.tick() => {
|
||||||
if changed.is_err() { break; }
|
if clipboard_channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { break; }
|
||||||
let text = updates.borrow_and_update().clone();
|
},
|
||||||
let Some(text) = text else { continue; };
|
_ = async { let _ = active.wait_for(|active| !*active).await; } => break,
|
||||||
{
|
changed = updates.changed() => {
|
||||||
let request_id=clipboard_sequence.fetch_add(1,std::sync::atomic::Ordering::Relaxed);
|
if changed.is_err() { break; }
|
||||||
let payload = match rich_outgoing.lock().unwrap().offer(request_id,text.clone()) {
|
let text = updates.borrow_and_update().clone();
|
||||||
Ok(payload)=>payload,Err(reason)=>{log::warn!("Clipboard offer rejected: {}",reason);continue;}
|
let Some(text) = text else { continue; };
|
||||||
};
|
{
|
||||||
let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
let request_id=clipboard_sequence.fetch_add(1,std::sync::atomic::Ordering::Relaxed);
|
||||||
let message = crate::initialization::envelope(clipboard_sequence.fetch_add(1,std::sync::atomic::Ordering::Relaxed),timestamp,21,&payload);
|
let payload = match rich_outgoing.lock().unwrap().offer(request_id,text.clone()) {
|
||||||
if !matches!(tokio::time::timeout(std::time::Duration::from_secs(2),clipboard_channel.send(&bytes::Bytes::from(message))).await,Ok(Ok(_))) {
|
Ok(payload)=>payload,Err(reason)=>{log::warn!("Clipboard offer rejected: {}",reason);continue;}
|
||||||
log::warn!("Native clipboard RPC send failed"); break;
|
};
|
||||||
}
|
let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
}
|
let message = crate::initialization::envelope(clipboard_sequence.fetch_add(1,std::sync::atomic::Ordering::Relaxed),timestamp,21,&payload);
|
||||||
log::info!("Native clipboard text format offered: bytes={}",text.len());
|
if !matches!(tokio::time::timeout(std::time::Duration::from_secs(2),clipboard_channel.send(&bytes::Bytes::from(message))).await,Ok(Ok(_))) {
|
||||||
}
|
log::warn!("Native clipboard RPC send failed"); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*clipboard_cleanup.lock().unwrap() = None;
|
log::info!("Native clipboard text format offered: bytes={}",text.len());
|
||||||
clipboard_ready.store(false,std::sync::atomic::Ordering::Relaxed);
|
}
|
||||||
});
|
}
|
||||||
return;
|
}
|
||||||
|
*clipboard_cleanup.lock().unwrap() = None;
|
||||||
|
clipboard_ready.store(false,std::sync::atomic::Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
if channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { return; }
|
||||||
|
// A newer desktop took over this promoted tool peer; capture_desktop restarts the clipboard.
|
||||||
|
log::info!("Native text clipboard stopped: a newer desktop took over");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
let replay = (last_echo_request.clone(), echo_seen.clone(), clipboard_ready.clone());
|
||||||
let early_desktop_selection = desktop && portal_desktop.is_some();
|
let early_desktop_selection = desktop && portal_desktop.is_some();
|
||||||
if early_desktop_selection {
|
if early_desktop_selection {
|
||||||
// Android 4.43.0's unlock presenter requires CaptureChange
|
// Android 4.43.0's unlock presenter requires CaptureChange
|
||||||
@@ -853,58 +976,75 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
} else { snapshot.screen }
|
} else { snapshot.screen }
|
||||||
} else { screen };
|
} else { screen };
|
||||||
let timestamp = std::time::SystemTime::now()
|
|
||||||
.duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
|
||||||
let next_seq = || sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
let next_seq = || sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
||||||
// Default file-transfer folder: the desktop user's home directory.
|
// Default file-transfer folder: the desktop user's home directory.
|
||||||
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
||||||
// Tool peers are permitted without a desktop; the port-mapping viewer aborts on Reject.
|
let (mut desktop, mut promoted, mut lock_reported) = (desktop, false, desktop);
|
||||||
let desktop_permission=if screen.init_error.is_none() || !desktop {
|
let mut screen = screen;
|
||||||
crate::system_metrics::Permission::Allow
|
loop {
|
||||||
} else { crate::system_metrics::Permission::Reject };
|
loop {
|
||||||
// Without a desktop (headless/portal before consent) the port-mapping tool still waits
|
let timestamp = std::time::SystemTime::now()
|
||||||
// for ScreenSources/CaptureChange and aborts otherwise: tool peers get a nominal screen.
|
.duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
let screen_size=crate::wayland::input_size(if screen.init_error.is_none() { (screen.width, screen.height) } else { (1920, 1080) });
|
// Tool peers are permitted without a desktop; the port-mapping viewer aborts on Reject.
|
||||||
let messages = [
|
let desktop_permission=if screen.init_error.is_none() || !desktop {
|
||||||
(8, crate::initialization::encode_capture_change(next_seq(), timestamp, 0, crate::wayland::selected() as i32, "Linux desktop")),
|
crate::system_metrics::Permission::Allow
|
||||||
(13, Ok(crate::initialization::envelope(next_seq(), timestamp, 13, &init_actions.metrics_payload(desktop_sound, desktop_permission)))),
|
} else { crate::system_metrics::Permission::Reject };
|
||||||
(26, Ok(crate::initialization::envelope(next_seq(), timestamp, 26,
|
// Without a desktop (headless/portal before consent) the port-mapping tool still waits
|
||||||
&crate::system_metrics::remote_download_path(&home)))),
|
// for ScreenSources/CaptureChange and aborts otherwise: tool peers get a nominal screen.
|
||||||
(18, Ok(crate::initialization::envelope(next_seq(), timestamp, 18,
|
let screen_size=crate::wayland::input_size(if screen.init_error.is_none() { (screen.width, screen.height) } else { (1920, 1080) });
|
||||||
&crate::capture_setting::codec_negotiation(screen_size, crate::video::display_fps(), init_track.supports(crate::capture_setting::VideoCodec::H265))))),
|
let messages = [
|
||||||
(7, crate::capture_setting::screen_sources(next_seq(), timestamp, screen_size, init_video.borrow().output, "Linux desktop")),
|
(8, crate::initialization::encode_capture_change(next_seq(), timestamp, 0, crate::wayland::selected() as i32, "Linux desktop")),
|
||||||
];
|
(13, Ok(crate::initialization::envelope(next_seq(), timestamp, 13, &init_actions.metrics_payload(desktop_sound, desktop_permission)))),
|
||||||
if desktop && screen.init_error.is_none() {
|
(26, Ok(crate::initialization::envelope(next_seq(), timestamp, 26,
|
||||||
let codec = crate::capture_setting::preferred_codec_for(init_track.supports(crate::capture_setting::VideoCodec::H264),
|
&crate::system_metrics::remote_download_path(&home)))),
|
||||||
init_track.supports(crate::capture_setting::VideoCodec::H265), open_selection);
|
(18, Ok(crate::initialization::envelope(next_seq(), timestamp, 18,
|
||||||
init_video.send_if_modified(|current| if current.codec != codec {
|
&crate::capture_setting::codec_negotiation(screen_size, crate::video::display_fps(), init_track.supports(crate::capture_setting::VideoCodec::H265))))),
|
||||||
log::info!("Desktop codec selected: {:?}", codec); current.codec = codec; true } else { false });
|
(7, crate::capture_setting::screen_sources(next_seq(), timestamp, screen_size, init_video.borrow().output, "Linux desktop")),
|
||||||
}
|
];
|
||||||
for (field, message) in messages {
|
if desktop && screen.init_error.is_none() {
|
||||||
if early_desktop_selection && field == 8 { continue; }
|
let codec = crate::capture_setting::preferred_codec_for(init_track.supports(crate::capture_setting::VideoCodec::H264),
|
||||||
if (!desktop || screen.init_error.is_some()) && field == 18 { continue; }
|
init_track.supports(crate::capture_setting::VideoCodec::H265), open_selection);
|
||||||
if desktop && screen.init_error.is_some() && matches!(field,7|8) { continue; }
|
init_video.send_if_modified(|current| if current.codec != codec {
|
||||||
let message = match message {
|
log::info!("Desktop codec selected: {:?}", codec); current.codec = codec; true } else { false });
|
||||||
Ok(message) => message,
|
|
||||||
Err(e) => { log::error!("CONTROL initialization encode failed: {}", e); return; }
|
|
||||||
};
|
|
||||||
if let Err(e) = channel.send(&bytes::Bytes::from(message)).await {
|
|
||||||
log::error!("CONTROL initialization field {} failed: {}", field, e);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
log::info!("CONTROL initialization field {} sent", field);
|
for (field, message) in messages {
|
||||||
|
if early_desktop_selection && field == 8 { continue; }
|
||||||
|
if promoted && field == 26 { continue; }
|
||||||
|
if (!desktop || screen.init_error.is_some()) && field == 18 { continue; }
|
||||||
|
if desktop && screen.init_error.is_some() && matches!(field,7|8) { continue; }
|
||||||
|
let message = match message {
|
||||||
|
Ok(message) => message,
|
||||||
|
Err(e) => { log::error!("CONTROL initialization encode failed: {}", e); return; }
|
||||||
|
};
|
||||||
|
if let Err(e) = channel.send(&bytes::Bytes::from(message)).await {
|
||||||
|
log::error!("CONTROL initialization field {} failed: {}", field, e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
log::info!("CONTROL initialization field {} sent", field);
|
||||||
|
}
|
||||||
|
if desktop { break; }
|
||||||
|
// The viewer opened the desktop on this tool connection (#99): repeat the
|
||||||
|
// desktop initialization once the host has started its video and input.
|
||||||
|
if !role.wait_desktop(&channel).await { return; }
|
||||||
|
(desktop, promoted) = (true, true);
|
||||||
|
screen = role.screen_or(&screen);
|
||||||
|
replay_clipboard_echo(channel.clone(), sequence.clone(), replay.clone(), role.clone());
|
||||||
|
}
|
||||||
|
if !lock_reported {
|
||||||
|
lock_reported = true;
|
||||||
|
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
||||||
}
|
}
|
||||||
// Mirror the Linux pointer shape; the video itself carries no pointer.
|
// Mirror the Linux pointer shape; the video itself carries no pointer.
|
||||||
if !desktop { return; }
|
|
||||||
let mut shapes = crate::cursor::monitor(&screen.display);
|
let mut shapes = crate::cursor::monitor(&screen.display);
|
||||||
let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
|
let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
|
||||||
let mut sent = 0usize;
|
let mut sent = 0usize;
|
||||||
loop {
|
let mut active = role.active.subscribe();
|
||||||
|
'cursor: loop {
|
||||||
let current = shapes.borrow_and_update().clone();
|
let current = shapes.borrow_and_update().clone();
|
||||||
if let Some(cursor) = current {
|
if let Some(cursor) = current {
|
||||||
let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
let message = crate::cursor::encode_cursor_shape(next_seq(), timestamp, &cursor);
|
let message = crate::cursor::encode_cursor_shape(next_seq(), timestamp, &cursor);
|
||||||
if channel.send(&bytes::Bytes::from(message)).await.is_err() { break; }
|
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
||||||
sent += 1;
|
sent += 1;
|
||||||
if sent <= 3 || sent % 100 == 0 {
|
if sent <= 3 || sent % 100 == 0 {
|
||||||
log::info!("Cursor shape sent: count={} size={}x{} hotspot={},{} png_bytes={}", sent, cursor.width, cursor.height, cursor.hot_x, cursor.hot_y, cursor.png.len());
|
log::info!("Cursor shape sent: count={} size={}x{} hotspot={},{} png_bytes={}", sent, cursor.width, cursor.height, cursor.hot_x, cursor.hot_y, cursor.png.len());
|
||||||
@@ -913,12 +1053,18 @@ impl WebRtcSession {
|
|||||||
loop {
|
loop {
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
changed = shapes.changed() => { if changed.is_err() { return; } break; },
|
changed = shapes.changed() => { if changed.is_err() { return; } break; },
|
||||||
|
_ = active.wait_for(|active| !*active) => break 'cursor,
|
||||||
_ = health.tick() => {
|
_ = health.tick() => {
|
||||||
if channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { return; }
|
if channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { return; }
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// A newer desktop took over this promoted tool peer; wait for capture_desktop again.
|
||||||
|
if !role.wait_desktop(&channel).await { return; }
|
||||||
|
screen = role.screen_or(&screen);
|
||||||
|
replay_clipboard_echo(channel.clone(), sequence.clone(), replay.clone(), role.clone());
|
||||||
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}));
|
}));
|
||||||
@@ -927,14 +1073,15 @@ impl WebRtcSession {
|
|||||||
|
|
||||||
d.on_message(Box::new(move |msg: DataChannelMessage| {
|
d.on_message(Box::new(move |msg: DataChannelMessage| {
|
||||||
// Keep the whole state: a cached screen waiting for a closed Portal is not ready for input.
|
// Keep the whole state: a cached screen waiting for a closed Portal is not ready for input.
|
||||||
let (screen, desktop_ready) = portal_desktop.as_ref().map_or_else(|| (screen.clone(), true), |desktop| {
|
let (screen, desktop_ready) = portal_desktop.as_ref().map_or_else(|| (channel_role.screen_or(&screen), true), |desktop| {
|
||||||
let state = desktop.snapshot();
|
let state = desktop.snapshot();
|
||||||
let ready = state.ready();
|
let ready = state.ready();
|
||||||
(state.screen, ready)
|
(state.screen, ready)
|
||||||
});
|
});
|
||||||
let channel_name = lbl.clone();
|
let channel_name = lbl.clone();
|
||||||
let input_worker = inp.clone();
|
let input_worker = inp.clone();
|
||||||
let message_input_session=channel_input_session.clone();
|
let message_input_session=channel_role.input();
|
||||||
|
let message_role=channel_role.clone();
|
||||||
let terminal_worker = terminal_conn.clone();
|
let terminal_worker = terminal_conn.clone();
|
||||||
let rpc_out = outbound.clone();
|
let rpc_out = outbound.clone();
|
||||||
let reply_chan = d_reply.clone();
|
let reply_chan = d_reply.clone();
|
||||||
@@ -1168,6 +1315,15 @@ impl WebRtcSession {
|
|||||||
if let Err(e) = chan.send(&bytes::Bytes::from(message)).await { log::warn!("Settings report failed: {}", e); }
|
if let Err(e) = chan.send(&bytes::Bytes::from(message)).await { log::warn!("Settings report failed: {}", e); }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} else if action == sa::CAPTURE_DESKTOP && channel_name == "CONTROL_DATA_CHANNEL" {
|
||||||
|
if message_role.is_desktop() {
|
||||||
|
log::info!("SimpleAction 4 (capture_desktop) received on a desktop connection");
|
||||||
|
} else if let Some(request) = message_role.request.get() {
|
||||||
|
log::info!("SimpleAction 4 (capture_desktop) received on a tool connection; starting the desktop");
|
||||||
|
request();
|
||||||
|
} else {
|
||||||
|
log::info!("SimpleAction 4 (capture_desktop) not handled: tool connection without a desktop route");
|
||||||
|
}
|
||||||
} else if action > 1 && action != 15 {
|
} else if action > 1 && action != 15 {
|
||||||
let args = action_fields.iter().find_map(|f| match (&f.value, f.number) { (WireValue::Bytes(v), 2) => Some(*v), _ => None }).unwrap_or(&[]);
|
let args = action_fields.iter().find_map(|f| match (&f.value, f.number) { (WireValue::Bytes(v), 2) => Some(*v), _ => None }).unwrap_or(&[]);
|
||||||
log::info!("SimpleAction {} ({}) not handled: args={}", action, crate::control_protocol::simple_action_name(action).unwrap_or("?"), sa::args_shape(args));
|
log::info!("SimpleAction {} ({}) not handled: args={}", action, crate::control_protocol::simple_action_name(action).unwrap_or("?"), sa::args_shape(args));
|
||||||
@@ -1290,10 +1446,50 @@ impl WebRtcSession {
|
|||||||
capture,
|
capture,
|
||||||
input,
|
input,
|
||||||
desktop,
|
desktop,
|
||||||
|
role,
|
||||||
|
controller_mac: false,
|
||||||
context,
|
context,
|
||||||
|
actions: session_actions,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Route for capture_desktop on this tool peer; the caller decides whether it may become the desktop.
|
||||||
|
pub fn on_desktop_request(&self, request: impl Fn() + Send + Sync + 'static) {
|
||||||
|
let _ = self.role.request.set(Box::new(request));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Makes this tool peer the desktop: it takes the input lease, starts the video it negotiated
|
||||||
|
/// (H.264; audio was never negotiated) and repeats the desktop CONTROL initialization.
|
||||||
|
/// `screen` replaces a capture that was unavailable when the peer was offered.
|
||||||
|
pub fn promote(&self, screen: Option<Arc<ScreenCapture>>) {
|
||||||
|
if self.role.is_desktop() { return; }
|
||||||
|
if let Some(screen) = screen { *self.role.screen.lock().unwrap() = Some(screen); }
|
||||||
|
let session = self.input.desktop_session();
|
||||||
|
if self.pc.connection_state() == RTCPeerConnectionState::Connected { session.connected(); }
|
||||||
|
*self.role.input.lock().unwrap() = Some(session);
|
||||||
|
self.role.active.send_replace(true);
|
||||||
|
let stream = self.role.stream.lock().unwrap().clone();
|
||||||
|
if let Some(stream) = stream {
|
||||||
|
let task = stream.spawn(self.role.screen.lock().unwrap().clone(), self.role.active.subscribe());
|
||||||
|
if let Some(old) = std::mem::replace(&mut *self.role.stream_task.lock().unwrap(), task) { old.abort(); }
|
||||||
|
}
|
||||||
|
if !cfg!(test) { track_session(self.pc.clone(), self.actions.clone(), &self.role); }
|
||||||
|
log::info!("Desktop started on an existing tool connection");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The capture this peer's desktop uses: its own, or the one reinitialized at promotion.
|
||||||
|
pub fn desktop_capture(&self) -> Arc<ScreenCapture> { self.role.screen_or(&self.capture) }
|
||||||
|
|
||||||
|
/// A newer desktop took over a promoted tool peer: stop its video, input and session count,
|
||||||
|
/// keep the connection's tools. capture_desktop on it promotes it again.
|
||||||
|
pub fn demote(&self) {
|
||||||
|
if self.desktop || !self.role.is_desktop() { return; }
|
||||||
|
self.role.active.send_replace(false);
|
||||||
|
if let Some(task) = self.role.stream_task.lock().unwrap().take() { task.abort(); }
|
||||||
|
if let Some(session) = self.role.input.lock().unwrap().take() { session.disconnected(); }
|
||||||
|
log::info!("Desktop on a tool connection stopped: a newer desktop took over");
|
||||||
|
}
|
||||||
|
|
||||||
/// 应用远端 Offer,生成并返回 Answer
|
/// 应用远端 Offer,生成并返回 Answer
|
||||||
pub async fn handle_offer(&self, soac: &SoacMessage) -> Result<String, String> {
|
pub async fn handle_offer(&self, soac: &SoacMessage) -> Result<String, String> {
|
||||||
// 同步当前的客户端与房间会话上下文
|
// 同步当前的客户端与房间会话上下文
|
||||||
|
|||||||
Reference in new issue
Block a user