mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 08:50:40 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13c92d8f68 | ||
|
|
b0015a6c48 | ||
|
|
c60d9f1bfa | ||
|
|
6032129228 | ||
|
|
7ba71a5540 | ||
|
|
b774bf6b16 |
No files matched your search
Generated
+1
-1
@@ -2804,7 +2804,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.51"
|
||||
version = "0.2.52"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"async-trait",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.51"
|
||||
version = "0.2.52"
|
||||
edition = "2021"
|
||||
default-run = "uuremote-server"
|
||||
authors = ["uu-remote-linux contributors"]
|
||||
|
||||
+36
-4
@@ -331,12 +331,30 @@ static int class_is_terminal(const char *value) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Returns 1 when the focused window belongs to a terminal emulator, else 0. */
|
||||
/* Returns 1 when the focused window belongs to a terminal emulator, else 0.
|
||||
Cached by focused Window with a 1000ms TTL, so key bursts on the same window
|
||||
avoid redundant 12-level XQueryTree walks, while focus changes invalidate immediately. */
|
||||
int x11_terminal_shortcut_state(void) {
|
||||
static Window cached_window = 0;
|
||||
static int cached_terminal = 0;
|
||||
static struct timespec last_query = {0, 0};
|
||||
|
||||
if (!g_probe && !(g_probe = XOpenDisplay(NULL))) return 0;
|
||||
Window focus = 0; int revert = 0;
|
||||
XGetInputFocus(g_probe, &focus, &revert);
|
||||
if (focus == None || focus == PointerRoot) return 0;
|
||||
if (focus == None || focus == PointerRoot) {
|
||||
cached_window = 0;
|
||||
cached_terminal = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct timespec now;
|
||||
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||
long diff_ms = (now.tv_sec - last_query.tv_sec) * 1000 + (now.tv_nsec - last_query.tv_nsec) / 1000000;
|
||||
if (focus == cached_window && last_query.tv_sec != 0 && diff_ms >= 0 && diff_ms < 1000) {
|
||||
return cached_terminal;
|
||||
}
|
||||
|
||||
Window cur = focus;
|
||||
for (int depth = 0; depth < 12 && cur; depth++) {
|
||||
XClassHint hint = {0};
|
||||
@@ -344,14 +362,28 @@ int x11_terminal_shortcut_state(void) {
|
||||
int terminal = class_is_terminal(hint.res_name) || class_is_terminal(hint.res_class);
|
||||
if (hint.res_name) XFree(hint.res_name);
|
||||
if (hint.res_class) XFree(hint.res_class);
|
||||
cached_window = focus;
|
||||
cached_terminal = terminal;
|
||||
last_query = now;
|
||||
return terminal;
|
||||
}
|
||||
Window root, parent, *children = NULL; unsigned int n = 0;
|
||||
if (!XQueryTree(g_probe, cur, &root, &parent, &children, &n)) return 0;
|
||||
if (!XQueryTree(g_probe, cur, &root, &parent, &children, &n)) {
|
||||
cached_window = 0;
|
||||
cached_terminal = 0;
|
||||
return 0;
|
||||
}
|
||||
if (children) XFree(children);
|
||||
if (parent == root) return 0;
|
||||
if (parent == root) {
|
||||
cached_window = 0;
|
||||
cached_terminal = 0;
|
||||
return 0;
|
||||
}
|
||||
cur = parent;
|
||||
}
|
||||
cached_window = focus;
|
||||
cached_terminal = 0;
|
||||
last_query = now;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
性能优化版:降低视频推流与输入通道的拷贝和解析开销,功能行为不变。/ Performance release: less copying and parsing on the video and input paths; no behavior change.
|
||||
|
||||
### 优化 / Improved
|
||||
- **编码帧零拷贝(#184)**:编码完成帧改用共享缓冲,去掉每帧码流深拷贝。/ Encoded frames use shared buffers, removing a per-frame bitstream deep copy.
|
||||
- **H.265 关键帧检测与 RTP 分包(#180、#182)**:IRAP 检测改为单趟流式扫描,HEVC RTP 分包改为零拷贝子切片。/ Single-pass streaming IRAP scan; zero-copy sub-slices for HEVC RTP packetization.
|
||||
- **数据通道解析(#180、#191)**:数据通道包单次解码、CONTROL 通道 JSON 单次解析。/ Single-pass data-channel decoding and single JSON parse on the CONTROL channel.
|
||||
- **X11 终端检测缓存(#182)**:100ms 缓存,减少高频查询。/ 100 ms cache for X11 terminal detection.
|
||||
- **文字输入不阻塞(#189)**:文字输入移到阻塞线程池执行,保持先后顺序。/ Text input runs on the blocking pool while preserving order.
|
||||
|
||||
感谢 @ferstar 提交这批优化。/ Thanks to @ferstar for these optimizations.
|
||||
|
||||
### 验证范围 / Validation
|
||||
单元测试与 CI;各 PR 经 Codex 审查。未做实机性能对比与 Mac/手机客户端界面验收。
|
||||
|
||||
### 下载 / Download
|
||||
`uu-remote-linux_0.2.52_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.52-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.52`(x86_64)。
|
||||
|
||||
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||
+40
@@ -36,6 +36,46 @@ pub fn payload(mtu: usize, annex_b: &[u8]) -> Result<Vec<Bytes>, String> {
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// Payload HEVC Annex-B bitstream with zero-copy sub-slicing for single NAL units <= MTU.
|
||||
pub fn payload_bytes(mtu: usize, annex_b: &Bytes) -> Result<Vec<Bytes>, String> {
|
||||
if mtu < 4 { return Err("HEVC payload MTU too small".into()); }
|
||||
let mut starts = Vec::new();
|
||||
let mut i = 0;
|
||||
let bytes = annex_b.as_ref();
|
||||
while i + 3 <= bytes.len() {
|
||||
let prefix = if bytes[i..].starts_with(&[0, 0, 0, 1]) { 4 }
|
||||
else if bytes[i..].starts_with(&[0, 0, 1]) { 3 } else { i += 1; continue; };
|
||||
starts.push((i, i + prefix)); i += prefix;
|
||||
}
|
||||
if starts.is_empty() { return Err("HEVC access unit has no Annex-B start code".into()); }
|
||||
let mut out = Vec::new();
|
||||
for (index, &(_, start)) in starts.iter().enumerate() {
|
||||
let mut end = starts.get(index + 1).map_or(bytes.len(), |s| s.0);
|
||||
while end > start && bytes[end - 1] == 0 { end -= 1; } // trailing_zero_8bits
|
||||
let nal_slice = &bytes[start..end];
|
||||
if nal_slice.len() < 2 || nal_slice[0] & 0x80 != 0 || nal_slice[1] & 7 == 0 {
|
||||
return Err("Invalid HEVC NAL header".into());
|
||||
}
|
||||
let kind = (nal_slice[0] >> 1) & 63;
|
||||
if kind >= 48 { return Err("HEVC Annex-B contains RTP packet type".into()); }
|
||||
if nal_slice.len() <= mtu {
|
||||
// Zero-copy reference-counted sub-slice:
|
||||
out.push(annex_b.slice(start..end));
|
||||
continue;
|
||||
}
|
||||
let chunks = nal_slice[2..].chunks(mtu - 3);
|
||||
let last = chunks.len() - 1;
|
||||
for (n, chunk) in chunks.enumerate() {
|
||||
let mut fu = Vec::with_capacity(3 + chunk.len());
|
||||
// Keep F, LayerId and TID, replacing only the NAL type with FU=49.
|
||||
fu.extend_from_slice(&[(nal_slice[0] & 0x81) | (49 << 1), nal_slice[1],
|
||||
kind | if n == 0 { 0x80 } else { 0 } | if n == last { 0x40 } else { 0 }]);
|
||||
fu.extend_from_slice(chunk); out.push(fu.into());
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
+28
-11
@@ -154,8 +154,25 @@ fn is_independent_frame_for(bytes: &[u8], codec: VideoCodec) -> bool {
|
||||
match codec {
|
||||
VideoCodec::H264 => !nal_offsets_for(bytes, 5, codec).is_empty() && nal_offsets_for(bytes, 1, codec).is_empty(),
|
||||
// BLA/IDR/CRA are IRAP (RFC 7798 §4.1); no leading pictures with our no-B-frame encoder.
|
||||
VideoCodec::H265 => (16..=21).any(|kind| !nal_offsets_for(bytes, kind, codec).is_empty())
|
||||
&& !(0..16).any(|kind| !nal_offsets_for(bytes, kind, codec).is_empty()),
|
||||
VideoCodec::H265 => {
|
||||
let mut has_irap = false;
|
||||
let mut has_non_irap_vcl = false;
|
||||
let mut i = 0;
|
||||
while i + 3 < bytes.len() {
|
||||
let prefix = if bytes[i..].starts_with(&[0, 0, 0, 1]) { 4 }
|
||||
else if bytes[i..].starts_with(&[0, 0, 1]) { 3 } else { i += 1; continue };
|
||||
let header = i + prefix;
|
||||
if let Some(kind) = hevc_nal_kind(bytes, header) {
|
||||
if (16..=21).contains(&kind) {
|
||||
has_irap = true;
|
||||
} else if kind < 16 {
|
||||
has_non_irap_vcl = true;
|
||||
}
|
||||
}
|
||||
i += prefix;
|
||||
}
|
||||
has_irap && !has_non_irap_vcl
|
||||
}
|
||||
}
|
||||
}
|
||||
#[cfg(test)]
|
||||
@@ -169,7 +186,7 @@ struct CompleteFrame {
|
||||
codec: VideoCodec,
|
||||
sequence: u64,
|
||||
completed_at: Instant,
|
||||
data: Vec<u8>,
|
||||
data: bytes::Bytes,
|
||||
_permit: Option<OwnedSemaphorePermit>,
|
||||
}
|
||||
|
||||
@@ -769,7 +786,7 @@ async fn read_inprocess(
|
||||
let mut gate = DependencyGate::default();
|
||||
while let Some(unit) = units.recv().await {
|
||||
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
|
||||
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: source.1, source_id: source.0, codec, sequence, completed_at: unit.completed_at, data: unit.data, _permit: Some(unit.permit) }));
|
||||
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: source.1, source_id: source.0, codec, sequence, completed_at: unit.completed_at, data: unit.data.into(), _permit: Some(unit.permit) }));
|
||||
if latest.is_closed() { break; }
|
||||
}
|
||||
// Dropping the receiver also unblocks the encoder if it is waiting to send.
|
||||
@@ -988,7 +1005,7 @@ async fn read_encoder_with(
|
||||
if aud.len() < 2 { break; }
|
||||
let next = aud[1];
|
||||
if next > MAX_ACCESS_UNIT { return Err("Encoder access unit exceeds limit".into()); }
|
||||
let frame: Vec<u8> = pending.drain(..next).collect();
|
||||
let frame: bytes::Bytes = pending.drain(..next).collect::<Vec<u8>>().into();
|
||||
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
|
||||
let permit=if wayland {Some(permits_rx.recv().await.ok_or("Capture producer stopped")?)} else {None};
|
||||
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: settings.source_generation, source_id: settings.source_id,
|
||||
@@ -1330,7 +1347,7 @@ pub async fn stream_desktop_at(pc: Arc<RTCPeerConnection>, track: Arc<crate::vid
|
||||
max_age_ms = max_age_ms.max(frame.completed_at.elapsed().as_millis());
|
||||
// Continue monitoring close even if the network send stalls.
|
||||
let sample = Sample {
|
||||
data: frame.data.clone().into(), duration, ..Default::default()
|
||||
data: frame.data.clone(), duration, ..Default::default()
|
||||
};
|
||||
let extensions = [crate::rtp_metadata::capture_index(0), crate::rtp_metadata::new_frame()];
|
||||
let sent_before=track.revision();
|
||||
@@ -1480,7 +1497,7 @@ mod tests {
|
||||
for sequence in 1..=2 {
|
||||
let permit=budget.clone().acquire_owned().await.unwrap();
|
||||
gate.submit(&tx,Arc::new(CompleteFrame { source_generation: 0, source_id: 0,codec:VideoCodec::H264,sequence,completed_at:Instant::now(),
|
||||
data:vec![0,0,1,5,42],_permit:Some(permit)}));
|
||||
data:vec![0,0,1,5,42].into(),_permit:Some(permit)}));
|
||||
}
|
||||
let sending=rx.recv().await.unwrap();
|
||||
assert_eq!(budget.available_permits(),0);
|
||||
@@ -1642,7 +1659,7 @@ mod tests {
|
||||
let (started_tx, started_rx) = tokio::sync::oneshot::channel();
|
||||
let frame = |sequence, idr| Arc::new(CompleteFrame { source_generation: 0, source_id: 0, _permit: None,
|
||||
sequence, codec: VideoCodec::H264, completed_at: Instant::now(),
|
||||
data: vec![0, 0, 1, 9, 240, 0, 0, 1, if idr { 5 } else { 1 }, 42],
|
||||
data: vec![0, 0, 1, 9, 240, 0, 0, 1, if idr { 5 } else { 1 }, 42].into(),
|
||||
});
|
||||
let mut reader = EncoderTask(tokio::spawn(async move {
|
||||
let _stopped = MarkStopped(old_stopped);
|
||||
@@ -1735,7 +1752,7 @@ mod tests {
|
||||
async fn bounded_queue_never_sends_broken_prediction_chain_after_overload(){
|
||||
let(tx,mut rx)=mpsc::channel(1);
|
||||
let mut gate=DependencyGate::default();
|
||||
let frame=|sequence,idr|Arc::new(CompleteFrame{source_generation:0,source_id:0,_permit:None,sequence,codec:VideoCodec::H264,completed_at:Instant::now(),data:vec![0,0,1,9,240,0,0,1,if idr{5}else{1},42]});
|
||||
let frame=|sequence,idr|Arc::new(CompleteFrame{source_generation:0,source_id:0,_permit:None,sequence,codec:VideoCodec::H264,completed_at:Instant::now(),data:vec![0,0,1,9,240,0,0,1,if idr{5}else{1},42].into()});
|
||||
gate.submit(&tx,frame(1,false));assert!(rx.try_recv().is_err()); // no IDR yet
|
||||
gate.submit(&tx,frame(2,true));
|
||||
gate.submit(&tx,frame(3,false)); // queue full: P3 lost
|
||||
@@ -1808,7 +1825,7 @@ mod tests {
|
||||
let (tx, mut rx) = mpsc::channel(1);
|
||||
let mut gate = DependencyGate::default();
|
||||
let frame = |sequence, irap| Arc::new(CompleteFrame { source_generation: 0, source_id: 0, _permit: None, codec: VideoCodec::H265,
|
||||
sequence, completed_at: Instant::now(), data: vec![0,0,1,if irap { 38 } else { 2 },1,42] });
|
||||
sequence, completed_at: Instant::now(), data: vec![0,0,1,if irap { 38 } else { 2 },1,42].into() });
|
||||
gate.submit(&tx, frame(1, false));
|
||||
assert!(rx.try_recv().is_err());
|
||||
gate.submit(&tx, frame(2, true));
|
||||
@@ -1855,7 +1872,7 @@ mod screen_frame_tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn source_restart_rejects_queued_frames_even_with_same_screen_and_codec() {
|
||||
let frame=CompleteFrame {source_id:0,source_generation:7,codec:VideoCodec::H264,sequence:1,completed_at:Instant::now(),data:vec![],_permit:None};
|
||||
let frame=CompleteFrame {source_id:0,source_generation:7,codec:VideoCodec::H264,sequence:1,completed_at:Instant::now(),data:vec![].into(),_permit:None};
|
||||
let mut settings=VideoSettings {source_id:0,source_generation:7,..Default::default()};
|
||||
assert!(frame.matches(&settings));
|
||||
settings.source_generation=9;assert!(!frame.matches(&settings));
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ impl VideoTrack {
|
||||
// Leave room for the RTP header and negotiated UU extensions below the 1200 byte MTU.
|
||||
let payloads = match codec {
|
||||
VideoCodec::H264 => state.h264.payload(1160, &sample.data).map_err(Error::Rtp)?,
|
||||
VideoCodec::H265 => crate::hevc::payload(1160, &sample.data).map_err(Error::new)?,
|
||||
VideoCodec::H265 => crate::hevc::payload_bytes(1160, &sample.data).map_err(Error::new)?,
|
||||
};
|
||||
let count = payloads.len();
|
||||
let mut complete = count > 0;
|
||||
|
||||
@@ -31,7 +31,7 @@ pub(super) async fn encode(latest: mpsc::Sender<Arc<CompleteFrame>>, settings: V
|
||||
let frame = Arc::new(CompleteFrame {
|
||||
source_generation: settings.source_generation, source_id: settings.source_id,
|
||||
codec: settings.codec, sequence: sequence.fetch_add(1, Ordering::Relaxed) + 1,
|
||||
completed_at: Instant::now(), data: vec![0, 0, 1, 65, 1, 2], _permit: Some(permit),
|
||||
completed_at: Instant::now(), data: vec![0, 0, 1, 65, 1, 2].into(), _permit: Some(permit),
|
||||
});
|
||||
if latest.send(frame).await.is_err() { return Ok(()); }
|
||||
}
|
||||
|
||||
+87
-72
@@ -1177,7 +1177,8 @@ impl WebRtcSession {
|
||||
}
|
||||
return;
|
||||
}
|
||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
||||
let proto_fields = crate::protocol::decode_wire(&msg.data).ok();
|
||||
if let Some(fields) = proto_fields.as_deref() {
|
||||
use crate::protocol::WireValue;
|
||||
let rpc = fields.iter().find_map(|f| match (f.number, &f.value) { (21, WireValue::Bytes(b)) => Some(*b), _ => None });
|
||||
let rpc_fields = rpc.and_then(|r| crate::protocol::decode_wire(r).ok());
|
||||
@@ -1222,18 +1223,18 @@ impl WebRtcSession {
|
||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||
return;
|
||||
}
|
||||
if let Some(response) = rpc.and_then(|r| crate::protocol::decode_wire(r).ok()).and_then(|r| crate::terminal::rpc_response(&r)) {
|
||||
if let Some(response) = rpc_fields.as_deref().and_then(crate::terminal::rpc_response) {
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||
return;
|
||||
}
|
||||
}
|
||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
||||
if mapping.handle(&fields, &channel_name) { return; }
|
||||
if let Some(fields) = proto_fields.as_deref() {
|
||||
if mapping.handle(fields, &channel_name) { return; }
|
||||
}
|
||||
if let Some(files) = &file_worker {
|
||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
||||
if files.handle(&fields) {
|
||||
if let Some(fields) = proto_fields.as_deref() {
|
||||
if files.handle(fields) {
|
||||
static ROUTE: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||
if ROUTE.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 20 {
|
||||
log::info!("File transfer RPC received on {}", channel_name);
|
||||
@@ -1259,16 +1260,16 @@ impl WebRtcSession {
|
||||
}
|
||||
}
|
||||
shape(&value,0).to_string()
|
||||
} else if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
||||
} else if let Some(fields) = proto_fields.as_deref() {
|
||||
format!("protobuf fields={:?}",fields.iter().map(|f|f.number).collect::<Vec<_>>())
|
||||
} else { "opaque".to_string() };
|
||||
log::info!("Clipboard channel schema: channel={} bytes={} schema={}",channel_name,msg.data.len(),shape);
|
||||
}
|
||||
}
|
||||
if channel_name == "CONTROL_DATA_CHANNEL" || channel_name == "TEXT_DATA_CHANNEL" {
|
||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
||||
if let Some(fields) = proto_fields.as_deref() {
|
||||
use crate::protocol::WireValue;
|
||||
for field in &fields {
|
||||
for field in fields {
|
||||
if let (22,WireValue::Bytes(payload))=(field.number,&field.value) {
|
||||
let update=rich_incoming.lock().unwrap().response(payload);
|
||||
match update {
|
||||
@@ -1285,8 +1286,6 @@ impl WebRtcSession {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for field in &fields {
|
||||
if let (21, WireValue::Bytes(payload)) = (field.number,&field.value) {
|
||||
let ids=crate::clipboard_rich::format_ids(payload);
|
||||
if !ids.is_empty(){log::info!("Clipboard offered format IDs: {:?}",ids);}
|
||||
@@ -1324,8 +1323,6 @@ impl WebRtcSession {
|
||||
Err(reason)=>log::warn!("Clipboard RPC rejected: {}",reason),
|
||||
}
|
||||
}
|
||||
}
|
||||
for field in &fields {
|
||||
if let (17, WireValue::Bytes(payload)) = (field.number, &field.value) {
|
||||
match clipboard_assembly.lock().unwrap().accept(payload) {
|
||||
Ok(Some(text)) => {
|
||||
@@ -1452,69 +1449,87 @@ impl WebRtcSession {
|
||||
}
|
||||
if let Ok(txt) = std::str::from_utf8(&msg.data) {
|
||||
log::debug!("DataChannel [{}] received UTF-8 data: {} bytes", channel_name, txt.len());
|
||||
if let Ok(val) = serde_json::from_str::<serde_json::Value>(txt) {
|
||||
if !channel_name.contains("CONTROL") {
|
||||
// Input JSON on another channel (mobile input-method text was missing from CONTROL, #13/#46):
|
||||
// record action names only, once per name, and accept text_input wherever it arrives.
|
||||
if let Some(action) = val.get("action").and_then(serde_json::Value::as_str) {
|
||||
static SEEN: std::sync::Mutex<Vec<String>> = std::sync::Mutex::new(Vec::new());
|
||||
let mut seen = SEEN.lock().unwrap();
|
||||
if seen.len() < 32 && action.len() <= 40 && action.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_') && !seen.iter().any(|s| s == action) {
|
||||
seen.push(action.to_owned());
|
||||
log::info!("JSON action on {} channel: action={}", if channel_name.contains("STREAMER") {"STREAMER"} else if channel_name.contains("TEXT") {"TEXT"} else {"other"}, action);
|
||||
if channel_name.contains("CONTROL") {
|
||||
match crate::control_protocol::decode_control(&msg.data) {
|
||||
Ok(crate::control_protocol::ControlMessage::Input(event)) => {
|
||||
// A ready compositor source remains controllable on its lock screen.
|
||||
if screen.backend == crate::desktop_backend::DesktopBackend::Portal
|
||||
&& (screen.init_error.is_some() || !desktop_ready) { return; }
|
||||
if !crate::wayland::input_ready() {return;}
|
||||
use crate::control_protocol::ControlInput;
|
||||
// Separate receipt budgets keep motion floods from hiding clicks.
|
||||
static RECEIPTS: [std::sync::atomic::AtomicUsize; 3] = [const { std::sync::atomic::AtomicUsize::new(0) }; 3];
|
||||
let (slot, kind) = match &event {
|
||||
ControlInput::MouseButton {..} | ControlInput::MouseClick {..} => (0, "button"),
|
||||
ControlInput::Keyboard {..} | ControlInput::KeyboardClick {..} | ControlInput::TextInput {..} => (1, "keyboard"),
|
||||
_ => (2, "motion"),
|
||||
};
|
||||
if RECEIPTS[slot].fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
||||
log::info!("CONTROL input received: kind={}", kind);
|
||||
}
|
||||
}
|
||||
if let Ok(crate::control_protocol::ControlMessage::Input(crate::control_protocol::ControlInput::TextInput {text})) = crate::control_protocol::decode_control(&msg.data) {
|
||||
if let Some(session)=message_input_session.as_ref() { session.with_input(|| {if crate::wayland::input_ready() {input_worker.text_input(&text);}}); }
|
||||
if let Some(session)=message_input_session.as_ref() {
|
||||
if matches!(&event, ControlInput::TextInput {..}) {
|
||||
let (session, input, text) = match &event {
|
||||
ControlInput::TextInput {text} => (session.clone(), input_worker.clone(), text.clone()),
|
||||
_ => unreachable!(),
|
||||
};
|
||||
let _ = tokio::task::spawn_blocking(move || {
|
||||
session.with_input(|| {
|
||||
if crate::wayland::input_ready() { input.text_input(&text); }
|
||||
});
|
||||
}).await;
|
||||
} else {
|
||||
session.with_input(|| {
|
||||
if !crate::wayland::input_ready() {return;}
|
||||
match &event {
|
||||
ControlInput::MouseAbsolute {x,y} => input_worker.mouse_absolute_normalized(*x,*y,crate::wayland::input_size(if live_x11 {crate::capture::x11_last_size().unwrap_or(input_size)} else {input_size})),
|
||||
ControlInput::MouseRelative {dx,dy} => input_worker.mouse_relative(*dx,*dy),
|
||||
ControlInput::MouseScroll {dx,dy} => input_worker.mouse_scroll(*dx,*dy),
|
||||
ControlInput::Keyboard {key, pressed} => input_worker.windows_key_event(*key, *pressed),
|
||||
ControlInput::KeyboardClick {key} => {input_worker.windows_key_event(*key, true);input_worker.windows_key_event(*key, false);},
|
||||
ControlInput::MouseButton {button,pressed} => input_worker.wire_mouse_button(*button,*pressed),
|
||||
ControlInput::MouseClick {button} => {input_worker.wire_mouse_button(*button,true);input_worker.wire_mouse_button(*button,false);},
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
Ok(crate::control_protocol::ControlMessage::Unsupported(v)) => {
|
||||
// Action name and key names only, never values (an IME text event would carry typed text).
|
||||
static UNSUPPORTED: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||
if UNSUPPORTED.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
||||
let action = v.get("action").and_then(serde_json::Value::as_str)
|
||||
.filter(|a| a.len() <= 40 && a.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_')).unwrap_or("?");
|
||||
let keys: Vec<&str> = v.as_object().map(|o| o.keys().map(String::as_str).take(12).collect()).unwrap_or_default();
|
||||
log::info!("Unsupported CONTROL input: action={action} keys={keys:?}");
|
||||
}
|
||||
},
|
||||
_ => {}
|
||||
}
|
||||
} else if let Ok(val) = serde_json::from_str::<serde_json::Value>(txt) {
|
||||
// Input JSON on another channel (mobile input-method text was missing from CONTROL, #13/#46):
|
||||
// record action names only, once per name, and accept text_input wherever it arrives.
|
||||
if let Some(action) = val.get("action").and_then(serde_json::Value::as_str) {
|
||||
static SEEN: std::sync::Mutex<Vec<String>> = std::sync::Mutex::new(Vec::new());
|
||||
let mut seen = SEEN.lock().unwrap();
|
||||
if seen.len() < 32 && action.len() <= 40 && action.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_') && !seen.iter().any(|s| s == action) {
|
||||
seen.push(action.to_owned());
|
||||
log::info!("JSON action on {} channel: action={}", if channel_name.contains("STREAMER") {"STREAMER"} else if channel_name.contains("TEXT") {"TEXT"} else {"other"}, action);
|
||||
}
|
||||
}
|
||||
if channel_name.contains("CONTROL") {
|
||||
match crate::control_protocol::decode_control(&msg.data) {
|
||||
Ok(crate::control_protocol::ControlMessage::Input(event)) => {
|
||||
// A ready compositor source remains controllable on its lock screen.
|
||||
if screen.backend == crate::desktop_backend::DesktopBackend::Portal
|
||||
&& (screen.init_error.is_some() || !desktop_ready) { return; }
|
||||
if !crate::wayland::input_ready() {return;}
|
||||
use crate::control_protocol::ControlInput;
|
||||
// Separate receipt budgets keep motion floods from hiding clicks.
|
||||
static RECEIPTS: [std::sync::atomic::AtomicUsize; 3] = [const { std::sync::atomic::AtomicUsize::new(0) }; 3];
|
||||
let (slot, kind) = match &event {
|
||||
ControlInput::MouseButton {..} | ControlInput::MouseClick {..} => (0, "button"),
|
||||
ControlInput::Keyboard {..} | ControlInput::KeyboardClick {..} | ControlInput::TextInput {..} => (1, "keyboard"),
|
||||
_ => (2, "motion"),
|
||||
};
|
||||
if RECEIPTS[slot].fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
||||
log::info!("CONTROL input received: kind={}", kind);
|
||||
}
|
||||
if let Some(session)=message_input_session.as_ref() {session.with_input(|| {
|
||||
if !crate::wayland::input_ready() {return;}
|
||||
match &event {
|
||||
ControlInput::MouseAbsolute {x,y} => input_worker.mouse_absolute_normalized(*x,*y,crate::wayland::input_size(if live_x11 {crate::capture::x11_last_size().unwrap_or(input_size)} else {input_size})),
|
||||
ControlInput::MouseRelative {dx,dy} => input_worker.mouse_relative(*dx,*dy),
|
||||
ControlInput::MouseScroll {dx,dy} => input_worker.mouse_scroll(*dx,*dy),
|
||||
ControlInput::Keyboard {key, pressed} => input_worker.windows_key_event(*key, *pressed),
|
||||
ControlInput::TextInput {text} => input_worker.text_input(text),
|
||||
ControlInput::KeyboardClick {key} => {input_worker.windows_key_event(*key, true);input_worker.windows_key_event(*key, false);},
|
||||
ControlInput::MouseButton {button,pressed} => input_worker.wire_mouse_button(*button,*pressed),
|
||||
ControlInput::MouseClick {button} => {input_worker.wire_mouse_button(*button,true);input_worker.wire_mouse_button(*button,false);},
|
||||
_ => {}
|
||||
}
|
||||
});}
|
||||
|
||||
},
|
||||
Ok(crate::control_protocol::ControlMessage::Unsupported(v)) => {
|
||||
// Action name and key names only, never values (an IME text event would carry typed text).
|
||||
static UNSUPPORTED: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||
if UNSUPPORTED.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
||||
let action = v.get("action").and_then(serde_json::Value::as_str)
|
||||
.filter(|a| a.len() <= 40 && a.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_')).unwrap_or("?");
|
||||
let keys: Vec<&str> = v.as_object().map(|o| o.keys().map(String::as_str).take(12).collect()).unwrap_or_default();
|
||||
log::info!("Unsupported CONTROL input: action={action} keys={keys:?}");
|
||||
}
|
||||
},
|
||||
_ => {}
|
||||
if let Ok(crate::control_protocol::ControlMessage::Input(crate::control_protocol::ControlInput::TextInput {text})) = crate::control_protocol::decode_control(&msg.data) {
|
||||
if let Some(session)=message_input_session.as_ref() {
|
||||
let (session, input) = (session.clone(), input_worker.clone());
|
||||
let _ = tokio::task::spawn_blocking(move || {
|
||||
session.with_input(|| {
|
||||
if crate::wayland::input_ready() { input.text_input(&text); }
|
||||
});
|
||||
}).await;
|
||||
}
|
||||
} else if channel_name.contains("STREAMER") {
|
||||
}
|
||||
if channel_name.contains("STREAMER") {
|
||||
log::debug!("STREAMER channel JSON received");
|
||||
if let Some(event)=val.get("connection_period_stats_event") {
|
||||
let nums=crate::viewer_metrics::collect(event);
|
||||
|
||||
Reference in new issue
Block a user