Compare commits

..
31 Commits
Author SHA1 Message Date
VallierDevandClaude Opus 5.5 d9c43897c7 Release v0.2.41
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-29 23:46:34 +08:00
9fe1351de1 控制端:重置后关键帧等待接受 I 片/恢复点 SEI 并 1.5 秒超时放行 (#136) (#137)
v0.2.40 在本地重置后只接受 IDR,Mac 被控端对 PLI 不回 IDR 时画面一直空白。
现在 H.264 的 I 片和恢复点 SEI 也算重启点,等待超过 1.5 秒照常解码;
丢弃单元时也取走解码器已完成的画面。

Co-authored-by: VallierDev <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
2026-10-29 23:43:34 +08:00
Its.spixy c0b0ca6afb GNOME Portal:手机控制端拖动滚动、按住选中、短按点击 (#134)
Replayed as touch, a phone drag scrolled in browsers but still selected
text in VTE terminals (Ptyxis, GNOME Terminal), as on a real touchscreen.
By default on the portal backend the host now decides per press: moving
past 12 px within 450 ms scrolls smoothly (NotifyPointerAxis or EIS
scroll, content follows the finger, `finish` on release so clients may
coast), holding still selects with button 1 down, and a short press
clicks. This works in terminals too and needs no touchscreen consent.
UU_TOUCH_INPUT=touch keeps the touchscreen replay (with its one-time
consent upgrade); UU_TOUCH_INPUT=0 keeps plain mouse drags.
2026-10-29 23:34:30 +08:00
Its.spixy 11097b5847 GNOME Portal:手机触控模式拖动按触摸屏重放,输入法 ASCII 直接按键输入 (#131)
* portal: mobile touch-mode drags become touch, consent asks once for it

In touch mode the Android viewer sends a finger as a left-button drag at
absolute positions (observed: press, mouse_move_absolute stream, release),
which on GNOME selects text instead of scrolling. SelectDevices now also
asks for the touchscreen type where AvailableDeviceTypes offers it, and a
drag from an Android/iOS controller (controller_platform 2/3) that follows
absolute motion is replayed as one finger through NotifyTouch* or EIS
touch, so the desktop scrolls and taps as on a touch screen. Relative
motion (the trackpad mode) and every other viewer keep mouse buttons.

A consent saved before this restores keyboard and pointer only. The first
mobile drag then asks the host once per run in the background (GNOME's
share dialog, also visible on the phone; the consent timeout closes it)
and swaps the new session in only when it grants the touchscreen for the
same monitor and size. The saved consent is never removed beforehand.
UU_TOUCH_INPUT=0 keeps mouse drags and never asks.

* input: type mobile IME text as portal keysyms on Latin GNOME layouts

Each mobile text_input was set as the clipboard and pasted with
Shift+Insert, which VTE terminals bind to the PRIMARY selection: text
typed from the phone into a terminal pasted whatever was last selected
(observed: a selected line of box-drawing characters for every letter).
When GNOME's active input source (first of mru-sources) is a Latin xkb
layout, printable ASCII, newline and tab now go through
NotifyKeyboardKeysym, where Mutter picks the key and Shift level of the
active layout. Other text, IBus engines, KDE and EIS sessions keep the
clipboard paste, which no longer replaces the clipboard for plain typing.

* portal test: accept libei before 1.3 rejecting a touch outside one of two regions

libei 1.2 (Ubuntu 24.04, CI) accepts a touch only inside every region of the
device; 1.3.0 checks any region. The harness device also carries a region for
another screen, so the older library rejects the touch with a client-bug
diagnostic. A real one-stream session has one region.
2026-10-29 19:49:15 +08:00
Its.spixy 6a0cd5bda6 控制端:跨会话记住画质、帧率和真彩设置 (#133)
The host starts every session at the official defaults (Auto, 60 fps,
4:2:0), so a choice made for a slow link was lost on reconnect. Save them
in viewer.json with the other preferences and send the ones that differ
once CONTROL answers the echo.
2026-10-29 18:48:30 +08:00
VallierDevandClaude Opus 5.5 4cfdd563f7 Release v0.2.40
TURN TCP: report an inspecting proxy that answers with HTTP inside the relay stream.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-29 11:46:02 +08:00
Its.spixyandClaude Opus 5.5 0cbfc5b4f1 控制端:原生分辨率、中英文界面、控制中心、实测 RTT 与稳定性修复 (#129)
* viewer: decode at the host's native size and filter window scaling

Every frame was scaled into a fixed 1920x1080 canvas and SDL then stretched it
to the window with nearest-neighbour sampling, so remote text looked uneven and
blurry. Decode at the native size (read from ffmpeg's verbose scaler line),
restart the decoder when the host resolution changes, and use linear render
scaling. UU_VIEWER_SIZE keeps the fixed canvas, now resampled with Lanczos.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Add Chinese/English UI language

All GTK windows (viewer launcher, tool windows, host main window and QR login)
and viewer messages are available in Chinese and English. The language comes
from UU_LANG, the choice saved in Settings -> General, then the locale.
README: document the fork's changes and language selection.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Host main window: add the language selector

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: control center, network status, loading screen, device previews

In-window chrome drawn on the SDL canvas with a fontconfig font (ab_glyph):
- loading animation with the connection stage instead of a black window
- control center (Ctrl+Alt+M or the top tab): quality, fps, true color,
  resolution, fit/1:1, volume, auto lock and host mute (SimpleAction 19,
  14/18/16), system shortcut grab, file transfer, watch mode, full screen,
  disconnect
- network status panel (Ctrl+Alt+G): time, route, fps, bitrate, RTT, loss
- launcher device previews from the last remote picture (local 0600 cache)
- viewer sign-in keeps the local host user service running, so this
  computer joins the account's device list; the settings switch controls it

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: compact cascading control center

Narrow category list with an options card beside the selected row, sized to
its content; opaque cards with a hairline border and soft shadow, so the
remote picture no longer shows through.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: keep the control center responsive; resync on a key frame

The menu was rasterized on every mouse event just to hit-test it; hit testing
now uses the layout alone and the drawn menu is cached until what it shows
changes. A stalled UI overflowed the access-unit queue, and the reset decoder
then smeared P-frames into blocks; after a reset it now waits for an IDR/IRAP
while requesting key frames. The tab icon is drawn, since fonts without U+2630
showed a box.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: measured RTT, no crash on closing tool windows, account card

webrtc-ice never measured the round trip, so the network panel always read
'RTT --'. Binding responses now record it on their pair, and the selected
pair is pinged when the sample is older than the keepalive interval, since
a streaming pair never idles (vendor/webrtc-ice/PATCHES.md).

On Wayland, libdecor's GTK plugin drew SDL's title bar with GTK3 from SDL's
thread while the file window ran gtk_main on its own; closing that window
crashed in GTK's style code. GTK builds now offer libdecor only the cairo
plugin unless LIBDECOR_PLUGIN_DIR is set.

Settings > General gets an Account card with the signed-in user and Sign out.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* README: keep the language section, without the fork notes

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: English server errors in the English UI; stable type_ipc tests

UU servers answer in Chinese only. The English UI now translates the known
messages (2002 target already controlled, assistance refusals) and shows the
code for unknown ones instead of Chinese text.

type_ipc tests shared one temp directory per process and read
XDG_RUNTIME_DIR while another test pointed it at a planted directory; each
call now gets its own directory and socket tests hold the environment lock.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer launcher: switching the language restarts the launcher

The choice was saved but took effect only on the next start, so the window
seemed to ignore it. The launcher now re-executes itself in place; session
windows are separate processes and stay connected.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: show pictures as soon as decoded; coalesce mouse motion

The raw-stream parser closed an access unit only when the next began, and
frames were collected only when another one arrived, so a single remote
change (a typed letter) waited for the next one. An access unit delimiter
now follows each unit and the loop drains finished frames between units.

Motions within one 8 ms poll collapse to the newest position (click order
kept), so a drag no longer queues behind itself on a relayed path.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer launcher: hosting is opt-in

Signing in to the viewer no longer installs or enables uuremote-native.service.
Only the Settings switch enables or disables it, and the unit's enabled state is
the saved choice, so turning it off survives a restart. A new sign-in restarts the
host only when the user turned it on and it is running.

PATCHES.md: the RTT keepalive also runs on the host; checked with the official
Android client controlling a Linux host.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* viewer: drop SDL event types sdl2 0.37 does not define

sdl2 0.37 transmutes every event type into SDL_EventType. sdl2-compat on SDL3
delivers types SDL 2 does not define (0x207), which is undefined behaviour and
aborts with debug checks (clipboard_requests_use_existing_window on Fedora 44).
Poll raw events and skip those types before the crate converts them.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Keep the package version at 0.2.39

The maintainer sets the version at release time.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

---------

Co-authored-by: Claude Opus 5.5 <[email protected]>
2026-10-29 10:45:11 +08:00
Its.spixyandClaude Opus 5.5 47c7728822 GNOME Portal:多显示器切换、精确触控、断开后停止共享 (#128)
* portal: switch monitors on GNOME, precise touch, stop sharing when idle

GNOME grants one monitor per portal consent and refuses multi-select, so
each Mutter monitor gets its own saved consent (gnome@<connector>). The
monitors are advertised as screens; a switch opens that monitor's session
(silently once consented, GNOME asks on the host the first time) and swaps
it into the shared PortalSession, whose frame size follows the monitor.

Absolute motion and clicks go through the portal session: a uinput tablet
spans every monitor, and clicks on the separate uinput queue could land
before the compositor moved the pointer.

An idle watch ends the portal session (screen-share indicator off) once no
desktop controller is left for two checks; the next one reopens it with the
saved consent.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* portal: stop screen sharing as soon as the last controller leaves

The idle watch stays as the fallback for controllers that vanish without
a release event.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* portal test: accept the runtime-engine message in portal builds

Co-Authored-By: Claude Opus 5.5 <[email protected]>

---------

Co-authored-by: Claude Opus 5.5 <[email protected]>
2026-10-29 10:44:30 +08:00
Its.spixy e503041dac 登录:跨进程串行化设备注册 (#127)
主机扫码窗口与控制端登录可能各自调用 device/windows/init,导致账号绑定一台设备而 config.json 保存另一台(主机显示离线的幽灵设备)。现在在 config.json 旁的排他文件锁下注册设备,取锁后重读配置,第二个流程复用已注册设备。

感谢 @spixyy7 的贡献。

🤖 Generated with [Claude Code](https://claude.com/claude-code)
2026-10-29 04:40:52 +08:00
Sile Liu 835bfa2319 Fix niri monitor switching, rotated input and mobile text (#71)
niri 实验性支持:三屏切换、90°/180°/270° 旋转输出的采集与指针映射、手机中文文本输入,全部 gated 在 NIRI_SOCKET,不影响 Hyprland/X11 路径。新增 wayland_transform.h 及其 ASAN 单测。

感谢 @WALKERKILLER 的贡献与 CachyOS + niri 实机验收。

🤖 Generated with [Claude Code](https://claude.com/claude-code)
2026-10-29 01:39:01 +08:00
VallierDevandClaude Opus 5.5 482c01a85d viewer tests: accept the video track RPC in the loopback session
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 20:45:43 +08:00
VallierDevandClaude Opus 5.5 7f6cf6e092 Release v0.2.39
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 20:39:58 +08:00
VallierDevandClaude Opus 5.5 c0c04a2c98 viewer: request the desktop video track like the official viewer (#124)
The official iPhone viewer sends RpcRequest case 15 SendVideoTrackReq (no
fields) right after CONTROL opens. Without it a second session only joins the
stream already encoded for another viewer: no SPS/PPS/IDR, so it stays black.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 20:37:43 +08:00
VallierDevandClaude Opus 5.5 b636f1b278 Release v0.2.38
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 20:22:03 +08:00
VallierDevandClaude Opus 5.5 64d2ffbdd3 ICE: trust the system certificate store for TURN over TLS
A TLS-inspecting HTTP proxy re-signs the TURN certificate with a CA that the
host's administrator installed in the system store; OpenSSL accepts it while
the bundled Mozilla roots alone fail with UnknownIssuer.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 20:21:37 +08:00
VallierDevandClaude Opus 5.5 5656f33d86 Release v0.2.37
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 19:35:12 +08:00
VallierDevandClaude Opus 5.5 6a633e1bc4 ICE: gather TURN relays over TCP/TLS through the HTTP proxy with UU_USE_PROXY=1
Upstream webrtc-ice only gathers UDP relays. Forced-relay sessions also offer
turns:<ip>:<port>?transport=tcp, the only media path on hosts whose UDP cannot
reach the TURN servers but whose TCP goes through an HTTP proxy. Vendor
webrtc-ice 0.10.1 with a TCP/TLS dialer (optional HTTP CONNECT) that frames
STUN/ChannelData for the unchanged turn client. Certificates are chain-verified;
a name mismatch is accepted only for IP-literal TURN URLs. Enabled only with
UU_USE_PROXY=1; default UDP gathering is unchanged.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 19:34:24 +08:00
VallierDevandClaude Opus 5.5 ab137a1b20 Release v0.2.36
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 17:27:17 +08:00
VallierDevandClaude Opus 5.5 092ea713f8 X11: fall back to XGetImage when MIT-SHM attach is refused
XShmAttach fails asynchronously with BadAccess when the X server cannot reach
the segment (for example a server in another container); Xlib's default error
handler exited the host before the existing XGetImage fallback could run.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 17:26:01 +08:00
VallierDevandClaude Opus 5.5 53d5f0e144 viewer: request key frames until the first frame is shown (#124)
A session that joins a host already streaming to another viewer can receive a
clean stream with no IDR in flight, so the loss-driven PLI never fired. Ask
every 30 access units until something is presented, and warn after 300.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 16:36:35 +08:00
VallierDevandClaude Opus 5.5 6b5216df35 Release v0.2.35
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 15:21:34 +08:00
VallierDevandClaude Opus 5.5 d66937a01c Signaling: honor the REST client's opt-in HTTP proxy policy (#123)
Route host and viewer WebSocket signaling through the shared reqwest client so UU_USE_PROXY=1 applies to signaling as well (HTTP/HTTPS proxies only, no direct fallback, no redirects, strict upgrade validation). ICE/WebRTC media is not proxied.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 14:42:12 +08:00
VallierDevandClaude Opus 5.5 825f964f7d doctor: warn about extra host instances; README: never share config.json (#122)
Count only top-level hosts (helpers such as the Wayland capture process and
the login window are children) and explain that two instances with one
identity kick each other out of the room.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 14:32:37 +08:00
VallierDevandClaude Opus 5.5 3f2da6f587 doctor: count re-executed host processes by executable (#122)
The host re-execs through /proc/self/exe, so its process name becomes "exe"
and pgrep -x uuremote-server missed duplicate hosts.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 14:26:34 +08:00
VallierDevandClaude Opus 5.5 027abba44d Signaling: log the shape of cloud room leaves without a peer id (#122)
Keys, value types and lengths only, as for SOAC offers.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 14:02:10 +08:00
VallierDevandClaude Opus 5.5 ef86019b39 Login: distinguish QR polling failures from expiry with safe diagnostics (#121)
Classify QR request failures (timeout/connect/decode/body/request) with phase, elapsed time and HTTP/API status only; never print tickets, URLs or server content. Extract and test the polling decisions; keep the 60 s timeout and official refresh behaviour.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-28 13:28:50 +08:00
shofukantktsandshofukantkts 003da254a6 Wayland: type mobile text_input via clipboard paste on Portal and compositors without spare keycodes (#119)
* Wayland: type mobile text_input via clipboard paste on Portal and compositors without spare keycodes

* Wayland: address review comments for mobile text_input clipboard fallback

- Guard external clipboard commands in unit tests to eliminate desktop side effects
- Narrow paste fallback to Wayland and Portal backends only
- Document clipboard override and two-way sync behavior in README (both zh and en)
- Unify disable switch via UU_WAYLAND_TEXT=0

---------

Co-authored-by: shofukantkts <[email protected]>
2026-10-27 22:14:56 +08:00
VallierDevandClaude Opus 5.5 7a86fab340 Release v0.2.34
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-27 13:10:49 +08:00
VallierDevandClaude Opus 5.5 d631849f1d Viewer: map the desktop window before the first decoded frame (#118)
Wayland shows a toplevel only after its first buffer, so a stream that never
yields a picture left no window at all. Present a black buffer on creation and
on resize/expose while no frame has arrived.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-27 12:10:35 +08:00
VallierDevandClaude Opus 5.5 d04d241411 Viewer: repaint the last frame after a compositor resize (#118)
Tiling or maximizing the SDL viewer resized the surface, but nothing was
drawn until the next decoded frame, so a static remote desktop stayed blank.
Repaint the last frame on SizeChanged/Resized/Exposed/Maximized/Restored.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-27 11:10:53 +08:00
VallierDevandClaude Opus 5.5 2eece30287 Signaling: bound the WebSocket handshake so reconnect retries after a stall (#115)
After a network change the DNS/TCP/TLS/upgrade could stall forever after
room credentials were acquired; the reconnect loop never retried. The
handshake now fails after 20s and the existing 5s retry takes over.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-26 20:03:54 +08:00
132 changed files with 18594 additions and 524 deletions

No files matched your search

+1 -1
View File
@@ -97,7 +97,7 @@ jobs:
ASAN_OPTIONS: detect_leaks=1
UBSAN_OPTIONS: halt_on_error=1
run: |
for source in tests/portal_engine.c tests/portal_input.c tests/portal_eis.c tests/desktop_power.c; do
for source in tests/portal_engine.c tests/portal_input.c tests/portal_eis.c tests/desktop_power.c tests/wayland_transform.c; do
target="/tmp/$(basename "$source" .c)"
cc -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer \
-Wall -Wextra -Wno-unused-parameter "$source" -o "$target" \
+8 -2
View File
@@ -29,7 +29,10 @@ This file is written for large language model agents (Claude Code, Codex, Cursor
the config file / environment. The only built-in default is the public client signing key in `src/auth.rs`.
6. **Don't break other tools.** The desktop, file-transfer, terminal and port-mapping tools each open their own
peer connection; a new offer must never close other peers.
7. Keep changes small and tested; match the surrounding code style (dense, comment only the non-obvious).
7. **UI text is bilingual.** Every user-facing string has Chinese and English: `L("中文", "English")` in C
(`c_engine/i18n.h`), `crate::i18n::s(..)` / `crate::tr!(..)` in Rust (`src/i18n.rs`; `UU_LANG`, saved choice, locale).
Logs stay English.
8. Keep changes small and tested; match the surrounding code style (dense, comment only the non-obvious).
## 3. Build and test
@@ -122,6 +125,7 @@ viewer does not reconnect them automatically.
| `UU_X11_MULTISCREEN=1`, `UU_X11_OUTPUT` | X11: advertise each RandR monitor (`xrandr --listmonitors`, read once at start; primary or `UU_X11_OUTPUT` is id 0) through the same screen-switch path as `UU_WAYLAND_MULTISCREEN` (`wayland::outputs`/`select`). x11grab reads `display+x,y` at the monitor size, XTest/uinput absolute input adds the monitor offset, the in-process engine and `desktop_mode` resize are skipped (分辨率 scales). Needs two or more monitors |
| `UU_DESKTOP_RESIZE=0` | X11: the viewer's 分辨率 choice scales the encoded stream instead of changing the display mode. Default: `src/desktop_mode.rs` switches the primary output via xrandr (adds a CVT-RB mode when missing, re-applies once if mutter resets it), restores the original mode for resolution_type 3 and 2 s after the last desktop stream ends |
| `UU_NVENC_RGB=0` / `=1` | NVENC 4:2:0 without scaling takes packed BGRA/BGR0 directly (no CPU swscale). Default: on, except when a connected DRM connector belongs to an nvidia-bound card (desktop composited on the encoding GPU; #16 measured 82.6 vs 98 fps at 4K). `0` forces CPU conversion, `1` forces the direct path |
| `UU_TOUCH_INPUT` | Android/iOS controllers (connect header `controller_platform` 2/3) send a finger as a left-button drag at absolute positions. Default on the portal backend (gesture): per press, moving past 12 px within 450 ms scrolls (`NotifyPointerAxis` / EIS scroll, content follows the finger, `finish` on release), holding still selects with button 1 down, a short press clicks; needs no touchscreen consent. `touch`: replay as one finger on the portal touchscreen (`NotifyTouch*` / EIS touch; requested where `AvailableDeviceTypes` offers it; consents saved before touch support restore keyboard+pointer only, so the first mobile drag asks once per run in the background via `PortalSession::upgrade_touch`, swapped in only with the touchscreen granted for the same monitor; the saved consent is never removed first). `0`: plain mouse drags |
| `UU_INPUT_BACKEND` | `auto` (uinput on Wayland/portal when `/dev/uinput` is accessible, udev `uaccess` rule in README) / `uinput` / `native`. X11 keeps XTest (held-key autorepeat handling) |
| Mac viewer Cmd | With 「使用 macOS 快捷键」 off the Mac viewer sends Cmd=VK_LWIN 0x5B, Option=0xA4, Ctrl=0xA2; connect header `controller_platform`=4 is macOS. For Mac controllers Cmd is held back: Cmd+C/V/A/F/X/Z → Ctrl+key (terminal: Cmd+C/V → Ctrl+Shift+C/V), other combos/alone → Super |
| `UU_TERMINAL_SHORTCUTS=0` | disable Ctrl+V → Ctrl+Shift+V in focused X11 terminals (Mac Cmd and Ctrl both arrive as VK_LCONTROL) |
@@ -133,7 +137,7 @@ viewer does not reconnect them automatically.
| `UU_LOGIN_WINDOW=0` | don't auto-open the login window |
| `UU_ENGINE_DIR` | directory holding `libuu-wayland.so` / `libuu-portal.so` (`--features engine-plugins`, used by release packages: engines are dlopen'ed only on Wayland sessions; also searched next to the binary, `../lib/uu-remote-linux`, `~/.local/lib/uu-remote-linux`, `/usr/lib/uu-remote-linux`) |
| `UU_WOL_HELPER=1` | experimental: report LAN info (`api-ipv4…/api/v1/device/wake_on_lan/info` {mac, ip, subnet_mask}) after sign-in and answer `wake_on_lan` pushes (`target_device` {mac, ip, subnet_mask}) with a magic packet, like the official Windows host (field names from its log strings; not verified end to end). `wake_on_lan` push key names are always logged |
| `UU_USE_PROXY=1` | honor HTTP/SOCKS proxy env vars; cloud API clients bypass env proxies by default |
| `UU_USE_PROXY=1` | honor HTTP/HTTPS proxy env vars for REST and WebSocket signaling, and also gather TURN relays over TCP/TLS through that proxy (`vendor/webrtc-ice/PATCHES.md`; chain-verified, name mismatch tolerated for IP TURN URLs); clients bypass env proxies by default |
| `UU_REMOTE_ASSIST=0`, `UU_ASSIST_ALLOW=1`, `UU_ASSIST_UI=tty`, `UU_ASSIST_DEBUG=1` | disable assistance / allow at start / terminal UI for `assist` / include the server's short error message in assist errors |
Token has no expiry field; API code 1120 (HTTP 422) means invalid/expired → re-login. `config.json` is parsed once
@@ -168,6 +172,8 @@ for a new QR login.
| `src/assist.rs`, `c_engine/assist_window.c` | remote assistance (guest + account) and the unified GTK main window (assist + account/QR card) |
| `src/viewer_main.rs`, `src/viewer/` | experimental viewer (`--features native-viewer,viewer-sdl`): cloud join, WebRTC offer side, SDL desktop window (ffmpeg CLI decode), files/terminal/portmap/power/assist tools, device removal (`POST /api/v1/device/{id}/unbind`, verified live; shared devices use `/api/v1/device/share/{id}/unbind`, strings only), GTK launcher |
| `c_engine/viewer_window.c`, `c_engine/viewer_tools.c` | viewer GTK launcher and tool windows (files, port mapping, terminal list) |
| `src/viewer/hud.rs` | in-window chrome drawn on the SDL canvas: loading screen, control center (Ctrl+Alt+M; capture settings RPC 2 and SimpleActions 14/16/18/19 as the official viewer sends them), network-status panel (Ctrl+Alt+G); fontconfig font via ab_glyph |
| `src/viewer/thumbs.rs`, `src/viewer/host.rs` | launcher device previews (last picture, local 0600 cache); viewer sign-in keeps the local host user service running so the machine joins the account's device list |
Diagnostic subcommands: `doctor` (paste-safe report: session, selected backend, engine plugins, uinput, encoder and codec with source, sign-in/service state; booleans and names only), `set-encoder auto|cpu|vaapi|nvenc` and `set-codec auto|h264|h265` (both notify a running host with SIGUSR2; live encoder switch, negotiated codec unchanged, codec preference on the next desktop stream; illegal values exit 2), `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto; `UU_PROBE_CHROMA=444` 真彩; `UU_PROBE_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
Generated
+38 -3
View File
@@ -2,6 +2,22 @@
# It is not intended for manual editing.
version = 4
[[package]]
name = "ab_glyph"
version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser",
]
[[package]]
name = "ab_glyph_rasterizer"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
[[package]]
name = "adler2"
version = "2.0.1"
@@ -1440,6 +1456,15 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
[[package]]
name = "owned_ttf_parser"
version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
dependencies = [
"ttf-parser",
]
[[package]]
name = "p256"
version = "0.13.2"
@@ -2629,6 +2654,12 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "ttf-parser"
version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
[[package]]
name = "tungstenite"
version = "0.23.0"
@@ -2741,8 +2772,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uu-remote-linux"
version = "0.2.33"
version = "0.2.41"
dependencies = [
"ab_glyph",
"async-trait",
"base64 0.22.1",
"bytes",
@@ -2758,12 +2790,14 @@ dependencies = [
"nix 0.29.0",
"qrcode",
"rand 0.8.8",
"rcgen",
"reqwest",
"sdl2",
"serde",
"serde_json",
"sha2",
"tokio",
"tokio-rustls",
"tokio-tungstenite",
"webrtc",
"x11rb",
@@ -3008,23 +3042,24 @@ dependencies = [
[[package]]
name = "webrtc-ice"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1bbd6b3dea22cc6e961e22b012e843d8869e2ac8e76b96e54d4a25e311857ad"
dependencies = [
"arc-swap",
"async-trait",
"crc",
"log",
"rand 0.8.8",
"rustls-native-certs",
"serde",
"serde_json",
"stun",
"thiserror 1.0.69",
"tokio",
"tokio-rustls",
"turn",
"url",
"uuid",
"waitgroup",
"webpki-roots 1.0.9",
"webrtc-mdns",
"webrtc-util",
]
+10 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "uu-remote-linux"
version = "0.2.33"
version = "0.2.41"
edition = "2021"
default-run = "uuremote-server"
authors = ["uu-remote-linux contributors"]
@@ -23,7 +23,7 @@ required-features = ["native-viewer"]
default = []
native-viewer = []
viewer-ffmpeg = ["native-viewer", "dep:ffmpeg-next"]
viewer-sdl = ["native-viewer", "dep:sdl2"]
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph"]
wayland = []
# Experimental direct linear framebuffer capture; never enabled in release builds.
kms = []
@@ -59,6 +59,12 @@ ffmpeg-next = { version = "6.1", optional = true, default-features = false, feat
x11rb = { version = "0.13", features = ["damage", "shm", "allow-unsafe-code"], optional = true }
sdl2 = { version = "0.37", optional = true, features = ["use-pkgconfig"] }
ab_glyph = { version = "0.2", optional = true }
[dev-dependencies]
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
rcgen = "0.11.3"
tokio-rustls = { version = "0.26.6", default-features = false, features = ["ring", "tls12"] }
[build-dependencies]
cc = "1.0"
@@ -69,6 +75,8 @@ webrtc-srtp = { path = "vendor/webrtc-srtp" }
webrtc-dtls = { path = "vendor/webrtc-dtls" }
# Larger data-channel receive buffer (see vendor/webrtc/src/data_channel/mod.rs).
webrtc = { path = "vendor/webrtc" }
# TURN over TCP/TLS through an HTTP CONNECT proxy (vendor/webrtc-ice/PATCHES.md).
webrtc-ice = { path = "vendor/webrtc-ice" }
[[bench]]
name = "nvenc_pipeline_bench"
+38 -5
View File
@@ -21,7 +21,23 @@
<p align="center"><sub>Linux viewer: device list (device names redacted)</sub></p>
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Host main window: remote assistance and account"></p>
<p align="center"><sub>Linux host main window: remote assistance and account (device ID, code and account redacted). The UI is in Chinese, like the official app.</sub></p>
<p align="center"><sub>Linux host main window: remote assistance and account (device ID, code and account redacted). The UI is available in Chinese and English (see [Language](#language--语言)).</sub></p>
## Language / 语言
The language is picked once at start, in this order:
1. `UU_LANG=en` or `UU_LANG=zh`;
2. the choice saved in the viewer's **Settings → General → 语言 / Language**
or the host main window's 语言 / Language row; stored as `~/.config/uuremote/language`, applies after a restart);
3. the locale: `LC_ALL` / `LC_MESSAGES` / `LANG` starting with `zh` → Chinese, anything else → English.
```sh
UU_LANG=en uuremote-viewer ui
UU_LANG=zh uuremote-server
```
Protocol strings and messages that come from the UU servers are shown as the server sends them.
<!-- Screenshot placeholder: the Linux desktop controlled from the official client. Take your own
screenshot, remove account/device details and NetEase logos, save it as docs/images/remote-desktop.png
@@ -45,7 +61,7 @@
| Mouse / keyboard | Absolute and relative motion, clicks, wheel, keys; no spurious key repeat on high-latency links; optional uinput virtual devices on Wayland (layout independent, see below) |
| Mac shortcuts | **Recommended**: turn off 「使用 macOS 快捷键」 (use macOS shortcuts) in the Mac viewer's remote-window menu; then Cmd+C/V/A/F/X/Z work as on a Mac (Cmd+C/V become Ctrl+Shift+C/V in terminals) and Ctrl+C always interrupts. With the option on, the viewer sends Cmd as Ctrl: in a terminal Ctrl+V / Cmd+V paste, Ctrl+C interrupts, copy is Cmd+Shift+C (X11) |
| Pointer shape | Remote cursor shape is mirrored to the viewer (X11) |
| Clipboard | Two-way text sync |
| Clipboard | Two-way text sync; Wayland mobile IME text inputs use clipboard paste fallback (see below) |
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; on X11 a resolution choice changes the desktop resolution itself like the official Windows host (xrandr, adding the mode when missing; restored for "original" or on disconnect), `UU_DESKTOP_RESIZE=0` scales in the encoder instead; Wayland scales in the encoder |
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
| File transfer | Upload, download (including folders), create folder, rename, delete |
@@ -73,7 +89,7 @@ authorized session. Independent file/terminal tool peers do not reset input.
| Xfce | X11 | ✅ Tested in a VM | default |
| Cinnamon / MATE | X11 | ✅ Tested in a VM | default |
| Hyprland | Wayland (native wlroots protocols) | 🧪 Experimental, tested in a VM (some features limited, see below) | `--features wayland` |
| niri | Wayland (native wlroots protocols) | 🧪 Experimental; protocol support confirmed from niri sources, not yet tested on hardware (#55) | `--features wayland` |
| niri | Wayland (native wlroots protocols) | 🧪 Experimental; capture, text input and portrait switching hardware-tested; other features pending (#55) | `--features wayland` |
| GNOME / KDE Plasma | Wayland (xdg-desktop-portal) | 🧪 Experimental; validation scope and limits below | `--features wayland,portal` |
The GNOME Wayland Portal/EIS path has been checked for video and mouse/keyboard input on Ubuntu 26.04, GNOME 50, with one 4K screen at 200% scale; auto unlock after a cold locked connection is verified with the official Mac and iPhone 4.42.0 viewers, while other lock recovery and reconnection still need hardware acceptance testing. Apart from that path and GNOME on X11, desktop testing has primarily used virtual machines. If something goes wrong on
@@ -84,6 +100,10 @@ plugins, permissions and encoders only, no account data, tokens or addresses) an
Wayland limits: captures one screen by default; Hyprland can enable monitor switching as described below. Resolution is fixed. The native Hyprland backend now pipelines two shm screencopy buffers and passes the viewer's requested fps to both capture pacing and the encoder. Actual fps remains limited by the compositor, rendering and readback (the old serial path measured about 16–22 fps at 2560x1600; the pipeline is VM-measured only, not a hardware guarantee). The portal backend does not support dynamic resolution; see below for GNOME wake and lock recovery; the clipboard syncs while the viewer's remote window has focus. On the first connection the desktop asks for "Remote Desktop / Screen Sharing"
permission; the permission is remembered once granted.
**Touch from mobile viewers (GNOME)**: in touch mode the Android/iOS viewers send a finger as a left-button drag, which on a desktop selects text. On the portal backend the host decides per press: a finger that moves more than a few pixels within 0.45 s scrolls smoothly (`NotifyPointerAxis`; the content follows the finger, also in terminals, and the last event lets clients coast), one held still selects like a mouse drag, and a short press clicks. This needs no touchscreen consent. `UU_TOUCH_INPUT=touch` instead replays drags as one finger on the portal touchscreen, which the host requests where the portal offers it; a consent saved before touch support restores keyboard and pointer only, so the first drag then asks the host once more in the background (the GNOME share dialog, which the phone also sees; it closes after the consent timeout), and an approval for the same monitor switches to touch without reconnecting. The saved consent is never removed beforehand, and the host asks at most once per run. `UU_TOUCH_INPUT=0` keeps mouse drags.
**Mobile IME typing and clipboard on Wayland**: Mobile IME text (`text_input`) on Wayland is typed through spare keycodes on wlroots compositors. On GNOME (Portal) printable ASCII is typed as keysyms when the active input source is a Latin xkb layout (Mutter picks the key and Shift level); other text, KDE and compositors where keycodes are exhausted fall back to "system clipboard write + `Shift+Insert` (or `UU_WAYLAND_PASTE_KEY=ctrl_v`)". VTE terminals paste the PRIMARY selection on `Shift+Insert`, which is why ASCII is typed instead. **Note**: This fallback replaces the host's existing clipboard contents and may echo back to the viewer's clipboard via two-way sync; set `UU_WAYLAND_TEXT=0` to completely disable Wayland mobile text input and clipboard paste fallback.
Scaled GNOME desktops using native Portal input use EIS on the same authorized session when `ConnectToEIS` and a screen `mapping_id` are available. Each axis is mapped using the matched region and actual frame dimensions, with no fixed resolution or scale factor. This avoids scaled-coordinate rejection by `NotifyPointerMotionAbsolute`. Portal builds require libei >= 1.1. Missing EIS support retains the legacy input path and its existing scaling limitations; other initialization failures are reported and trigger session recovery. After a successful EIS connection, all input uses EIS. Capture alone and uinput do not initialize EIS; missing optional logical dimensions do not block capture. Keyboard input uses the existing Windows VK to evdev mapping. Recovery keeps the encoder frame dimensions fixed but accepts logical-size changes after scaling. On GNOME, a display-change notification enables earlier recovery when previously streaming Portal capture remains paused without a valid format for a 200 ms grace after both conditions are present. Healthy renegotiation cancels the early check; repeated notifications do not postpone the same interruption. The five-second fallback remains without a related notification. Static video and valid-format pauses do not trigger recovery. Tested while connected on Ubuntu 26.04, GNOME Wayland, one 3840x2160 display: 200% -> 166.67% -> 200%, with continuously updating video and full-screen pointer control after recovery. Switching briefly freezes and goes black before recovering; five seconds is the fallback threshold, not total recovery time. See [#35](../../pull/35) for timing measurements and validation limits. Lock recovery still needs hardware acceptance testing; multi-monitor support, live resolution changes, and rotation/reflection transforms are outside this fix's scope. Capture settings remain at protocol version 4: advertised resolutions use pixel coordinates and DPR 1; Portal logical dimensions are used only for local input mapping.
GNOME Portal CONTROL no longer waits for a consent dialog or the first video frame. It announces the selected desktop before reporting secure-desktop state and receiving the official viewer's “auto unlock host” request. The official Android viewer requires this desktop selection before entering its auto-unlock flow, so the notification must precede capture readiness; actual screen dimensions, codec information and capture permissions still follow their real readiness state. Enable auto unlock in the viewer and use the current Linux user's login password. The host verifies it with PAM, unlocks the existing GNOME session, requests display wake, and restores capture, input and clipboard through the shared Portal session. Initial consent or revoked permissions still require local approval. Reconnect if physical or logical dimensions change.
@@ -114,11 +134,13 @@ X11 sessions send all monitors as one combined picture by default. With `UU_X11_
Switching reuses one video track and pauses input until the new source sends a frame. Capture/encoder failure or a first-frame timeout requests restoration of the previous source. The inventory uses `hyprctl` and supports unrotated outputs; restart the host after monitor hotplug or layout changes. Phone-side switching and clicks were tested on Omarchy / Hyprland with 2560×1440 at 125% and 1920×1080 at 133.33%.
On niri, `niri msg --json outputs` enumerates enabled monitors. Normal and 90/180/270-degree capture and pointer transforms are enabled only with `NIRI_SOCKET`; reflected transforms are excluded. Three-output switching, 90-degree portrait capture/click alignment, and mobile Chinese input into Codex were hardware-tested on CachyOS + niri. Other compositors retain their existing text path and reject rotated outputs. Restart after layout changes. The temporary printable-key text keyboard is niri-only; the Hyprland fast path and pristine-keymap restoration are unchanged.
## Not implemented / not supported
| Feature | Status |
|---|---|
| Switching between multiple monitors | Experimental on native Hyprland Wayland and on X11 (`UU_X11_MULTISCREEN=1`); see above |
| Switching between multiple monitors | Experimental on native niri / Hyprland Wayland and on X11 (`UU_X11_MULTISCREEN=1`); see above |
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
| HDR | Not implemented |
| Super screen / virtual display | Not implemented |
@@ -210,6 +232,10 @@ Run inside your graphical session:
Scan the code with the **NetEase UU Remote mobile app** and confirm. Credentials are stored only on this
machine, in `~/.config/uuremote/config.json` (mode 0600).
A failed status query or the 60-second request timeout does not prove that the QR expired or that the phone confirmed login. The official-client refresh policy is unchanged: after a query error, click Refresh QR (Enter in a terminal; refresh after 60 seconds with neither a window nor a terminal). QR request diagnostics contain only the request phase, error category, elapsed time, HTTP/API status and last known scan state—not tickets, URLs or response content. A `connect` category alone does not identify a DNS, TLS or proxy cause.
The same file holds this machine's device identity (`device_id`, `client_id`, `system_id`), which reinstalls and new QR logins keep. **Do not copy `config.json` between machines or clone a second host from a snapshot/disk that includes the home directory**: two host instances with one identity, on the same or different machines, kick each other out of the room. The log then shows `Cloud room leave without peer identifier` every few seconds with reconnects, and viewers disconnect right after connecting. On a cloned or copied machine, stop the service, remove those three keys plus `token`, `csrf` and `user_id`, and run `uuremote-server login` to register a new device. A leftover instance on the same machine (for example an old `~/.local/bin/uuremote-server` started by hand) has the same effect; `uuremote-server doctor` warns when more than one host instance is running.
### 4. Run as a user service
`~/.config/systemd/user/uuremote-native.service`:
@@ -356,7 +382,12 @@ Common environment variables:
| `UU_LOGIN_WINDOW=0` | Do not open the login window automatically when credentials are missing |
| `UU_PORT_MAPPING=0` | Disable port mapping (the official host's controlled-side switch) |
| `UU_WOL_HELPER=1` | Experimental: act as a remote-boot helper like the official Windows host — report this host's LAN info after sign-in and send a magic packet to the LAN when the cloud asks to wake a PC (not verified end to end) |
| `UU_USE_PROXY=1` | Honor HTTP/SOCKS proxy environment variables; by default proxies are ignored and NetEase servers are reached directly |
| `UU_USE_PROXY=1` | Share environment HTTP/HTTPS proxy policy between REST and host/viewer WebSocket signaling; proxies are ignored by default |
`UU_USE_PROXY=1` uses only proxy settings already available to the current process. `HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY` (and lowercase forms) and `NO_PROXY` follow reqwest's standard selection, with uppercase taking precedence. Signaling rejects invalid/unsupported values in the selected variables (HTTP/HTTPS only, not SOCKS), proxy URLs with paths/queries/fragments, and CGI environments that would ignore proxies; this validation is intentionally stricter than silently ignoring bad values. No matching proxy or a `NO_PROXY` match still means direct access; a selected proxy failing does not trigger direct fallback. Certificate verification remains enabled and redirects are not followed, so room authentication is not forwarded to a redirect target.
With it the host also reaches the cloud TURN relays over TCP/TLS (CONNECT through the unauthenticated `http://` proxy in `HTTPS_PROXY`/`ALL_PROXY`, or directly without one), for hosts whose UDP cannot reach the TURN servers but whose TCP/proxy can. TURN certificates are chain-verified; a name mismatch is tolerated only when the cloud-supplied TURN address is an IP (media itself is end-to-end DTLS-SRTP). Without the setting only UDP relays are used, as before. **This creates no new network access**: login, signaling and media each still need an allowed network path. Connector errors expose only fixed categories/HTTP status; do not enable dependency TRACE logs that may record URLs or authentication information.
Host settings such as "lock after remote session" and "mute host" are stored in
`~/.config/uuremote/host_settings.json`. The same file stores `video_encoder`
@@ -589,6 +620,8 @@ GNOME-to-official-Mac bidirectional clipboard synchronization is still unverifie
- Desktop offers H.264 / H.265; the host chooses the codec. `UU_VIEWER_CODEC=h264` limits both SDP and decoder capabilities to H.264.
The default request stays 4:2:0; `UU_VIEWER_CHROMA=444` requests true color (4:4:4) after CONTROL opens. The host may fall back to
4:2:0, as reported by CaptureSettingSync. FFmpeg converts either chroma format to RGB24 for display.
- Frames are decoded at the host's native resolution and scaled to the window with linear filtering; a host resolution
change restarts the decoder. `UU_VIEWER_SIZE=WxH` forces a fixed letterboxed canvas instead.
Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without
automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target
+37 -6
View File
@@ -19,6 +19,21 @@
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Linux 主机主窗口:远程协助与账号"></p>
<p align="center"><sub>Linux 被控端主窗口:远程协助与账号(设备 ID、验证码和账号已打码)</sub></p>
## 语言 / Language
启动时按以下顺序确定界面语言:
1. `UU_LANG=zh` 或 `UU_LANG=en`;
2. 控制端 **设置 → 常规 → 语言 / Language** 或主机主窗口底部「语言 / Language」中保存的选择(保存在 `~/.config/uuremote/language`,重启后生效);
3. 系统区域设置:`LC_ALL` / `LC_MESSAGES` / `LANG` 以 `zh` 开头为中文,其余为英文。
```sh
UU_LANG=zh uuremote-viewer ui
UU_LANG=en uuremote-server
```
协议字段以及 UU 服务器返回的提示按服务器原文显示。
<!-- 截图占位:在官方客户端里远控 Linux 桌面的效果图。请自行截图并去掉账号、设备名等信息后放到
docs/images/remote-desktop.png,再取消下面这行的注释。注意不要截入网易的图标和品牌素材。 -->
<!-- <p align="center"><img src="docs/images/remote-desktop.png" width="720" alt="用官方 Mac 客户端远控 Linux 桌面"></p> -->
@@ -39,7 +54,7 @@
| 鼠标 / 键盘 | 绝对/相对移动、点击、滚轮、按键;修复了网络延迟导致的按键连发;Wayland 下可用 uinput 虚拟键鼠(不依赖键盘布局,见下文) |
| Mac 快捷键 | **推荐**:在 Mac 远控窗口菜单里关闭「使用 macOS 快捷键」,之后和在 Mac 上一样:Cmd+C/V/A/F/X/Z 是复制、粘贴、全选、查找、剪切、撤销(终端里 Cmd+C/V 自动变成 Ctrl+Shift+C/V),Ctrl+C 在终端里始终是中断。保持开启时,客户端会把 Cmd 和 Ctrl 都当成 Ctrl 发送:终端里 Ctrl+V / Cmd+V 自动转成粘贴,Ctrl+C 是中断,复制用 Cmd+Shift+C(X11) |
| 鼠标指针样式 | 远端指针形状实时同步(X11) |
| 剪贴板 | 双向文本同步 |
| 剪贴板 | 双向文本同步;Wayland 手机输入法输入通过剪贴板兜底粘贴,见下文 |
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;X11 下切换分辨率会像官方 Windows 被控端一样真正修改桌面分辨率(xrandr,缺少该模式时自动添加;选「原始」或断开后恢复),`UU_DESKTOP_RESIZE=0` 改为仅由编码器缩放;Wayland 仍由编码器缩放 |
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
@@ -65,7 +80,7 @@ Portal 仅作用于本服务获授权的会话。文件传输、终端等独立
| Xfce | X11 | ✅ 虚拟机测试通过 | 默认 |
| Cinnamon / MATE | X11 | ✅ 虚拟机测试通过 | 默认 |
| Hyprland | Wayland(wlroots 原生协议) | 🧪 实验性,虚拟机测试(部分功能受限,见下) | `--features wayland` |
| niri | Wayland(wlroots 原生协议) | 🧪 实验性,协议支持已按 niri 源码确认,尚未实机验收(#55) | `--features wayland` |
| niri | Wayland(wlroots 原生协议) | 🧪 实验性,采集、文字输入及竖屏切换已实机验收,其余待验证(#55) | `--features wayland` |
| GNOME / KDE Plasma | Wayland(xdg-desktop-portal) | 🧪 实验性,验证范围与限制见下 | `--features wayland,portal` |
最后一列是源码编译方式;Release 预编译包已包含全部后端,直接使用即可(见[安装](#0-直接用-release-预编译包推荐x86_64))。
@@ -75,6 +90,10 @@ GNOME Wayland 的 Portal/EIS 路径已在 Ubuntu 26.04、GNOME 50、单屏 4K/20
Wayland 下的限制:默认采集单屏,Hyprland 可按上文启用切屏;分辨率固定;Hyprland 原生后端默认使用双缓冲流水线 shm screencopy,控制端帧率设置会同步到采集节拍和编码器,但实际帧率仍受合成器、渲染和读回速度限制(旧串行路径在 2560x1600 曾测得约 16~22 帧;流水线只在虚拟机里测量过,不代表实机保证);portal 后端暂不支持动态分辨率;GNOME 的屏幕唤醒与锁屏恢复见下;剪贴板只在控制端的远控窗口处于前台时同步。
**手机控制端触控(GNOME)**:Android/iOS 控制端在触控模式下把手指当作左键拖动发送,在桌面上会选中文字。Portal 后端下被控端按每次按下判断:0.45 秒内移动超过几个像素即平滑滚动(`NotifyPointerAxis`,内容跟随手指,终端里同样有效,最后一个事件让客户端可以惯性滑动);按住不动则像鼠标拖动一样选中;短按为点击。此模式无需触摸屏授权。`UU_TOUCH_INPUT=touch` 改为把拖动按单指触控在 Portal 触摸屏上重放,门户提供触摸屏设备类型时被控端会一并申请;此前保存的授权只恢复键盘和指针,因此第一次拖动时会在后台再申请一次(GNOME 共享对话框,手机画面中也能看到,授权超时后自动关闭),同意同一显示器后无需重连即切换为触控。不会预先删除已保存的授权,每次运行最多申请一次。`UU_TOUCH_INPUT=0` 保持鼠标拖动。
**Wayland 手机输入法打字与剪贴板**:Wayland 下手机端输入法提交的文字(`text_input`)优先通过虚拟键盘空闲键码上屏;GNOME(Portal)下,当前输入源为拉丁 xkb 布局时,可打印 ASCII 直接以 keysym 输入(由 Mutter 选择按键和 Shift 层级);其他文字、KDE 以及键码耗尽的环境自动通过「写系统剪贴板 + 触发 `Shift+Insert`(或 `UU_WAYLAND_PASTE_KEY=ctrl_v`)」兜底粘贴。VTE 终端的 `Shift+Insert` 粘贴的是 PRIMARY 选区,因此 ASCII 改为直接输入。**注意**:此兜底过程会覆盖被控端原有的剪贴板内容,且会被双向同步回传到控制端剪贴板;设置 `UU_WAYLAND_TEXT=0` 可完全关闭 Wayland 文字输入及该粘贴兜底。
GNOME 缩放桌面在使用 Portal 原生键鼠时,若支持 `ConnectToEIS` 和屏幕 `mapping_id`,通过同一授权会话的 EIS 接口注入输入,按匹配的区域与实际帧尺寸分别映射横纵坐标,没有固定分辨率或缩放倍率,可避免 `NotifyPointerMotionAbsolute` 在缩放时拒绝坐标。Portal 构建需要 libei ≥ 1.1。缺少 EIS 支持时保留旧输入路径及其既有缩放限制;其他初始化错误会明确报告并触发会话恢复。EIS 连接成功后全部输入统一使用 EIS。只采集画面或使用 uinput 时不会初始化 EIS;缺少可选的逻辑尺寸也不阻断采集。键盘沿用项目现有的 Windows VK → evdev 映射。恢复时保持编码器的采集帧尺寸不变,允许缩放后的逻辑尺寸变化。GNOME 显示配置变化后,已推流的 Portal 采集若持续「暂停且无有效格式」,会在关联通知后的 200 毫秒宽限结束后提前进入现有恢复流程;正常重协商恢复会取消提前判定,连续通知不会推迟同次异常的判定。未收到相关通知时保留五秒兜底;静态画面或有效格式下的暂停不会触发恢复。Ubuntu 26.04、GNOME Wayland 单屏 3840×2160 已实测保持连接切换 200%→166.67%→200%,恢复后画面持续更新且鼠标可控制全屏;切换期间会短暂停顿、黑屏后恢复,五秒是兜底判定阈值,并非总恢复时间。提前恢复的测量结果和验证范围见 [#35](../../pull/35)。此路径仍需实机验证锁屏恢复;多屏、连接中改变分辨率及旋转/镜像变换不属于本次修复范围。 捕获设置协议仍为版本 4:对客户端上报的分辨率统一使用像素坐标、DPR 为 1;Portal 逻辑尺寸仅用于本地输入映射。
GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通知客户端当前选择桌面,再上报锁屏状态、接收官方客户端的「自动解锁被控端」请求。官方 Android 客户端需要桌面目标通知才会进入自动解锁流程,因此该通知不能等待采集就绪;真实屏幕尺寸、编码信息及采集权限仍按实际就绪状态上报。请在客户端启用自动解锁,使用当前 Linux 用户的登录密码;主机通过 PAM 验证后解锁当前 GNOME 会话、请求点亮屏幕,并恢复同一 Portal 会话中的画面、键鼠和剪贴板。首次授权或权限被撤销时仍需本机确认。物理或逻辑分辨率变化后需要重连。
@@ -98,13 +117,15 @@ GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通
X11 会话默认把所有显示器拼成一张画面。设置 `UU_X11_MULTISCREEN=1` 后,主机按 `xrandr --listmonitors` 列出各个显示器,控制端可选择其中一块,只采集该区域,绝对鼠标坐标加上该屏幕在桌面中的偏移;默认屏幕为主显示器,`UU_X11_OUTPUT` 可指定其他屏幕(如 `HDMI-1`)。显示器布局在主机启动时读取,改动后需重启服务。此模式下控制端的「分辨率」改为缩放画面,不再修改显示模式。实验性:目前只有单元测试与 Xvfb 虚拟显示器实测,尚未经官方客户端实机验收。
切屏复用同一条视频轨道,过渡期间暂停输入,发送新屏首帧后恢复;采集或编码失败、等待首帧超时会请求恢复原屏。当前通过 `hyprctl` 枚举未旋转的显示器,显示器插拔或布局变化后需重启服务。已在 Omarchy / Hyprland 上用官方手机客户端实测 2560×1440(125%)与 1920×1080(133.33%)双屏切换及点击。
切屏复用同一条视频轨道,过渡期间暂停输入,发送新屏首帧后恢复;采集或编码失败、等待首帧超时会请求恢复原屏。Hyprland 通过 `hyprctl` 枚举未旋转的显示器,显示器插拔或布局变化后需重启服务。已在 Omarchy / Hyprland 上用官方手机客户端实测 2560×1440(125%)与 1920×1080(133.33%)双屏切换及点击。
niri 会话通过 `niri msg --json outputs` 枚举已启用的显示器。普通及 90°/180°/270° 旋转输出仅在 `NIRI_SOCKET` 存在时启用;镜像变换暂不支持。三屏切换、90° 竖屏画面与点击,以及手机向 Codex 输入中文已在 CachyOS + niri 实测。其他合成器继续拒绝旋转输出,保留原有文本输入路径。显示器布局变化后需重启服务。
## 尚未实现 / 不支持
| 功能 | 状态 |
|---|---|
| 多显示器切换 | Hyprland 原生 Wayland 后端与 X11(`UU_X11_MULTISCREEN=1`)实验性支持,见上文 |
| 多显示器切换 | niri / Hyprland 原生 Wayland 后端与 X11(`UU_X11_MULTISCREEN=1`)实验性支持,见上文 |
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
| HDR | 未实现 |
| 超级屏 / 虚拟显示器 | 未实现 |
@@ -193,6 +214,10 @@ cargo build --release --features wayland,portal # + GNOME/KDE Wayland
用手机上的 **网易 UU 远程 App** 扫码并确认即可。登录信息只保存在本机的
`~/.config/uuremote/config.json`(权限 0600)里。
登录状态查询失败或达到 60 秒请求超时不代表二维码已过期,也不代表手机已经确认。程序保留官方客户端的刷新策略:查询出错后点击「刷新二维码」(终端按回车;无窗口且无终端时 60 秒后刷新)。二维码请求诊断只包含请求阶段、错误类别、耗时、HTTP/API 状态及最后已知扫码状态,不输出票据、URL 或响应内容;`connect` 类别本身不能确定是 DNS、TLS 还是代理问题。
这个文件里还有本机的设备身份(`device_id`、`client_id`、`system_id`),重装软件和重新扫码登录都会沿用它。**不要在机器之间拷贝 `config.json`,也不要从带着家目录的快照/数据盘克隆出第二台主机**:同一身份的两个主机实例(不论在同一台还是不同机器上)会互相把对方踢出房间,日志表现为每隔几秒出现 `Cloud room leave without peer identifier` 并反复重连,控制端一连就断。克隆或拷贝出来的机器先停掉服务,删掉配置里这三个键和 `token`、`csrf`、`user_id`,再运行 `uuremote-server login` 注册为新设备。同一台机器上残留的旧实例(例如以前手动启动的 `~/.local/bin/uuremote-server`)也会这样,`uuremote-server doctor` 发现多个主机实例时会提示。
### 4. 作为用户服务常驻
`~/.config/systemd/user/uuremote-native.service`:
@@ -307,7 +332,7 @@ systemctl --user restart uuremote-native.service
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
| `UU_DESKTOP_RESIZE=0` | X11 下控制端切换分辨率时不改桌面分辨率,只缩放编码画面 |
| `UU_NVENC_RGB=0` / `=1` | NVENC 直接编码 BGRA(省 CPU)。显示器接在 NVIDIA 卡上时默认关闭(同卡合成时直吃反而更慢),`0` 强制关,`1` 强制开 |
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland / niri 物理显示器切换(默认关闭) |
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
| `UU_X11_MULTISCREEN=1` | X11 下按显示器分别选择和采集(实验性,默认关闭,需要 `xrandr`) |
| `UU_X11_OUTPUT` | X11 默认采集的显示器名称(`xrandr --listmonitors`),默认主显示器 |
@@ -324,7 +349,12 @@ systemctl --user restart uuremote-native.service
| `UU_ASSIST_ALLOW=1` | 启动时就允许他人远程协助(覆盖窗口里保存的开关状态) |
| `UU_PORT_MAPPING=0` | 关闭端口映射(对应官方被控端的开关) |
| `UU_WOL_HELPER=1` | 实验性:让这台主机像官方 Windows 被控端一样充当「远程开机」辅助设备——登录后向网易上报本机局域网信息,收到云端唤醒请求时向同一局域网发送唤醒包(未经端到端验证) |
| `UU_USE_PROXY=1` | 使用环境变量里的 HTTP/SOCKS 代理;默认忽略代理、直连网易服务器 |
| `UU_USE_PROXY=1` | REST API 与 host/viewer WebSocket 信令共用环境 HTTP/HTTPS 代理策略;默认忽略代理、直连 |
`UU_USE_PROXY=1` 仅使用当前进程已有的代理配置;`HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY`(及小写形式)和 `NO_PROXY` 按 reqwest 的标准规则选择,大写优先。信令拒绝选定变量中的无效/不支持的代理 URL(仅 HTTP/HTTPS;不支持 SOCKS)、带路径/查询/片段的代理 URL,以及会忽略代理的 CGI 环境;此校验比 reqwest 默默忽略坏值更严格。未配置匹配代理或命中 `NO_PROXY` 时仍正常直连,选中代理后连接失败不会改为直连。信令保留 TLS 证书校验,不跟随重定向,也不转发认证头到重定向目标。
开启后主机还会经 TCP/TLS 连接云端 TURN 中继(使用 `HTTPS_PROXY`/`ALL_PROXY` 里的无认证 `http://` 代理做 CONNECT,没有代理则直连),适用于 UDP 到不了 TURN 服务器、只有 TCP/代理能出网的主机;TURN 证书按 CA 链校验,云端下发的 TURN 地址是 IP 时容忍名称不匹配(媒体本身由 DTLS-SRTP 端到端加密)。默认(不开代理)只用 UDP 中继,行为不变。**这不创建任何新的网络出口**:登录、信令和媒体仍需各自有允许使用的网络路径。连接器只返回固定错误类别/HTTP 状态;不要为诊断开启会记录 URL/认证信息的依赖库 TRACE 日志。
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。同一文件里的 `video_encoder`(`auto`/`cpu`/`vaapi`/`nvenc`)和 `video_codec`(`auto`/`h264`/`h265`)用 `uuremote-server set-encoder`、`uuremote-server set-codec` 写入(非法参数退出码 2)。非 `auto` 的值优先于 `UU_VIDEO_ENCODER` / `UU_VIDEO_CODEC`;`auto` 或留空则落到环境变量,再落到 auto(有 NVIDIA 时 NVENC 优先,失败再 CPU;没有 NVIDIA 时就是 CPU,不探测;codec 仍是硬件优先 H.265、CPU 用 H.264)。探测在启动时后台进行,不挡住第一路出图。成功结果缓存到进程退出,但 NVIDIA 是否存在(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)与报告不一致时,下一次桌面连接会在后台再探测一次(`warm_auto_probe`),这一路仍用缓存的编码器,直到新结果写入。NVENC 失败只缓存 10 分钟,到期后的桌面连接同样在后台再探测一次,这一路仍用当前结果。`set-encoder` 和 `set-codec` 写完后若 `host.pid` 指向正在运行的本程序,都会发 `SIGUSR2`:编码器变化时进行中的桌面流立刻换编码器(不断开,沿用本会话已协商的 codec;新编码器起不来时按进程内 → FFmpeg 进程 → CPU 回退)。手改文件后可 `kill -USR2 $(cat ~/.config/uuremote/host.pid)`。`SIGUSR2` 不重新探测。codec 偏好仍在下次建立桌面连接时生效(运行中的 host 只记日志,不重开编码)。显式 `vaapi` 请求真彩时仍用 VAAPI、编码 4:2:0,并在 CaptureSettingSync 的 field 3 回报 4:2:0。所选编码器在本机不可用时,建流回退 CPU 并记 warning。VAAPI 进入 auto 要等 #33。
@@ -514,6 +544,7 @@ GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不
- 桌面同时提供 H.264 / H.265,由主机协商选择;`UU_VIEWER_CODEC=h264` 将 SDP 和解码能力限制为 H.264。
默认请求 4:2:0;`UU_VIEWER_CHROMA=444` 在 CONTROL 打开后请求真彩(4:4:4)。主机可能回落到 4:2:0,
以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。
- 按被控端原始分辨率解码,窗口缩放使用线性过滤;被控端分辨率变化时自动重启解码器。`UU_VIEWER_SIZE=WxH` 可改为固定的留黑边画布。
Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command;
控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac),
+1
View File
@@ -1,4 +1,5 @@
fn main() {
println!("cargo:rerun-if-changed=c_engine/wayland_transform.h");
println!("cargo:rerun-if-changed=c_engine/portal_clipboard.inc");
println!("cargo:rerun-if-changed=c_engine/x11_engine.c");
println!("cargo:rerun-if-changed=c_engine/nvenc_engine.c");
+71 -55
View File
@@ -8,6 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <dlfcn.h>
#include "i18n.h"
static void on_language(GtkComboBox *c, gpointer note);
static const char *CSS =
"window { background-color: #f5f6f8; }\n"
@@ -96,9 +98,9 @@ static void on_custom_changed(GtkEditable *e, gpointer ok) {
// Returns 1 when a new custom code was entered and posted.
static int ask_custom_code(void) {
GtkWidget *d = gtk_dialog_new_with_buttons("设置自定义验证码", GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
"取消", GTK_RESPONSE_CANCEL, NULL);
GtkWidget *ok = gtk_dialog_add_button(GTK_DIALOG(d), "确定", GTK_RESPONSE_OK);
GtkWidget *d = gtk_dialog_new_with_buttons(L("设置自定义验证码", "Set custom code"), GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
L("取消", "Cancel"), GTK_RESPONSE_CANCEL, NULL);
GtkWidget *ok = gtk_dialog_add_button(GTK_DIALOG(d), L("确定", "OK"), GTK_RESPONSE_OK);
gtk_widget_set_sensitive(ok, FALSE);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(d));
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
@@ -106,10 +108,10 @@ static int ask_custom_code(void) {
GtkWidget *entry = gtk_entry_new();
gtk_entry_set_max_length(GTK_ENTRY(entry), 16);
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
gtk_entry_set_placeholder_text(GTK_ENTRY(entry), "请输入自定义验证码");
gtk_entry_set_placeholder_text(GTK_ENTRY(entry), L("请输入自定义验证码", "Enter custom code"));
g_signal_connect(entry, "changed", G_CALLBACK(on_custom_changed), ok);
gtk_box_pack_start(GTK_BOX(area), entry, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(area), label("8-16 位,需同时包含字母和数字;不会自动刷新,请妥善保管", "note"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(area), label(L("8-16 位,需同时包含字母和数字;不会自动刷新,请妥善保管", "8-16 characters with both letters and digits; never refreshed automatically, keep it safe"), "note"), FALSE, FALSE, 0);
gtk_widget_show_all(d);
int done = 0;
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
@@ -140,12 +142,12 @@ static void on_refresh_item(GtkCheckMenuItem *item, gpointer data) {
}
static void on_refresh_now(GtkMenuItem *i, gpointer d) { (void)i; (void)d; post(CMD_RESET); }
static const char *REFRESH_NOTES[5] = { "每次远控结束刷新", "每小时自动刷新", "每 12 小时自动刷新", "每 24 小时自动刷新", "不自动刷新" };
static const char *refresh_note(int i) { const char *notes[5] = { L("每次远控结束刷新", "Refreshed after every remote session"), L("每小时自动刷新", "Refreshed every hour"), L("每 12 小时自动刷新", "Refreshed every 12 hours"), L("每 24 小时自动刷新", "Refreshed every 24 hours"), L("不自动刷新", "Never refreshed automatically") }; return notes[i >= 0 && i < 5 ? i : 0]; }
static void render_code(void) {
if (!code_label) return;
gtk_label_set_text(GTK_LABEL(code_label), current_code[0] ? (code_visible ? current_code : "********") : "--------");
gtk_button_set_label(GTK_BUTTON(eye_button), code_visible ? "隐藏" : "显示");
gtk_button_set_label(GTK_BUTTON(eye_button), code_visible ? L("隐藏", "Hide") : L("显示", "Show"));
}
static void copy_text(const char *text, const char *hint) {
@@ -159,19 +161,19 @@ static void on_copy_id(GtkButton *b, gpointer d) {
char digits[64]; size_t n = 0;
for (const char *p = current_id; *p && n + 1 < sizeof digits; p++) if (*p != ' ') digits[n++] = *p;
digits[n] = 0;
copy_text(digits, "已复制设备 ID");
copy_text(digits, L("已复制设备 ID", "Device ID copied"));
}
static void on_copy_code(GtkButton *b, gpointer d) { (void)b; (void)d; copy_text(current_code, "已复制验证码,请只发给信任的人"); }
static void on_copy_code(GtkButton *b, gpointer d) { (void)b; (void)d; copy_text(current_code, L("已复制验证码,请只发给信任的人", "Code copied. Only share it with people you trust")); }
static void on_eye(GtkButton *b, gpointer d) { (void)b; (void)d; code_visible = !code_visible; render_code(); }
static void on_share(GtkButton *b, gpointer d) {
(void)b; (void)d;
if (!current_id[0] || !current_code[0]) return;
char *text = g_strdup_printf("UU 远程协助\n设备 ID:%s\n验证码:%s", current_id, current_code);
char *text = g_strdup_printf(L("UU 远程协助\n设备 ID:%s\n验证码:%s", "UU Remote assistance\nDevice ID: %s\nCode: %s"), current_id, current_code);
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), text, -1);
g_free(text);
gtk_label_set_text(GTK_LABEL(hint_label), "已复制设备 ID 和验证码,请只发给信任的人");
gtk_label_set_text(GTK_LABEL(hint_label), L("已复制设备 ID 和验证码,请只发给信任的人", "Device ID and code copied. Only share them with people you trust"));
}
static gboolean on_switch(GtkSwitch *s, gboolean state, gpointer d) {
@@ -213,10 +215,10 @@ static gboolean draw_avatar(GtkWidget *w, cairo_t *cr, gpointer d) {
static void on_logout(GtkButton *b, gpointer d) {
(void)b; (void)d;
GtkWidget *dlg = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
"退出登录后,本机将从你的设备列表中下线,远程协助会改用访客身份。确定退出吗?");
L("退出登录后,本机将从你的设备列表中下线,远程协助会改用访客身份。确定退出吗?", "After signing out this computer leaves your device list and assistance switches to guest mode. Sign out?"));
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
post(CMD_LOGOUT);
gtk_label_set_text(GTK_LABEL(user_label), "正在退出登录…");
gtk_label_set_text(GTK_LABEL(user_label), L("正在退出登录…", "Signing out…"));
}
gtk_widget_destroy(dlg);
}
@@ -226,7 +228,7 @@ static GtkWidget *build_account_card(void) {
gtk_style_context_add_class(gtk_widget_get_style_context(card), "card");
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(header), 20);
gtk_box_pack_start(GTK_BOX(header), label("账号", "heading"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(header), label(L("账号", "Account"), "heading"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(card), header, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(card), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
account_stack = gtk_stack_new();
@@ -243,21 +245,21 @@ static GtkWidget *build_account_card(void) {
GtkWidget *spinner = gtk_spinner_new();
gtk_spinner_start(GTK_SPINNER(spinner));
gtk_box_pack_start(GTK_BOX(loading), spinner, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(loading), label("正在获取二维码…", "note"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(loading), label(L("正在获取二维码…", "Loading QR code…"), "note"), FALSE, FALSE, 0);
gtk_stack_add_named(GTK_STACK(qr_stack), loading, "loading");
qr_image = gtk_image_new();
gtk_stack_add_named(GTK_STACK(qr_stack), qr_image, "qr");
gtk_box_pack_start(GTK_BOX(qr_page), qr_stack, FALSE, FALSE, 0);
GtkWidget *qr_text = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_set_valign(qr_text, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(qr_text), label("扫码登录", "heading"), FALSE, FALSE, 0);
GtkWidget *cap = label("请使用网易 UU 远程 App 扫一扫登录。\n登录后本机会出现在你的设备列表中,可直接远程控制;\n远程协助在登录前后都可以使用。", "hint");
gtk_box_pack_start(GTK_BOX(qr_text), label(L("扫码登录", "Scan to sign in"), "heading"), FALSE, FALSE, 0);
GtkWidget *cap = label(L("请使用网易 UU 远程 App 扫一扫登录。\n登录后本机会出现在你的设备列表中,可直接远程控制;\n远程协助在登录前后都可以使用。", "Scan with the NetEase UU Remote app to sign in.\nAfter sign-in this computer appears in your device list and can be controlled directly;\nremote assistance works whether you are signed in or not."), "hint");
gtk_label_set_xalign(GTK_LABEL(cap), 0);
gtk_box_pack_start(GTK_BOX(qr_text), cap, FALSE, FALSE, 0);
login_status = label("", "status");
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
qr_refresh = gtk_button_new_with_label("刷新二维码");
qr_refresh = gtk_button_new_with_label(L("刷新二维码", "Refresh QR code"));
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
gtk_widget_set_no_show_all(qr_refresh, TRUE);
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
@@ -277,9 +279,9 @@ static GtkWidget *build_account_card(void) {
gtk_widget_set_valign(user_text, GTK_ALIGN_CENTER);
user_label = label("", "user");
gtk_box_pack_start(GTK_BOX(user_text), user_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(user_text), label("已登录 · 本机已出现在你的设备列表中", "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(user_text), label(L("已登录 · 本机已出现在你的设备列表中", "Signed in · this computer is in your device list"), "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(user_page), user_text, TRUE, TRUE, 0);
GtkWidget *logout = gtk_button_new_with_label("退出登录");
GtkWidget *logout = gtk_button_new_with_label(L("退出登录", "Sign out"));
gtk_style_context_add_class(gtk_widget_get_style_context(logout), "share");
gtk_widget_set_valign(logout, GTK_ALIGN_CENTER);
g_signal_connect(logout, "clicked", G_CALLBACK(on_logout), NULL);
@@ -299,8 +301,8 @@ static void on_tray_allow(GtkCheckMenuItem *i, gpointer d) {
static void on_tray_quit(GtkMenuItem *i, gpointer d) {
(void)i; (void)d;
GtkWidget *dlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
"退出后本机将下线:设备列表和远程协助都无法连接,直到再次启动。确定退出吗?");
gtk_window_set_title(GTK_WINDOW(dlg), "UU 远程 Linux 主机");
L("退出后本机将下线:设备列表和远程协助都无法连接,直到再次启动。确定退出吗?", "Quitting takes this computer offline: neither the device list nor remote assistance can connect until it starts again. Quit?"));
gtk_window_set_title(GTK_WINDOW(dlg), L("UU 远程 Linux 主机", "UU Remote Linux host"));
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) post(CMD_QUIT);
gtk_widget_destroy(dlg);
}
@@ -337,11 +339,11 @@ static gchar *write_tray_icon(void) {
}
static void build_tray(void) {
tray_menu = gtk_menu_new();
GtkWidget *open = gtk_menu_item_new_with_label("打开主窗口");
GtkWidget *open = gtk_menu_item_new_with_label(L("打开主窗口", "Open main window"));
g_signal_connect(open, "activate", G_CALLBACK(on_tray_open), NULL);
tray_allow = gtk_check_menu_item_new_with_label("允许他人远程协助");
tray_allow = gtk_check_menu_item_new_with_label(L("允许他人远程协助", "Allow remote assistance"));
g_signal_connect(tray_allow, "toggled", G_CALLBACK(on_tray_allow), NULL);
GtkWidget *quit = gtk_menu_item_new_with_label("退出");
GtkWidget *quit = gtk_menu_item_new_with_label(L("退出", "Quit"));
g_signal_connect(quit, "activate", G_CALLBACK(on_tray_quit), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), open);
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), tray_allow);
@@ -367,7 +369,7 @@ static void build_tray(void) {
// Without a theme path the panel cannot find the cached icon; keep the installed one.
void *ind = ind_new("uu-remote-linux", set_theme_path ? icon : fallback, 0 /* APPLICATION_STATUS */);
if (icon_path && set_theme_path) set_theme_path(ind, icon_path);
if (set_title) set_title(ind, "UU 远程 Linux 主机");
if (set_title) set_title(ind, L("UU 远程 Linux 主机", "UU Remote Linux host"));
set_menu(ind, GTK_MENU(tray_menu));
set_status(ind, 1 /* ACTIVE */);
return; // keep the library loaded for the indicator's lifetime
@@ -377,8 +379,8 @@ static void build_tray(void) {
// XEmbed system tray (Xfce, Cinnamon, MATE...).
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GtkStatusIcon *status = gtk_status_icon_new_from_icon_name(icon);
gtk_status_icon_set_tooltip_text(status, "UU 远程 Linux 主机");
gtk_status_icon_set_title(status, "UU 远程 Linux 主机");
gtk_status_icon_set_tooltip_text(status, L("UU 远程 Linux 主机", "UU Remote Linux host"));
gtk_status_icon_set_title(status, L("UU 远程 Linux 主机", "UU Remote Linux host"));
g_signal_connect(status, "activate", G_CALLBACK(on_status_activate), NULL);
g_signal_connect(status, "popup-menu", G_CALLBACK(on_status_menu), NULL);
G_GNUC_END_IGNORE_DEPRECATIONS
@@ -393,7 +395,7 @@ static void build_window(void) {
gtk_window_set_default_icon_name("uu-remote-linux"); // contrib/desktop icon, when installed
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), "UU 远程 Linux 主机(非官方)");
gtk_window_set_title(GTK_WINDOW(window), L("UU 远程 Linux 主机(非官方)", "UU Remote Linux host (unofficial)"));
gtk_window_set_default_size(GTK_WINDOW(window), 760, -1);
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
@@ -417,12 +419,12 @@ static void build_window(void) {
// Header: 本设备 ... 允许他人远程协助 [switch]
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_container_set_border_width(GTK_CONTAINER(header), 20);
gtk_box_pack_start(GTK_BOX(header), label("本设备", "heading"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(header), label(L("本设备", "This device"), "heading"), FALSE, FALSE, 0);
allow_switch = gtk_switch_new();
gtk_widget_set_valign(allow_switch, GTK_ALIGN_CENTER);
g_signal_connect(allow_switch, "state-set", G_CALLBACK(on_switch), NULL);
gtk_box_pack_end(GTK_BOX(header), allow_switch, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(header), label("允许他人远程协助", "key"), FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(header), label(L("允许他人远程协助", "Allow remote assistance"), "key"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(card), header, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(card), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
@@ -431,12 +433,12 @@ static void build_window(void) {
gtk_container_set_border_width(GTK_CONTAINER(body), 20);
gtk_grid_set_column_spacing(GTK_GRID(body), 48);
gtk_grid_set_row_spacing(GTK_GRID(body), 6);
gtk_grid_attach(GTK_GRID(body), label("本设备 ID", "key"), 0, 0, 1, 1);
gtk_grid_attach(GTK_GRID(body), label(L("本设备 ID", "This device's ID"), "key"), 0, 0, 1, 1);
GtkWidget *id_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
id_label = label("获取中…", "big");
id_label = label(L("获取中…", "Loading…"), "big");
gtk_label_set_selectable(GTK_LABEL(id_label), TRUE);
gtk_box_pack_start(GTK_BOX(id_row), id_label, FALSE, FALSE, 0);
GtkWidget *copy_id = gtk_button_new_with_label("复制");
GtkWidget *copy_id = gtk_button_new_with_label(L("复制", "Copy"));
gtk_style_context_add_class(gtk_widget_get_style_context(copy_id), "flat");
gtk_widget_set_valign(copy_id, GTK_ALIGN_CENTER);
g_signal_connect(copy_id, "clicked", G_CALLBACK(on_copy_id), NULL);
@@ -444,11 +446,11 @@ static void build_window(void) {
gtk_grid_attach(GTK_GRID(body), id_row, 0, 1, 1, 1);
GtkWidget *verify_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start(GTK_BOX(verify_row), label("验证方式:", "key"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(verify_row), label(L("验证方式:", "Verification:"), "key"), FALSE, FALSE, 0);
verify_combo = gtk_combo_box_text_new();
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "仅使用临时验证码");
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "仅使用自定义验证码");
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "同时使用两种验证码");
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), L("仅使用临时验证码", "Temporary code only"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), L("仅使用自定义验证码", "Custom code only"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), L("同时使用两种验证码", "Use both codes"));
gtk_combo_box_set_active(GTK_COMBO_BOX(verify_combo), 0);
g_signal_connect(verify_combo, "changed", G_CALLBACK(on_verify_changed), NULL);
gtk_box_pack_start(GTK_BOX(verify_row), verify_combo, FALSE, FALSE, 0);
@@ -456,17 +458,17 @@ static void build_window(void) {
GtkWidget *code_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
code_label = label("--------", "big");
gtk_box_pack_start(GTK_BOX(code_row), code_label, FALSE, FALSE, 0);
eye_button = gtk_button_new_with_label("隐藏");
eye_button = gtk_button_new_with_label(L("隐藏", "Hide"));
gtk_style_context_add_class(gtk_widget_get_style_context(eye_button), "flat");
g_signal_connect(eye_button, "clicked", G_CALLBACK(on_eye), NULL);
// Gear menu: 立即刷新 / 自动刷新 ▸ (每次远控结束, 每小时, 每 12 小时, 每 24 小时, 关闭) / 设置自定义验证码
GtkWidget *menu = gtk_menu_new();
GtkWidget *now = gtk_menu_item_new_with_label("立即刷新");
GtkWidget *now = gtk_menu_item_new_with_label(L("立即刷新", "Refresh now"));
g_signal_connect(now, "activate", G_CALLBACK(on_refresh_now), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), now);
GtkWidget *auto_item = gtk_menu_item_new_with_label("自动刷新");
GtkWidget *auto_item = gtk_menu_item_new_with_label(L("自动刷新", "Auto refresh"));
GtkWidget *sub = gtk_menu_new();
const char *names[5] = { "每次远控结束", "每小时", "每 12 小时", "每 24 小时", "关闭" };
const char *names[5] = { L("每次远控结束", "After every remote session"), L("每小时", "Every hour"), L("每 12 小时", "Every 12 hours"), L("每 24 小时", "Every 24 hours"), L("关闭", "Close") };
GSList *group = NULL;
for (int i = 0; i < 5; i++) {
refresh_items[i] = gtk_radio_menu_item_new_with_label(group, names[i]);
@@ -476,15 +478,15 @@ static void build_window(void) {
}
gtk_menu_item_set_submenu(GTK_MENU_ITEM(auto_item), sub);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), auto_item);
GtkWidget *custom_item = gtk_menu_item_new_with_label("设置自定义验证码…");
GtkWidget *custom_item = gtk_menu_item_new_with_label(L("设置自定义验证码…", "Set custom code…"));
g_signal_connect(custom_item, "activate", G_CALLBACK(on_set_custom), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), custom_item);
gtk_widget_show_all(menu);
GtkWidget *gear = gtk_menu_button_new();
gtk_button_set_image(GTK_BUTTON(gear), gtk_image_new_from_icon_name("emblem-system-symbolic", GTK_ICON_SIZE_BUTTON));
gtk_widget_set_tooltip_text(gear, "刷新设置");
gtk_widget_set_tooltip_text(gear, L("刷新设置", "Refresh settings"));
gtk_menu_button_set_popup(GTK_MENU_BUTTON(gear), menu);
GtkWidget *copy_code = gtk_button_new_with_label("复制");
GtkWidget *copy_code = gtk_button_new_with_label(L("复制", "Copy"));
gtk_style_context_add_class(gtk_widget_get_style_context(copy_code), "flat");
gtk_widget_set_valign(copy_code, GTK_ALIGN_CENTER);
g_signal_connect(copy_code, "clicked", G_CALLBACK(on_copy_code), NULL);
@@ -494,10 +496,10 @@ static void build_window(void) {
gtk_box_pack_start(GTK_BOX(code_row), eye_button, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(code_row), gear, FALSE, FALSE, 0);
gtk_grid_attach(GTK_GRID(body), code_row, 1, 1, 1, 1);
note_label = label(REFRESH_NOTES[0], "note");
note_label = label(refresh_note(0), "note");
gtk_grid_attach(GTK_GRID(body), note_label, 1, 2, 1, 1);
share_button = gtk_button_new_with_label("复制并分享");
share_button = gtk_button_new_with_label(L("复制并分享", "Copy and share"));
gtk_style_context_add_class(gtk_widget_get_style_context(share_button), "share");
gtk_widget_set_valign(share_button, GTK_ALIGN_CENTER);
g_signal_connect(share_button, "clicked", G_CALLBACK(on_share), NULL);
@@ -509,9 +511,18 @@ static void build_window(void) {
account_card = build_account_card();
gtk_widget_set_margin_top(account_card, 6);
gtk_box_pack_start(GTK_BOX(root), account_card, FALSE, FALSE, 0);
footer_label = label("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口即停止远程协助", "footer");
footer_label = label(L("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口即停止远程协助", "Open-source Linux host · not an official NetEase client · closing the window stops remote assistance"), "footer");
gtk_box_pack_end(GTK_BOX(root), footer_label, FALSE, FALSE, 0);
if (close_hides) gtk_label_set_text(GTK_LABEL(footer_label), "开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口后远程协助仍在后台运行");
GtkWidget *lang_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8), *lang_note = label("", "note");
GtkWidget *lang = gtk_combo_box_text_new();
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(lang), "中文"); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(lang), "English");
gtk_combo_box_set_active(GTK_COMBO_BOX(lang), uu_i18n_english());
g_signal_connect(lang, "changed", G_CALLBACK(on_language), lang_note);
gtk_box_pack_start(GTK_BOX(lang_row), label("语言 / Language", "key"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(lang_row), lang, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(lang_row), lang_note, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(root), lang_row, FALSE, FALSE, 6);
if (close_hides) gtk_label_set_text(GTK_LABEL(footer_label), L("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口后远程协助仍在后台运行", "Open-source Linux host · not an official NetEase client · remote assistance keeps running after the window closes"));
render_code();
if (close_hides) build_tray();
gtk_widget_show_all(gtk_bin_get_child(GTK_BIN(window)));
@@ -525,6 +536,11 @@ static void build_window(void) {
if (!start_hidden) gtk_widget_show(window);
}
static void on_language(GtkComboBox *c, gpointer note) {
int english = gtk_combo_box_get_active(c) == 1;
gtk_label_set_text(GTK_LABEL(note), english == uu_i18n_english() ? "" : !uu_i18n_save(english) ? L("无法保存语言设置", "Could not save the language")
: english ? "Restart uuremote-server to switch to English" : "重新启动 uuremote-server 后切换为中文");
}
static void *ui_main(void *arg) {
(void)arg;
int ok = gtk_init_check(NULL, NULL);
@@ -582,7 +598,7 @@ static gboolean apply_state(gpointer data) {
if (window) {
g_strlcpy(current_id, s->id, sizeof current_id);
g_strlcpy(current_code, s->code, sizeof current_code);
gtk_label_set_text(GTK_LABEL(id_label), current_id[0] ? current_id : "获取中…");
gtk_label_set_text(GTK_LABEL(id_label), current_id[0] ? current_id : L("获取中…", "Loading…"));
render_code();
suppress_switch = 1;
gtk_switch_set_active(GTK_SWITCH(allow_switch), s->allowed);
@@ -593,12 +609,12 @@ static gboolean apply_state(gpointer data) {
if (s->refresh >= 0 && s->refresh < 5) {
suppress_refresh = 1; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(refresh_items[s->refresh]), TRUE); suppress_refresh = 0;
}
gtk_label_set_text(GTK_LABEL(note_label), s->verify == VERIFY_CUSTOM ? "自定义验证码不会自动刷新"
: s->verify == VERIFY_BOTH ? "也可使用自定义验证码连接" : REFRESH_NOTES[s->refresh >= 0 && s->refresh < 5 ? s->refresh : 0]);
gtk_label_set_text(GTK_LABEL(note_label), s->verify == VERIFY_CUSTOM ? L("自定义验证码不会自动刷新", "Custom code is never refreshed automatically")
: s->verify == VERIFY_BOTH ? L("也可使用自定义验证码连接", "The custom code also works") : refresh_note(s->refresh));
gtk_widget_set_sensitive(share_button, current_id[0] && current_code[0]);
gtk_label_set_text(GTK_LABEL(hint_label), s->allowed
? "对方在 UU 远程「开始协助」中输入设备 ID 和验证码即可连接"
: "已关闭:他人暂时无法远程协助本机,打开右上角开关后才能连接");
? L("对方在 UU 远程「开始协助」中输入设备 ID 和验证码即可连接", "Your partner enters the device ID and code under \"Start assistance\" in UU Remote to connect")
: L("已关闭:他人暂时无法远程协助本机,打开右上角开关后才能连接", "Off: nobody can assist this computer until you turn on the switch at the top right"));
}
g_free(s->id); g_free(s->code); g_free(s);
return G_SOURCE_REMOVE;
@@ -725,7 +741,7 @@ static int notify_desktop(const char *summary, const char *body) {
g_variant_builder_add(&hints, "{sv}", "urgency", g_variant_new_byte(2)); // critical: stays until dismissed
GVariant *reply = g_dbus_connection_call_sync(bus, "org.freedesktop.Notifications", "/org/freedesktop/Notifications",
"org.freedesktop.Notifications", "Notify",
g_variant_new("(susssasa{sv}i)", "UU 远程 Linux 主机", 0u, "uu-remote-linux", summary, body, &actions, &hints, -1),
g_variant_new("(susssasa{sv}i)", L("UU 远程 Linux 主机", "UU Remote Linux host"), 0u, "uu-remote-linux", summary, body, &actions, &hints, -1),
G_VARIANT_TYPE("(u)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
g_object_unref(bus);
if (!reply) return -1;
+8
View File
@@ -0,0 +1,8 @@
// Chinese / English UI text. The language is decided once on the Rust side (src/i18n.rs: UU_LANG, the
// choice saved in settings, then the locale) so the GTK windows and Rust messages always agree.
#ifndef UU_I18N_H
#define UU_I18N_H
int uu_i18n_english(void);
int uu_i18n_save(int english);
#define L(zh, en) (uu_i18n_english() ? (en) : (zh))
#endif
+39 -3
View File
@@ -17,7 +17,7 @@ static int portal_eis_dispatch(struct uu_portal *p) {
case EI_EVENT_SEAT_ADDED:
ei_seat_bind_capabilities(ei_event_get_seat(event),
EI_DEVICE_CAP_POINTER, EI_DEVICE_CAP_POINTER_ABSOLUTE,
EI_DEVICE_CAP_BUTTON, EI_DEVICE_CAP_SCROLL, EI_DEVICE_CAP_KEYBOARD, NULL);
EI_DEVICE_CAP_BUTTON, EI_DEVICE_CAP_SCROLL, EI_DEVICE_CAP_KEYBOARD, EI_DEVICE_CAP_TOUCH, NULL);
break;
case EI_EVENT_DEVICE_RESUMED:
if (!g_list_find(p->ei_devices, device)) {
@@ -55,15 +55,19 @@ static struct ei_region *portal_eis_region(struct uu_portal *p, struct ei_device
ei_region_get_width(region) && ei_region_get_height(region)) return region;
}
}
static struct ei_device *portal_eis_absolute(struct uu_portal *p, struct ei_region **region) {
static struct ei_device *portal_eis_mapped(struct uu_portal *p, enum ei_device_capability capability, struct ei_region **region) {
for (GList *item = p->ei_devices; item; item = item->next) {
struct ei_device *device = item->data;
if (ei_device_has_capability(device, EI_DEVICE_CAP_POINTER_ABSOLUTE) &&
if (ei_device_has_capability(device, capability) &&
(*region = portal_eis_region(p, device))) return device;
}
return NULL;
}
static struct ei_device *portal_eis_absolute(struct uu_portal *p, struct ei_region **region) {
return portal_eis_mapped(p, EI_DEVICE_CAP_POINTER_ABSOLUTE, region);
}
static void portal_eis_close(struct uu_portal *p) {
if (p->ei_touch) p->ei_touch = ei_touch_unref(p->ei_touch);
for (GList *item = p->ei_devices; item; item = item->next) ei_device_unref(item->data);
g_list_free(p->ei_devices); p->ei_devices = NULL;
if (p->ei) p->ei = ei_unref(p->ei);
@@ -157,6 +161,38 @@ static int portal_eis_button(struct uu_portal *p, int button, int pressed) {
ei_device_button_button(device, code, !!pressed);
return portal_eis_frame(p, device);
}
static int portal_eis_scroll(struct uu_portal *p, double dx, double dy, int finish) {
if (portal_eis_available(p)) return 9;
struct ei_device *device = portal_eis_device(p, EI_DEVICE_CAP_SCROLL);
if (!device) return 9;
if (dx != 0 || dy != 0) ei_device_scroll_delta(device, dx, dy);
if (finish) ei_device_scroll_stop(device, true, true);
return portal_eis_frame(p, device);
}
static int portal_eis_touch(struct uu_portal *p, int phase, double x, double y) {
if (portal_eis_available(p)) return 9;
if (phase == 2) {
if (!p->ei_touch) return 0;
struct ei_device *device = ei_touch_get_device(p->ei_touch);
ei_touch_up(p->ei_touch);
p->ei_touch = ei_touch_unref(p->ei_touch);
return portal_eis_frame(p, device);
}
struct ei_region *region = NULL;
struct ei_device *device = portal_eis_mapped(p, EI_DEVICE_CAP_TOUCH, &region);
if (!device) return 9;
double target_x = ei_region_get_x(region) + x * ei_region_get_width(region) / p->width;
double target_y = ei_region_get_y(region) + y * ei_region_get_height(region) / p->height;
if (phase == 0) {
if (p->ei_touch) { ei_touch_up(p->ei_touch); p->ei_touch = ei_touch_unref(p->ei_touch); }
if (!(p->ei_touch = ei_device_touch_new(device))) return 9;
ei_touch_down(p->ei_touch, target_x, target_y);
} else {
if (!p->ei_touch) return 11;
ei_touch_motion(p->ei_touch, target_x, target_y);
}
return portal_eis_frame(p, device);
}
static int portal_eis_key(struct uu_portal *p, int code, int pressed) {
if (code < 0 || code > 0x2ff) return 11;
if (portal_eis_available(p)) return 9;
+109 -11
View File
@@ -56,10 +56,12 @@ struct uu_portal {
int format_valid, stream_started;
gint64 interrupted_at, display_changed_at;
uint32_t node, width, height;
int logical_width, logical_height;
int logical_width, logical_height, position_x, position_y, has_position;
int absolute_stream_pixels;
uint32_t devices, available;
struct ei *ei;
GList *ei_devices;
struct ei_touch *ei_touch;
char *mapping_id;
uint32_t ei_sequence;
atomic_int ei_failed;
@@ -81,6 +83,19 @@ static int open_cancelled(struct uu_portal *p) {
}
static int wait_for_first_frame(struct uu_portal *p);
#include "portal_eis.inc"
/* A uint32 RemoteDesktop property (version, AvailableDeviceTypes); 0 when unreadable. */
static guint remote_property(struct uu_portal *p, const char *name) {
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, PATH,
"org.freedesktop.DBus.Properties", "Get", g_variant_new("(ss)", REMOTE, name),
G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
guint result = 0;
if (reply) {
GVariant *value; g_variant_get(reply, "(v)", &value);
if (g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) result = g_variant_get_uint32(value);
g_variant_unref(value); g_variant_unref(reply);
}
return result;
}
static void fail(struct uu_portal *p, int error) {
pthread_mutex_lock(&p->lock);
if (!p->error) p->error = error;
@@ -365,10 +380,12 @@ static int read_stream_result(struct uu_portal *p, GVariant *results) {
if (!has_devices || (devices & 3) != 3 || !streams || g_variant_n_children(streams) != 1) {
error = 6;
} else {
p->devices = devices;
GVariant *entry = g_variant_get_child_value(streams, 0), *properties;
g_variant_get(entry, "(u@a{sv})", &p->node, &properties);
/* Optional 'size' is compositor logical coordinates, not frame pixels. */
g_variant_lookup(properties, "size", "(ii)", &p->logical_width, &p->logical_height);
p->has_position = g_variant_lookup(properties, "position", "(ii)", &p->position_x, &p->position_y);
const char *mapping_id = NULL;
if (g_variant_lookup(properties, "mapping_id", "&s", &mapping_id)) p->mapping_id = g_strdup(mapping_id);
g_variant_unref(properties); g_variant_unref(entry);
@@ -412,16 +429,10 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
p->closed_subscription = g_dbus_connection_signal_subscribe(p->bus, DEST, SESSION, "Closed", p->session,
NULL, G_DBUS_SIGNAL_FLAGS_NONE, session_closed, p, NULL);
g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(3));
GVariant *version_reply = g_dbus_connection_call_sync(p->bus, DEST, PATH,
"org.freedesktop.DBus.Properties", "Get", g_variant_new("(ss)", REMOTE, "version"),
G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
guint version = 0;
if (version_reply) {
GVariant *value; g_variant_get(version_reply, "(v)", &value);
if (g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) version = g_variant_get_uint32(value);
g_variant_unref(value); g_variant_unref(version_reply);
}
/* Keyboard and pointer, plus the touchscreen (4) where the portal offers one (mobile viewers). */
p->available = remote_property(p, "AvailableDeviceTypes");
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(3 | (p->available & 4)));
guint version = remote_property(p, "version");
if (version >= 2) {
g_variant_builder_add(&options, "{sv}", "persist_mode", g_variant_new_uint32(2));
if (restore && *restore) g_variant_builder_add(&options, "{sv}", "restore_token", g_variant_new_string(restore));
@@ -669,9 +680,96 @@ int uu_portal_button(struct uu_portal *p, int button, int pressed) {
if (!code) return 11;
return notify(p, "NotifyPointerButton", g_variant_new("(o@a{sv}iu)", p->session, empty_options(), code, (guint)!!pressed));
}
/* Smooth scroll in stream pixels (positive scrolls down/right, like a touchpad); `finish` ends the
* gesture so clients may coast. */
int uu_portal_scroll(struct uu_portal *p, double dx, double dy, int finish) {
if (!p || !isfinite(dx) || !isfinite(dy)) return 11;
if (p->logical_width <= 0 || p->logical_height <= 0 || !p->width || !p->height) return 11;
int result = prepare_input(p); if (result) return result;
double lx = dx * p->logical_width / p->width, ly = dy * p->logical_height / p->height;
if (p->ei) return portal_eis_scroll(p, lx, ly, finish);
GVariantBuilder options; g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT);
if (finish) g_variant_builder_add(&options, "{sv}", "finish", g_variant_new_boolean(TRUE));
return notify(p, "NotifyPointerAxis", g_variant_new("(oa{sv}dd)", p->session, &options, lx, ly));
}
/* One finger (slot 0) in stream pixels: phase 0 down, 1 motion, 2 up. */
int uu_portal_touch_supported(struct uu_portal *p) { return p && (p->devices & 4); }
/* The portal offers a touchscreen this session's consent did not grant (restored from before touch). */
int uu_portal_touch_available(struct uu_portal *p) { return p && (p->available & 4); }
int uu_portal_touch(struct uu_portal *p, int phase, double x, double y) {
if (!uu_portal_touch_supported(p) || phase < 0 || phase > 2) return 11;
if (phase != 2 && (!isfinite(x) || !isfinite(y) || p->logical_width <= 0 || p->logical_height <= 0 ||
!p->width || !p->height || x < 0 || y < 0 || x >= p->width || y >= p->height)) return 11;
int result = prepare_input(p); if (result) return result;
if (p->ei) return portal_eis_touch(p, phase, x, y);
if (phase == 2) return notify(p, "NotifyTouchUp", g_variant_new("(o@a{sv}u)", p->session, empty_options(), 0u));
return notify(p, phase ? "NotifyTouchMotion" : "NotifyTouchDown", g_variant_new("(o@a{sv}uudd)", p->session, empty_options(), p->node, 0u,
p->absolute_stream_pixels ? x : x * p->logical_width / p->width,
p->absolute_stream_pixels ? y : y * p->logical_height / p->height));
}
int uu_portal_key(struct uu_portal *p, uint32_t symbol, int keycode, int pressed) {
if (!p || !symbol || symbol > INT32_MAX) return 11;
int result = prepare_input(p); if (result) return result;
if (p->ei) return portal_eis_key(p, keycode, pressed);
return notify(p, "NotifyKeyboardKeysym", g_variant_new("(o@a{sv}iu)", p->session, empty_options(), (gint)symbol, (guint)!!pressed));
}
/* Logical position of the granted monitor: matches a Mutter logical monitor. */
int uu_portal_stream_position(struct uu_portal *p, int32_t *x, int32_t *y) {
if (!p || !p->has_position) return 11;
*x = p->position_x; *y = p->position_y;
return 0;
}
/* Mutter's monitors as "connector\twidth\theight\tx\ty\tprimary\n" lines: current mode in
* pixels, logical position. Returns the count, or -1 without Mutter (KDE, no session bus). */
int uu_portal_monitors(char *out, size_t length) {
if (!out || !length) return -1;
out[0] = 0;
GDBusConnection *bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
if (!bus) return -1;
GVariant *reply = g_dbus_connection_call_sync(bus, MUTTER_DISPLAY, MUTTER_DISPLAY_PATH, MUTTER_DISPLAY,
"GetCurrentState", NULL, G_VARIANT_TYPE("(ua((ssss)a(siiddada{sv})a{sv})a(iiduba(ssss)a{sv})a{sv})"),
G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
g_object_unref(bus);
if (!reply) return -1;
GVariant *monitors = g_variant_get_child_value(reply, 1), *logical = g_variant_get_child_value(reply, 2);
int count = 0; size_t used = 0;
for (gsize i = 0; i < g_variant_n_children(logical); i++) {
gint32 x, y; gdouble scale; guint32 transform; gboolean primary; GVariant *specs, *props;
g_variant_get_child(logical, i, "(iidub@a(ssss)@a{sv})", &x, &y, &scale, &transform, &primary, &specs, &props);
const gchar *connector = NULL;
if (g_variant_n_children(specs)) g_variant_get_child(specs, 0, "(&s&s&s&s)", &connector, NULL, NULL, NULL);
gint32 width = 0, height = 0;
for (gsize m = 0; connector && m < g_variant_n_children(monitors); m++) {
GVariant *monitor = g_variant_get_child_value(monitors, m), *spec = g_variant_get_child_value(monitor, 0),
*modes = g_variant_get_child_value(monitor, 1);
const gchar *name = NULL; g_variant_get_child(spec, 0, "&s", &name);
for (gsize k = 0; name && !strcmp(name, connector) && k < g_variant_n_children(modes); k++) {
GVariant *mode = g_variant_get_child_value(modes, k), *mode_props = g_variant_get_child_value(mode, 6);
gboolean current = FALSE;
if (g_variant_lookup(mode_props, "is-current", "b", &current) && current)
g_variant_get_child(mode, 1, "i", &width), g_variant_get_child(mode, 2, "i", &height);
g_variant_unref(mode_props); g_variant_unref(mode);
}
g_variant_unref(modes); g_variant_unref(spec); g_variant_unref(monitor);
}
if (transform % 2) { gint32 t = width; width = height; height = t; } /* 90/270, flipped or not */
if (connector && width > 0 && height > 0) {
int n = snprintf(out + used, length - used, "%s\t%d\t%d\t%d\t%d\t%d\n", connector, width, height, x, y, primary ? 1 : 0);
if (n > 0 && (size_t)n < length - used) { used += (size_t)n; count++; }
}
g_variant_unref(specs); g_variant_unref(props);
}
g_variant_unref(monitors); g_variant_unref(logical); g_variant_unref(reply);
return count;
}
/* End the compositor session now (screen-share indicator off) while the handle stays valid;
* captures then report a closed stream until the handle is replaced. */
void uu_portal_end(struct uu_portal *p) {
if (!p || atomic_exchange(&p->closed, 1)) return;
if (p->bus && p->session) {
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, p->session, SESSION, "Close",
NULL, NULL, G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
if (reply) g_variant_unref(reply);
}
}
+7
View File
@@ -25,5 +25,12 @@ int uu_portal_capture(struct uu_portal *portal, uint8_t *bgra, size_t length);
int uu_portal_capture_since(struct uu_portal *portal, uint8_t *bgra, size_t length, uint64_t *revision);
int uu_portal_move(struct uu_portal *portal, double x, double y, int relative);
int uu_portal_button(struct uu_portal *portal, int button, int pressed);
int uu_portal_scroll(struct uu_portal *portal, double dx, double dy, int finish);
int uu_portal_touch_supported(struct uu_portal *portal);
int uu_portal_touch_available(struct uu_portal *portal);
int uu_portal_touch(struct uu_portal *portal, int phase, double x, double y);
int uu_portal_key(struct uu_portal *portal, uint32_t keysym, int keycode, int pressed);
int uu_portal_stream_position(struct uu_portal *portal, int32_t *x, int32_t *y);
int uu_portal_monitors(char *out, size_t length);
void uu_portal_end(struct uu_portal *portal);
#endif
+50 -49
View File
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include "i18n.h"
#define QSIZE 64
static char queue[QSIZE][4096];
@@ -97,9 +98,9 @@ static void format_size(guint64 size, int kind, char *out, size_t len) {
static void format_time(guint64 secs, char *out, size_t len) {
if (!secs) { snprintf(out, len, "--"); return; }
time_t t = (time_t)secs; struct tm tm; localtime_r(&t, &tm);
strftime(out, len, "%Y年%m月%d日", &tm);
strftime(out, len, L("%Y年%m月%d日", "%Y-%m-%d"), &tm);
}
static const char *kind_name(int kind) { return kind == 4 ? "文件" : kind == 3 ? "磁盘" : "文件夹"; }
static const char *kind_name(int kind) { return kind == 4 ? L("文件", "File") : kind == 3 ? L("磁盘", "Disk") : L("文件夹", "Folder"); }
/* ---------------- file transfer ---------------- */
enum { C_NAME, C_TIME, C_TYPE, C_SIZE, C_PATH, C_KIND, C_N };
@@ -111,7 +112,7 @@ static char local_dir[2048] = "", remote_dir[2048] = ":/";
static void load_local(const char *path) {
char *dir = g_strdup(path); /* path may alias local_dir */
GDir *d = g_dir_open(dir, 0, NULL);
if (!d) { show_toast("无法打开本机目录"); g_free(dir); return; }
if (!d) { show_toast(L("无法打开本机目录", "Cannot open local folder")); g_free(dir); return; }
snprintf(local_dir, sizeof local_dir, "%s", dir); g_free(dir);
gtk_entry_set_text(GTK_ENTRY(local_path), local_dir);
gtk_list_store_clear(local_store);
@@ -150,7 +151,7 @@ static void on_row_activated(GtkTreeView *view, GtkTreePath *path, GtkTreeViewCo
g_free(full);
}
static char *ask_name(const char *title) {
GtkWidget *dlg = gtk_dialog_new_with_buttons(title, GTK_WINDOW(window), GTK_DIALOG_MODAL, "取消", GTK_RESPONSE_CANCEL, "确定", GTK_RESPONSE_OK, NULL);
GtkWidget *dlg = gtk_dialog_new_with_buttons(title, GTK_WINDOW(window), GTK_DIALOG_MODAL, L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("确定", "OK"), GTK_RESPONSE_OK, NULL);
GtkWidget *entry = gtk_entry_new(); gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dlg)); gtk_container_set_border_width(GTK_CONTAINER(area), 16);
@@ -158,21 +159,21 @@ static char *ask_name(const char *title) {
char *name = NULL;
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
const char *t = gtk_entry_get_text(GTK_ENTRY(entry));
if (*t && !strchr(t, '/') && strcmp(t, ".") && strcmp(t, "..")) name = g_strdup(t); else if (*t) show_toast("名称无效");
if (*t && !strchr(t, '/') && strcmp(t, ".") && strcmp(t, "..")) name = g_strdup(t); else if (*t) show_toast(L("名称无效", "Invalid name"));
}
gtk_widget_destroy(dlg);
return name;
}
static void on_local_mkdir(GtkButton *b, gpointer d) {
(void)b; (void)d; char *name = ask_name("新建文件夹"); if (!name) return;
(void)b; (void)d; char *name = ask_name(L("新建文件夹", "New folder")); if (!name) return;
char *full = g_build_filename(local_dir, name, NULL);
if (mkdir(full, 0755) != 0) show_toast("无法创建文件夹"); else load_local(local_dir);
if (mkdir(full, 0755) != 0) show_toast(L("无法创建文件夹", "Cannot create folder")); else load_local(local_dir);
g_free(full); g_free(name);
}
static void on_remote_mkdir(GtkButton *b, gpointer d) {
(void)b; (void)d;
if (!strcmp(remote_dir, ":/")) { show_toast("请先进入一个文件夹"); return; }
char *name = ask_name("新建文件夹"); if (!name) return;
if (!strcmp(remote_dir, ":/")) { show_toast(L("请先进入一个文件夹", "Open a folder first")); return; }
char *name = ask_name(L("新建文件夹", "New folder")); if (!name) return;
char *full = g_build_filename(remote_dir, name, NULL); char cmd[2200];
snprintf(cmd, sizeof cmd, "mkdir\t%s", full); push(cmd); g_free(full); g_free(name);
}
@@ -181,8 +182,8 @@ static void on_remote_mkdir(GtkButton *b, gpointer d) {
static void on_send(GtkButton *b, gpointer upload) {
(void)b; GtkTreeView *view = GTK_TREE_VIEW(upload ? local_view : remote_view);
GtkTreeModel *m; GList *rows = gtk_tree_selection_get_selected_rows(gtk_tree_view_get_selection(view), &m);
if (!rows) { show_toast("请先选择要发送的文件"); return; }
if (upload && !strcmp(remote_dir, ":/")) { show_toast("请先在远端进入目标文件夹"); g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free); return; }
if (!rows) { show_toast(L("请先选择要发送的文件", "Select the files to send first")); return; }
if (upload && !strcmp(remote_dir, ":/")) { show_toast(L("请先在远端进入目标文件夹", "Open the destination folder on the remote side first")); g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free); return; }
int skipped = 0;
for (GList *r = rows; r; r = r->next) {
GtkTreeIter it; char *full, *name; int kind;
@@ -199,7 +200,7 @@ static void on_send(GtkButton *b, gpointer upload) {
g_free(full); g_free(name);
}
g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free);
if (skipped) show_toast(upload ? "暂不支持上传文件夹,已跳过" : "不能下载整个磁盘,已跳过");
if (skipped) show_toast(upload ? L("暂不支持上传文件夹,已跳过", "Uploading folders is not supported yet; skipped") : L("不能下载整个磁盘,已跳过", "Cannot download a whole disk; skipped"));
}
static void on_cancel_all(GtkButton *b, gpointer d) { (void)b; (void)d; push("cancel"); }
static void on_clear_done(GtkButton *b, gpointer d) {
@@ -209,13 +210,13 @@ static void on_clear_done(GtkButton *b, gpointer d) {
}
static GtkWidget *pane(int remote) {
GtkWidget *card = vbox(6); add_class(card, "card");
GtkWidget *bar = hbox(6), *up = button("↑", NULL), *refresh = button("刷新", NULL), *mk = button("新建文件夹", NULL), *path = gtk_entry_new();
gtk_widget_set_tooltip_text(up, "上一级"); gtk_widget_set_tooltip_text(refresh, "刷新");
GtkWidget *bar = hbox(6), *up = button("↑", NULL), *refresh = button(L("刷新", "Refresh"), NULL), *mk = button(L("新建文件夹", "New folder"), NULL), *path = gtk_entry_new();
gtk_widget_set_tooltip_text(up, L("上一级", "Up")); gtk_widget_set_tooltip_text(refresh, L("刷新", "Refresh"));
gtk_box_pack_start(GTK_BOX(bar), up, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(bar), refresh, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(bar), mk, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(bar), path, TRUE, TRUE, 0);
GtkListStore *store = gtk_list_store_new(C_N, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
add_column(view, "名称", C_NAME, 1); add_column(view, "修改日期", C_TIME, 0); add_column(view, "类型", C_TYPE, 0); add_column(view, "大小", C_SIZE, 0);
add_column(view, L("名称", "Name"), C_NAME, 1); add_column(view, L("修改日期", "Date modified"), C_TIME, 0); add_column(view, L("类型", "Type"), C_TYPE, 0); add_column(view, L("大小", "Size"), C_SIZE, 0);
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_MULTIPLE);
g_signal_connect(view, "row-activated", G_CALLBACK(on_row_activated), GINT_TO_POINTER(remote));
g_signal_connect(up, "clicked", G_CALLBACK(remote ? on_remote_up : on_local_up), NULL);
@@ -229,13 +230,13 @@ static GtkWidget *pane(int remote) {
return card;
}
static void build_files(void) {
GtkWidget *content; frame("文件传输", &content);
GtkWidget *content; frame(L("文件传输", "File transfer"), &content);
gtk_window_set_default_size(GTK_WINDOW(window), 1100, 760);
GtkWidget *head = gtk_grid_new(); gtk_grid_set_column_homogeneous(GTK_GRID(head), TRUE); gtk_grid_set_column_spacing(GTK_GRID(head), 24);
GtkWidget *left = hbox(10), *right = hbox(10);
char host[256]; if (gethostname(host, sizeof host) != 0) snprintf(host, sizeof host, "本机"); host[sizeof host - 1] = 0;
GtkWidget *tag_l = label("本机", "tag"), *tag_r = label("远端", "tag"); add_class(tag_r, "remote");
GtkWidget *send_r = button("发送 →", NULL), *send_l = button("← 发送", NULL);
char host[256]; if (gethostname(host, sizeof host) != 0) snprintf(host, sizeof host, L("本机", "This device")); host[sizeof host - 1] = 0;
GtkWidget *tag_l = label(L("本机", "This device"), "tag"), *tag_r = label(L("远端", "Remote"), "tag"); add_class(tag_r, "remote");
GtkWidget *send_r = button(L("发送 →", "Send →"), NULL), *send_l = button(L("← 发送", "← Send"), NULL);
g_signal_connect(send_r, "clicked", G_CALLBACK(on_send), GINT_TO_POINTER(1));
g_signal_connect(send_l, "clicked", G_CALLBACK(on_send), NULL);
gtk_box_pack_start(GTK_BOX(left), label(host, "title"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(left), tag_l, FALSE, FALSE, 0);
@@ -247,25 +248,25 @@ static void build_files(void) {
gtk_grid_set_row_spacing(GTK_GRID(head), 14);
gtk_box_pack_start(GTK_BOX(content), head, TRUE, TRUE, 0);
GtkWidget *tasks = vbox(8); add_class(tasks, "card");
GtkWidget *tbar = hbox(8), *cancel = button("全部取消", NULL), *clear = button("清除完结任务", NULL);
GtkWidget *tbar = hbox(8), *cancel = button(L("全部取消", "Cancel all"), NULL), *clear = button(L("清除完结任务", "Clear finished"), NULL);
g_signal_connect(cancel, "clicked", G_CALLBACK(on_cancel_all), NULL); g_signal_connect(clear, "clicked", G_CALLBACK(on_clear_done), NULL);
gtk_box_pack_start(GTK_BOX(tbar), label("传输列表", "section"), FALSE, FALSE, 4);
gtk_box_pack_start(GTK_BOX(tbar), label(L("传输列表", "Transfers"), "section"), FALSE, FALSE, 4);
gtk_box_pack_end(GTK_BOX(tbar), clear, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(tbar), cancel, FALSE, FALSE, 0);
task_store = gtk_list_store_new(T_N, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
GtkWidget *tview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(task_store));
add_column(tview, "名称", T_NAME, 1); add_column(tview, "状态", T_STATUS, 0); add_column(tview, "大小", T_SIZE, 0);
add_column(tview, "发送路径", T_FROM, 1); add_column(tview, "接收路径", T_TO, 1);
add_column(tview, L("名称", "Name"), T_NAME, 1); add_column(tview, L("状态", "Status"), T_STATUS, 0); add_column(tview, L("大小", "Size"), T_SIZE, 0);
add_column(tview, L("发送路径", "From"), T_FROM, 1); add_column(tview, L("接收路径", "To"), T_TO, 1);
gtk_box_pack_start(GTK_BOX(tasks), tbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(tasks), scrolled(tview, 180), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(content), tasks, TRUE, TRUE, 0);
const char *home = g_get_home_dir(); load_local(home ? home : "/");
gtk_entry_set_text(GTK_ENTRY(remote_path), "此电脑");
gtk_entry_set_text(GTK_ENTRY(remote_path), L("此电脑", "This PC"));
}
struct listing { char *path; char *rows; };
static gboolean remote_idle(gpointer d) {
struct listing *l = d;
snprintf(remote_dir, sizeof remote_dir, "%s", l->path);
gtk_entry_set_text(GTK_ENTRY(remote_path), strcmp(remote_dir, ":/") ? remote_dir : "此电脑");
gtk_entry_set_text(GTK_ENTRY(remote_path), strcmp(remote_dir, ":/") ? remote_dir : L("此电脑", "This PC"));
gtk_list_store_clear(remote_store);
char **lines = g_strsplit(l->rows, "\n", -1);
for (char **line = lines; *line; line++) {
@@ -312,10 +313,10 @@ static GtkListStore *rule_store;
static GtkWidget *rule_stack;
static void on_add_rule(GtkButton *b, gpointer d) {
(void)b; (void)d;
GtkWidget *dlg = gtk_dialog_new_with_buttons("添加映射规则", GTK_WINDOW(window), GTK_DIALOG_MODAL, "取消", GTK_RESPONSE_CANCEL, "保存后立即启用", GTK_RESPONSE_OK, NULL);
GtkWidget *dlg = gtk_dialog_new_with_buttons(L("添加映射规则", "Add mapping rule"), GTK_WINDOW(window), GTK_DIALOG_MODAL, L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("保存后立即启用", "Save and enable"), GTK_RESPONSE_OK, NULL);
GtkWidget *grid = gtk_grid_new(); gtk_grid_set_row_spacing(GTK_GRID(grid), 12); gtk_grid_set_column_spacing(GTK_GRID(grid), 24);
gtk_container_set_border_width(GTK_CONTAINER(grid), 20);
const char *labels[] = {"名称", "本地端口", "目标地址", "目标端口"}, *hints[] = {"名称", "请输入端口", "", "请输入端口"};
const char *labels[] = {L("名称", "Name"), L("本地端口", "Local port"), L("目标地址", "Target address"), L("目标端口", "Target port")}, *hints[] = {L("名称", "Name"), L("请输入端口", "Enter port"), "", L("请输入端口", "Enter port")};
GtkWidget *entries[4];
for (int i = 0; i < 4; i++) {
entries[i] = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entries[i]), hints[i]); gtk_widget_set_hexpand(entries[i], TRUE);
@@ -328,7 +329,7 @@ static void on_add_rule(GtkButton *b, gpointer d) {
const char *name = gtk_entry_get_text(GTK_ENTRY(entries[0])), *host = gtk_entry_get_text(GTK_ENTRY(entries[2]));
char *end; long local = strtol(gtk_entry_get_text(GTK_ENTRY(entries[1])), &end, 10); int bad_local = *end || local < 0 || local > 65535;
long port = strtol(gtk_entry_get_text(GTK_ENTRY(entries[3])), &end, 10); int bad_port = *end || port < 1 || port > 65535;
if (!*name || strchr(name, '\t') || !*host || strchr(host, '\t') || bad_local || bad_port) { show_toast("请填写名称、有效端口和目标地址"); continue; }
if (!*name || strchr(name, '\t') || !*host || strchr(host, '\t') || bad_local || bad_port) { show_toast(L("请填写名称、有效端口和目标地址", "Enter a name, valid ports and a target address")); continue; }
char cmd[1024]; snprintf(cmd, sizeof cmd, "add\t%s\t%ld\t%s\t%ld", name, local, host, port); push(cmd);
break;
}
@@ -336,27 +337,27 @@ static void on_add_rule(GtkButton *b, gpointer d) {
}
static void on_remove_rule(GtkButton *b, gpointer view) {
(void)b; GtkTreeModel *m; GtkTreeIter it;
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(view), &m, &it)) { show_toast("请先选择一条规则"); return; }
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(view), &m, &it)) { show_toast(L("请先选择一条规则", "Select a rule first")); return; }
int id; gtk_tree_model_get(m, &it, P_ID, &id, -1); char cmd[64]; snprintf(cmd, sizeof cmd, "remove\t%d", id); push(cmd);
}
static void build_portmap(void) {
GtkWidget *content; frame("端口映射", &content);
GtkWidget *content; frame(L("端口映射", "Port mapping"), &content);
gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
GtkWidget *head = hbox(12), *add = button("添加规则", "primary"), *del = button("删除", NULL);
GtkWidget *dot = label("● 已连接", "online");
GtkWidget *head = hbox(12), *add = button(L("添加规则", "Add rule"), "primary"), *del = button(L("删除", "Remove"), NULL);
GtkWidget *dot = label(L("● 已连接", "● Connected"), "online");
gtk_box_pack_start(GTK_BOX(head), label(remote_name, "title"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(head), dot, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(head), add, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(head), del, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(content), head, FALSE, FALSE, 0);
rule_store = gtk_list_store_new(P_N, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(rule_store));
add_column(view, "名称", P_NAME, 1); add_column(view, "本地地址", P_LOCAL, 0); add_column(view, "目标地址", P_TARGET, 1); add_column(view, "状态", P_STATUS, 0);
add_column(view, L("名称", "Name"), P_NAME, 1); add_column(view, L("本地地址", "Local address"), P_LOCAL, 0); add_column(view, L("目标地址", "Target address"), P_TARGET, 1); add_column(view, L("状态", "Status"), P_STATUS, 0);
rule_stack = gtk_stack_new();
GtkWidget *empty = label("当前没有端口映射规则,点击「添加规则」把远端端口映射到本机", "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
GtkWidget *empty = label(L("当前没有端口映射规则,点击「添加规则」把远端端口映射到本机", "No port mapping rules. Click \"Add rule\" to map a remote port to this computer"), "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
gtk_stack_add_named(GTK_STACK(rule_stack), empty, "empty");
gtk_stack_add_named(GTK_STACK(rule_stack), scrolled(view, 360), "list");
GtkWidget *card = vbox(0); add_class(card, "card"); gtk_box_pack_start(GTK_BOX(card), rule_stack, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(content), card, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(content), label("本地端口只监听 127.0.0.1;本地端口填 0 时自动分配。", "empty"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(content), label(L("本地端口只监听 127.0.0.1;本地端口填 0 时自动分配。", "Local ports listen on 127.0.0.1 only; enter 0 to pick a free port."), "empty"), FALSE, FALSE, 0);
g_signal_connect(add, "clicked", G_CALLBACK(on_add_rule), NULL);
g_signal_connect(del, "clicked", G_CALLBACK(on_remove_rule), view);
}
@@ -394,36 +395,36 @@ static void on_open_session(GtkTreeView *v, GtkTreePath *path, GtkTreeViewColumn
}
static void on_kill_session(GtkButton *b, gpointer d) {
(void)b; (void)d; guint id = selected_session();
if (!id) { show_toast("请先选择一个会话"); return; }
if (!id) { show_toast(L("请先选择一个会话", "Select a session first")); return; }
GtkWidget *dlg = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "确定结束会话 %u?", id);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dlg), "会话内正在运行的程序将被终止。");
gtk_dialog_add_buttons(GTK_DIALOG(dlg), "取消", GTK_RESPONSE_CANCEL, "结束会话", GTK_RESPONSE_OK, NULL);
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, L("确定结束会话 %u?", "End session %u?"), id);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dlg), L("会话内正在运行的程序将被终止。", "Programs running in the session will be terminated."));
gtk_dialog_add_buttons(GTK_DIALOG(dlg), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("结束会话", "End session"), GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_CANCEL);
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) { char cmd[64]; snprintf(cmd, sizeof cmd, "kill\t%u", id); push(cmd); }
gtk_widget_destroy(dlg);
}
static void build_terminal(void) {
GtkWidget *content; frame("终端远控", &content); gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
GtkWidget *head = hbox(12); session_dot = label("● 正在读取会话", "online");
session_create = button("创建会话", "primary"); session_kill = button("结束会话", NULL);
GtkWidget *content; frame(L("终端远控", "Remote terminal"), &content); gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
GtkWidget *head = hbox(12); session_dot = label(L("● 正在读取会话", "● Loading sessions"), "online");
session_create = button(L("创建会话", "New session"), "primary"); session_kill = button(L("结束会话", "End session"), NULL);
gtk_box_pack_start(GTK_BOX(head), label(remote_name, "title"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(head), session_dot, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(head), session_create, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(head), session_kill, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(content), head, FALSE, FALSE, 0);
session_store = gtk_list_store_new(S_N, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
session_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(session_store));
add_column(session_view, "会话 ID", S_ID, 0); add_column(session_view, "Shell", S_SHELL, 1);
add_column(session_view, "创建时间", S_TIME, 0); add_column(session_view, "状态", S_STATE, 0);
add_column(session_view, L("会话 ID", "Session ID"), S_ID, 0); add_column(session_view, "Shell", S_SHELL, 1);
add_column(session_view, L("创建时间", "Created"), S_TIME, 0); add_column(session_view, L("状态", "Status"), S_STATE, 0);
session_stack = gtk_stack_new();
GtkWidget *empty = label("当前无正在运行的终端会话", "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
GtkWidget *empty = label(L("当前无正在运行的终端会话", "No running terminal sessions"), "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
gtk_stack_add_named(GTK_STACK(session_stack), empty, "empty");
gtk_stack_add_named(GTK_STACK(session_stack), label("正在读取会话…", "empty"), "loading");
gtk_stack_add_named(GTK_STACK(session_stack), label("连接已断开,请关闭窗口后重试", "empty"), "offline");
gtk_stack_add_named(GTK_STACK(session_stack), label(L("正在读取会话…", "Loading sessions…"), "empty"), "loading");
gtk_stack_add_named(GTK_STACK(session_stack), label(L("连接已断开,请关闭窗口后重试", "Disconnected. Close the window and try again"), "empty"), "offline");
gtk_stack_add_named(GTK_STACK(session_stack), scrolled(session_view, 360), "list");
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), "loading");
gtk_box_pack_start(GTK_BOX(content), session_stack, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(content), label("双击接回会话;创建会话将在本机终端程序中打开。", "empty"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(content), label(L("双击接回会话;创建会话将在本机终端程序中打开。", "Double-click to reattach; new sessions open in a local terminal."), "empty"), FALSE, FALSE, 0);
gtk_widget_set_sensitive(session_create, FALSE); gtk_widget_set_sensitive(session_kill, FALSE);
g_signal_connect(session_create, "clicked", G_CALLBACK(on_create_session), NULL);
g_signal_connect(session_kill, "clicked", G_CALLBACK(on_kill_session), NULL);
@@ -449,7 +450,7 @@ static gboolean sessions_idle(gpointer d) {
g_strfreev(f);
}
g_strfreev(lines);
gtk_label_set_text(GTK_LABEL(session_dot), s->connected ? "● 已连接" : "● 已断开");
gtk_label_set_text(GTK_LABEL(session_dot), s->connected ? L("● 已连接", "● Connected") : L("● 已断开", "● Disconnected"));
gtk_widget_set_sensitive(session_create, s->connected); gtk_widget_set_sensitive(session_kill, s->connected);
gtk_widget_set_sensitive(session_view, s->connected);
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), s->connected ? (n ? "list" : "empty") : "offline");
+196 -120
View File
@@ -9,6 +9,8 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <sys/stat.h>
#include "i18n.h"
static const char *CSS =
"window { background-color: #ffffff; }\n"
@@ -49,7 +51,7 @@ static const char *CSS =
".status { font-size: 13px; color: #2f6bff; }\n"
".toast { background-color: #ffffff; border: 1px solid #e5e7eb; border-radius: 10px; padding: 10px 18px; font-size: 15px; }\n";
typedef struct { char id[64]; char name[128]; int platform, online, current; } Device;
typedef struct { char id[64]; char name[128]; int platform, online, current; char thumb[512]; } Device;
static Device devices[64];
static int device_count;
static char queue[16][200];
@@ -93,7 +95,7 @@ static GtkWidget *platform_icon(int platform, int online) {
}
static gboolean hide_toast(gpointer d) { (void)d; gtk_widget_hide(toast); return G_SOURCE_REMOVE; }
static void show_toast(const char *text) { gtk_label_set_text(GTK_LABEL(toast), text); gtk_widget_show(toast); g_timeout_add(3500, hide_toast, NULL); }
static void unsupported(GtkButton *b, gpointer what) { (void)b; char t[128]; snprintf(t, sizeof t, "%s:暂未支持", (const char *)what); show_toast(t); }
static void unsupported(GtkButton *b, gpointer what) { (void)b; char t[128]; snprintf(t, sizeof t, L("%s:暂未支持", "%s: not supported yet"), (const char *)what); show_toast(t); }
static void connect_kind(const char *kind) {
if (selected < 0) return;
@@ -102,7 +104,7 @@ static void connect_kind(const char *kind) {
snprintf(cmd, sizeof cmd, "connect\t%s\t%s", devices[selected].id, kind);
pthread_mutex_unlock(&d_lock);
push(cmd);
if (!strcmp(kind, "desktop") || !strcmp(kind, "watch")) show_toast("正在连接…");
if (!strcmp(kind, "desktop") || !strcmp(kind, "watch")) show_toast(L("正在连接…", "Connecting…"));
}
static void on_tool(GtkButton *b, gpointer kind);
static void more_item(GtkButton *b, gpointer kind) {
@@ -110,32 +112,32 @@ static void more_item(GtkButton *b, gpointer kind) {
const char *k = kind;
if (!strcmp(k, "reboot") || !strcmp(k, "shutdown")) {
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
!strcmp(k, "reboot") ? "确定要重启被控电脑吗?" : "确定要关闭被控电脑吗?");
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "远程会话会断开。");
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "确认", GTK_RESPONSE_OK, NULL);
!strcmp(k, "reboot") ? L("确定要重启被控电脑吗?", "Restart the remote computer?") : L("确定要关闭被控电脑吗?", "Shut down the remote computer?"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("远程会话会断开。", "The remote session will be disconnected."));
gtk_dialog_add_buttons(GTK_DIALOG(d), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("确认", "Confirm"), GTK_RESPONSE_OK, NULL);
int ok = gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK; gtk_widget_destroy(d);
if (ok) { connect_kind(k); show_toast("正在发送电源指令…"); }
if (ok) { connect_kind(k); show_toast(L("正在发送电源指令…", "Sending power command…")); }
return;
}
if (!strcmp(k, "unbind")) {
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
"确定要从账号中删除该设备吗?");
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "删除后需要在该设备上重新登录才能再次远控。");
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "删除", GTK_RESPONSE_OK, NULL);
L("确定要从账号中删除该设备吗?", "Remove this device from your account?"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("删除后需要在该设备上重新登录才能再次远控。", "After removal you must sign in on that device again before you can control it."));
gtk_dialog_add_buttons(GTK_DIALOG(d), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("删除", "Remove"), GTK_RESPONSE_OK, NULL);
int ok = gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK; gtk_widget_destroy(d);
if (ok) { gtk_widget_destroy(dialog); connect_kind(k); show_toast("正在删除设备…"); }
if (ok) { gtk_widget_destroy(dialog); connect_kind(k); show_toast(L("正在删除设备…", "Removing device…")); }
return;
}
gtk_widget_destroy(dialog);
on_tool(NULL, kind);
}
static void open_more(void) {
GtkWidget *dialog = gtk_dialog_new_with_buttons("更多工具", GTK_WINDOW(window), GTK_DIALOG_MODAL, NULL, NULL);
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("更多工具", "More tools"), GTK_WINDOW(window), GTK_DIALOG_MODAL, NULL, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 520, -1);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
gtk_box_pack_start(GTK_BOX(box), label("更多工具", "h2"), FALSE, FALSE, 6);
const char *names[] = {"🗂 文件传输", "▶ 观看模式", "⌨ 终端", "⇄ 端口映射", "⏻ 远程开机", "↻ 重启", "⏻ 关机", "🗑 删除设备"};
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), L("⏻ 远程开机", "⏻ Wake on LAN"), L("↻ 重启", "↻ Restart"), L("⏻ 关机", "⏻ Shut down"), L("🗑 删除设备", "🗑 Remove device")};
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
for (int i = 0; i < 8; i++) {
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
@@ -146,8 +148,8 @@ static void open_more(void) {
else g_signal_connect(b, "clicked", G_CALLBACK(more_item), (gpointer)kinds[i]);
gtk_box_pack_start(GTK_BOX(box), b, FALSE, FALSE, 0);
}
GtkWidget *foot = hbox(10), *order = button("调整顺序", "secondary"), *close = button("关闭", "secondary");
g_signal_connect(order, "clicked", G_CALLBACK(unsupported), "调整顺序");
GtkWidget *foot = hbox(10), *order = button(L("调整顺序", "Reorder"), "secondary"), *close = button(L("关闭", "Close"), "secondary");
g_signal_connect(order, "clicked", G_CALLBACK(unsupported), L("调整顺序", "Reorder"));
g_signal_connect_swapped(close, "clicked", G_CALLBACK(gtk_widget_destroy), dialog);
gtk_box_pack_start(GTK_BOX(foot), order, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(foot), close, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 8);
@@ -159,10 +161,10 @@ static void on_tool(GtkButton *b, gpointer kind) {
(void)b;
if (!strcmp(kind, "more")) open_more();
else if (!strcmp(kind, "wol") || !strcmp(kind, "reboot") || !strcmp(kind, "shutdown"))
unsupported(NULL, (gpointer)(!strcmp(kind, "wol") ? "远程开机" : !strcmp(kind, "reboot") ? "重启" : "关机"));
unsupported(NULL, (gpointer)(!strcmp(kind, "wol") ? L("远程开机", "Wake on LAN") : !strcmp(kind, "reboot") ? L("重启", "Restart") : L("关机", "Shut down")));
else connect_kind(kind);
}
static void on_login(GtkButton *b, gpointer d) { (void)b; (void)d; push("login"); gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); gtk_label_set_text(GTK_LABEL(title_label), "登录"); }
static void on_login(GtkButton *b, gpointer d) { (void)b; (void)d; push("login"); gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); gtk_label_set_text(GTK_LABEL(title_label), L("登录", "Sign in")); }
static void set_header(const char *title, int device_page) {
gtk_label_set_text(GTK_LABEL(title_label), title);
@@ -170,19 +172,52 @@ static void set_header(const char *title, int device_page) {
}
static void show_page(const char *name, const char *title) {
int need_login = strcmp(name, "assist") && strcmp(name, "login");
if (!logged_in && need_login) { set_header("全部设备", 0); gtk_stack_set_visible_child_name(GTK_STACK(stack), "welcome"); return; }
if (!logged_in && need_login) { set_header(L("全部设备", "All devices"), 0); gtk_stack_set_visible_child_name(GTK_STACK(stack), "welcome"); return; }
set_header(title, 0);
gtk_stack_set_visible_child_name(GTK_STACK(stack), name);
}
// ---- device preview: the last remote picture saved by the desktop window (src/viewer/thumbs.rs) ----
static GtkWidget *preview_bg;
static GdkPixbuf *thumb_pixbuf;
static char thumb_loaded[512];
static gint64 thumb_mtime;
static void load_thumb(const char *path) {
struct stat st; gint64 mtime = path[0] && stat(path, &st) == 0 ? (gint64)st.st_mtime : 0;
if (!strcmp(path, thumb_loaded) && mtime == thumb_mtime) return;
if (thumb_pixbuf) { g_object_unref(thumb_pixbuf); thumb_pixbuf = NULL; }
snprintf(thumb_loaded, sizeof thumb_loaded, "%s", path); thumb_mtime = mtime;
if (mtime) thumb_pixbuf = gdk_pixbuf_new_from_file(path, NULL);
if (preview_bg) gtk_widget_queue_draw(preview_bg);
}
static gboolean draw_preview(GtkWidget *w, cairo_t *cr, gpointer d) {
(void)d; if (!thumb_pixbuf) return FALSE;
double W = gtk_widget_get_allocated_width(w), H = gtk_widget_get_allocated_height(w), r = 12;
double pw = gdk_pixbuf_get_width(thumb_pixbuf), ph = gdk_pixbuf_get_height(thumb_pixbuf);
double scale = W / pw > H / ph ? W / pw : H / ph; // cover, centered
cairo_save(cr);
cairo_new_path(cr); cairo_arc(cr, r, r, r, G_PI, 1.5 * G_PI); cairo_arc(cr, W - r, r, r, 1.5 * G_PI, 2 * G_PI);
cairo_line_to(cr, W, H); cairo_line_to(cr, 0, H); cairo_close_path(cr); cairo_clip(cr);
cairo_translate(cr, (W - pw * scale) / 2, (H - ph * scale) / 2); cairo_scale(cr, scale, scale);
gdk_cairo_set_source_pixbuf(cr, thumb_pixbuf, 0, 0);
cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_GOOD); cairo_paint(cr);
cairo_restore(cr);
// Soft shade at the bottom keeps the "Open desktop" button readable on bright desktops.
cairo_pattern_t *g = cairo_pattern_create_linear(0, H * 0.55, 0, H);
cairo_pattern_add_color_stop_rgba(g, 0, 0, 0, 0, 0); cairo_pattern_add_color_stop_rgba(g, 1, 0, 0, 0, 0.35);
cairo_rectangle(cr, 0, 0, W, H); cairo_set_source(cr, g); cairo_fill(cr); cairo_pattern_destroy(g);
return FALSE;
}
static void show_device(int index) {
pthread_mutex_lock(&d_lock);
if (index < 0 || index >= device_count) { pthread_mutex_unlock(&d_lock); return; }
selected = index;
char name[128]; snprintf(name, sizeof name, "%s", devices[index].name);
int online = devices[index].online;
char thumb[512]; snprintf(thumb, sizeof thumb, "%s", devices[index].thumb);
pthread_mutex_unlock(&d_lock);
load_thumb(thumb);
set_header(name, 1);
gtk_label_set_markup(GTK_LABEL(badge), online ? "<span foreground='#22c55e'>●</span> 在线" : "离线");
gtk_label_set_markup(GTK_LABEL(badge), online ? L("<span foreground='#22c55e'>●</span> 在线", "<span foreground='#22c55e'>●</span> Online") : L("离线", "Offline"));
GtkStyleContext *ctx = gtk_widget_get_style_context(badge);
if (online) gtk_style_context_remove_class(ctx, "off"); else gtk_style_context_add_class(ctx, "off");
gtk_stack_set_visible_child_name(GTK_STACK(stack), "device");
@@ -194,9 +229,9 @@ static void on_row(GtkListBox *box, GtkListBoxRow *row, gpointer d) {
gtk_list_box_unselect_all(GTK_LIST_BOX(box == GTK_LIST_BOX(device_list) ? assist_list : device_list));
const char *kind = g_object_get_data(G_OBJECT(row), "kind");
if (!kind) { show_device(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(row), "index"))); return; }
if (!strcmp(kind, "all")) show_page("all", "全部设备");
else if (!strcmp(kind, "assist")) show_page("assist", "远程协助");
else if (!strcmp(kind, "favorite")) show_page("favorite", "收藏设备");
if (!strcmp(kind, "all")) show_page("all", L("全部设备", "All devices"));
else if (!strcmp(kind, "assist")) show_page("assist", L("远程协助", "Remote assistance"));
else if (!strcmp(kind, "favorite")) show_page("favorite", L("收藏设备", "Favorites"));
}
static void on_card(GtkButton *b, gpointer index) { (void)b; show_device(GPOINTER_TO_INT(index)); }
@@ -220,18 +255,18 @@ static void on_info(GtkButton *b, gpointer index) {
int i = GPOINTER_TO_INT(index);
char name[128] = "";
pthread_mutex_lock(&d_lock); if (i >= 0 && i < device_count) snprintf(name, sizeof name, "%s", devices[i].name); pthread_mutex_unlock(&d_lock);
GtkWidget *dialog = gtk_dialog_new_with_buttons("设备信息", GTK_WINDOW(window), GTK_DIALOG_MODAL, "完成", GTK_RESPONSE_OK, NULL);
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("设备信息", "Device info"), GTK_WINDOW(window), GTK_DIALOG_MODAL, L("完成", "Done"), GTK_RESPONSE_OK, NULL);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(12);
gtk_container_set_border_width(GTK_CONTAINER(box), 20);
GtkWidget *c1 = vbox(8); add_class(c1, "card");
GtkWidget *r = hbox(8); gtk_box_pack_start(GTK_BOX(r), label("名称", "devname"), TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(r), label(name, "hint"), FALSE, FALSE, 0);
GtkWidget *r = hbox(8); gtk_box_pack_start(GTK_BOX(r), label(L("名称", "Name"), "devname"), TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(r), label(name, "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c1), r, FALSE, FALSE, 0);
GtkWidget *rename = button("重命名", "secondary"); gtk_widget_set_halign(rename, GTK_ALIGN_END);
g_signal_connect(rename, "clicked", G_CALLBACK(unsupported), "重命名");
GtkWidget *rename = button(L("重命名", "Rename"), "secondary"); gtk_widget_set_halign(rename, GTK_ALIGN_END);
g_signal_connect(rename, "clicked", G_CALLBACK(unsupported), L("重命名", "Rename"));
gtk_box_pack_start(GTK_BOX(c1), rename, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), c1, FALSE, FALSE, 0);
GtkWidget *c2 = vbox(10); add_class(c2, "card");
const char *rows[] = {"处理器", "网卡", "总内存", "系统版本", "显卡"};
const char *rows[] = {L("处理器", "Processor"), L("网卡", "Network adapter"), L("总内存", "Total memory"), L("系统版本", "OS version"), L("显卡", "Graphics")};
for (int k = 0; k < 5; k++) {
GtkWidget *line = hbox(8);
gtk_box_pack_start(GTK_BOX(line), label(rows[k], "devname"), TRUE, TRUE, 0);
@@ -239,7 +274,7 @@ static void on_info(GtkButton *b, gpointer index) {
gtk_box_pack_start(GTK_BOX(c2), line, FALSE, FALSE, 0);
}
gtk_box_pack_start(GTK_BOX(box), c2, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), label("硬件信息暂未获取。", "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), label(L("硬件信息暂未获取。", "Hardware info not available yet."), "hint"), FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(area), box);
gtk_widget_show_all(dialog); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog);
}
@@ -249,8 +284,9 @@ static gboolean apply_devices(gpointer d) {
(void)d;
clear(device_list); clear(all_box);
pthread_mutex_lock(&d_lock);
if (selected >= 0 && selected < device_count) load_thumb(devices[selected].thumb);
if (!banner_closed) gtk_widget_show_all(banner);
char group[64]; snprintf(group, sizeof group, "⌄ 电脑 %d", device_count);
char group[64]; snprintf(group, sizeof group, L("⌄ 电脑 %d", "⌄ Computers %d"), device_count);
gtk_box_pack_start(GTK_BOX(all_box), label(group, "group"), FALSE, FALSE, 8);
for (int i = 0; i < device_count; i++) {
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(8);
@@ -266,7 +302,7 @@ static gboolean apply_devices(gpointer d) {
GtkWidget *card = hbox(12); add_class(card, "card");
gtk_box_pack_start(GTK_BOX(card), platform_icon(devices[i].platform, 1), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(card), label(devices[i].name, "devname"), FALSE, FALSE, 0);
if (devices[i].current) gtk_box_pack_start(GTK_BOX(card), label("本机", "tag"), FALSE, FALSE, 0);
if (devices[i].current) gtk_box_pack_start(GTK_BOX(card), label(L("本机", "This device"), "tag"), FALSE, FALSE, 0);
GtkWidget *open = button("›", "hbtn"), *info = button("ⓘ", "hbtn");
g_signal_connect(info, "clicked", G_CALLBACK(on_info), GINT_TO_POINTER(i));
if (!devices[i].current) { g_signal_connect(open, "clicked", G_CALLBACK(on_card), GINT_TO_POINTER(i)); gtk_box_pack_end(GTK_BOX(card), open, FALSE, FALSE, 0); }
@@ -275,12 +311,20 @@ static gboolean apply_devices(gpointer d) {
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
}
pthread_mutex_unlock(&d_lock);
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", "全部设备", "all"), -1);
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", L("全部设备", "All devices"), "all"), -1);
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
return G_SOURCE_REMOVE;
}
static GtkWidget *account_who, *account_out;
/* The settings window is built once and kept; refresh its account card on every login change. */
static void refresh_account(void) {
if (!account_who) return;
gtk_label_set_text(GTK_LABEL(account_who), logged_in ? (user_text[0] ? user_text : L("已登录", "Signed in")) : L("未登录", "Not signed in"));
gtk_widget_set_sensitive(account_out, logged_in);
}
static gboolean apply_login(gpointer d) {
(void)d;
refresh_account();
gtk_label_set_text(GTK_LABEL(status_label), status_text);
if (qr_path[0]) {
GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size(qr_path, 240, 240, NULL);
@@ -288,9 +332,9 @@ static gboolean apply_login(gpointer d) {
} else gtk_image_clear(GTK_IMAGE(qr_image));
gtk_widget_set_visible(my_section, logged_in);
const char *page = gtk_stack_get_visible_child_name(GTK_STACK(stack));
if (logged_in && (!strcmp(page, "login") || !strcmp(page, "welcome"))) show_page("all", "全部设备");
if (!logged_in && strcmp(page, "login") && strcmp(page, "assist")) show_page("welcome", "全部设备");
if (!logged_in && qr_path[0]) { gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); set_header("登录", 0); }
if (logged_in && (!strcmp(page, "login") || !strcmp(page, "welcome"))) show_page("all", L("全部设备", "All devices"));
if (!logged_in && strcmp(page, "login") && strcmp(page, "assist")) show_page("welcome", L("全部设备", "All devices"));
if (!logged_in && qr_path[0]) { gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); set_header(L("登录", "Sign in"), 0); }
return G_SOURCE_REMOVE;
}
@@ -299,28 +343,28 @@ static GtkWidget *build_welcome(void) {
GtkWidget *page = vbox(22); gtk_widget_set_valign(page, GTK_ALIGN_CENTER); gtk_widget_set_halign(page, GTK_ALIGN_CENTER);
GtkWidget *art = gtk_event_box_new(); add_class(art, "preview"); gtk_widget_set_size_request(art, 520, 300);
gtk_box_pack_start(GTK_BOX(page), art, FALSE, FALSE, 0);
GtkWidget *t = label("随时访问个人设备,可用于办公、游戏、文件传输。", "h2"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
GtkWidget *t = label(L("随时访问个人设备,可用于办公、游戏、文件传输。", "Access your devices anytime for work, gaming and file transfer."), "h2"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(page), t, FALSE, FALSE, 0);
GtkWidget *b = button("立即登录", "primary"); gtk_widget_set_halign(b, GTK_ALIGN_CENTER);
GtkWidget *b = button(L("立即登录", "Sign in now"), "primary"); gtk_widget_set_halign(b, GTK_ALIGN_CENTER);
g_signal_connect(b, "clicked", G_CALLBACK(on_login), NULL);
gtk_box_pack_start(GTK_BOX(page), b, FALSE, FALSE, 0);
return page;
}
static GtkWidget *build_login(void) {
GtkWidget *page = vbox(16); gtk_widget_set_valign(page, GTK_ALIGN_CENTER); gtk_widget_set_halign(page, GTK_ALIGN_CENTER);
GtkWidget *brand = label("UU 远程 Linux 控制端(非官方)", "h2"); gtk_widget_set_halign(brand, GTK_ALIGN_CENTER);
GtkWidget *t = label("扫码登录", "group"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
GtkWidget *brand = label(L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)"), "h2"); gtk_widget_set_halign(brand, GTK_ALIGN_CENTER);
GtkWidget *t = label(L("扫码登录", "Scan to sign in"), "group"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(page), brand, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), t, FALSE, FALSE, 0);
GtkWidget *box = vbox(0); add_class(box, "qrbox"); gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
qr_image = gtk_image_new(); gtk_widget_set_size_request(qr_image, 240, 240);
gtk_container_add(GTK_CONTAINER(box), qr_image);
gtk_box_pack_start(GTK_BOX(page), box, FALSE, FALSE, 0);
GtkWidget *h = label("请使用网易 UU 远程 App 扫一扫\n可快速登录", "hint"); gtk_label_set_justify(GTK_LABEL(h), GTK_JUSTIFY_CENTER); gtk_widget_set_halign(h, GTK_ALIGN_CENTER);
GtkWidget *h = label(L("请使用网易 UU 远程 App 扫一扫\n可快速登录", "Scan with the NetEase UU Remote app\nto sign in quickly"), "hint"); gtk_label_set_justify(GTK_LABEL(h), GTK_JUSTIFY_CENTER); gtk_widget_set_halign(h, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(page), h, FALSE, FALSE, 0);
status_label = label("", "status"); gtk_widget_set_halign(status_label, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(page), status_label, FALSE, FALSE, 0);
GtkWidget *again = button("刷新二维码", "secondary"); gtk_widget_set_halign(again, GTK_ALIGN_CENTER);
GtkWidget *again = button(L("刷新二维码", "Refresh QR code"), "secondary"); gtk_widget_set_halign(again, GTK_ALIGN_CENTER);
g_signal_connect(again, "clicked", G_CALLBACK(on_login), NULL);
gtk_box_pack_start(GTK_BOX(page), again, FALSE, FALSE, 0);
return page;
@@ -328,14 +372,15 @@ static GtkWidget *build_login(void) {
static GtkWidget *build_device(void) {
GtkWidget *page = vbox(0); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
GtkWidget *preview = gtk_overlay_new(), *bg = gtk_event_box_new(); add_class(bg, "preview"); gtk_widget_set_size_request(bg, -1, 320);
preview_bg = bg; g_signal_connect_after(bg, "draw", G_CALLBACK(draw_preview), NULL);
gtk_container_add(GTK_CONTAINER(preview), bg);
GtkWidget *enter = button("进入桌面 →", "enter");
GtkWidget *enter = button(L("进入桌面 →", "Open desktop →"), "enter");
gtk_widget_set_halign(enter, GTK_ALIGN_CENTER); gtk_widget_set_valign(enter, GTK_ALIGN_END); gtk_widget_set_margin_bottom(enter, 26);
g_signal_connect(enter, "clicked", G_CALLBACK(on_tool), "desktop");
gtk_overlay_add_overlay(GTK_OVERLAY(preview), enter);
gtk_box_pack_start(GTK_BOX(page), preview, FALSE, FALSE, 0);
GtkWidget *tools = hbox(0); add_class(tools, "toolbar");
const char *names[] = {"🗂 文件传输", "▶ 观看模式", "⌨ 终端", "⇄ 端口映射", "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
for (int i = 0; i < 5; i++) {
GtkWidget *b = button(names[i], "tool");
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
@@ -343,11 +388,11 @@ static GtkWidget *build_device(void) {
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
}
gtk_box_pack_start(GTK_BOX(page), tools, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), label("快速启动", "h2"), FALSE, FALSE, 22);
gtk_box_pack_start(GTK_BOX(page), label(L("快速启动", "Quick launch"), "h2"), FALSE, FALSE, 22);
GtkWidget *quick = vbox(10); add_class(quick, "dashed");
GtkWidget *add = button("+", "round"); gtk_widget_set_halign(add, GTK_ALIGN_CENTER);
g_signal_connect(add, "clicked", G_CALLBACK(unsupported), "快速启动");
GtkWidget *al = label("添加", "hint"); gtk_widget_set_halign(al, GTK_ALIGN_CENTER);
g_signal_connect(add, "clicked", G_CALLBACK(unsupported), L("快速启动", "Quick launch"));
GtkWidget *al = label(L("添加", "Add"), "hint"); gtk_widget_set_halign(al, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(quick), add, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(quick), al, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), quick, FALSE, FALSE, 0);
return page;
@@ -357,8 +402,8 @@ static GtkWidget *build_all(void) {
GtkWidget *page = vbox(8); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
banner = hbox(10); add_class(banner, "banner");
GtkWidget *text = vbox(4);
gtk_box_pack_start(GTK_BOX(text), label("ⓘ 添加你的其他设备", "group"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(text), label("在其他电脑上安装 UU 远程官方客户端或本项目主机端,登录同一账号后即可在这里远程访问。", "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(text), label(L("ⓘ 添加你的其他设备", "ⓘ Add your other devices"), "group"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(text), label(L("在其他电脑上安装 UU 远程官方客户端或本项目主机端,登录同一账号后即可在这里远程访问。", "Install the official UU Remote client or this project's host on another computer and sign in with the same account to access it here."), "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(banner), text, TRUE, TRUE, 0);
GtkWidget *x = button("×", "hbtn"); gtk_widget_set_valign(x, GTK_ALIGN_START);
g_signal_connect(x, "clicked", G_CALLBACK(close_banner), NULL);
@@ -372,51 +417,51 @@ static GtkWidget *build_all(void) {
static void on_assist_connect(GtkButton *b, gpointer entry) {
(void)b;
const char *id = gtk_entry_get_text(GTK_ENTRY(entry));
if (!id[0]) { show_toast("请输入伙伴的设备 ID"); return; }
if (!id[0]) { show_toast(L("请输入伙伴的设备 ID", "Enter your partner's device ID")); return; }
GtkWidget *code_entry = g_object_get_data(G_OBJECT(entry), "assist-code");
const char *code = gtk_entry_get_text(GTK_ENTRY(code_entry));
if (!code[0]) { show_toast("请输入伙伴的设备验证码"); return; }
if (strpbrk(id, "\t\r\n") || strpbrk(code, "\t\r\n")) { show_toast("设备 ID 和验证码不能包含换行或制表符"); return; }
if (!code[0]) { show_toast(L("请输入伙伴的设备验证码", "Enter your partner's verification code")); return; }
if (strpbrk(id, "\t\r\n") || strpbrk(code, "\t\r\n")) { show_toast(L("设备 ID 和验证码不能包含换行或制表符", "Device ID and code cannot contain line breaks or tabs")); return; }
char cmd[200];
int n = snprintf(cmd, sizeof cmd, "assist\t%s\t%s", id, code);
if (n < 0 || (size_t)n >= sizeof cmd) { show_toast("设备 ID 或验证码过长"); return; }
if (n < 0 || (size_t)n >= sizeof cmd) { show_toast(L("设备 ID 或验证码过长", "Device ID or code is too long")); return; }
int accepted = push(cmd);
memset(cmd, 0, sizeof cmd);
if (!accepted) { show_toast("连接请求过多,请稍后重试"); return; }
if (!accepted) { show_toast(L("连接请求过多,请稍后重试", "Too many connection requests, try again later")); return; }
gtk_entry_set_text(GTK_ENTRY(code_entry), "");
show_toast("正在连接…");
show_toast(L("正在连接…", "Connecting…"));
}
static GtkWidget *build_assist(void) {
GtkWidget *page = vbox(20); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
GtkWidget *mine = vbox(14); add_class(mine, "card");
GtkWidget *top = hbox(10); gtk_box_pack_start(GTK_BOX(top), label("本设备", "h2"), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(top), label("允许他人远程协助", "devname"), FALSE, FALSE, 0);
GtkWidget *top = hbox(10); gtk_box_pack_start(GTK_BOX(top), label(L("本设备", "This device"), "h2"), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(top), label(L("允许他人远程协助", "Allow remote assistance"), "devname"), FALSE, FALSE, 0);
GtkWidget *sw = gtk_switch_new(); gtk_widget_set_sensitive(sw, FALSE); gtk_box_pack_start(GTK_BOX(top), sw, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(mine), top, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(mine), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
GtkWidget *grid = hbox(40), *c1 = vbox(6), *c2 = vbox(6);
gtk_box_pack_start(GTK_BOX(c1), label("本设备 ID", "devname"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c1), label(L("本设备 ID", "This device's ID"), "devname"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c1), label("— — —", "big"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c2), label("验证方式:仅使用临时验证码", "devname"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c2), label(L("验证方式:仅使用临时验证码", "Verification: temporary code only"), "devname"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c2), label("—", "big"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c2), label("每次远控结束刷新", "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(c2), label(L("每次远控结束刷新", "Refreshed after every remote session"), "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(grid), c1, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(grid), c2, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(mine), grid, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(mine), label("本机被协助由 uuremote-server 主机端提供(uuremote-server assist)。", "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(mine), label(L("本机被协助由 uuremote-server 主机端提供(uuremote-server assist)。", "Assistance for this computer is provided by the uuremote-server host (uuremote-server assist)."), "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), mine, FALSE, FALSE, 0);
GtkWidget *peer = vbox(12); add_class(peer, "card");
gtk_box_pack_start(GTK_BOX(peer), label("远控伙伴设备", "h2"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(peer), label("通过其他设备的【设备 ID】及【设备验证码】启动远程控制", "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(peer), label(L("远控伙伴设备", "Control a partner's device"), "h2"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(peer), label(L("通过其他设备的【设备 ID】及【设备验证码】启动远程控制", "Start remote control with another device's [Device ID] and [Verification code]"), "hint"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(peer), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(peer), label("伙伴的设备 ID", "devname"), FALSE, FALSE, 0);
GtkWidget *row = hbox(20), *entry = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entry), "请输入设备 ID"); gtk_widget_set_size_request(entry, 320, -1);
GtkWidget *code = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(code), "请输入设备验证码");
gtk_box_pack_start(GTK_BOX(peer), label(L("伙伴的设备 ID", "Partner's device ID"), "devname"), FALSE, FALSE, 0);
GtkWidget *row = hbox(20), *entry = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entry), L("请输入设备 ID", "Enter device ID")); gtk_widget_set_size_request(entry, 320, -1);
GtkWidget *code = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(code), L("请输入设备验证码", "Enter verification code"));
gtk_entry_set_visibility(GTK_ENTRY(code), FALSE);
gtk_entry_set_input_purpose(GTK_ENTRY(code), GTK_INPUT_PURPOSE_PASSWORD);
gtk_entry_set_max_length(GTK_ENTRY(entry), 64); gtk_entry_set_max_length(GTK_ENTRY(code), 64);
g_object_set_data(G_OBJECT(entry), "assist-code", code);
g_signal_connect(code, "activate", G_CALLBACK(on_assist_connect), entry);
GtkWidget *go = button("连接", "primary"); g_signal_connect(go, "clicked", G_CALLBACK(on_assist_connect), entry);
GtkWidget *go = button(L("连接", "Connect"), "primary"); g_signal_connect(go, "clicked", G_CALLBACK(on_assist_connect), entry);
gtk_box_pack_start(GTK_BOX(row), entry, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(row), code, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(row), go, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(peer), row, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(page), peer, FALSE, FALSE, 0);
@@ -424,10 +469,10 @@ static GtkWidget *build_assist(void) {
}
static void on_add_favorite(GtkButton *b, gpointer d) {
(void)b; (void)d;
GtkWidget *dialog = gtk_dialog_new_with_buttons("添加收藏设备", GTK_WINDOW(window), GTK_DIALOG_MODAL, "取消", GTK_RESPONSE_CANCEL, "添加", GTK_RESPONSE_OK, NULL);
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("添加收藏设备", "Add favorite device"), GTK_WINDOW(window), GTK_DIALOG_MODAL, L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("添加", "Add"), GTK_RESPONSE_OK, NULL);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *card = vbox(12); add_class(card, "card");
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
const char *names[] = {"伙伴的设备 ID", "设备验证码(可选)", "备注名称(可选)"}, *hints[] = {"请输入设备 ID", "请输入设备验证码", "请输入名称"};
const char *names[] = {L("伙伴的设备 ID", "Partner's device ID"), L("设备验证码(可选)", "Verification code (optional)"), L("备注名称(可选)", "Nickname (optional)")}, *hints[] = {L("请输入设备 ID", "Enter device ID"), L("请输入设备验证码", "Enter verification code"), L("请输入名称", "Enter a name")};
GtkWidget *first = NULL;
for (int i = 0; i < 3; i++) {
GtkWidget *line = hbox(20), *e = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(e), hints[i]); gtk_widget_set_size_request(e, 280, -1);
@@ -440,17 +485,17 @@ static void on_add_favorite(GtkButton *b, gpointer d) {
int response = gtk_dialog_run(GTK_DIALOG(dialog));
int has_id = first && gtk_entry_get_text(GTK_ENTRY(first))[0];
gtk_widget_destroy(dialog);
if (response == GTK_RESPONSE_OK) show_toast(has_id ? "收藏设备:暂未支持" : "请输入伙伴的设备 ID");
if (response == GTK_RESPONSE_OK) show_toast(has_id ? L("收藏设备:暂未支持", "Favorite devices: not supported yet") : L("请输入伙伴的设备 ID", "Enter your partner's device ID"));
}
static GtkWidget *build_favorite(void) {
GtkWidget *page = vbox(10); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
GtkWidget *add = button("添加收藏设备", "secondary"); gtk_widget_set_halign(add, GTK_ALIGN_END);
GtkWidget *add = button(L("添加收藏设备", "Add favorite device"), "secondary"); gtk_widget_set_halign(add, GTK_ALIGN_END);
g_signal_connect(add, "clicked", G_CALLBACK(on_add_favorite), NULL);
gtk_box_pack_start(GTK_BOX(page), add, FALSE, FALSE, 0);
fav_stack = gtk_stack_new();
GtkWidget *empty = vbox(10); gtk_widget_set_valign(empty, GTK_ALIGN_CENTER);
GtkWidget *box = label("📦", "big"); gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
GtkWidget *t = label("暂无收藏", "devname"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
GtkWidget *t = label(L("暂无收藏", "No favorites yet"), "devname"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(empty), box, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(empty), t, FALSE, FALSE, 0);
gtk_stack_add_named(GTK_STACK(fav_stack), empty, "empty");
gtk_box_pack_start(GTK_BOX(page), fav_stack, TRUE, TRUE, 0);
@@ -478,7 +523,7 @@ static GtkWidget *settings_card(GtkWidget **rows, int n) {
return card;
}
static GtkWidget *settings_page(void) { GtkWidget *p = vbox(14); gtk_container_set_border_width(GTK_CONTAINER(p), 22); return p; }
static GtkWidget *edit_button(const char *what) { GtkWidget *b = button("编辑", "secondary"); g_signal_connect(b, "clicked", G_CALLBACK(unsupported), (gpointer)what); return b; }
static GtkWidget *edit_button(const char *what) { GtkWidget *b = button(L("编辑", "Edit"), "secondary"); g_signal_connect(b, "clicked", G_CALLBACK(unsupported), (gpointer)what); return b; }
static gboolean settings_hidden(GtkWidget *w, GdkEvent *e, gpointer d) { (void)e; (void)d; gtk_widget_hide(w); return TRUE; }
static gboolean settings_key(GtkWidget *w, GdkEventKey *e, gpointer d) { (void)d; if (e->keyval == GDK_KEY_Escape) { gtk_widget_hide(w); return TRUE; } return FALSE; }
// Compositors such as Hyprland draw no title bar, so windows carry their own (with a close button).
@@ -488,15 +533,31 @@ static void own_titlebar(GtkWidget *w, const char *title) {
gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(bar), TRUE);
gtk_window_set_titlebar(GTK_WINDOW(w), bar);
}
static atomic_int host_active;
static GtkWidget *host_switch;
static gboolean host_idle(gpointer d) { (void)d; if (host_switch) gtk_switch_set_active(GTK_SWITCH(host_switch), atomic_load(&host_active)); return G_SOURCE_REMOVE; }
void uu_viewer_ui_set_host(int active) { atomic_store(&host_active, active != 0); g_idle_add(host_idle, NULL); }
static void on_host(GObject *o, GParamSpec *p, gpointer d) {
(void)p; (void)d; int on = gtk_switch_get_active(GTK_SWITCH(o));
if (on != atomic_load(&host_active)) { atomic_store(&host_active, on); push(on ? "host\ton" : "host\toff"); }
}
static void on_language(GtkComboBox *c, gpointer d) {
(void)d; int english = gtk_combo_box_get_active(c) == 1;
if (english == uu_i18n_english()) return;
if (!uu_i18n_save(english)) show_toast(L("无法保存语言设置", "Could not save the language"));
else push("relaunch");
}
static void confirm_logout(void);
static void on_sign_out(GtkButton *b, gpointer d) { (void)b; (void)d; if (logged_in) confirm_logout(); }
static void open_settings(void) {
if (settings_window) { gtk_window_present(GTK_WINDOW(settings_window)); return; }
if (settings_window) { refresh_account(); gtk_window_present(GTK_WINDOW(settings_window)); return; }
settings_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(settings_window), "设置");
gtk_window_set_title(GTK_WINDOW(settings_window), L("设置", "Settings"));
gtk_window_set_transient_for(GTK_WINDOW(settings_window), GTK_WINDOW(window));
gtk_window_set_default_size(GTK_WINDOW(settings_window), 680, 600);
g_signal_connect(settings_window, "delete-event", G_CALLBACK(settings_hidden), NULL);
g_signal_connect(settings_window, "key-press-event", G_CALLBACK(settings_key), NULL);
own_titlebar(settings_window, "设置");
own_titlebar(settings_window, L("设置", "Settings"));
GtkWidget *root = vbox(0), *tabs = gtk_stack_new(), *switcher = gtk_stack_switcher_new();
gtk_stack_switcher_set_stack(GTK_STACK_SWITCHER(switcher), GTK_STACK(tabs));
gtk_widget_set_halign(switcher, GTK_ALIGN_CENTER); gtk_widget_set_margin_top(switcher, 10); gtk_widget_set_margin_bottom(switcher, 6);
@@ -504,60 +565,74 @@ static void open_settings(void) {
gtk_box_pack_start(GTK_BOX(root), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
// 常规
GtkWidget *general = settings_page();
const char *wake[] = {"永不", "接通电源时", "始终"}, *close_opts[] = {"最小化", "退出程序"};
GtkWidget *g1[] = { setting_row("开机自启动", NULL, gtk_switch_new()),
setting_row("保持唤醒状态", "防止电脑进入睡眠状态,导致无法远程访问。", combo(wake, 3)),
setting_row("关闭窗口时", NULL, combo(close_opts, 2)) };
GtkWidget *acct = hbox(12), *acct_text = vbox(2);
gtk_box_pack_start(GTK_BOX(acct_text), label(L("账号", "Account"), "devname"), FALSE, FALSE, 0);
account_who = label("", "hint"); gtk_box_pack_start(GTK_BOX(acct_text), account_who, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(acct), acct_text, TRUE, TRUE, 0);
account_out = button(L("退出登录", "Sign out"), "secondary"); gtk_widget_set_valign(account_out, GTK_ALIGN_CENTER);
g_signal_connect(account_out, "clicked", G_CALLBACK(on_sign_out), NULL); gtk_box_pack_end(GTK_BOX(acct), account_out, FALSE, FALSE, 0);
GtkWidget *g0[] = { acct };
gtk_box_pack_start(GTK_BOX(general), settings_card(g0, 1), FALSE, FALSE, 0);
refresh_account();
const char *wake[] = {L("永不", "Never"), L("接通电源时", "When plugged in"), L("始终", "Always")}, *close_opts[] = {L("最小化", "Minimize"), L("退出程序", "Quit")};
GtkWidget *g1[] = { setting_row(L("开机自启动", "Start at login"), NULL, gtk_switch_new()),
setting_row(L("保持唤醒状态", "Stay awake"), L("防止电脑进入睡眠状态,导致无法远程访问。", "Keep the computer from sleeping so it stays reachable."), combo(wake, 3)),
setting_row(L("关闭窗口时", "When closing the window"), NULL, combo(close_opts, 2)) };
gtk_box_pack_start(GTK_BOX(general), settings_card(g1, 3), FALSE, FALSE, 0);
GtkWidget *path = hbox(8); GtkWidget *change = button("修改路径", "secondary"), *open = button("打开文件夹", "secondary");
g_signal_connect(change, "clicked", G_CALLBACK(unsupported), "修改路径"); g_signal_connect(open, "clicked", G_CALLBACK(unsupported), "打开文件夹");
GtkWidget *path = hbox(8); GtkWidget *change = button(L("修改路径", "Change path"), "secondary"), *open = button(L("打开文件夹", "Open folder"), "secondary");
g_signal_connect(change, "clicked", G_CALLBACK(unsupported), L("修改路径", "Change path")); g_signal_connect(open, "clicked", G_CALLBACK(unsupported), L("打开文件夹", "Open folder"));
gtk_box_pack_end(GTK_BOX(path), open, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(path), change, FALSE, FALSE, 0);
GtkWidget *g2[] = { setting_row("传输文件存储路径", "~/Downloads", path) };
GtkWidget *g2[] = { setting_row(L("传输文件存储路径", "Received files folder"), "~/Downloads", path) };
gtk_box_pack_start(GTK_BOX(general), settings_card(g2, 1), FALSE, FALSE, 0);
GtkWidget *real = button("在手机 App 中查看", "secondary"); gtk_widget_set_sensitive(real, FALSE);
GtkWidget *g3[] = { setting_row("实名认证", NULL, real) };
GtkWidget *real = button(L("在手机 App 中查看", "View in the mobile app"), "secondary"); gtk_widget_set_sensitive(real, FALSE);
GtkWidget *g3[] = { setting_row(L("实名认证", "Identity verification"), NULL, real) };
gtk_box_pack_start(GTK_BOX(general), settings_card(g3, 1), FALSE, FALSE, 0);
gtk_stack_add_titled(GTK_STACK(tabs), general, "general", "⚙ 常规");
const char *languages[] = {"中文", "English"}; GtkWidget *language = combo(languages, 2);
gtk_combo_box_set_active(GTK_COMBO_BOX(language), uu_i18n_english()); g_signal_connect(language, "changed", G_CALLBACK(on_language), NULL);
GtkWidget *g4[] = { setting_row("语言 / Language", NULL, language) };
gtk_box_pack_start(GTK_BOX(general), settings_card(g4, 1), FALSE, FALSE, 0);
gtk_stack_add_titled(GTK_STACK(tabs), general, "general", L("⚙ 常规", "⚙ General"));
// 安全
GtkWidget *security = settings_page();
const char *verify[] = {"仅使用临时验证码", "仅使用自定义验证码", "临时与自定义验证码"};
GtkWidget *s1[] = { setting_row("允许同账号控制本设备", NULL, gtk_switch_new()), setting_row("允许他人远程协助", NULL, gtk_switch_new()) };
GtkWidget *s2[] = { setting_row("远程协助连接本设备的验证方式", NULL, combo(verify, 3)) };
GtkWidget *s3[] = { setting_row("客户端锁定", "防止客户端设置被修改,保障数据与使用安全。", gtk_switch_new()) };
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
host_switch = gtk_switch_new(); gtk_switch_set_active(GTK_SWITCH(host_switch), atomic_load(&host_active));
g_signal_connect(host_switch, "notify::active", G_CALLBACK(on_host), NULL);
GtkWidget *s1[] = { setting_row(L("允许同账号控制本设备", "Allow the same account to control this device"), L("默认关闭。开启后本机会出现在你的设备列表中,可被远程控制(uuremote-server 用户服务)", "Off by default. When on, this computer appears in your device list and can be controlled (uuremote-server user service)"), host_switch), setting_row(L("允许他人远程协助", "Allow remote assistance"), NULL, gtk_switch_new()) };
GtkWidget *s2[] = { setting_row(L("远程协助连接本设备的验证方式", "Verification for remote assistance"), NULL, combo(verify, 3)) };
GtkWidget *s3[] = { setting_row(L("客户端锁定", "Lock client"), L("防止客户端设置被修改,保障数据与使用安全。", "Prevents client settings from being changed, keeping data and usage safe."), gtk_switch_new()) };
gtk_box_pack_start(GTK_BOX(security), settings_card(s1, 2), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(security), settings_card(s2, 1), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(security), settings_card(s3, 1), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(security), label("本机被控相关设置由 uuremote-server 主机端提供。", "hint"), FALSE, FALSE, 0);
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", "🔒 安全");
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("🔒 安全", "🔒 Security"));
// 键盘
GtkWidget *keys = settings_page();
gtk_box_pack_start(GTK_BOX(keys), label("仅控制端响应的快捷键", "h2"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(keys), label("远控时按下以下快捷键,仅在控制端本地响应,不会发送到被控端。", "hint"), FALSE, FALSE, 0);
GtkWidget *addk = button("添加控制端快捷键", "secondary"); g_signal_connect(addk, "clicked", G_CALLBACK(unsupported), "添加快捷键");
GtkWidget *k1[] = { setting_row("当前暂无设置", NULL, NULL), setting_row("", NULL, addk) };
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(keys), label(L("远控时按下以下快捷键,仅在控制端本地响应,不会发送到被控端。", "These shortcuts are handled locally on the viewer and are not sent to the remote device."), "hint"), FALSE, FALSE, 0);
GtkWidget *addk = button(L("添加控制端快捷键", "Add viewer shortcut"), "secondary"); g_signal_connect(addk, "clicked", G_CALLBACK(unsupported), L("添加快捷键", "Add shortcut"));
GtkWidget *k1[] = { setting_row(L("当前暂无设置", "Nothing set yet"), NULL, NULL), setting_row("", NULL, addk) };
gtk_box_pack_start(GTK_BOX(keys), settings_card(k1, 2), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(keys), label("功能快捷键", "h2"), FALSE, FALSE, 6);
gtk_box_pack_start(GTK_BOX(keys), label("按下以下快捷键时,仅在本地触发对应功能,不会发送到被控端。", "hint"), FALSE, FALSE, 0);
const char *fns[] = {"使用被控端鼠标/解锁鼠标", "被控时解除防窥模式", "切换上一个屏幕", "切换下一个屏幕", "显示/隐藏悬浮球", "静音/取消静音", "老板键(隐藏/显示所有客户端窗口)", "发送 Ctrl+Alt+Delete 组合键"};
gtk_box_pack_start(GTK_BOX(keys), label(L("功能快捷键", "Function shortcuts"), "h2"), FALSE, FALSE, 6);
gtk_box_pack_start(GTK_BOX(keys), label(L("按下以下快捷键时,仅在本地触发对应功能,不会发送到被控端。", "These shortcuts trigger local functions only and are not sent to the remote device."), "hint"), FALSE, FALSE, 0);
const char *fns[] = {L("使用被控端鼠标/解锁鼠标", "Use remote mouse / release mouse"), L("被控时解除防窥模式", "Turn off privacy screen while controlled"), L("切换上一个屏幕", "Previous screen"), L("切换下一个屏幕", "Next screen"), L("显示/隐藏悬浮球", "Show/hide floating ball"), L("静音/取消静音", "Mute/unmute"), L("老板键(隐藏/显示所有客户端窗口)", "Boss key (hide/show all client windows)"), L("发送 Ctrl+Alt+Delete 组合键", "Send Ctrl+Alt+Delete")};
GtkWidget *k2[8];
for (int i = 0; i < 8; i++) k2[i] = setting_row(fns[i], NULL, edit_button(fns[i]));
gtk_box_pack_start(GTK_BOX(keys), settings_card(k2, 8), FALSE, FALSE, 0);
GtkWidget *kscroll = gtk_scrolled_window_new(NULL, NULL); gtk_container_add(GTK_CONTAINER(kscroll), keys);
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", "⌨ 键盘");
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("⌨ 键盘", "⌨ Keyboard"));
// 网络
GtkWidget *network = settings_page();
const char *proxy[] = {"使用系统环境代理", "不使用代理"};
GtkWidget *n1[] = { setting_row("代理设置", NULL, combo(proxy, 2)) };
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
GtkWidget *n1[] = { setting_row(L("代理设置", "Proxy"), NULL, combo(proxy, 2)) };
gtk_box_pack_start(GTK_BOX(network), settings_card(n1, 1), FALSE, FALSE, 0);
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", "🌐 网络");
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", L("🌐 网络", "🌐 Network"));
gtk_box_pack_start(GTK_BOX(root), tabs, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(settings_window), root);
gtk_widget_show_all(settings_window);
}
static void confirm_logout(void) {
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "确定要退出登录吗?");
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "退出登录会中断正在进行中的连接,你的设备也将从本账户删除。请谨慎操作!");
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "确认", GTK_RESPONSE_OK, NULL);
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, L("确定要退出登录吗?", "Sign out?"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("退出登录会中断正在进行中的连接,你的设备也将从本账户删除。请谨慎操作!", "Signing out ends active connections and removes your device from this account. Be careful!"));
gtk_dialog_add_buttons(GTK_DIALOG(d), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("确认", "Confirm"), GTK_RESPONSE_OK, NULL);
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) push("logout");
gtk_widget_destroy(d);
}
@@ -571,15 +646,15 @@ static void on_menu(GtkMenuItem *item, gpointer what) {
static void popup(GtkButton *b, gpointer kind) {
GtkWidget *menu = gtk_menu_new();
if (!strcmp(kind, "account")) {
GtkWidget *who = gtk_menu_item_new_with_label(logged_in ? (user_text[0] ? user_text : "已登录") : "未登录"); gtk_widget_set_sensitive(who, FALSE);
GtkWidget *who = gtk_menu_item_new_with_label(logged_in ? (user_text[0] ? user_text : L("已登录", "Signed in")) : L("未登录", "Not signed in")); gtk_widget_set_sensitive(who, FALSE);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), who);
GtkWidget *out = gtk_menu_item_new_with_label("退出登录"); g_signal_connect(out, "activate", G_CALLBACK(on_menu), "logout");
GtkWidget *out = gtk_menu_item_new_with_label(L("退出登录", "Sign out")); g_signal_connect(out, "activate", G_CALLBACK(on_menu), "logout");
gtk_widget_set_sensitive(out, logged_in); gtk_menu_shell_append(GTK_MENU_SHELL(menu), out);
} else if (!strcmp(kind, "notice")) {
GtkWidget *none = gtk_menu_item_new_with_label("暂无通知"); gtk_widget_set_sensitive(none, FALSE);
GtkWidget *none = gtk_menu_item_new_with_label(L("暂无通知", "No notifications")); gtk_widget_set_sensitive(none, FALSE);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), none);
} else {
const char *labels[] = {"刷新设备列表", "设置", "退出程序"}, *whats[] = {"refresh", "settings", "quit"};
const char *labels[] = {L("刷新设备列表", "Refresh device list"), L("设置", "Settings"), L("退出程序", "Quit")}, *whats[] = {"refresh", "settings", "quit"};
for (int i = 0; i < 3; i++) { GtkWidget *it = gtk_menu_item_new_with_label(labels[i]); g_signal_connect(it, "activate", G_CALLBACK(on_menu), (gpointer)whats[i]); gtk_menu_shell_append(GTK_MENU_SHELL(menu), it); }
}
gtk_widget_show_all(menu);
@@ -598,27 +673,27 @@ static void *run(void *arg) {
gtk_css_provider_load_from_data(css, CSS, -1, NULL);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), "UU 远程 Linux 控制端(非官方)");
gtk_window_set_title(GTK_WINDOW(window), L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)"));
gtk_window_set_default_size(GTK_WINDOW(window), 1180, 780);
g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL);
own_titlebar(window, "UU 远程 Linux 控制端(非官方)");
own_titlebar(window, L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)"));
GtkWidget *root = hbox(0);
// Sidebar
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
my_section = vbox(0);
GtkWidget *mh = hbox(8); gtk_widget_set_margin_start(mh, 18); gtk_widget_set_margin_top(mh, 22); gtk_widget_set_margin_bottom(mh, 6);
gtk_box_pack_start(GTK_BOX(mh), label("⧉ 我的设备", "section"), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(mh), label(L("⧉ 我的设备", "⧉ My devices"), "section"), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
GtkWidget *ah = label("⧉ 远程协助", "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
GtkWidget *ah = label(L("⧉ 远程协助", "⧉ Remote assistance"), "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", "开始协助", "assist"), -1);
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", "收藏设备", "favorite"), -1);
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", L("开始协助", "Start assistance"), "assist"), -1);
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", L("收藏设备", "Favorites"), "favorite"), -1);
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
(void)welcome_nav;
@@ -628,7 +703,7 @@ static void *run(void *arg) {
// Main area
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
badge = gtk_label_new(""); add_class(badge, "badge");
title_label = label("全部设备", "title");
title_label = label(L("全部设备", "All devices"), "title");
more_button = button("⋮", "hbtn"); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
@@ -676,12 +751,13 @@ void uu_viewer_ui_set_devices(const char *tsv) {
device_count = 0;
char *copy = strdup(tsv ? tsv : ""), *save = NULL;
for (char *line = strtok_r(copy, "\n", &save); line && device_count < 64; line = strtok_r(NULL, "\n", &save)) {
char *f[5] = {0}, *s2 = NULL; int n = 0;
for (char *p = strtok_r(line, "\t", &s2); p && n < 5; p = strtok_r(NULL, "\t", &s2)) f[n++] = p;
char *f[6] = {0}, *s2 = NULL; int n = 0;
for (char *p = strtok_r(line, "\t", &s2); p && n < 6; p = strtok_r(NULL, "\t", &s2)) f[n++] = p;
if (n < 5) continue;
Device *d = &devices[device_count++];
snprintf(d->id, sizeof d->id, "%s", f[0]); snprintf(d->name, sizeof d->name, "%s", f[1]);
d->platform = atoi(f[2]); d->online = atoi(f[3]); d->current = atoi(f[4]);
snprintf(d->thumb, sizeof d->thumb, "%s", n > 5 && f[5][0] == '/' ? f[5] : "");
}
free(copy);
selected = -1;
@@ -715,8 +791,8 @@ static int replace_result;
static gboolean confirm_replace(gpointer d) {
(void)d;
GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "打开后将断开当前与该设备的连接,继续吗?");
gtk_dialog_add_buttons(GTK_DIALOG(dialog), "取消", GTK_RESPONSE_CANCEL, "继续", GTK_RESPONSE_OK, NULL);
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, L("打开后将断开当前与该设备的连接,继续吗?", "Opening this disconnects your current connection to this device. Continue?"));
gtk_dialog_add_buttons(GTK_DIALOG(dialog), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("继续", "Continue"), GTK_RESPONSE_OK, NULL);
int accepted = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK;
gtk_widget_destroy(dialog);
pthread_mutex_lock(&init_lock); replace_result = accepted; pthread_cond_signal(&init_cond); pthread_mutex_unlock(&init_lock);
+57 -16
View File
@@ -1,5 +1,6 @@
/* Native Hyprland/wlroots desktop bridge. Protocol XMLs retain upstream licenses. */
#define _GNU_SOURCE
#include "wayland_transform.h"
#include <wayland-client.h>
#include <xkbcommon/xkbcommon.h>
#include <pthread.h>
@@ -60,7 +61,7 @@ static struct xkb_state *key_state;
static unsigned char held_keys[768];
/* Mobile input-method text (#13/#46). The protocol has no per-key remap request, but
zwp_virtual_keyboard_v1_keymap may be re-sent at any time, so the pristine keymap text is kept
and a spare keycode is pointed at one character's keysym at a time. Never logs the text. */
and printable codes on a separate text keyboard carry each batch. Never logs the text. */
#define UU_TEXT_SPARE 32
static char *keymap_text;
static size_t keymap_text_len, keymap_insert;
@@ -187,6 +188,14 @@ static xkb_keycode_t existing_keycode(xkb_keysym_t symbol) {
}
return 0;
}
static unsigned find_niri_text_codes(xkb_keycode_t *out,unsigned limit) {
/* Printable physical keys work in Chromium; reserved evdev codes can be discarded. */
static const xkb_keycode_t text_codes[]={24,25,26,27,28,29,30,31,32,33,38,39,40,41,42,43,44,45,46,52,53,54,55,56,57,58};
unsigned count=0;
for(unsigned i=0;i<sizeof(text_codes)/sizeof(text_codes[0]) && count<limit;i++)
if(xkb_keymap_key_get_name(keymap,text_codes[i])) out[count++]=text_codes[i];
return count;
}
static void press_keycode(xkb_keycode_t code) {
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_PRESSED);
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
@@ -207,7 +216,8 @@ static void release_held_keys_locked(void) {
key_state and held_keys: pressed and released here. */
static int flush_batch(char *buffer,size_t capacity,const char names[][64],const xkb_keycode_t *codes,unsigned count,int *typed) {
release_held_keys_locked();
if(rekey_keyboard()!=0) return -1;
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
else if(rekey_keyboard()!=0) return -1;
size_t at=keymap_insert;
memcpy(buffer,keymap_text,at);
for(unsigned i=0;i<count;i++) {
@@ -217,8 +227,11 @@ static int flush_batch(char *buffer,size_t capacity,const char names[][64],const
}
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
if(getenv("NIRI_SOCKET")) zwp_virtual_keyboard_v1_modifiers(keyboard,0,0,0,0);
if(sync_display()!=0) return -1;
if(getenv("NIRI_SOCKET")) usleep(8000);
for(unsigned i=0;i<count;i++) { press_keycode(codes[i]); (*typed)++; }
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
return 0;
}
/* Type UTF-8 like xdotool type does on X11, but on Wayland: characters the session keymap already
@@ -247,14 +260,14 @@ static int type_utf8_locked(const char *text) {
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
else if(cp<0x100) sym=cp; /* Latin-1 keysyms equal the code point */
else sym=(xkb_keysym_t)(0x1000000|cp); /* Unicode keysym */
xkb_keycode_t existing=existing_keycode(sym);
xkb_keycode_t existing=getenv("NIRI_SOCKET")?0:existing_keycode(sym);
if(existing) {
if(count && flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
count=0;
press_keycode(existing); typed++;
continue;
}
if(count==UU_TEXT_SPARE) {
if(count==(getenv("NIRI_SOCKET")?spare_count:UU_TEXT_SPARE)) {
if(flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
count=0;
}
@@ -266,13 +279,23 @@ static int type_utf8_locked(const char *text) {
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
free(buffer);
/* Restore the pristine keymap whatever happened above, so uu_wl_key keeps its own symbol map. */
if(upload_keymap(keymap_text,keymap_text_len)!=0) return -1;
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
else if(upload_keymap(keymap_text,keymap_text_len)!=0) return -1;
return failed && !typed?-1:typed;
}
int uu_wl_type_utf8(const char *text) {
pthread_mutex_lock(&lock);
int typed=-1;
if(initialized && text && keymap_text && keymap_insert && spare_count) typed=type_utf8_locked(text);
if(initialized && text && keymap_text && keymap_insert && spare_count) {
if(getenv("NIRI_SOCKET")) {
/* Only niri uses printable codes on a separate text device; preserve the Hyprland path. */
release_held_keys_locked();
struct zwp_virtual_keyboard_v1 *saved=keyboard;
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
if(keyboard) {typed=type_utf8_locked(text);sync_display();usleep(8000);if(keyboard) zwp_virtual_keyboard_v1_destroy(keyboard);}
keyboard=saved;
} else typed=type_utf8_locked(text);
}
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
pthread_mutex_unlock(&lock); return typed;
}
@@ -544,9 +567,9 @@ int uu_wl_init(int32_t *w,int32_t *h) {
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
if(selected==output_count) goto end;
}
/* Rotated output coordinate mapping needs separate acceptance. */
if(outputs[selected].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
if(!uu_output_transform_supported(outputs[selected].transform,getenv("NIRI_SOCKET")!=NULL)) goto end;
width=outputs[selected].width; height=outputs[selected].height;
if(outputs[selected].transform&1) {uint32_t t=width;width=height;height=t;}
if(!width || !height || width>16384 || height>16384 || (uint64_t)width*height*4>256*1024*1024) goto end;
if(power_manager) {
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
@@ -574,7 +597,7 @@ int uu_wl_init(int32_t *w,int32_t *h) {
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
keymap_insert=symbols_close(keymap_text);
spare_count=find_spare_codes(spare_codes,sizeof(spare_codes)/sizeof(spare_codes[0]));
spare_count=getenv("NIRI_SOCKET")?find_niri_text_codes(spare_codes,UU_TEXT_SPARE):find_spare_codes(spare_codes,UU_TEXT_SPARE);
}
initialized=1; *w=width; *h=height; result=0;
end:
@@ -588,8 +611,9 @@ int uu_wl_select_output(const char *name,uint32_t expected_w,uint32_t expected_h
if(!initialized || !name || sync_display()!=0) goto end;
unsigned target;
for(target=0;target<output_count;target++) if(!strcmp(outputs[target].name,name)) break;
if(target==output_count || outputs[target].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
if(target==output_count || !uu_output_transform_supported(outputs[target].transform,getenv("NIRI_SOCKET")!=NULL)) goto end;
uint32_t w=outputs[target].width,h=outputs[target].height;
if(outputs[target].transform&1) {uint32_t t=w;w=h;h=t;}
if(w!=expected_w || h!=expected_h || !w || !h || w>16384 || h>16384 || (uint64_t)w*h*4>256*1024*1024) goto end;
struct zwlr_virtual_pointer_v1 *next=NULL;
if(pointer_manager) {
@@ -640,7 +664,7 @@ retry:;
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); }
pending=0; goto retry;
}
if(frame->failed || !frame->pixels || frame->width!=width || frame->height!=height) goto end;
if(frame->failed || !frame->pixels || frame->width!=outputs[selected].width || frame->height!=outputs[selected].height) goto end;
zwlr_screencopy_frame_v1_destroy(frame->handle); frame->handle=NULL;
const char *pipeline=getenv("UU_WAYLAND_PIPELINE");
if(!pipeline || strcmp(pipeline,"0")) {
@@ -651,11 +675,22 @@ retry:;
}
{
for(uint32_t y=0;y<height;y++) {
uint32_t source=(frame->flags&ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT)?height-y-1:y;
uint8_t *row=out+(size_t)y*width*4;
memcpy(row,(uint8_t*)frame->pixels+(size_t)source*frame->stride,width*4);
if(frame->format==WL_SHM_FORMAT_XBGR8888 || frame->format==WL_SHM_FORMAT_ABGR8888) {
for(uint32_t x=0;x<width;x++) { uint8_t red=row[x*4]; row[x*4]=row[x*4+2]; row[x*4+2]=red; }
if(outputs[selected].transform==WL_OUTPUT_TRANSFORM_NORMAL &&
frame->format!=WL_SHM_FORMAT_XBGR8888 && frame->format!=WL_SHM_FORMAT_ABGR8888) {
uint32_t sy=(frame->flags&ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT)?height-1-y:y;
memcpy(row,(uint8_t*)frame->pixels+(size_t)sy*frame->stride,width*4);
continue;
}
for(uint32_t x=0;x<width;x++) {
uint32_t sx=x,sy=y,sw=frame->width,sh=frame->height;
uu_source_pixel(outputs[selected].transform,sw,sh,x,y,&sx,&sy);
if(frame->flags&ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT) sy=sh-1-sy;
const uint8_t *pixel=(uint8_t*)frame->pixels+(size_t)sy*frame->stride+sx*4;
memcpy(row+x*4,pixel,4);
if(frame->format==WL_SHM_FORMAT_XBGR8888 || frame->format==WL_SHM_FORMAT_ABGR8888) {
row[x*4]=pixel[2];row[x*4+2]=pixel[0];
}
}
}
result=0;
@@ -675,7 +710,13 @@ int uu_wl_move(int32_t x,int32_t y,int relative) {
double scale=outputs[selected].scale;
zwlr_virtual_pointer_v1_motion(pointer,timestamp(),wl_fixed_from_double(x/scale),wl_fixed_from_double(y/scale));
}
else if(x>=0 && y>=0 && x<(int32_t)width && y<(int32_t)height) zwlr_virtual_pointer_v1_motion_absolute(pointer,timestamp(),x,y,width,height);
else if(x>=0 && y>=0 && x<(int32_t)width && y<(int32_t)height) {
uint32_t sx,sy,sw=outputs[selected].width,sh=outputs[selected].height;
/* niri/Smithay applies the output transform to absolute device coordinates. */
if(getenv("NIRI_SOCKET")) uu_source_pixel(outputs[selected].transform,sw,sh,x,y,&sx,&sy);
else {sx=x;sy=y;sw=width;sh=height;}
zwlr_virtual_pointer_v1_motion_absolute(pointer,timestamp(),sx,sy,sw,sh);
}
else goto end;
zwlr_virtual_pointer_v1_frame(pointer); result=wl_display_flush(display)<0?-1:0;
}
+14
View File
@@ -0,0 +1,14 @@
#include <stdint.h>
/* Map upright output pixels to untransformed capture/device coordinates (Smithay Transform). */
static inline void uu_source_pixel(int transform,uint32_t w,uint32_t h,uint32_t x,uint32_t y,uint32_t *sx,uint32_t *sy) {
*sx=x;*sy=y;
switch(transform) {
case 1:*sx=y;*sy=h-1-x;break;
case 2:*sx=w-1-x;*sy=h-1-y;break;
case 3:*sx=w-1-y;*sy=x;break;
}
}
/* Rotated capture and pointer mapping have hardware acceptance only on niri. */
static inline int uu_output_transform_supported(int transform,int niri) {
return transform==0 || (niri && transform>=1 && transform<=3);
}
+17 -2
View File
@@ -56,6 +56,15 @@ static void track_injected_key(int keycode, int is_press) {
}
}
/* XShmAttach fails asynchronously (BadAccess when the X server cannot reach our segment, e.g. a
* server in another container); Xlib's default handler would exit the process before the XGetImage fallback. */
static volatile int g_shm_attach_failed = 0;
static int shm_attach_error(Display *display, XErrorEvent *event) {
(void)display; (void)event;
g_shm_attach_failed = 1;
return 0;
}
static void shm_open_image(void) {
g_use_shm = 0;
if (!XShmQueryExtension(g_display)) return;
@@ -66,9 +75,15 @@ static void shm_open_image(void) {
if (g_shminfo.shmid == -1) return;
g_shminfo.shmaddr = g_shm_image->data = (char *)shmat(g_shminfo.shmid, 0, 0);
g_shminfo.readOnly = False;
if (g_shminfo.shmaddr != (char *)-1 && XShmAttach(g_display, &g_shminfo)) {
if (g_shminfo.shmaddr != (char *)-1) {
XSync(g_display, False);
g_use_shm = 1;
g_shm_attach_failed = 0;
int (*previous)(Display *, XErrorEvent *) = XSetErrorHandler(shm_attach_error);
Status attached = XShmAttach(g_display, &g_shminfo);
XSync(g_display, False);
XSetErrorHandler(previous);
if (attached && !g_shm_attach_failed) g_use_shm = 1;
else fprintf(stderr, "X11 shared-memory capture unavailable; using XGetImage\n");
}
shmctl(g_shminfo.shmid, IPC_RMID, 0); // 标记删除,进程退出时自动回收;失败时也不遗留段
}
+15
View File
@@ -0,0 +1,15 @@
修复网络波动后信令重连卡住,以及 Linux 控制端在平铺窗口管理器下画面空白。/ Fixes signaling reconnect stalling after a network hiccup, and the Linux viewer showing a blank window under tiling compositors.
### 修复 / Fixed
- **网络异常后停在 Acquired room signaling credentials(#115,感谢 @Changxi-M)**:信令 WebSocket 握手没有超时,网络半断时会无限等待,重连不再重试。现在握手限时 20 秒,超时后按原有退避重试。
The signaling WebSocket handshake is now bounded to 20 s, so a stalled handshake falls back to the normal reconnect retry instead of hanging forever.
- **控制端窗口平铺后画面空白(#118,感谢 @shao-zhijie)**:Linux 控制端只在收到新解码帧时绘制,合成器调整窗口尺寸后静止画面不会重绘;在尚未收到首帧时,Wayland 也不会映射没有提交缓冲的窗口。现在窗口尺寸变化/重新显示时用最后一帧重绘,无帧时先画黑底。
The Linux viewer now repaints the last frame after a compositor resize/expose, and paints a black frame before the first decoded frame so Wayland maps the window.
### 验证范围 / Validation
单元测试与 CI;#115、#118 的场景尚未实机复现,欢迎反馈。
### 下载 / Download
`uu-remote-linux_0.2.34_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.34-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.34`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+21
View File
@@ -0,0 +1,21 @@
信令可走 HTTP 代理、二维码登录错误分类、重复主机实例诊断,以及 Wayland 手机端文字输入兜底。/ Signaling through an opt-in HTTP proxy, clearer QR login errors, duplicate-host diagnostics, and a Wayland fallback for mobile text input.
### 新增 / Added
- **信令遵循 `UU_USE_PROXY=1`(#123)**:主机和 Linux 控制端的 WebSocket 信令改用与 REST 接口相同的 HTTP 客户端,开启 `UU_USE_PROXY=1` 后也走环境里的 HTTP/HTTPS 代理(不支持 SOCKS;选中的代理失败不会改为直连;不跟随重定向)。不代理 ICE/WebRTC 媒体。默认(不开代理)行为不变。
Host and viewer signaling now use the same HTTP client as the REST API, so `UU_USE_PROXY=1` applies to signaling too (HTTP/HTTPS proxies only, no direct fallback, no redirects). Media is not proxied; the default is unchanged.
- **Wayland/Portal 手机端文字输入兜底(#119,感谢 @shofukantkts)**:没有空闲键码的合成器和 Portal 后端上,手机端输入的文字经剪贴板 + Shift+Insert 粘贴;`UU_WAYLAND_TEXT=0` 可关闭。
Mobile text input on Portal and compositors without spare keycodes is pasted via the clipboard and Shift+Insert; `UU_WAYLAND_TEXT=0` disables it.
### 修复 / Fixed
- **二维码登录错误分类(#121)**:状态查询失败不再一律提示「网络超时」,区分超时、连接失败、响应异常与二维码过期;诊断只含阶段、类别、耗时和状态码,不输出票据、URL 或服务器内容。
QR polling failures are no longer all reported as a network timeout; timeouts, connection failures, bad responses and expiry are distinguished, with diagnostics that never include tickets, URLs or server content.
- **重复主机实例(#122)**:同一身份的两个主机实例(拷贝了 `config.json`,或残留的旧手动实例)会互相把对方踢出房间,表现为控制端一连就断。`doctor` 现在能数到重新执行后进程名为 `exe` 的实例并给出提示;README 说明不要在机器之间拷贝 `config.json`;日志会记录无 peer id 的 leave 事件结构(仅键名/类型/长度)。
Two host instances sharing one identity kick each other out of the room. `doctor` now counts re-executed instances and warns about extras, the README explains not to copy `config.json` between machines, and leave events without a peer id log their shape (keys/types/lengths only).
### 验证范围 / Validation
单元测试与 CI。#123 在真实 Linux X11 主机上实测不开代理时信令与 iPhone 桌面连接正常;经真实代理的信令尚未实测。#122 的修复在报告环境实机验证。
### 下载 / Download
`uu-remote-linux_0.2.35_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.35-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.35`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+15
View File
@@ -0,0 +1,15 @@
修复 X11 共享内存被拒时主机直接退出,以及 Linux 控制端加入已有会话时可能永久黑屏。/ Fixes the host exiting when X11 refuses shared memory, and a possible black screen when the Linux viewer joins a host that already streams to another session.
### 修复 / Fixed
- **X11 MIT-SHM 被拒时直接退出**:X 服务器无法访问本程序的共享内存段时(例如 X 服务器在另一个容器里),`XShmAttach` 返回 BadAccess,Xlib 默认错误处理直接结束了进程,原有的 `XGetImage` 退路没有机会执行。现在捕获该错误并改用 `XGetImage` 抓屏。
When `XShmAttach` is refused (BadAccess, e.g. an X server in another container), the host now falls back to `XGetImage` instead of being terminated by Xlib's default error handler.
- **控制端加入已有会话时黑屏(#124,感谢 @shao-zhijie)**:Linux 控制端过去只在丢包或解码出错时请求关键帧;加入一条已在推流的干净 H.264 流时永远等不到 IDR。现在首帧显示前每 30 个访问单元请求一次关键帧(PLI),300 个仍无画面时日志给出提示。
The Linux viewer now requests key frames (PLI) every 30 access units until the first frame is shown, and logs a warning after 300.
### 验证范围 / Validation
单元测试与 CI。共享内存退路尚待在报告环境实机确认;#124 中官方 Mac 主机是否响应 PLI 尚未实测。
### 下载 / Download
`uu-remote-linux_0.2.36_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.36-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.36`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+13
View File
@@ -0,0 +1,13 @@
`UU_USE_PROXY=1` 时经 TCP/TLS(可走 HTTP 代理)连接 TURN 中继,供 UDP 到不了中继服务器的主机使用。/ With `UU_USE_PROXY=1`, TURN relays are also reached over TCP/TLS (optionally through the HTTP proxy) for hosts whose UDP cannot reach the relay servers.
### 新增 / Added
- **TURN over TCP/TLS**:云端在强制中继的会话里也会下发 `turns:<IP>:<端口>?transport=tcp`,原来使用的 webrtc-ice 只支持 UDP 中继,UDP 被限制、只能经 HTTP 代理出网的主机因此拿不到任何中继候选,控制端一直"正在尝试重连"。现在开启 `UU_USE_PROXY=1` 后,主机会经 `HTTPS_PROXY`/`ALL_PROXY` 中的无认证 `http://` 代理(没有则直连)建立 TCP/TLS 中继连接。TURN 证书按 CA 链校验,仅在云端下发的地址为 IP 时容忍名称不匹配;媒体仍由 DTLS-SRTP 端到端加密。未开启时只用 UDP 中继,行为不变(`vendor/webrtc-ice/PATCHES.md`)。
With `UU_USE_PROXY=1` the host also opens TURN relays over TCP/TLS through the unauthenticated `http://` proxy (or directly), chain-verifying certificates and tolerating a name mismatch only for IP TURN URLs. The default stays UDP-only.
### 验证范围 / Validation
单元测试(经模拟代理的 CONNECT 与 STUN/ChannelData 分帧)与 CI;与真实 TURN 服务器的 TCP/TLS 分配尚待在报告环境实机确认。
### 下载 / Download
`uu-remote-linux_0.2.37_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.37-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.37`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+13
View File
@@ -0,0 +1,13 @@
TURN over TLS 改为同时信任系统证书库。/ TURN over TLS now also trusts the system certificate store.
### 修复 / Fixed
- **TURN over TLS 报 UnknownIssuer**:v0.2.37 的 TCP/TLS 中继只信任内置的 Mozilla 根证书;在会检查 TLS 的 HTTP 代理后面,中继证书由主机管理员装在系统证书库里的 CA 重新签发,OpenSSL 能通过、我们却报 `UnknownIssuer`。现在同时信任系统证书库(与 OpenSSL 一致)和内置根证书。仅影响 `UU_USE_PROXY=1` 时的 TCP/TLS 中继。
TCP/TLS relays (only with `UU_USE_PROXY=1`) now trust the system certificate store as well as the bundled Mozilla roots, so CAs added for TLS-inspecting proxies are honoured.
### 验证范围 / Validation
单元测试与 CI;报告环境实机验证进行中。
### 下载 / Download
`uu-remote-linux_0.2.38_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.38-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.38`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+13
View File
@@ -0,0 +1,13 @@
Linux 控制端像官方控制端一样请求桌面视频轨道,修复第二个会话永久黑屏。/ The Linux viewer now requests the desktop video track like the official viewer, fixing a permanently black second session.
### 修复 / Fixed
- **第二个会话黑屏(#124,感谢 @shao-zhijie 的码流取证)**:被控端已在给别的控制端推流时,Linux 控制端只会接上那条流的中段,没有 SPS/PPS/IDR,永远无法解码;官方主机也不响应 RTCP PLI。官方 iPhone 控制端在 CONTROL 通道打开后会立即发 RPC 15 `SendVideoTrackReq`(无字段);Linux 控制端现在桌面会话里也发这一条。
Desktop sessions now send RpcRequest case 15 `SendVideoTrackReq` (no fields) right after CONTROL opens, as the official iPhone viewer does, so the host starts a track for this session instead of the viewer joining another session's stream mid-GOP.
### 验证范围 / Validation
单元测试与 CI;官方 iPhone 控制端发送该 RPC 的行为来自本项目主机日志(`response_field=11 value=None`)。与官方 macOS 主机的第二会话场景尚待报告者实测。
### 下载 / Download
`uu-remote-linux_0.2.39_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.39-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.39`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+23
View File
@@ -0,0 +1,23 @@
GNOME 多显示器与精确触控、niri 适配、控制端控制中心与中英文界面,以及登录设备注册修复。/ GNOME multi-monitor and precise touch, niri support, a viewer control center with Chinese/English UI, and a login device-registration fix.
### 新增 / Added
- **GNOME(Wayland / Portal)多显示器切换(#128,感谢 @spixyy7)**:逐块显示器公布并各自保存 Portal 授权,首次在主机上授权一次,之后静默恢复;最后一个控制端断开后立即停止屏幕共享。
GNOME Portal: per-monitor sources with per-monitor saved grants (asked once, restored silently); screen sharing stops when the last viewer leaves.
- **niri 支持(#71,感谢 @WALKERKILLER)**:`UU_WAYLAND_MULTISCREEN=1` 下的显示器枚举与切换、旋转输出的正向采集与指针映射、手机端中文输入。其他合成器行为不变。
niri: output enumeration/switching, upright capture and pointer mapping for rotated outputs, and mobile text input; other compositors unchanged.
- **原生控制端(#129,感谢 @spixyy7)**:按被控端原始分辨率解码、中英文界面(`UU_LANG` 或设置)、控制中心(`Ctrl+Alt+M`)、网络状态面板(`Ctrl+Alt+G`,显示实测 RTT)、连接加载画面。控制端登录不会开启本机被控服务(默认关闭)。
Native viewer: native-resolution decode, Chinese/English UI, control center, network panel with measured RTT, connection screen. Viewer login does not enable the local host service (off by default).
### 修复 / Fixed
- **GNOME 触控偏移(#128)**:绝对移动与点击改走当前 Portal 流,不再映射到整个多屏桌面。/ Absolute pointer goes through the current Portal stream.
- **账号下出现永远离线的“幽灵”设备(#127,感谢 @spixyy7)**:主机与控制端同时登录时,设备注册在配置文件锁下串行进行并复用已注册的设备。/ Device registration is serialized under a config lock.
- **控制端**:控制中心卡顿与随后的花屏、Wayland 下关闭文件传输窗口崩溃(#129)。/ Viewer menu stalls and resulting corruption; crash closing the file-transfer window on Wayland.
- **TURN over TCP/TLS 经检查型代理**:代理返回 HTTP 时给出明确错误(代理在检查 TLS 内容,TURN 无法通过),不再报含糊的解析错误。/ A clear error when an inspecting proxy answers with HTTP inside the relay stream.
### 验证范围 / Validation
单元测试与 CI。GNOME 多显示器/触控由贡献者在 Fedora 44 / GNOME 50.6 双屏实机验证;niri 与控制端改动由各自贡献者实机验证(控制端 RTT 补丁实测仅覆盖 Android 控制端场景)。
### 下载 / Download
`uu-remote-linux_0.2.40_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.40-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.40`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+18
View File
@@ -0,0 +1,18 @@
修复原生控制端连 Mac 无画面,GNOME 手机控制端新增手势滚动,控制端记住画质设置。/ Fixes the native viewer showing no picture from Mac hosts, adds gesture scrolling for phone viewers on GNOME, and remembers viewer quality settings.
### 修复 / Fixed
- **原生控制端连 Mac 被控端一直“连接中”、无画面(#136,感谢 @coolxll 二分定位)**:v0.2.40 在本地重置后只等 IDR,Mac 对 PLI 不回 IDR 时会一直丢帧。现在 H.264 I 片和恢复点 SEI 也可作为重启点,最多等待 1.5 秒后照常解码。
Native viewer: after a local reset it accepted only IDR frames, so a Mac host that answers PLI without one stayed blank. I slices and recovery-point SEI now count, and the wait is capped at 1.5 s.
### 新增 / Added
- **GNOME(Portal)手机控制端手势(#134、#131,感谢 @spixyy7)**:触控模式下拖动即平滑滚动(终端里也能滚),按住 0.45 秒后拖动为选中,短按为点击;默认不再需要触摸屏授权。`UU_TOUCH_INPUT=touch` 改用真触控,`=0` 保持鼠标拖动。输入法 ASCII 直接按键输入。
GNOME Portal phone viewers: drag scrolls smoothly (also in terminals), hold-then-drag selects, tap clicks, with no touchscreen consent by default; `UU_TOUCH_INPUT=touch` / `=0` select real touch or mouse drags.
- **控制端跨会话记住画质、帧率和真彩设置(#133,感谢 @spixyy7)**。/ The viewer remembers quality, frame rate and true-color choices.
### 验证范围 / Validation
单元测试与 CI。手机手势由贡献者在 Fedora 44 / GNOME 50.6 + 官方 Android 控制端实机验证;#136 的修复尚未连真实 Mac 被控端验证。
### 下载 / Download
`uu-remote-linux_0.2.41_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.41-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.41`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+109 -9
View File
@@ -91,6 +91,48 @@ pub struct UUAuthClient {
guest_id: Option<String>,
}
/// QR failures are safe to display: never retain a URL, source error or response body.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum QrRequestErrorKind { Timeout, Connect, Decode, Body, Request }
impl QrRequestErrorKind {
fn from_reqwest(error: &reqwest::Error) -> Self {
if error.is_timeout() { Self::Timeout }
else if error.is_connect() { Self::Connect }
else if error.is_decode() { Self::Decode }
else if error.is_body() { Self::Body }
else { Self::Request }
}
fn label(self) -> &'static str {
match self { Self::Timeout => "timeout", Self::Connect => "connect", Self::Decode => "decode",
Self::Body => "body", Self::Request => "request" }
}
}
#[derive(Debug)]
pub struct QrRequestError {
pub kind: QrRequestErrorKind,
phase: &'static str,
elapsed_ms: u128,
http_status: Option<u16>,
}
impl std::fmt::Display for QrRequestError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "phase={} kind={} elapsed_ms={} http_status={:?}",
self.phase, self.kind.label(), self.elapsed_ms, self.http_status)
}
}
impl QrRequestError {
pub fn response_received(&self) -> bool { self.http_status.is_some() }
fn new(kind: QrRequestErrorKind, phase: &'static str, started: std::time::Instant, http_status: Option<u16>) -> Self {
Self { kind, phase, elapsed_ms: started.elapsed().as_millis(), http_status }
}
}
async fn send_qr_request(request: reqwest::RequestBuilder, started: std::time::Instant) -> Result<(u16, serde_json::Value), QrRequestError> {
let resp = request.send().await.map_err(|e| QrRequestError::new(QrRequestErrorKind::from_reqwest(&e), "send", started, None))?;
let status = resp.status().as_u16();
let value = resp.json().await.map_err(|e| QrRequestError::new(QrRequestErrorKind::from_reqwest(&e), "response", started, Some(status)))?;
Ok((status, value))
}
/// Transport failures name only the outer request; the cause (certificate, proxy, DNS,
/// timeout) lives in the source chain. URL user-info (proxy credentials) and query
/// strings are removed before the chain is shown.
@@ -121,17 +163,20 @@ fn redact_urls(text: &str) -> String {
out
}
/// Cloud API clients ignore ambient HTTP/SOCKS proxy settings by default: a local
/// Cloud API and signaling clients ignore ambient HTTP/HTTPS proxy settings by default: a local
/// proxy that intercepts TLS breaks login and signaling. `UU_USE_PROXY=1` opts back
/// into reqwest's standard proxy environment handling.
pub fn http_client_builder() -> reqwest::ClientBuilder {
let builder = reqwest::Client::builder();
if std::env::var("UU_USE_PROXY").ok().as_deref().is_some_and(proxy_requested) {
if proxy_enabled() {
builder
} else {
builder.no_proxy()
}
}
pub(crate) fn proxy_enabled() -> bool {
std::env::var("UU_USE_PROXY").ok().as_deref().is_some_and(proxy_requested)
}
fn proxy_requested(value: &str) -> bool {
matches!(value.trim().to_ascii_lowercase().as_str(), "1" | "true" | "yes" | "on")
}
@@ -253,13 +298,13 @@ impl UUAuthClient {
/// Signed POST with an optional JSON body (None = empty body, like Moya `requestPlain`) and an
/// explicit timeout. The official clients long-poll the QR status with a 60 s request timeout.
pub async fn post_with_timeout(&self, path: &str, body: Option<&serde_json::Value>, timeout: std::time::Duration) -> Result<(u16, serde_json::Value), String> {
let body_str = body.map(serde_json::to_string).transpose().map_err(|e| e.to_string())?.unwrap_or_default();
let resp = self.http.post(format!("{}{}", BASE_URL, path)).timeout(timeout)
.headers(self.build_headers("POST", path, &body_str)).body(body_str)
.send().await.map_err(|e| format!("HTTP post {path} failed: {}", transport_error(&e)))?;
let status = resp.status().as_u16();
Ok((status, resp.json().await.unwrap_or(serde_json::Value::Null)))
pub async fn post_with_timeout(&self, path: &str, body: Option<&serde_json::Value>, timeout: std::time::Duration) -> Result<(u16, serde_json::Value), QrRequestError> {
let started = std::time::Instant::now();
let body_str = body.map(serde_json::to_string).transpose()
.map_err(|_| QrRequestError::new(QrRequestErrorKind::Request, "encode", started, None))?.unwrap_or_default();
let request = self.http.post(format!("{}{}", BASE_URL, path)).timeout(timeout)
.headers(self.build_headers("POST", path, &body_str)).body(body_str);
send_qr_request(request, started).await
}
/// Signed JSON POST to another API host (the signature covers the path only).
@@ -389,3 +434,58 @@ mod guest_tests {
for value in ["", "0", "false", "no", "off", "2"] { assert!(!super::proxy_requested(value)); }
}
}
#[cfg(test)]
mod qr_request_tests {
use super::*;
use std::time::{Duration, Instant};
use tokio::io::{AsyncReadExt, AsyncWriteExt};
// Synthetic, loopback-only responses: no account, device, proxy or live login API.
async fn response(reply: &'static [u8], stall: bool) -> QrRequestError {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let addr = listener.local_addr().unwrap();
let server = tokio::spawn(async move {
let (mut socket, _) = listener.accept().await.unwrap();
let mut request = [0u8; 4096];
let _ = socket.read(&mut request).await.unwrap();
socket.write_all(reply).await.unwrap();
if stall { std::future::pending::<()>().await; }
});
let request = reqwest::Client::builder().no_proxy().build().unwrap()
.post(format!("http://fixture-user:fixture-password@{addr}/fixture-path?token=fixture-ticket"))
.timeout(Duration::from_secs(2));
let error = send_qr_request(request, Instant::now()).await.unwrap_err();
server.abort();
let output = format!("{error} {error:?}");
for secret in ["fixture-user", "fixture-password", "fixture-path", "fixture-ticket", "fixture-body", "127.0.0.1", "http://"] {
assert!(!output.contains(secret));
}
error
}
#[tokio::test]
async fn qr_request_distinguishes_send_timeout_body_timeout_and_bad_json_without_secrets() {
let error = response(b"", true).await;
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Timeout, "send", None));
assert!(!error.response_received());
let error = response(b"HTTP/1.1 200 OK\r\nContent-Length: 100\r\n\r\n", true).await;
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Timeout, "response", Some(200)));
assert!(error.response_received());
let error = response(b"HTTP/1.1 502 Bad Gateway\r\nContent-Length: 12\r\n\r\nfixture-body", false).await;
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Decode, "response", Some(502)));
assert!(error.response_received());
}
#[tokio::test]
async fn qr_connection_failure_is_not_a_timeout() {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let addr = listener.local_addr().unwrap();
drop(listener);
let request = reqwest::Client::builder().no_proxy().build().unwrap()
.post(format!("http://{addr}/fixture-ticket")).timeout(Duration::from_secs(2));
let error = send_qr_request(request, Instant::now()).await.unwrap_err();
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Connect, "send", None));
assert!(!format!("{error} {error:?}").contains("fixture-ticket"));
}
}
+3 -1
View File
@@ -82,8 +82,10 @@ pub struct ScreenCapture {
impl ScreenCapture {
pub fn open_portal(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, crate::portal::PortalError> {
let session = std::sync::Arc::new(crate::portal::PortalSession::open_cancellable(cancelled)?);
crate::portal::register(&session);
let (width, height) = session.size();
Ok(Self { backend: crate::desktop_backend::DesktopBackend::Portal, init_error: None,
display: "wayland:portal".into(), width: session.width, height: session.height,
display: "wayland:portal".into(), width, height,
portal: Some(session), kms: None, buffer: Mutex::new(Vec::new()) })
}
pub fn new() -> Result<Self, String> {
+8
View File
@@ -123,6 +123,14 @@ impl PortalDesktop {
|| state.screen.portal.as_ref().is_some_and(|portal| !portal.is_alive()));
}
pub fn snapshot(&self) -> State { self.state.borrow().clone() }
/// No desktop controller left: stop sharing the screen. begin() then sees the dead
/// session and the next controller's maintain() reopens it with the saved consent.
pub fn end_idle(&self) {
if let Some(portal) = self.snapshot().screen.portal.as_ref().filter(|portal| portal.is_alive()) {
portal.end();
log::info!("Portal screen sharing ended: no desktop controller");
}
}
pub fn subscribe(&self) -> watch::Receiver<State> { self.state.subscribe() }
pub fn lock_state(&self) -> watch::Receiver<Option<bool>> { self.locked.clone() }
#[cfg(test)]
+50 -2
View File
@@ -147,11 +147,39 @@ pub async fn run() -> Result<(), String> {
Err(_) => line("config mode", "missing (run `uuremote-server login`)"),
}
line("service", command_output("systemctl", &["--user", "is-active", "uuremote-native.service"]).await.unwrap_or_else(|| "systemctl unavailable".into()));
let running = command_output("pgrep", &["-c", "-x", "uuremote-server"]).await.filter(|n| !n.is_empty()).unwrap_or_else(|| "unknown".into());
line("uuremote-server procs", format!("{running} (including this one; more than 2 means duplicates)"));
let running = host_processes();
line("uuremote-server procs", format!("{} (including this one; more than 2 means duplicates)", running.map_or_else(|| "unknown".into(), |n| n.to_string())));
if running.is_some_and(|n| n > 2) {
println!(" ! another host instance is running (check `pgrep -af uuremote`); stop the extra one, e.g. an old copy started by hand");
println!(" instances sharing one identity, on this or another machine, kick each other out of the room: never copy config.json between machines");
}
Ok(())
}
/// Hosts re-exec through /proc/self/exe (comm "exe"), so match the executable's file name, not the process name.
/// Helpers a host spawns (Wayland capture, login window) are its children and are not separate instances.
fn host_processes() -> Option<usize> {
let hosts: Vec<(u32, u32)> = std::fs::read_dir("/proc").ok()?.flatten()
.filter_map(|entry| Some((entry.file_name().to_str()?.parse::<u32>().ok()?, entry.path())))
.filter(|(_, dir)| std::fs::read_link(dir.join("exe")).is_ok_and(|exe| is_host_executable(&exe)))
.filter_map(|(pid, dir)| Some((pid, parent_pid(&std::fs::read_to_string(dir.join("stat")).ok()?)?)))
.collect();
Some(top_level(&hosts))
}
/// Field 4 of /proc/<pid>/stat; the command name in field 2 may contain spaces and parentheses.
fn parent_pid(stat: &str) -> Option<u32> {
stat.rsplit_once(')')?.1.split_whitespace().nth(1)?.parse().ok()
}
fn top_level(hosts: &[(u32, u32)]) -> usize {
hosts.iter().filter(|(_, parent)| !hosts.iter().any(|(pid, _)| pid == parent)).count()
}
fn is_host_executable(exe: &std::path::Path) -> bool {
exe.file_name().and_then(|name| name.to_str()).is_some_and(|name| name.trim_end_matches(" (deleted)") == "uuremote-server")
}
#[cfg(test)]
mod tests {
#[test]
@@ -174,4 +202,24 @@ mod tests {
assert!(!super::missing_display(DesktopBackend::Wayland, false, None, None));
assert!(!super::missing_display(DesktopBackend::X11, true, None, None));
}
#[test]
fn host_processes_match_the_executable_even_after_reexec() {
use std::path::Path;
for exe in ["/usr/bin/uuremote-server", "/home/u/.local/bin/uuremote-server", "/usr/bin/uuremote-server (deleted)"] {
assert!(super::is_host_executable(Path::new(exe)));
}
for exe in ["/usr/bin/uuremote-viewer", "/usr/bin/bash", "/usr/bin/uuremote-server-old"] {
assert!(!super::is_host_executable(Path::new(exe)));
}
}
#[test]
fn host_helpers_are_not_counted_as_instances() {
assert_eq!(super::parent_pid("8943 (exe) S 1699 8943 1699 0 -1"), Some(1699));
assert_eq!(super::parent_pid("12 (a) b (c) R 7 12"), Some(7));
// service 10 with a login window 11, a stale copy 20, doctor 30
assert_eq!(super::top_level(&[(10, 1), (11, 10), (20, 5), (30, 9)]), 3);
assert_eq!(super::top_level(&[(10, 1), (11, 10), (30, 9)]), 2);
}
}
+1
View File
@@ -87,6 +87,7 @@ pub use native::symbol;
pub trait Missing { fn missing() -> Self; }
impl Missing for () { fn missing() -> Self {} }
impl Missing for i32 { fn missing() -> Self { -1 } }
impl Missing for usize { fn missing() -> Self { 0 } }
impl<T> Missing for *mut T { fn missing() -> Self { std::ptr::null_mut() } }
/// Declares engine C functions: an `extern "C"` block when linked statically, or dlsym-resolved
+57
View File
@@ -0,0 +1,57 @@
//! UI language: Chinese (the official clients' wording) or English.
//! `UU_LANG=zh|en`, else the choice saved from the settings window (`language` next to config.json),
//! else the locale (`LC_ALL` / `LC_MESSAGES` / `LANG` starting with `zh` → Chinese, anything else → English).
use std::sync::OnceLock;
static ENGLISH: OnceLock<bool> = OnceLock::new();
fn parse(value: &str) -> Option<bool> {
let value = value.trim().to_ascii_lowercase();
if value.starts_with("zh") { Some(false) } else if value.starts_with("en") { Some(true) } else { None }
}
fn saved_path() -> std::path::PathBuf {
crate::config::path().parent().map_or_else(|| "language".into(), |dir| dir.join("language"))
}
fn detect() -> bool {
if let Some(english) = std::env::var("UU_LANG").ok().as_deref().and_then(parse) { return english; }
if let Some(english) = std::fs::read_to_string(saved_path()).ok().as_deref().and_then(parse) { return english; }
let locale = ["LC_ALL", "LC_MESSAGES", "LANG"].iter()
.find_map(|name| std::env::var(name).ok().filter(|v| !v.is_empty()));
!locale.is_some_and(|v| v.to_ascii_lowercase().starts_with("zh"))
}
pub fn english() -> bool { *ENGLISH.get_or_init(detect) }
/// Pick the text for the current language.
pub fn s(zh: &'static str, en: &'static str) -> &'static str { if english() { en } else { zh } }
/// Saves the settings-window choice; it applies on the next start.
pub fn save(english: bool) -> std::io::Result<()> {
let path = saved_path();
if let Some(dir) = path.parent() { std::fs::create_dir_all(dir)?; }
std::fs::write(path, if english { "en\n" } else { "zh\n" })
}
/// `tr!("连接失败:{e}", "Connection failed: {e}")` formats the string for the current language.
#[macro_export]
macro_rules! tr {
($zh:literal, $en:literal $(, $arg:expr)* $(,)?) => {
if $crate::i18n::english() { format!($en $(, $arg)*) } else { format!($zh $(, $arg)*) }
};
}
// The GTK windows (c_engine/i18n.h) ask the same question so both halves always agree.
#[no_mangle] pub extern "C" fn uu_i18n_english() -> std::os::raw::c_int { english().into() }
#[no_mangle] pub extern "C" fn uu_i18n_save(english: std::os::raw::c_int) -> std::os::raw::c_int {
save(english != 0).is_ok().into()
}
#[cfg(test)] mod tests {
#[test] fn language_values_are_parsed(){
assert_eq!(super::parse("zh_CN.UTF-8"),Some(false));
assert_eq!(super::parse("EN\n"),Some(true));
assert_eq!(super::parse("sr_RS"),None);
}
}
+421 -12
View File
@@ -46,12 +46,60 @@ struct HeldInput { buttons: std::collections::BTreeSet<i32>, keys: std::collecti
/// Held modifier VKs (bit 0 Ctrl, 1 Shift, 2 Alt, 3 Win) and keys that got a synthetic Shift.
#[derive(Default)]
struct Shortcuts { modifiers: u8, shifted: std::collections::BTreeSet<i32> }
/// Mobile viewers in touch mode send a finger as a left-button drag at absolute positions (observed:
/// Android sends press, a stream of mouse_move_absolute, release), which on a desktop selects text
/// instead of scrolling. By default (`Gesture`) the host decides per press: moving past `SLOP` before
/// `HOLD` scrolls smoothly (content follows the finger, also in terminals), holding still selects
/// like a mouse drag, and a short press is a click. `UU_TOUCH_INPUT=touch` replays drags as one finger
/// on the portal touchscreen instead; `=0` keeps mouse buttons. `at` is the last absolute position;
/// relative motion (the viewers' trackpad mode) clears it and keeps mouse buttons.
#[derive(Default)]
struct TouchDrag { mode: TouchMode, at: Option<(i32,i32)>, down: bool, finger: Finger }
#[derive(Clone, Copy, Debug, Default, PartialEq)]
enum TouchMode { #[default] Mouse, Gesture, Touch }
/// A mobile left press in gesture mode: not decided yet, scrolling, or selecting with button 1 down.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
enum Finger { #[default] Up, Pending { start: (i32,i32), at: std::time::Instant }, Scroll { last: (i32,i32) }, Select }
/// Pixels a finger may wander before a press becomes a scroll, and how long it holds still to select.
const SLOP: i32 = 12;
const HOLD: std::time::Duration = std::time::Duration::from_millis(450);
/// What an absolute position does to the finger: the next state and a scroll from→to or a pointer move.
#[derive(Debug, PartialEq)]
enum FingerStep { Scroll((i32,i32),(i32,i32)), Move(i32,i32), Stay }
fn finger_motion(finger: Finger, to: (i32,i32)) -> (Finger, FingerStep) {
match finger {
Finger::Pending { start, .. } if (to.0-start.0).abs().max((to.1-start.1).abs()) > SLOP => (Finger::Scroll { last: to }, FingerStep::Scroll(start, to)),
Finger::Pending { .. } => (finger, FingerStep::Stay),
Finger::Scroll { last } => (Finger::Scroll { last: to }, FingerStep::Scroll(last, to)),
Finger::Select | Finger::Up => (finger, FingerStep::Move(to.0, to.1)),
}
}
/// A pending press held still for `HOLD`: where the selection starts.
fn finger_held(finger: Finger, now: std::time::Instant) -> Option<(i32,i32)> {
match finger { Finger::Pending { start, at } if now.duration_since(at) >= HOLD => Some(start), _ => None }
}
/// Viewer platform from the connect header `controller_platform` (website enum: 1 windows, 2 android,
/// 3 ios, 4 macos, 5 tv).
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub enum Controller { #[default] Other, Mac, Mobile }
impl Controller {
pub fn from_platform(platform: Option<&serde_json::Value>) -> Self {
let Some(v) = platform else { return Self::Other };
let text = v.as_str().map(str::to_ascii_lowercase);
match v.as_i64().or_else(|| text.as_deref().and_then(|s| s.parse().ok())) {
Some(4) => Self::Mac,
Some(2 | 3) => Self::Mobile,
_ if text.is_some_and(|s| s.contains("mac") || s.contains("darwin")) => Self::Mac,
_ => Self::Other,
}
}
}
/// Mac viewer with 「使用 macOS 快捷键」 off sends Cmd as VK_LWIN (verified: Cmd 0x5B, Option 0xA4,
/// Ctrl 0xA2). Cmd is held back until we know whether it starts a Mac shortcut.
#[derive(Default)]
struct CmdState { held: bool, pending: bool, passthrough: bool, combos: std::collections::BTreeMap<i32, bool> }
pub struct InputInjector { mac_controller: std::sync::atomic::AtomicBool, cmd: std::sync::Mutex<CmdState>, serial:std::sync::Mutex<()>, owner:std::sync::Mutex<DesktopOwner>, shortcuts: std::sync::Mutex<Shortcuts>, uinput: Option<crate::uinput::Devices>, screen: std::sync::Mutex<(u32,u32)>, portal_failures: std::sync::atomic::AtomicUsize, portal_outcomes: [std::sync::atomic::AtomicUsize; 3], portal:std::sync::Mutex<Option<std::sync::Arc<crate::portal::PortalSession>>>, backend: crate::desktop_backend::DesktopBackend, pending: std::sync::Mutex<PendingPointer>, held: std::sync::Mutex<HeldInput> }
pub struct InputInjector { mac_controller: std::sync::atomic::AtomicBool, cmd: std::sync::Mutex<CmdState>, serial:std::sync::Mutex<()>, owner:std::sync::Mutex<DesktopOwner>, shortcuts: std::sync::Mutex<Shortcuts>, uinput: Option<crate::uinput::Devices>, screen: std::sync::Mutex<(u32,u32)>, portal_failures: std::sync::atomic::AtomicUsize, portal_outcomes: [std::sync::atomic::AtomicUsize; 3], portal:std::sync::Mutex<Option<std::sync::Arc<crate::portal::PortalSession>>>, backend: crate::desktop_backend::DesktopBackend, pending: std::sync::Mutex<PendingPointer>, held: std::sync::Mutex<HeldInput>, touch: std::sync::Mutex<TouchDrag> }
impl InputInjector {
pub fn new() -> Self {
@@ -62,7 +110,7 @@ impl InputInjector {
Err(e) => { log::warn!("uinput unavailable ({}); using the desktop input path. See README for the udev rule.", e.kind()); None }
}
} else { None };
Self { mac_controller: std::sync::atomic::AtomicBool::new(false), cmd: std::sync::Mutex::new(CmdState::default()), serial:std::sync::Mutex::new(()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts: std::sync::Mutex::new(Shortcuts::default()), uinput, screen: std::sync::Mutex::new((0,0)), portal_failures: std::sync::atomic::AtomicUsize::new(0), portal_outcomes: std::array::from_fn(|_| std::sync::atomic::AtomicUsize::new(0)), portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::detect().unwrap_or(crate::desktop_backend::DesktopBackend::X11), pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()) }
Self { mac_controller: std::sync::atomic::AtomicBool::new(false), cmd: std::sync::Mutex::new(CmdState::default()), serial:std::sync::Mutex::new(()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts: std::sync::Mutex::new(Shortcuts::default()), uinput, screen: std::sync::Mutex::new((0,0)), portal_failures: std::sync::atomic::AtomicUsize::new(0), portal_outcomes: std::array::from_fn(|_| std::sync::atomic::AtomicUsize::new(0)), portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::detect().unwrap_or(crate::desktop_backend::DesktopBackend::X11), pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()), touch:std::sync::Mutex::new(TouchDrag::default()) }
}
pub fn bind_portal(&self,session:Option<std::sync::Arc<crate::portal::PortalSession>>) {
@@ -114,8 +162,29 @@ impl InputInjector {
let mut pending = self.pending.lock().unwrap();
let motion = std::mem::take(&mut *pending);
pending.scroll = (motion.scroll.0 % 120, motion.scroll.1 % 120);
if let Some((x,y)) = motion.absolute { self.inject_move(x,y,false); }
if motion.relative != (0,0) { self.inject_move(motion.relative.0 as i32,motion.relative.1 as i32,true); }
let mut touch = self.touch.lock().unwrap();
if let Some((x,y)) = motion.absolute {
if touch.down { self.inject_touch(1,x,y); } else {
let (finger, step) = finger_motion(touch.finger, (x,y));
touch.finger = finger;
match step {
FingerStep::Scroll(from,to) => { self.inject_scroll(from,to,false); },
FingerStep::Move(x,y) => { self.inject_move(x,y,false); },
FingerStep::Stay => {},
}
}
touch.at = Some((x,y));
}
// Held still: select from where the finger went down, like a mouse drag.
if let Some((x,y)) = finger_held(touch.finger, std::time::Instant::now()) {
self.inject_move(x,y,false);
touch.finger = if self.inject_button(1,true) == 0 { Finger::Select } else { Finger::Up };
}
drop(touch);
if motion.relative != (0,0) {
self.touch.lock().unwrap().at = None;
self.inject_move(motion.relative.0 as i32,motion.relative.1 as i32,true);
}
for (value, positive, negative) in [(motion.scroll.1,4,5),(motion.scroll.0,7,6)] {
let count = value / 120;
let button = if count > 0 { positive } else { negative };
@@ -136,6 +205,7 @@ impl InputInjector {
pub fn mouse_button(&self, button: i32, is_press: bool) {
let _serial=self.serial.lock().unwrap();
self.flush_pointer_locked();
if button == 1 && self.touch_button(is_press) { return; }
let result = self.inject_button(button,is_press);
if result == 0 {
let mut held = self.held.lock().unwrap();
@@ -174,10 +244,92 @@ impl InputInjector {
shift
}
/// The current desktop controller is the macOS viewer (connect header controller_platform).
pub fn set_mac_controller(&self, mac: bool) {
self.mac_controller.store(mac, std::sync::atomic::Ordering::Relaxed);
/// The current desktop controller's platform (connect header controller_platform).
/// Mobile drags follow `UU_TOUCH_INPUT`: unset = gesture, `touch` = portal touchscreen, `0` = mouse.
pub fn set_controller(&self, controller: Controller) {
self.mac_controller.store(controller == Controller::Mac, std::sync::atomic::Ordering::Relaxed);
*self.cmd.lock().unwrap() = CmdState::default();
let mut touch = self.touch.lock().unwrap();
self.lift_finger(&mut touch);
let mode = if controller != Controller::Mobile { TouchMode::Mouse } else {
match std::env::var("UU_TOUCH_INPUT").as_deref() { Ok("0") => TouchMode::Mouse, Ok("touch") => TouchMode::Touch, _ => TouchMode::Gesture }
};
*touch = TouchDrag { mode, ..TouchDrag::default() };
}
/// Ends whatever a finger holds: the touch point, a selection's button, a scroll gesture.
fn lift_finger(&self, touch: &mut TouchDrag) {
if std::mem::take(&mut touch.down) { self.inject_touch(2,0,0); }
match std::mem::take(&mut touch.finger) {
Finger::Select => { self.inject_button(1,false); },
Finger::Scroll { last } => { self.inject_scroll(last,last,true); },
Finger::Pending { .. } | Finger::Up => {},
}
}
/// Left button of a mobile controller: a finger down at the last absolute position, or up.
/// False leaves the button to the mouse path (no touchscreen, trackpad mode, other viewers).
fn touch_button(&self, pressed: bool) -> bool {
let mut touch = self.touch.lock().unwrap();
if touch.mode == TouchMode::Gesture { return self.gesture_button(&mut touch, pressed) }
if !pressed {
if !touch.down { return false; }
touch.down = false;
self.inject_touch(2,0,0);
return true;
}
if touch.down { return true; }
let Some((x,y)) = touch.at.filter(|_| touch.mode == TouchMode::Touch) else { return false };
let supported = self.backend == crate::desktop_backend::DesktopBackend::Portal
&& self.portal.lock().unwrap().as_ref().is_some_and(|portal| portal.touch_supported());
static REPORTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
if !REPORTED.swap(true, std::sync::atomic::Ordering::Relaxed) {
log::info!("Mobile controller drag input: touchscreen={supported}");
}
if !supported { self.offer_touch_consent(); }
touch.down = supported && self.inject_touch(0,x,y) == 0;
touch.down
}
/// Gesture mode (portal only, for its smooth scroll): a press waits for `finger_motion`/`finger_held`
/// to decide; releasing an undecided press is a click.
fn gesture_button(&self, touch: &mut TouchDrag, pressed: bool) -> bool {
if !pressed {
return match std::mem::take(&mut touch.finger) {
Finger::Up => false,
Finger::Pending { start, .. } => {
self.inject_move(start.0,start.1,false);
if self.inject_button(1,true) == 0 { self.inject_button(1,false); }
true
},
finger => { touch.finger = finger; self.lift_finger(touch); true },
};
}
if touch.finger != Finger::Up { return true }
let bound = self.backend == crate::desktop_backend::DesktopBackend::Portal && self.portal.lock().unwrap().is_some();
let Some(start) = touch.at.filter(|_| bound) else { return false };
static REPORTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
if !REPORTED.swap(true, std::sync::atomic::Ordering::Relaxed) { log::info!("Mobile controller drag input: gesture (drag scrolls, hold selects)"); }
touch.finger = Finger::Pending { start, at: std::time::Instant::now() };
true
}
/// Content follows the finger: moving it up scrolls down.
fn inject_scroll(&self, from: (i32,i32), to: (i32,i32), finish: bool) -> i32 {
let Some(portal) = self.portal.lock().unwrap().clone() else { return -1 };
self.portal_result("scroll", portal.scroll(f64::from(from.0 - to.0), f64::from(from.1 - to.1), finish))
}
/// The portal offers a touchscreen the restored consent lacks: ask the host once per run, in the
/// background (GNOME's share dialog, visible to the phone too); drags stay mouse drags meanwhile.
fn offer_touch_consent(&self) {
static ASKED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
let Some(portal) = self.portal.lock().unwrap().clone() else { return };
if ASKED.swap(true, std::sync::atomic::Ordering::Relaxed) { return }
std::thread::spawn(move || match portal.upgrade_touch() {
Ok(true) => log::info!("Touch consent upgraded: mobile drags are touch from now on"),
Ok(false) => log::info!("Touch consent upgrade not needed or not offered by the portal"),
Err(reason) => log::info!("Touch consent upgrade not granted: {reason}"),
});
}
fn inject_touch(&self, phase: i32, x: i32, y: i32) -> i32 {
let Some(portal) = self.portal.lock().unwrap().clone() else { return -1 };
self.portal_result("touch", portal.touch(phase, f64::from(x), f64::from(y)))
}
fn terminal_focused(&self) -> bool {
@@ -269,6 +421,7 @@ impl InputInjector {
pub fn release_held(&self) {
let _serial=self.serial.lock().unwrap();
self.discard_pointer();
{ let mut touch=self.touch.lock().unwrap(); self.lift_finger(&mut touch); }
let mut held=self.held.lock().unwrap();
if let Some(uinput)=&self.uinput {
Self::uinput_result(uinput.release_all());
@@ -334,6 +487,11 @@ impl InputInjector {
let result=crate::wayland::move_pointer(x,y,false);
if result!=-2 { return result; }
}
// Portal (GNOME/KDE): absolute motion is addressed to the shared stream, i.e. the captured
// monitor; a uinput tablet would stretch the point across every monitor of the desktop.
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Portal {
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("motion", portal.move_pointer(f64::from(x),f64::from(y),false)); }
}
// X11 multi-screen: the point is inside the selected monitor; XTest and uinput span the root.
let placement=if relative || self.backend!=crate::desktop_backend::DesktopBackend::X11 {None} else {crate::wayland::x11_placement()};
let (x,y)=placement.map_or((x,y),|(ox,oy)|(x+ox,y+oy));
@@ -352,6 +510,11 @@ impl InputInjector {
else if relative { unsafe { x11_mouse_relative(x,y) } } else { unsafe { x11_mouse_move(x,y) } }
}
fn inject_button(&self,button:i32,pressed:bool)->i32 {
// Portal: clicks follow absolute motion on the same session, so a tap cannot land
// before the compositor has moved the pointer there (uinput is a separate queue).
if self.backend==crate::desktop_backend::DesktopBackend::Portal {
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("button", portal.button(button,pressed)); }
}
if let Some(uinput)=&self.uinput {
if let Some((v,h))=crate::uinput::wheel_step(button) { return if pressed { Self::uinput_result(uinput.wheel(v,h)) } else { 0 }; }
if let Some(code)=crate::uinput::button_code(button) { return Self::uinput_result(uinput.button(code,pressed)); }
@@ -372,8 +535,93 @@ impl InputInjector {
if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::key(symbol,pressed) }
else { unsafe { x11_key_symbol(symbol as libc::c_ulong,i32::from(pressed)) } }
}
/// Set clipboard content for text injection on Wayland / Portal.
/// Tries Portal RemoteDesktop.SetSelection first, then wl-copy as fallback.
fn set_clipboard_text(&self, text: &str) -> bool {
if text.is_empty() || text.len() > crate::clipboard::MAX_TEXT {
return false;
}
// In unit tests, never invoke external clipboard binaries (wl-copy)
// or alter the system clipboard to prevent side effects on developer desktops.
#[cfg(test)]
{
let _ = text;
false
}
#[cfg(not(test))]
{
// 1. Try Portal clipboard if session is bound and active
if let Some(portal) = self.portal.lock().unwrap().as_ref() {
if portal.clipboard_set(text).is_ok() {
return true;
}
}
// 2. Try wl-copy in Wayland session
if std::env::var_os("WAYLAND_DISPLAY").is_some() {
if let Ok(mut child) = std::process::Command::new("wl-copy")
.args(["--type", "text/plain;charset=utf-8"])
.stdin(std::process::Stdio::piped())
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()
{
if let Some(mut stdin) = child.stdin.take() {
use std::io::Write;
let _ = stdin.write_all(text.as_bytes());
}
if let Ok(status) = child.wait() {
if status.success() {
return true;
}
}
}
}
false
}
}
/// Injects text by copying it to the clipboard and simulating a paste shortcut.
/// Uses Shift+Insert by default (broadest Linux compatibility across GUI apps and terminals),
/// or Ctrl+V if configured via UU_WAYLAND_PASTE_KEY=ctrl_v.
fn paste_text_via_clipboard(&self, text: &str) -> bool {
if !self.set_clipboard_text(text) {
return false;
}
// Give the clipboard daemon / compositor a brief moment to register the selection.
std::thread::sleep(std::time::Duration::from_millis(25));
let use_ctrl_v = std::env::var("UU_WAYLAND_PASTE_KEY")
.is_ok_and(|v| v.eq_ignore_ascii_case("ctrl_v") || v.eq_ignore_ascii_case("ctrl+v"));
if use_ctrl_v {
// Control_L (0xffe3) + 'v' (0x76)
self.inject_key(0xffe3, true);
std::thread::sleep(std::time::Duration::from_millis(15));
self.inject_key(0x76, true);
std::thread::sleep(std::time::Duration::from_millis(20));
self.inject_key(0x76, false);
std::thread::sleep(std::time::Duration::from_millis(15));
self.inject_key(0xffe3, false);
} else {
// Shift_L (0xffe1) + Insert (0xff63)
self.inject_key(0xffe1, true);
std::thread::sleep(std::time::Duration::from_millis(15));
self.inject_key(0xff63, true);
std::thread::sleep(std::time::Duration::from_millis(20));
self.inject_key(0xff63, false);
std::thread::sleep(std::time::Duration::from_millis(15));
self.inject_key(0xffe1, false);
}
// Brief delay allowing the target application to consume the paste event
std::thread::sleep(std::time::Duration::from_millis(25));
true
}
/// Mobile input-method text (`text_input`). X11 types it directly; Wayland re-maps a spare
/// keycode in the virtual keyboard's keymap. Other backends log once.
/// keycode in the virtual keyboard's keymap. Portal and other Wayland environments inject
/// via clipboard paste (Shift+Insert). Set UU_WAYLAND_TEXT=0 to disable Wayland text injection.
pub fn text_input(&self, text: &str) {
let _serial=self.serial.lock().unwrap();
let Ok(c_text)=std::ffi::CString::new(text.replace('\0',"")) else { return };
@@ -381,17 +629,39 @@ impl InputInjector {
let typed=unsafe { x11_type_utf8(c_text.as_ptr()) };
log::info!("Desktop text input: chars={} result={}", text.chars().count(), typed);
} else if self.backend==crate::desktop_backend::DesktopBackend::Wayland {
// Escape hatch: keep the old behaviour without rebuilding.
// Escape hatch: disable Wayland text typing/pasting entirely without rebuilding.
if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v|v=="0") { return; }
let typed=crate::wayland::type_utf8(text);
if typed>=0 {
log::info!("Desktop text input: chars={} result={}", text.chars().count(), typed);
return;
}
// A keymap whose keycodes are all mapped cannot carry text; report it once.
// Fallback to clipboard paste if keymap has no spare keycodes or native typing failed
if self.paste_text_via_clipboard(text) {
log::info!("Desktop text input (Wayland clipboard paste fallback): chars={} result=ok", text.chars().count());
return;
}
static WARNED:std::sync::atomic::AtomicBool=std::sync::atomic::AtomicBool::new(false);
if !WARNED.swap(true,std::sync::atomic::Ordering::Relaxed) {
log::warn!("Mobile text input unavailable on the Wayland backend (no spare keycode in this keymap)");
log::warn!("Mobile text input unavailable on the Wayland backend (native and clipboard fallback failed)");
}
} else if self.backend==crate::desktop_backend::DesktopBackend::Portal {
if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v|v=="0") { return; }
// Shift+Insert pastes the PRIMARY selection in VTE terminals, not the clipboard just set:
// type what the active layout has as keys and paste only the rest.
let typed=self.type_portal_keysyms(text);
if typed==text.chars().count() {
log::info!("Desktop text input (Portal keysyms): chars={typed}");
return;
}
let rest:String=text.chars().skip(typed).collect();
if self.paste_text_via_clipboard(&rest) {
log::info!("Desktop text input (Portal clipboard paste): chars={} typed={typed} result=ok", text.chars().count());
return;
}
static WARNED:std::sync::atomic::AtomicBool=std::sync::atomic::AtomicBool::new(false);
if !WARNED.swap(true,std::sync::atomic::Ordering::Relaxed) {
log::warn!("Portal clipboard text paste failed: ensure clipboard permission or wl-copy is available");
}
} else {
static WARNED:std::sync::atomic::AtomicBool=std::sync::atomic::AtomicBool::new(false);
@@ -400,6 +670,14 @@ impl InputInjector {
}
}
}
/// Types `text` as portal keysyms when it is all printable ASCII (or newline/tab) and GNOME's
/// active input source is a Latin xkb layout; returns how many characters were typed.
fn type_portal_keysyms(&self, text: &str) -> usize {
let Some(symbols)=ascii_keysyms(text) else { return 0 };
if !gnome_layout_types_ascii() { return 0; }
let Some(portal)=self.portal.lock().unwrap().clone() else { return 0 };
symbols.iter().take_while(|&&symbol| portal.type_keysym(symbol).is_ok()).count()
}
pub fn key_event(&self, keycode: i32, is_press: bool) {
let _serial=self.serial.lock().unwrap();
if self.backend!=crate::desktop_backend::DesktopBackend::X11 { return; }
@@ -536,7 +814,107 @@ impl InputInjector {
uinput:None, screen:std::sync::Mutex::new((0,0)), portal_failures:std::sync::atomic::AtomicUsize::new(0),
portal_outcomes:std::array::from_fn(|_|std::sync::atomic::AtomicUsize::new(0)),
portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::DesktopBackend::Portal,
pending:std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()) }
pending:std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()),
touch:std::sync::Mutex::new(TouchDrag::default()) }
}
}
/// Keysyms for mobile IME text: printable ASCII is its own keysym, newline is Return, tab is Tab.
fn ascii_keysyms(text: &str) -> Option<Vec<u32>> {
text.chars().map(|c| match c { '\n' => Some(0xff0d), '\t' => Some(0xff09), ' '..='~' => Some(c as u32), _ => None }).collect()
}
/// Whether an `org.gnome.desktop.input-sources` source list starts with an xkb layout that has
/// printable ASCII in its first group. Mutter drops keysyms the active layout lacks, and an IBus
/// engine (pinyin, ...) would compose the keys instead.
fn first_source_types_ascii(sources: &str) -> bool {
let Some(start)=sources.find('(') else { return false };
let Some(end)=sources[start..].find(')') else { return false };
let fields:Vec<&str>=sources[start+1..start+end].split(',').map(|f| f.trim().trim_matches('\'')).collect();
let [kind, layout]=fields[..] else { return false };
let (base, variant)=layout.split_once('+').unwrap_or((layout, ""));
const NON_LATIN: &[&str]=&["af","am","ara","bd","bg","bt","by","eg","et","ge","gr","il","in","iq","ir","kg","kh","kz","la","lk","mk","mm","mn","mv","np","ru","sy","th","tj","ua"];
kind=="xkb" && !NON_LATIN.contains(&base) && !variant.contains("cyrillic") && (base!="rs" || variant.contains("latin"))
}
/// GNOME's active input source is the first of `mru-sources` (else of `sources`). Cached for 2 s.
fn gnome_layout_types_ascii() -> bool {
#[cfg(test)]
{ false }
#[cfg(not(test))]
{
static CACHE: std::sync::Mutex<Option<(std::time::Instant,bool)>> = std::sync::Mutex::new(None);
let mut cache=CACHE.lock().unwrap();
if let Some((at,value))=*cache { if at.elapsed()<std::time::Duration::from_secs(2) { return value; } }
let read=|key: &str| std::process::Command::new("gsettings").args(["get","org.gnome.desktop.input-sources",key])
.stderr(std::process::Stdio::null()).output().ok().filter(|o| o.status.success())
.map(|o| String::from_utf8_lossy(&o.stdout).into_owned()).filter(|s| s.contains('('));
let value=read("mru-sources").or_else(|| read("sources")).is_some_and(|s| first_source_types_ascii(&s));
*cache=Some((std::time::Instant::now(),value));
value
}
}
#[cfg(test)]
mod text_keysym_tests {
use super::*;
#[test]
fn ascii_text_becomes_keysyms_and_other_text_does_not() {
assert_eq!(ascii_keysyms("Hi!\n\t~"), Some(vec![0x48,0x69,0x21,0xff0d,0xff09,0x7e]));
assert_eq!(ascii_keysyms("čaj"), None);
assert_eq!(ascii_keysyms("测试"), None);
}
#[test]
fn only_latin_xkb_layouts_type_ascii() {
assert!(first_source_types_ascii("[('xkb', 'us'), ('ibus', 'libpinyin'), ('xkb', 'rs+latin')]"));
assert!(first_source_types_ascii("[('xkb', 'rs+latin')]"));
assert!(first_source_types_ascii("[('xkb', 'de+nodeadkeys')]"));
assert!(!first_source_types_ascii("[('ibus', 'libpinyin'), ('xkb', 'us')]"));
assert!(!first_source_types_ascii("[('xkb', 'rs')]"));
assert!(!first_source_types_ascii("[('xkb', 'ru')]"));
assert!(first_source_types_ascii("[('xkb', 'ba+unicodeus')]"));
assert!(!first_source_types_ascii("[('xkb', 'me+cyrillic')]"));
assert!(!first_source_types_ascii("@a(ss) []"));
}
}
#[cfg(test)]
mod touch_tests {
use super::*;
#[test]
fn controller_from_platform_numbers_and_mac_strings() {
use serde_json::json;
assert_eq!(Controller::from_platform(Some(&json!(2))), Controller::Mobile);
assert_eq!(Controller::from_platform(Some(&json!("3"))), Controller::Mobile);
assert_eq!(Controller::from_platform(Some(&json!(4))), Controller::Mac);
assert_eq!(Controller::from_platform(Some(&json!("MacOS"))), Controller::Mac);
assert_eq!(Controller::from_platform(Some(&json!(1))), Controller::Other);
assert_eq!(Controller::from_platform(None), Controller::Other);
}
#[test]
fn a_press_scrolls_past_the_slop_and_selects_when_held() {
let t0=std::time::Instant::now();
let pending=Finger::Pending{start:(100,100),at:t0};
// Small wander stays undecided; past SLOP the content follows the finger from the start.
assert_eq!(finger_motion(pending,(105,110)),(pending,FingerStep::Stay));
assert_eq!(finger_motion(pending,(100,100+SLOP+1)),(Finger::Scroll{last:(100,113)},FingerStep::Scroll((100,100),(100,113))));
assert_eq!(finger_motion(Finger::Scroll{last:(100,113)},(100,90)),(Finger::Scroll{last:(100,90)},FingerStep::Scroll((100,113),(100,90))));
assert_eq!(finger_motion(Finger::Select,(7,8)),(Finger::Select,FingerStep::Move(7,8)));
assert_eq!(finger_motion(Finger::Up,(7,8)),(Finger::Up,FingerStep::Move(7,8)));
assert_eq!(finger_held(pending,t0+HOLD-std::time::Duration::from_millis(1)),None);
assert_eq!(finger_held(pending,t0+HOLD),Some((100,100)));
assert_eq!(finger_held(Finger::Scroll{last:(1,1)},t0+HOLD*4),None);
}
#[test]
fn mobile_drag_without_touchscreen_stays_a_mouse_button() {
let input=InputInjector::without_desktop();
input.set_controller(Controller::Mobile);
input.mouse_absolute_normalized(0.5,0.5,(100,100)); input.flush_pointer();
assert!(input.touch.lock().unwrap().at.is_some());
assert!(!input.touch_button(true) && !input.touch.lock().unwrap().down);
assert!(!input.touch_button(false));
input.mouse_relative(1,1); input.flush_pointer();
assert!(input.touch.lock().unwrap().at.is_none());
input.set_controller(Controller::Other);
assert_eq!(input.touch.lock().unwrap().mode,TouchMode::Mouse);
}
}
@@ -728,3 +1106,34 @@ mod x11_monitor_pointer_tests {
crate::wayland::select(0).unwrap();
}
}
#[cfg(test)]
mod clipboard_paste_text_tests {
use super::*;
#[test]
fn rejects_empty_and_oversized_text() {
let input = InputInjector::new();
assert!(!input.set_clipboard_text(""));
let oversized = "a".repeat(crate::clipboard::MAX_TEXT + 1);
assert!(!input.set_clipboard_text(&oversized));
}
#[test]
fn text_input_handles_portal_backend_safely_without_side_effects() {
let mut input = InputInjector::new();
input.backend = crate::desktop_backend::DesktopBackend::Portal;
// In unit tests, set_clipboard_text avoids external commands so this
// will not mutate the host's actual clipboard.
input.text_input("测试输入法文字");
}
#[test]
fn text_input_respects_disable_env() {
let mut input = InputInjector::new();
input.backend = crate::desktop_backend::DesktopBackend::Portal;
std::env::set_var("UU_WAYLAND_TEXT", "0");
input.text_input("测试输入法文字");
std::env::remove_var("UU_WAYLAND_TEXT");
}
}
+135 -27
View File
@@ -8,7 +8,7 @@
//! (analysis/tools-fix-20261013/viewer-fieldmd.json). Results are written to the private
//! config file (chmod 600). Tokens and tickets are never printed or logged.
use crate::auth::{Credentials, UUAuthClient};
use crate::auth::{Credentials, QrRequestErrorKind, UUAuthClient};
use crate::login_ui::{LoginUi, Tone};
use serde_json::{json, Value};
use std::time::Duration;
@@ -127,6 +127,35 @@ fn render_qr(content: &str) -> Result<String, String> {
/// API code for an expired login QR code.
const QR_EXPIRED: i64 = 1190;
/// QR API errors must not echo server messages/validation fields: they may contain credentials.
fn qr_data<'a>(stage: &str, status: u16, body: &'a Value) -> Result<&'a Value, String> {
let code = body.get("code").and_then(Value::as_i64);
if status == 200 && code == Some(0) { return Ok(body.get("data").unwrap_or(&Value::Null)); }
Err(format!("{stage}: http_status={status} api_code={code:?}"))
}
#[derive(Debug, PartialEq, Eq)]
enum QrPollAction { Wait(i64), Scanned, Confirmed, Refresh(Duration), Failed(&'static str) }
/// Preserve the official refresh policy; a failed query says nothing about QR expiry.
fn qr_poll_action(last_status: i64, http_status: u16, body: &Value) -> QrPollAction {
if body.get("code").and_then(Value::as_i64) == Some(QR_EXPIRED) {
return QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired"));
}
let Ok(data) = qr_data("qrcode status", http_status, body) else {
return QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed"));
};
match data.get("status").and_then(Value::as_i64) {
Some(1) => QrPollAction::Wait(1),
Some(2) if last_status != 2 => QrPollAction::Scanned,
Some(2) => QrPollAction::Wait(2),
Some(0) => QrPollAction::Refresh(Duration::from_millis(350)),
Some(3) => QrPollAction::Refresh(Duration::ZERO),
Some(4) => QrPollAction::Confirmed,
_ => QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")),
}
}
/// QR modules as RGBA pixels: `scale` pixels per module, `quiet` light modules around the code.
fn qr_rgba(content: &str, scale: usize, quiet: usize) -> Result<(Vec<u8>, usize), String> {
let code = qrcode::QrCode::new(content.as_bytes()).map_err(|e| format!("QR encode failed: {e}"))?;
@@ -218,10 +247,10 @@ pub async fn run(gui: bool) -> Result<(), String> {
};
match &result {
Ok(name) => {
ui.done(&format!("登录成功\n{name}"));
ui.status("登录信息已保存到本机配置,可以关闭此窗口", Tone::Ok);
ui.done(&crate::tr!("登录成功\n{name}","Signed in\n{name}"));
ui.status(crate::i18n::s("登录信息已保存到本机配置,可以关闭此窗口","Sign-in saved to the local config; you can close this window"), Tone::Ok);
}
Err(e) => { eprintln!("login failed: {e}"); ui.status(&format!("登录失败:{e}"), Tone::Error); }
Err(e) => { eprintln!("login failed: {e}"); ui.status(&crate::tr!("登录失败:{e}","Sign-in failed: {e}"), Tone::Error); }
}
if ui.shown() { ui.wait_closed().await; }
result.map(|_| ())
@@ -243,7 +272,26 @@ pub fn prepare_identity() -> Result<(Value, Credentials), String> {
Ok((cfg, creds))
}
/// Holds an exclusive lock beside config.json while a device identity is created: the host's own QR
/// window and the viewer's sign-in can run at once, and two `device/windows/init` calls would leave the
/// account bound to one device while config.json keeps the other (the host then shows as offline).
struct IdentityLock(std::fs::File);
impl IdentityLock {
fn acquire() -> Result<Self, String> {
use std::os::unix::io::AsRawFd;
let path = crate::config::path().with_extension("lock");
if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); }
let file = std::fs::OpenOptions::new().create(true).truncate(false).write(true).open(&path).map_err(|_| "Cannot open the identity lock")?;
if unsafe { libc::flock(file.as_raw_fd(), libc::LOCK_EX) } != 0 { return Err("Cannot lock the device identity".into()) }
Ok(Self(file))
}
}
impl Drop for IdentityLock { fn drop(&mut self) { use std::os::unix::io::AsRawFd; unsafe { libc::flock(self.0.as_raw_fd(), libc::LOCK_UN); } } }
pub async fn prepare_device() -> Result<(Value, Credentials), String> {
// Read the configuration only after taking the lock, so a waiting process sees the device the
// first one registered instead of creating its own.
let _lock = tokio::task::spawn_blocking(IdentityLock::acquire).await.map_err(|_| "Identity lock task failed")??;
let (mut cfg, mut creds) = prepare_identity()?;
let get = |cfg: &Value, k: &str| std::env::var(format!("UU_{}", k.to_uppercase())).ok().filter(|v| !v.is_empty())
.or_else(|| cfg.get(k).and_then(|v| v.as_str()).map(str::to_owned)).unwrap_or_default();
@@ -276,10 +324,18 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
// every QR within seconds (#68).
let timeout = Duration::from_secs(60);
loop {
let (status, resp) = client.post_with_timeout("/api/v1/qrcode/gen/login", None, timeout).await?;
let d = match data("qrcode gen", status, &resp) {
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/gen/login", None, timeout).await {
Ok(r) => r,
Err(e) if e.response_received() => {
eprintln!("QR generation response failed: {e}");
wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await;
continue;
}
Err(e) => return Err(format!("QR generation failed: {e}")),
};
let d = match qr_data("qrcode gen", status, &resp) {
Ok(d) => d.clone(),
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, "二维码加载失败").await; continue; }
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await; continue; }
};
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
@@ -288,7 +344,7 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
ui.qr(&rgba, edge);
ui.status("等待扫码…", Tone::Info);
ui.status(crate::i18n::s("等待扫码…","Waiting for scan…"), Tone::Info);
}
if let Some(path)=std::env::var_os("UU_LOGIN_QR_PNG") {
use std::io::Write;
@@ -303,26 +359,44 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/login/status", Some(&query), timeout).await {
Ok(r) => r,
Err(_) => break "网络超时,二维码已停止刷新",
Err(e) => {
eprintln!("QR status query failed: {e}; last_status={login_status}");
break match e.kind {
QrRequestErrorKind::Timeout => crate::i18n::s("二维码状态查询超时(不代表二维码已失效)","QR status check timed out (the QR code may still be valid)"),
_ => crate::i18n::s("二维码状态查询失败(不代表二维码已失效)","QR status check failed (the QR code may still be valid)"),
};
}
};
let code = resp.get("code").and_then(|c| c.as_i64());
if code == Some(QR_EXPIRED) { break "二维码已失效"; }
let Ok(d) = data("qrcode status", status, &resp) else { break "二维码状态查询失败"; };
let st = d.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
match st {
1 => {}
2 => if login_status != 2 {
match qr_poll_action(login_status, status, &resp) {
QrPollAction::Wait(st) => {
if st == 1 && login_status != 1 { ui.status(crate::i18n::s("等待扫码…","Waiting for scan…"), Tone::Info); }
login_status = st;
}
QrPollAction::Scanned => {
login_status = 2;
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
},
3 => { println!("QR code expired; generating a new one"); break ""; }
0 => { tokio::time::sleep(Duration::from_millis(350)).await; break ""; }
4 => {
ui.status(crate::i18n::s("已扫码,请在手机上确认登录","Scanned, confirm the sign-in on your phone"), Tone::Ok);
}
QrPollAction::Refresh(delay) => {
if delay.is_zero() { println!("QR code expired; generating a new one"); }
else { tokio::time::sleep(delay).await; }
break "";
}
QrPollAction::Confirmed => {
println!("已确认,正在完成登录 (confirmed, completing login)");
ui.status(crate::i18n::s("已确认,正在完成登录…","Confirmed, finishing sign-in…"), Tone::Info);
let body = json!({"token": ticket, "qrcode_jump_url": url});
let (status, resp) = client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await?;
let d = match data("qrcode login", status, &resp) {
let (status, resp) = match client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await {
Ok(r) => r,
Err(e) if e.response_received() => {
eprintln!("QR login exchange response failed: {e}");
break crate::i18n::s("登录失败","Sign-in failed");
}
Err(e) => return Err(format!("QR login exchange failed: {e}")),
};
let d = match qr_data("qrcode login", status, &resp) {
Ok(d) => d,
Err(e) => { println!("QR login not granted ({e})"); break "登录失败"; }
Err(e) => { println!("QR login not granted ({e})"); break crate::i18n::s("登录失败","Sign-in failed"); }
};
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
@@ -339,9 +413,12 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
}
other => { println!("QR status: {other}"); break "二维码已失效"; }
QrPollAction::Failed(reason) => {
eprintln!("QR status query stopped: http_status={status} api_code={:?} status={:?} last_status={login_status}",
resp.get("code").and_then(Value::as_i64), resp.get("data").and_then(|d| d.get("status")).and_then(Value::as_i64));
break reason;
}
}
login_status = st;
};
if !failure.is_empty() { wait_for_refresh(ui, failure).await; }
}
@@ -357,7 +434,7 @@ fn qr_ticket(gen: &Value) -> Option<&str> {
/// or (no window and no terminal, e.g. a service) one minute.
async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
use std::io::IsTerminal;
ui.status(&format!("{reason},请点击「刷新二维码」"), Tone::Error);
ui.status(&crate::tr!("{reason},请点击「刷新二维码」","{reason}. Click \"Refresh QR code\"."), Tone::Error);
ui.offer_refresh(true);
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
@@ -376,6 +453,37 @@ async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn qr_poll_keeps_waiting_scanned_and_confirmed_distinct() {
let reply = |status| json!({"code": 0, "data": {"status": status}});
assert_eq!(qr_poll_action(1, 200, &reply(1)), QrPollAction::Wait(1));
assert_eq!(qr_poll_action(1, 200, &reply(2)), QrPollAction::Scanned);
assert_eq!(qr_poll_action(2, 200, &reply(2)), QrPollAction::Wait(2));
assert_eq!(qr_poll_action(2, 200, &reply(4)), QrPollAction::Confirmed);
assert_eq!(qr_poll_action(1, 200, &reply(0)), QrPollAction::Refresh(Duration::from_millis(350)));
assert_eq!(qr_poll_action(2, 200, &reply(3)), QrPollAction::Refresh(Duration::ZERO));
assert_eq!(qr_poll_action(2, 400, &json!({"code": 1190})), QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired")));
}
#[test]
fn qr_poll_failures_do_not_imply_expiry_or_confirmation() {
for last in [1, 2] {
for body in [json!(null), json!({"code": 1}), json!({"code": 0, "data": {"status": 4}})] {
assert_eq!(qr_poll_action(last, 503, &body), QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed")));
}
assert_eq!(qr_poll_action(last, 200, &json!({"code": 1})), QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed")));
for data in [json!(null), json!({}), json!({"status": "4"}), json!({"status": 99}), json!({"status": -1})] {
assert_eq!(qr_poll_action(last, 200, &json!({"code": 0, "data": data})), QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")));
}
}
}
#[test]
fn qr_api_errors_do_not_echo_server_content() {
let body = json!({"code": 1001, "msg": "fixture-token", "data": [{"loc": "fixture-ticket"}]});
assert_eq!(qr_data("qrcode gen", 400, &body).unwrap_err(), "qrcode gen: http_status=400 api_code=Some(1001)");
}
#[test]
fn status_ticket_prefers_status_query_ticket() {
assert_eq!(qr_ticket(&json!({"token": "old", "status_query_ticket": "new"})), Some("new"));
+32 -10
View File
@@ -1,6 +1,7 @@
//! UU Remote Pure Native Linux Server (Rust Edition)
//! Zero-Wine, Zero-Python, Single-Binary, 5 Native Tools Integrated
mod ws_transport;
mod engine_plugin;
mod doctor;
mod wol;
@@ -15,6 +16,7 @@ mod wayland;
mod auth;
mod assist;
mod config;
mod i18n;
mod login;
mod login_ui;
mod session_lock;
@@ -69,6 +71,8 @@ use webrtc::WebRtcSession;
/// Set before a normal return when the host must come back in the other mode (signed in / out).
static RESTART: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
struct AbortOnDrop(tokio::task::AbortHandle);
impl Drop for AbortOnDrop { fn drop(&mut self) { self.0.abort(); } }
fn superseded_peer_ids(sessions: &HashMap<String, WebRtcSession>, ice: &str, desktop: bool) -> Vec<String> {
sessions.iter().filter(|(id, peer)| id.as_str() == ice || (desktop && peer.desktop))
.map(|(id, _)| id.clone()).collect()
@@ -629,6 +633,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
virtual_audio::init();
let _audio_cleanup=virtual_audio::Cleanup;
log::info!("Starting uu-remote-linux host v{}...", env!("CARGO_PKG_VERSION"));
session_ice::configure_relay_transport();
// Before host.pid, and before assist: a missing or failed assist session must still handle SIGUSR2.
let _ = install_host_signals(None);
video::warm_auto_probe();
@@ -711,6 +716,21 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
assist: &mut Option<assist::Assist>, commands: &mut mpsc::Receiver<assist::Command>, webrtc_sessions: Arc<Mutex<HashMap<String, WebRtcSession>>>) -> Result<(), Box<dyn std::error::Error>> {
let portal_desktop = (capture.backend == desktop_backend::DesktopBackend::Portal && !desktop_backend::headless())
.then(|| Arc::new(desktop_session::PortalDesktop::new(capture.clone())));
// Stop sharing the screen once no desktop controller is left. Viewers send stop_capture
// before leaving and phones reconnect within seconds, so require two idle checks in a row.
let idle_watch = portal_desktop.clone().map(|portal| {
let sessions = webrtc_sessions.clone();
tokio::spawn(async move {
let mut idle = 0u8;
loop {
tokio::time::sleep(std::time::Duration::from_secs(2)).await;
if sessions.lock().await.values().any(|s| s.role.is_desktop()) { idle = 0; continue; }
idle = idle.saturating_add(1);
if idle >= 2 { portal.end_idle(); }
}
})
});
let _idle_watch = idle_watch.map(|task| AbortOnDrop(task.abort_handle()));
let mut auth = if let Some(session) = assist.as_ref() { session.client.clone() } else {
let creds = match config::file().and_then(Credentials::load) {
Ok(creds) => creds,
@@ -743,8 +763,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
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 next_mac = false;
let mut controller_by_ice: HashMap<String, crate::input::Controller> = HashMap::new();
let mut next_controller = crate::input::Controller::Other;
// 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>();
@@ -868,6 +888,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
let mut desktop_ended = false;
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.role.is_desktop(); close_peer(&s.pc).await; } }
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
// The controller left: stop sharing now; reconnecting reopens silently with the saved consent.
if !sessions.values().any(|s| s.role.is_desktop()) { if let Some(portal) = &portal_desktop { portal.end_idle(); } }
if let Some(s) = assist.as_mut() { s.tick()?; }
}
SignalingEvent::Connected => {
@@ -929,9 +951,9 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
.and_then(|s| s.as_str())
);
}
SignalingEvent::ConnectRequest { capture_type, ice_id, transport, controller_mac } => {
if mac_by_ice.len()>=32 { mac_by_ice.clear(); }
match ice_id.clone() { Some(id) => { mac_by_ice.insert(id, controller_mac); } None => next_mac = controller_mac }
SignalingEvent::ConnectRequest { capture_type, ice_id, transport, controller } => {
if controller_by_ice.len()>=32 { controller_by_ice.clear(); }
match ice_id.clone() { Some(id) => { controller_by_ice.insert(id, controller); } None => next_controller = controller }
// Pending cloud credentials live only within this room; cap
// requests that never receive an offer rather than retain them.
if capture_types.len()>=32 { capture_types.clear(); }
@@ -962,8 +984,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
let (capture_type,transport) = capture_types.remove(&ice).or_else(|| next_capture_type.take()).unwrap_or((1,crate::session_ice::SessionIce::default()));
// CaptureType: 0 unknown, 1 desktop, 2 window; 5 file transfer, 8 terminal, 9 port mapping.
let desktop = capture_type <= 2;
let controller_mac = mac_by_ice.remove(&ice).unwrap_or(next_mac);
if desktop { input.set_mac_controller(controller_mac); }
let controller = controller_by_ice.remove(&ice).unwrap_or(next_controller);
if desktop { input.set_controller(controller); }
log::info!("Offer for connection: capture_type={} desktop={} active_peers={}", capture_type, desktop, sessions.len());
// An expired NVENC failure is re-probed in the background. This offer keeps the cached encoder.
if desktop { video::warm_auto_probe(); video::check_ffmpeg_usable(); }
@@ -995,7 +1017,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
match WebRtcSession::new(session_capture, input.clone(), signaling_client.clone(), desktop, transport,
if desktop { portal_desktop.clone() } else { None }).await {
Ok(mut sess) => {
sess.controller_mac = controller_mac;
sess.controller = controller;
if !desktop {
let (requests, peer) = (desktop_requests.clone(), ice.clone());
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
@@ -1062,7 +1084,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
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 controller = peer.controller;
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
@@ -1076,7 +1098,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
}
} else { None };
video::warm_auto_probe(); video::check_ffmpeg_usable();
input.set_mac_controller(controller_mac);
input.set_controller(controller);
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.
+178 -19
View File
@@ -38,8 +38,16 @@ mod native {
fn uu_portal_move(portal: *mut c_void, x: f64, y: f64, relative: i32) -> i32;
fn uu_portal_button(portal: *mut c_void, button: i32, pressed: i32) -> i32;
fn uu_portal_key(portal: *mut c_void, keysym: u32, keycode: i32, pressed: i32) -> i32;
fn uu_portal_scroll(portal: *mut c_void, dx: f64, dy: f64, finish: i32) -> i32;
fn uu_portal_touch_supported(portal: *mut c_void) -> i32;
fn uu_portal_touch_available(portal: *mut c_void) -> i32;
fn uu_portal_touch(portal: *mut c_void, phase: i32, x: f64, y: f64) -> i32;
fn uu_portal_stream_position(portal: *mut c_void, x: *mut i32, y: *mut i32) -> i32;
fn uu_portal_monitors(out: *mut libc::c_char, length: usize) -> i32;
fn uu_portal_end(portal: *mut c_void);
}
struct Handle(NonNull<c_void>);
fn pack(width: u32, height: u32) -> u64 { (u64::from(width) << 32) | u64::from(height) }
// The engine owns callback threads; public calls are serialized by Mutex.
unsafe impl Send for Handle {}
impl Drop for Handle { fn drop(&mut self) { unsafe { uu_portal_close(self.0.as_ptr()) } } }
@@ -84,7 +92,7 @@ mod native {
was_locked.store(false, std::sync::atomic::Ordering::Release);
}
}
pub struct Session { handle: Mutex<Handle>, locked: tokio::sync::watch::Receiver<Option<bool>>, was_locked: std::sync::atomic::AtomicBool, recovery: Mutex<Recovery>, pub width: u32, pub height: u32 }
pub struct Session { handle: Mutex<Handle>, locked: tokio::sync::watch::Receiver<Option<bool>>, was_locked: std::sync::atomic::AtomicBool, recovery: Mutex<Recovery>, size: std::sync::atomic::AtomicU64, monitor: Mutex<Option<String>> }
impl Session {
fn take_lock_observation(&self) -> Result<bool, String> {
// A recovery in progress must see the lock even if another capture
@@ -99,7 +107,7 @@ mod native {
fn check_geometry(&self, replacement: &Self) -> Result<(), super::PortalError> {
// Encoder buffers use frame pixels. Logical geometry and EIS regions
// belong to the replacement handle and may change with scaling (#25).
if (self.width, self.height) != (replacement.width, replacement.height) {
if self.size() != replacement.size() {
Err(super::PortalError { code: 14 })
} else {
Ok(())
@@ -108,7 +116,10 @@ mod native {
pub fn is_alive(&self) -> bool {
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_alive(handle.0.as_ptr()) != 0 })
}
fn open_inner(cancelled: Option<&std::sync::atomic::AtomicBool>) -> Result<Self, super::PortalError> {
/// Opens a session for `monitor` (a Mutter connector) with that monitor's saved consent;
/// None means the screen currently selected, or the only monitor.
/// `fresh` asks the host again instead of restoring the saved consent (which stays saved).
fn open_inner(cancelled: Option<&std::sync::atomic::AtomicBool>, monitor: Option<&str>, fresh: bool) -> Result<Self, super::PortalError> {
extern "C" fn is_cancelled(data: *mut c_void) -> i32 {
let cancelled = unsafe { &*(data as *const std::sync::atomic::AtomicBool) };
i32::from(cancelled.load(std::sync::atomic::Ordering::Acquire))
@@ -121,16 +132,19 @@ mod native {
let (mut error, mut width, mut height) = (0, 0, 0);
let directory = super::permissions::directory();
let key = super::permissions::desktop_key();
let token = directory.as_deref().and_then(|dir| super::permissions::take(dir, key))
.and_then(|value| std::ffi::CString::new(value).ok());
let mut cache = (directory, key);
let wanted = monitor.map(str::to_owned).or_else(crate::wayland::portal_monitor);
// Each monitor has its own consent; the desktop-wide key is the single-monitor one.
let token = directory.as_deref().filter(|_| !fresh).and_then(|dir| {
wanted.as_deref().and_then(|name| super::permissions::take(dir, &super::permissions::monitor_key(name)))
.or_else(|| super::permissions::take(dir, key))
}).and_then(|value| std::ffi::CString::new(value).ok());
// The new token is saved once the granted monitor is known (after open).
let mut cache: Option<String> = None;
extern "C" fn save_token(token: *const libc::c_char, data: *mut c_void) {
// Callback is synchronous during open; cache lives through the call.
let result = std::panic::catch_unwind(|| unsafe {
let cache = &*(data as *const (Option<std::path::PathBuf>, &'static str));
if let (Some(dir), Ok(value)) = (cache.0.as_deref(), std::ffi::CStr::from_ptr(token).to_str()) {
if super::permissions::save(dir, cache.1, value).is_err() { log::warn!("Portal permission cache could not be saved"); }
}
let cache = &mut *(data as *mut Option<String>);
*cache = std::ffi::CStr::from_ptr(token).to_str().ok().map(str::to_owned);
});
if result.is_err() { log::warn!("Portal permission cache callback failed"); }
}
@@ -147,16 +161,77 @@ mod native {
}
};
let handle = NonNull::new(pointer).ok_or(super::PortalError { code: error })?;
let (mut x, mut y) = (0, 0);
let granted = (unsafe { uu_portal_stream_position(handle.as_ptr(), &mut x, &mut y) } == 0)
.then(|| crate::wayland::portal_monitor_at(x, y)).flatten();
if let (Some(dir), Some(token)) = (directory.as_deref(), cache.take()) {
let saved = match &granted {
Some(name) => super::permissions::monitor_key(name),
None => key.to_owned(),
};
if super::permissions::save(dir, &saved, &token).is_err() { log::warn!("Portal permission cache could not be saved"); }
}
if wanted.is_some() && granted != wanted { log::warn!("Portal granted a different monitor than requested"); }
// A freshly opened session holds no lock-screen frame: only an observed lock (or a
// closed stream) must discard the cached frame. Starting "locked" cleared the first
// valid frame, and a static desktop sends no new one, so the viewer stayed black (#2).
Ok(Self { handle: Mutex::new(Handle(handle)), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), width, height })
Ok(Self { handle: Mutex::new(Handle(handle)), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), size: pack(width, height).into(), monitor: Mutex::new(granted) })
}
/// Frame pixels of the monitor the stream currently follows.
pub fn size(&self) -> (u32, u32) {
let packed = self.size.load(std::sync::atomic::Ordering::Acquire);
((packed >> 32) as u32, packed as u32)
}
/// End the compositor session (screen-share indicator off); the next desktop
/// connection reopens it with the saved consent.
pub fn end(&self) {
if let Ok(handle) = self.handle.lock() { unsafe { uu_portal_end(handle.0.as_ptr()) }; }
}
/// Mutter connector of the monitor this session captures, when several are advertised.
pub fn monitor(&self) -> Option<String> { self.monitor.lock().ok().and_then(|m| m.clone()) }
/// Capture another monitor: open its own session (silently with saved consent; the first
/// time GNOME asks on the host) and swap it in, so every holder of this Arc follows.
pub fn switch_to(&self, connector: &str) -> Result<(), String> {
if self.monitor().as_deref() == Some(connector) { return Ok(()); }
let replacement = Self::open_inner(None, Some(connector), false).map_err(|error| error.to_string())?;
if replacement.monitor().as_deref() != Some(connector) {
return Err("Another monitor was shared; choose this monitor in the host dialog".into());
}
let size = replacement.size();
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
let previous = {
let mut handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
self.size.store(pack(size.0, size.1), std::sync::atomic::Ordering::Release);
std::mem::replace(&mut *handle, next)
};
if let Ok(mut monitor) = self.monitor.lock() { *monitor = Some(connector.to_owned()); }
drop(previous);
Ok(())
}
pub fn open() -> Result<Self, String> {
Self::open_inner(None).map_err(|error| error.to_string())
Self::open_inner(None, None, false).map_err(|error| error.to_string())
}
/// A consent saved before touch support restores keyboard and pointer only. Ask the host once
/// more (GNOME shows its share dialog; the consent timeout closes it) and swap the new session
/// in when it grants the touchscreen for this monitor at this size; until then, and on any
/// refusal, this session and its saved consent stay as they are. Ok(false): nothing to do.
pub fn upgrade_touch(&self) -> Result<bool, String> {
let available = self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_touch_available(handle.0.as_ptr()) } != 0);
if !available || self.touch_supported() { return Ok(false); }
log::info!("Portal touch consent: asking the host again for the touchscreen");
let monitor = self.monitor();
let replacement = Self::open_inner(None, monitor.as_deref(), true).map_err(|error| error.to_string())?;
// The new consent is saved for whichever monitor was granted, so a later connection uses it.
if replacement.monitor() != monitor { return Err("another monitor was shared".into()); }
if !replacement.touch_supported() { return Err("the touchscreen was not granted".into()); }
self.check_geometry(&replacement).map_err(|error| error.to_string())?;
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
let previous = std::mem::replace(&mut *self.handle.lock().map_err(|_| "Portal session lock poisoned")?, next);
drop(previous);
Ok(true)
}
pub fn open_cancellable(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, super::PortalError> {
Self::open_inner(Some(cancelled))
Self::open_inner(Some(cancelled), None, false)
}
pub fn recover(&self, cancelled: &std::sync::atomic::AtomicBool) -> Result<bool, super::PortalError> {
use std::sync::atomic::Ordering;
@@ -211,7 +286,9 @@ mod native {
self.capture_changed(frame, &mut None).map(|_| ())
}
pub fn capture_changed(&self, frame: &mut [u8], version: &mut Option<super::FrameVersion>) -> Result<bool, String> {
if frame.len() != self.width as usize * self.height as usize * 4 { return Err(super::error(11)); }
let (width, height) = self.size();
// A buffer sized for the previous monitor belongs to an encoder that a switch is replacing.
if frame.len() != width as usize * height as usize * 4 { return Ok(blank_changed(frame, version)); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
// Drain EIS even on a static desktop so pause/disconnect and sync
// events are processed without waiting for remote input.
@@ -252,7 +329,7 @@ mod native {
self.was_locked.store(true, std::sync::atomic::Ordering::Release);
false
}) { return Ok(None); }
let replacement = match Self::open_inner(None) {
let replacement = match Self::open_inner(None, self.monitor().as_deref(), false) {
Ok(value) => value,
Err(error) => {
log::warn!("Portal capture recovery deferred: {error}");
@@ -319,6 +396,30 @@ mod native {
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_button(handle.0.as_ptr(), button, i32::from(pressed)) })
}
/// Press and release a keysym through Notify*: the compositor picks the key and level of
/// the active layout. Under EIS (keycodes only) it fails before typing anything.
pub fn type_keysym(&self, symbol: u32) -> Result<(), String> {
if *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_key(handle.0.as_ptr(), symbol, -1, 1) })?;
super::check(unsafe { uu_portal_key(handle.0.as_ptr(), symbol, -1, 0) })
}
/// Smooth scroll in stream pixels (positive scrolls down/right); `finish` ends the gesture.
pub fn scroll(&self, dx: f64, dy: f64, finish: bool) -> Result<(), String> {
if *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_scroll(handle.0.as_ptr(), dx, dy, i32::from(finish)) })
}
/// The portal granted the touchscreen device type (requested where available).
pub fn touch_supported(&self) -> bool {
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_touch_supported(handle.0.as_ptr()) } != 0)
}
/// One finger in stream pixels: phase 0 down, 1 motion, 2 up.
pub fn touch(&self, phase: i32, x: f64, y: f64) -> Result<(), String> {
if phase != 2 && *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_touch(handle.0.as_ptr(), phase, x, y) })
}
pub fn key(&self, symbol: u64, pressed: bool) -> Result<(), String> {
if pressed && *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let symbol = u32::try_from(symbol).map_err(|_| "Invalid Portal keysym")?;
@@ -328,6 +429,14 @@ mod native {
}
}
/// Mutter's monitors (GNOME); empty elsewhere.
pub fn monitors() -> Vec<super::Monitor> {
if crate::engine_plugin::load(crate::engine_plugin::Engine::Portal).is_err() { return Vec::new(); }
let mut text = vec![0u8; 8192];
if unsafe { uu_portal_monitors(text.as_mut_ptr() as *mut libc::c_char, text.len()) } <= 0 { return Vec::new(); }
let end = text.iter().position(|&b| b == 0).unwrap_or(text.len());
super::parse_monitors(&String::from_utf8_lossy(&text[..end]))
}
#[cfg(test)]
mod tests {
use super::*;
@@ -342,8 +451,8 @@ mod native {
locked,
was_locked: std::sync::atomic::AtomicBool::new(false),
recovery: Mutex::new(Recovery::default()),
width: physical.0,
height: physical.1,
size: pack(physical.0, physical.1).into(),
monitor: Mutex::new(None),
}))
}
@@ -605,6 +714,13 @@ pub use native::Session as PortalSession;
#[cfg(not(all(target_os = "linux", feature = "portal")))]
pub struct PortalSession { pub width: u32, pub height: u32 }
#[cfg(not(all(target_os = "linux", feature = "portal")))]
impl PortalSession {
pub fn size(&self) -> (u32, u32) { (self.width, self.height) }
pub fn monitor(&self) -> Option<String> { None }
pub fn end(&self) {}
pub fn switch_to(&self, _: &str) -> Result<(), String> { Err(error(15)) }
}
#[cfg(not(all(target_os = "linux", feature = "portal")))]
impl PortalSession {
pub fn clipboard_supported(&self) -> bool { false }
pub fn clipboard_ready(&self) -> bool { false }
@@ -625,13 +741,48 @@ impl PortalSession {
pub fn capture_changed(&self, _: &mut [u8], _: &mut Option<FrameVersion>) -> Result<bool, String> { Err(error(15)) }
pub fn move_pointer(&self, _: f64, _: f64, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn button(&self, _: i32, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn touch_supported(&self) -> bool { false }
pub fn scroll(&self, _: f64, _: f64, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn upgrade_touch(&self) -> Result<bool, String> { Err(error(15)) }
pub fn type_keysym(&self, _: u32) -> Result<(), String> { Err(error(15)) }
pub fn touch(&self, _: i32, _: f64, _: f64) -> Result<(), String> { Err(error(15)) }
pub fn key(&self, _: u64, _: bool) -> Result<(), String> { Err(error(15)) }
}
/// The portal session that monitor switches act on: one per host, reused by reconnects.
static ACTIVE: std::sync::Mutex<Option<std::sync::Weak<PortalSession>>> = std::sync::Mutex::new(None);
pub fn permissions_directory() -> Option<std::path::PathBuf> { permissions::directory() }
pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connector) }
pub fn register(session: &Arc<PortalSession>) {
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
}
pub fn switch_active(connector: &str) -> Result<(), String> {
let session = ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade)
.ok_or("Portal desktop unavailable")?;
session.switch_to(connector)
}
pub struct Monitor { pub connector: String, pub width: u32, pub height: u32, pub x: i32, pub y: i32, pub primary: bool }
#[cfg(all(target_os = "linux", feature = "portal"))]
pub use native::monitors;
#[cfg(not(all(target_os = "linux", feature = "portal")))]
pub fn monitors() -> Vec<Monitor> { Vec::new() }
/// `connector\twidth\theight\tx\ty\tprimary` lines from the engine.
fn parse_monitors(text: &str) -> Vec<Monitor> {
text.lines().filter_map(|line| {
let mut f = line.split('\t');
let connector = f.next()?.to_owned();
let (width, height) = (f.next()?.parse().ok()?, f.next()?.parse().ok()?);
let (x, y, primary) = (f.next()?.parse().ok()?, f.next()?.parse().ok()?, f.next()? == "1");
(!connector.is_empty() && connector.len() <= 64 && connector.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_'))
.then_some(Monitor { connector, width, height, x, y, primary })
}).collect()
}
/// Forward frames in-process into encoder stdin. Cancellation drops the Arc;
/// the caller keeps one owning Arc for all subsequent desktop reconnects.
pub fn write_frames(session: Arc<PortalSession>, mut output: impl std::io::Write, cancelled: &std::sync::atomic::AtomicBool) -> Result<(), String> {
let length = (session.width as usize).checked_mul(session.height as usize).and_then(|n| n.checked_mul(4)).ok_or("Portal frame too large")?;
let (width, height) = session.size();
let length = (width as usize).checked_mul(height as usize).and_then(|n| n.checked_mul(4)).ok_or("Portal frame too large")?;
let mut frame = vec![0; length];
let interval = std::time::Duration::from_nanos(1_000_000_000 / crate::video::FPS);
while !cancelled.load(std::sync::atomic::Ordering::Acquire) {
@@ -645,13 +796,21 @@ pub fn write_frames(session: Arc<PortalSession>, mut output: impl std::io::Write
#[cfg(test)]
mod tests {
#[test]
fn monitor_lines_parse_and_reject_unsafe_connectors() {
let m = super::parse_monitors("eDP-1\t2880\t1800\t0\t0\t1\nHDMI-1\t2560\t1440\t1920\t0\t0\n../x\t1\t1\t0\t0\t0\n");
assert_eq!(m.len(), 2);
assert!(m[0].primary && m[0].connector == "eDP-1" && (m[1].width, m[1].x) == (2560, 1920));
}
#[test]
fn locked_frames_hide_old_content() { let mut frame = [42; 8]; super::blank(&mut frame); assert_eq!(frame, [0,0,0,255,0,0,0,255]); }
#[test]
fn errors_never_include_remote_messages_or_identifiers() {
assert!(super::check(4).unwrap_err().contains("cancelled or denied"));
assert!(super::check(9).unwrap_err().contains("closed or stream lost"));
assert!(super::check(15).unwrap_err().contains("--features wayland,portal"));
// Portal builds name the missing runtime engine; other builds say how to get one.
let unavailable = super::check(15).unwrap_err();
assert!(unavailable.contains("--features wayland,portal") || (cfg!(feature = "portal") && unavailable.contains("engine unavailable")));
}
#[test]
fn portal_error_display_is_fixed_and_sanitized() {
+3
View File
@@ -23,6 +23,9 @@ pub fn desktop_key() -> &'static str {
if desktop.split(':').any(|v| v == "kde") { "kde" } else { "gnome" }
}
/// Consent for one monitor (Mutter connector); connectors are checked to be file-name safe.
pub fn monitor_key(connector: &str) -> String { format!("{}@{}", desktop_key(), connector) }
pub fn take(dir: &Path, key: &str) -> Option<String> {
let path = dir.join(key);
let mut file = OpenOptions::new().read(true).custom_flags(libc::O_NOFOLLOW).open(&path).ok()?;
+77
View File
@@ -56,6 +56,31 @@ impl SessionIce {
}
}
/// With `UU_USE_PROXY=1`, also gather TURN relays over TCP/TLS (through the HTTP proxy when
/// one is configured); hosts whose UDP cannot reach the TURN servers then still get a relay.
pub fn configure_relay_transport() {
if !crate::auth::proxy_enabled() { return; }
let value = ["HTTPS_PROXY", "https_proxy", "ALL_PROXY", "all_proxy"].iter().find_map(|name| std::env::var(name).ok()).filter(|v| !v.is_empty());
let proxy = match value.as_deref().map(relay_proxy) {
Some(Ok(proxy)) => Some(proxy),
Some(Err(reason)) => { log::warn!("TURN over TCP/TLS disabled: {reason}"); return; }
None => None,
};
log::info!("TURN over TCP/TLS enabled: via_http_proxy={}", proxy.is_some());
webrtc::ice::agent::turn_tcp::set_relay_transport(webrtc::ice::agent::turn_tcp::RelayTransport { http_proxy: proxy });
}
/// `host:port` of an unauthenticated HTTP proxy URL; never echoes the value.
fn relay_proxy(value: &str) -> Result<String, &'static str> {
let url = reqwest::Url::parse(&if value.contains("://") { value.to_owned() } else { format!("http://{value}") })
.map_err(|_| "invalid proxy URL")?;
if url.scheme() != "http" { return Err("only http:// proxies are supported for TURN"); }
if !url.username().is_empty() || url.password().is_some() { return Err("proxy authentication is not supported for TURN"); }
let host = url.host_str().ok_or("invalid proxy URL")?;
let port = url.port_or_known_default().ok_or("invalid proxy URL")?;
Ok(format!("{host}:{port}")) // host_str() keeps IPv6 brackets
}
#[cfg(test)]
mod tests {
use super::*;
@@ -74,4 +99,56 @@ mod tests {
assert_eq!(config.ice_servers.len(),1);
assert!(config.ice_servers[0].urls.iter().all(|s|s.starts_with("stun:")));
}
#[test]
fn relay_proxy_accepts_plain_http_only() {
assert_eq!(super::relay_proxy("http://proxy.invalid:8889").unwrap(), "proxy.invalid:8889");
assert_eq!(super::relay_proxy("proxy.invalid:8889/").unwrap(), "proxy.invalid:8889");
assert_eq!(super::relay_proxy("http://[::1]:3128").unwrap(), "[::1]:3128");
for bad in ["socks5://proxy.invalid:1080", "https://proxy.invalid:443", "http://user:[email protected]:8889", "::"] {
assert!(super::relay_proxy(bad).is_err());
}
}
#[test]
fn turn_tcp_frames_stun_and_padded_channel_data() {
use webrtc::ice::agent::turn_tcp::frame_len;
assert_eq!(frame_len([0x01, 0x01, 0x00, 0x08]), Some(28));
assert_eq!(frame_len([0x40, 0x00, 0x00, 0x05]), Some(12));
assert_eq!(frame_len([0x40, 0x00, 0x00, 0x08]), Some(12));
assert_eq!(frame_len([0x80, 0x00, 0x00, 0x00]), None);
assert!(webrtc::ice::agent::turn_tcp::is_http_reply(*b"HTTP"));
assert!(!webrtc::ice::agent::turn_tcp::is_http_reply([0x40, 0x00, 0x00, 0x05]));
}
#[tokio::test]
async fn turn_tcp_connects_through_the_proxy_and_frames_the_stream() {
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use webrtc::ice::agent::turn_tcp::{dial, set_relay_transport, RelayTransport};
use webrtc::util::Conn;
let proxy = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let proxy_addr = proxy.local_addr().unwrap();
let server = tokio::spawn(async move {
let (mut socket, _) = proxy.accept().await.unwrap();
let mut head = Vec::new();
while !head.ends_with(b"\r\n\r\n") { let mut b = [0u8; 1]; socket.read_exact(&mut b).await.unwrap(); head.push(b[0]); }
assert!(String::from_utf8_lossy(&head).starts_with("CONNECT 192.0.2.1:2483 HTTP/1.1\r\n"));
socket.write_all(b"HTTP/1.1 200 Connection established\r\n\r\n").await.unwrap();
let mut frames = [0u8; 20 + 12];
socket.read_exact(&mut frames).await.unwrap();
socket.write_all(&frames).await.unwrap();
});
set_relay_transport(RelayTransport { http_proxy: Some(proxy_addr.to_string()) });
let target: std::net::SocketAddr = "192.0.2.1:2483".parse().unwrap();
let conn = dial("192.0.2.1", 2483, target, false).await.unwrap();
let mut stun = [0u8; 20]; stun[1] = 0x01;
let channel = [0x40, 0x00, 0x00, 0x05, 1, 2, 3, 4, 5, 0, 0, 0];
conn.send_to(&stun, target).await.unwrap();
conn.send_to(&channel, target).await.unwrap();
let mut buf = [0u8; 64];
assert_eq!(conn.recv_from(&mut buf).await.unwrap(), (20, target));
assert_eq!(conn.recv_from(&mut buf).await.unwrap(), (12, target));
assert_eq!(&buf[..12], &channel);
server.await.unwrap();
}
}
+31 -9
View File
@@ -7,13 +7,15 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::Arc;
use std::time::{Duration, Instant};
use tokio::sync::mpsc;
use tokio_tungstenite::connect_async;
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
use tokio_tungstenite::tungstenite::Message;
/// A peer that stops reading must not park the heartbeat loop on a full queue.
/// Kept below the Engine.IO window so the protocol deadline still fires.
const SEND_STALL_TIMEOUT: Duration = Duration::from_secs(10);
// DNS/TCP/TLS/WebSocket upgrade must finish in bounded time: after a network
// change the handshake can stall forever and the reconnect loop never retries.
const CONNECT_TIMEOUT: Duration = Duration::from_secs(20);
/// How often the watchdog checks the last inbound frame.
const WATCHDOG_TICK: Duration = Duration::from_secs(1);
@@ -49,7 +51,7 @@ pub enum SignalingEvent {
BeControlled(Value),
/// be-controlled with its binary app_data (ConnectOptions): capture type and the
/// ice_id it announces, when present.
ConnectRequest { capture_type: u64, ice_id: Option<String>, transport:crate::session_ice::SessionIce, controller_mac: bool },
ConnectRequest { capture_type: u64, ice_id: Option<String>, transport:crate::session_ice::SessionIce, controller: crate::input::Controller },
Soac(SoacMessage),
Released(Value),
Left(Value),
@@ -177,6 +179,21 @@ mod refresh_tests {
let closed=tokio::time::timeout(std::time::Duration::from_secs(15),closed_rx).await;
assert!(closed.is_ok(),"a blocked consumer must not keep a dead signaling socket open");
}
#[tokio::test]
async fn stalled_handshake_times_out() {
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
// Accepts TCP but never answers the upgrade, like a stalled path after a network change.
let listener=tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let address=listener.local_addr().unwrap();
tokio::spawn(async move {
let (_tcp,_)=listener.accept().await.unwrap();
tokio::time::sleep(std::time::Duration::from_secs(30)).await;
});
let req=format!("ws://{address}/socket.io/").into_client_request().unwrap();
let result=tokio::time::timeout(std::time::Duration::from_secs(5),super::open_socket(req,std::time::Duration::from_secs(1))).await;
assert!(matches!(result,Ok(Err(_))),"a stalled handshake must fail within the connect timeout");
}
#[tokio::test]
async fn stalled_event_delivery_still_reports_disconnected() {
use futures_util::{SinkExt,StreamExt};
@@ -210,6 +227,13 @@ mod refresh_tests {
}
}
async fn open_socket(
req: tokio_tungstenite::tungstenite::handshake::client::Request,
limit: Duration,
) -> Result<crate::ws_transport::Socket, String> {
crate::ws_transport::connect(req, limit).await
}
impl SignalingClient {
pub async fn connect(
url: &str,
@@ -231,9 +255,7 @@ impl SignalingClient {
room_token.parse().map_err(|_| "Invalid token header")?,
);
let (ws_stream, _) = connect_async(req)
.await
.map_err(|e| format!("WS connect failed: {}", e))?;
let ws_stream = open_socket(req, CONNECT_TIMEOUT).await?;
log::info!("Connected to Engine.IO / Socket.IO");
let (mut write, mut read) = ws_stream.split();
@@ -440,6 +462,7 @@ impl SignalingClient {
log::info!("Cloud peer event: generation={} event={} age_s={} pings={} last_ping_gap_s={} ice_id_present={}",generation,event_name,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs(),data.get("ice_id").is_some());
let ice_id = data.get("ice_id").and_then(|v| v.as_str()).unwrap_or("");
if ice_id.is_empty() {
log::info!("Cloud room leave shape: {}", crate::protocol::json_shape(data, 3));
log::warn!("Cloud room leave without peer identifier; renewing signaling (expiry cause unknown)");
if !send_event(&event_sender, SignalingEvent::Disconnected).await { break; }
} else {
@@ -490,10 +513,9 @@ impl SignalingClient {
if !caps.is_empty() { log::info!("Viewer decoder caps (fps,codec,w,h,chroma fields): {:?}", caps); }
// Viewer platform (website enum: 1 windows, 2 android, 3 ios, 4 macos, 5 tv).
let platform = header.get("controller_platform").or_else(|| header.get("data").and_then(|d| d.get("controller_platform")));
let controller_mac = platform.is_some_and(|v| v.as_i64() == Some(4)
|| v.as_str().is_some_and(|s| s == "4" || s.to_ascii_lowercase().contains("mac") || s.to_ascii_lowercase().contains("darwin")));
log::info!("Controller platform: {} mac={}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::<String>(), controller_mac);
if !send_event(&event_sender, SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller_mac }).await { break; }
let controller = crate::input::Controller::from_platform(platform);
log::info!("Controller platform: {} controller={:?}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::<String>(), controller);
if !send_event(&event_sender, SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller }).await { break; }
}
}
}
+8 -6
View File
@@ -376,11 +376,11 @@ pub fn check_ffmpeg_usable() {
if crate::desktop_backend::headless() { return; }
tokio::spawn(async {
static LAST_NOTICE: std::sync::Mutex<Option<Instant>> = std::sync::Mutex::new(None);
const SUMMARY: &str = "无法传输远程画面";
let summary = crate::i18n::s("无法传输远程画面","Cannot stream the remote desktop");
match ffmpeg_encoders().await {
None => {
log::error!("FFmpeg is not runnable: desktop video cannot start and viewers stay on 正在传输画面. Install ffmpeg (Debian/Ubuntu: sudo apt install ffmpeg; Arch: sudo pacman -S ffmpeg; Fedora: ffmpeg from RPM Fusion), or set ffmpeg_root, then check `uuremote-server doctor`");
let text = "未找到可运行的 FFmpeg,客户端会一直停在「正在传输画面」。\n请安装后重新连接:sudo apt install ffmpeg(Arch:sudo pacman -S ffmpeg;Fedora 需先启用 RPM Fusion)";
let text = crate::i18n::s("未找到可运行的 FFmpeg,客户端会一直停在「正在传输画面」。\n请安装后重新连接:sudo apt install ffmpeg(Arch:sudo pacman -S ffmpeg;Fedora 需先启用 RPM Fusion)","No runnable FFmpeg found; viewers stay on the loading screen.\nInstall it and reconnect: sudo apt install ffmpeg (Arch: sudo pacman -S ffmpeg; Fedora: enable RPM Fusion first)");
let previous = {
let mut last = LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner());
let previous = *last;
@@ -389,7 +389,7 @@ pub fn check_ffmpeg_usable() {
due.then_some(previous)
};
// The notification is a blocking D-Bus call (bounded to 3 s).
let told = tokio::task::spawn_blocking(move || crate::assist::show_problem(SUMMARY, Some(text), previous.is_some())).await.unwrap_or(false);
let told = tokio::task::spawn_blocking(move || crate::assist::show_problem(summary, Some(text), previous.is_some())).await.unwrap_or(false);
// Only a notice that reached the person starts the 5-minute quiet period.
if let (Some(previous), false) = (previous, told) {
*LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner()) = previous;
@@ -398,7 +398,7 @@ pub fn check_ffmpeg_usable() {
}
Some(found) => {
if !found.contains(&"libx264") { log::warn!("FFmpeg has no libx264: CPU encoding and the fallback after a hardware encoder failure are unavailable. Install a full ffmpeg build"); }
tokio::task::spawn_blocking(|| crate::assist::show_problem(SUMMARY, None, false));
tokio::task::spawn_blocking(move || crate::assist::show_problem(summary, None, false));
}
}
});
@@ -816,7 +816,8 @@ async fn read_encoder_with(
selection: crate::video_select::Selection,
)->Result<(),String>{
let selected_output=crate::wayland::capture_source(&display,portal.is_some(),settings.source_id);
let size=selected_output.map_or(size,|s|(s.width,s.height));
// Portal frames come from the session's current monitor, whatever the advertised mode says.
let size=portal.as_ref().map(|p|p.size()).or(selected_output.map(|s|(s.width,s.height))).unwrap_or(size);
let kms=display.starts_with("kms:");
let wayland=kms || display.starts_with("wayland:");
// X11 multi-screen: x11grab reads only the selected monitor's region of the root.
@@ -929,7 +930,8 @@ async fn read_encoder_with(
let interval=Duration::from_nanos(1_000_000_000/u64::from(settings.fps));
let mut tick=tokio::time::interval(interval);
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
let mut frame=vec![0;(session.width as usize)*(session.height as usize)*4];
let (width,height)=session.size();
let mut frame=vec![0;(width as usize)*(height as usize)*4];
let mut version=None;
loop {
tick.tick().await;
+27 -10
View File
@@ -22,20 +22,35 @@ fn device_platform(data:&Value,device:&str)->Option<i64>{
.find(|d|d.get("device_id").and_then(Value::as_str)==Some(device))
.and_then(|d|d.get("platform")).and_then(Value::as_i64)
}
/// English for server messages observed in assistance and connection replies.
fn english_message(msg: &str) -> Option<&'static str> {
Some(match msg {
"验证码错误" => "Wrong verification code",
"对方未开启协助" => "The partner has not turned on remote assistance",
"无法对同账号的设备发起远程协助" => "Remote assistance between devices of the same account is not possible",
"被控端正在被远控中,无法发起连接" => "This computer is already being controlled from another device",
_ => return None,
})
}
#[derive(Debug, PartialEq, Eq)]
pub enum Error { AuthenticationExpired, Api(i32, String), InvalidResponse, Transport, MissingRoom, InvalidDevice, InvalidAssist, UnknownKeyboardPlatform }
impl std::fmt::Display for Error {
// The server's short message is user-facing (e.g. 2002 「被控端正在被远控中,无法发起连接」).
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Error::Api(code, msg) if !msg.is_empty() => write!(f, "{msg} (code {code})"),
Error::AuthenticationExpired => write!(f, "登录已过期,请重新登录"),
Error::Transport => write!(f, "网络连接失败"),
Error::InvalidAssist => write!(f, "请输入对方的设备 ID 和有效验证码"),
Error::InvalidResponse => write!(f, "服务器响应格式无效"),
Error::MissingRoom => write!(f, "服务器未返回可用的房间或信令信息"),
Error::UnknownKeyboardPlatform => write!(f, "无法确定目标键盘平台,不能启用控制"),
Error::Api(code, _) => write!(f, "连接请求失败(错误码 {code})"),
// Observed 2002: the target already has a controller (another viewer, a phone).
Error::Api(2002, _) => f.write_str(crate::i18n::s("被控端正在被远控中,无法发起连接(错误码 2002)",
"This computer is already being controlled from another device; disconnect there and try again (error 2002)")),
// Server messages are Chinese only: the English UI translates the known ones.
Error::Api(code, msg) if !msg.is_empty() && !crate::i18n::english() => write!(f, "{msg} (code {code})"),
Error::Api(code, msg) if english_message(msg).is_some() => write!(f, "{} (code {code})", english_message(msg).unwrap_or_default()),
Error::AuthenticationExpired => f.write_str(crate::i18n::s("登录已过期,请重新登录","Sign-in expired, please sign in again")),
Error::Transport => f.write_str(crate::i18n::s("网络连接失败","Network connection failed")),
Error::InvalidAssist => f.write_str(crate::i18n::s("请输入对方的设备 ID 和有效验证码","Enter the partner's device ID and a valid code")),
Error::InvalidResponse => f.write_str(crate::i18n::s("服务器响应格式无效","Invalid server response")),
Error::MissingRoom => f.write_str(crate::i18n::s("服务器未返回可用的房间或信令信息","The server returned no usable room or signaling info")),
Error::UnknownKeyboardPlatform => f.write_str(crate::i18n::s("无法确定目标键盘平台,不能启用控制","Unknown remote keyboard platform; control is disabled")),
Error::Api(code, _) => f.write_str(&crate::tr!("连接请求失败(错误码 {code})","Connection request failed (error {code})")),
_ => write!(f, "viewer API: {self:?}"),
}
}
@@ -237,7 +252,8 @@ mod tests {
assert_eq!(parse_share(200,v,&[]).err().unwrap(),Error::MissingRoom);
}
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
assert_eq!(parse_share(422,json!({"code":9876,"msg":msg}),&[]).err().unwrap().to_string(),format!("{msg} (code 9876)"));
let shown=if crate::i18n::english() {english_message(msg).unwrap()} else {msg};
assert_eq!(parse_share(422,json!({"code":9876,"msg":msg}),&[]).err().unwrap().to_string(),format!("{shown} (code 9876)"));
}
assert_eq!(parse_share(422,json!({"code":9876,"msg":"fixture-code\nfixture-token"}),&["fixture-code","fixture-token",""]).err().unwrap(),Error::Api(9876,"[已隐藏][已隐藏]".into()));
assert_eq!(parse_share(422,json!({"code":1120,"msg":"expired"}),&[]).err().unwrap(),Error::AuthenticationExpired);
@@ -405,7 +421,8 @@ mod http_tests {
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
let(url,job)=server(vec![(422,json!({"code":9876,"msg":msg}))]).await;
let error=Api::new(signer(),&url).join_share("synthetic-id","synthetic-code").await.err().unwrap();
assert_eq!(error.to_string(),format!("{msg} (code 9876)"));assert_eq!(job.await.unwrap().len(),1);
let shown=if crate::i18n::english() {english_message(msg).unwrap()} else {msg};
assert_eq!(error.to_string(),format!("{shown} (code 9876)"));assert_eq!(job.await.unwrap().len(),1);
}
for (status,body,expected) in [
(200,json!({"code":405,"msg":"业务拒绝"}),Error::Api(405,"业务拒绝".into())),
+7 -7
View File
@@ -4,10 +4,10 @@ use tokio::{io::AsyncWriteExt,process::{Child,Command}};
pub fn read_code(input: impl BufRead) -> Result<String,String> {
let mut code=String::new();
input.take(1025).read_line(&mut code).map_err(|_|"无法从 stdin 读取验证码")?;
if code.len()>1024 {return Err("验证码过长".into())}
input.take(1025).read_line(&mut code).map_err(|_|crate::i18n::s("无法从 stdin 读取验证码","Cannot read the code from stdin"))?;
if code.len()>1024 {return Err(crate::i18n::s("验证码过长","Code is too long").into())}
if code.ends_with('\n') {code.pop();if code.ends_with('\r'){code.pop();}}
if code.trim().is_empty() || code.chars().any(char::is_control) {return Err("请输入有效验证码".into())}
if code.trim().is_empty() || code.chars().any(char::is_control) {return Err(crate::i18n::s("请输入有效验证码","Enter a valid code").into())}
Ok(code)
}
pub fn command(exe:&Path,id:&str)->Command {
@@ -17,10 +17,10 @@ pub fn command(exe:&Path,id:&str)->Command {
}
pub async fn send_code(child:&mut Child,code:&str)->Result<(),String> {
let result=async {
let mut stdin=child.stdin.take().ok_or("无法打开会话输入管道")?;
stdin.write_all(code.as_bytes()).await.map_err(|_|"无法向会话传递验证码")?;
stdin.write_all(b"\n").await.map_err(|_|"无法向会话传递验证码")?;
stdin.shutdown().await.map_err(|_|"无法关闭会话输入管道")
let mut stdin=child.stdin.take().ok_or(crate::i18n::s("无法打开会话输入管道","Cannot open the session input pipe"))?;
stdin.write_all(code.as_bytes()).await.map_err(|_|crate::i18n::s("无法向会话传递验证码","Cannot pass the code to the session"))?;
stdin.write_all(b"\n").await.map_err(|_|crate::i18n::s("无法向会话传递验证码","Cannot pass the code to the session"))?;
stdin.shutdown().await.map_err(|_|crate::i18n::s("无法关闭会话输入管道","Cannot close the session input pipe"))
}.await;
if result.is_err() {let _=child.kill().await;}
result.map_err(str::to_owned)
+4 -3
View File
@@ -93,20 +93,21 @@ mod playback {
if let Some(mut child)=self.child.take() {let _=child.start_kill();tokio::spawn(async move {let _=child.wait().await;});}
}
}
pub struct Playback { queue:sdl2::audio::AudioQueue<i16>, decoder:Decoder }
pub struct Playback { queue:sdl2::audio::AudioQueue<i16>, decoder:Decoder, pub volume:u8 }
impl Playback {
pub fn new(sdl:&sdl2::Sdl,audio:Audio)->Option<Self> {
if !audio.enabled {return None}
let result=(|| {
let subsystem=sdl.audio()?;
let queue=subsystem.open_queue::<i16,_>(None,&sdl2::audio::AudioSpecDesired{freq:Some(48000),channels:Some(2),samples:Some(960)})?;
let decoder=Decoder::new(audio)?;queue.resume();Ok::<_,String>(Self{queue,decoder})
let decoder=Decoder::new(audio)?;queue.resume();Ok::<_,String>(Self{queue,decoder,volume:100})
})();
match result {Ok(p)=>Some(p),Err(_)=>{log::warn!("Viewer audio playback unavailable");None}}
}
pub fn pump(&mut self)->Result<(),String> {
if !self.decoder.alive() {return Err("Audio decoder stopped".into())}
while let Some(samples)=self.decoder.pcm.pop() {
while let Some(mut samples)=self.decoder.pcm.pop() {
if self.volume<100 {let v=i32::from(self.volume);for s in samples.iter_mut(){*s=(i32::from(*s)*v/100) as i16;}}
if self.queue.size()+samples.len() as u32*2>SDL_BYTES {self.queue.clear();}
self.queue.queue_audio(&samples).map_err(|_|"Audio queue failed")?;
}Ok(())
+82 -29
View File
@@ -1,34 +1,35 @@
//! H.264/H.265 decoding through an external `ffmpeg` process, like the host's encoder pipeline.
//! Needs only the ffmpeg CLI, not FFmpeg development libraries.
//! Output is scaled into a fixed letterboxed canvas so every frame has a known byte length; the
//! source size from ffmpeg's stream line tells the window which sub-rectangle is picture content.
//! Frames are decoded at the host's native size (resampling the picture blurs text); ffmpeg's verbose
//! scaler line gives the size before the first frame. `UU_VIEWER_SIZE` keeps the old fixed letterboxed
//! canvas, where the stream line tells the window which sub-rectangle is picture content.
use super::desktop::{Decoder,Frame};
use super::media::Codec;
use std::io::{BufRead,Read,Write};
use std::process::{Child,ChildStdin,Command,Stdio};
use std::sync::Arc;
use std::sync::atomic::{AtomicU64,Ordering};
use std::sync::atomic::{AtomicBool,AtomicU64,Ordering};
use std::sync::mpsc::{Receiver,TryRecvError};
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<Vec<u8>>, width:u32, height:u32, source:Arc<AtomicU64> }
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<(u32,u32,Vec<u8>)>, fixed:Option<(u32,u32)>, source:Arc<AtomicU64>, resized:Arc<AtomicBool> }
impl Cli {
/// `UU_VIEWER_SIZE=WxH` picks the decoded size (default 1920x1080); `UU_VIEWER_FFMPEG` the binary.
/// `UU_VIEWER_SIZE=WxH` scales into a fixed canvas (default: native size); `UU_VIEWER_FFMPEG` the binary.
pub fn new()->Result<Self,String> {
let (width,height)=std::env::var("UU_VIEWER_SIZE").ok()
let fixed=std::env::var("UU_VIEWER_SIZE").ok()
.and_then(|v|{let (w,h)=v.split_once('x')?;Some((w.parse().ok()?,h.parse().ok()?))})
.filter(|&(w,h):&(u32,u32)|(16..=8192).contains(&w)&&(16..=8192).contains(&h)&&w%2==0&&h%2==0)
.unwrap_or((1920,1080));
Self::with_codec(Codec::H264,width,height)
.filter(|&(w,h):&(u32,u32)|(16..=8192).contains(&w)&&(16..=8192).contains(&h)&&w%2==0&&h%2==0);
Self::with_codec(Codec::H264,fixed)
}
fn with_codec(codec:Codec,width:u32,height:u32)->Result<Self,String> {
fn with_codec(codec:Codec,fixed:Option<(u32,u32)>)->Result<Self,String> {
let ffmpeg=std::env::var("UU_VIEWER_FFMPEG").unwrap_or_else(|_|"ffmpeg".into());
let filter=format!("scale={width}:{height}:force_original_aspect_ratio=decrease,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2");
let filter=fixed.map(|(width,height)|format!("scale={width}:{height}:force_original_aspect_ratio=decrease:flags=lanczos,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2"));
let passthrough=passthrough_args(&ffmpeg);
let mut child=Command::new(&ffmpeg)
.args(["-hide_banner","-loglevel","info","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an","-vf",&filter,
"-pix_fmt","rgb24",
let mut command=Command::new(&ffmpeg);
command.args(["-hide_banner","-loglevel","verbose","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an"]);
if let Some(filter)=&filter {command.args(["-vf",filter]);}
let mut child=command.args(["-pix_fmt","rgb24",
// Raw H.264/H.265 carries no timestamps; constant-rate output dropped almost every frame of
// the official Mac host's stream (270 → 2). Pass frames through unchanged.
passthrough.0,passthrough.1,"-f","rawvideo","pipe:1"])
@@ -37,30 +38,58 @@ impl Cli {
let input=child.stdin.take().ok_or("ffmpeg stdin missing")?;
let mut output=child.stdout.take().ok_or("ffmpeg stdout missing")?;
// Source picture size from the one-time stream line; 0 until parsed. Only the numbers are kept.
let source=Arc::new(AtomicU64::new(0));
let source=Arc::new(AtomicU64::new(0));let resized=Arc::new(AtomicBool::new(false));
let (size_tx,size_rx)=std::sync::mpsc::sync_channel::<(u32,u32)>(1);
if let Some((w,h))=fixed {let _=size_tx.send((w,h));}
if let Some(stderr)=child.stderr.take() {
let source=source.clone();
let (source,resized)=(source.clone(),resized.clone());
let _=std::thread::Builder::new().name("uu-viewer-ffmpeg-info".into()).spawn(move||{
let mut native=None;
for line in std::io::BufReader::new(stderr).lines().map_while(Result::ok) {
if source.load(Ordering::Relaxed)!=0 {continue}
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
if fixed.is_some() {
if source.load(Ordering::Relaxed)!=0 {continue}
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
continue
}
// Native: the first scaler line fixes the output size; ffmpeg auto-scales a later
// resolution change to it, so a different input size means the decoder must restart.
let Some((input,out))=parse_scaler_sizes(&line) else {continue};
match native {
None=>{native=Some(out);let _=size_tx.send(out);},
Some(size) if input!=size=>resized.store(true,Ordering::Release),
Some(_)=>{},
}
}
});
}
let size=width as usize*height as usize*3;
// Bounded: a slow window drops decoded frames instead of growing memory.
let (tx,frames)=std::sync::mpsc::sync_channel(2);
std::thread::Builder::new().name("uu-viewer-decode".into()).spawn(move||{
let Ok((width,height))=size_rx.recv() else {return};
let size=width as usize*height as usize*3;
loop {
let mut frame=vec![0;size];
if output.read_exact(&mut frame).is_err() {break;}
match tx.try_send(frame) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
match tx.try_send((width,height,frame)) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
}
}).map_err(|e|format!("Decoder reader: {e}"))?;
Ok(Self{child,input:Some(input),codec,frames,width,height,source})
Ok(Self{child,input:Some(input),codec,frames,fixed,source,resized})
}
}
/// Verbose swscale setup line: `[auto_scale_0 @ 0x..] w:3024 h:1964 fmt:yuv420p ... -> w:3024 h:1964 fmt:rgb24 ...`.
fn parse_scaler_sizes(line:&str)->Option<((u32,u32),(u32,u32))> {
let (input,out)=line.split_once(" -> ")?;
if !out.contains(" fmt:") {return None}
fn size(part:&str)->Option<(u32,u32)> {
let mut words=part.split_whitespace();
let w=words.find_map(|t|t.strip_prefix("w:"))?.parse().ok()?;
let h=words.next()?.strip_prefix("h:")?.parse().ok()?;
((16..=16384).contains(&w)&&(16..=16384).contains(&h)).then_some((w,h))
}
Some((size(input.rsplit_once("] ").map_or(input,|(_,rest)|rest))?,size(out)?))
}
/// `30000/1001`-style or display strings are irrelevant here: the first WxH on a `Video:` line is the
/// coded picture size, which is the aspect the scale+pad filter letterboxes into the canvas.
fn parse_video_size(line:&str)->Option<(u32,u32)> {
@@ -93,19 +122,33 @@ fn passthrough_args(ffmpeg:&str)->(&'static str,&'static str) {
impl Decoder for Cli {
fn set_codec(&mut self,codec:Codec)->Result<(),String>{
if self.codec!=codec {*self=Self::with_codec(codec,self.width,self.height)?;}Ok(())
if self.codec!=codec {*self=Self::with_codec(codec,self.fixed)?;}Ok(())
}
fn reset(&mut self) {}
fn decode(&mut self,au:&[u8])->Result<Vec<Frame>,String> {
if self.resized.load(Ordering::Acquire) {
// The caller resets and asks for a key frame; the new process sizes itself from it.
*self=Self::with_codec(self.codec,self.fixed)?;
return Err("remote resolution changed".into());
}
let input=self.input.as_mut().ok_or("ffmpeg input closed")?;
input.write_all(au).and_then(|_|input.flush()).map_err(|_|"ffmpeg decoder exited")?;
// The raw-stream parser ends an access unit only when the next one starts; an access unit
// delimiter right after it releases the picture now instead of one remote frame later.
let delimiter:&[u8]=match self.codec {Codec::H264=>&[0,0,0,1,0x09,0xf0],Codec::H265=>&[0,0,0,1,0x46,0x01,0x50]};
input.write_all(au).and_then(|_|input.write_all(delimiter)).and_then(|_|input.flush()).map_err(|_|"ffmpeg decoder exited")?;
self.take_frames()
}
fn poll(&mut self)->Vec<Frame> {self.take_frames().unwrap_or_default()}
}
impl Cli {
fn take_frames(&mut self)->Result<Vec<Frame>,String> {
let mut out=Vec::new();
loop {
match self.frames.try_recv() {
Ok(rgb)=>{
Ok((width,height,rgb))=>{
let source=self.source.load(Ordering::Relaxed);
let content=(source!=0).then(||((source>>32) as u32,source as u32));
out.push(Frame{width:self.width,height:self.height,rgb,content})
let content=(self.fixed.is_some()&&source!=0).then(||((source>>32) as u32,source as u32));
out.push(Frame{width,height,rgb,content})
},
Err(TryRecvError::Empty)=>break,
Err(TryRecvError::Disconnected)=>return Err("ffmpeg decoder exited".into()),
@@ -135,7 +178,9 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
Err(e) if e.kind()==std::io::ErrorKind::NotFound=>{eprintln!("skip: ffmpeg is not on PATH");return},
result=>assert!(result.expect("ffmpeg availability").success()),
}
let mut cli=Cli::with_codec(Codec::H265,32,32).unwrap();
// Native size and the fixed UU_VIEWER_SIZE canvas.
for fixed in [None,Some((32,32))] {
let mut cli=Cli::with_codec(Codec::H265,fixed).unwrap();
for (codec,data) in [
(Codec::H264,&include_bytes!("../../tests/fixtures/viewer/red-420.h264")[..]),
(Codec::H265,&include_bytes!("../../tests/fixtures/viewer/red-420.hevc")[..]),
@@ -146,7 +191,7 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
// Exercise the same streaming process and RGB conversion as SDL, then drain at EOF.
let mut frames=cli.decode(data).unwrap();drop(cli.input.take());
loop {match cli.frames.recv_timeout(std::time::Duration::from_secs(5)) {
Ok(rgb)=>frames.push(Frame{width:32,height:32,rgb,content:None}),
Ok((width,height,rgb))=>frames.push(Frame{width,height,rgb,content:None}),
Err(std::sync::mpsc::RecvTimeoutError::Disconnected)=>break,
Err(e)=>panic!("{codec:?} decoder did not finish: {e}"),
}}
@@ -155,9 +200,17 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
assert!(!frames.is_empty(),"{codec:?}: no RGB frames");
for frame in frames {
assert_eq!(frame.rgb.len(),32*32*3);
assert_eq!((frame.width,frame.height),(32,32));
assert!(frame.rgb.chunks_exact(3).all(|p|p[0]>220 && p[1]<30 && p[2]<30),"{codec:?}: RGB conversion");
}
}
}
}
#[test] fn native_size_is_read_from_the_scaler_line(){
assert_eq!(super::parse_scaler_sizes("[auto_scale_0 @ 0x7f55ac005f40] w:3024 h:1964 fmt:yuv420p csp:unknown range:unknown sar:1/1 -> w:3024 h:1964 fmt:rgb24 csp:gbr range:pc sar:1/1 flags:0x00000004"),Some(((3024,1964),(3024,1964))));
assert_eq!(super::parse_scaler_sizes("[auto_scaler_0 @ 0x55d] w:2560 h:1440 fmt:yuv444p sar:1/1 -> w:1920 h:1080 fmt:rgb24 sar:1/1 flags:0x4"),Some(((2560,1440),(1920,1080))));
assert_eq!(super::parse_scaler_sizes("[Parsed_pad_1 @ 0x7f00] w:32 h:32 -> w:64 h:32 x:16 y:0 color:0x000000FF"),None);
assert_eq!(super::parse_scaler_sizes(" Stream #0:0 -> #0:0 (h264 (native) -> rawvideo (native))"),None);
}
#[test] fn source_size_is_read_from_the_ffmpeg_stream_line(){
assert_eq!(super::parse_video_size(" Stream #0:0: Video: h264 (High), yuv420p(progressive), 3024x1964, 25 fps"),Some((3024,1964)));
+76 -2
View File
@@ -7,12 +7,62 @@ impl Default for Desktop {
}
/// `content` is the source picture size inside the (possibly padded) RGB canvas; None = full frame.
pub struct Frame { pub width:u32, pub height:u32, pub rgb:Vec<u8>, pub content:Option<(u32,u32)> }
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self); }
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self);
/// Frames finished since the last call, without new input; an asynchronous decoder
/// returns a picture here instead of holding it until the next access unit arrives.
fn poll(&mut self)->Vec<Frame> {Vec::new()} }
pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; }
/// Counts only (access units, presented frames, decode errors) for the periodic stats line.
pub static STATS:[std::sync::atomic::AtomicU64;3]=[std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0)];
fn wants_key_frame(units:u64,presented:u64)->bool {presented==0 && units%30==0}
/// True when an Annex-B access unit carries a picture the decoder can restart from: an IDR/IRAP,
/// an H.264 recovery-point SEI or an H.264 I slice (some hosts answer PLI without an IDR, #136).
pub fn is_key_frame(codec:super::media::Codec,au:&[u8])->bool {
au.windows(4).enumerate().filter(|(_,w)|w[..3]==[0,0,1]).any(|(i,w)|match codec {
super::media::Codec::H264=>match w[3]&0x1f {5=>true,6=>au.get(i+4)==Some(&6),1=>h264_i_slice(&au[i+4..]),_=>false},
super::media::Codec::H265=>(16..=21).contains(&((w[3]>>1)&0x3f)),
})
}
/// Reads first_mb_in_slice and slice_type (both ue(v)) from a slice header; I = 2 or 7.
fn h264_i_slice(rbsp:&[u8])->bool {
let mut bit=0usize;
let mut ue=||->Option<u32>{
let mut zeros=0;
while (rbsp.get(bit/8)?>>(7-bit%8))&1==0 {zeros+=1;bit+=1;if zeros>31 {return None}}
bit+=1;let mut v=0u32;
for _ in 0..zeros {v=(v<<1)|u32::from((rbsp.get(bit/8)?>>(7-bit%8))&1);bit+=1;}
Some((1u32<<zeros)-1+v)
};
ue().is_some() && matches!(ue(),Some(2|7))
}
/// After a local reset, holds back pictures until a restart point arrives, but never longer
/// than `limit`: a host that ignores PLI must not leave the window blank (#136).
pub struct KeyGate { since:Option<std::time::Instant>, limit:std::time::Duration }
impl KeyGate {
pub fn new()->Self {Self{since:None,limit:std::time::Duration::from_millis(1500)}}
pub fn arm(&mut self) {self.since.get_or_insert_with(std::time::Instant::now);}
/// False = drop this unit and keep asking for a key frame.
pub fn admit(&mut self,codec:super::media::Codec,au:&[u8])->bool {
let Some(since)=self.since else {return true};
let timed_out=since.elapsed()>=self.limit;
if timed_out || is_key_frame(codec,au) {
if timed_out {log::debug!("Viewer desktop: no key frame within {:?} after reset; decoding on",self.limit);}
self.since=None;true
} else {false}
}
}
/// Shows the newest frame a decoder finished between access units.
pub fn drain(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink)->Result<(),String> {
if let Some(frame)=decoder.poll().pop() {STATS[1].fetch_add(1,Ordering::Relaxed);sink.present(&frame)?;}
Ok(())
}
pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:super::media::Codec,pli:&AtomicBool)->Result<(),String> {
STATS[0].fetch_add(1,Ordering::Relaxed);
let units=STATS[0].fetch_add(1,Ordering::Relaxed)+1;
// A later session can join a clean stream with no IDR in flight (#124): keep asking until a frame shows.
if wants_key_frame(units,STATS[1].load(Ordering::Relaxed)) {
pli.store(true,Ordering::Release);
if units==300 { log::warn!("Viewer desktop: no decodable frame after {units} access units; requesting key frames (another session may hold the host)"); }
}
// Local diagnostic: UU_VIEWER_DUMP_H264=path appends the first 300 access units (owner's own stream).
if codec==super::media::Codec::H264 && STATS[0].load(Ordering::Relaxed)<=300 { if let Some(path)=std::env::var_os("UU_VIEWER_DUMP_H264") {
use std::io::Write; if let Ok(mut f)=std::fs::OpenOptions::new().create(true).append(true).open(path){let _=f.write_all(au);}
@@ -29,8 +79,32 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s
}
}
#[cfg(test)] mod tests {
#[test] fn key_frames_by_nal_type(){
use crate::viewer::media::Codec;
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x67,1,0,0,0,1,0x68,2,0,0,0,1,0x65,3]));
assert!(!super::is_key_frame(Codec::H264,&[0,0,0,1,0x61,1]));
assert!(super::is_key_frame(Codec::H265,&[0,0,0,1,0x40,1,0,0,1,0x26,1,3]));
assert!(!super::is_key_frame(Codec::H265,&[0,0,0,1,0x02,1]));
// I slice (first_mb=0 '1', slice_type=7 '0001000') and P slice (slice_type=5 '00110').
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x41,0b1000_1000,0]));
assert!(!super::is_key_frame(Codec::H264,&[0,0,0,1,0x41,0b1001_1000]));
// Recovery-point SEI (payload type 6).
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x06,0x06,1,0x80]));
}
#[test] fn key_gate_waits_then_gives_up(){
use crate::viewer::media::Codec;
let mut g=super::KeyGate::new();let p=[0,0,0,1,0x41,0b1001_1000];
assert!(g.admit(Codec::H264,&p));
g.arm();assert!(!g.admit(Codec::H264,&p));
assert!(g.admit(Codec::H264,&[0,0,0,1,0x65,0x88]));assert!(g.admit(Codec::H264,&p));
g.limit=std::time::Duration::ZERO;g.arm();assert!(g.admit(Codec::H264,&p));
}
use super::*;
struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result<Vec<Frame>,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3],content:None}])}} fn reset(&mut self){self.0=false;}}
struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}}
#[test] fn requests_key_frames_until_the_first_frame(){
assert_eq!((1..=90).filter(|&n|wants_key_frame(n,0)).count(),3);
assert!(!(1..=90).any(|n|wants_key_frame(n,1)));
}
#[test] fn decode_error_requests_pli_and_recovers(){let mut d=Mock(true);let mut s=Sink(0);let p=AtomicBool::new(false);display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert!(p.load(Ordering::Acquire));display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert_eq!(s.0,1);}
}
+55
View File
@@ -0,0 +1,55 @@
//! "Allow the same account to control this device": the Settings switch runs this computer's own
//! host (`uuremote-server`, the sibling binary) as the systemd user service, so the Linux machine
//! shows up in every client of that account. Hosting is opt-in: the viewer never enables the
//! service by itself, and the unit's enabled state is the saved choice. The host reads the shared
//! config.json, so a running host only needs a restart to go online with a new account.
use std::process::{Command, Stdio};
const UNIT: &str = "uuremote-native.service";
/// `UU_VIEWER_HOST=0` leaves the host service alone.
pub fn managed() -> bool { std::env::var("UU_VIEWER_HOST").as_deref() != Ok("0") }
fn systemctl(args: &[&str]) -> bool {
Command::new("systemctl").arg("--user").args(args).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null())
.status().is_ok_and(|s| s.success())
}
pub fn active() -> bool { systemctl(&["is-active", "--quiet", UNIT]) }
fn installed() -> bool { systemctl(&["cat", UNIT]) }
/// Same unit as packaging/deb and README (graphical-session.target imports DISPLAY / WAYLAND_DISPLAY).
fn unit_text(server: &std::path::Path) -> String {
format!("[Unit]\nDescription=UU Remote Linux host (unofficial)\nAfter=graphical-session.target\nPartOf=graphical-session.target\n\n\
[Service]\nEnvironment=RUST_LOG=info\nExecStart={}\nRestart=always\nRestartSec=5\n\n[Install]\nWantedBy=graphical-session.target\n", server.display())
}
fn install(server: &std::path::Path) -> Result<(), String> {
let base = std::env::var_os("XDG_CONFIG_HOME").map(std::path::PathBuf::from).filter(|p| p.is_absolute())
.or_else(|| std::env::var_os("HOME").map(|h| std::path::PathBuf::from(h).join(".config"))).ok_or("No config directory")?;
let dir = base.join("systemd/user");
std::fs::create_dir_all(&dir).map_err(|_| "Cannot create the systemd user directory")?;
std::fs::write(dir.join(UNIT), unit_text(server)).map_err(|_| "Cannot write the host service")?;
if systemctl(&["daemon-reload"]) { Ok(()) } else { Err("systemctl --user daemon-reload failed".into()) }
}
/// Starts the host and keeps it enabled (installing the user unit next to the viewer's binary if
/// there is none). Only the Settings switch calls this.
pub fn enable(viewer: &std::path::Path) -> Result<(), String> {
if !installed() {
let server = viewer.with_file_name("uuremote-server");
if !server.is_file() { return Err("uuremote-server is not installed next to the viewer".into()) }
install(&server)?;
}
if systemctl(&["enable", "--now", UNIT]) { log::info!("Host service enabled"); Ok(()) } else { Err("Cannot start the host service".into()) }
}
/// The account changed: a running host reloads its credentials. A stopped host stays stopped.
pub fn restart() -> Result<(), String> {
if systemctl(&["try-restart", UNIT]) { log::info!("Host service restarted"); Ok(()) } else { Err("Cannot restart the host service".into()) }
}
pub fn disable() -> Result<(), String> {
if systemctl(&["disable", "--now", UNIT]) { log::info!("Host service disabled"); Ok(()) } else { Err("Cannot stop the host service".into()) }
}
#[cfg(test)] mod tests {
#[test] fn unit_runs_the_given_server(){
let text=super::unit_text(std::path::Path::new("/opt/uu/uuremote-server"));
assert!(text.contains("ExecStart=/opt/uu/uuremote-server\n"));assert!(text.contains("WantedBy=graphical-session.target"));
}
}
+378
View File
@@ -0,0 +1,378 @@
//! In-window viewer chrome drawn over the remote picture, like the official client's: the loading
//! screen, the network-status panel (Ctrl+Alt+G), the control-center tab and its menu (Ctrl+Alt+M).
//! Shapes and text are rasterized on the CPU into small RGBA layers (anti-aliased); text uses a system
//! font found with fc-match (CJK capable). Without a font only shapes are drawn.
use ab_glyph::{Font, FontVec, PxScale, ScaleFont};
use crate::i18n::s;
pub type Rgba = [u8; 4];
const PANEL: Rgba = [32, 34, 40, 255];
const HOVER: Rgba = [255, 255, 255, 16];
const TEXT: Rgba = [240, 242, 245, 255];
const DIM: Rgba = [160, 166, 176, 255];
const ACCENT: Rgba = [59, 130, 246, 255];
const DANGER: Rgba = [248, 113, 113, 255];
/// Straight-alpha RGBA pixels, uploaded as SDL_PIXELFORMAT_RGBA32 with alpha blending.
pub struct Layer { pub w: u32, pub h: u32, pub px: Vec<u8> }
impl Layer {
pub fn new(w: u32, h: u32) -> Self { Self { w: w.max(1), h: h.max(1), px: vec![0; w.max(1) as usize * h.max(1) as usize * 4] } }
fn blend(&mut self, x: i32, y: i32, c: Rgba, coverage: f32) {
if x < 0 || y < 0 || x >= self.w as i32 || y >= self.h as i32 || coverage <= 0. { return }
let i = (y as usize * self.w as usize + x as usize) * 4;
let sa = c[3] as f32 / 255. * coverage.min(1.);
let da = self.px[i + 3] as f32 / 255.;
let oa = sa + da * (1. - sa);
if oa <= 0. { return }
for k in 0..3 { self.px[i + k] = ((c[k] as f32 * sa + self.px[i + k] as f32 * da * (1. - sa)) / oa).round() as u8; }
self.px[i + 3] = (oa * 255.).round() as u8;
}
/// Anti-aliased rounded rectangle; coverage from the signed distance to the rounded edge.
pub fn round_rect(&mut self, x: f32, y: f32, w: f32, h: f32, r: f32, c: Rgba) {
let r = r.min(w / 2.).min(h / 2.);
for py in y.floor() as i32..(y + h).ceil() as i32 { for px in x.floor() as i32..(x + w).ceil() as i32 {
let (fx, fy) = (px as f32 + 0.5, py as f32 + 0.5);
let qx = (fx - (x + w / 2.)).abs() - (w / 2. - r);
let qy = (fy - (y + h / 2.)).abs() - (h / 2. - r);
let d = (qx.max(0.).hypot(qy.max(0.))) + qx.max(qy).min(0.) - r;
self.blend(px, py, c, 0.5 - d);
}}
}
pub fn circle(&mut self, cx: f32, cy: f32, r: f32, c: Rgba) { self.round_rect(cx - r, cy - r, r * 2., r * 2., r, c); }
/// Text with its top-left at (x, y); returns the advance width.
pub fn text(&mut self, font: Option<&FontVec>, x: f32, y: f32, text: &str, size: f32, c: Rgba) -> f32 {
let Some(font) = font else { return 0. };
let scaled = font.as_scaled(PxScale::from(size));
let mut caret = x;
for ch in text.chars() {
let id = scaled.glyph_id(ch);
let glyph = id.with_scale_and_position(PxScale::from(size), ab_glyph::point(caret, y + scaled.ascent()));
caret += scaled.h_advance(id);
if let Some(outline) = font.outline_glyph(glyph) {
let b = outline.px_bounds();
outline.draw(|gx, gy, v| self.blend(b.min.x.floor() as i32 + gx as i32, b.min.y.floor() as i32 + gy as i32, c, v));
}
}
caret - x
}
}
pub fn measure(font: Option<&FontVec>, text: &str, size: f32) -> f32 {
let Some(font) = font else { return text.chars().count() as f32 * size * 0.55 };
let scaled = font.as_scaled(PxScale::from(size));
text.chars().map(|ch| scaled.h_advance(scaled.glyph_id(ch))).sum()
}
/// The UI font: `UU_VIEWER_FONT` (a .ttf/.otf/.ttc path), else fontconfig's CJK-capable sans-serif.
pub fn load_font() -> Option<FontVec> {
let (path, index) = match std::env::var("UU_VIEWER_FONT") {
Ok(p) if !p.is_empty() => (p, 0),
_ => {
let out = std::process::Command::new("fc-match").args(["-f", "%{file}\t%{index}", "sans-serif:lang=zh-cn"]).output().ok()?;
let line = String::from_utf8(out.stdout).ok()?;
let (file, index) = line.split_once('\t').unwrap_or((line.as_str(), "0"));
// fontconfig puts the variable-font named instance in the upper 16 bits; the face is below.
(file.to_owned(), index.trim().parse::<u32>().unwrap_or(0) & 0xffff)
}
};
let data = std::fs::read(&path).ok()?;
let mut font = FontVec::try_from_vec_and_index(data, index).ok()?;
// Variable CJK fonts default to their lightest master; use a regular UI weight.
use ab_glyph::VariableFont;
font.set_variation(b"wght", 450.);
Some(font)
}
// ---------------------------------------------------------------- loading screen
pub fn spinner(t: f32, size: u32) -> Layer {
let mut l = Layer::new(size, size);
let c = size as f32 / 2.;
let head = (t * 1.1).fract() * std::f32::consts::TAU;
for i in 0..12 {
let a = i as f32 / 12. * std::f32::consts::TAU;
// Brightness falls off smoothly behind the rotating head.
let behind = (head - a).rem_euclid(std::f32::consts::TAU) / std::f32::consts::TAU;
let alpha = (255. * (1. - behind).powf(1.6)).max(40.) as u8;
l.circle(c + a.sin() * c * 0.72, c - a.cos() * c * 0.72, size as f32 * 0.07, [255, 255, 255, alpha]);
}
l
}
pub fn label_layer(font: Option<&FontVec>, text: &str, size: f32, c: Rgba) -> Layer {
let mut l = Layer::new(measure(font, text, size).ceil() as u32 + 4, (size * 1.4).ceil() as u32);
l.text(font, 2., 0., text, size, c);
l
}
// ---------------------------------------------------------------- network status
#[derive(Default, Clone, PartialEq)]
pub struct NetStats { pub elapsed: u64, pub route: String, pub fps: u32, pub kbps: f64, pub rtt_ms: Option<u32>, pub loss: f64, pub size: (u32, u32), pub codec: &'static str, pub chroma: u32 }
pub fn stats_lines(n: &NetStats) -> Vec<String> {
let rate = if n.kbps >= 1000. { format!("{:.1} Mbps", n.kbps / 1000.) } else { format!("{:.0} Kbps", n.kbps) };
vec![
format!("{:02}:{:02}:{:02}", n.elapsed / 3600, n.elapsed / 60 % 60, n.elapsed % 60),
if n.route.is_empty() { "--".into() } else { n.route.clone() },
format!("{} fps · {}", n.fps, n.codec),
rate,
n.rtt_ms.map_or_else(|| "RTT --".into(), |r| format!("RTT {r} ms")),
format!("{} {:.1}%", s("丢包", "Loss"), n.loss),
format!("{}×{} · {}", n.size.0, n.size.1, if n.chroma == 3 { "4:4:4" } else { "4:2:0" }),
]
}
pub fn stats_layer(font: Option<&FontVec>, lines: &[String], scale: f32) -> Layer {
let size = 13. * scale;
let w = lines.iter().map(|l| measure(font, l, size)).fold(0., f32::max) + 24. * scale;
let h = lines.len() as f32 * size * 1.45 + 16. * scale;
let mut l = Layer::new(w.ceil() as u32, h.ceil() as u32);
l.round_rect(0., 0., w, h, 8. * scale, [0, 0, 0, 150]);
for (i, line) in lines.iter().enumerate() { l.text(font, 12. * scale, 8. * scale + i as f32 * size * 1.45, line, size, TEXT); }
l
}
// ---------------------------------------------------------------- control center
#[derive(Clone, Copy, PartialEq, Debug)]
pub enum Command {
Quality(u64), Fps(u32), Chroma(u32), FollowRemote(bool), OneToOne(bool), Volume(u8),
AutoLock(bool), HostMute(bool), GrabKeys(bool), Files, Watch(bool), Stats(bool), HideTab(bool), Fullscreen, Disconnect,
}
/// What the menu shows as selected. The host does not report remote settings back; quality, frame
/// rate and color are saved and sent again when the next session's CONTROL is ready.
#[derive(Clone, PartialEq)]
pub struct State {
pub quality: u64, pub fps: u32, pub chroma: u32, pub follow_remote: bool, pub one_to_one: bool, pub volume: u8,
pub auto_lock: bool, pub host_mute: bool, pub grab_keys: bool, pub watch: bool, pub stats: bool, pub hide_tab: bool, pub fullscreen: bool,
}
impl Default for State {
fn default() -> Self { Self { quality: 5, fps: 60, chroma: 1, follow_remote: true, one_to_one: false, volume: 100, auto_lock: false,
host_mute: false, grab_keys: false, watch: false, stats: false, hide_tab: false, fullscreen: false } }
}
enum Opt { Header(&'static str), Radio(&'static str, bool, Command), Check(&'static str, bool, Command), Action(&'static str, Command, &'static str), Slider }
fn categories() -> [&'static str; 10] {
[s("显示屏", "Display"), s("画质", "Quality"), s("窗口", "Window"), s("声音", "Sound"), s("安全", "Security"),
s("外设", "Peripherals"), s("工具", "Tools"), s("更多", "More"), s("全屏", "Full screen"), s("退出远控", "Disconnect")]
}
fn options(cat: usize, st: &State) -> Vec<Opt> {
use Opt::*;
match cat {
0 => vec![Header(s("分辨率", "Resolution")), Radio(s("跟随被控端", "Follow the remote"), st.follow_remote, Command::FollowRemote(true)),
Radio(s("跟随当前窗口", "Match this window"), !st.follow_remote, Command::FollowRemote(false))],
1 => vec![Radio(s("自动", "Auto"), st.quality == 5, Command::Quality(5)), Radio(s("原画 20M", "Original 20M"), st.quality == 4, Command::Quality(4)),
Radio(s("超清 8M", "Ultra HD 8M"), st.quality == 3, Command::Quality(3)), Radio(s("高清 2M", "HD 2M"), st.quality == 2, Command::Quality(2)),
Header(s("帧率", "Frame rate")), Radio(s("144 帧", "144 fps"), st.fps == 144, Command::Fps(144)), Radio(s("90 帧", "90 fps"), st.fps == 90, Command::Fps(90)),
Radio(s("60 帧", "60 fps"), st.fps == 60, Command::Fps(60)), Radio(s("30 帧", "30 fps"), st.fps == 30, Command::Fps(30)),
Header(s("色彩", "Color")), Radio(s("真彩 4:4:4", "True color 4:4:4"), st.chroma == 3, Command::Chroma(3)),
Radio(s("常规色彩", "Standard color"), st.chroma != 3, Command::Chroma(1))],
2 => vec![Radio(s("自适应", "Fit to window"), !st.one_to_one, Command::OneToOne(false)), Radio(s("实际大小 1:1", "Actual size 1:1"), st.one_to_one, Command::OneToOne(true))],
3 => vec![Slider],
4 => vec![Check(s("远程结束后,被控端自动锁屏", "Lock the remote when the session ends"), st.auto_lock, Command::AutoLock(!st.auto_lock)),
Check(s("被控端静音运行", "Mute the remote while connected"), st.host_mute, Command::HostMute(!st.host_mute))],
5 => vec![Header(s("键盘", "Keyboard")), Check(s("发送系统快捷键到被控端", "Send system shortcuts (Alt+Tab)"), st.grab_keys, Command::GrabKeys(!st.grab_keys))],
6 => vec![Action(s("文件传输", "File transfer"), Command::Files, "Ctrl+Alt+F"), Check(s("观看模式", "Watch mode"), st.watch, Command::Watch(!st.watch))],
7 => vec![Check(s("显示网络状态", "Show network status"), st.stats, Command::Stats(!st.stats)),
Check(s("全屏状态隐藏控制按钮", "Hide the control tab in full screen"), st.hide_tab, Command::HideTab(!st.hide_tab))],
_ => vec![],
}
}
#[derive(Clone, Copy, PartialEq)]
pub enum Hit { Tab, Category(usize), Option(usize, usize), Slider(f32, f32), Panel }
#[derive(Clone, PartialEq)]
pub struct Menu { pub open: bool, pub category: usize, pub hover: Option<Hit>, pub dragging: bool }
impl Default for Menu { fn default() -> Self { Self { open: false, category: 1, hover: None, dragging: false } } }
pub struct Rect { pub x: f32, pub y: f32, pub w: f32, pub h: f32 }
impl Rect { pub fn contains(&self, x: f32, y: f32) -> bool { x >= self.x && y >= self.y && x < self.x + self.w && y < self.y + self.h } }
pub const TAB_H: f32 = 30.;
pub fn tab_text() -> &'static str { s("控制中心", "Control center") }
/// Width of the drawn menu icon plus its gap; fonts without U+2630 would show a box.
const ICON_W: f32 = 18.;
pub fn tab_rect(font: Option<&FontVec>, window: (u32, u32), scale: f32) -> Rect {
let w = measure(font, tab_text(), 13. * scale) + (28. + ICON_W) * scale;
Rect { x: (window.0 as f32 - w) / 2., y: 0., w, h: TAB_H * scale }
}
pub fn tab_layer(font: Option<&FontVec>, scale: f32, hover: bool) -> Layer {
let r = tab_rect(font, (0, 0), scale);
let mut l = Layer::new(r.w.ceil() as u32, r.h.ceil() as u32);
// Flat top edge: the pill hangs from the window border.
l.round_rect(0., -12. * scale, r.w, r.h + 12. * scale, 12. * scale, if hover { [40, 44, 52, 235] } else { [24, 26, 31, 205] });
for i in 0..3 { l.round_rect(14. * scale, r.h / 2. + (i as f32 * 4. - 5.) * scale, 11. * scale, 1.6 * scale, 0.8 * scale, TEXT); }
l.text(font, (14. + ICON_W) * scale, (r.h - 13. * scale * 1.25) / 2., tab_text(), 13. * scale, TEXT);
l
}
/// Menu geometry relative to its own layer; the same list drives drawing and hit testing.
/// Cascading like the official client: a narrow category list and, beside the hovered row,
/// a card sized to the selected category's options.
pub struct Layout { pub w: f32, pub h: f32, pub items: Vec<(Rect, Hit)>, pub panels: Vec<Rect> }
const ROW: f32 = 30.; const HEADER: f32 = 22.; const SLIDER: f32 = 36.; const PAD: f32 = 6.; const SHADOW: f32 = 14.;
const MAIN_W: f32 = 150.; const GAP: f32 = 6.; const TEXT_SIZE: f32 = 13.;
fn option_height(opt: &Opt) -> f32 { match opt { Opt::Header(_) => HEADER, Opt::Slider => SLIDER, _ => ROW } }
fn option_width(font: Option<&FontVec>, opt: &Opt, scale: f32) -> f32 {
let text = |t: &str, size: f32| measure(font, t, size * scale);
match opt {
Opt::Header(t) => text(t, 11.) + 28. * scale,
Opt::Radio(t, ..) | Opt::Check(t, ..) => text(t, TEXT_SIZE) + 52. * scale,
Opt::Action(t, _, key) => text(t, TEXT_SIZE) + text(key, 11.) + 72. * scale,
Opt::Slider => 210. * scale,
}
}
pub fn layout(font: Option<&FontVec>, st: &State, menu: &Menu, scale: f32) -> Layout {
let k = |v: f32| v * scale;
let cats = categories().len();
let main = Rect { x: k(SHADOW), y: k(SHADOW), w: k(MAIN_W), h: k(PAD * 2. + ROW * cats as f32) };
let mut items: Vec<(Rect, Hit)> = (0..cats).map(|i| (Rect { x: main.x + k(PAD), y: main.y + k(PAD + ROW * i as f32), w: main.w - k(PAD * 2.), h: k(ROW) }, Hit::Category(i))).collect();
let mut panels = vec![Rect { x: main.x, y: main.y, w: main.w, h: main.h }];
let opts = options(menu.category, st);
let (mut w, mut h) = (main.x + main.w + k(SHADOW), main.y + main.h + k(SHADOW));
if !opts.is_empty() {
let sub_w = opts.iter().map(|o| option_width(font, o, scale)).fold(k(180.), f32::max);
let sub_h = k(PAD * 2.) + opts.iter().map(|o| k(option_height(o))).sum::<f32>();
// Aligned with the selected category row, kept inside the main panel's height when possible.
let row_y = main.y + k(PAD + ROW * menu.category as f32) - k(PAD);
let sub = Rect { x: main.x + main.w + k(GAP), y: row_y.min((main.y + main.h - sub_h).max(main.y)), w: sub_w, h: sub_h };
let mut y = sub.y + k(PAD);
for (i, opt) in opts.iter().enumerate() {
let r = Rect { x: sub.x + k(PAD), y, w: sub.w - k(PAD * 2.), h: k(option_height(opt)) };
match opt {
Opt::Header(_) => {}
Opt::Slider => items.push((r, Hit::Slider(sub.x + k(18.), sub.w - k(70.)))),
_ => items.push((r, Hit::Option(menu.category, i))),
}
y += k(option_height(opt));
}
w = sub.x + sub.w + k(SHADOW); h = h.max(sub.y + sub.h + k(SHADOW));
panels.push(sub);
}
Layout { w, h, items, panels }
}
fn card(l: &mut Layer, r: &Rect, scale: f32) {
// Soft drop shadow, then an opaque card with a hairline border.
for i in (1..=6).rev() {
let e = i as f32 * 2. * scale;
l.round_rect(r.x - e / 2., r.y - e / 2. + 3. * scale, r.w + e, r.h + e, 10. * scale + e / 2., [0, 0, 0, 9]);
}
l.round_rect(r.x - 1., r.y - 1., r.w + 2., r.h + 2., 10. * scale + 1., [255, 255, 255, 26]);
l.round_rect(r.x, r.y, r.w, r.h, 10. * scale, PANEL);
}
pub fn menu_layer(font: Option<&FontVec>, st: &State, menu: &Menu, scale: f32) -> (Layer, Layout) {
let lay = layout(font, st, menu, scale);
let k = |v: f32| v * scale;
let mut l = Layer::new(lay.w.ceil() as u32, lay.h.ceil() as u32);
for p in &lay.panels { card(&mut l, p, scale); }
let size = k(TEXT_SIZE);
let mid = |r: &Rect, size: f32| r.y + (r.h - size * 1.25) / 2.;
let opts = options(menu.category, st);
for (i, name) in categories().iter().enumerate() {
let r = &lay.items[i].0;
let selected = menu.category == i && !opts.is_empty();
if selected { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), [255, 255, 255, 30]); }
else if menu.hover == Some(Hit::Category(i)) { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), HOVER); }
if i == 9 { l.round_rect(r.x + k(4.), r.y - k(1.), r.w - k(8.), 1., 0., [255, 255, 255, 22]); }
l.text(font, r.x + k(10.), mid(r, size), name, size, if i == 9 { DANGER } else { TEXT });
if !options(i, st).is_empty() { l.text(font, r.x + r.w - k(14.), mid(r, size), "›", size, if selected { TEXT } else { DIM }); }
}
if let Some(sub) = lay.panels.get(1) {
let mut y = sub.y + k(PAD);
for (i, opt) in opts.iter().enumerate() {
let r = Rect { x: sub.x + k(PAD), y, w: sub.w - k(PAD * 2.), h: k(option_height(opt)) };
if menu.hover == Some(Hit::Option(menu.category, i)) { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), HOVER); }
match opt {
Opt::Header(t) => { l.text(font, r.x + k(10.), r.y + k(6.), t, k(11.), DIM); }
Opt::Radio(t, on, _) => {
if *on { l.circle(r.x + k(16.), r.y + r.h / 2., k(3.), ACCENT); }
l.text(font, r.x + k(30.), mid(&r, size), t, size, if *on { TEXT } else { [214, 218, 224, 255] });
}
Opt::Check(t, on, _) => {
// Drawn check mark: fonts without U+2713 would show a box.
if *on { let (cx, cy) = (r.x + k(16.), r.y + r.h / 2.);
for j in 0..8 { let f = j as f32 / 7.; l.circle(cx - k(4.) + f * k(3.), cy + f * k(3.), k(1.1), ACCENT); l.circle(cx - k(1.) + f * k(6.), cy + k(3.) - f * k(7.), k(1.1), ACCENT); } }
l.text(font, r.x + k(30.), mid(&r, size), t, size, if *on { TEXT } else { [214, 218, 224, 255] });
}
Opt::Action(t, _, key) => {
l.text(font, r.x + k(30.), mid(&r, size), t, size, TEXT);
let kw = measure(font, key, k(11.));
l.text(font, r.x + r.w - kw - k(10.), mid(&r, k(11.)), key, k(11.), DIM);
}
Opt::Slider => {
let (a, len) = (sub.x + k(18.), sub.w - k(70.));
let v = st.volume as f32 / 100.; let cy = r.y + r.h / 2.;
l.round_rect(a, cy - k(2.), len, k(4.), k(2.), [255, 255, 255, 40]);
l.round_rect(a, cy - k(2.), (len * v).max(k(4.)), k(4.), k(2.), ACCENT);
l.circle(a + len * v, cy, k(7.), [0, 0, 0, 60]);
l.circle(a + len * v, cy, k(6.), [255, 255, 255, 255]);
let label = format!("{}%", st.volume);
l.text(font, sub.x + sub.w - k(14.) - measure(font, &label, k(12.)), mid(&r, k(12.)), &label, k(12.), DIM);
}
}
y += r.h;
}
}
(l, lay)
}
/// The command for a click on an option row.
pub fn option_command(st: &State, cat: usize, index: usize) -> Option<Command> {
match options(cat, st).get(index)? { Opt::Radio(_, _, c) | Opt::Check(_, _, c) | Opt::Action(_, c, _) => Some(*c), _ => None }
}
pub fn category_command(cat: usize) -> Option<Command> { match cat { 8 => Some(Command::Fullscreen), 9 => Some(Command::Disconnect), _ => None } }
pub fn slider_value(x: f32, a: f32, len: f32) -> u8 { (((x - a) / len).clamp(0., 1.) * 100.).round() as u8 }
/// Viewer preferences that outlive a session (`viewer.json` next to config.json).
pub fn load_prefs(st: &mut State) {
let Ok(text) = std::fs::read_to_string(prefs_path()) else { return };
let Ok(v) = serde_json::from_str::<serde_json::Value>(&text) else { return };
if let Some(b) = v["stats"].as_bool() { st.stats = b; }
if let Some(b) = v["hide_tab_fullscreen"].as_bool() { st.hide_tab = b; }
if let Some(b) = v["one_to_one"].as_bool() { st.one_to_one = b; }
if let Some(n) = v["volume"].as_u64() { st.volume = n.min(100) as u8; }
if let Some(q) = v["quality"].as_u64().filter(|q| (2..=5).contains(q)) { st.quality = q; }
if let Some(f) = v["fps"].as_u64().filter(|f| [30, 60, 90, 144].contains(f)) { st.fps = f as u32; }
if let Some(c) = v["chroma"].as_u64().filter(|c| [1, 3].contains(c)) { st.chroma = c as u32; }
}
pub fn save_prefs(st: &State) {
let path = prefs_path();
if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); }
let v = serde_json::json!({"stats": st.stats, "hide_tab_fullscreen": st.hide_tab, "one_to_one": st.one_to_one, "volume": st.volume,
"quality": st.quality, "fps": st.fps, "chroma": st.chroma});
let _ = std::fs::write(path, v.to_string());
}
fn prefs_path() -> std::path::PathBuf { crate::config::path().parent().map_or_else(|| "viewer.json".into(), |d| d.join("viewer.json")) }
#[cfg(test)] mod tests {
use super::*;
#[test] fn layers_blend_inside_bounds_only(){
let mut l=Layer::new(8,8);l.round_rect(-4.,-4.,20.,20.,3.,[255,0,0,255]);l.circle(100.,100.,5.,[0,0,0,255]);
assert!(l.px.chunks_exact(4).all(|p|p==[255,0,0,255]));
let mut l=Layer::new(4,4);l.round_rect(0.,0.,4.,4.,0.,[0,0,255,128]);assert_eq!(&l.px[..4],&[0,0,255,128]);
}
#[test] fn every_option_row_has_a_command_and_categories_map_actions(){
let st=State::default();
for cat in 0..10 { let lay=layout(None,&st,&Menu{category:cat,..Default::default()},1.);
for (_,hit) in &lay.items { if let Hit::Option(c,i)=hit { assert!(option_command(&st,*c,*i).is_some()); } } }
assert_eq!(category_command(9),Some(Command::Disconnect));assert_eq!(category_command(1),None);
assert_eq!(slider_value(150.,100.,100.),50);assert_eq!(slider_value(0.,100.,100.),0);
}
/// `UU_HUD_PREVIEW=dir cargo test render_preview -- --ignored` writes the chrome as PNGs (visual check).
#[test] #[ignore] fn render_preview(){
let Some(dir)=std::env::var_os("UU_HUD_PREVIEW") else {return};let dir=std::path::PathBuf::from(dir);
let font=load_font();let font=font.as_ref();
let save=|name:&str,l:&Layer,bg:[u8;3]|{
let rgb:Vec<u8>=l.px.chunks_exact(4).flat_map(|p|{let a=p[3] as u32;(0..3).map(move|k|((p[k] as u32*a+bg[k] as u32*(255-a))/255) as u8)}).collect();
crate::viewer::type_ipc::write_png_rgb(&dir.join(name),l.w,l.h,&rgb,false).unwrap();
};
let st=State{stats:true,..State::default()};
for cat in [1usize,3,4] {let (l,_)=menu_layer(font,&st,&Menu{open:true,category:cat,hover:Some(Hit::Option(cat,1)),dragging:false},1.);save(&format!("menu{cat}.png"),&l,[200,200,210]);}
save("tab.png",&tab_layer(font,1.,false),[230,230,230]);
let n=NetStats{elapsed:57,route:"UDP · relay".into(),fps:60,kbps:8420.,rtt_ms:Some(36),loss:0.,size:(1920,1080),codec:"H.265",chroma:1};
save("stats.png",&stats_layer(font,&stats_lines(&n),1.),[230,230,230]);
save("spinner.png",&spinner(0.3,56),[17,19,24]);
save("title.png",&label_layer(font,"Connecting to PUNOSEVAC",20.,[240,242,245,255]),[17,19,24]);
}
#[test] fn stats_lines_format_numbers(){
let n=NetStats{elapsed:3723,route:"UDP · relay".into(),fps:60,kbps:8420.,rtt_ms:Some(36),loss:0.25,size:(1920,1080),codec:"H.265",chroma:3};
let l=stats_lines(&n);assert_eq!(l[0],"01:02:03");assert_eq!(l[3],"8.4 Mbps");assert_eq!(l[4],"RTT 36 ms");assert!(l[6].ends_with("4:4:4"));
}
}
+1
View File
@@ -66,6 +66,7 @@ impl Input {
pub fn new(view_only:bool)->Self {Self{view_only,..Default::default()}}
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
pub fn enabled(&self)->bool {!self.view_only}
pub fn set_view_only(&mut self,view_only:bool){self.view_only=view_only;}
pub fn key(&mut self,scan:i32,down:bool)->Option<Value> {
if self.view_only {return None}
let vk=if self.mac{mac_keycode(scan)}else{windows_vk(scan)}?;
+6 -3
View File
@@ -16,6 +16,9 @@ pub mod desktop;
#[cfg(uu_gtk)] pub mod ui;
#[cfg(uu_gtk)] pub mod tools_ui;
#[cfg(feature="viewer-sdl")] pub mod sdl;
#[cfg(feature="viewer-sdl")] pub mod hud;
pub mod thumbs;
#[cfg(uu_gtk)] pub mod host;
pub mod tools;
@@ -25,7 +28,7 @@ pub mod secure_input;
pub mod type_ipc;
fn device_label(name:Option<&str>)->&str{
name.filter(|name|!name.is_empty()).unwrap_or("远端设备")
name.filter(|name|!name.is_empty()).unwrap_or_else(||crate::i18n::s("远端设备","Remote device"))
}
#[cfg(test)]
@@ -33,7 +36,7 @@ mod device_label_tests {
#[test]
fn device_name_or_fallback(){
assert_eq!(super::device_label(Some("测试电脑")),"测试电脑");
assert_eq!(super::device_label(None),"远端设备");
assert_eq!(super::device_label(Some("")),"远端设备");
assert_eq!(super::device_label(None),crate::i18n::s("远端设备","Remote device"));
assert_eq!(super::device_label(Some("")),crate::i18n::s("远端设备","Remote device"));
}
}
+36
View File
@@ -36,6 +36,10 @@ pub struct Observed {
pub media_packets:AtomicU64,
pub encoder_codecs:AtomicU32,
pub chroma:AtomicU32,
/// Received RTP payload bytes and video packets vs. sequence span, for the network-status panel.
pub media_bytes:AtomicU64,
pub video_received:AtomicU64,
pub video_expected:AtomicU64,
}
pub struct Peer {
clipboard:super::clipboard::Bridge,
@@ -115,11 +119,22 @@ impl Peer {
let mut receiver=super::media::Receiver::new(super::media::Codec::from_mime(&track.codec().capability.mime_type).unwrap_or_default());
let mut tick=tokio::time::interval(std::time::Duration::from_millis(40));
let mut last_pli=std::time::Instant::now()-std::time::Duration::from_secs(1);
let mut span:Option<(u16,u64)>=None;
loop {
let output=tokio::select! {
packet=track.read_rtp()=>match packet {
Ok((p,_))=>{
counters.media_packets.fetch_add(1,Ordering::Relaxed);
counters.media_bytes.fetch_add(p.payload.len() as u64+12,Ordering::Relaxed);
if video {
// Extended sequence span: forward steps add, reordered/old packets do not.
let seq=p.header.sequence_number;
let (last,expected)=span.unwrap_or((seq.wrapping_sub(1),0));
let step=seq.wrapping_sub(last);
span=Some(if step!=0 && step<32768 {(seq,expected+u64::from(step))} else {(last,expected)});
counters.video_expected.store(span.map_or(0,|s|s.1),Ordering::Relaxed);
counters.video_received.fetch_add(1,Ordering::Relaxed);
}
if !video {if opus {audio.push(p.header.sequence_number,&p.payload);}continue}
// TrackRemote updates codec from the negotiated payload type on each read.
let Some(codec)=super::media::Codec::from_mime(&track.codec().capability.mime_type) else{continue};
@@ -172,10 +187,12 @@ impl Peer {
if index==0 {
let weak=Arc::downgrade(&channel);let state=observed.clone();
let chroma444=shape.capture_type==1 && std::env::var("UU_VIEWER_CHROMA").is_ok_and(|v|v=="444");
let desktop_track=shape.capture_type==1;
channel.on_open(Box::new(move ||Box::pin(async move {
state.control_open.store(true,Ordering::Release);
if let Some(channel)=weak.upgrade(){
let _=channel.send(&bytes::Bytes::from(wire::echo_request_with_clipboard(1,clipboard_enabled))).await;
if desktop_track {let _=channel.send(&bytes::Bytes::from(wire::request_video_track())).await;}
if chroma444 {let _=channel.send(&bytes::Bytes::from(wire::request_chroma444())).await;}
}
})));
@@ -293,6 +310,25 @@ impl Peer {
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
channel.send(&bytes::Bytes::from(value.to_string())).await.map_err(|_|"CONTROL input send failed")?;Ok(())
}
/// Binary CONTROL message (protobuf envelope), e.g. capture settings and SimpleActions.
pub async fn send_control(&self,data:Vec<u8>)->Result<(),String> {
let channel=&self.channels[0];
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
channel.send(&bytes::Bytes::from(data)).await.map_err(|_|"CONTROL send failed")?;Ok(())
}
/// Selected ICE pair: (round-trip ms, "UDP · direct" / "TCP · relay" ...). Addresses are not kept.
pub async fn route(&self)->(Option<u32>,String) {
use webrtc::stats::StatsReportType as T;
let report=self.pc.get_stats().await;
let pair=report.reports.values().filter_map(|r|match r{T::CandidatePair(p) if p.nominated=>Some(p),_=>None}).max_by_key(|p|p.bytes_received);
let Some(pair)=pair else {return (None,String::new())};
let local=report.reports.get(&pair.local_candidate_id).and_then(|r|match r{T::LocalCandidate(c)=>Some(c),_=>None});
let remote=report.reports.get(&pair.remote_candidate_id).and_then(|r|match r{T::RemoteCandidate(c)=>Some(c),_=>None});
let relay=[local,remote].iter().flatten().any(|c|c.candidate_type==webrtc::ice::candidate::CandidateType::Relay);
let tcp=local.is_some_and(|c|c.network_type.to_string().to_ascii_lowercase().contains("tcp") || c.relay_protocol.eq_ignore_ascii_case("tcp"));
let rtt=(pair.current_round_trip_time>0.).then(||(pair.current_round_trip_time*1000.).round() as u32);
(rtt,format!("{} · {}",if tcp{"TCP"}else{"UDP"},if relay{"relay"}else{"direct"}))
}
pub async fn close(&self) {self.clipboard.stop();self.tools.lock().unwrap().take();let _=self.pc.close().await;}
}
fn answer_sdp(body:&Value)->Result<String,String> {
+372 -26
View File
@@ -3,19 +3,42 @@ use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum
#[derive(Debug)] enum Command { Files, Type }
pub struct Window { canvas:sdl2::render::Canvas<sdl2::video::Window>, events:sdl2::EventPump, _sdl:sdl2::Sdl, frame:(u32,u32), focused:bool, files:bool, mac:bool,
clipboard:sdl2::clipboard::ClipboardUtil, clipboard_dirty:bool, clipboard_tx:tokio::sync::mpsc::Sender<super::clipboard::ClipboardRequest>, clipboard_requests:tokio::sync::mpsc::Receiver<super::clipboard::ClipboardRequest>,
pub last_frame:Option<Frame> }
pub last_frame:Option<Frame>, chrome:Chrome }
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
struct Chrome { font:Option<ab_glyph::FontVec>, scale:f32, pub state:hud::State, menu:hud::Menu, net:Option<hud::NetStats>, tab_hover:bool, tab_down:bool,
commands:Vec<hud::Command>, started:std::time::Instant, last_loading:std::time::Instant, title:String, stage:String, labels:std::collections::HashMap<(String,u32,u32),hud::Layer>,
menu_cache:Option<(hud::State,hud::Menu,f32,hud::Layer)> }
use super::hud;
impl Window {
pub fn new()->Result<Self,String>{
// SDL's default nearest-neighbour scaling makes remote text uneven whenever the window size
// differs from the stream; filter instead. Set before the renderer/textures exist.
sdl2::hint::set_with_priority("SDL_RENDER_SCALE_QUALITY","linear",&sdl2::hint::Hint::Default);
#[cfg(uu_gtk)] cairo_decorations();
let sdl=sdl2::init()?;let video=sdl.video()?;
let window=video.window("Native viewer (experimental)",1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
let canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
let name=super::device_label(std::env::var("UU_VIEWER_DEVICE_NAME").ok().as_deref()).to_owned();
let window=video.window(&format!("{name} · {}",crate::i18n::s("UU 远程 Linux 控制端","UU Remote Linux viewer")),1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
// Wayland maps a toplevel only after its first buffer; without this the window stays
// invisible until the first decoded frame, which a stalled stream never delivers.
canvas.set_draw_color(LOADING_BG);canvas.clear();canvas.present();
let scale=std::env::var("UU_VIEWER_UI_SCALE").ok().and_then(|v|v.parse::<f32>().ok()).filter(|v|(0.5..=4.).contains(v)).unwrap_or(1.);
let mut state=hud::State::default();hud::load_prefs(&mut state);
let now=std::time::Instant::now();
let chrome=Chrome{font:hud::load_font(),scale,state,menu:hud::Menu::default(),net:None,tab_hover:false,tab_down:false,commands:Vec::new(),started:now,last_loading:now-std::time::Duration::from_secs(1),
title:crate::tr!("正在连接 {name}","Connecting to {name}"),stage:crate::i18n::s("正在连接远端设备…","Contacting the remote device…").into(),labels:Default::default(),menu_cache:None};
let events=sdl.event_pump()?;let clipboard=video.clipboard();
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None})
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None,chrome})
}
pub fn clipboard_bridge(&self)->super::clipboard::Bridge{super::clipboard::Bridge::sdl(self.clipboard_tx.clone())}
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
fn viewport(&self)->Viewport {Viewport::fit(self.canvas.window().size(),self.frame)}
fn viewport(&self)->Viewport {
let window=self.canvas.window().size();
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
let (w,h)=(self.frame.0 as f64,self.frame.1 as f64);
Viewport{x:((window.0 as f64-w)/2.).round(),y:((window.1 as f64-h)/2.).round(),width:w,height:h}
}
fn poll_clipboard(&mut self){
// Use the existing SDL window; wl-paste creates a transient toplevel on GNOME every poll.
while let Ok(request)=self.clipboard_requests.try_recv(){
@@ -38,12 +61,255 @@ impl Window {
}
pub fn poll(&mut self,input:&mut Input)->(bool,Vec<serde_json::Value>){
let viewport=self.viewport();
let dirty=&mut self.clipboard_dirty;
let events=self.events.poll_iter().inspect(|event|{
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){*dirty=true;}
});
translate_actions(events,input,viewport,&mut self.focused,&mut self.files)
let mut redraw=false;
let events=poll_events(&mut self.events);
let mut forward=Vec::with_capacity(events.len());
for event in events {
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){self.clipboard_dirty=true;}
redraw|=needs_redraw(&event);
let (consumed,changed)=self.chrome_event(&event);redraw|=changed;
if !consumed {forward.push(event);}
}
let result=translate_actions(forward,input,viewport,&mut self.focused,&mut self.files);
// A compositor resize (tiling, maximize) leaves the surface without a buffer of the new size
// until the next frame; a static remote desktop sends none, so repaint the last frame now.
if redraw {if let Some(frame)=self.last_frame.take(){
log::debug!("Viewer window resized: {:?}",self.canvas.window().size());
if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}
self.last_frame=Some(frame);
}else{self.loading_frame(true);}}
result
}
/// Menu, hotkeys and the control tab. Returns (consumed, needs redraw).
fn chrome_event(&mut self,event:&Event)->(bool,bool){
use sdl2::keyboard::{Mod,Scancode};
let size=self.canvas.window().size();let scale=self.chrome.scale;
let tab=hud::tab_rect(self.chrome.font.as_ref(),size,scale);
let tab_visible=self.tab_visible();
if let Event::KeyDown{scancode:Some(code),keymod,repeat,..}=event {
let chord=keymod.intersects(Mod::LCTRLMOD|Mod::RCTRLMOD)&&keymod.intersects(Mod::LALTMOD|Mod::RALTMOD);
let command=match code {Scancode::M=>Some(None),Scancode::G=>Some(Some(hud::Command::Stats(!self.chrome.state.stats))),Scancode::Return=>Some(Some(hud::Command::Fullscreen)),_=>None};
if chord { if let Some(command)=command {
if !repeat { match command {None=>self.chrome.menu.open^=true,Some(c)=>self.command(c)} }
return (true,true)
}}
if self.chrome.menu.open { if *code==Scancode::Escape {self.chrome.menu.open=false;} return (true,true) }
}
if !self.chrome.menu.open {
return match *event {
Event::MouseMotion{x,y,..}=>{let h=tab_visible&&tab.contains(x as f32,y as f32);let changed=h!=self.chrome.tab_hover;self.chrome.tab_hover=h;(false,changed)},
Event::MouseButtonDown{x,y,mouse_btn:MouseButton::Left,..} if tab_visible&&tab.contains(x as f32,y as f32)=>{self.chrome.menu.open=true;self.chrome.tab_down=true;(true,true)},
Event::MouseButtonUp{mouse_btn:MouseButton::Left,..} if self.chrome.tab_down=>{self.chrome.tab_down=false;(true,false)},
_=>(false,false),
}
}
let lay=hud::layout(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,scale);let origin=self.menu_origin(&lay);
let hit=|x:i32,y:i32|->Option<hud::Hit>{
let (lx,ly)=(x as f32-origin.0,y as f32-origin.1);
if tab.contains(x as f32,y as f32) {return Some(hud::Hit::Tab)}
if !lay.panels.iter().any(|p|p.contains(lx,ly)) {return None}
Some(lay.items.iter().find(|(r,_)|r.contains(lx,ly)).map_or(hud::Hit::Panel,|(_,h)|*h))
};
match *event {
Event::MouseMotion{x,y,..}=>{
if self.chrome.menu.dragging { if let Some((a,len))=slider(&lay) {self.command(hud::Command::Volume(hud::slider_value(x as f32-origin.0,a,len)));} return (true,true) }
let h=hit(x,y);
if let Some(hud::Hit::Category(i))=h { if hud::category_command(i).is_none() {self.chrome.menu.category=i;} }
let changed=h!=self.chrome.menu.hover;self.chrome.menu.hover=h;(true,changed)
},
Event::MouseButtonDown{x,y,mouse_btn:MouseButton::Left,..}=>{
match hit(x,y) {
None|Some(hud::Hit::Tab)=>{self.chrome.menu.open=false;self.chrome.tab_down=true},
Some(hud::Hit::Category(i))=>match hud::category_command(i) {Some(c)=>{self.chrome.menu.open=false;self.command(c)},None=>self.chrome.menu.category=i},
Some(hud::Hit::Option(c,i))=>if let Some(command)=hud::option_command(&self.chrome.state,c,i) {
if command==hud::Command::Files {self.chrome.menu.open=false;}
self.command(command);
},
Some(hud::Hit::Slider(a,len))=>{self.chrome.menu.dragging=true;self.command(hud::Command::Volume(hud::slider_value(x as f32-origin.0,a,len)))},
Some(hud::Hit::Panel)=>{},
}
(true,true)
},
Event::MouseButtonUp{..}=>{self.chrome.tab_down=false;if std::mem::take(&mut self.chrome.menu.dragging){hud::save_prefs(&self.chrome.state);}(true,true)},
Event::MouseButtonDown{..}|Event::MouseWheel{..}|Event::KeyUp{..}|Event::TextInput{..}=>(true,false),
_=>(false,false),
}
}
/// Local effects happen here; remote ones are drained by `run` through `take_commands`.
fn command(&mut self,command:hud::Command){
let st=&mut self.chrome.state;
match command {
hud::Command::Quality(q)=>{st.quality=q;hud::save_prefs(st)}, hud::Command::Fps(f)=>{st.fps=f;hud::save_prefs(st)},
hud::Command::Chroma(c)=>{st.chroma=c;hud::save_prefs(st)},
hud::Command::FollowRemote(b)=>st.follow_remote=b, hud::Command::Volume(v)=>st.volume=v,
hud::Command::AutoLock(b)=>st.auto_lock=b, hud::Command::HostMute(b)=>st.host_mute=b, hud::Command::Watch(b)=>st.watch=b,
hud::Command::OneToOne(b)=>{st.one_to_one=b;hud::save_prefs(st)},
hud::Command::Stats(b)=>{st.stats=b;hud::save_prefs(st)},
hud::Command::HideTab(b)=>{st.hide_tab=b;hud::save_prefs(st)},
hud::Command::GrabKeys(b)=>{st.grab_keys=b;self.canvas.window_mut().set_keyboard_grab(b)},
hud::Command::Fullscreen=>{
st.fullscreen^=true;let mode=if st.fullscreen{sdl2::video::FullscreenType::Desktop}else{sdl2::video::FullscreenType::Off};
let _=self.canvas.window_mut().set_fullscreen(mode);
},
hud::Command::Files=>self.files=true,
hud::Command::Disconnect=>{},
}
self.chrome.commands.push(command);
}
pub fn take_commands(&mut self)->Vec<hud::Command>{std::mem::take(&mut self.chrome.commands)}
/// The host starts every session at the official defaults; repeat the saved choices that differ.
pub fn restore_remote_settings(&mut self){
let(st,d)=(&self.chrome.state,hud::State::default());let c=&mut self.chrome.commands;
if st.quality!=d.quality {c.push(hud::Command::Quality(st.quality));}
if st.fps!=d.fps {c.push(hud::Command::Fps(st.fps));}
if st.chroma!=d.chroma {c.push(hud::Command::Chroma(st.chroma));}
}
pub fn state(&self)->&hud::State{&self.chrome.state}
pub fn sync_chroma(&mut self,chroma:u32){if chroma!=0 {self.chrome.state.chroma=chroma;}}
pub fn set_stage(&mut self,stage:&str){self.chrome.stage=stage.into();}
pub fn window_size(&self)->(u32,u32){self.canvas.window().size()}
pub fn has_picture(&self)->bool{self.last_frame.is_some()}
pub fn set_net(&mut self,net:hud::NetStats){
let show=self.chrome.state.stats;let changed=self.chrome.net.as_ref()!=Some(&net);
self.chrome.net=Some(net);
if show && changed {self.redraw();}
}
fn tab_visible(&self)->bool{!(self.chrome.state.fullscreen&&self.chrome.state.hide_tab)||self.chrome.menu.open}
fn menu_layout(&self)->(hud::Layer,hud::Layout){hud::menu_layer(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,self.chrome.scale)}
fn menu_origin(&self,lay:&hud::Layout)->(f32,f32){
let size=self.canvas.window().size();
// The category list sits centered under the tab; the cascade card grows to its right.
let shadow=14.*self.chrome.scale;let main=lay.panels.first().map_or(lay.w,|p|p.w);
(((size.0 as f32-main)/2.-shadow).max(-shadow).min(size.0 as f32-lay.w+shadow).round(),(hud::TAB_H*self.chrome.scale+4.-shadow).round())
}
pub fn redraw(&mut self){
if let Some(frame)=self.last_frame.take(){if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}self.last_frame=Some(frame);}
else {self.loading_frame(true);}
}
fn blit(&mut self,layer:&hud::Layer,x:i32,y:i32)->Result<(),String>{
let creator=self.canvas.texture_creator();
let mut t=creator.create_texture_streaming(PixelFormatEnum::RGBA32,layer.w,layer.h).map_err(|_|"Texture creation failed")?;
t.set_blend_mode(sdl2::render::BlendMode::Blend);
t.update(None,&layer.px,layer.w as usize*4).map_err(|_|"Texture update failed")?;
self.canvas.copy(&t,None,Some(Rect::new(x,y,layer.w,layer.h)))
}
fn label(&mut self,text:&str,size:f32,color:hud::Rgba)->hud::Layer{
let key=(text.to_owned(),size.to_bits(),u32::from_le_bytes(color));
if self.chrome.labels.len()>64 {self.chrome.labels.clear();}
let font=self.chrome.font.as_ref();
let layer=self.chrome.labels.entry(key).or_insert_with(||hud::label_layer(font,text,size,color));
hud::Layer{w:layer.w,h:layer.h,px:layer.px.clone()}
}
/// Network panel, control tab and menu over the picture.
fn draw_chrome(&mut self)->Result<(),String>{
let size=self.canvas.window().size();let scale=self.chrome.scale;
if self.chrome.state.stats { if let Some(net)=self.chrome.net.clone() {
let layer=hud::stats_layer(self.chrome.font.as_ref(),&hud::stats_lines(&net),scale);
self.blit(&layer,size.0 as i32-layer.w as i32-(12.*scale) as i32,size.1 as i32-layer.h as i32-(12.*scale) as i32)?;
}}
if self.tab_visible() {
let r=hud::tab_rect(self.chrome.font.as_ref(),size,scale);
let layer=hud::tab_layer(self.chrome.font.as_ref(),scale,self.chrome.tab_hover||self.chrome.menu.open);
self.blit(&layer,r.x.round() as i32,0)?;
}
if self.chrome.menu.open {
// Rasterizing the menu is costly; reuse it until what it shows changes.
let c=&self.chrome;
let cached=matches!(&c.menu_cache,Some((st,m,sc,_)) if *st==c.state&&*m==c.menu&&*sc==c.scale);
if !cached {let (layer,_)=self.menu_layout();self.chrome.menu_cache=Some((self.chrome.state.clone(),self.chrome.menu.clone(),scale,layer));}
let lay=hud::layout(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,scale);let o=self.menu_origin(&lay);
let (st,m,sc,layer)=self.chrome.menu_cache.take().expect("menu cached above");
let r=self.blit(&layer,o.0 as i32,o.1 as i32);
self.chrome.menu_cache=Some((st,m,sc,layer));r?;
}
Ok(())
}
/// Animated "connecting" screen until the first remote picture; throttled to ~60 fps.
pub fn loading_frame(&mut self,force:bool){
let now=std::time::Instant::now();
if !force && now.duration_since(self.chrome.last_loading)<std::time::Duration::from_millis(16) {return}
self.chrome.last_loading=now;
let size=self.canvas.window().size();let scale=self.chrome.scale;
self.canvas.set_draw_color(LOADING_BG);self.canvas.clear();
let t=now.duration_since(self.chrome.started).as_secs_f32();
let spin=hud::spinner(t,(56.*scale) as u32);
let cy=size.1 as i32/2-(40.*scale) as i32;
let _=self.blit(&spin,(size.0 as i32-spin.w as i32)/2,cy-spin.h as i32/2);
let (title,stage)=(self.chrome.title.clone(),self.chrome.stage.clone());
let a=self.label(&title,20.*scale,[240,242,245,255]);
let _=self.blit(&a,(size.0 as i32-a.w as i32)/2,cy+(48.*scale) as i32);
// The stage line breathes gently so a long wait still looks alive.
let alpha=(170.+60.*(t*2.2).sin()) as u8;
let b=self.label(&stage,14.*scale,[160,166,176,255]);
let mut b2=b;for p in b2.px.chunks_exact_mut(4){p[3]=(u16::from(p[3])*u16::from(alpha)/255) as u8;}
let _=self.blit(&b2,(size.0 as i32-b2.w as i32)/2,cy+(84.*scale) as i32);
if self.chrome.menu.open||self.tab_visible() {let _=self.draw_chrome();}
self.canvas.present();
}
fn draw(&mut self,frame:&Frame)->Result<(),String>{
// Pad bars belong to the decoded canvas, not the remote picture: viewport and input use the
// content aspect, and only the content sub-rectangle of the texture is drawn.
let content=frame.content.unwrap_or((frame.width,frame.height));
self.frame=content;let v=self.viewport();let creator=self.canvas.texture_creator();
let mut texture=creator.create_texture_streaming(PixelFormatEnum::RGB24,frame.width,frame.height).map_err(|_|"Texture creation failed")?;
texture.update(None,&frame.rgb,frame.width as usize*3).map_err(|_|"Texture update failed")?;
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
let src=super::input::content_rect((frame.width,frame.height),content)
.map(|(x,y,w,h)|Rect::new(x.round() as i32,y.round() as i32,w.round().max(1.) as u32,h.round().max(1.) as u32));
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;
drop(texture);self.draw_chrome()?;self.canvas.present();Ok(())
}
}
/// On Wayland SDL draws its title bar through libdecor; the GTK plugin calls GTK3 from SDL's thread
/// while the tool windows run gtk_main on theirs, and the two crash in GTK's style code (SIGSEGV on
/// closing the file window). Offer libdecor only its cairo plugin unless the user chose a directory.
#[cfg(uu_gtk)]
fn cairo_decorations(){
if std::env::var_os("LIBDECOR_PLUGIN_DIR").is_some() {return}
let Some(cairo)=["/usr/lib64/libdecor/plugins-1","/usr/lib/x86_64-linux-gnu/libdecor/plugins-1","/usr/lib/libdecor/plugins-1"]
.iter().map(|d|std::path::Path::new(d).join("libdecor-cairo.so")).find(|p|p.exists()) else {return};
let dir=std::env::var_os("XDG_RUNTIME_DIR").map_or_else(std::env::temp_dir,std::path::PathBuf::from).join("uuremote-libdecor");
let link=dir.join("libdecor-cairo.so");
if std::fs::create_dir_all(&dir).is_ok() && (link.exists() || std::os::unix::fs::symlink(&cairo,&link).is_ok()) {
std::env::set_var("LIBDECOR_PLUGIN_DIR",&dir);
}
}
const LOADING_BG:sdl2::pixels::Color=sdl2::pixels::Color::RGB(17,19,24);
/// sdl2 0.37 transmutes every event type into its `SDL_EventType` enum, which is undefined
/// behaviour for a type SDL 2 does not define (an abort with debug checks). sdl2-compat on SDL3
/// delivers such types (e.g. 0x207), so drop them before the crate converts the event.
fn poll_events(_pump:&mut sdl2::EventPump)->Vec<Event>{
let mut events=Vec::new();
loop{
let mut raw=std::mem::MaybeUninit::<sdl2::sys::SDL_Event>::uninit();
// SAFETY: the pump proves SDL events are initialised on this thread; SDL_PollEvent fills the event when it returns 1.
if unsafe{sdl2::sys::SDL_PollEvent(raw.as_mut_ptr())}!=1 {return events}
let raw=unsafe{raw.assume_init()};
if sdl2_event_type(unsafe{raw.type_}) {events.push(Event::from_ll(raw));}
}
}
/// The values of sdl2-sys 0.37 `SDL_EventType`.
fn sdl2_event_type(t:u32)->bool{
matches!(t,0|0x100..=0x107|0x150|0x200|0x201|0x300..=0x305|0x400..=0x403|0x600..=0x607|0x650..=0x659|0x700..=0x702
|0x800..=0x802|0x900|0x1000..=0x1003|0x1100|0x1101|0x1200|0x2000|0x2001|0x7F00|0x8000|0xFFFF)
}
fn slider(lay:&hud::Layout)->Option<(f32,f32)>{lay.items.iter().find_map(|(_,h)|match h{hud::Hit::Slider(a,len)=>Some((*a,*len)),_=>None})}
/// Runs `fut` while the window shows the loading animation; closing the window cancels it.
pub async fn loading<T>(window:Option<&mut Window>,stage:&str,fut:impl std::future::Future<Output=T>)->Result<T,String>{
let Some(window)=window else {return Ok(fut.await)};
window.set_stage(stage);
tokio::pin!(fut);
let mut tick=tokio::time::interval(std::time::Duration::from_millis(16));
loop {tokio::select!{
value=&mut fut=>return Ok(value),
_=tick.tick()=>{
for event in poll_events(&mut window.events) {
if matches!(event,Event::Quit{..}|Event::Window{win_event:WindowEvent::Close,..}) {return Err("Viewer window closed".into())}
let _=window.chrome_event(&event);
}
window.loading_frame(false);
},
}}
}
fn clipboard_text(bytes:&[u8])->Option<String>{
if bytes.len()>super::clipboard::MAX_TEXT{return None}
@@ -87,24 +353,24 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
input.scroll(dx,dy)
},
_=>None,
};if let Some(m)=message{messages.push(m);}
};if let Some(m)=message{
// Several motions in one poll: only the newest position matters. Sending each one
// queues a drag behind itself on a slow (relayed) path; clicks keep their order.
let motion=|m:&serde_json::Value|m.get("action").and_then(serde_json::Value::as_str)==Some("mouse_move_absolute");
if motion(&m) && messages.last().is_some_and(motion) {messages.pop();}
messages.push(m);
}
} (quit,messages)
}
fn needs_redraw(event:&Event)->bool{
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
}
fn button(b:MouseButton)->Option<i32>{match b{MouseButton::Left=>Some(1),MouseButton::Right=>Some(2),MouseButton::Middle=>Some(4),_=>None}}
impl FrameSink for Window {
fn present(&mut self,frame:&Frame)->Result<(),String>{
self.last_frame=Some(Frame{width:frame.width,height:frame.height,rgb:frame.rgb.clone(),content:frame.content});
// Pad bars belong to the decoded canvas, not the remote picture: viewport and input use the
// content aspect, and only the content sub-rectangle of the texture is drawn.
let content=frame.content.unwrap_or((frame.width,frame.height));
self.frame=content;let v=self.viewport();let creator=self.canvas.texture_creator();
let mut texture=creator.create_texture_streaming(PixelFormatEnum::RGB24,frame.width,frame.height).map_err(|_|"Texture creation failed")?;
texture.update(None,&frame.rgb,frame.width as usize*3).map_err(|_|"Texture update failed")?;
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
let src=super::input::content_rect((frame.width,frame.height),content)
.map(|(x,y,w,h)|Rect::new(x.round() as i32,y.round() as i32,w.round().max(1.) as u32,h.round().max(1.) as u32));
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;self.canvas.present();Ok(())
self.draw(frame)
}
}
pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super::desktop::Decoder,view_only:bool,device:&str)->Result<(),String>{
@@ -133,13 +399,22 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
}
Err(e)=>{ log::warn!("Type IPC not started: {e}"); None }
};
let mut command_open=true;let mut requested=false;let mut type_requested=false;
let mut command_open=true;let mut requested=false;let mut type_requested=false;let mut restored=false;
let mut type_job:Option<TypeJob>=None;
let mut terminate=tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).map_err(|_|"Cannot watch termination")?;
let mut audio=super::audio::Playback::new(&window._sdl,session.peer.audio.clone());
let mut input=Input::new(view_only);input.set_mac(window.mac);let mut tick=tokio::time::interval(std::time::Duration::from_millis(8));
let mut heartbeat=tokio::time::interval(std::time::Duration::from_secs(1));
let deadline=tokio::time::sleep(std::time::Duration::from_secs(30));tokio::pin!(deadline);
window.set_stage(crate::i18n::s("正在传输画面…","Waiting for the remote picture…"));
if let Some(playback)=audio.as_mut(){playback.volume=window.state().volume;}
if window.state().grab_keys {window.canvas.window_mut().set_keyboard_grab(true);}
let started=std::time::Instant::now();let mut seq=3_000_000u64;
let mut last=(0u64,0u64,0u64,0u64,std::time::Instant::now());
let mut codec_name="--";
// After a local drop the decoder has no reference picture; P-frames would only smear blocks.
let mut key_gate=super::desktop::KeyGate::new();
let mut next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(5);
let result=async {
loop {tokio::select!{
command=commands.recv(),if command_open=>{
@@ -177,10 +452,48 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
let o=&session.peer.observed;let s=&super::desktop::STATS;let r=std::sync::atomic::Ordering::Relaxed;
log::info!("Viewer desktop stats: control_open={} echo={} media_packets={} access_units={} presented={} decode_errors={}",
o.control_open.load(r),o.echo_received.load(r),o.media_packets.load(r),s[0].load(r),s[1].load(r),s[2].load(r));
// Network-status panel: per-second deltas of local counters plus the selected ICE pair.
let now=(s[1].load(r),o.media_bytes.load(r),o.video_received.load(r),o.video_expected.load(r),std::time::Instant::now());
let secs=now.4.duration_since(last.4).as_secs_f64().max(0.2);
let expected=now.3.saturating_sub(last.3);let lost=expected.saturating_sub(now.2.saturating_sub(last.2));
let (rtt_ms,route)=session.peer.route().await;
window.sync_chroma(o.chroma.load(r));
let size=window.last_frame.as_ref().map_or((0,0),|f|f.content.unwrap_or((f.width,f.height)));
window.set_net(hud::NetStats{elapsed:started.elapsed().as_secs(),route,fps:((now.0-last.0) as f64/secs).round() as u32,
kbps:(now.1-last.1) as f64*8./1000./secs,rtt_ms,loss:if expected>0 {lost as f64*100./expected as f64} else {0.},size,
codec:codec_name,chroma:window.state().chroma});
last=now;
if std::time::Instant::now()>=next_thumb { if let Some(frame)=window.last_frame.as_ref() {
if let Err(e)=super::thumbs::save(device,frame){log::debug!("Viewer thumbnail not saved: {e}");}
next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(30);
}}
},
_=tick.tick()=>{
if let Some(playback)=audio.as_mut(){if playback.pump().is_err(){log::warn!("Viewer audio playback stopped");audio=None;}}
let (quit,messages)=window.poll(&mut input);
let (quit,mut messages)=window.poll(&mut input);
if !window.has_picture() {window.loading_frame(false);}
if !restored && session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false) {restored=true;window.restore_remote_settings();}
for command in window.take_commands() {
seq+=1;
let control=match command {
hud::Command::Quality(q)=>Some(super::wire::capture_setting(seq,&[(2,q)])),
hud::Command::Fps(f)=>Some(super::wire::capture_setting(seq,&[(1,match f{30=>1,60=>2,90=>3,_=>4}),(18,u64::from(f))])),
hud::Command::Chroma(c)=>Some(super::wire::capture_setting(seq,&[(7,u64::from(c))])),
hud::Command::FollowRemote(true)=>Some(super::wire::capture_setting(seq,&[(10,3)])),
hud::Command::FollowRemote(false)=>{let (w,h)=window.window_size();let (w,h)=(u64::from(w&!1),u64::from(h&!1));
Some(super::wire::capture_setting(seq,&[(5,w),(6,h),(16,w),(17,h)]))},
// 远程结束后自动锁屏: SimpleAction 19, value 2 = on, 1 = off.
hud::Command::AutoLock(on)=>Some(super::wire::simple_action(seq,19,Some(if on {2} else {1}))),
// 静音运行: on = SimpleAction 14 then 18, off = 16 (src/system_actions.rs).
hud::Command::HostMute(true)=>{let _=session.peer.send_control(super::wire::simple_action(seq,14,None)).await;seq+=1;Some(super::wire::simple_action(seq,18,None))},
hud::Command::HostMute(false)=>Some(super::wire::simple_action(seq,16,None)),
hud::Command::Volume(v)=>{if let Some(playback)=audio.as_mut(){playback.volume=v;}None},
hud::Command::Watch(on)=>{messages.extend(input.release_all());input.set_view_only(on||view_only);None},
hud::Command::Disconnect=>return Ok(()),
_=>None,
};
if let Some(data)=control { if let Err(e)=session.peer.send_control(data).await {log::warn!("Viewer control command not sent: {e}");} }
}
window.poll_clipboard();
requested|=std::mem::take(&mut window.files);
#[cfg(uu_gtk)] {
@@ -229,12 +542,20 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
if quit{return Ok(())}
// At most one AU per iteration keeps local event polling responsive.
if let Some(au)=session.peer.desktop.units.pop(){
if session.peer.desktop.reset.swap(false,std::sync::atomic::Ordering::AcqRel){decoder.reset();}
decoder.set_codec(au.codec)?;
super::desktop::display(decoder,window,&au.data,au.codec,&session.peer.desktop.pli)?;}
if session.peer.desktop.reset.swap(false,std::sync::atomic::Ordering::AcqRel){decoder.reset();key_gate.arm();}
if !key_gate.admit(au.codec,&au.data) {session.peer.desktop.pli.store(true,std::sync::atomic::Ordering::Release);super::desktop::drain(decoder,window)?;}
else {
decoder.set_codec(au.codec)?;
codec_name=if au.codec==super::media::Codec::H265 {"H.265"} else {"H.264"};
super::desktop::display(decoder,window,&au.data,au.codec,&session.peer.desktop.pli)?;
}}
// A picture can finish after its access unit was written; show it without waiting
// for the next one (a single keystroke may change the remote screen only once).
else {super::desktop::drain(decoder,window)?;}
}
}}
}.await;
if let Some(frame)=window.last_frame.as_ref() {if let Err(e)=super::thumbs::save(device,frame){log::debug!("Viewer thumbnail not saved: {e}");}}
#[cfg(uu_gtk)] if let Some(f)=files {f.abort();let _=f.await;super::tools_ui::hide();session.peer.tools.lock().unwrap().take();}
if let Some(t)=type_ipc {t.abort();let _=t.await;}
for m in input.release_all(){let _=session.peer.send_input(&m).await;}
@@ -424,6 +745,15 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
assert!(tx.is_closed());drop(bridge);
let window=Window::new().unwrap();assert!(window.clipboard_bridge().enabled);
}
#[test] fn only_event_types_sdl2_defines_reach_the_crate(){
use sdl2::sys::SDL_EventType as T;
for t in [T::SDL_QUIT,T::SDL_LOCALECHANGED,T::SDL_DISPLAYEVENT,T::SDL_WINDOWEVENT,T::SDL_TEXTEDITING_EXT,T::SDL_MOUSEWHEEL,
T::SDL_JOYBATTERYUPDATED,T::SDL_CONTROLLERSENSORUPDATE,T::SDL_FINGERMOTION,T::SDL_MULTIGESTURE,T::SDL_CLIPBOARDUPDATE,
T::SDL_DROPCOMPLETE,T::SDL_AUDIODEVICEREMOVED,T::SDL_SENSORUPDATE,T::SDL_RENDER_DEVICE_RESET,T::SDL_POLLSENTINEL,T::SDL_USEREVENT]{
assert!(sdl2_event_type(t as u32),"{:#x}",t as u32);
}
for t in [0x151,0x202,0x207,0x306,0x404,0x608,0x65A,0x703,0x901,0x1004,0x1102,0x1201,0x2002,0x8001]{assert!(!sdl2_event_type(t),"{t:#x}");}
}
#[test] fn clipboard_text_rejects_invalid_or_large_data_and_keeps_empty_text(){
assert_eq!(clipboard_text(b""),Some(String::new()));
assert_eq!(clipboard_text(b"text\n"),Some("text\n".into()));
@@ -442,6 +772,11 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
assert!(input.release_all().is_empty());
}
}
#[test] fn compositor_resize_and_expose_repaint_the_last_frame(){
let w=|win_event|Event::Window{timestamp:0,window_id:1,win_event};
for e in [WindowEvent::SizeChanged(1280,800),WindowEvent::Resized(1280,800),WindowEvent::Exposed,WindowEvent::Maximized,WindowEvent::Restored]{assert!(needs_redraw(&w(e)));}
for e in [WindowEvent::FocusGained,WindowEvent::Moved(0,0)]{assert!(!needs_redraw(&w(e)));}
}
#[test] fn wheel_events_become_scroll_messages(){
use sdl2::mouse::MouseWheelDirection;
let mut input=Input::default();let mut focused=true;
@@ -474,6 +809,17 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
let (quit,out)=translate(events,&mut input,Viewport::fit((800,600),(1920,1080)),&mut focused);
assert!(quit);assert!(out.is_empty());assert!(input.release_all().is_empty());
}
#[test] fn motions_in_one_poll_send_only_the_newest_and_keep_click_order(){
let mut input=Input::default();let mut focused=true;
let motion=|x,y|Event::MouseMotion{timestamp:0,window_id:1,which:0,mousestate:sdl2::mouse::MouseState::from_sdl_state(0),x,y,xrel:1,yrel:1};
let down=Event::MouseButtonDown{timestamp:0,window_id:1,which:0,mouse_btn:MouseButton::Left,clicks:1,x:0,y:0};
let v=Viewport::fit((800,600),(800,600));
let (_,out)=translate([motion(10,10),motion(20,20),down,motion(30,30),motion(40,40)],&mut input,v,&mut focused);
let actions:Vec<&str>=out.iter().map(|m|m["action"].as_str().unwrap()).collect();
assert_eq!(actions.len(),3,"{out:?}");
assert_eq!(actions[0],"mouse_move_absolute");assert_eq!(actions[2],"mouse_move_absolute");assert_ne!(actions[1],"mouse_move_absolute");
assert!((out[0]["abs_x"].as_f64().unwrap()-20./800.).abs()<0.01 && (out[2]["abs_x"].as_f64().unwrap()-40./800.).abs()<0.01,"{out:?}");
}
#[test] fn focus_event_releases_and_suppresses_input_until_focus_returns(){
let mut input=Input::default();input.key(4,true);input.button(1,true);let mut focused=true;
let focus=|win_event|Event::Window{timestamp:0,window_id:1,win_event};
+4 -6
View File
@@ -3,13 +3,11 @@
use base64::Engine as _;
use futures_util::{SinkExt, StreamExt};
use serde_json::Value;
use tokio::net::TcpStream;
use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
use tokio_tungstenite::tungstenite::{client::IntoClientRequest, Message};
use std::{collections::VecDeque,time::Duration};
pub struct Signal {
ws: WebSocketStream<MaybeTlsStream<TcpStream>>,
ws: crate::ws_transport::Socket,
next_ack:u64,
pending:VecDeque<Value>,
legacy_prefix:bool,
@@ -17,14 +15,14 @@ pub struct Signal {
impl Signal {
pub async fn connect(urls:&[String], token:&str, timeout:Duration, legacy_prefix:bool)->Result<Self,String> {
for url in urls {
if let Ok(Ok(signal))=tokio::time::timeout(timeout,Self::one(url,token,legacy_prefix)).await {return Ok(signal)}
if let Ok(Ok(signal))=tokio::time::timeout(timeout,Self::one(url,token,legacy_prefix,timeout)).await {return Ok(signal)}
}
Err("Signaling connection failed (details omitted)".into())
}
async fn one(url:&str,token:&str,legacy_prefix:bool)->Result<Self,String> {
async fn one(url:&str,token:&str,legacy_prefix:bool,timeout:Duration)->Result<Self,String> {
let mut request=format!("{}/socket.io/?transport=websocket&EIO=4",url.trim_end_matches('/')).into_client_request().map_err(|_|"Invalid signaling endpoint")?;
request.headers_mut().insert("X-NRD-AUTH",token.parse().map_err(|_|"Invalid room authentication header")?);
let (ws,_)=connect_async(request).await.map_err(|_|"Signaling transport failed")?;
let ws=crate::ws_transport::connect(request,timeout).await?;
let mut s=Self{ws,next_ack:10,pending:VecDeque::new(),legacy_prefix};
let mut opened=false;
loop {
+2
View File
@@ -82,6 +82,8 @@ async fn complete_session_uses_loopback_signaling_and_virtual_rtc_through_echo()
for (action,number) in [(super::power::Action::Reboot,9),(super::power::Action::Shutdown,12)] {
if message.data.as_ref()==action.message(2).as_slice(){input_tx.send(json!({"power":number})).await.unwrap();return}
}
// Desktop sessions also request the video track (RPC 15), like the official viewer.
if message.data.as_ref()==wire::request_video_track().as_slice() {return}
assert_eq!(&message.data[..],&wire::echo_request(1));
let mut action=Vec::new();wire::int(1,1,&mut action);wire::bytes(2,br#"{"seq":1}"#,&mut action);
if let Some(channel)=weak.upgrade(){channel.send(&bytes::Bytes::from(wire::envelope(100,3,&action))).await.unwrap();}
+58
View File
@@ -0,0 +1,58 @@
//! Device preview pictures for the launcher, like the official client's device card: the desktop
//! window saves a small PNG of the last remote picture. Local only (`$XDG_CACHE_HOME/uuremote/thumbs`,
//! 0700 directory, 0600 files); `UU_VIEWER_THUMBNAILS=0` turns it off.
use std::path::PathBuf;
pub fn enabled() -> bool { std::env::var("UU_VIEWER_THUMBNAILS").as_deref() != Ok("0") }
fn dir() -> Option<PathBuf> {
let base = std::env::var_os("XDG_CACHE_HOME").map(PathBuf::from).filter(|p| p.is_absolute())
.or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".cache")))?;
Some(base.join("uuremote").join("thumbs"))
}
pub fn path(device: &str) -> Option<PathBuf> { Some(dir()?.join(format!("{}.png", &super::type_ipc::device_key(device)[..32]))) }
pub fn existing(device: &str) -> Option<PathBuf> { enabled().then(|| path(device)).flatten().filter(|p| p.is_file()) }
/// Box-filtered downscale of the content rectangle to at most `max_w` pixels wide.
pub fn downscale(width: u32, height: u32, rgb: &[u8], content: (u32, u32, u32, u32), max_w: u32) -> (u32, u32, Vec<u8>) {
let (cx, cy, cw, ch) = content;
let ratio = (cw as f64 / max_w as f64).max(1.);
let (w, h) = (((cw as f64 / ratio).round() as u32).max(1), ((ch as f64 / ratio).round() as u32).max(1));
let mut out = Vec::with_capacity(w as usize * h as usize * 3);
for y in 0..h { for x in 0..w {
let (x0, x1) = (cx + (x as f64 * ratio) as u32, (cx + ((x + 1) as f64 * ratio) as u32).max(cx + (x as f64 * ratio) as u32 + 1).min(cx + cw).min(width));
let (y0, y1) = (cy + (y as f64 * ratio) as u32, (cy + ((y + 1) as f64 * ratio) as u32).max(cy + (y as f64 * ratio) as u32 + 1).min(cy + ch).min(height));
let mut sum = [0u64; 3]; let mut n = 0u64;
for sy in y0..y1 { for sx in x0..x1 {
let i = (sy as usize * width as usize + sx as usize) * 3;
for k in 0..3 { sum[k] += u64::from(rgb[i + k]); } n += 1;
}}
for k in 0..3 { out.push((sum[k] / n.max(1)) as u8); }
}}
(w, h, out)
}
pub fn save(device: &str, frame: &super::desktop::Frame) -> Result<(), String> {
if !enabled() { return Ok(()) }
let path = path(device).ok_or("No cache directory")?;
let dir = path.parent().ok_or("No cache directory")?;
use std::os::unix::fs::{DirBuilderExt, PermissionsExt};
std::fs::DirBuilder::new().recursive(true).mode(0o700).create(dir).map_err(|_| "Cannot create the thumbnail directory")?;
let _ = std::fs::set_permissions(dir, std::fs::Permissions::from_mode(0o700));
let content = super::input::content_rect((frame.width, frame.height), frame.content.unwrap_or((frame.width, frame.height)))
.map_or((0, 0, frame.width, frame.height), |(x, y, w, h)| (x as u32, y as u32, w as u32, h as u32));
let (w, h, rgb) = downscale(frame.width, frame.height, &frame.rgb, content, 640);
// Write then rename, so the launcher never reads a half-written file.
let tmp = path.with_extension("tmp");
let _ = std::fs::remove_file(&tmp);
super::type_ipc::write_png_rgb(&tmp, w, h, &rgb, true)?;
std::fs::rename(&tmp, &path).map_err(|_| "Cannot store the thumbnail".into())
}
#[cfg(test)] mod tests {
#[test] fn downscale_averages_and_keeps_aspect(){
let rgb:Vec<u8>=(0..4*2).flat_map(|i|if i%2==0{[0,0,0]}else{[200,100,50]}).collect();
let (w,h,out)=super::downscale(4,2,&rgb,(0,0,4,2),2);
assert_eq!((w,h),(2,1));assert_eq!(&out[..3],&[100,50,25]);
assert_eq!(super::downscale(4,2,&rgb,(0,0,4,2),640).0,4);
}
}
+1 -1
View File
@@ -161,7 +161,7 @@ pub fn session_rows(sessions:&[Value])->String{
let mut rows:Vec<_>=sessions.iter().filter_map(|s|{
let id=u32::try_from(s["session_id"].as_u64()?).ok().filter(|n|*n!=0)?;
let shell=s["shell"].as_str().unwrap_or("--").chars().take(256).collect::<String>().replace(['\t','\n','\r','\0']," ");
let state=match s["state"].as_str(){Some("running")=>"运行中",Some("detached")=>"已分离",_=>"--"};
let state=match s["state"].as_str(){Some("running")=>crate::i18n::s("运行中","Running"),Some("detached")=>crate::i18n::s("已分离","Detached"),_=>"--"};
Some((id,format!("{id}\t{shell}\t{}\t{state}\n",s["created_at_ms"].as_u64().unwrap_or(0))))
}).collect();rows.sort_by_key(|r|r.0);rows.into_iter().map(|r|r.1).collect()
}
+1 -1
View File
@@ -156,7 +156,7 @@ fn terminal_metadata_is_allowlisted_and_sorted(){
serde_json::json!({"session_id":2,"shell":"/bin/bash","state":"running"}),
serde_json::json!({"session_id":0}),serde_json::json!({"session_id":4294967296u64}),
]);
assert_eq!(rows,"2\t/bin/bash\t0\t运行中\n9\t/bin/sh X Y \t123\t已分离\n");
assert_eq!(rows,format!("2\t/bin/bash\t0\t{}\n9\t/bin/sh X Y \t123\t{}\n",crate::i18n::s("运行中","Running"),crate::i18n::s("已分离","Detached")));
assert!(!rows.contains("PRIVATE"));assert!(terminal::session_rows(&[]).is_empty());
}
#[tokio::test]
+18 -18
View File
@@ -54,7 +54,7 @@ fn task(id:i32,name:&str,status:&str,done:u64,total:u64,from:&str,to:&str,state:
let(n,s,f,t)=(c(name),c(status),c(from),c(to));
unsafe{uu_files_ui_task(id,n.as_ptr(),s.as_ptr(),done,total,f.as_ptr(),t.as_ptr(),state)}
}
fn reason(error:&str)->String{if error.contains("canceled"){"已取消".into()}else{format!("失败:{error}")}}
fn reason(error:&str)->String{if error.contains("canceled"){crate::i18n::s("已取消","Canceled").into()}else{crate::tr!("失败:{error}","Failed: {error}")}}
pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),String>{
start("files",name)?;
@@ -67,7 +67,7 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
let mut guard=shown.lock().unwrap();let Some(a)=guard.as_mut() else{continue};
if a.last.elapsed()<Duration::from_millis(200) && p.transferred<p.total{continue}a.last=Instant::now();
let percent=if p.total>0{p.transferred*100/p.total}else{0};
task(a.id,&a.name,&format!("传输中 {percent}%"),p.transferred,p.total,&a.from,&a.to,0);
task(a.id,&a.name,&crate::tr!("传输中 {percent}%","Transferring {percent}%"),p.transferred,p.total,&a.from,&a.to,0);
}
});
let _reporter=super::tools::Cancel(reporter.abort_handle());
@@ -79,24 +79,24 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
while let Some(job)=queue.recv().await{if worker_closing.load(Ordering::Acquire){break}match job{
Job::List(path)=>match worker_f.list_dir(&path).await{
Ok(entries)=>{remote=path.clone();let(p,r)=(c(&path),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}
Err(e)=>toast(&format!("无法读取远端目录:{e}")),
Err(e)=>toast(&crate::tr!("无法读取远端目录:{e}","Cannot read remote folder: {e}")),
},
Job::Mkdir(path,parent)=>match worker_f.mkdir(&path).await{
Ok(())=>if parent==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}},
Err(e)=>toast(&format!("无法创建远端文件夹:{e}")),
Err(e)=>toast(&crate::tr!("无法创建远端文件夹:{e}","Cannot create remote folder: {e}")),
},
Job::Transfer{id,upload,from,dir,generation}=>{
let name=base_name(&from).to_owned();
let to=if upload{remote_join(&dir,&name)}else{free_local(std::path::Path::new(&dir),&name).to_string_lossy().into_owned()};
if generation!=worker_gen.load(Ordering::Acquire){task(id,&name,"已取消",0,0,&from,&to,2);continue}
if generation!=worker_gen.load(Ordering::Acquire){task(id,&name,crate::i18n::s("已取消","Canceled"),0,0,&from,&to,2);continue}
*worker_active.lock().unwrap()=Some(Active{id,name:name.clone(),from:from.clone(),to:to.clone(),last:Instant::now()});
task(id,&name,"传输中",0,0,&from,&to,0);
task(id,&name,crate::i18n::s("传输中","Transferring"),0,0,&from,&to,0);
let result=if upload{worker_f.upload(&from,&to).await}else{worker_f.download(&from,&to).await};
*worker_active.lock().unwrap()=None;
match result{
Ok(())=>{
let size=std::fs::metadata(if upload{&from}else{&to}).map(|m|if m.is_file(){m.len()}else{0}).unwrap_or(0);
task(id,&name,"已完成",size,size,&from,&to,1);
task(id,&name,crate::i18n::s("已完成","Done"),size,size,&from,&to,1);
if upload{if dir==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}}}
else{unsafe{uu_files_ui_refresh_local()}}
}
@@ -118,7 +118,7 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
["mkdir",path]=>{let parent=path.rfind(['/','\\']).map(|i|path[..i.max(1)].to_owned()).unwrap_or_default();let _=jobs.send(Job::Mkdir((*path).into(),parent));}
[kind@("put"|"get"),from,dir]=>{
let(id,upload)=(NEXT_TASK.fetch_add(1,Ordering::Relaxed),*kind=="put");
let name=base_name(from);task(id,name,"等待中",0,0,from,dir,0);
let name=base_name(from);task(id,name,crate::i18n::s("等待中","Waiting"),0,0,from,dir,0);
let _=jobs.send(Job::Transfer{id,upload,from:(*from).into(),dir:(*dir).into(),generation:generation.load(Ordering::Acquire)});
}
["cancel"]=>{generation.fetch_add(1,Ordering::AcqRel);f.cancel();}
@@ -147,12 +147,12 @@ pub async fn portmap(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(
["add",rule,local,host,port]=>match(local.parse::<u16>(),port.parse::<u16>()){
(Ok(local),Ok(port))=>match p.add_rule(*rule,local,*host,port).await{
Ok(id)=>{targets.insert(id,format!("{host}:{port}"));}
Err(e)=>toast(&format!("添加失败:{}",if e.contains("bind"){"本地端口已被占用".to_owned()}else{e})),
Err(e)=>toast(&crate::tr!("添加失败:{}","Add failed: {}",if e.contains("bind"){crate::i18n::s("本地端口已被占用","Local port is already in use").to_owned()}else{e})),
},
_=>toast("端口无效"),
_=>toast(crate::i18n::s("端口无效","Invalid port")),
},
["remove",id]=>if let Ok(id)=id.parse::<u64>(){
if let Err(e)=p.remove_rule(id).await{toast(&format!("删除失败:{e}"))}targets.remove(&id);
if let Err(e)=p.remove_rule(id).await{toast(&crate::tr!("删除失败:{e}","Remove failed: {e}"))}targets.remove(&id);
},
_=>{}
}
@@ -160,9 +160,9 @@ pub async fn portmap(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(
let mut status=p.status();status.sort_by_key(|s|s.id);
let rows:String=status.iter().map(|s|format!("{}\t{}\t127.0.0.1:{}\t{}\t{}\n",s.id,s.name.replace(['\t','\n']," "),s.local_port,
targets.get(&s.id).map(String::as_str).unwrap_or("-"),
if s.failures>0{format!("已启用 · {} 个连接 · {} 次失败",s.streams,s.failures)}else{format!("已启用 · {} 个连接",s.streams)})).collect();
if s.failures>0{crate::tr!("已启用 · {} 个连接 · {} 次失败","On · {} connections · {} failures",s.streams,s.failures)}else{crate::tr!("已启用 · {} 个连接","On · {} connections",s.streams)})).collect();
if rows!=last{let r=c(&rows);unsafe{uu_portmap_ui_set_rules(r.as_ptr())};last=rows;}
tokio::select!{_=&mut closed_transport=>{toast("连接已断开");tokio::time::sleep(Duration::from_secs(3)).await;break Err("Forwarding transport closed".into())},_=tokio::time::sleep(Duration::from_millis(200))=>{}}
tokio::select!{_=&mut closed_transport=>{toast(crate::i18n::s("连接已断开","Disconnected"));tokio::time::sleep(Duration::from_secs(3)).await;break Err("Forwarding transport closed".into())},_=tokio::time::sleep(Duration::from_millis(200))=>{}}
};
let ids:Vec<u64>=p.status().iter().map(|s|s.id).collect();for id in ids{let _=p.remove_rule(id).await;}
result
@@ -190,14 +190,14 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}
},
id=queue.recv()=>match id{
Some(id)=>{if t.kill(id).await.is_err(){toast("结束会话失败,会话可能已退出")}
Some(id)=>{if t.kill(id).await.is_err(){toast(crate::i18n::s("结束会话失败,会话可能已退出","Could not end the session; it may have exited"))}
let rows=c(&session_rows(&t.list_sessions().await?));unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}},
None=>return Ok::<(),String>(()),
},
_=tokio::time::sleep(Duration::from_millis(100)),if relay.0.is_finished()=>return Err("Terminal channel closed".into()),
}}
}.await;
if operation.is_err(){unsafe{uu_terminal_ui_set(c("").as_ptr(),0)};toast("终端连接已断开,请关闭窗口后重试")}
if operation.is_err(){unsafe{uu_terminal_ui_set(c("").as_ptr(),0)};toast(crate::i18n::s("终端连接已断开,请关闭窗口后重试","Terminal disconnected. Close the window and try again"))}
});
let _worker=super::tools::Cancel(worker.abort_handle());
let mut children:Vec<std::process::Child>=Vec::new();
@@ -205,7 +205,7 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
if worker.is_finished(){ipc.0.abort();}
children.retain_mut(|child|matches!(child.try_wait(),Ok(None)));
while let Some(cmd)=take(){
if worker.is_finished(){toast("连接已断开");continue}
if worker.is_finished(){toast(crate::i18n::s("连接已断开","Disconnected"));continue}
let parts:Vec<_>=cmd.split('\t').collect();
let session=match parts.as_slice(){
["create"]=>None,
@@ -214,8 +214,8 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
_=>continue,
};
match local_terminal_command(&exe,&path,session){
Some(mut command)=>match command.spawn(){Ok(child)=>children.push(child),Err(_)=>toast("无法启动本机终端程序")},
None=>toast("没有找到本机终端程序(可设置 TERMINAL 环境变量)"),
Some(mut command)=>match command.spawn(){Ok(child)=>children.push(child),Err(_)=>toast(crate::i18n::s("无法启动本机终端程序","Cannot start a local terminal"))},
None=>toast(crate::i18n::s("没有找到本机终端程序(可设置 TERMINAL 环境变量)","No local terminal found (set the TERMINAL environment variable)")),
}
}
tokio::time::sleep(Duration::from_millis(100)).await;
+8 -1
View File
@@ -392,7 +392,10 @@ mod tests {
fn tempfile_dir() -> PathBuf {
use std::os::unix::fs::DirBuilderExt;
let dir = std::env::temp_dir().join(format!("uu-type-ipc-test-{}", std::process::id()));
// One directory per call: tests run in parallel and must not remove each other's files.
static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
let dir = std::env::temp_dir().join(format!("uu-type-ipc-test-{}-{}", std::process::id(),
NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)));
let _ = std::fs::remove_dir_all(&dir);
std::fs::DirBuilder::new()
.mode(0o700)
@@ -404,6 +407,8 @@ mod tests {
#[tokio::test]
async fn server_client_roundtrip_and_uid_gate() {
let device = format!("ipc-test-{}", uuidish());
// XDG_RUNTIME_DIR is process-wide; another test points it at a planted directory.
let _env = crate::viewer::secure_input::ENV_LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
let server = Server::bind(&device).await.unwrap();
let path = server.path.clone();
let (tx, mut rx) = mpsc::channel::<PendingType>(4);
@@ -463,6 +468,8 @@ mod tests {
#[tokio::test]
async fn oversized_frame_rejected() {
let device = format!("oversize-{}", uuidish());
// XDG_RUNTIME_DIR is process-wide; another test points it at a planted directory.
let _env = crate::viewer::secure_input::ENV_LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
let server = Server::bind(&device).await.unwrap();
let path = server.path.clone();
let (tx, mut rx) = mpsc::channel::<PendingType>(1);
+54 -23
View File
@@ -13,6 +13,7 @@ extern "C" {
fn uu_viewer_ui_closed() -> c_int;
fn uu_viewer_ui_confirm_replace() -> c_int;
fn uu_viewer_ui_toast(text: *const c_char);
fn uu_viewer_ui_set_host(active: c_int);
}
fn toast(text: &str) { let t = c(text); unsafe { uu_viewer_ui_toast(t.as_ptr()) } }
@@ -46,12 +47,12 @@ fn watch_session(mut child: tokio::process::Child, mut cancel: tokio::sync::ones
}).await;
if !status.is_ok_and(|s| s.success()) {
let reason = match last.as_str() {
"" => "连接已断开".to_owned(),
"CONTROL echo timed out" => "连接超时:被控端没有响应(官方主机互通尚未完成)".to_owned(),
"Remote session released" => "被控端结束了本次连接".to_owned(),
"" => crate::i18n::s("连接已断开","Disconnected").to_owned(),
"CONTROL echo timed out" => crate::i18n::s("连接超时:被控端没有响应(官方主机互通尚未完成)","Timed out: the remote device did not answer (official host interop is not finished)").to_owned(),
"Remote session released" => crate::i18n::s("被控端结束了本次连接","The remote device ended the connection").to_owned(),
other => other.to_owned(),
};
toast(&format!("连接失败:{reason}"));
toast(&crate::tr!("连接失败:{reason}","Connection failed: {reason}"));
} else if let Some(message) = success { toast(message); }
})
}
@@ -81,7 +82,8 @@ pub fn device_rows(devices: &[Value], current: Option<&str>) -> String {
let name = d.get("alias").and_then(Value::as_str).unwrap_or(id);
let platform = d.get("platform").and_then(Value::as_i64).unwrap_or(0);
let online = d.get("status").and_then(Value::as_str) == Some("CONNECTED");
Some(format!("{}\t{}\t{}\t{}\t{}\n", clean(id), clean(name), platform, online as u8, (current == Some(id)) as u8))
let thumb = super::thumbs::existing(id).map(|p| clean(&p.to_string_lossy())).unwrap_or_default();
Some(format!("{}\t{}\t{}\t{}\t{}\t{}\n", clean(id), clean(name), platform, online as u8, (current == Some(id)) as u8, thumb))
}).collect()
}
@@ -94,6 +96,10 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
let mut next_refresh = Instant::now();
let mut sessions:std::collections::HashMap<String,Running>=Default::default();
let mut names: std::collections::HashMap<String, String> = Default::default();
// Account token seen last; a new sign-in restarts a host the user turned on.
let mut host_token: Option<String> = None;
let mut just_logged_in = false;
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
let refresh = |creds: &crate::auth::Credentials| {
let api = super::api::Api::new(crate::auth::UUAuthClient::new(creds.clone()), crate::auth::BASE_URL);
async move { api.device_list().await }
@@ -103,27 +109,40 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
sessions.retain(|_,s| !s.task.is_finished());
if let Some(child) = login.as_mut() {
if let Ok(meta) = std::fs::metadata(&qr) {
if meta.modified().ok() != qr_seen { qr_seen = meta.modified().ok(); set_login(false, &qr.to_string_lossy(), "请用手机扫码并确认", ""); }
if meta.modified().ok() != qr_seen { qr_seen = meta.modified().ok(); set_login(false, &qr.to_string_lossy(), crate::i18n::s("请用手机扫码并确认","Scan with your phone and confirm"), ""); }
}
if let Ok(Some(_)) = child.try_wait() { login = None; let _ = std::fs::remove_file(&qr); next_refresh = Instant::now(); }
if let Ok(Some(_)) = child.try_wait() { login = None; let _ = std::fs::remove_file(&qr); next_refresh = Instant::now(); just_logged_in = true; }
} else if Instant::now() >= next_refresh {
next_refresh = Instant::now() + Duration::from_secs(30);
match credentials() {
Ok(creds) => {
set_login(true, "", "", "已登录");
set_login(true, "", "", crate::i18n::s("已登录","Signed in"));
// Hosting is opt-in (Settings switch): signing in never starts the host, but a
// host the user turned on goes online with the new account.
if host_token.as_deref() != Some(creds.token.as_str()) {
let changed = host_token.is_some() || std::mem::take(&mut just_logged_in);
if changed && super::host::managed() && super::host::active() {
match super::host::restart() {
Ok(()) => toast(crate::i18n::s("本机已上线,可在你的其他设备上远程控制","This computer is online; control it from your other devices")),
Err(e) => log::warn!("Host service not restarted: {e}"),
}
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
}
host_token = Some(creds.token.clone());
}
match refresh(&creds).await {
Ok(data) => {
let list = data.get("my_binded_devices").and_then(Value::as_array).cloned().unwrap_or_default();
let current = data.pointer("/current_device/device_id").and_then(Value::as_str);
names = list.iter().filter_map(|d| Some((d.get("device_id")?.as_str()?.to_owned(),
d.get("alias").and_then(Value::as_str).unwrap_or("远端设备").to_owned()))).collect();
d.get("alias").and_then(Value::as_str).unwrap_or_else(|| crate::i18n::s("远端设备","Remote device")).to_owned()))).collect();
let rows = c(&device_rows(&list, current)); unsafe { uu_viewer_ui_set_devices(rows.as_ptr()) }
}
Err(super::api::Error::AuthenticationExpired) => set_login(false, "", "登录已过期,请重新登录", ""),
Err(super::api::Error::AuthenticationExpired) => set_login(false, "", crate::i18n::s("登录已过期,请重新登录","Sign-in expired, please sign in again"), ""),
Err(_) => {}
}
}
Err(_) => set_login(false, "", "尚未登录", ""),
Err(_) => set_login(false, "", crate::i18n::s("尚未登录","Not signed in"), ""),
}
}
while let Some(cmd) = take() {
@@ -131,6 +150,18 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
match parts.as_slice() {
["quit"] => break,
["refresh"] => next_refresh = Instant::now(),
["relaunch"] => {
// Language is read once at start: restart the launcher in place. Open
// sessions are separate processes and keep running.
use std::os::unix::process::CommandExt;
let _ = std::process::Command::new(&exe).args(std::env::args_os().skip(1)).exec();
toast(crate::i18n::s("请重新启动控制端以切换语言","Restart the viewer to switch the language"));
}
["host", state] => {
let result = if *state == "on" { super::host::enable(&exe) } else { super::host::disable() };
if let Err(e) = result { toast(&crate::tr!("本机被控设置失败:{e}","Could not change hosting: {e}")); }
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
}
["logout"] => {
// Sign out locally: drop the account token, keep the device identity.
let path = crate::config::path();
@@ -140,7 +171,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
}
for (_,s) in sessions.drain() { s.stop().await; }
unsafe { uu_viewer_ui_set_devices(c("").as_ptr()) }
set_login(false, "", "已退出登录", "");
set_login(false, "", crate::i18n::s("已退出登录","Signed out"), "");
next_refresh = Instant::now() + Duration::from_secs(3600);
}
["login"] if login.is_none() => {
@@ -149,7 +180,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
.env("UU_LOGIN_QR_PNG", &qr).stdin(std::process::Stdio::null())
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())
.kill_on_drop(true).spawn().ok();
if login.is_none() { set_login(false, "", "找不到配套的 uuremote-server", ""); }
if login.is_none() { set_login(false, "", crate::i18n::s("找不到配套的 uuremote-server","The matching uuremote-server was not found"), ""); }
}
["connect", id, kind] if matches!(*kind, "desktop" | "watch") => {
if !replace(&mut sessions,id).await{continue}
@@ -161,38 +192,38 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
match command.env("UU_VIEWER_COMMANDS","1").stdin(std::process::Stdio::piped())
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
Ok(mut child) => { let input=child.stdin.take();let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input}); }
Err(_) => toast("连接失败:无法启动会话进程"),
Err(_) => toast(crate::i18n::s("连接失败:无法启动会话进程","Connection failed: cannot start the session process")),
}
}
["assist", id, code] => {
match super::assist::command(&exe, id).spawn() {
Ok(mut child) => match super::assist::send_code(&mut child, code).await {
Ok(()) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert(format!("assist:{id}"),Running{cancel,task,input:None}); }
Err(reason) => toast(&format!("连接失败:{reason}")),
Err(reason) => toast(&crate::tr!("连接失败:{reason}","Connection failed: {reason}")),
},
Err(_) => toast("连接失败:无法启动协助会话进程"),
Err(_) => toast(crate::i18n::s("连接失败:无法启动协助会话进程","Connection failed: cannot start the assistance session")),
}
}
["connect", id, kind @ ("file" | "portmap" | "terminal")] => {
if *kind=="file" {if let Some(s)=sessions.get_mut(*id){if let Some(input)=s.input.as_mut(){
use tokio::io::AsyncWriteExt;
if input.write_all(b"files\n").await.is_err(){toast("桌面会话命令发送失败,请重试")}continue
if input.write_all(b"files\n").await.is_err(){toast(crate::i18n::s("桌面会话命令发送失败,请重试","Could not send the command to the desktop session, try again"))}continue
}}}
if !replace(&mut sessions,id).await{continue}
let name = names.get(*id).cloned().unwrap_or_else(|| "远端设备".into());
let name = names.get(*id).cloned().unwrap_or_else(|| crate::i18n::s("远端设备","Remote device").into());
let tool = if *kind == "file" { "files-ui" } else if *kind == "terminal" { "terminal-ui" } else { "portmap-ui" };
match tokio::process::Command::new(&exe).args([tool, id, &name])
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input:None}); }
Err(_) => toast("连接失败:无法启动工具进程"),
Err(_) => toast(crate::i18n::s("连接失败:无法启动工具进程","Connection failed: cannot start the tool process")),
}
}
["connect", id, kind @ ("reboot" | "shutdown")] => {
if !replace(&mut sessions,id).await{continue}
match tokio::process::Command::new(&exe).args(["power", id, kind])
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,Some("电源指令已发送,未确认远端执行结果"));sessions.insert((*id).into(),Running{cancel,task,input:None}); }
Err(_) => toast("电源指令失败:无法启动会话进程"),
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,Some(crate::i18n::s("电源指令已发送,未确认远端执行结果","Power command sent; the result on the remote device is not confirmed")));sessions.insert((*id).into(),Running{cancel,task,input:None}); }
Err(_) => toast(crate::i18n::s("电源指令失败:无法启动会话进程","Power command failed: cannot start the session process")),
}
}
["connect", id, "unbind"] => {
@@ -201,7 +232,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
Ok(creds)=>super::api::Api::new(crate::auth::UUAuthClient::new(creds),crate::auth::BASE_URL).unbind(id,false).await.map_err(|e|e.to_string()),
Err(e)=>Err(e),
};
match result {Ok(())=>toast("设备已从账号删除"),Err(e)=>toast(&format!("删除设备失败:{e}"))}
match result {Ok(())=>toast(crate::i18n::s("设备已从账号删除","Device removed from the account")),Err(e)=>toast(&crate::tr!("删除设备失败:{e}","Removing the device failed: {e}"))}
next_refresh=Instant::now();
}
["connect", _, kind] => log::info!("Viewer UI: {kind} is not supported yet"),
@@ -221,6 +252,6 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
serde_json::json!({"device_id":"d2","platform":1,"status":"DISCONNECTED"}),
serde_json::json!({"alias":"no id"}),
], Some("d2"));
assert_eq!(rows, "d1\ta b\t4\t1\t0\nd2\td2\t1\t0\t1\n");
assert_eq!(rows, "d1\ta b\t4\t1\t0\t\nd2\td2\t1\t0\t1\t\n");
}
}
+30
View File
@@ -198,6 +198,14 @@ mod tests {
}
}
/// RpcRequest case 15 SendVideoTrackReq with no fields (track 0), sent by the official iPhone
/// viewer right after CONTROL opens (host logs: response_field=11 value=None). Without it a
/// second session only joins the stream already encoded for another viewer: no SPS/PPS/IDR (#124).
pub fn request_video_track()->Vec<u8>{
let mut header=Vec::new();int(1,2_000_001,&mut header);
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(15,&[],&mut rpc);
envelope(2_000_001,21,&rpc)
}
/// CaptureSettingRequest field 7 = ChromaFormat 3, wrapped in RPC 21/case 2.
pub fn request_chroma444()->Vec<u8>{
let mut header=Vec::new();int(1,2_000_000,&mut header);
@@ -205,6 +213,19 @@ pub fn request_chroma444()->Vec<u8>{
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
envelope(2_000_000,21,&rpc)
}
/// RpcRequest case 2 CaptureSettingRequest with the given (field, value) pairs: 1 fps option
/// index, 18 fpsCount, 2 quality, 7 chroma, 10 resolution_type, 16/17 pixel size (src/capture_setting.rs).
pub fn capture_setting(seq:u64,fields:&[(u32,u64)])->Vec<u8>{
let mut header=Vec::new();int(1,seq,&mut header);
let mut setting=Vec::new();for &(f,v) in fields {int(f,v,&mut setting);}
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
envelope(seq,21,&rpc)
}
/// Message 3 SimpleAction {1 action, 5 value} as the official 安全 menu sends it.
pub fn simple_action(seq:u64,action:u64,value:Option<u64>)->Vec<u8>{
let mut body=Vec::new();int(1,action,&mut body);if let Some(v)=value {int(5,v,&mut body);}
envelope(seq,3,&body)
}
/// Message 18 is an encoder capability LIST, not the chosen codec; RTP's negotiated PT is authoritative.
/// Message 25 reports actual encoded chroma, which may fall back to 4:2:0.
pub fn media_control(data:&[u8])->(Option<u32>,Option<u32>){
@@ -237,6 +258,15 @@ pub fn media_control(data:&[u8])->(Option<u32>,Option<u32>){
assert!(s.video_preferences(force).connect_options("synthetic-device",false).unwrap()==options);
}
}
#[test] fn video_track_request_is_an_empty_rpc_15(){
let message=request_video_track();
let fields=decode_wire(&message).unwrap();
assert!(fields.iter().any(|f|f.number==1));
let rpc=fields.iter().find_map(|f|match (f.number,&f.value){(21,WireValue::Bytes(b))=>Some(*b),_=>None}).unwrap();
let rpc=decode_wire(rpc).unwrap();
assert!(rpc.iter().any(|f|f.number==1));
assert!(rpc.iter().any(|f|matches!((f.number,&f.value),(15,WireValue::Bytes(b)) if b.is_empty())));
}
#[test] fn chroma_request_and_actual_sync_are_independent_of_encoder_list(){
let request=request_chroma444();let rpc=super::super::tools::blob(&request,21).unwrap();
let setting=super::super::tools::blob(rpc,2).unwrap();assert_eq!(super::super::tools::uint(setting,7),3);
+18 -11
View File
@@ -2,7 +2,9 @@
#![allow(dead_code)]
#[path = "auth.rs"] mod auth;
#[path = "config.rs"] mod config;
#[path = "i18n.rs"] mod i18n;
#[path = "protocol.rs"] mod protocol;
mod ws_transport;
mod viewer;
#[cfg(test)] #[path="hevc.rs"] mod hevc;
use viewer::clipboard;
@@ -13,7 +15,7 @@ use viewer::clipboard;
#[cfg(test)] #[path="initialization.rs"] mod initialization;
use viewer::{api::Api,rtc::ReadyPolicy,session::{Options,Session},wire::Shape};
use std::time::Duration;
const HELP:&str="Experimental native viewer.\n uuremote-viewer ui (GTK window: sign-in, devices, sessions) Desktop UI requires viewer-sdl (decodes with the ffmpeg CLI, or FFmpeg 6.x libraries with viewer-ffmpeg).\n uuremote-viewer power DEVICE reboot|shutdown\n uuremote-viewer type DEVICE [options] (secret from UU_INPUT_ENV or stdin; reuses running viewer)\n options: --delay-ms MS --omit-last N --snapshot PATH --dry-run --new-session\n uuremote-viewer unbind DEVICE [--shared] (从账号删除设备 / remove a device from the account)\n uuremote-viewer terminal DEVICE [SESSION]\n uuremote-viewer files DEVICE ls PATH | get REMOTE LOCAL | put LOCAL REMOTE\n uuremote-viewer portmap DEVICE LOCAL_PORT HOST PORT\n uuremote-viewer files-ui|portmap-ui|terminal-ui DEVICE NAME (GTK tool windows)\n uuremote-viewer login [--no-gui]\n uuremote-viewer devices METHOD ARRAY_POINTER ID_POINTER NAME_POINTER\n uuremote-viewer assist CONNECT_ID (验证码从 stdin 读取一行)\n uuremote-viewer connect DEVICE true|false SHAPE_JSON echo|manual raw|legacy [--view-only]\nVideo: UU_VIEWER_CODEC=h264 forces H.264; UU_VIEWER_CHROMA=444 requests true color (default 4:2:0).\nAudio: UU_VIEWER_AUDIO=0 disables playback. UU_VIEWER_VIEW_ONLY=1 disables desktop input.\nDevice-list method/JSON pointers and compatibility shape require verified operator configuration.\nQR login reuses the sibling uuremote-server login command. Never run login in a captured log.\nEcho readiness is transport observation only; no sendVideoTrack RPC is emitted.";
const HELP:&str="Experimental native viewer.\n uuremote-viewer ui (GTK window: sign-in, devices, sessions) Desktop UI requires viewer-sdl (decodes with the ffmpeg CLI, or FFmpeg 6.x libraries with viewer-ffmpeg).\n uuremote-viewer power DEVICE reboot|shutdown\n uuremote-viewer type DEVICE [options] (secret from UU_INPUT_ENV or stdin; reuses running viewer)\n options: --delay-ms MS --omit-last N --snapshot PATH --dry-run --new-session\n uuremote-viewer unbind DEVICE [--shared] (从账号删除设备 / remove a device from the account)\n uuremote-viewer terminal DEVICE [SESSION]\n uuremote-viewer files DEVICE ls PATH | get REMOTE LOCAL | put LOCAL REMOTE\n uuremote-viewer portmap DEVICE LOCAL_PORT HOST PORT\n uuremote-viewer files-ui|portmap-ui|terminal-ui DEVICE NAME (GTK tool windows)\n uuremote-viewer login [--no-gui]\n uuremote-viewer devices METHOD ARRAY_POINTER ID_POINTER NAME_POINTER\n uuremote-viewer assist CONNECT_ID (验证码从 stdin 读取一行)\n uuremote-viewer connect DEVICE true|false SHAPE_JSON echo|manual raw|legacy [--view-only]\nVideo: UU_VIEWER_CODEC=h264 forces H.264; UU_VIEWER_CHROMA=444 requests true color (default 4:2:0).\nAudio: UU_VIEWER_AUDIO=0 disables playback. UU_VIEWER_VIEW_ONLY=1 disables desktop input.\nDevice-list method/JSON pointers and compatibility shape require verified operator configuration.\nQR login reuses the sibling uuremote-server login command. Never run login in a captured log.\nEcho readiness is transport observation only; desktop sessions send one sendVideoTrack RPC (like the official iPhone viewer).";
const DEFAULT_SHAPE:&str=r#"{"capture_type":1,"platform":3,"client_version":"4.42.0","width":1920,"height":1080,"fps":60,"chroma":1,
"decoders":[{"fps":60,"codec":1,"width":3840,"height":2160,"chroma":1}],"display_modes":[[1920,1080,60]],
"displays":[{"id":1,"fps":60,"type":0,"hdr":0}],
@@ -56,8 +58,8 @@ async fn run(args:&[String])->Result<(),String> {
Ok(())
}
Some("unbind") if (args.len()==2 || (args.len()==3 && args[2]=="--shared")) && !args[1].is_empty() => {
api()?.unbind(&args[1],args.len()==3).await.map_err(|e|format!("删除设备失败:{e}"))?;
println!("已从账号删除设备");Ok(())
api()?.unbind(&args[1],args.len()==3).await.map_err(|e|crate::tr!("删除设备失败:{e}","Removing the device failed: {e}"))?;
println!("{}",crate::i18n::s("已从账号删除设备","Device removed from the account"));Ok(())
}
Some("power")=>power_command(args).await,
Some("type")=>type_command(args).await,
@@ -68,7 +70,7 @@ async fn run(args:&[String])->Result<(),String> {
Some("terminal"|"files"|"portmap"|"files-ui"|"portmap-ui"|"terminal-ui")=>tool_command(args).await,
Some("assist") if args.len()==2=> {
let code=viewer::assist::read_code(std::io::stdin().lock())?;
desktop_command(&["connect".into(),args[1].clone(),"false".into(),"-".into(),"echo".into(),"legacy".into()],Some(code)).await.map_err(|e|format!("协助连接失败:{e}"))
desktop_command(&["connect".into(),args[1].clone(),"false".into(),"-".into(),"echo".into(),"legacy".into()],Some(code)).await.map_err(|e|crate::tr!("协助连接失败:{e}","Assistance connection failed: {e}"))
}
Some("connect") if args.len()==6 || args.len()==7=> desktop_command(args,None).await,
_=>Err(HELP.into()),
@@ -95,11 +97,16 @@ async fn desktop_command(args:&[String],code:Option<String>)->Result<(),String>
let creds=credentials()?;
let api=Api::new(auth::UUAuthClient::new(creds.clone()),auth::BASE_URL);
let account_connection=code.is_none();
let room=match code {
#[cfg(feature="viewer-sdl")]
macro_rules! wait {($stage:expr,$fut:expr)=>{viewer::sdl::loading(desktop.as_mut().map(|d|&mut d.0),$stage,$fut).await?}}
#[cfg(not(feature="viewer-sdl"))]
macro_rules! wait {($stage:expr,$fut:expr)=>{{let _=$stage;$fut.await}}}
let contacting=i18n::s("正在连接远端设备…","Contacting the remote device…");
let room=wait!(contacting,async{match code {
Some(code)=>api.join_share(&args[1],&code).await,
None=>api.join(&args[1],force,true).await,
}.map_err(|e|e.to_string())?;
let target_mac=if shape.capture_type==1 {api.target_is_mac(&room,account_connection.then_some(args[1].as_str())).await} else {Err(viewer::api::Error::UnknownKeyboardPlatform)};
}}).map_err(|e|e.to_string())?;
let target_mac=if shape.capture_type==1 {wait!(contacting,api.target_is_mac(&room,account_connection.then_some(args[1].as_str())))} else {Err(viewer::api::Error::UnknownKeyboardPlatform)};
#[cfg(feature="viewer-sdl")]
if let Some((window,_))=desktop.as_mut().filter(|_|!view_only){
window.set_mac(*target_mac.as_ref().map_err(|e|e.to_string())?);
@@ -110,7 +117,7 @@ async fn desktop_command(args:&[String],code:Option<String>)->Result<(),String>
let mut clipboard=clipboard::Bridge::new(shape.capture_type==1);
clipboard.set_target_mac(target_mac.ok());
let options=Options{timeout:Duration::from_secs(12),legacy_prefix:legacy,ready_policy:policy,clipboard};
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
let mut session=wait!(i18n::s("正在建立安全连接…","Establishing a secure connection…"),Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()))?;
#[cfg(feature="viewer-sdl")]
let result=if let Some((window,decoder))=desktop.as_mut(){viewer::sdl::run(&mut session,window,decoder.as_mut(),view_only,&args[1]).await}else{session.run().await};
#[cfg(not(feature="viewer-sdl"))]
@@ -168,7 +175,7 @@ async fn type_command(args:&[String])->Result<(),String>{
if !response.ok {
return Err(response.error.unwrap_or_else(||"Secure input failed on running viewer".into()));
}
println!("安全输入已发送({} 个按键事件,{} 字符)。", response.events, response.chars);
println!("{}",crate::tr!("安全输入已发送({} 个按键事件,{} 字符)。","Secure input sent ({} key events, {} characters).", response.events, response.chars));
if let Some(path)=response.snapshot {
println!("snapshot={path}");
log::info!("Secure input snapshot: {path}");
@@ -195,7 +202,7 @@ async fn type_command(args:&[String])->Result<(),String>{
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
let result=viewer::secure_input::run_session(&mut session,actions.as_slice(),delay).await;
session.close().await;
if result.is_ok(){println!("安全输入已发送({event_count} 个按键事件);新会话路径无截图。");}
if result.is_ok(){println!("{}",crate::tr!("安全输入已发送({event_count} 个按键事件);新会话路径无截图。","Secure input sent ({event_count} key events); no snapshot on the new-session path."));}
result
}
@@ -294,6 +301,6 @@ async fn power_command(args:&[String])->Result<(),String>{
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
let result=viewer::power::run(&mut session,action).await;
session.close().await;
if result.is_ok(){println!("电源指令已发送;未确认远端执行结果。");}
if result.is_ok(){println!("{}",crate::i18n::s("电源指令已发送;未确认远端执行结果。","Power command sent; the result on the remote device is not confirmed."));}
result
}
+85 -8
View File
@@ -199,6 +199,7 @@ pub fn text_probe()->Result<(),String> {
typed+=one;
}
if typed<0 { return Err(format!("Wayland text typing failed ({typed})")); }
std::thread::sleep(std::time::Duration::from_millis(100));
println!("Typed {typed} of {} characters in {} calls; check that they match.",
sequence.chars().filter(|character|*character!='|').count(),sequence.split('|').count());
Ok(())
@@ -209,7 +210,7 @@ pub fn text_probe()->Result<(),String> {
// root to the selected monitor. No compositor layout or user credentials are modified.
#[derive(Clone, Debug)]
pub struct Output { pub name:String, pub width:u32, pub height:u32, pub fps:i32, pub x:i32, pub y:i32 }
struct Inventory { outputs:Vec<Output>, x11:bool }
struct Inventory { outputs:Vec<Output>, x11:bool, portal:bool }
static OUTPUTS: std::sync::OnceLock<Inventory> = std::sync::OnceLock::new();
#[derive(Default)]
struct Selection { id:usize, generation:u64, presented:Option<u64>, failed:bool }
@@ -229,21 +230,54 @@ fn inventory() -> &'static Inventory {
if backend==Some(crate::desktop_backend::DesktopBackend::X11) && !crate::desktop_backend::headless()
&& std::env::var("UU_X11_MULTISCREEN").ok().as_deref()==Some("1") {
let outputs=x11_outputs();
return Inventory {x11:!outputs.is_empty(),outputs};
return Inventory {x11:!outputs.is_empty(),outputs,portal:false};
}
if backend==Some(crate::desktop_backend::DesktopBackend::Portal) && !crate::desktop_backend::headless() {
let outputs=portal_outputs();
return Inventory {portal:!outputs.is_empty(),outputs,x11:false};
}
if !cfg!(all(target_os="linux",feature="wayland"))
|| std::env::var("UU_WAYLAND_MULTISCREEN").ok().as_deref()!=Some("1")
|| backend!=Some(crate::desktop_backend::DesktopBackend::Wayland) {return Inventory {outputs:Vec::new(),x11:false};}
let output=std::process::Command::new("hyprctl").args(["monitors","-j"]).output();
let result=output.map_err(|_|"hyprctl unavailable").and_then(|output| {
if !output.status.success() {return Err("hyprctl failed");}
parse_outputs(&output.stdout,&std::env::var("UU_WAYLAND_OUTPUT").unwrap_or_default())
|| backend!=Some(crate::desktop_backend::DesktopBackend::Wayland) {return Inventory {outputs:Vec::new(),x11:false,portal:false};}
let niri=std::env::var_os("NIRI_SOCKET").is_some();
let output=if niri {std::process::Command::new("niri").args(["msg","--json","outputs"]).output()}
else {std::process::Command::new("hyprctl").args(["monitors","-j"]).output()};
let result=output.map_err(|_|"monitor command unavailable").and_then(|output| {
if !output.status.success() {return Err("monitor command failed");}
let preferred=std::env::var("UU_WAYLAND_OUTPUT").unwrap_or_default();
if niri {parse_niri_outputs(&output.stdout,&preferred)} else {parse_outputs(&output.stdout,&preferred)}
});
let outputs=match result {Ok(outputs)=>outputs,Err(reason)=>{log::warn!("Wayland multi-screen disabled: {}",reason);Vec::new()}};
Inventory {outputs,x11:false}
Inventory {outputs,x11:false,portal:false}
})
}
pub fn outputs() -> &'static [Output] {&inventory().outputs}
/// GNOME portal grants one monitor per consent (multi-select is refused), so each monitor
/// gets its own saved consent and a switch opens that monitor's session. Read once.
fn portal_outputs()->Vec<Output> {
let monitors=crate::portal::monitors();
if monitors.len()<2 {return Vec::new();}
let fps=crate::video::display_fps() as i32;
let mut outputs:Vec<Output>=monitors.iter().map(|m|Output {name:m.connector.clone(),width:m.width,height:m.height,fps,x:m.x,y:m.y}).collect();
// Screen 0 is the one opened first: the monitor whose consent is already saved, else the primary.
let dir=crate::portal::permissions_directory();
let granted=|name:&str|dir.as_deref().is_some_and(|d|d.join(crate::portal::monitor_key(name)).exists());
let primary=monitors.iter().find(|m|m.primary).map(|m|m.connector.clone()).unwrap_or_default();
outputs.sort_by_key(|o|(!granted(&o.name),o.name!=primary,o.x,o.y));
outputs.truncate(16);
log::info!("Portal multi-screen: {} monitors",outputs.len());
outputs
}
/// Connector of the selected screen when the portal advertises several monitors.
pub fn portal_monitor()->Option<String> {
if !inventory().portal {return None;}
source(selected()).map(|o|o.name.clone())
}
/// Monitor at a portal stream's logical position (Mutter logical layout).
pub fn portal_monitor_at(x:i32,y:i32)->Option<String> {
if !inventory().portal {return None;}
outputs().iter().find(|o|(o.x,o.y)==(x,y)).map(|o|o.name.clone())
}
/// X11 monitors are advertised: the stream captures the selected monitor's region of the root.
pub fn x11_multiscreen()->bool {inventory().x11}
/// Read once, like the Hyprland inventory: a changed monitor layout needs a host restart.
@@ -294,6 +328,20 @@ fn parse_x11_monitors(text:&str,preferred:&str,fps:i32)->Result<Vec<Output>,&'st
if outputs.is_empty() || (!preferred.is_empty() && outputs[0].name!=preferred) {return Err("No capturable preferred output");}
Ok(outputs)
}
fn parse_niri_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
let inventory=serde_json::from_slice::<serde_json::Map<String,serde_json::Value>>(json).map_err(|_|"Invalid niri inventory")?;
let monitors:Vec<_>=inventory.values().filter_map(|m| {
let logical=m["logical"].as_object()?;
let mode=m["modes"].as_array()?.get(usize::try_from(m["current_mode"].as_u64()?).ok()?)?;
let transform=logical.get("transform")?.as_str()?;
if !matches!(transform,"Normal"|"90"|"180"|"270") {return None;}
let (w,h)=(mode["width"].as_u64()?,mode["height"].as_u64()?);
let (w,h)=if matches!(transform,"90"|"270") {(h,w)} else {(w,h)};
Some(serde_json::json!({"name":m["name"],"width":w,"height":h,"transform":0,
"refreshRate":mode["refresh_rate"].as_f64()?/1000.0}))
}).collect();
parse_outputs(&serde_json::to_vec(&monitors).map_err(|_|"Invalid niri inventory")?,preferred)
}
fn parse_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
let monitors=serde_json::from_slice::<Vec<serde_json::Value>>(json).map_err(|_|"Invalid monitor inventory")?;
let mut seen=std::collections::HashSet::new();
@@ -353,6 +401,13 @@ pub fn failed(id:usize,generation:u64) {
}
pub fn select(id:usize)->Result<(),String> {
let output=source(id).ok_or("Unknown screen")?;
if inventory().portal {
let mut state=SELECTION.lock().unwrap();
crate::portal::switch_active(&output.name)?;
state.begin(id);
log::info!("Portal screen selected: id={} source={}x{}",id,output.width,output.height);
return Ok(());
}
if x11_multiscreen() {
SELECTION.lock().unwrap().begin(id);
log::info!("X11 screen selected: id={} source={}x{}+{}+{}",id,output.width,output.height,output.x,output.y);
@@ -429,6 +484,28 @@ mod selection_regressions {
s.sent(0,current);assert!(s.ready());
}
#[test]
#[ignore = "requires an unlocked Wayland session and UU_WAYLAND_MULTISCREEN=1"]
fn live_monitor_switch_captures_each_output() {
assert!(outputs().len()>1);
init().unwrap();
for (id,output) in outputs().iter().enumerate() {
select(id).unwrap();
let mut frame=vec![0;(output.width as usize)*(output.height as usize)*4];
capture(&mut frame).unwrap();
assert_eq!(selected(),id);
}
select(0).unwrap();
}
#[test]
fn niri_inventory_uses_active_mode_and_rotated_pixel_size() {
let json=br#"{"one":{"name":"DP-1","modes":[{"width":2240,"height":1400,"refresh_rate":60000}],"current_mode":0,"logical":{"transform":"90"}},
"off":{"name":"off","modes":[],"current_mode":null,"logical":null}}"#;
let outputs=parse_niri_outputs(json,"").unwrap();
assert_eq!((outputs.len(),outputs[0].width,outputs[0].height,outputs[0].fps),(1,1400,2240,60));
assert!(parse_niri_outputs(json,"off").is_err());
assert!(parse_niri_outputs(b"[]","").is_err());
}
#[test]
fn mixed_scale_inventory_preserves_pixel_sizes_and_preferred_output() {
let json=br#"[{"name":"eDP-1","width":1920,"height":1080,"scale":1.3333334,"transform":0,"refreshRate":144},
{"name":"HDMI-A-1","width":2560,"height":1440,"scale":1.25,"transform":0,"refreshRate":75}]"#;
+2 -2
View File
@@ -111,7 +111,7 @@ pub struct WebRtcSession {
/// The role this peer was offered with; `role` also covers a later capture_desktop.
pub desktop: bool,
pub role: Arc<DesktopRole>,
pub controller_mac: bool,
pub controller: crate::input::Controller,
pub context: Arc<Mutex<SessionContext>>,
actions: Arc<crate::system_actions::PeerActions>,
}
@@ -1454,7 +1454,7 @@ impl WebRtcSession {
input,
desktop,
role,
controller_mac: false,
controller: crate::input::Controller::Other,
context,
actions: session_actions,
})
+105
View File
@@ -0,0 +1,105 @@
//! Socket.IO's WebSocket transport uses the same opt-in proxy policy as the REST client.
//! No proxy addresses, room headers, response text or underlying errors are displayed.
use std::time::Duration;
use reqwest::header::{HeaderMap, CONNECTION, UPGRADE, SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_KEY,
SEC_WEBSOCKET_EXTENSIONS, SEC_WEBSOCKET_PROTOCOL};
use tokio_tungstenite::{WebSocketStream, tungstenite::{handshake::{client::Request, derive_accept_key}, protocol::Role}};
pub type Socket = WebSocketStream<reqwest::Upgraded>;
/// Validate configuration rather than let reqwest silently ignore an unsupported proxy URL.
/// Selection/NO_PROXY matching still belongs to reqwest, not a second proxy implementation.
fn validate_proxy_url(value: &str) -> Result<(), &'static str> {
if value.is_empty() { return Ok(()); }
// Match reqwest's system-proxy parser before URL normalization (which would accept
// whitespace/Unicode that http::Uri rejects and the connector would silently ignore).
let uri: tokio_tungstenite::tungstenite::http::Uri = value.parse().map_err(|_| "Invalid signaling proxy configuration")?;
if uri.authority().is_none() { return Err("Invalid signaling proxy configuration"); }
let url = if value.contains("://") { reqwest::Url::parse(value) }
else { reqwest::Url::parse(&format!("http://{value}")) }
.map_err(|_| "Invalid signaling proxy configuration")?;
if !matches!(url.scheme(), "http" | "https") || url.host_str().is_none()
|| url.port_or_known_default().is_none() || url.path() != "/" || url.query().is_some() || url.fragment().is_some() {
return Err("Unsupported signaling proxy configuration (HTTP/HTTPS only)");
}
Ok(())
}
fn client() -> Result<reqwest::Client, String> {
if crate::auth::proxy_enabled() {
let mut configured = false;
for names in [["HTTP_PROXY", "http_proxy"], ["HTTPS_PROXY", "https_proxy"], ["ALL_PROXY", "all_proxy"]] {
if let Some(value) = names.iter().find_map(std::env::var_os) {
let value = value.to_str().ok_or("Invalid signaling proxy configuration")?;
validate_proxy_url(value)?;
configured |= !value.is_empty();
}
}
// reqwest disables environment proxies in CGI contexts; don't silently ignore an opt-in.
if configured && std::env::var_os("REQUEST_METHOD").is_some() {
return Err("Signaling environment proxies are disabled in CGI contexts".into());
}
}
crate::auth::http_client_builder().http1_only().redirect(reqwest::redirect::Policy::none())
.retry(reqwest::retry::never()).build().map_err(|_| "Signaling HTTP client setup failed".into())
}
pub async fn connect(request: Request, timeout: Duration) -> Result<Socket, String> {
let client = client()?;
match tokio::time::timeout(timeout, connect_with_client(&client, request)).await {
Ok(result) => result,
Err(_) => Err("WS connect failed: timeout".into()),
}
}
async fn connect_with_client(client: &reqwest::Client, request: Request) -> Result<Socket, String> {
let (mut parts, _) = request.into_parts();
if parts.method != reqwest::Method::GET || parts.headers.contains_key(SEC_WEBSOCKET_EXTENSIONS)
|| parts.headers.contains_key(SEC_WEBSOCKET_PROTOCOL) || parts.headers.contains_key("proxy-authorization") {
return Err("Unsupported signaling WebSocket request".into());
}
let mut url = reqwest::Url::parse(&parts.uri.to_string()).map_err(|_| "Invalid signaling endpoint")?;
if !url.username().is_empty() || url.password().is_some() || url.fragment().is_some() {
return Err("Invalid signaling endpoint".into());
}
let scheme = match url.scheme() { "ws" => "http", "wss" => "https", _ => return Err("Unsupported signaling endpoint scheme".into()) };
url.set_scheme(scheme).map_err(|_| "Invalid signaling endpoint")?;
let key = parts.headers.get(SEC_WEBSOCKET_KEY).ok_or("Missing WebSocket handshake key")?;
let accept = derive_accept_key(key.as_bytes());
for name in ["x-nrd-auth", "authorization", "cookie"] {
if let Some(value) = parts.headers.get_mut(name) { value.set_sensitive(true); }
}
// reqwest owns DNS/TCP/proxy CONNECT/TLS. No custom relay, direct fallback or redirect.
let response = client.get(url).version(reqwest::Version::HTTP_11).headers(parts.headers).send().await
.map_err(|e| if e.is_timeout() { "WS connect failed: timeout" } else if e.is_connect() { "WS connect failed: connection" } else { "WS connect failed: request" })?;
if response.status() != reqwest::StatusCode::SWITCHING_PROTOCOLS {
return Err(format!("WS upgrade refused: http_status={}", response.status().as_u16()));
}
verify_upgrade(response.version(), response.headers(), &accept)?;
let stream = response.upgrade().await.map_err(|_| "WS upgrade failed")?;
Ok(WebSocketStream::from_raw_socket(stream, Role::Client, None).await)
}
/// RFC 6455 §4.1: validate before handing upgraded bytes to the frame codec. Socket.IO
/// requests no extensions/subprotocols. Unlike a generic HTTP client we never follow redirects.
fn verify_upgrade(version: reqwest::Version, headers: &HeaderMap, accept: &str) -> Result<(), &'static str> {
let single = |name: reqwest::header::HeaderName| {
let mut values = headers.get_all(name).iter();
let value = values.next()?.to_str().ok()?;
values.next().is_none().then_some(value)
};
let connection_upgrade = headers.get_all(CONNECTION).iter().all(|value| value.to_str().is_ok())
&& headers.get_all(CONNECTION).iter().any(|value|
value.to_str().is_ok_and(|value| value.split(',').any(|token| token.trim().eq_ignore_ascii_case("upgrade"))));
if version != reqwest::Version::HTTP_11 || !connection_upgrade
|| !single(UPGRADE).is_some_and(|v| v.eq_ignore_ascii_case("websocket"))
|| single(SEC_WEBSOCKET_ACCEPT) != Some(accept)
|| headers.contains_key(SEC_WEBSOCKET_EXTENSIONS) || headers.contains_key(SEC_WEBSOCKET_PROTOCOL) {
return Err("Invalid signaling WebSocket upgrade response");
}
Ok(())
}
#[cfg(test)]
#[path = "ws_transport_tests.rs"]
mod tests;
+245
View File
@@ -0,0 +1,245 @@
use super::*;
use futures_util::{SinkExt, StreamExt};
use tokio::{io::{AsyncRead, AsyncReadExt, AsyncWriteExt}, net::{TcpListener, TcpStream}};
use tokio_tungstenite::tungstenite::{client::IntoClientRequest, Message};
fn request(url: &str) -> Request {
let mut request = url.into_client_request().unwrap();
request.headers_mut().insert("x-nrd-auth", "fixture-room-secret".parse().unwrap());
request
}
fn test_client() -> reqwest::ClientBuilder {
reqwest::Client::builder().no_proxy().http1_only()
.redirect(reqwest::redirect::Policy::none()).retry(reqwest::retry::never())
}
async fn read_headers<S: AsyncRead + Unpin>(socket: &mut S) -> String {
let mut bytes = Vec::new();
while !bytes.ends_with(b"\r\n\r\n") {
let mut byte = [0];
socket.read_exact(&mut byte).await.unwrap();
bytes.push(byte[0]);
assert!(bytes.len() < 16384);
}
String::from_utf8(bytes).unwrap()
}
fn header<'a>(request: &'a str, name: &str) -> Option<&'a str> {
request.lines().filter_map(|line| line.split_once(':'))
.find(|(key, _)| key.eq_ignore_ascii_case(name)).map(|(_, value)| value.trim())
}
async fn accept_upgrade(listener: TcpListener, proxy: bool) -> TcpStream {
let (mut socket, _) = listener.accept().await.unwrap();
let received = read_headers(&mut socket).await;
assert!(received.starts_with(if proxy { "GET http://" } else { "GET /" }));
assert!(header(&received, "x-nrd-auth") == Some("fixture-room-secret"));
if !proxy { assert!(header(&received, "proxy-authorization").is_none()); }
let accept = derive_accept_key(header(&received, "sec-websocket-key").unwrap().as_bytes());
let mut response = format!("HTTP/1.1 101 Switching Protocols\r\nConnection: keep-alive, Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Accept: {accept}\r\n\r\n").into_bytes();
// The first Engine.IO frame shares a single write with the HTTP response.
response.extend_from_slice(&[0x81, 3, b'0', b'{', b'}']);
socket.write_all(&response).await.unwrap();
socket
}
async fn no_connection(listener: &TcpListener) {
assert!(tokio::time::timeout(Duration::from_millis(150), listener.accept()).await.is_err());
}
#[test]
fn strict_upgrade_validation_accepts_tokens_and_rejects_unsolicited_or_ambiguous_headers() {
let mut headers = HeaderMap::new();
headers.insert(CONNECTION, "keep-alive, Upgrade".parse().unwrap());
headers.insert(UPGRADE, "WebSocket".parse().unwrap());
headers.insert(SEC_WEBSOCKET_ACCEPT, "fixture-accept".parse().unwrap());
assert!(verify_upgrade(reqwest::Version::HTTP_11, &headers, "fixture-accept").is_ok());
headers.append(CONNECTION, "keep-alive".parse().unwrap());
assert!(verify_upgrade(reqwest::Version::HTTP_11, &headers, "fixture-accept").is_ok());
assert!(verify_upgrade(reqwest::Version::HTTP_2, &headers, "fixture-accept").is_err());
assert!(verify_upgrade(reqwest::Version::HTTP_11, &headers, "wrong").is_err());
for name in [CONNECTION, UPGRADE, SEC_WEBSOCKET_ACCEPT] {
let mut missing = headers.clone(); missing.remove(name);
assert!(verify_upgrade(reqwest::Version::HTTP_11, &missing, "fixture-accept").is_err());
}
for name in [UPGRADE, SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_EXTENSIONS, SEC_WEBSOCKET_PROTOCOL] {
let mut invalid = headers.clone(); invalid.append(name, "fixture-server-secret".parse().unwrap());
let error = verify_upgrade(reqwest::Version::HTTP_11, &invalid, "fixture-accept").unwrap_err();
assert!(!error.contains("fixture"));
}
}
#[test]
fn proxy_configuration_errors_never_echo_proxy_values() {
for proxy in ["", "127.0.0.1:3128", "http://127.0.0.1:3128", "https://fixture-user:[email protected]:3128"] {
assert!(validate_proxy_url(proxy).is_ok());
}
for proxy in ["socks5://fixture-user:[email protected]:3128", "http://127.0.0.1:3128/?fixture-token", "http://127.0.0.1:3128/#fixture-token", "http://127.0.0.1:3128/fixture-secret", "http://[fixture-invalid", " http://127.0.0.1:3128", "http://127.0.0.1:3128 ", "http://例子.invalid:3128"] {
let error = validate_proxy_url(proxy).unwrap_err();
assert!(!error.contains("fixture"));
assert!(!error.contains("127.0.0.1"));
}
}
#[tokio::test]
async fn upgrade_keeps_prefetched_frame_and_does_not_limit_socket_lifetime() {
let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
let url = format!("ws://{}/socket.io/?fixture-query-secret", listener.local_addr().unwrap());
let server = tokio::spawn(async move {
let socket = accept_upgrade(listener, false).await;
let mut socket = WebSocketStream::from_raw_socket(socket, Role::Server, None).await;
tokio::time::sleep(Duration::from_millis(1200)).await;
assert!(matches!(socket.next().await, Some(Ok(Message::Text(value))) if value == "fixture-client-frame"));
socket.send(Message::Text("fixture-late-frame".into())).await.unwrap();
});
let http = test_client().build().unwrap();
let mut socket = tokio::time::timeout(Duration::from_secs(1), connect_with_client(&http, request(&url))).await.unwrap().unwrap();
assert!(matches!(socket.next().await, Some(Ok(Message::Text(value))) if value == "0{}"));
// A one-second establishment deadline must not remain attached to the upgraded stream.
tokio::time::sleep(Duration::from_millis(1300)).await;
socket.send(Message::Text("fixture-client-frame".into())).await.unwrap();
let message = tokio::time::timeout(Duration::from_secs(3), socket.next()).await.unwrap();
assert!(matches!(message, Some(Ok(Message::Text(value))) if value == "fixture-late-frame"));
server.await.unwrap();
}
#[tokio::test]
async fn proxy_refusal_never_falls_back_to_origin_or_echoes_server_content() {
let origin = TcpListener::bind("127.0.0.1:0").await.unwrap();
let proxy = TcpListener::bind("127.0.0.1:0").await.unwrap();
let proxy_url = format!("http://{}", proxy.local_addr().unwrap());
let server = tokio::spawn(async move {
let (mut socket, _) = proxy.accept().await.unwrap();
let received = read_headers(&mut socket).await;
assert!(received.starts_with("GET http://"));
assert!(header(&received, "proxy-authorization").is_some());
socket.write_all(b"HTTP/1.1 407 Proxy Authentication Required\r\nContent-Length: 19\r\n\r\nfixture-body-secret").await.unwrap();
});
let proxy = reqwest::Proxy::all(proxy_url).unwrap().basic_auth("fixture-user", "fixture-proxy-secret");
let http = test_client().proxy(proxy).build().unwrap();
let result = tokio::time::timeout(Duration::from_secs(5),
connect_with_client(&http, request(&format!("ws://{}/fixture-path-secret", origin.local_addr().unwrap()))))
.await.expect("proxy refusal must not wait on a fallback origin");
let error = result.err().expect("proxy refusal must fail");
assert!(error.contains("407")); assert!(!error.contains("fixture"));
no_connection(&origin).await;
server.await.unwrap();
}
#[tokio::test]
async fn redirects_are_not_followed_with_room_credentials() {
let origin = TcpListener::bind("127.0.0.1:0").await.unwrap();
let destination = TcpListener::bind("127.0.0.1:0").await.unwrap();
let url = format!("ws://{}/socket.io/", origin.local_addr().unwrap());
let location = format!("http://{}/fixture-redirect-secret", destination.local_addr().unwrap());
let server = tokio::spawn(async move {
let (mut socket, _) = origin.accept().await.unwrap();
let _ = read_headers(&mut socket).await;
socket.write_all(format!("HTTP/1.1 302 Found\r\nLocation: {location}\r\nContent-Length: 0\r\n\r\n").as_bytes()).await.unwrap();
});
let result = tokio::time::timeout(Duration::from_secs(5),
connect_with_client(&test_client().build().unwrap(), request(&url)))
.await.expect("redirect must not wait on its destination");
let error = result.err().expect("redirect must fail");
assert!(error.contains("302")); assert!(!error.contains("fixture"));
no_connection(&destination).await;
server.await.unwrap();
}
// No global environment mutation: the subprocess has only synthetic loopback configuration.
#[test]
fn environment_policy_probe() {
let Ok(url) = std::env::var("UU_WS_TEST_ENDPOINT") else { return; };
assert!(url.starts_with("ws://127.0.0.1:"));
let runtime = tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap();
runtime.block_on(async {
let mut socket = connect(request(&url), Duration::from_secs(5)).await.expect("fixture connection failed");
let message = tokio::time::timeout(Duration::from_secs(3), socket.next()).await.unwrap();
assert!(matches!(message, Some(Ok(Message::Text(value))) if value == "0{}"));
});
}
#[tokio::test]
async fn environment_proxy_opt_in_and_no_proxy_match_rest_policy() {
for (opt_in, bypass, via_proxy) in [(false, false, false), (true, false, true), (true, true, false)] {
let origin = TcpListener::bind("127.0.0.1:0").await.unwrap();
let proxy = TcpListener::bind("127.0.0.1:0").await.unwrap();
let url = format!("ws://{}/socket.io/", origin.local_addr().unwrap());
let proxy_url = format!("http://fixture-user:fixture-proxy-secret@{}", proxy.local_addr().unwrap());
let (selected, unused) = if via_proxy { (proxy, origin) } else { (origin, proxy) };
let server = tokio::spawn(async move { let _socket = accept_upgrade(selected, via_proxy).await; });
let mut child = tokio::process::Command::new(std::env::current_exe().unwrap());
child.args(["--exact", "ws_transport::tests::environment_policy_probe", "--nocapture"])
.env_clear().env("UU_WS_TEST_ENDPOINT", url).env("HTTP_PROXY", proxy_url);
if opt_in { child.env("UU_USE_PROXY", "1"); }
if bypass { child.env("NO_PROXY", "127.0.0.1"); }
let output = tokio::time::timeout(Duration::from_secs(10), child.output()).await.unwrap().unwrap();
assert!(output.status.success(), "isolated proxy-policy subprocess failed");
assert!(!output.stdout.windows(b"fixture-room-secret".len()).any(|s| s == b"fixture-room-secret"));
assert!(!output.stderr.windows(b"fixture-proxy-secret".len()).any(|s| s == b"fixture-proxy-secret"));
no_connection(&unused).await;
server.await.unwrap();
}
}
#[tokio::test]
async fn wss_connect_keeps_origin_auth_inside_tls_and_requires_trusted_certificate() {
use std::sync::Arc;
use tokio_rustls::{rustls, TlsAcceptor};
use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
// A fresh test certificate/key, kept only in memory. The mock does not relay anywhere:
// it accepts CONNECT and then speaks TLS + WebSocket on that same loopback socket.
let cert = rcgen::generate_simple_self_signed(vec!["localhost".into()]).unwrap();
let cert_der = cert.serialize_der().unwrap();
let root = reqwest::Certificate::from_der(&cert_der).unwrap();
let config = rustls::ServerConfig::builder_with_provider(Arc::new(rustls::crypto::ring::default_provider()))
.with_safe_default_protocol_versions().unwrap().with_no_client_auth()
.with_single_cert(vec![CertificateDer::from(cert_der)],
PrivateKeyDer::Pkcs8(PrivatePkcs8KeyDer::from(cert.serialize_private_key_der()))).unwrap();
let acceptor = TlsAcceptor::from(Arc::new(config));
for trusted in [false, true] {
let origin = TcpListener::bind("127.0.0.1:0").await.unwrap();
let proxy = TcpListener::bind("127.0.0.1:0").await.unwrap();
let port = origin.local_addr().unwrap().port();
let proxy_url = format!("http://{}", proxy.local_addr().unwrap());
let acceptor = acceptor.clone();
let server = tokio::spawn(async move {
let (mut socket, _) = proxy.accept().await.unwrap();
let received = read_headers(&mut socket).await;
assert!(received.starts_with(&format!("CONNECT localhost:{port} HTTP/1.1\r\n")));
assert!(header(&received, "x-nrd-auth").is_none());
assert!(header(&received, "proxy-authorization").is_some());
assert!(!received.contains("fixture-room-secret"));
socket.write_all(b"HTTP/1.1 200 Connection Established\r\n\r\n").await.unwrap();
let tls = acceptor.accept(socket).await;
if !trusted { assert!(tls.is_err()); return; }
let mut tls = tls.expect("fixture TLS handshake failed");
let received = read_headers(&mut tls).await;
assert!(received.starts_with("GET /socket.io/"));
assert!(header(&received, "x-nrd-auth") == Some("fixture-room-secret"));
assert!(header(&received, "proxy-authorization").is_none());
assert!(!received.contains("fixture-proxy-secret"));
let accept = derive_accept_key(header(&received, "sec-websocket-key").unwrap().as_bytes());
let mut response = format!("HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Accept: {accept}\r\n\r\n").into_bytes();
response.extend_from_slice(&[0x81, 3, b'0', b'{', b'}']);
tls.write_all(&response).await.unwrap();
});
let proxy = reqwest::Proxy::all(proxy_url).unwrap().basic_auth("fixture-user", "fixture-proxy-secret");
let mut builder = test_client().proxy(proxy);
if trusted { builder = builder.add_root_certificate(root.clone()); }
let client = builder.build().unwrap();
let result = tokio::time::timeout(Duration::from_secs(5),
connect_with_client(&client, request(&format!("wss://localhost:{port}/socket.io/?fixture-query-secret")))).await.unwrap();
if trusted {
let mut socket = result.expect("trusted fixture WebSocket failed");
let message = tokio::time::timeout(Duration::from_secs(3), socket.next()).await.unwrap();
assert!(matches!(message, Some(Ok(Message::Text(value))) if value == "0{}"));
} else {
let error = result.err().expect("untrusted fixture certificate must fail");
assert!(!error.contains("fixture")); assert!(!error.contains("localhost"));
}
no_connection(&origin).await;
tokio::time::timeout(Duration::from_secs(5), server).await.unwrap().unwrap();
}
}
+34
View File
@@ -0,0 +1,34 @@
# Requires an unlocked niri session; opens a fullscreen test window and moves the pointer.
# UU_TEST_OUTPUT selects the output. UU_TEST_ENGINE is the built libuu-wayland.so.
import os,json,subprocess,ctypes,gi
os.environ['UU_WAYLAND_OUTPUT']=os.environ['UU_TEST_OUTPUT']
gi.require_version('Gtk','3.0');from gi.repository import Gtk,Gdk,GLib
inv=json.loads(subprocess.check_output(['niri','msg','-j','outputs']))
out=next(o for o in inv.values() if o['name']==os.environ['UU_TEST_OUTPUT']);geo=out['logical'];d=Gdk.Display.get_default()
monitor=next(i for i in range(d.get_n_monitors()) if (d.get_monitor(i).get_geometry().x,d.get_monitor(i).get_geometry().y)==(geo['x'],geo['y']))
w=Gtk.Window(title='UU pointer acceptance');box=Gtk.EventBox();box.set_above_child(True);grid=Gtk.Grid();grid.set_row_homogeneous(True);grid.set_column_homogeneous(True)
for i,color in enumerate(['red','lime','blue','yellow']):
cell=Gtk.EventBox();rgba=Gdk.RGBA();rgba.parse(color);cell.override_background_color(Gtk.StateFlags.NORMAL,rgba);grid.attach(cell,i%2,i//2,1,1)
box.add(grid);w.add(box);box.add_events(Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.ENTER_NOTIFY_MASK)
positions=[];box.connect('motion-notify-event',lambda widget,e:positions.append((e.x,e.y)) or False)
box.connect('enter-notify-event',lambda widget,e:positions.append((e.x,e.y)) or False)
w.fullscreen_on_monitor(w.get_screen(),monitor);w.show_all()
lib=ctypes.CDLL(os.environ['UU_TEST_ENGINE']);width=ctypes.c_int();height=ctypes.c_int();points=iter([(0.2,0.2),(0.8,0.2),(0.8,0.8),(0.2,0.8),(0.5,0.5)]);passed=[];image_matches=0
def step():
try:x,y=next(points)
except StopIteration:print('pointer_points_passed=',sum(passed),'total=',len(passed),'points=',passed,flush=True);Gtk.main_quit();return False
positions.clear();assert lib.uu_wl_move(int(x*width.value),int(y*height.value),0)==0
def check():
size=box.get_allocation();matched=any(abs(px-x*size.width)<4 and abs(py-y*size.height)<4 for px,py in positions);passed.append(matched);GLib.timeout_add(100,step);return False
GLib.timeout_add(150,check);return False
def start():
global image_matches
assert lib.uu_wl_init(ctypes.byref(width),ctypes.byref(height))==0
frame=(ctypes.c_ubyte*(width.value*height.value*4))();assert lib.uu_wl_capture(frame,len(frame))==0
for (x,y),(r,g,b) in zip([(0.25,0.25),(0.75,0.25),(0.25,0.75),(0.75,0.75)],[(255,0,0),(0,255,0),(0,0,255),(255,255,0)]):
at=(int(y*height.value)*width.value+int(x*width.value))*4
image_matches+=abs(frame[at]-b)<10 and abs(frame[at+1]-g)<10 and abs(frame[at+2]-r)<10
print('rotation_color_checks=',image_matches,'of=4',flush=True)
step();return False
GLib.timeout_add(1500,start);GLib.timeout_add(10000,lambda:(Gtk.main_quit(),False)[1]);Gtk.main()
raise SystemExit(0 if len(passed)==5 and all(passed) and image_matches==4 else 1)
+25
View File
@@ -0,0 +1,25 @@
# Run with /usr/bin/python, UU_TEST_BIN set to the test binary, and GDK_BACKEND=x11 or wayland.
# Opens and focuses a dedicated entry; only the built-in sample is injected.
import os
os.environ["GTK_IM_MODULE"]="gtk-im-context-simple"
import gi,subprocess,threading
gi.require_version('Gtk','3.0')
from gi.repository import Gtk,GLib
events=[]
passed=False
expected=os.environ.get("UU_PROBE_SEQUENCE","abc你好XYZ").replace("|","")
w=Gtk.Window(title='UU input acceptance'); e=Gtk.Entry();w.add(e);w.show_all();e.grab_focus();w.present();e.connect("key-press-event",lambda widget,event:events.append(event.keyval) and False)
def start():
if "UU input acceptance" not in subprocess.check_output(["niri","msg","-j","focused-window"],text=True):
Gtk.main_quit();return False
def run():
r=subprocess.run([os.environ.get('UU_TEST_BIN',os.path.expanduser('~/.local/bin/uuremote-server')),'wayland-text-probe'],env={**os.environ,'UU_PROBE_TEXT':'abc你好XYZ'},stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
GLib.timeout_add(1000,finish,r.returncode)
threading.Thread(target=run).start();return False
def finish(code):
global passed
passed=code==0 and e.get_text()==expected
print('probe_exit=',code,'matches=',e.get_text()==expected,'received_chars=',len(e.get_text()),'key_events=',len(events),flush=True);Gtk.main_quit();return False
GLib.timeout_add(1500,start);GLib.timeout_add(15000,lambda:(Gtk.main_quit(),False)[1]);Gtk.main()
raise SystemExit(0 if passed else 1)
+63 -2
View File
@@ -23,7 +23,7 @@ static GVariant *test_call_with_unix_fd_list_sync(GDBusConnection *connection,
#define CAP_MASK (EI_DEVICE_CAP_POINTER | EI_DEVICE_CAP_POINTER_ABSOLUTE | \
EI_DEVICE_CAP_BUTTON | EI_DEVICE_CAP_SCROLL | EI_DEVICE_CAP_KEYBOARD)
#define EVENT_CAP_MASK (EIS_DEVICE_CAP_POINTER | EIS_DEVICE_CAP_POINTER_ABSOLUTE | \
EIS_DEVICE_CAP_BUTTON | EIS_DEVICE_CAP_SCROLL | EIS_DEVICE_CAP_KEYBOARD)
EIS_DEVICE_CAP_BUTTON | EIS_DEVICE_CAP_SCROLL | EIS_DEVICE_CAP_KEYBOARD | EIS_DEVICE_CAP_TOUCH)
static const unsigned capabilities[] = {
EIS_DEVICE_CAP_POINTER,
@@ -31,6 +31,7 @@ static const unsigned capabilities[] = {
EIS_DEVICE_CAP_BUTTON,
EIS_DEVICE_CAP_SCROLL,
EIS_DEVICE_CAP_KEYBOARD,
EIS_DEVICE_CAP_TOUCH,
};
struct received {
@@ -166,7 +167,9 @@ static void handle_server_events(struct harness *h) {
h->stops++;
} else if (type == EIS_EVENT_POINTER_MOTION || type == EIS_EVENT_POINTER_MOTION_ABSOLUTE ||
type == EIS_EVENT_BUTTON_BUTTON || type == EIS_EVENT_SCROLL_DISCRETE ||
type == EIS_EVENT_KEYBOARD_KEY) {
type == EIS_EVENT_KEYBOARD_KEY || type == EIS_EVENT_TOUCH_DOWN ||
type == EIS_EVENT_TOUCH_MOTION || type == EIS_EVENT_TOUCH_UP ||
type == EIS_EVENT_SCROLL_DELTA || type == EIS_EVENT_SCROLL_STOP) {
assert(h->n_events < sizeof(h->events) / sizeof(h->events[0]));
struct received *got = &h->events[h->n_events++];
got->type = type;
@@ -187,6 +190,15 @@ static void handle_server_events(struct harness *h) {
got->dx = eis_event_scroll_get_discrete_dx(event);
got->dy = eis_event_scroll_get_discrete_dy(event);
break;
case EIS_EVENT_SCROLL_DELTA:
got->x = eis_event_scroll_get_dx(event);
got->y = eis_event_scroll_get_dy(event);
break;
case EIS_EVENT_TOUCH_DOWN:
case EIS_EVENT_TOUCH_MOTION:
got->x = eis_event_touch_get_x(event);
got->y = eis_event_touch_get_y(event);
break;
case EIS_EVENT_KEYBOARD_KEY:
got->code = eis_event_keyboard_get_key(event);
got->pressed = eis_event_keyboard_get_key_is_press(event);
@@ -255,6 +267,15 @@ static void wait_for_input(struct harness *h) {
assert(h->frames > 0);
}
static int input_within(struct harness *h, gint64 microseconds) {
gint64 deadline = g_get_monotonic_time() + microseconds;
while (!h->n_events && g_get_monotonic_time() < deadline) {
pump(h);
g_usleep(1000);
}
return h->n_events > 0;
}
static void pause_resume(struct harness *h) {
/* libeis 1.5 pauses only a resumed device; pause while emulating is a
* no-op. End the client transaction before exercising pause/resume. */
@@ -295,6 +316,7 @@ static void run_geometry(const struct geometry *geometry) {
h.portal->mapping_id = g_strdup("synthetic-screen");
h.portal->session = strdup("/synthetic/session");
h.portal->absolute_stream_pixels = 1;
h.portal->devices = 7;
h.server = eis_new(NULL);
assert(h.server && eis_setup_backend_fd(h.server) == 0);
@@ -380,6 +402,45 @@ static void run_geometry(const struct geometry *geometry) {
assert(h.events[0].type == EIS_EVENT_SCROLL_DISCRETE);
assert(h.events[0].dx == 0 && h.events[0].dy == -120);
/* Smooth scroll maps like relative motion; finish ends the gesture with a scroll stop. */
clear_events(&h);
assert(uu_portal_scroll(h.portal, geometry->width / 8.0, -(double)geometry->height / 8.0, 1) == 0);
wait_for_input(&h);
assert(h.events[0].type == EIS_EVENT_SCROLL_DELTA);
assert(fabs(h.events[0].x - geometry->logical_width / 8.0) < 0.001 && fabs(h.events[0].y + geometry->logical_height / 8.0) < 0.001);
for (gint64 until = g_get_monotonic_time() + 300000; h.n_events < 2 && g_get_monotonic_time() < until; g_usleep(1000)) pump(&h);
assert(h.n_events == 2 && h.events[1].type == EIS_EVENT_SCROLL_STOP);
/* A touch drag lands in the stream's region; motion without a finger down is refused. */
assert(uu_portal_touch(h.portal, 1, 1, 1) == 11);
clear_events(&h);
unsigned diagnostics = h.diagnostics;
assert(uu_portal_touch(h.portal, 0, geometry->width / 2.0, geometry->height / 2.0) == 0);
if (!input_within(&h, 300000)) {
/* libei before 1.3.0 accepts a touch only inside every region of the device (later:
* any region). This device also has a region for another screen, so an older library
* rejects the point with a client-bug diagnostic; a real one-stream session has one region. */
assert(h.diagnostics > diagnostics);
assert(uu_portal_touch(h.portal, 2, 0, 0) == 0 && !h.portal->ei_touch);
h.diagnostics = diagnostics; /* expected: the rejected touch and its release */
goto touched;
}
assert(h.events[0].type == EIS_EVENT_TOUCH_DOWN);
assert(h.events[0].x == geometry->x + geometry->logical_width / 2.0);
assert(h.events[0].y == geometry->y + geometry->logical_height / 2.0);
clear_events(&h);
assert(uu_portal_touch(h.portal, 1, 0, 0) == 0);
wait_for_input(&h);
assert(h.events[0].type == EIS_EVENT_TOUCH_MOTION);
assert(h.events[0].x == geometry->x && h.events[0].y == geometry->y);
assert(uu_portal_touch(h.portal, 1, geometry->width, 0) == 11);
clear_events(&h);
assert(uu_portal_touch(h.portal, 2, 0, 0) == 0);
wait_for_input(&h);
assert(h.events[0].type == EIS_EVENT_TOUCH_UP && !h.portal->ei_touch);
assert(uu_portal_touch(h.portal, 2, 0, 0) == 0);
touched:;
uint8_t storage[256];
struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(storage, sizeof(storage));
const struct spa_pod *format = spa_format_video_raw_build(&builder, SPA_PARAM_Format,
+45 -1
View File
@@ -18,6 +18,7 @@ enum response_mode { UNKNOWN_METHOD, NOT_SUPPORTED, TEMPORARY_FAILURE, NO_FDS, B
static enum response_mode mode;
static unsigned connects, legacy_calls;
static double last_x, last_y;
static int last_finish;
static GVariant *test_call(GDBusConnection *bus, const gchar *dest, const gchar *path,
const gchar *interface, const gchar *method, GVariant *parameters,
@@ -26,7 +27,24 @@ static GVariant *test_call(GDBusConnection *bus, const gchar *dest, const gchar
assert(!strcmp(interface, REMOTE));
assert(!strcmp(method, "NotifyKeyboardKeysym") || !strcmp(method, "NotifyPointerButton") ||
!strcmp(method, "NotifyPointerAxisDiscrete") || !strcmp(method, "NotifyPointerMotion") ||
!strcmp(method, "NotifyPointerMotionAbsolute"));
!strcmp(method, "NotifyPointerMotionAbsolute") || !strcmp(method, "NotifyTouchDown") ||
!strcmp(method, "NotifyTouchMotion") || !strcmp(method, "NotifyTouchUp") || !strcmp(method, "NotifyPointerAxis"));
if (!strcmp(method, "NotifyPointerAxis")) {
assert(g_variant_is_of_type(parameters, G_VARIANT_TYPE("(oa{sv}dd)")));
GVariant *options = g_variant_get_child_value(parameters, 1);
GVariant *x = g_variant_get_child_value(parameters, 2), *y = g_variant_get_child_value(parameters, 3);
last_x = g_variant_get_double(x); last_y = g_variant_get_double(y);
gboolean finish = FALSE; last_finish = g_variant_lookup(options, "finish", "b", &finish) && finish;
g_variant_unref(options); g_variant_unref(x); g_variant_unref(y);
}
if (!strcmp(method, "NotifyTouchDown") || !strcmp(method, "NotifyTouchMotion")) {
assert(g_variant_is_of_type(parameters, G_VARIANT_TYPE("(oa{sv}uudd)")));
GVariant *x = g_variant_get_child_value(parameters, 4);
GVariant *y = g_variant_get_child_value(parameters, 5);
last_x = g_variant_get_double(x); last_y = g_variant_get_double(y);
g_variant_unref(x); g_variant_unref(y);
}
if (!strcmp(method, "NotifyTouchUp")) assert(g_variant_is_of_type(parameters, G_VARIANT_TYPE("(oa{sv}u)")));
if (!strcmp(method, "NotifyPointerMotion") || !strcmp(method, "NotifyPointerMotionAbsolute")) {
unsigned offset = !strcmp(method, "NotifyPointerMotion") ? 2 : 3;
GVariant *x = g_variant_get_child_value(parameters, offset);
@@ -93,6 +111,28 @@ static void legacy_input(struct uu_portal *p) {
assert(legacy_calls == 7 && uu_portal_alive(p) && !p->ei);
}
/* Smooth scroll maps like relative motion; only the last event of a gesture carries "finish". */
static void legacy_scroll(struct uu_portal *p) {
unsigned before = legacy_calls;
assert(uu_portal_scroll(p, 20, -40, 0) == 0);
assert(last_x == 20. * p->logical_width / p->width && last_y == -40. * p->logical_height / p->height && !last_finish);
assert(uu_portal_scroll(p, 0, 0, 1) == 0 && last_finish && last_x == 0 && last_y == 0);
assert(uu_portal_scroll(p, NAN, 0, 0) == 11 && legacy_calls == before + 2);
}
/* Touch needs the granted touchscreen type and uses the same stream mapping as absolute motion. */
static void legacy_touch(struct uu_portal *p) {
p->devices = 3;
assert(uu_portal_touch(p, 0, 10, 10) == 11 && legacy_calls == 7);
p->devices = 7;
assert(uu_portal_touch(p, 0, 1920, 1080) == 0);
assert(last_x == (p->absolute_stream_pixels ? 1920 : 960));
assert(last_y == (p->absolute_stream_pixels ? 1080 : 540));
assert(uu_portal_touch(p, 1, 3840, 0) == 11);
assert(uu_portal_touch(p, 1, 0, 0) == 0 && last_x == 0 && last_y == 0);
assert(uu_portal_touch(p, 2, 0, 0) == 0);
assert(legacy_calls == 10 && !p->ei);
}
int main(void) {
struct uu_portal *p = session(1, 1, 0);
legacy_input(p);
@@ -107,10 +147,14 @@ int main(void) {
}
p = session(0, 1, 1); /* Unscaled GNOME keeps Notify*. */
legacy_input(p);
legacy_touch(p);
legacy_scroll(p);
assert(!connects);
uu_portal_close(p);
p = session(1, 0, 1); /* KDE keeps its compositor-logical mapping. */
legacy_input(p);
legacy_touch(p);
legacy_scroll(p);
assert(!connects);
uu_portal_close(p);
+19
View File
@@ -0,0 +1,19 @@
#include <assert.h>
#include "../c_engine/wayland_transform.h"
int main(void) {
assert(uu_output_transform_supported(0,0));
for(int t=1;t<=3;t++) {
assert(!uu_output_transform_supported(t,0));
assert(uu_output_transform_supported(t,1));
}
assert(!uu_output_transform_supported(4,1));
assert(!uu_output_transform_supported(-1,1));
const unsigned expected[4][6]={{0,1,2,3,4,5},{3,0,4,1,5,2},{5,4,3,2,1,0},{2,5,1,4,0,3}};
for(int t=0;t<4;t++) {
unsigned dw=t&1?2:3,dh=t&1?3:2;
for(unsigned y=0;y<dh;y++) for(unsigned x=0;x<dw;x++) {
uint32_t sx,sy;uu_source_pixel(t,3,2,x,y,&sx,&sy);
assert(sx<3 && sy<2 && sy*3+sx==expected[t][y*dw+x]);
}
}
}
+11
View File
@@ -0,0 +1,11 @@
# Generated by Cargo
# will have compiled files and executables
/target/
/.idea/
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock
# These are backup files generated by rustfmt
**/*.rs.bk
+49
View File
@@ -0,0 +1,49 @@
# webrtc-ice changelog
## Unreleased
### Breaking changes
* remove non used `MulticastDnsMode::Unspecified` variant [#404](https://github.com/webrtc-rs/webrtc/pull/404):
## v0.9.0
* Increased minimum support rust version to `1.60.0`.
### Breaking changes
* Make functions non-async [#338](https://github.com/webrtc-rs/webrtc/pull/338):
- `Agent`:
- `get_bytes_received`;
- `get_bytes_sent`;
- `on_connection_state_change`;
- `on_selected_candidate_pair_change`;
- `on_candidate`;
- `add_remote_candidate`;
- `gather_candidates`.
- `unmarshal_candidate`;
- `CandidateHostConfig::new_candidate_host`;
- `CandidatePeerReflexiveConfig::new_candidate_peer_reflexive`;
- `CandidateRelayConfig::new_candidate_relay`;
- `CandidateServerReflexiveConfig::new_candidate_server_reflexive`;
- `Candidate`:
- `addr`;
- `set_ip`.
## v0.8.2
* Add IP filter to ICE `AgentConfig` [#306](https://github.com/webrtc-rs/webrtc/pull/306) and [#318](https://github.com/webrtc-rs/webrtc/pull/318).
* Add `rust-version` at 1.57.0 to `Cargo.toml`. This was already the minimum version so does not constitute a change.
## v0.8.1
This release was released in error and contains no changes from 0.8.0.
## v0.8.0
* Increased min version of `log` dependency to `0.4.16`. [#250 Fix log at ^0.4.16 to make tests compile](https://github.com/webrtc-rs/webrtc/pull/250) by [@k0nserv](https://github.com/k0nserv).
* Increased serde's minimum version to 1.0.102 [#243 Fixes for cargo minimal-versions](https://github.com/webrtc-rs/webrtc/pull/243) contributed by [algesten](https://github.com/algesten)
## Prior to 0.8.0
Before 0.8.0 there was no changelog, previous changes are sometimes, but not always, available in the [GitHub Releases](https://github.com/webrtc-rs/ice/releases).
+125
View File
@@ -0,0 +1,125 @@
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
#
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
# to registry (e.g., crates.io) dependencies.
#
# If you are reading this file be aware that the original Cargo.toml
# will likely look very different (and much more reasonable).
# See Cargo.toml.orig for the original contents.
[package]
edition = "2021"
name = "webrtc-ice"
version = "0.10.1"
authors = ["Rain Liu <[email protected]>"]
description = "A pure Rust implementation of ICE"
homepage = "https://webrtc.rs"
documentation = "https://docs.rs/webrtc-ice"
readme = "README.md"
license = "MIT OR Apache-2.0"
repository = "https://github.com/webrtc-rs/ice"
[[example]]
name = "ping_pong"
path = "examples/ping_pong.rs"
bench = false
[dependencies.arc-swap]
version = "1"
[dependencies.async-trait]
version = "0.1"
[dependencies.crc]
version = "3"
[dependencies.log]
version = "0.4"
[dependencies.mdns]
version = "0.6.1"
package = "webrtc-mdns"
[dependencies.rand]
version = "0.8"
[dependencies.rustls-native-certs]
version = "0.8"
[dependencies.serde]
version = "1"
features = ["derive"]
[dependencies.serde_json]
version = "1"
[dependencies.stun]
version = "0.5.1"
[dependencies.thiserror]
version = "1"
[dependencies.tokio]
version = "1.32.0"
features = ["full"]
[dependencies.tokio-rustls]
version = "0.26.6"
default-features = false
features = ["ring", "tls12"]
[dependencies.turn]
version = "0.7.1"
[dependencies.url]
version = "2"
[dependencies.util]
version = "0.8.1"
features = [
"conn",
"vnet",
"sync",
]
default-features = false
package = "webrtc-util"
[dependencies.uuid]
version = "1"
features = ["v4"]
[dependencies.waitgroup]
version = "0.1"
[dependencies.webpki-roots]
version = "1"
[dev-dependencies.chrono]
version = "0.4.28"
[dev-dependencies.clap]
version = "3"
[dev-dependencies.env_logger]
version = "0.10"
[dev-dependencies.hyper]
version = "0.14.27"
features = ["full"]
[dev-dependencies.ipnet]
version = "2"
[dev-dependencies.lazy_static]
version = "1"
[dev-dependencies.regex]
version = "1.9.5"
[dev-dependencies.sha1]
version = "0.10"
[dev-dependencies.tokio-test]
version = "0.4"
+45
View File
@@ -0,0 +1,45 @@
[package]
name = "webrtc-ice"
version = "0.10.1"
authors = ["Rain Liu <[email protected]>"]
edition = "2021"
description = "A pure Rust implementation of ICE"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/webrtc-ice"
homepage = "https://webrtc.rs"
repository = "https://github.com/webrtc-rs/ice"
[dependencies]
util = { version = "0.8.1", path = "../util", package = "webrtc-util", default-features = false, features = ["conn", "vnet", "sync"] }
turn = { version = "0.7.1", path = "../turn" }
stun = { version = "0.5.1", path = "../stun" }
mdns = { version = "0.6.1", path = "../mdns", package = "webrtc-mdns" }
arc-swap = "1"
async-trait = "0.1"
crc = "3"
log = "0.4"
rand = "0.8"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
thiserror = "1"
tokio = { version = "1.32.0", features = ["full"] }
url = "2"
uuid = { version = "1", features = ["v4"] }
waitgroup = "0.1"
[dev-dependencies]
tokio-test = "0.4"
regex = "1.9.5"
env_logger = "0.10"
chrono = "0.4.28"
ipnet = "2"
clap = "3"
lazy_static = "1"
hyper = { version = "0.14.27", features = ["full"] }
sha1 = "0.10"
[[example]]
name = "ping_pong"
path = "examples/ping_pong.rs"
bench = false
+201
View File
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+21
View File
@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2021 WebRTC.rs
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+30
View File
@@ -0,0 +1,30 @@
# Local patch to webrtc-ice 0.10.1
Source: crates.io webrtc-ice 0.10.1 (MIT / Apache-2.0; upstream licenses retained).
Upstream gathers relay candidates only for `turn:` over UDP and logs "Unable to handle URL" for
`turn:?transport=tcp` and `turns:`. NetEase sessions that force relaying also offer
`turns:<host>:<port>?transport=tcp`, which is the only media path on hosts whose UDP cannot reach
the TURN servers but whose TCP goes through an HTTP proxy.
`src/agent/turn_tcp.rs` opens TCP (directly, or through an HTTP CONNECT proxy set by the
application with `set_relay_transport`), adds TLS for `turns:`, and exposes the stream to the
unchanged `turn` client as datagrams: one STUN message or ChannelData frame (with its 4-byte TCP
padding) per read. `agent_gather.rs` uses it for `ProtoType::Tcp` URLs. UDP gathering is unchanged.
TLS trusts the system certificate store (`rustls-native-certs`, as OpenSSL does) plus the bundled
Mozilla roots. A name mismatch is accepted only when the TURN URL is an IP literal.
## Round-trip time
Upstream never measures it: `CandidatePairStats::current_round_trip_time` is always 0. A successful
binding response now records `now - request timestamp` on its candidate pair, and the stats report
the latest sample. Keepalive pings only an idle pair, which a streaming session never is, so the
selected pair is also pinged when its last sample is older than the keepalive interval (a binding
request, like a consent check from RFC 7675).
The host (`uuremote-server`) uses the same crate, so on the selected pair it also sends one
binding request per keepalive interval (2 s) while media flows. Checked on the host side with the
official Android client controlling a Linux host (GNOME, cloud ICE servers incl. TURN) over repeated
sessions: the client answers every request and sessions stay up. Official Windows/macOS controllers
have not been tried against the host yet.
+30
View File
@@ -0,0 +1,30 @@
<h1 align="center">
<a href="https://webrtc.rs"><img src="./doc/webrtc.rs.png" alt="WebRTC.rs"></a>
<br>
</h1>
<p align="center">
<a href="https://github.com/webrtc-rs/ice/actions">
<img src="https://github.com/webrtc-rs/ice/workflows/cargo/badge.svg">
</a>
<a href="https://codecov.io/gh/webrtc-rs/ice">
<img src="https://codecov.io/gh/webrtc-rs/ice/branch/main/graph/badge.svg">
</a>
<a href="https://deps.rs/repo/github/webrtc-rs/ice">
<img src="https://deps.rs/repo/github/webrtc-rs/ice/status.svg">
</a>
<a href="https://crates.io/crates/webrtc-ice">
<img src="https://img.shields.io/crates/v/webrtc-ice.svg">
</a>
<a href="https://docs.rs/webrtc-ice">
<img src="https://docs.rs/webrtc-ice/badge.svg">
</a>
<a href="https://doc.rust-lang.org/1.6.0/complement-project-faq.html#why-dual-mitasl2-license">
<img src="https://img.shields.io/badge/license-MIT%2FApache--2.0-blue" alt="License: MIT/Apache 2.0">
</a>
<a href="https://discord.gg/4Ju8UHdXMs">
<img src="https://img.shields.io/discord/800204819540869120?logo=discord" alt="Discord">
</a>
</p>
<p align="center">
A pure Rust implementation of ICE. Rewrite <a href="https://github.com/pion/ice/releases/tag/v2.0.14">Pion</a> ICE in Rust
</p>
+23
View File
@@ -0,0 +1,23 @@
codecov:
require_ci_to_pass: yes
max_report_age: off
token: 4bd5cec1-2807-4cd6-8430-d5f3efe32ce0
coverage:
precision: 2
round: down
range: 50..90
status:
project:
default:
enabled: no
threshold: 0.2
if_not_found: success
patch:
default:
enabled: no
if_not_found: success
changes:
default:
enabled: no
if_not_found: success
Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

+424
View File
@@ -0,0 +1,424 @@
use std::io;
use std::sync::Arc;
use std::time::Duration;
use clap::{App, AppSettings, Arg};
use hyper::service::{make_service_fn, service_fn};
use hyper::{Body, Client, Method, Request, Response, Server, StatusCode};
use ice::agent::agent_config::AgentConfig;
use ice::agent::Agent;
use ice::candidate::candidate_base::*;
use ice::candidate::*;
use ice::network_type::*;
use ice::state::*;
use ice::udp_network::UDPNetwork;
use ice::Error;
use rand::{thread_rng, Rng};
use tokio::net::UdpSocket;
use tokio::sync::{mpsc, watch, Mutex};
use util::Conn;
use webrtc_ice as ice;
#[macro_use]
extern crate lazy_static;
type SenderType = Arc<Mutex<mpsc::Sender<String>>>;
type ReceiverType = Arc<Mutex<mpsc::Receiver<String>>>;
lazy_static! {
// ErrUnknownType indicates an error with Unknown info.
static ref REMOTE_AUTH_CHANNEL: (SenderType, ReceiverType ) = {
let (tx, rx) = mpsc::channel::<String>(3);
(Arc::new(Mutex::new(tx)), Arc::new(Mutex::new(rx)))
};
static ref REMOTE_CAND_CHANNEL: (SenderType, ReceiverType) = {
let (tx, rx) = mpsc::channel::<String>(10);
(Arc::new(Mutex::new(tx)), Arc::new(Mutex::new(rx)))
};
}
// HTTP Listener to get ICE Credentials/Candidate from remote Peer
async fn remote_handler(req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
//println!("received {:?}", req);
match (req.method(), req.uri().path()) {
(&Method::POST, "/remoteAuth") => {
let full_body =
match std::str::from_utf8(&hyper::body::to_bytes(req.into_body()).await?) {
Ok(s) => s.to_owned(),
Err(err) => panic!("{}", err),
};
let tx = REMOTE_AUTH_CHANNEL.0.lock().await;
//println!("body: {:?}", full_body);
let _ = tx.send(full_body).await;
let mut response = Response::new(Body::empty());
*response.status_mut() = StatusCode::OK;
Ok(response)
}
(&Method::POST, "/remoteCandidate") => {
let full_body =
match std::str::from_utf8(&hyper::body::to_bytes(req.into_body()).await?) {
Ok(s) => s.to_owned(),
Err(err) => panic!("{}", err),
};
let tx = REMOTE_CAND_CHANNEL.0.lock().await;
//println!("body: {:?}", full_body);
let _ = tx.send(full_body).await;
let mut response = Response::new(Body::empty());
*response.status_mut() = StatusCode::OK;
Ok(response)
}
// Return the 404 Not Found for other routes.
_ => {
let mut not_found = Response::default();
*not_found.status_mut() = StatusCode::NOT_FOUND;
Ok(not_found)
}
}
}
// Controlled Agent:
// cargo run --color=always --package webrtc-ice --example ping_pong
// Controlling Agent:
// cargo run --color=always --package webrtc-ice --example ping_pong -- --controlling
#[tokio::main]
async fn main() -> Result<(), Error> {
env_logger::init();
// .format(|buf, record| {
// writeln!(
// buf,
// "{}:{} [{}] {} - {}",
// record.file().unwrap_or("unknown"),
// record.line().unwrap_or(0),
// record.level(),
// chrono::Local::now().format("%H:%M:%S.%6f"),
// record.args()
// )
// })
// .filter(None, log::LevelFilter::Trace)
// .init();
let mut app = App::new("ICE Demo")
.version("0.1.0")
.author("Rain Liu <[email protected]>")
.about("An example of ICE")
.setting(AppSettings::DeriveDisplayOrder)
.setting(AppSettings::SubcommandsNegateReqs)
.arg(
Arg::with_name("use-mux")
.takes_value(false)
.long("use-mux")
.short('m')
.help("Use a muxed UDP connection over a single listening port"),
)
.arg(
Arg::with_name("FULLHELP")
.help("Prints more detailed help information")
.long("fullhelp"),
)
.arg(
Arg::with_name("controlling")
.takes_value(false)
.long("controlling")
.help("is ICE Agent controlling"),
);
let matches = app.clone().get_matches();
if matches.is_present("FULLHELP") {
app.print_long_help().unwrap();
std::process::exit(0);
}
let is_controlling = matches.is_present("controlling");
let use_mux = matches.is_present("use-mux");
let (local_http_port, remote_http_port) = if is_controlling {
(9000, 9001)
} else {
(9001, 9000)
};
let (weak_conn, weak_agent) = {
let (done_tx, done_rx) = watch::channel(());
println!("Listening on http://localhost:{local_http_port}");
let mut done_http_server = done_rx.clone();
tokio::spawn(async move {
let addr = ([0, 0, 0, 0], local_http_port).into();
let service =
make_service_fn(|_| async { Ok::<_, hyper::Error>(service_fn(remote_handler)) });
let server = Server::bind(&addr).serve(service);
tokio::select! {
_ = done_http_server.changed() => {
println!("receive cancel http server!");
}
result = server => {
// Run this server for... forever!
if let Err(e) = result {
eprintln!("server error: {e}");
}
println!("exit http server!");
}
};
});
if is_controlling {
println!("Local Agent is controlling");
} else {
println!("Local Agent is controlled");
};
println!("Press 'Enter' when both processes have started");
let mut input = String::new();
let _ = io::stdin().read_line(&mut input)?;
let udp_network = if use_mux {
use ice::udp_mux::*;
let port = if is_controlling { 4000 } else { 4001 };
let udp_socket = UdpSocket::bind(("0.0.0.0", port)).await?;
let udp_mux = UDPMuxDefault::new(UDPMuxParams::new(udp_socket));
UDPNetwork::Muxed(udp_mux)
} else {
UDPNetwork::Ephemeral(Default::default())
};
let ice_agent = Arc::new(
Agent::new(AgentConfig {
network_types: vec![NetworkType::Udp4],
udp_network,
..Default::default()
})
.await?,
);
let client = Arc::new(Client::new());
// When we have gathered a new ICE Candidate send it to the remote peer
let client2 = Arc::clone(&client);
ice_agent.on_candidate(Box::new(
move |c: Option<Arc<dyn Candidate + Send + Sync>>| {
let client3 = Arc::clone(&client2);
Box::pin(async move {
if let Some(c) = c {
println!("posting remoteCandidate with {}", c.marshal());
let req = match Request::builder()
.method(Method::POST)
.uri(format!(
"http://localhost:{remote_http_port}/remoteCandidate"
))
.body(Body::from(c.marshal()))
{
Ok(req) => req,
Err(err) => {
println!("{err}");
return;
}
};
let resp = match client3.request(req).await {
Ok(resp) => resp,
Err(err) => {
println!("{err}");
return;
}
};
println!("Response from remoteCandidate: {}", resp.status());
}
})
},
));
let (ice_done_tx, mut ice_done_rx) = mpsc::channel::<()>(1);
// When ICE Connection state has change print to stdout
ice_agent.on_connection_state_change(Box::new(move |c: ConnectionState| {
println!("ICE Connection State has changed: {c}");
if c == ConnectionState::Failed {
let _ = ice_done_tx.try_send(());
}
Box::pin(async move {})
}));
// Get the local auth details and send to remote peer
let (local_ufrag, local_pwd) = ice_agent.get_local_user_credentials().await;
println!("posting remoteAuth with {local_ufrag}:{local_pwd}");
let req = match Request::builder()
.method(Method::POST)
.uri(format!("http://localhost:{remote_http_port}/remoteAuth"))
.body(Body::from(format!("{local_ufrag}:{local_pwd}")))
{
Ok(req) => req,
Err(err) => return Err(Error::Other(format!("{err}"))),
};
let resp = match client.request(req).await {
Ok(resp) => resp,
Err(err) => return Err(Error::Other(format!("{err}"))),
};
println!("Response from remoteAuth: {}", resp.status());
let (remote_ufrag, remote_pwd) = {
let mut rx = REMOTE_AUTH_CHANNEL.1.lock().await;
if let Some(s) = rx.recv().await {
println!("received: {s}");
let fields: Vec<String> = s.split(':').map(|s| s.to_string()).collect();
(fields[0].clone(), fields[1].clone())
} else {
panic!("rx.recv() empty");
}
};
println!("remote_ufrag: {remote_ufrag}, remote_pwd: {remote_pwd}");
let ice_agent2 = Arc::clone(&ice_agent);
let mut done_cand = done_rx.clone();
tokio::spawn(async move {
let mut rx = REMOTE_CAND_CHANNEL.1.lock().await;
loop {
tokio::select! {
_ = done_cand.changed() => {
println!("receive cancel remote cand!");
break;
}
result = rx.recv() => {
if let Some(s) = result {
if let Ok(c) = unmarshal_candidate(&s) {
println!("add_remote_candidate: {c}");
let c: Arc<dyn Candidate + Send + Sync> = Arc::new(c);
let _ = ice_agent2.add_remote_candidate(&c);
}else{
println!("unmarshal_candidate error!");
break;
}
}else{
println!("REMOTE_CAND_CHANNEL done!");
break;
}
}
};
}
});
ice_agent.gather_candidates()?;
println!("Connecting...");
let (_cancel_tx, cancel_rx) = mpsc::channel(1);
// Start the ICE Agent. One side must be controlled, and the other must be controlling
let conn: Arc<dyn Conn + Send + Sync> = if is_controlling {
ice_agent.dial(cancel_rx, remote_ufrag, remote_pwd).await?
} else {
ice_agent
.accept(cancel_rx, remote_ufrag, remote_pwd)
.await?
};
let weak_conn = Arc::downgrade(&conn);
// Send messages in a loop to the remote peer
let conn_tx = Arc::clone(&conn);
let mut done_send = done_rx.clone();
tokio::spawn(async move {
const RANDOM_STRING: &[u8] = b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
loop {
tokio::time::sleep(Duration::from_secs(3)).await;
let val: String = (0..15)
.map(|_| {
let idx = thread_rng().gen_range(0..RANDOM_STRING.len());
RANDOM_STRING[idx] as char
})
.collect();
tokio::select! {
_ = done_send.changed() => {
println!("receive cancel ice send!");
break;
}
result = conn_tx.send(val.as_bytes()) => {
if let Err(err) = result {
eprintln!("conn_tx send error: {err}");
break;
}else{
println!("Sent: '{val}'");
}
}
};
}
});
let mut done_recv = done_rx.clone();
tokio::spawn(async move {
// Receive messages in a loop from the remote peer
let mut buf = vec![0u8; 1500];
loop {
tokio::select! {
_ = done_recv.changed() => {
println!("receive cancel ice recv!");
break;
}
result = conn.recv(&mut buf) => {
match result {
Ok(n) => {
println!("Received: '{}'", std::str::from_utf8(&buf[..n]).unwrap());
}
Err(err) => {
eprintln!("conn_tx send error: {err}");
break;
}
};
}
};
}
});
println!("Press ctrl-c to stop");
/*let d = if is_controlling {
Duration::from_secs(500)
} else {
Duration::from_secs(5)
};
let timeout = tokio::time::sleep(d);
tokio::pin!(timeout);*/
tokio::select! {
/*_ = timeout.as_mut() => {
println!("received timeout signal!");
let _ = done_tx.send(());
}*/
_ = ice_done_rx.recv() => {
println!("ice_done_rx");
let _ = done_tx.send(());
}
_ = tokio::signal::ctrl_c() => {
println!();
let _ = done_tx.send(());
}
};
let _ = ice_agent.close().await;
(weak_conn, Arc::downgrade(&ice_agent))
};
let mut int = tokio::time::interval(Duration::from_secs(1));
loop {
int.tick().await;
println!(
"weak_conn: weak count = {}, strong count = {}, weak_agent: weak count = {}, strong count = {}",
weak_conn.weak_count(),
weak_conn.strong_count(),
weak_agent.weak_count(),
weak_agent.strong_count(),
);
if weak_conn.strong_count() == 0 && weak_agent.strong_count() == 0 {
break;
}
}
Ok(())
}
+255
View File
@@ -0,0 +1,255 @@
use std::net::IpAddr;
use std::time::Duration;
use util::vnet::net::*;
use super::*;
use crate::error::*;
use crate::mdns::*;
use crate::network_type::*;
use crate::udp_network::UDPNetwork;
use crate::url::*;
/// The interval at which the agent performs candidate checks in the connecting phase.
pub(crate) const DEFAULT_CHECK_INTERVAL: Duration = Duration::from_millis(200);
/// The interval used to keep candidates alive.
pub(crate) const DEFAULT_KEEPALIVE_INTERVAL: Duration = Duration::from_secs(2);
/// The default time till an Agent transitions disconnected.
pub(crate) const DEFAULT_DISCONNECTED_TIMEOUT: Duration = Duration::from_secs(5);
/// The default time till an Agent transitions to failed after disconnected.
pub(crate) const DEFAULT_FAILED_TIMEOUT: Duration = Duration::from_secs(25);
/// Wait time before nominating a host candidate.
pub(crate) const DEFAULT_HOST_ACCEPTANCE_MIN_WAIT: Duration = Duration::from_secs(0);
/// Wait time before nominating a srflx candidate.
pub(crate) const DEFAULT_SRFLX_ACCEPTANCE_MIN_WAIT: Duration = Duration::from_millis(500);
/// Wait time before nominating a prflx candidate.
pub(crate) const DEFAULT_PRFLX_ACCEPTANCE_MIN_WAIT: Duration = Duration::from_millis(1000);
/// Wait time before nominating a relay candidate.
pub(crate) const DEFAULT_RELAY_ACCEPTANCE_MIN_WAIT: Duration = Duration::from_millis(2000);
/// Max binding request before considering a pair failed.
pub(crate) const DEFAULT_MAX_BINDING_REQUESTS: u16 = 7;
/// The number of bytes that can be buffered before we start to error.
pub(crate) const MAX_BUFFER_SIZE: usize = 1000 * 1000; // 1MB
/// Wait time before binding requests can be deleted.
pub(crate) const MAX_BINDING_REQUEST_TIMEOUT: Duration = Duration::from_millis(4000);
pub(crate) fn default_candidate_types() -> Vec<CandidateType> {
vec![
CandidateType::Host,
CandidateType::ServerReflexive,
CandidateType::Relay,
]
}
pub type InterfaceFilterFn = Box<dyn (Fn(&str) -> bool) + Send + Sync>;
pub type IpFilterFn = Box<dyn (Fn(IpAddr) -> bool) + Send + Sync>;
/// Collects the arguments to `ice::Agent` construction into a single structure, for
/// future-proofness of the interface.
#[derive(Default)]
pub struct AgentConfig {
pub urls: Vec<Url>,
/// Controls how the UDP network stack works.
/// See [`UDPNetwork`]
pub udp_network: UDPNetwork,
/// It is used to perform connectivity checks. The values MUST be unguessable, with at least
/// 128 bits of random number generator output used to generate the password, and at least 24
/// bits of output to generate the username fragment.
pub local_ufrag: String,
/// It is used to perform connectivity checks. The values MUST be unguessable, with at least
/// 128 bits of random number generator output used to generate the password, and at least 24
/// bits of output to generate the username fragment.
pub local_pwd: String,
/// Controls mDNS behavior for the ICE agent.
pub multicast_dns_mode: MulticastDnsMode,
/// Controls the hostname for this agent. If none is specified a random one will be generated.
pub multicast_dns_host_name: String,
/// Control mDNS destination address
pub multicast_dns_dest_addr: String,
/// Defaults to 5 seconds when this property is nil.
/// If the duration is 0, the ICE Agent will never go to disconnected.
pub disconnected_timeout: Option<Duration>,
/// Defaults to 25 seconds when this property is nil.
/// If the duration is 0, we will never go to failed.
pub failed_timeout: Option<Duration>,
/// Determines how often should we send ICE keepalives (should be less then connectiontimeout
/// above) when this is nil, it defaults to 10 seconds.
/// A keepalive interval of 0 means we never send keepalive packets
pub keepalive_interval: Option<Duration>,
/// An optional configuration for disabling or enabling support for specific network types.
pub network_types: Vec<NetworkType>,
/// An optional configuration for disabling or enabling support for specific candidate types.
pub candidate_types: Vec<CandidateType>,
//LoggerFactory logging.LoggerFactory
/// Controls how often our internal task loop runs when in the connecting state.
/// Only useful for testing.
pub check_interval: Duration,
/// The max amount of binding requests the agent will send over a candidate pair for validation
/// or nomination, if after max_binding_requests the candidate is yet to answer a binding
/// request or a nomination we set the pair as failed.
pub max_binding_requests: Option<u16>,
pub is_controlling: bool,
/// lite agents do not perform connectivity check and only provide host candidates.
pub lite: bool,
/// It is used along with nat1to1ips to specify which candidate type the 1:1 NAT IP addresses
/// should be mapped to. If unspecified or CandidateTypeHost, nat1to1ips are used to replace
/// host candidate IPs. If CandidateTypeServerReflexive, it will insert a srflx candidate (as
/// if it was derived from a STUN server) with its port number being the one for the actual host
/// candidate. Other values will result in an error.
pub nat_1to1_ip_candidate_type: CandidateType,
/// Contains a list of public IP addresses that are to be used as a host candidate or srflx
/// candidate. This is used typically for servers that are behind 1:1 D-NAT (e.g. AWS EC2
/// instances) and to eliminate the need of server reflexisive candidate gathering.
pub nat_1to1_ips: Vec<String>,
/// Specify a minimum wait time before selecting host candidates.
pub host_acceptance_min_wait: Option<Duration>,
/// Specify a minimum wait time before selecting srflx candidates.
pub srflx_acceptance_min_wait: Option<Duration>,
/// Specify a minimum wait time before selecting prflx candidates.
pub prflx_acceptance_min_wait: Option<Duration>,
/// Specify a minimum wait time before selecting relay candidates.
pub relay_acceptance_min_wait: Option<Duration>,
/// Net is the our abstracted network interface for internal development purpose only
/// (see (github.com/pion/transport/vnet)[github.com/pion/transport/vnet]).
pub net: Option<Arc<Net>>,
/// A function that you can use in order to whitelist or blacklist the interfaces which are
/// used to gather ICE candidates.
pub interface_filter: Arc<Option<InterfaceFilterFn>>,
/// A function that you can use in order to whitelist or blacklist
/// the ips which are used to gather ICE candidates.
pub ip_filter: Arc<Option<IpFilterFn>>,
/// Controls if self-signed certificates are accepted when connecting to TURN servers via TLS or
/// DTLS.
pub insecure_skip_verify: bool,
}
impl AgentConfig {
/// Populates an agent and falls back to defaults if fields are unset.
pub(crate) fn init_with_defaults(&self, a: &mut AgentInternal) {
if let Some(max_binding_requests) = self.max_binding_requests {
a.max_binding_requests = max_binding_requests;
} else {
a.max_binding_requests = DEFAULT_MAX_BINDING_REQUESTS;
}
if let Some(host_acceptance_min_wait) = self.host_acceptance_min_wait {
a.host_acceptance_min_wait = host_acceptance_min_wait;
} else {
a.host_acceptance_min_wait = DEFAULT_HOST_ACCEPTANCE_MIN_WAIT;
}
if let Some(srflx_acceptance_min_wait) = self.srflx_acceptance_min_wait {
a.srflx_acceptance_min_wait = srflx_acceptance_min_wait;
} else {
a.srflx_acceptance_min_wait = DEFAULT_SRFLX_ACCEPTANCE_MIN_WAIT;
}
if let Some(prflx_acceptance_min_wait) = self.prflx_acceptance_min_wait {
a.prflx_acceptance_min_wait = prflx_acceptance_min_wait;
} else {
a.prflx_acceptance_min_wait = DEFAULT_PRFLX_ACCEPTANCE_MIN_WAIT;
}
if let Some(relay_acceptance_min_wait) = self.relay_acceptance_min_wait {
a.relay_acceptance_min_wait = relay_acceptance_min_wait;
} else {
a.relay_acceptance_min_wait = DEFAULT_RELAY_ACCEPTANCE_MIN_WAIT;
}
if let Some(disconnected_timeout) = self.disconnected_timeout {
a.disconnected_timeout = disconnected_timeout;
} else {
a.disconnected_timeout = DEFAULT_DISCONNECTED_TIMEOUT;
}
if let Some(failed_timeout) = self.failed_timeout {
a.failed_timeout = failed_timeout;
} else {
a.failed_timeout = DEFAULT_FAILED_TIMEOUT;
}
if let Some(keepalive_interval) = self.keepalive_interval {
a.keepalive_interval = keepalive_interval;
} else {
a.keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL;
}
if self.check_interval == Duration::from_secs(0) {
a.check_interval = DEFAULT_CHECK_INTERVAL;
} else {
a.check_interval = self.check_interval;
}
}
pub(crate) fn init_ext_ip_mapping(
&self,
mdns_mode: MulticastDnsMode,
candidate_types: &[CandidateType],
) -> Result<Option<ExternalIpMapper>> {
if let Some(ext_ip_mapper) =
ExternalIpMapper::new(self.nat_1to1_ip_candidate_type, &self.nat_1to1_ips)?
{
if ext_ip_mapper.candidate_type == CandidateType::Host {
if mdns_mode == MulticastDnsMode::QueryAndGather {
return Err(Error::ErrMulticastDnsWithNat1to1IpMapping);
}
let mut candi_host_enabled = false;
for candi_type in candidate_types {
if *candi_type == CandidateType::Host {
candi_host_enabled = true;
break;
}
}
if !candi_host_enabled {
return Err(Error::ErrIneffectiveNat1to1IpMappingHost);
}
} else if ext_ip_mapper.candidate_type == CandidateType::ServerReflexive {
let mut candi_srflx_enabled = false;
for candi_type in candidate_types {
if *candi_type == CandidateType::ServerReflexive {
candi_srflx_enabled = true;
break;
}
}
if !candi_srflx_enabled {
return Err(Error::ErrIneffectiveNat1to1IpMappingSrflx);
}
}
Ok(Some(ext_ip_mapper))
} else {
Ok(None)
}
}
}
+911
View File
@@ -0,0 +1,911 @@
use std::net::{Ipv4Addr, Ipv6Addr};
use std::str::FromStr;
use std::sync::Arc;
use util::vnet::net::*;
use util::Conn;
use waitgroup::WaitGroup;
use super::*;
use crate::candidate::candidate_base::CandidateBaseConfig;
use crate::candidate::candidate_host::CandidateHostConfig;
use crate::candidate::candidate_relay::CandidateRelayConfig;
use crate::candidate::candidate_server_reflexive::CandidateServerReflexiveConfig;
use crate::candidate::*;
use crate::error::*;
use crate::network_type::*;
use crate::udp_network::UDPNetwork;
use crate::url::{ProtoType, SchemeType, Url};
use crate::util::*;
const STUN_GATHER_TIMEOUT: Duration = Duration::from_secs(5);
pub(crate) struct GatherCandidatesInternalParams {
pub(crate) udp_network: UDPNetwork,
pub(crate) candidate_types: Vec<CandidateType>,
pub(crate) urls: Vec<Url>,
pub(crate) network_types: Vec<NetworkType>,
pub(crate) mdns_mode: MulticastDnsMode,
pub(crate) mdns_name: String,
pub(crate) net: Arc<Net>,
pub(crate) interface_filter: Arc<Option<InterfaceFilterFn>>,
pub(crate) ip_filter: Arc<Option<IpFilterFn>>,
pub(crate) ext_ip_mapper: Arc<Option<ExternalIpMapper>>,
pub(crate) agent_internal: Arc<AgentInternal>,
pub(crate) gathering_state: Arc<AtomicU8>,
pub(crate) chan_candidate_tx: ChanCandidateTx,
}
struct GatherCandidatesLocalParams {
udp_network: UDPNetwork,
network_types: Vec<NetworkType>,
mdns_mode: MulticastDnsMode,
mdns_name: String,
interface_filter: Arc<Option<InterfaceFilterFn>>,
ip_filter: Arc<Option<IpFilterFn>>,
ext_ip_mapper: Arc<Option<ExternalIpMapper>>,
net: Arc<Net>,
agent_internal: Arc<AgentInternal>,
}
struct GatherCandidatesLocalUDPMuxParams {
network_types: Vec<NetworkType>,
interface_filter: Arc<Option<InterfaceFilterFn>>,
ip_filter: Arc<Option<IpFilterFn>>,
ext_ip_mapper: Arc<Option<ExternalIpMapper>>,
net: Arc<Net>,
agent_internal: Arc<AgentInternal>,
udp_mux: Arc<dyn UDPMux + Send + Sync>,
}
struct GatherCandidatesSrflxMappedParasm {
network_types: Vec<NetworkType>,
port_max: u16,
port_min: u16,
ext_ip_mapper: Arc<Option<ExternalIpMapper>>,
net: Arc<Net>,
agent_internal: Arc<AgentInternal>,
}
struct GatherCandidatesSrflxParams {
urls: Vec<Url>,
network_types: Vec<NetworkType>,
port_max: u16,
port_min: u16,
net: Arc<Net>,
agent_internal: Arc<AgentInternal>,
}
impl Agent {
pub(crate) async fn gather_candidates_internal(params: GatherCandidatesInternalParams) {
Self::set_gathering_state(
&params.chan_candidate_tx,
&params.gathering_state,
GatheringState::Gathering,
)
.await;
let wg = WaitGroup::new();
for t in &params.candidate_types {
match t {
CandidateType::Host => {
let local_params = GatherCandidatesLocalParams {
udp_network: params.udp_network.clone(),
network_types: params.network_types.clone(),
mdns_mode: params.mdns_mode,
mdns_name: params.mdns_name.clone(),
interface_filter: Arc::clone(&params.interface_filter),
ip_filter: Arc::clone(&params.ip_filter),
ext_ip_mapper: Arc::clone(&params.ext_ip_mapper),
net: Arc::clone(&params.net),
agent_internal: Arc::clone(&params.agent_internal),
};
let w = wg.worker();
tokio::spawn(async move {
let _d = w;
Self::gather_candidates_local(local_params).await;
});
}
CandidateType::ServerReflexive => {
let ephemeral_config = match &params.udp_network {
UDPNetwork::Ephemeral(e) => e,
// No server reflexive for muxxed connections
UDPNetwork::Muxed(_) => continue,
};
let srflx_params = GatherCandidatesSrflxParams {
urls: params.urls.clone(),
network_types: params.network_types.clone(),
port_max: ephemeral_config.port_max(),
port_min: ephemeral_config.port_min(),
net: Arc::clone(&params.net),
agent_internal: Arc::clone(&params.agent_internal),
};
let w1 = wg.worker();
tokio::spawn(async move {
let _d = w1;
Self::gather_candidates_srflx(srflx_params).await;
});
if let Some(ext_ip_mapper) = &*params.ext_ip_mapper {
if ext_ip_mapper.candidate_type == CandidateType::ServerReflexive {
let srflx_mapped_params = GatherCandidatesSrflxMappedParasm {
network_types: params.network_types.clone(),
port_max: ephemeral_config.port_max(),
port_min: ephemeral_config.port_min(),
ext_ip_mapper: Arc::clone(&params.ext_ip_mapper),
net: Arc::clone(&params.net),
agent_internal: Arc::clone(&params.agent_internal),
};
let w2 = wg.worker();
tokio::spawn(async move {
let _d = w2;
Self::gather_candidates_srflx_mapped(srflx_mapped_params).await;
});
}
}
}
CandidateType::Relay => {
let urls = params.urls.clone();
let net = Arc::clone(&params.net);
let agent_internal = Arc::clone(&params.agent_internal);
let w = wg.worker();
tokio::spawn(async move {
let _d = w;
Self::gather_candidates_relay(urls, net, agent_internal).await;
});
}
_ => {}
}
}
// Block until all STUN and TURN URLs have been gathered (or timed out)
wg.wait().await;
Self::set_gathering_state(
&params.chan_candidate_tx,
&params.gathering_state,
GatheringState::Complete,
)
.await;
}
async fn set_gathering_state(
chan_candidate_tx: &ChanCandidateTx,
gathering_state: &Arc<AtomicU8>,
new_state: GatheringState,
) {
if GatheringState::from(gathering_state.load(Ordering::SeqCst)) != new_state
&& new_state == GatheringState::Complete
{
let cand_tx = chan_candidate_tx.lock().await;
if let Some(tx) = &*cand_tx {
let _ = tx.send(None).await;
}
}
gathering_state.store(new_state as u8, Ordering::SeqCst);
}
async fn gather_candidates_local(params: GatherCandidatesLocalParams) {
let GatherCandidatesLocalParams {
udp_network,
network_types,
mdns_mode,
mdns_name,
interface_filter,
ip_filter,
ext_ip_mapper,
net,
agent_internal,
} = params;
// If we wanna use UDP mux, do so
// FIXME: We still need to support TCP in combination with this option
if let UDPNetwork::Muxed(udp_mux) = udp_network {
let result = Self::gather_candidates_local_udp_mux(GatherCandidatesLocalUDPMuxParams {
network_types,
interface_filter,
ip_filter,
ext_ip_mapper,
net,
agent_internal,
udp_mux,
})
.await;
if let Err(err) = result {
log::error!("Failed to gather local candidates using UDP mux: {}", err);
}
return;
}
let ips = local_interfaces(&net, &interface_filter, &ip_filter, &network_types).await;
for ip in ips {
let mut mapped_ip = ip;
if mdns_mode != MulticastDnsMode::QueryAndGather && ext_ip_mapper.is_some() {
if let Some(ext_ip_mapper2) = ext_ip_mapper.as_ref() {
if ext_ip_mapper2.candidate_type == CandidateType::Host {
if let Ok(mi) = ext_ip_mapper2.find_external_ip(&ip.to_string()) {
mapped_ip = mi;
} else {
log::warn!(
"[{}]: 1:1 NAT mapping is enabled but no external IP is found for {}",
agent_internal.get_name(),
ip
);
}
}
}
}
let address = if mdns_mode == MulticastDnsMode::QueryAndGather {
mdns_name.clone()
} else {
mapped_ip.to_string()
};
//TODO: for network in networks
let network = UDP.to_owned();
if let UDPNetwork::Ephemeral(ephemeral_config) = &udp_network {
/*TODO:switch network {
case tcp:
// Handle ICE TCP passive mode
a.log.Debugf("GetConn by ufrag: %s\n", a.localUfrag)
conn, err = a.tcpMux.GetConnByUfrag(a.localUfrag)
if err != nil {
if !errors.Is(err, ErrTCPMuxNotInitialized) {
a.log.Warnf("error getting tcp conn by ufrag: %s %s %s\n", network, ip, a.localUfrag)
}
continue
}
port = conn.LocalAddr().(*net.TCPAddr).Port
tcpType = TCPTypePassive
// is there a way to verify that the listen address is even
// accessible from the current interface.
case udp:*/
let conn: Arc<dyn Conn + Send + Sync> = match listen_udp_in_port_range(
&net,
ephemeral_config.port_max(),
ephemeral_config.port_min(),
SocketAddr::new(ip, 0),
)
.await
{
Ok(conn) => conn,
Err(err) => {
log::warn!(
"[{}]: could not listen {} {}: {}",
agent_internal.get_name(),
network,
ip,
err
);
continue;
}
};
let port = match conn.local_addr() {
Ok(addr) => addr.port(),
Err(err) => {
log::warn!(
"[{}]: could not get local addr: {}",
agent_internal.get_name(),
err
);
continue;
}
};
let host_config = CandidateHostConfig {
base_config: CandidateBaseConfig {
network: network.clone(),
address,
port,
component: COMPONENT_RTP,
conn: Some(conn),
..CandidateBaseConfig::default()
},
..CandidateHostConfig::default()
};
let candidate: Arc<dyn Candidate + Send + Sync> =
match host_config.new_candidate_host() {
Ok(candidate) => {
if mdns_mode == MulticastDnsMode::QueryAndGather {
if let Err(err) = candidate.set_ip(&ip) {
log::warn!(
"[{}]: Failed to create host candidate: {} {} {}: {:?}",
agent_internal.get_name(),
network,
mapped_ip,
port,
err
);
continue;
}
}
Arc::new(candidate)
}
Err(err) => {
log::warn!(
"[{}]: Failed to create host candidate: {} {} {}: {}",
agent_internal.get_name(),
network,
mapped_ip,
port,
err
);
continue;
}
};
{
if let Err(err) = agent_internal.add_candidate(&candidate).await {
if let Err(close_err) = candidate.close().await {
log::warn!(
"[{}]: Failed to close candidate: {}",
agent_internal.get_name(),
close_err
);
}
log::warn!(
"[{}]: Failed to append to localCandidates and run onCandidateHdlr: {}",
agent_internal.get_name(),
err
);
}
}
}
}
}
async fn gather_candidates_local_udp_mux(
params: GatherCandidatesLocalUDPMuxParams,
) -> Result<()> {
let GatherCandidatesLocalUDPMuxParams {
network_types,
interface_filter,
ip_filter,
ext_ip_mapper,
net,
agent_internal,
udp_mux,
} = params;
// Filter out non UDP network types
let relevant_network_types: Vec<_> =
network_types.into_iter().filter(|n| n.is_udp()).collect();
let udp_mux = Arc::clone(&udp_mux);
let local_ips =
local_interfaces(&net, &interface_filter, &ip_filter, &relevant_network_types).await;
let candidate_ips: Vec<std::net::IpAddr> = ext_ip_mapper
.as_ref() // Arc
.as_ref() // Option
.and_then(|mapper| {
if mapper.candidate_type != CandidateType::Host {
return None;
}
Some(
local_ips
.iter()
.filter_map(|ip| match mapper.find_external_ip(&ip.to_string()) {
Ok(ip) => Some(ip),
Err(err) => {
log::warn!(
"1:1 NAT mapping is enabled but not external IP is found for {}: {}",
ip,
err
);
None
}
})
.collect(),
)
})
.unwrap_or_else(|| local_ips.iter().copied().collect());
if candidate_ips.is_empty() {
return Err(Error::ErrCandidateIpNotFound);
}
let ufrag = {
let ufrag_pwd = agent_internal.ufrag_pwd.lock().await;
ufrag_pwd.local_ufrag.clone()
};
let conn = udp_mux.get_conn(&ufrag).await?;
let port = conn.local_addr()?.port();
for candidate_ip in candidate_ips {
let host_config = CandidateHostConfig {
base_config: CandidateBaseConfig {
network: UDP.to_owned(),
address: candidate_ip.to_string(),
port,
conn: Some(conn.clone()),
component: COMPONENT_RTP,
..Default::default()
},
tcp_type: TcpType::Unspecified,
};
let candidate: Arc<dyn Candidate + Send + Sync> =
Arc::new(host_config.new_candidate_host()?);
agent_internal.add_candidate(&candidate).await?;
}
Ok(())
}
async fn gather_candidates_srflx_mapped(params: GatherCandidatesSrflxMappedParasm) {
let GatherCandidatesSrflxMappedParasm {
network_types,
port_max,
port_min,
ext_ip_mapper,
net,
agent_internal,
} = params;
let wg = WaitGroup::new();
for network_type in network_types {
if network_type.is_tcp() {
continue;
}
let network = network_type.to_string();
let net2 = Arc::clone(&net);
let agent_internal2 = Arc::clone(&agent_internal);
let ext_ip_mapper2 = Arc::clone(&ext_ip_mapper);
let w = wg.worker();
tokio::spawn(async move {
let _d = w;
let conn: Arc<dyn Conn + Send + Sync> = match listen_udp_in_port_range(
&net2,
port_max,
port_min,
if network_type.is_ipv4() {
SocketAddr::new(Ipv4Addr::new(0, 0, 0, 0).into(), 0)
} else {
SocketAddr::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0).into(), 0)
},
)
.await
{
Ok(conn) => conn,
Err(err) => {
log::warn!(
"[{}]: Failed to listen {}: {}",
agent_internal2.get_name(),
network,
err
);
return Ok(());
}
};
let laddr = conn.local_addr()?;
let mapped_ip = {
if let Some(ext_ip_mapper3) = &*ext_ip_mapper2 {
match ext_ip_mapper3.find_external_ip(&laddr.ip().to_string()) {
Ok(ip) => ip,
Err(err) => {
log::warn!(
"[{}]: 1:1 NAT mapping is enabled but no external IP is found for {}: {}",
agent_internal2.get_name(),
laddr,
err
);
return Ok(());
}
}
} else {
log::error!(
"[{}]: ext_ip_mapper is None in gather_candidates_srflx_mapped",
agent_internal2.get_name(),
);
return Ok(());
}
};
let srflx_config = CandidateServerReflexiveConfig {
base_config: CandidateBaseConfig {
network: network.clone(),
address: mapped_ip.to_string(),
port: laddr.port(),
component: COMPONENT_RTP,
conn: Some(conn),
..CandidateBaseConfig::default()
},
rel_addr: laddr.ip().to_string(),
rel_port: laddr.port(),
};
let candidate: Arc<dyn Candidate + Send + Sync> =
match srflx_config.new_candidate_server_reflexive() {
Ok(candidate) => Arc::new(candidate),
Err(err) => {
log::warn!(
"[{}]: Failed to create server reflexive candidate: {} {} {}: {}",
agent_internal2.get_name(),
network,
mapped_ip,
laddr.port(),
err
);
return Ok(());
}
};
{
if let Err(err) = agent_internal2.add_candidate(&candidate).await {
if let Err(close_err) = candidate.close().await {
log::warn!(
"[{}]: Failed to close candidate: {}",
agent_internal2.get_name(),
close_err
);
}
log::warn!(
"[{}]: Failed to append to localCandidates and run onCandidateHdlr: {}",
agent_internal2.get_name(),
err
);
}
}
Result::<()>::Ok(())
});
}
wg.wait().await;
}
async fn gather_candidates_srflx(params: GatherCandidatesSrflxParams) {
let GatherCandidatesSrflxParams {
urls,
network_types,
port_max,
port_min,
net,
agent_internal,
} = params;
let wg = WaitGroup::new();
for network_type in network_types {
if network_type.is_tcp() {
continue;
}
for url in &urls {
let network = network_type.to_string();
let is_ipv4 = network_type.is_ipv4();
let url = url.clone();
let net2 = Arc::clone(&net);
let agent_internal2 = Arc::clone(&agent_internal);
let w = wg.worker();
tokio::spawn(async move {
let _d = w;
let host_port = format!("{}:{}", url.host, url.port);
let server_addr = match net2.resolve_addr(is_ipv4, &host_port).await {
Ok(addr) => addr,
Err(err) => {
log::warn!(
"[{}]: failed to resolve stun host: {}: {}",
agent_internal2.get_name(),
host_port,
err
);
return Ok(());
}
};
let conn: Arc<dyn Conn + Send + Sync> = match listen_udp_in_port_range(
&net2,
port_max,
port_min,
if is_ipv4 {
SocketAddr::new(Ipv4Addr::new(0, 0, 0, 0).into(), 0)
} else {
SocketAddr::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0).into(), 0)
},
)
.await
{
Ok(conn) => conn,
Err(err) => {
log::warn!(
"[{}]: Failed to listen for {}: {}",
agent_internal2.get_name(),
server_addr,
err
);
return Ok(());
}
};
let xoraddr =
match get_xormapped_addr(&conn, server_addr, STUN_GATHER_TIMEOUT).await {
Ok(xoraddr) => xoraddr,
Err(err) => {
log::warn!(
"[{}]: could not get server reflexive address {} {}: {}",
agent_internal2.get_name(),
network,
url,
err
);
return Ok(());
}
};
let (ip, port) = (xoraddr.ip, xoraddr.port);
let laddr = conn.local_addr()?;
let srflx_config = CandidateServerReflexiveConfig {
base_config: CandidateBaseConfig {
network: network.clone(),
address: ip.to_string(),
port,
component: COMPONENT_RTP,
conn: Some(conn),
..CandidateBaseConfig::default()
},
rel_addr: laddr.ip().to_string(),
rel_port: laddr.port(),
};
let candidate: Arc<dyn Candidate + Send + Sync> =
match srflx_config.new_candidate_server_reflexive() {
Ok(candidate) => Arc::new(candidate),
Err(err) => {
log::warn!(
"[{}]: Failed to create server reflexive candidate: {} {} {}: {:?}",
agent_internal2.get_name(),
network,
ip,
port,
err
);
return Ok(());
}
};
{
if let Err(err) = agent_internal2.add_candidate(&candidate).await {
if let Err(close_err) = candidate.close().await {
log::warn!(
"[{}]: Failed to close candidate: {}",
agent_internal2.get_name(),
close_err
);
}
log::warn!(
"[{}]: Failed to append to localCandidates and run onCandidateHdlr: {}",
agent_internal2.get_name(),
err
);
}
}
Result::<()>::Ok(())
});
}
}
wg.wait().await;
}
pub(crate) async fn gather_candidates_relay(
urls: Vec<Url>,
net: Arc<Net>,
agent_internal: Arc<AgentInternal>,
) {
let wg = WaitGroup::new();
for url in urls {
if url.scheme != SchemeType::Turn && url.scheme != SchemeType::Turns {
continue;
}
if url.username.is_empty() {
log::error!(
"[{}]:Failed to gather relay candidates: {:?}",
agent_internal.get_name(),
Error::ErrUsernameEmpty
);
return;
}
if url.password.is_empty() {
log::error!(
"[{}]: Failed to gather relay candidates: {:?}",
agent_internal.get_name(),
Error::ErrPasswordEmpty
);
return;
}
let network = NetworkType::Udp4.to_string();
let net2 = Arc::clone(&net);
let agent_internal2 = Arc::clone(&agent_internal);
let w = wg.worker();
tokio::spawn(async move {
let _d = w;
let turn_server_addr = format!("{}:{}", url.host, url.port);
let (loc_conn, rel_addr, rel_port) =
if url.proto == ProtoType::Udp && url.scheme == SchemeType::Turn {
let loc_conn = match net2.bind(SocketAddr::from_str("0.0.0.0:0")?).await {
Ok(c) => c,
Err(err) => {
log::warn!(
"[{}]: Failed to listen due to error: {}",
agent_internal2.get_name(),
err
);
return Ok(());
}
};
let local_addr = loc_conn.local_addr()?;
let rel_addr = local_addr.ip().to_string();
let rel_port = local_addr.port();
(loc_conn, rel_addr, rel_port)
/*TODO: case url.proto == ProtoType::UDP && url.scheme == SchemeType::TURNS{*/
} else if url.proto == ProtoType::Tcp && super::turn_tcp::enabled() {
// uu-remote-linux patch: TURN over TCP/TLS, optionally via an HTTP proxy.
let server = tokio::net::lookup_host(turn_server_addr.as_str()).await.ok()
.and_then(|mut addrs| addrs.next())
.unwrap_or_else(|| SocketAddr::from(([0, 0, 0, 0], url.port)));
let tls = url.scheme == SchemeType::Turns;
match super::turn_tcp::dial(&url.host, url.port, server, tls).await {
Ok(conn) => {
let local_addr = conn.local_addr()?;
let loc_conn: Arc<dyn Conn + Send + Sync> = Arc::new(conn);
(loc_conn, local_addr.ip().to_string(), local_addr.port())
}
Err(err) => {
log::warn!(
"[{}]: Failed to open TURN {} connection: {}",
agent_internal2.get_name(),
if tls { "TLS" } else { "TCP" },
err
);
return Ok(());
}
}
} else {
log::warn!(
"[{}]: Unable to handle URL in gather_candidates_relay {}",
agent_internal2.get_name(),
url
);
return Ok(());
};
let cfg = turn::client::ClientConfig {
stun_serv_addr: String::new(),
turn_serv_addr: turn_server_addr.clone(),
username: url.username,
password: url.password,
realm: String::new(),
software: String::new(),
rto_in_ms: 0,
conn: loc_conn,
vnet: Some(Arc::clone(&net2)),
};
let client = match turn::client::Client::new(cfg).await {
Ok(client) => Arc::new(client),
Err(err) => {
log::warn!(
"[{}]: Failed to build new turn.Client {} {}\n",
agent_internal2.get_name(),
turn_server_addr,
err
);
return Ok(());
}
};
if let Err(err) = client.listen().await {
let _ = client.close().await;
log::warn!(
"[{}]: Failed to listen on turn.Client {} {}",
agent_internal2.get_name(),
turn_server_addr,
err
);
return Ok(());
}
let relay_conn: Arc<dyn Conn + Send + Sync> = match client.allocate().await {
Ok(conn) => Arc::new(conn),
Err(err) => {
let _ = client.close().await;
log::warn!(
"[{}]: Failed to allocate on turn.Client {} {}",
agent_internal2.get_name(),
turn_server_addr,
err
);
return Ok(());
}
};
let raddr = relay_conn.local_addr()?;
let relay_config = CandidateRelayConfig {
base_config: CandidateBaseConfig {
network: network.clone(),
address: raddr.ip().to_string(),
port: raddr.port(),
component: COMPONENT_RTP,
conn: Some(Arc::clone(&relay_conn)),
..CandidateBaseConfig::default()
},
rel_addr,
rel_port,
relay_client: Some(Arc::clone(&client)),
};
let candidate: Arc<dyn Candidate + Send + Sync> =
match relay_config.new_candidate_relay() {
Ok(candidate) => Arc::new(candidate),
Err(err) => {
let _ = relay_conn.close().await;
let _ = client.close().await;
log::warn!(
"[{}]: Failed to create relay candidate: {} {}: {}",
agent_internal2.get_name(),
network,
raddr,
err
);
return Ok(());
}
};
{
if let Err(err) = agent_internal2.add_candidate(&candidate).await {
if let Err(close_err) = candidate.close().await {
log::warn!(
"[{}]: Failed to close candidate: {}",
agent_internal2.get_name(),
close_err
);
}
log::warn!(
"[{}]: Failed to append to localCandidates and run onCandidateHdlr: {}",
agent_internal2.get_name(),
err
);
}
}
Result::<()>::Ok(())
});
}
wg.wait().await;
}
}
+490
View File
@@ -0,0 +1,490 @@
use std::str::FromStr;
use ipnet::IpNet;
use tokio::net::UdpSocket;
use util::vnet::*;
use super::agent_vnet_test::*;
use super::*;
use crate::udp_mux::{UDPMuxDefault, UDPMuxParams};
use crate::util::*;
#[tokio::test]
async fn test_vnet_gather_no_local_ip_address() -> Result<()> {
let vnet = Arc::new(net::Net::new(Some(net::NetConfig::default())));
let a = Agent::new(AgentConfig {
net: Some(Arc::clone(&vnet)),
..Default::default()
})
.await?;
let local_ips = local_interfaces(
&vnet,
&a.interface_filter,
&a.ip_filter,
&[NetworkType::Udp4],
)
.await;
assert!(local_ips.is_empty(), "should return no local IP");
a.close().await?;
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_dynamic_ip_address() -> Result<()> {
let cider = "1.2.3.0/24";
let ipnet = IpNet::from_str(cider).map_err(|e| Error::Other(e.to_string()))?;
let r = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: cider.to_owned(),
..Default::default()
})?));
let nw = Arc::new(net::Net::new(Some(net::NetConfig::default())));
connect_net2router(&nw, &r).await?;
let a = Agent::new(AgentConfig {
net: Some(Arc::clone(&nw)),
..Default::default()
})
.await?;
let local_ips =
local_interfaces(&nw, &a.interface_filter, &a.ip_filter, &[NetworkType::Udp4]).await;
assert!(!local_ips.is_empty(), "should have one local IP");
for ip in &local_ips {
if ip.is_loopback() {
panic!("should not return loopback IP");
}
if !ipnet.contains(ip) {
panic!("{ip} should be contained in the CIDR {ipnet}");
}
}
a.close().await?;
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_listen_udp() -> Result<()> {
let cider = "1.2.3.0/24";
let r = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: cider.to_owned(),
..Default::default()
})?));
let nw = Arc::new(net::Net::new(Some(net::NetConfig::default())));
connect_net2router(&nw, &r).await?;
let a = Agent::new(AgentConfig {
net: Some(Arc::clone(&nw)),
..Default::default()
})
.await?;
let local_ips =
local_interfaces(&nw, &a.interface_filter, &a.ip_filter, &[NetworkType::Udp4]).await;
assert!(!local_ips.is_empty(), "should have one local IP");
for ip in local_ips {
let _ = listen_udp_in_port_range(&nw, 0, 0, SocketAddr::new(ip, 0)).await?;
let result = listen_udp_in_port_range(&nw, 4999, 5000, SocketAddr::new(ip, 0)).await;
assert!(
result.is_err(),
"listenUDP with invalid port range did not return ErrPort"
);
let conn = listen_udp_in_port_range(&nw, 5000, 5000, SocketAddr::new(ip, 0)).await?;
let port = conn.local_addr()?.port();
assert_eq!(
port, 5000,
"listenUDP with port restriction of 5000 listened on incorrect port ({port})"
);
}
a.close().await?;
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_with_nat_1to1_as_host_candidates() -> Result<()> {
let external_ip0 = "1.2.3.4";
let external_ip1 = "1.2.3.5";
let local_ip0 = "10.0.0.1";
let local_ip1 = "10.0.0.2";
let map0 = format!("{external_ip0}/{local_ip0}");
let map1 = format!("{external_ip1}/{local_ip1}");
let wan = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: "1.2.3.0/24".to_owned(),
..Default::default()
})?));
let lan = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: "10.0.0.0/24".to_owned(),
static_ips: vec![map0.clone(), map1.clone()],
nat_type: Some(nat::NatType {
mode: nat::NatMode::Nat1To1,
..Default::default()
}),
..Default::default()
})?));
connect_router2router(&lan, &wan).await?;
let nw = Arc::new(net::Net::new(Some(net::NetConfig {
static_ips: vec![local_ip0.to_owned(), local_ip1.to_owned()],
..Default::default()
})));
connect_net2router(&nw, &lan).await?;
let a = Agent::new(AgentConfig {
network_types: vec![NetworkType::Udp4],
nat_1to1_ips: vec![map0.clone(), map1.clone()],
net: Some(Arc::clone(&nw)),
..Default::default()
})
.await?;
let (done_tx, mut done_rx) = mpsc::channel::<()>(1);
let done_tx = Arc::new(Mutex::new(Some(done_tx)));
a.on_candidate(Box::new(
move |c: Option<Arc<dyn Candidate + Send + Sync>>| {
let done_tx_clone = Arc::clone(&done_tx);
Box::pin(async move {
if c.is_none() {
let mut tx = done_tx_clone.lock().await;
tx.take();
}
})
},
));
a.gather_candidates()?;
log::debug!("wait for gathering is done...");
let _ = done_rx.recv().await;
log::debug!("gathering is done");
let candidates = a.get_local_candidates().await?;
assert_eq!(candidates.len(), 2, "There must be two candidates");
let mut laddrs = vec![];
for candi in &candidates {
if let Some(conn) = candi.get_conn() {
let laddr = conn.local_addr()?;
assert_eq!(
candi.port(),
laddr.port(),
"Unexpected candidate port: {}",
candi.port()
);
laddrs.push(laddr);
}
}
if candidates[0].address() == external_ip0 {
assert_eq!(
candidates[1].address(),
external_ip1,
"Unexpected candidate IP: {}",
candidates[1].address()
);
assert_eq!(
laddrs[0].ip().to_string(),
local_ip0,
"Unexpected listen IP: {}",
laddrs[0].ip()
);
assert_eq!(
laddrs[1].ip().to_string(),
local_ip1,
"Unexpected listen IP: {}",
laddrs[1].ip()
);
} else if candidates[0].address() == external_ip1 {
assert_eq!(
candidates[1].address(),
external_ip0,
"Unexpected candidate IP: {}",
candidates[1].address()
);
assert_eq!(
laddrs[0].ip().to_string(),
local_ip1,
"Unexpected listen IP: {}",
laddrs[0].ip(),
);
assert_eq!(
laddrs[1].ip().to_string(),
local_ip0,
"Unexpected listen IP: {}",
laddrs[1].ip(),
)
}
a.close().await?;
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_with_nat_1to1_as_srflx_candidates() -> Result<()> {
let wan = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: "1.2.3.0/24".to_owned(),
..Default::default()
})?));
let lan = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: "10.0.0.0/24".to_owned(),
static_ips: vec!["1.2.3.4/10.0.0.1".to_owned()],
nat_type: Some(nat::NatType {
mode: nat::NatMode::Nat1To1,
..Default::default()
}),
..Default::default()
})?));
connect_router2router(&lan, &wan).await?;
let nw = Arc::new(net::Net::new(Some(net::NetConfig {
static_ips: vec!["10.0.0.1".to_owned()],
..Default::default()
})));
connect_net2router(&nw, &lan).await?;
let a = Agent::new(AgentConfig {
network_types: vec![NetworkType::Udp4],
nat_1to1_ips: vec!["1.2.3.4".to_owned()],
nat_1to1_ip_candidate_type: CandidateType::ServerReflexive,
net: Some(nw),
..Default::default()
})
.await?;
let (done_tx, mut done_rx) = mpsc::channel::<()>(1);
let done_tx = Arc::new(Mutex::new(Some(done_tx)));
a.on_candidate(Box::new(
move |c: Option<Arc<dyn Candidate + Send + Sync>>| {
let done_tx_clone = Arc::clone(&done_tx);
Box::pin(async move {
if c.is_none() {
let mut tx = done_tx_clone.lock().await;
tx.take();
}
})
},
));
a.gather_candidates()?;
log::debug!("wait for gathering is done...");
let _ = done_rx.recv().await;
log::debug!("gathering is done");
let candidates = a.get_local_candidates().await?;
assert_eq!(candidates.len(), 2, "There must be two candidates");
let mut candi_host = None;
let mut candi_srflx = None;
for candidate in candidates {
match candidate.candidate_type() {
CandidateType::Host => {
candi_host = Some(candidate);
}
CandidateType::ServerReflexive => {
candi_srflx = Some(candidate);
}
_ => {
panic!("Unexpected candidate type");
}
}
}
assert!(candi_host.is_some(), "should not be nil");
assert_eq!("10.0.0.1", candi_host.unwrap().address(), "should match");
assert!(candi_srflx.is_some(), "should not be nil");
assert_eq!("1.2.3.4", candi_srflx.unwrap().address(), "should match");
a.close().await?;
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_with_interface_filter() -> Result<()> {
let r = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: "1.2.3.0/24".to_owned(),
..Default::default()
})?));
let nw = Arc::new(net::Net::new(Some(net::NetConfig::default())));
connect_net2router(&nw, &r).await?;
//"InterfaceFilter should exclude the interface"
{
let a = Agent::new(AgentConfig {
net: Some(Arc::clone(&nw)),
interface_filter: Arc::new(Some(Box::new(|_: &str| -> bool {
//assert_eq!("eth0", interface_name);
false
}))),
..Default::default()
})
.await?;
let local_ips =
local_interfaces(&nw, &a.interface_filter, &a.ip_filter, &[NetworkType::Udp4]).await;
assert!(
local_ips.is_empty(),
"InterfaceFilter should have excluded everything"
);
a.close().await?;
}
//"InterfaceFilter should not exclude the interface"
{
let a = Agent::new(AgentConfig {
net: Some(Arc::clone(&nw)),
interface_filter: Arc::new(Some(Box::new(|interface_name: &str| -> bool {
"eth0" == interface_name
}))),
..Default::default()
})
.await?;
let local_ips =
local_interfaces(&nw, &a.interface_filter, &a.ip_filter, &[NetworkType::Udp4]).await;
assert_eq!(
local_ips.len(),
1,
"InterfaceFilter should not have excluded everything"
);
a.close().await?;
}
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_turn_connection_leak() -> Result<()> {
let turn_server_url = Url {
scheme: SchemeType::Turn,
host: VNET_STUN_SERVER_IP.to_owned(),
port: VNET_STUN_SERVER_PORT,
username: "user".to_owned(),
password: "pass".to_owned(),
proto: ProtoType::Udp,
};
// buildVNet with a Symmetric NATs for both LANs
let nat_type = nat::NatType {
mapping_behavior: nat::EndpointDependencyType::EndpointAddrPortDependent,
filtering_behavior: nat::EndpointDependencyType::EndpointAddrPortDependent,
..Default::default()
};
let v = build_vnet(nat_type, nat_type).await?;
let cfg0 = AgentConfig {
urls: vec![turn_server_url.clone()],
network_types: supported_network_types(),
multicast_dns_mode: MulticastDnsMode::Disabled,
nat_1to1_ips: vec![VNET_GLOBAL_IPA.to_owned()],
net: Some(Arc::clone(&v.net0)),
..Default::default()
};
let a_agent = Agent::new(cfg0).await?;
{
let agent_internal = Arc::clone(&a_agent.internal);
Agent::gather_candidates_relay(
vec![turn_server_url.clone()],
Arc::clone(&v.net0),
agent_internal,
)
.await;
}
// Assert relay conn leak on close.
a_agent.close().await?;
v.close().await?;
Ok(())
}
#[tokio::test]
async fn test_vnet_gather_muxed_udp() -> Result<()> {
let udp_socket = UdpSocket::bind("0.0.0.0:0").await?;
let udp_mux = UDPMuxDefault::new(UDPMuxParams::new(udp_socket));
let lan = Arc::new(Mutex::new(router::Router::new(router::RouterConfig {
cidr: "10.0.0.0/24".to_owned(),
nat_type: Some(nat::NatType {
mode: nat::NatMode::Nat1To1,
..Default::default()
}),
..Default::default()
})?));
let nw = Arc::new(net::Net::new(Some(net::NetConfig {
static_ips: vec!["10.0.0.1".to_owned()],
..Default::default()
})));
connect_net2router(&nw, &lan).await?;
let a = Agent::new(AgentConfig {
network_types: vec![NetworkType::Udp4],
nat_1to1_ips: vec!["1.2.3.4".to_owned()],
net: Some(nw),
udp_network: UDPNetwork::Muxed(udp_mux),
..Default::default()
})
.await?;
let (done_tx, mut done_rx) = mpsc::channel::<()>(1);
let done_tx = Arc::new(Mutex::new(Some(done_tx)));
a.on_candidate(Box::new(
move |c: Option<Arc<dyn Candidate + Send + Sync>>| {
let done_tx_clone = Arc::clone(&done_tx);
Box::pin(async move {
if c.is_none() {
let mut tx = done_tx_clone.lock().await;
tx.take();
}
})
},
));
a.gather_candidates()?;
log::debug!("wait for gathering is done...");
let _ = done_rx.recv().await;
log::debug!("gathering is done");
let candidates = a.get_local_candidates().await?;
assert_eq!(candidates.len(), 1, "There must be a single candidate");
let candi = &candidates[0];
let laddr = candi.get_conn().unwrap().local_addr()?;
assert_eq!(candi.address(), "1.2.3.4");
assert_eq!(
candi.port(),
laddr.port(),
"Unexpected candidate port: {}",
candi.port()
);
Ok(())
}
File diff suppressed because it is too large. Load diff
+551
View File
@@ -0,0 +1,551 @@
use std::net::SocketAddr;
use std::sync::atomic::Ordering;
use std::sync::Arc;
use async_trait::async_trait;
use stun::agent::*;
use stun::attributes::*;
use stun::fingerprint::*;
use stun::integrity::*;
use stun::message::*;
use stun::textattrs::*;
use tokio::time::{Duration, Instant};
use crate::agent::agent_internal::*;
use crate::candidate::*;
use crate::control::*;
use crate::priority::*;
use crate::use_candidate::*;
#[async_trait]
trait ControllingSelector {
async fn start(&self);
async fn contact_candidates(&self);
async fn ping_candidate(
&self,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
);
async fn handle_success_response(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
remote_addr: SocketAddr,
);
async fn handle_binding_request(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
);
}
#[async_trait]
trait ControlledSelector {
async fn start(&self);
async fn contact_candidates(&self);
async fn ping_candidate(
&self,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
);
async fn handle_success_response(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
remote_addr: SocketAddr,
);
async fn handle_binding_request(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
);
}
impl AgentInternal {
fn is_nominatable(&self, c: &Arc<dyn Candidate + Send + Sync>) -> bool {
let start_time = *self.start_time.lock();
match c.candidate_type() {
CandidateType::Host => {
Instant::now()
.checked_duration_since(start_time)
.unwrap_or_else(|| Duration::from_secs(0))
.as_nanos()
> self.host_acceptance_min_wait.as_nanos()
}
CandidateType::ServerReflexive => {
Instant::now()
.checked_duration_since(start_time)
.unwrap_or_else(|| Duration::from_secs(0))
.as_nanos()
> self.srflx_acceptance_min_wait.as_nanos()
}
CandidateType::PeerReflexive => {
Instant::now()
.checked_duration_since(start_time)
.unwrap_or_else(|| Duration::from_secs(0))
.as_nanos()
> self.prflx_acceptance_min_wait.as_nanos()
}
CandidateType::Relay => {
Instant::now()
.checked_duration_since(start_time)
.unwrap_or_else(|| Duration::from_secs(0))
.as_nanos()
> self.relay_acceptance_min_wait.as_nanos()
}
CandidateType::Unspecified => {
log::error!(
"is_nominatable invalid candidate type {}",
c.candidate_type()
);
false
}
}
}
async fn nominate_pair(&self) {
let result = {
let nominated_pair = self.nominated_pair.lock().await;
if let Some(pair) = &*nominated_pair {
// The controlling agent MUST include the USE-CANDIDATE attribute in
// order to nominate a candidate pair (Section 8.1.1). The controlled
// agent MUST NOT include the USE-CANDIDATE attribute in a Binding
// request.
let (msg, result) = {
let ufrag_pwd = self.ufrag_pwd.lock().await;
let username =
ufrag_pwd.remote_ufrag.clone() + ":" + ufrag_pwd.local_ufrag.as_str();
let mut msg = Message::new();
let result = msg.build(&[
Box::new(BINDING_REQUEST),
Box::new(TransactionId::new()),
Box::new(Username::new(ATTR_USERNAME, username)),
Box::<UseCandidateAttr>::default(),
Box::new(AttrControlling(self.tie_breaker.load(Ordering::SeqCst))),
Box::new(PriorityAttr(pair.local.priority())),
Box::new(MessageIntegrity::new_short_term_integrity(
ufrag_pwd.remote_pwd.clone(),
)),
Box::new(FINGERPRINT),
]);
(msg, result)
};
if let Err(err) = result {
log::error!("{}", err);
None
} else {
log::trace!(
"ping STUN (nominate candidate pair from {} to {}",
pair.local,
pair.remote
);
let local = pair.local.clone();
let remote = pair.remote.clone();
Some((msg, local, remote))
}
} else {
None
}
};
if let Some((msg, local, remote)) = result {
self.send_binding_request(&msg, &local, &remote).await;
}
}
pub(crate) async fn start(&self) {
if self.is_controlling.load(Ordering::SeqCst) {
ControllingSelector::start(self).await;
} else {
ControlledSelector::start(self).await;
}
}
pub(crate) async fn contact_candidates(&self) {
if self.is_controlling.load(Ordering::SeqCst) {
ControllingSelector::contact_candidates(self).await;
} else {
ControlledSelector::contact_candidates(self).await;
}
}
pub(crate) async fn ping_candidate(
&self,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
) {
if self.is_controlling.load(Ordering::SeqCst) {
ControllingSelector::ping_candidate(self, local, remote).await;
} else {
ControlledSelector::ping_candidate(self, local, remote).await;
}
}
pub(crate) async fn handle_success_response(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
remote_addr: SocketAddr,
) {
if self.is_controlling.load(Ordering::SeqCst) {
ControllingSelector::handle_success_response(self, m, local, remote, remote_addr).await;
} else {
ControlledSelector::handle_success_response(self, m, local, remote, remote_addr).await;
}
}
pub(crate) async fn handle_binding_request(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
) {
if self.is_controlling.load(Ordering::SeqCst) {
ControllingSelector::handle_binding_request(self, m, local, remote).await;
} else {
ControlledSelector::handle_binding_request(self, m, local, remote).await;
}
}
}
#[async_trait]
impl ControllingSelector for AgentInternal {
async fn start(&self) {
{
let mut nominated_pair = self.nominated_pair.lock().await;
*nominated_pair = None;
}
*self.start_time.lock() = Instant::now();
}
async fn contact_candidates(&self) {
// A lite selector should not contact candidates
if self.lite.load(Ordering::SeqCst) {
// This only happens if both peers are lite. See RFC 8445 S6.1.1 and S6.2
log::trace!("now falling back to full agent");
}
let nominated_pair_is_some = {
let nominated_pair = self.nominated_pair.lock().await;
nominated_pair.is_some()
};
if self.agent_conn.get_selected_pair().is_some() {
if self.validate_selected_pair().await {
log::trace!("[{}]: checking keepalive", self.get_name());
self.check_keepalive().await;
}
} else if nominated_pair_is_some {
self.nominate_pair().await;
} else {
let has_nominated_pair =
if let Some(p) = self.agent_conn.get_best_valid_candidate_pair().await {
self.is_nominatable(&p.local) && self.is_nominatable(&p.remote)
} else {
false
};
if has_nominated_pair {
if let Some(p) = self.agent_conn.get_best_valid_candidate_pair().await {
log::trace!(
"Nominatable pair found, nominating ({}, {})",
p.local.to_string(),
p.remote.to_string()
);
p.nominated.store(true, Ordering::SeqCst);
{
let mut nominated_pair = self.nominated_pair.lock().await;
*nominated_pair = Some(p);
}
}
self.nominate_pair().await;
} else {
self.ping_all_candidates().await;
}
}
}
async fn ping_candidate(
&self,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
) {
let (msg, result) = {
let ufrag_pwd = self.ufrag_pwd.lock().await;
let username = ufrag_pwd.remote_ufrag.clone() + ":" + ufrag_pwd.local_ufrag.as_str();
let mut msg = Message::new();
let result = msg.build(&[
Box::new(BINDING_REQUEST),
Box::new(TransactionId::new()),
Box::new(Username::new(ATTR_USERNAME, username)),
Box::new(AttrControlling(self.tie_breaker.load(Ordering::SeqCst))),
Box::new(PriorityAttr(local.priority())),
Box::new(MessageIntegrity::new_short_term_integrity(
ufrag_pwd.remote_pwd.clone(),
)),
Box::new(FINGERPRINT),
]);
(msg, result)
};
if let Err(err) = result {
log::error!("{}", err);
} else {
self.send_binding_request(&msg, local, remote).await;
}
}
async fn handle_success_response(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
remote_addr: SocketAddr,
) {
if let Some(pending_request) = self.handle_inbound_binding_success(m.transaction_id).await {
let transaction_addr = pending_request.destination;
// Assert that NAT is not symmetric
// https://tools.ietf.org/html/rfc8445#section-7.2.5.2.1
if transaction_addr != remote_addr {
log::debug!("discard message: transaction source and destination does not match expected({}), actual({})", transaction_addr, remote);
return;
}
log::trace!(
"inbound STUN (SuccessResponse) from {} to {}",
remote,
local
);
if let Some(p) = self.find_pair(local, remote).await {
p.record_rtt(pending_request.timestamp.elapsed());
}
let selected_pair_is_none = self.agent_conn.get_selected_pair().is_none();
if let Some(p) = self.find_pair(local, remote).await {
p.state
.store(CandidatePairState::Succeeded as u8, Ordering::SeqCst);
log::trace!(
"Found valid candidate pair: {}, p.state: {}, isUseCandidate: {}, {}",
p,
p.state.load(Ordering::SeqCst),
pending_request.is_use_candidate,
selected_pair_is_none
);
if pending_request.is_use_candidate && selected_pair_is_none {
self.set_selected_pair(Some(Arc::clone(&p))).await;
}
} else {
// This shouldn't happen
log::error!("Success response from invalid candidate pair");
}
} else {
log::warn!(
"discard message from ({}), unknown TransactionID 0x{:?}",
remote,
m.transaction_id
);
}
}
async fn handle_binding_request(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
) {
self.send_binding_success(m, local, remote).await;
log::trace!("controllingSelector: sendBindingSuccess");
if let Some(p) = self.find_pair(local, remote).await {
let nominated_pair_is_none = {
let nominated_pair = self.nominated_pair.lock().await;
nominated_pair.is_none()
};
log::trace!(
"controllingSelector: after findPair {}, p.state: {}, {}",
p,
p.state.load(Ordering::SeqCst),
nominated_pair_is_none,
//self.agent_conn.get_selected_pair().await.is_none() //, {}
);
if p.state.load(Ordering::SeqCst) == CandidatePairState::Succeeded as u8
&& nominated_pair_is_none
&& self.agent_conn.get_selected_pair().is_none()
{
if let Some(best_pair) = self.agent_conn.get_best_available_candidate_pair().await {
log::trace!(
"controllingSelector: getBestAvailableCandidatePair {}",
best_pair
);
if best_pair == p
&& self.is_nominatable(&p.local)
&& self.is_nominatable(&p.remote)
{
log::trace!("The candidate ({}, {}) is the best candidate available, marking it as nominated",
p.local, p.remote);
{
let mut nominated_pair = self.nominated_pair.lock().await;
*nominated_pair = Some(p);
}
self.nominate_pair().await;
}
} else {
log::trace!("No best pair available");
}
}
} else {
log::trace!("controllingSelector: addPair");
self.add_pair(local.clone(), remote.clone()).await;
}
}
}
#[async_trait]
impl ControlledSelector for AgentInternal {
async fn start(&self) {}
async fn contact_candidates(&self) {
// A lite selector should not contact candidates
if self.lite.load(Ordering::SeqCst) {
self.validate_selected_pair().await;
} else if self.agent_conn.get_selected_pair().is_some() {
if self.validate_selected_pair().await {
log::trace!("[{}]: checking keepalive", self.get_name());
self.check_keepalive().await;
}
} else {
self.ping_all_candidates().await;
}
}
async fn ping_candidate(
&self,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
) {
let (msg, result) = {
let ufrag_pwd = self.ufrag_pwd.lock().await;
let username = ufrag_pwd.remote_ufrag.clone() + ":" + ufrag_pwd.local_ufrag.as_str();
let mut msg = Message::new();
let result = msg.build(&[
Box::new(BINDING_REQUEST),
Box::new(TransactionId::new()),
Box::new(Username::new(ATTR_USERNAME, username)),
Box::new(AttrControlled(self.tie_breaker.load(Ordering::SeqCst))),
Box::new(PriorityAttr(local.priority())),
Box::new(MessageIntegrity::new_short_term_integrity(
ufrag_pwd.remote_pwd.clone(),
)),
Box::new(FINGERPRINT),
]);
(msg, result)
};
if let Err(err) = result {
log::error!("{}", err);
} else {
self.send_binding_request(&msg, local, remote).await;
}
}
async fn handle_success_response(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
remote_addr: SocketAddr,
) {
// https://tools.ietf.org/html/rfc8445#section-7.3.1.5
// If the controlled agent does not accept the request from the
// controlling agent, the controlled agent MUST reject the nomination
// request with an appropriate error code response (e.g., 400)
// [RFC5389].
if let Some(pending_request) = self.handle_inbound_binding_success(m.transaction_id).await {
let transaction_addr = pending_request.destination;
// Assert that NAT is not symmetric
// https://tools.ietf.org/html/rfc8445#section-7.2.5.2.1
if transaction_addr != remote_addr {
log::debug!("discard message: transaction source and destination does not match expected({}), actual({})", transaction_addr, remote);
return;
}
log::trace!(
"inbound STUN (SuccessResponse) from {} to {}",
remote,
local
);
if let Some(p) = self.find_pair(local, remote).await {
p.record_rtt(pending_request.timestamp.elapsed());
}
if let Some(p) = self.find_pair(local, remote).await {
p.state
.store(CandidatePairState::Succeeded as u8, Ordering::SeqCst);
log::trace!("Found valid candidate pair: {}", p);
} else {
// This shouldn't happen
log::error!("Success response from invalid candidate pair");
}
} else {
log::warn!(
"discard message from ({}), unknown TransactionID 0x{:?}",
remote,
m.transaction_id
);
}
}
async fn handle_binding_request(
&self,
m: &Message,
local: &Arc<dyn Candidate + Send + Sync>,
remote: &Arc<dyn Candidate + Send + Sync>,
) {
if self.find_pair(local, remote).await.is_none() {
self.add_pair(local.clone(), remote.clone()).await;
}
if let Some(p) = self.find_pair(local, remote).await {
let use_candidate = m.contains(ATTR_USE_CANDIDATE);
if use_candidate {
// https://tools.ietf.org/html/rfc8445#section-7.3.1.5
if p.state.load(Ordering::SeqCst) == CandidatePairState::Succeeded as u8 {
// If the state of this pair is Succeeded, it means that the check
// previously sent by this pair produced a successful response and
// generated a valid pair (Section 7.2.5.3.2). The agent sets the
// nominated flag value of the valid pair to true.
if self.agent_conn.get_selected_pair().is_none() {
self.set_selected_pair(Some(Arc::clone(&p))).await;
}
self.send_binding_success(m, local, remote).await;
} else {
// If the received Binding request triggered a new check to be
// enqueued in the triggered-check queue (Section 7.3.1.4), once the
// check is sent and if it generates a successful response, and
// generates a valid pair, the agent sets the nominated flag of the
// pair to true. If the request fails (Section 7.2.5.2), the agent
// MUST remove the candidate pair from the valid list, set the
// candidate pair state to Failed, and set the checklist state to
// Failed.
self.ping_candidate(local, remote).await;
}
} else {
self.send_binding_success(m, local, remote).await;
self.ping_candidate(local, remote).await;
}
}
}
}
+286
View File
@@ -0,0 +1,286 @@
use std::sync::atomic::Ordering;
use tokio::time::Instant;
use crate::agent::agent_internal::AgentInternal;
use crate::candidate::{CandidatePairState, CandidateType};
use crate::network_type::NetworkType;
/// Contains ICE candidate pair statistics.
pub struct CandidatePairStats {
/// The timestamp associated with this struct.
pub timestamp: Instant,
/// The id of the local candidate.
pub local_candidate_id: String,
/// The id of the remote candidate.
pub remote_candidate_id: String,
/// The state of the checklist for the local and remote candidates in a pair.
pub state: CandidatePairState,
/// It is true when this valid pair that should be used for media,
/// if it is the highest-priority one amongst those whose nominated flag is set.
pub nominated: bool,
/// The total number of packets sent on this candidate pair.
pub packets_sent: u32,
/// The total number of packets received on this candidate pair.
pub packets_received: u32,
/// The total number of payload bytes sent on this candidate pair not including headers or
/// padding.
pub bytes_sent: u64,
/// The total number of payload bytes received on this candidate pair not including headers or
/// padding.
pub bytes_received: u64,
/// The timestamp at which the last packet was sent on this particular candidate pair, excluding
/// STUN packets.
pub last_packet_sent_timestamp: Instant,
/// The timestamp at which the last packet was received on this particular candidate pair,
/// excluding STUN packets.
pub last_packet_received_timestamp: Instant,
/// The timestamp at which the first STUN request was sent on this particular candidate pair.
pub first_request_timestamp: Instant,
/// The timestamp at which the last STUN request was sent on this particular candidate pair.
/// The average interval between two consecutive connectivity checks sent can be calculated with
/// (last_request_timestamp - first_request_timestamp) / requests_sent.
pub last_request_timestamp: Instant,
/// Timestamp at which the last STUN response was received on this particular candidate pair.
pub last_response_timestamp: Instant,
/// The sum of all round trip time measurements in seconds since the beginning of the session,
/// based on STUN connectivity check responses (responses_received), including those that reply
/// to requests that are sent in order to verify consent. The average round trip time can be
/// computed from total_round_trip_time by dividing it by responses_received.
pub total_round_trip_time: f64,
/// The latest round trip time measured in seconds, computed from both STUN connectivity checks,
/// including those that are sent for consent verification.
pub current_round_trip_time: f64,
/// It is calculated by the underlying congestion control by combining the available bitrate for
/// all the outgoing RTP streams using this candidate pair. The bitrate measurement does not
/// count the size of the IP or other transport layers like TCP or UDP. It is similar to the
/// TIAS defined in RFC 3890, i.e., it is measured in bits per second and the bitrate is
/// calculated over a 1 second window.
pub available_outgoing_bitrate: f64,
/// It is calculated by the underlying congestion control by combining the available bitrate for
/// all the incoming RTP streams using this candidate pair. The bitrate measurement does not
/// count the size of the IP or other transport layers like TCP or UDP. It is similar to the
/// TIAS defined in RFC 3890, i.e., it is measured in bits per second and the bitrate is
/// calculated over a 1 second window.
pub available_incoming_bitrate: f64,
/// The number of times the circuit breaker is triggered for this particular 5-tuple,
/// ceasing transmission.
pub circuit_breaker_trigger_count: u32,
/// The total number of connectivity check requests received (including retransmissions).
/// It is impossible for the receiver to tell whether the request was sent in order to check
/// connectivity or check consent, so all connectivity checks requests are counted here.
pub requests_received: u64,
/// The total number of connectivity check requests sent (not including retransmissions).
pub requests_sent: u64,
/// The total number of connectivity check responses received.
pub responses_received: u64,
/// The total number of connectivity check responses sent. Since we cannot distinguish
/// connectivity check requests and consent requests, all responses are counted.
pub responses_sent: u64,
/// The total number of connectivity check request retransmissions received.
pub retransmissions_received: u64,
/// The total number of connectivity check request retransmissions sent.
pub retransmissions_sent: u64,
/// The total number of consent requests sent.
pub consent_requests_sent: u64,
/// The timestamp at which the latest valid STUN binding response expired.
pub consent_expired_timestamp: Instant,
}
impl Default for CandidatePairStats {
fn default() -> Self {
Self {
timestamp: Instant::now(),
local_candidate_id: String::new(),
remote_candidate_id: String::new(),
state: CandidatePairState::default(),
nominated: false,
packets_sent: 0,
packets_received: 0,
bytes_sent: 0,
bytes_received: 0,
last_packet_sent_timestamp: Instant::now(),
last_packet_received_timestamp: Instant::now(),
first_request_timestamp: Instant::now(),
last_request_timestamp: Instant::now(),
last_response_timestamp: Instant::now(),
total_round_trip_time: 0.0,
current_round_trip_time: 0.0,
available_outgoing_bitrate: 0.0,
available_incoming_bitrate: 0.0,
circuit_breaker_trigger_count: 0,
requests_received: 0,
requests_sent: 0,
responses_received: 0,
responses_sent: 0,
retransmissions_received: 0,
retransmissions_sent: 0,
consent_requests_sent: 0,
consent_expired_timestamp: Instant::now(),
}
}
}
/// Contains ICE candidate statistics related to the `ICETransport` objects.
#[derive(Debug, Clone)]
pub struct CandidateStats {
// The timestamp associated with this struct.
pub timestamp: Instant,
/// The candidate id.
pub id: String,
/// The type of network interface used by the base of a local candidate (the address the ICE
/// agent sends from). Only present for local candidates; it's not possible to know what type of
/// network interface a remote candidate is using.
///
/// Note: This stat only tells you about the network interface used by the first "hop"; it's
/// possible that a connection will be bottlenecked by another type of network. For example,
/// when using Wi-Fi tethering, the networkType of the relevant candidate would be "wifi", even
/// when the next hop is over a cellular connection.
pub network_type: NetworkType,
/// The IP address of the candidate, allowing for IPv4 addresses and IPv6 addresses, but fully
/// qualified domain names (FQDNs) are not allowed.
pub ip: String,
/// The port number of the candidate.
pub port: u16,
/// The `Type` field of the ICECandidate.
pub candidate_type: CandidateType,
/// The `priority` field of the ICECandidate.
pub priority: u32,
/// The url of the TURN or STUN server indicated in the that translated this IP address.
/// It is the url address surfaced in an PeerConnectionICEEvent.
pub url: String,
/// The protocol used by the endpoint to communicate with the TURN server. This is only present
/// for local candidates. Valid values for the TURN url protocol is one of udp, tcp, or tls.
pub relay_protocol: String,
/// It is true if the candidate has been deleted/freed. For host candidates, this means that any
/// network resources (typically a socket) associated with the candidate have been released. For
/// TURN candidates, this means the TURN allocation is no longer active.
///
/// Only defined for local candidates. For remote candidates, this property is not applicable.
pub deleted: bool,
}
impl Default for CandidateStats {
fn default() -> Self {
Self {
timestamp: Instant::now(),
id: String::new(),
network_type: NetworkType::default(),
ip: String::new(),
port: 0,
candidate_type: CandidateType::default(),
priority: 0,
url: String::new(),
relay_protocol: String::new(),
deleted: false,
}
}
}
impl AgentInternal {
/// Returns a list of candidate pair stats.
pub(crate) async fn get_candidate_pairs_stats(&self) -> Vec<CandidatePairStats> {
let checklist = self.agent_conn.checklist.lock().await;
let mut res = Vec::with_capacity(checklist.len());
for cp in &*checklist {
let stat = CandidatePairStats {
timestamp: Instant::now(),
local_candidate_id: cp.local.id(),
remote_candidate_id: cp.remote.id(),
state: cp.state.load(Ordering::SeqCst).into(),
nominated: cp.nominated.load(Ordering::SeqCst),
current_round_trip_time: cp
.current_round_trip_time()
.map_or(0.0, |rtt| rtt.as_secs_f64()),
..CandidatePairStats::default()
};
res.push(stat);
}
res
}
/// Returns a list of local candidates stats.
pub(crate) async fn get_local_candidates_stats(&self) -> Vec<CandidateStats> {
let local_candidates = self.local_candidates.lock().await;
let mut res = Vec::with_capacity(local_candidates.len());
for (network_type, local_candidates) in &*local_candidates {
for c in local_candidates {
let stat = CandidateStats {
timestamp: Instant::now(),
id: c.id(),
network_type: *network_type,
ip: c.address(),
port: c.port(),
candidate_type: c.candidate_type(),
priority: c.priority(),
// URL string
relay_protocol: "udp".to_owned(),
// Deleted bool
..CandidateStats::default()
};
res.push(stat);
}
}
res
}
/// Returns a list of remote candidates stats.
pub(crate) async fn get_remote_candidates_stats(&self) -> Vec<CandidateStats> {
let remote_candidates = self.remote_candidates.lock().await;
let mut res = Vec::with_capacity(remote_candidates.len());
for (network_type, remote_candidates) in &*remote_candidates {
for c in remote_candidates {
let stat = CandidateStats {
timestamp: Instant::now(),
id: c.id(),
network_type: *network_type,
ip: c.address(),
port: c.port(),
candidate_type: c.candidate_type(),
priority: c.priority(),
// URL string
relay_protocol: "udp".to_owned(),
// Deleted bool
..CandidateStats::default()
};
res.push(stat);
}
}
res
}
}
File diff suppressed because it is too large. Load diff
+246
View File
@@ -0,0 +1,246 @@
use std::io;
use std::sync::atomic::{AtomicBool, Ordering};
use arc_swap::ArcSwapOption;
use async_trait::async_trait;
use util::Conn;
use super::*;
use crate::error::*;
impl Agent {
/// Connects to the remote agent, acting as the controlling ice agent.
/// The method blocks until at least one ice candidate pair has successfully connected.
///
/// The operation will be cancelled if `cancel_rx` either receives a message or its channel
/// closes.
pub async fn dial(
&self,
mut cancel_rx: mpsc::Receiver<()>,
remote_ufrag: String,
remote_pwd: String,
) -> Result<Arc<impl Conn>> {
let (on_connected_rx, agent_conn) = {
self.internal
.start_connectivity_checks(true, remote_ufrag, remote_pwd)
.await?;
let mut on_connected_rx = self.internal.on_connected_rx.lock().await;
(
on_connected_rx.take(),
Arc::clone(&self.internal.agent_conn),
)
};
if let Some(mut on_connected_rx) = on_connected_rx {
// block until pair selected
tokio::select! {
_ = on_connected_rx.recv() => {},
_ = cancel_rx.recv() => {
return Err(Error::ErrCanceledByCaller);
}
}
}
Ok(agent_conn)
}
/// Connects to the remote agent, acting as the controlled ice agent.
/// The method blocks until at least one ice candidate pair has successfully connected.
///
/// The operation will be cancelled if `cancel_rx` either receives a message or its channel
/// closes.
pub async fn accept(
&self,
mut cancel_rx: mpsc::Receiver<()>,
remote_ufrag: String,
remote_pwd: String,
) -> Result<Arc<impl Conn>> {
let (on_connected_rx, agent_conn) = {
self.internal
.start_connectivity_checks(false, remote_ufrag, remote_pwd)
.await?;
let mut on_connected_rx = self.internal.on_connected_rx.lock().await;
(
on_connected_rx.take(),
Arc::clone(&self.internal.agent_conn),
)
};
if let Some(mut on_connected_rx) = on_connected_rx {
// block until pair selected
tokio::select! {
_ = on_connected_rx.recv() => {},
_ = cancel_rx.recv() => {
return Err(Error::ErrCanceledByCaller);
}
}
}
Ok(agent_conn)
}
}
pub(crate) struct AgentConn {
pub(crate) selected_pair: ArcSwapOption<CandidatePair>,
pub(crate) checklist: Mutex<Vec<Arc<CandidatePair>>>,
pub(crate) buffer: Buffer,
pub(crate) bytes_received: AtomicUsize,
pub(crate) bytes_sent: AtomicUsize,
pub(crate) done: AtomicBool,
}
impl AgentConn {
pub(crate) fn new() -> Self {
Self {
selected_pair: ArcSwapOption::empty(),
checklist: Mutex::new(vec![]),
// Make sure the buffer doesn't grow indefinitely.
// NOTE: We actually won't get anywhere close to this limit.
// SRTP will constantly read from the endpoint and drop packets if it's full.
buffer: Buffer::new(0, MAX_BUFFER_SIZE),
bytes_received: AtomicUsize::new(0),
bytes_sent: AtomicUsize::new(0),
done: AtomicBool::new(false),
}
}
pub(crate) fn get_selected_pair(&self) -> Option<Arc<CandidatePair>> {
self.selected_pair.load().clone()
}
pub(crate) async fn get_best_available_candidate_pair(&self) -> Option<Arc<CandidatePair>> {
let mut best: Option<&Arc<CandidatePair>> = None;
let checklist = self.checklist.lock().await;
for p in &*checklist {
if p.state.load(Ordering::SeqCst) == CandidatePairState::Failed as u8 {
continue;
}
if let Some(b) = &mut best {
if b.priority() < p.priority() {
*b = p;
}
} else {
best = Some(p);
}
}
best.cloned()
}
pub(crate) async fn get_best_valid_candidate_pair(&self) -> Option<Arc<CandidatePair>> {
let mut best: Option<&Arc<CandidatePair>> = None;
let checklist = self.checklist.lock().await;
for p in &*checklist {
if p.state.load(Ordering::SeqCst) != CandidatePairState::Succeeded as u8 {
continue;
}
if let Some(b) = &mut best {
if b.priority() < p.priority() {
*b = p;
}
} else {
best = Some(p);
}
}
best.cloned()
}
/// Returns the number of bytes sent.
pub fn bytes_sent(&self) -> usize {
self.bytes_sent.load(Ordering::SeqCst)
}
/// Returns the number of bytes received.
pub fn bytes_received(&self) -> usize {
self.bytes_received.load(Ordering::SeqCst)
}
}
#[async_trait]
impl Conn for AgentConn {
async fn connect(&self, _addr: SocketAddr) -> std::result::Result<(), util::Error> {
Err(io::Error::new(io::ErrorKind::Other, "Not applicable").into())
}
async fn recv(&self, buf: &mut [u8]) -> std::result::Result<usize, util::Error> {
if self.done.load(Ordering::SeqCst) {
return Err(io::Error::new(io::ErrorKind::Other, "Conn is closed").into());
}
let n = match self.buffer.read(buf, None).await {
Ok(n) => n,
Err(err) => return Err(io::Error::new(io::ErrorKind::Other, err.to_string()).into()),
};
self.bytes_received.fetch_add(n, Ordering::SeqCst);
Ok(n)
}
async fn recv_from(
&self,
buf: &mut [u8],
) -> std::result::Result<(usize, SocketAddr), util::Error> {
if let Some(raddr) = self.remote_addr() {
let n = self.recv(buf).await?;
Ok((n, raddr))
} else {
Err(io::Error::new(io::ErrorKind::Other, "Not applicable").into())
}
}
async fn send(&self, buf: &[u8]) -> std::result::Result<usize, util::Error> {
if self.done.load(Ordering::SeqCst) {
return Err(io::Error::new(io::ErrorKind::Other, "Conn is closed").into());
}
if is_message(buf) {
return Err(util::Error::Other("ErrIceWriteStunMessage".into()));
}
let result = if let Some(pair) = self.get_selected_pair() {
pair.write(buf).await
} else if let Some(pair) = self.get_best_available_candidate_pair().await {
pair.write(buf).await
} else {
Ok(0)
};
match result {
Ok(n) => {
self.bytes_sent.fetch_add(buf.len(), Ordering::SeqCst);
Ok(n)
}
Err(err) => Err(io::Error::new(io::ErrorKind::Other, err.to_string()).into()),
}
}
async fn send_to(
&self,
_buf: &[u8],
_target: SocketAddr,
) -> std::result::Result<usize, util::Error> {
Err(io::Error::new(io::ErrorKind::Other, "Not applicable").into())
}
fn local_addr(&self) -> std::result::Result<SocketAddr, util::Error> {
if let Some(pair) = self.get_selected_pair() {
Ok(pair.local.addr())
} else {
Err(io::Error::new(io::ErrorKind::AddrNotAvailable, "Addr Not Available").into())
}
}
fn remote_addr(&self) -> Option<SocketAddr> {
self.get_selected_pair().map(|pair| pair.remote.addr())
}
async fn close(&self) -> std::result::Result<(), util::Error> {
Ok(())
}
}
+133
View File
@@ -0,0 +1,133 @@
use util::vnet::*;
use util::Conn;
use waitgroup::WaitGroup;
use super::agent_vnet_test::*;
use super::*;
use crate::agent::agent_transport::AgentConn;
pub(crate) async fn pipe(
default_config0: Option<AgentConfig>,
default_config1: Option<AgentConfig>,
) -> Result<(Arc<impl Conn>, Arc<impl Conn>, Arc<Agent>, Arc<Agent>)> {
let (a_notifier, mut a_connected) = on_connected();
let (b_notifier, mut b_connected) = on_connected();
let mut cfg0 = if let Some(cfg) = default_config0 {
cfg
} else {
AgentConfig::default()
};
cfg0.urls = vec![];
cfg0.network_types = supported_network_types();
let a_agent = Arc::new(Agent::new(cfg0).await?);
a_agent.on_connection_state_change(a_notifier);
let mut cfg1 = if let Some(cfg) = default_config1 {
cfg
} else {
AgentConfig::default()
};
cfg1.urls = vec![];
cfg1.network_types = supported_network_types();
let b_agent = Arc::new(Agent::new(cfg1).await?);
b_agent.on_connection_state_change(b_notifier);
let (a_conn, b_conn) = connect_with_vnet(&a_agent, &b_agent).await?;
// Ensure pair selected
// Note: this assumes ConnectionStateConnected is thrown after selecting the final pair
let _ = a_connected.recv().await;
let _ = b_connected.recv().await;
Ok((a_conn, b_conn, a_agent, b_agent))
}
#[tokio::test]
async fn test_remote_local_addr() -> Result<()> {
// Agent0 is behind 1:1 NAT
let nat_type0 = nat::NatType {
mode: nat::NatMode::Nat1To1,
..Default::default()
};
// Agent1 is behind 1:1 NAT
let nat_type1 = nat::NatType {
mode: nat::NatMode::Nat1To1,
..Default::default()
};
let v = build_vnet(nat_type0, nat_type1).await?;
let stun_server_url = Url {
scheme: SchemeType::Stun,
host: VNET_STUN_SERVER_IP.to_owned(),
port: VNET_STUN_SERVER_PORT,
proto: ProtoType::Udp,
..Default::default()
};
//"Disconnected Returns nil"
{
let disconnected_conn = AgentConn::new();
let result = disconnected_conn.local_addr();
assert!(result.is_err(), "Disconnected Returns nil");
}
//"Remote/Local Pair Match between Agents"
{
let (ca, cb) = pipe_with_vnet(
&v,
AgentTestConfig {
urls: vec![stun_server_url.clone()],
..Default::default()
},
AgentTestConfig {
urls: vec![stun_server_url],
..Default::default()
},
)
.await?;
let a_laddr = ca.local_addr()?;
let b_laddr = cb.local_addr()?;
// Assert addresses
assert_eq!(a_laddr.ip().to_string(), VNET_LOCAL_IPA.to_string());
assert_eq!(b_laddr.ip().to_string(), VNET_LOCAL_IPB.to_string());
// Close
//ca.close().await?;
//cb.close().await?;
}
v.close().await?;
Ok(())
}
#[tokio::test]
async fn test_conn_stats() -> Result<()> {
let (ca, cb, _, _) = pipe(None, None).await?;
let na = ca.send(&[0u8; 10]).await?;
let wg = WaitGroup::new();
let w = wg.worker();
tokio::spawn(async move {
let _d = w;
let mut buf = vec![0u8; 10];
let nb = cb.recv(&mut buf).await?;
assert_eq!(nb, 10, "bytes received don't match");
Result::<()>::Ok(())
});
wg.wait().await;
assert_eq!(na, 10, "bytes sent don't match");
Ok(())
}
File diff suppressed because it is too large. Load diff
+517
View File
@@ -0,0 +1,517 @@
#[cfg(test)]
mod agent_gather_test;
#[cfg(test)]
mod agent_test;
#[cfg(test)]
mod agent_transport_test;
#[cfg(test)]
pub(crate) mod agent_vnet_test;
pub mod agent_config;
pub mod agent_gather;
pub(crate) mod agent_internal;
pub mod agent_selector;
pub mod agent_stats;
pub mod agent_transport;
pub mod turn_tcp;
use std::collections::HashMap;
use std::future::Future;
use std::net::{Ipv4Addr, SocketAddr};
use std::pin::Pin;
use std::sync::atomic::{AtomicU8, AtomicUsize, Ordering};
use std::sync::Arc;
use std::time::SystemTime;
use agent_config::*;
use agent_internal::*;
use agent_stats::*;
use mdns::conn::*;
use stun::agent::*;
use stun::attributes::*;
use stun::fingerprint::*;
use stun::integrity::*;
use stun::message::*;
use stun::xoraddr::*;
use tokio::sync::{broadcast, mpsc, Mutex};
use tokio::time::{Duration, Instant};
use util::vnet::net::*;
use util::Buffer;
use crate::agent::agent_gather::GatherCandidatesInternalParams;
use crate::candidate::*;
use crate::error::*;
use crate::external_ip_mapper::*;
use crate::mdns::*;
use crate::network_type::*;
use crate::rand::*;
use crate::state::*;
use crate::tcp_type::TcpType;
use crate::udp_mux::UDPMux;
use crate::udp_network::UDPNetwork;
use crate::url::*;
#[derive(Debug, Clone)]
pub(crate) struct BindingRequest {
pub(crate) timestamp: Instant,
pub(crate) transaction_id: TransactionId,
pub(crate) destination: SocketAddr,
pub(crate) is_use_candidate: bool,
}
impl Default for BindingRequest {
fn default() -> Self {
Self {
timestamp: Instant::now(),
transaction_id: TransactionId::default(),
destination: SocketAddr::new(Ipv4Addr::new(0, 0, 0, 0).into(), 0),
is_use_candidate: false,
}
}
}
pub type OnConnectionStateChangeHdlrFn = Box<
dyn (FnMut(ConnectionState) -> Pin<Box<dyn Future<Output = ()> + Send + 'static>>)
+ Send
+ Sync,
>;
pub type OnSelectedCandidatePairChangeHdlrFn = Box<
dyn (FnMut(
&Arc<dyn Candidate + Send + Sync>,
&Arc<dyn Candidate + Send + Sync>,
) -> Pin<Box<dyn Future<Output = ()> + Send + 'static>>)
+ Send
+ Sync,
>;
pub type OnCandidateHdlrFn = Box<
dyn (FnMut(
Option<Arc<dyn Candidate + Send + Sync>>,
) -> Pin<Box<dyn Future<Output = ()> + Send + 'static>>)
+ Send
+ Sync,
>;
pub type GatherCandidateCancelFn = Box<dyn Fn() + Send + Sync>;
struct ChanReceivers {
chan_state_rx: mpsc::Receiver<ConnectionState>,
chan_candidate_rx: mpsc::Receiver<Option<Arc<dyn Candidate + Send + Sync>>>,
chan_candidate_pair_rx: mpsc::Receiver<()>,
}
/// Represents the ICE agent.
pub struct Agent {
pub(crate) internal: Arc<AgentInternal>,
pub(crate) udp_network: UDPNetwork,
pub(crate) interface_filter: Arc<Option<InterfaceFilterFn>>,
pub(crate) ip_filter: Arc<Option<IpFilterFn>>,
pub(crate) mdns_mode: MulticastDnsMode,
pub(crate) mdns_name: String,
pub(crate) mdns_conn: Option<Arc<DnsConn>>,
pub(crate) net: Arc<Net>,
// 1:1 D-NAT IP address mapping
pub(crate) ext_ip_mapper: Arc<Option<ExternalIpMapper>>,
pub(crate) gathering_state: Arc<AtomicU8>, //GatheringState,
pub(crate) candidate_types: Vec<CandidateType>,
pub(crate) urls: Vec<Url>,
pub(crate) network_types: Vec<NetworkType>,
pub(crate) gather_candidate_cancel: Option<GatherCandidateCancelFn>,
}
impl Agent {
/// Creates a new Agent.
pub async fn new(config: AgentConfig) -> Result<Self> {
let mut mdns_name = config.multicast_dns_host_name.clone();
if mdns_name.is_empty() {
mdns_name = generate_multicast_dns_name();
}
if !mdns_name.ends_with(".local") || mdns_name.split('.').count() != 2 {
return Err(Error::ErrInvalidMulticastDnshostName);
}
let mdns_mode = config.multicast_dns_mode;
let mdns_conn =
match create_multicast_dns(mdns_mode, &mdns_name, &config.multicast_dns_dest_addr) {
Ok(c) => c,
Err(err) => {
// Opportunistic mDNS: If we can't open the connection, that's ok: we
// can continue without it.
log::warn!("Failed to initialize mDNS {}: {}", mdns_name, err);
None
}
};
let (mut ai, chan_receivers) = AgentInternal::new(&config);
let (chan_state_rx, chan_candidate_rx, chan_candidate_pair_rx) = (
chan_receivers.chan_state_rx,
chan_receivers.chan_candidate_rx,
chan_receivers.chan_candidate_pair_rx,
);
config.init_with_defaults(&mut ai);
let candidate_types = if config.candidate_types.is_empty() {
default_candidate_types()
} else {
config.candidate_types.clone()
};
if ai.lite.load(Ordering::SeqCst)
&& (candidate_types.len() != 1 || candidate_types[0] != CandidateType::Host)
{
Self::close_multicast_conn(&mdns_conn).await;
return Err(Error::ErrLiteUsingNonHostCandidates);
}
if !config.urls.is_empty()
&& !contains_candidate_type(CandidateType::ServerReflexive, &candidate_types)
&& !contains_candidate_type(CandidateType::Relay, &candidate_types)
{
Self::close_multicast_conn(&mdns_conn).await;
return Err(Error::ErrUselessUrlsProvided);
}
let ext_ip_mapper = match config.init_ext_ip_mapping(mdns_mode, &candidate_types) {
Ok(ext_ip_mapper) => ext_ip_mapper,
Err(err) => {
Self::close_multicast_conn(&mdns_conn).await;
return Err(err);
}
};
let net = if let Some(net) = config.net {
if net.is_virtual() {
log::warn!("vnet is enabled");
if mdns_mode != MulticastDnsMode::Disabled {
log::warn!("vnet does not support mDNS yet");
}
}
net
} else {
Arc::new(Net::new(None))
};
let agent = Self {
udp_network: config.udp_network,
internal: Arc::new(ai),
interface_filter: Arc::clone(&config.interface_filter),
ip_filter: Arc::clone(&config.ip_filter),
mdns_mode,
mdns_name,
mdns_conn,
net,
ext_ip_mapper: Arc::new(ext_ip_mapper),
gathering_state: Arc::new(AtomicU8::new(0)), //GatheringState::New,
candidate_types,
urls: config.urls.clone(),
network_types: config.network_types.clone(),
gather_candidate_cancel: None, //TODO: add cancel
};
agent.internal.start_on_connection_state_change_routine(
chan_state_rx,
chan_candidate_rx,
chan_candidate_pair_rx,
);
// Restart is also used to initialize the agent for the first time
if let Err(err) = agent.restart(config.local_ufrag, config.local_pwd).await {
Self::close_multicast_conn(&agent.mdns_conn).await;
let _ = agent.close().await;
return Err(err);
}
Ok(agent)
}
pub fn get_bytes_received(&self) -> usize {
self.internal.agent_conn.bytes_received()
}
pub fn get_bytes_sent(&self) -> usize {
self.internal.agent_conn.bytes_sent()
}
/// Sets a handler that is fired when the connection state changes.
pub fn on_connection_state_change(&self, f: OnConnectionStateChangeHdlrFn) {
self.internal
.on_connection_state_change_hdlr
.store(Some(Arc::new(Mutex::new(f))))
}
/// Sets a handler that is fired when the final candidate pair is selected.
pub fn on_selected_candidate_pair_change(&self, f: OnSelectedCandidatePairChangeHdlrFn) {
self.internal
.on_selected_candidate_pair_change_hdlr
.store(Some(Arc::new(Mutex::new(f))))
}
/// Sets a handler that is fired when new candidates gathered. When the gathering process
/// complete the last candidate is nil.
pub fn on_candidate(&self, f: OnCandidateHdlrFn) {
self.internal
.on_candidate_hdlr
.store(Some(Arc::new(Mutex::new(f))));
}
/// Adds a new remote candidate.
pub fn add_remote_candidate(&self, c: &Arc<dyn Candidate + Send + Sync>) -> Result<()> {
// cannot check for network yet because it might not be applied
// when mDNS hostame is used.
if c.tcp_type() == TcpType::Active {
// TCP Candidates with tcptype active will probe server passive ones, so
// no need to do anything with them.
log::info!("Ignoring remote candidate with tcpType active: {}", c);
return Ok(());
}
// If we have a mDNS Candidate lets fully resolve it before adding it locally
if c.candidate_type() == CandidateType::Host && c.address().ends_with(".local") {
if self.mdns_mode == MulticastDnsMode::Disabled {
log::warn!(
"remote mDNS candidate added, but mDNS is disabled: ({})",
c.address()
);
return Ok(());
}
if c.candidate_type() != CandidateType::Host {
return Err(Error::ErrAddressParseFailed);
}
let ai = Arc::clone(&self.internal);
let host_candidate = Arc::clone(c);
let mdns_conn = self.mdns_conn.clone();
tokio::spawn(async move {
if let Some(mdns_conn) = mdns_conn {
if let Ok(candidate) =
Self::resolve_and_add_multicast_candidate(mdns_conn, host_candidate).await
{
ai.add_remote_candidate(&candidate).await;
}
}
});
} else {
let ai = Arc::clone(&self.internal);
let candidate = Arc::clone(c);
tokio::spawn(async move {
ai.add_remote_candidate(&candidate).await;
});
}
Ok(())
}
/// Returns the local candidates.
pub async fn get_local_candidates(&self) -> Result<Vec<Arc<dyn Candidate + Send + Sync>>> {
let mut res = vec![];
{
let local_candidates = self.internal.local_candidates.lock().await;
for candidates in local_candidates.values() {
for candidate in candidates {
res.push(Arc::clone(candidate));
}
}
}
Ok(res)
}
/// Returns the local user credentials.
pub async fn get_local_user_credentials(&self) -> (String, String) {
let ufrag_pwd = self.internal.ufrag_pwd.lock().await;
(ufrag_pwd.local_ufrag.clone(), ufrag_pwd.local_pwd.clone())
}
/// Returns the remote user credentials.
pub async fn get_remote_user_credentials(&self) -> (String, String) {
let ufrag_pwd = self.internal.ufrag_pwd.lock().await;
(ufrag_pwd.remote_ufrag.clone(), ufrag_pwd.remote_pwd.clone())
}
/// Cleans up the Agent.
pub async fn close(&self) -> Result<()> {
if let Some(gather_candidate_cancel) = &self.gather_candidate_cancel {
gather_candidate_cancel();
}
if let UDPNetwork::Muxed(ref udp_mux) = self.udp_network {
let (ufrag, _) = self.get_local_user_credentials().await;
udp_mux.remove_conn_by_ufrag(&ufrag).await;
}
//FIXME: deadlock here
self.internal.close().await
}
/// Returns the selected pair or nil if there is none
pub fn get_selected_candidate_pair(&self) -> Option<Arc<CandidatePair>> {
self.internal.agent_conn.get_selected_pair()
}
/// Sets the credentials of the remote agent.
pub async fn set_remote_credentials(
&self,
remote_ufrag: String,
remote_pwd: String,
) -> Result<()> {
self.internal
.set_remote_credentials(remote_ufrag, remote_pwd)
.await
}
/// Restarts the ICE Agent with the provided ufrag/pwd
/// If no ufrag/pwd is provided the Agent will generate one itself.
///
/// Restart must only be called when `GatheringState` is `GatheringStateComplete`
/// a user must then call `GatherCandidates` explicitly to start generating new ones.
pub async fn restart(&self, mut ufrag: String, mut pwd: String) -> Result<()> {
if ufrag.is_empty() {
ufrag = generate_ufrag();
}
if pwd.is_empty() {
pwd = generate_pwd();
}
if ufrag.len() * 8 < 24 {
return Err(Error::ErrLocalUfragInsufficientBits);
}
if pwd.len() * 8 < 128 {
return Err(Error::ErrLocalPwdInsufficientBits);
}
if GatheringState::from(self.gathering_state.load(Ordering::SeqCst))
== GatheringState::Gathering
{
return Err(Error::ErrRestartWhenGathering);
}
self.gathering_state
.store(GatheringState::New as u8, Ordering::SeqCst);
{
let done_tx = self.internal.done_tx.lock().await;
if done_tx.is_none() {
return Err(Error::ErrClosed);
}
}
// Clear all agent needed to take back to fresh state
{
let mut ufrag_pwd = self.internal.ufrag_pwd.lock().await;
ufrag_pwd.local_ufrag = ufrag;
ufrag_pwd.local_pwd = pwd;
ufrag_pwd.remote_ufrag = String::new();
ufrag_pwd.remote_pwd = String::new();
}
{
let mut pending_binding_requests = self.internal.pending_binding_requests.lock().await;
*pending_binding_requests = vec![];
}
{
let mut checklist = self.internal.agent_conn.checklist.lock().await;
*checklist = vec![];
}
self.internal.set_selected_pair(None).await;
self.internal.delete_all_candidates().await;
self.internal.start().await;
// Restart is used by NewAgent. Accept/Connect should be used to move to checking
// for new Agents
if self.internal.connection_state.load(Ordering::SeqCst) != ConnectionState::New as u8 {
self.internal
.update_connection_state(ConnectionState::Checking)
.await;
}
Ok(())
}
/// Initiates the trickle based gathering process.
pub fn gather_candidates(&self) -> Result<()> {
if self.gathering_state.load(Ordering::SeqCst) != GatheringState::New as u8 {
return Err(Error::ErrMultipleGatherAttempted);
}
if self.internal.on_candidate_hdlr.load().is_none() {
return Err(Error::ErrNoOnCandidateHandler);
}
if let Some(gather_candidate_cancel) = &self.gather_candidate_cancel {
gather_candidate_cancel(); // Cancel previous gathering routine
}
//TODO: a.gatherCandidateCancel = cancel
let params = GatherCandidatesInternalParams {
udp_network: self.udp_network.clone(),
candidate_types: self.candidate_types.clone(),
urls: self.urls.clone(),
network_types: self.network_types.clone(),
mdns_mode: self.mdns_mode,
mdns_name: self.mdns_name.clone(),
net: Arc::clone(&self.net),
interface_filter: self.interface_filter.clone(),
ip_filter: self.ip_filter.clone(),
ext_ip_mapper: Arc::clone(&self.ext_ip_mapper),
agent_internal: Arc::clone(&self.internal),
gathering_state: Arc::clone(&self.gathering_state),
chan_candidate_tx: Arc::clone(&self.internal.chan_candidate_tx),
};
tokio::spawn(async move {
Self::gather_candidates_internal(params).await;
});
Ok(())
}
/// Returns a list of candidate pair stats.
pub async fn get_candidate_pairs_stats(&self) -> Vec<CandidatePairStats> {
self.internal.get_candidate_pairs_stats().await
}
/// Returns a list of local candidates stats.
pub async fn get_local_candidates_stats(&self) -> Vec<CandidateStats> {
self.internal.get_local_candidates_stats().await
}
/// Returns a list of remote candidates stats.
pub async fn get_remote_candidates_stats(&self) -> Vec<CandidateStats> {
self.internal.get_remote_candidates_stats().await
}
async fn resolve_and_add_multicast_candidate(
mdns_conn: Arc<DnsConn>,
c: Arc<dyn Candidate + Send + Sync>,
) -> Result<Arc<dyn Candidate + Send + Sync>> {
//TODO: hook up _close_query_signal_tx to Agent or Candidate's Close signal?
let (_close_query_signal_tx, close_query_signal_rx) = mpsc::channel(1);
let src = match mdns_conn.query(&c.address(), close_query_signal_rx).await {
Ok((_, src)) => src,
Err(err) => {
log::warn!("Failed to discover mDNS candidate {}: {}", c.address(), err);
return Err(err.into());
}
};
c.set_ip(&src.ip())?;
Ok(c)
}
async fn close_multicast_conn(mdns_conn: &Option<Arc<DnsConn>>) {
if let Some(conn) = mdns_conn {
if let Err(err) = conn.close().await {
log::warn!("failed to close mDNS Conn: {}", err);
}
}
}
}
+205
View File
@@ -0,0 +1,205 @@
//! TURN over TCP/TLS (RFC 6062 framing as used by RFC 5766 §2.1), optionally through an HTTP
//! CONNECT proxy. Local patch for uu-remote-linux: upstream only gathers relays over UDP.
use std::net::{IpAddr, SocketAddr};
use std::sync::{Arc, RwLock};
use async_trait::async_trait;
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadHalf, WriteHalf};
use tokio::net::TcpStream;
use tokio::sync::Mutex;
use util::Conn;
/// How relay connections over TCP reach the TURN server. Set once by the application.
#[derive(Clone, Debug, Default)]
pub struct RelayTransport {
/// HTTP proxy `host:port` for CONNECT; None dials the TURN server directly.
pub http_proxy: Option<String>,
}
static TRANSPORT: RwLock<Option<RelayTransport>> = RwLock::new(None);
pub fn set_relay_transport(transport: RelayTransport) {
*TRANSPORT.write().unwrap() = Some(transport);
}
fn transport() -> RelayTransport {
TRANSPORT.read().unwrap().clone().unwrap_or_default()
}
/// TCP/TLS relays are gathered only after the application opts in; UDP-only by default.
pub fn enabled() -> bool {
TRANSPORT.read().unwrap().is_some()
}
trait Stream: AsyncRead + AsyncWrite + Send + Unpin {}
impl<T: AsyncRead + AsyncWrite + Send + Unpin> Stream for T {}
/// Datagram view of a framed TURN stream: one STUN message or ChannelData per read.
pub struct FramedConn {
reader: Mutex<ReadHalf<Box<dyn Stream>>>,
writer: Mutex<WriteHalf<Box<dyn Stream>>>,
local: SocketAddr,
server: SocketAddr,
}
/// Opens TCP (optionally through the proxy) and TLS when `tls`, then frames it.
pub async fn dial(host: &str, port: u16, server: SocketAddr, tls: bool) -> Result<FramedConn, String> {
let settings = transport();
let target = format!("{host}:{port}");
let tcp = match &settings.http_proxy {
Some(proxy) => connect_via_proxy(proxy, &target).await?,
None => TcpStream::connect(server).await.map_err(|e| format!("TURN TCP connect: {e}"))?,
};
let local = tcp.local_addr().map_err(|e| format!("TURN TCP local address: {e}"))?;
let stream: Box<dyn Stream> = if tls {
Box::new(tls_connect(tcp, host).await?)
} else {
Box::new(tcp)
};
let (reader, writer) = tokio::io::split(stream);
Ok(FramedConn { reader: Mutex::new(reader), writer: Mutex::new(writer), local, server })
}
async fn connect_via_proxy(proxy: &str, target: &str) -> Result<TcpStream, String> {
let mut tcp = TcpStream::connect(proxy).await.map_err(|e| format!("TURN proxy connect: {e}"))?;
let request = format!("CONNECT {target} HTTP/1.1\r\nHost: {target}\r\n\r\n");
tcp.write_all(request.as_bytes()).await.map_err(|e| format!("TURN proxy write: {e}"))?;
// Read byte by byte up to the blank line so no tunnelled bytes are consumed.
let mut head = Vec::new();
while !head.ends_with(b"\r\n\r\n") {
if head.len() > 8192 { return Err("TURN proxy response too large".into()); }
let mut byte = [0u8; 1];
if tcp.read(&mut byte).await.map_err(|e| format!("TURN proxy read: {e}"))? == 0 {
return Err("TURN proxy closed the connection".into());
}
head.push(byte[0]);
}
let status = String::from_utf8_lossy(&head).lines().next().unwrap_or("").to_owned();
match status.split_whitespace().nth(1) {
Some("200") => Ok(tcp),
code => Err(format!("TURN proxy CONNECT refused: status={}", code.unwrap_or("none"))),
}
}
async fn tls_connect(tcp: TcpStream, host: &str)
-> Result<tokio_rustls::client::TlsStream<TcpStream>, String> {
use tokio_rustls::rustls::{self, client::WebPkiServerVerifier, pki_types::ServerName};
let provider = Arc::new(rustls::crypto::ring::default_provider());
// System store first (it holds any CA the host's administrator added, e.g. for a TLS-inspecting
// proxy, as OpenSSL would use), then the bundled Mozilla roots.
let mut roots = rustls::RootCertStore::empty();
roots.add_parsable_certificates(rustls_native_certs::load_native_certs().certs);
roots.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
let inner = WebPkiServerVerifier::builder_with_provider(Arc::new(roots), provider.clone()).build()
.map_err(|e| format!("TURN TLS setup: {e}"))?;
let config = rustls::ClientConfig::builder_with_provider(provider)
.with_safe_default_protocol_versions().map_err(|e| format!("TURN TLS setup: {e}"))?
.dangerous().with_custom_certificate_verifier(Arc::new(IpTolerant(inner))).with_no_client_auth();
let name = match host.parse::<IpAddr>() {
Ok(ip) => ServerName::IpAddress(ip.into()),
Err(_) => ServerName::try_from(host.to_owned()).map_err(|_| "TURN TLS: invalid server name".to_owned())?,
};
tokio_rustls::TlsConnector::from(Arc::new(config)).connect(name, tcp).await
.map_err(|e| format!("TURN TLS handshake: {e}"))
}
/// Full chain verification; only a name mismatch is accepted, and only when the TURN URL is an
/// IP literal (cloud TURN URLs are IPs while certificates name the service). Media is protected
/// end to end by DTLS-SRTP with signalled fingerprints, not by this hop.
#[derive(Debug)]
struct IpTolerant(Arc<tokio_rustls::rustls::client::WebPkiServerVerifier>);
impl tokio_rustls::rustls::client::danger::ServerCertVerifier for IpTolerant {
fn verify_server_cert(&self, end_entity: &tokio_rustls::rustls::pki_types::CertificateDer<'_>,
intermediates: &[tokio_rustls::rustls::pki_types::CertificateDer<'_>],
server_name: &tokio_rustls::rustls::pki_types::ServerName<'_>, ocsp: &[u8],
now: tokio_rustls::rustls::pki_types::UnixTime)
-> Result<tokio_rustls::rustls::client::danger::ServerCertVerified, tokio_rustls::rustls::Error> {
use tokio_rustls::rustls::{CertificateError, Error, pki_types::ServerName};
match self.0.verify_server_cert(end_entity, intermediates, server_name, ocsp, now) {
Err(Error::InvalidCertificate(CertificateError::NotValidForName | CertificateError::NotValidForNameContext { .. }))
if matches!(server_name, ServerName::IpAddress(_)) =>
Ok(tokio_rustls::rustls::client::danger::ServerCertVerified::assertion()),
other => other,
}
}
fn verify_tls12_signature(&self, message: &[u8], cert: &tokio_rustls::rustls::pki_types::CertificateDer<'_>,
dss: &tokio_rustls::rustls::DigitallySignedStruct)
-> Result<tokio_rustls::rustls::client::danger::HandshakeSignatureValid, tokio_rustls::rustls::Error> {
self.0.verify_tls12_signature(message, cert, dss)
}
fn verify_tls13_signature(&self, message: &[u8], cert: &tokio_rustls::rustls::pki_types::CertificateDer<'_>,
dss: &tokio_rustls::rustls::DigitallySignedStruct)
-> Result<tokio_rustls::rustls::client::danger::HandshakeSignatureValid, tokio_rustls::rustls::Error> {
self.0.verify_tls13_signature(message, cert, dss)
}
fn supported_verify_schemes(&self) -> Vec<tokio_rustls::rustls::SignatureScheme> {
self.0.supported_verify_schemes()
}
}
/// Total on-the-wire length of the frame starting with `header` (4 bytes), including
/// ChannelData padding to 4 bytes, which TCP carries (RFC 5766 §11.5).
pub fn frame_len(header: [u8; 4]) -> Option<usize> {
let length = u16::from_be_bytes([header[2], header[3]]) as usize;
match header[0] >> 6 {
0 => Some(20 + length), // STUN: 20-byte header + attributes
1 => Some(4 + (length + 3) / 4 * 4), // ChannelData 0x4000..0x7FFF
_ => None,
}
}
/// An HTTP reply inside the relay stream means a proxy is inspecting the (TLS) content;
/// "HT" would otherwise parse as a ChannelData header.
pub fn is_http_reply(header: [u8; 4]) -> bool {
&header == b"HTTP"
}
#[async_trait]
impl Conn for FramedConn {
async fn connect(&self, _: SocketAddr) -> util::Result<()> {
Err(util::Error::Other("TURN TCP connection is already connected".into()))
}
async fn recv(&self, buf: &mut [u8]) -> util::Result<usize> {
self.recv_from(buf).await.map(|(n, _)| n)
}
async fn recv_from(&self, buf: &mut [u8]) -> util::Result<(usize, SocketAddr)> {
let mut reader = self.reader.lock().await;
let mut header = [0u8; 4];
reader.read_exact(&mut header).await?;
if is_http_reply(header) {
return Err(util::Error::Other(
"TURN TCP: got an HTTP response instead of TURN; a proxy is inspecting the TLS content, TURN cannot pass through it".into(),
));
}
let total = frame_len(header).ok_or_else(|| util::Error::Other("TURN TCP: unknown frame type".into()))?;
let mut frame = vec![0u8; total];
frame[..4].copy_from_slice(&header);
reader.read_exact(&mut frame[4..]).await?;
if frame.len() > buf.len() {
return Err(util::Error::Other("TURN TCP: frame larger than the read buffer".into()));
}
buf[..frame.len()].copy_from_slice(&frame);
Ok((frame.len(), self.server))
}
async fn send(&self, buf: &[u8]) -> util::Result<usize> {
let mut writer = self.writer.lock().await;
writer.write_all(buf).await?;
writer.flush().await?;
Ok(buf.len())
}
async fn send_to(&self, buf: &[u8], _: SocketAddr) -> util::Result<usize> {
self.send(buf).await
}
fn local_addr(&self) -> util::Result<SocketAddr> {
Ok(self.local)
}
fn remote_addr(&self) -> Option<SocketAddr> {
Some(self.server)
}
async fn close(&self) -> util::Result<()> {
let _ = self.writer.lock().await.shutdown().await;
Ok(())
}
}
+524
View File
@@ -0,0 +1,524 @@
use std::fmt;
use std::ops::Add;
use std::sync::atomic::{AtomicU16, AtomicU64, AtomicU8, Ordering};
use std::sync::Arc;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
use async_trait::async_trait;
use crc::{Crc, CRC_32_ISCSI};
use tokio::sync::{broadcast, Mutex};
use util::sync::Mutex as SyncMutex;
use super::*;
use crate::candidate::candidate_host::CandidateHostConfig;
use crate::candidate::candidate_peer_reflexive::CandidatePeerReflexiveConfig;
use crate::candidate::candidate_relay::CandidateRelayConfig;
use crate::candidate::candidate_server_reflexive::CandidateServerReflexiveConfig;
use crate::error::*;
use crate::util::*;
#[derive(Default)]
pub struct CandidateBaseConfig {
pub candidate_id: String,
pub network: String,
pub address: String,
pub port: u16,
pub component: u16,
pub priority: u32,
pub foundation: String,
pub conn: Option<Arc<dyn util::Conn + Send + Sync>>,
pub initialized_ch: Option<broadcast::Receiver<()>>,
}
pub struct CandidateBase {
pub(crate) id: String,
pub(crate) network_type: AtomicU8,
pub(crate) candidate_type: CandidateType,
pub(crate) component: AtomicU16,
pub(crate) address: String,
pub(crate) port: u16,
pub(crate) related_address: Option<CandidateRelatedAddress>,
pub(crate) tcp_type: TcpType,
pub(crate) resolved_addr: SyncMutex<SocketAddr>,
pub(crate) last_sent: AtomicU64,
pub(crate) last_received: AtomicU64,
pub(crate) conn: Option<Arc<dyn util::Conn + Send + Sync>>,
pub(crate) closed_ch: Arc<Mutex<Option<broadcast::Sender<()>>>>,
pub(crate) foundation_override: String,
pub(crate) priority_override: u32,
//CandidateHost
pub(crate) network: String,
//CandidateRelay
pub(crate) relay_client: Option<Arc<turn::client::Client>>,
}
impl Default for CandidateBase {
fn default() -> Self {
Self {
id: String::new(),
network_type: AtomicU8::new(0),
candidate_type: CandidateType::default(),
component: AtomicU16::new(0),
address: String::new(),
port: 0,
related_address: None,
tcp_type: TcpType::default(),
resolved_addr: SyncMutex::new(SocketAddr::new(IpAddr::from([0, 0, 0, 0]), 0)),
last_sent: AtomicU64::new(0),
last_received: AtomicU64::new(0),
conn: None,
closed_ch: Arc::new(Mutex::new(None)),
foundation_override: String::new(),
priority_override: 0,
network: String::new(),
relay_client: None,
}
}
}
// String makes the candidateBase printable
impl fmt::Display for CandidateBase {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if let Some(related_address) = self.related_address() {
write!(
f,
"{} {} {}:{}{}",
self.network_type(),
self.candidate_type(),
self.address(),
self.port(),
related_address,
)
} else {
write!(
f,
"{} {} {}:{}",
self.network_type(),
self.candidate_type(),
self.address(),
self.port(),
)
}
}
}
#[async_trait]
impl Candidate for CandidateBase {
fn foundation(&self) -> String {
if !self.foundation_override.is_empty() {
return self.foundation_override.clone();
}
let mut buf = vec![];
buf.extend_from_slice(self.candidate_type().to_string().as_bytes());
buf.extend_from_slice(self.address.as_bytes());
buf.extend_from_slice(self.network_type().to_string().as_bytes());
let checksum = Crc::<u32>::new(&CRC_32_ISCSI).checksum(&buf);
format!("{checksum}")
}
/// Returns Candidate ID.
fn id(&self) -> String {
self.id.clone()
}
/// Returns candidate component.
fn component(&self) -> u16 {
self.component.load(Ordering::SeqCst)
}
fn set_component(&self, component: u16) {
self.component.store(component, Ordering::SeqCst);
}
/// Returns a time indicating the last time this candidate was received.
fn last_received(&self) -> SystemTime {
UNIX_EPOCH.add(Duration::from_nanos(
self.last_received.load(Ordering::SeqCst),
))
}
/// Returns a time indicating the last time this candidate was sent.
fn last_sent(&self) -> SystemTime {
UNIX_EPOCH.add(Duration::from_nanos(self.last_sent.load(Ordering::SeqCst)))
}
/// Returns candidate NetworkType.
fn network_type(&self) -> NetworkType {
NetworkType::from(self.network_type.load(Ordering::SeqCst))
}
/// Returns Candidate Address.
fn address(&self) -> String {
self.address.clone()
}
/// Returns Candidate Port.
fn port(&self) -> u16 {
self.port
}
/// Computes the priority for this ICE Candidate.
fn priority(&self) -> u32 {
if self.priority_override != 0 {
return self.priority_override;
}
// The local preference MUST be an integer from 0 (lowest preference) to
// 65535 (highest preference) inclusive. When there is only a single IP
// address, this value SHOULD be set to 65535. If there are multiple
// candidates for a particular component for a particular data stream
// that have the same type, the local preference MUST be unique for each
// one.
(1 << 24) * u32::from(self.candidate_type().preference())
+ (1 << 8) * u32::from(self.local_preference())
+ (256 - u32::from(self.component()))
}
/// Returns `Option<CandidateRelatedAddress>`.
fn related_address(&self) -> Option<CandidateRelatedAddress> {
self.related_address.as_ref().cloned()
}
/// Returns candidate type.
fn candidate_type(&self) -> CandidateType {
self.candidate_type
}
fn tcp_type(&self) -> TcpType {
self.tcp_type
}
/// Returns the string representation of the ICECandidate.
fn marshal(&self) -> String {
let mut val = format!(
"{} {} {} {} {} {} typ {}",
self.foundation(),
self.component(),
self.network_type().network_short(),
self.priority(),
self.address(),
self.port(),
self.candidate_type()
);
if self.tcp_type != TcpType::Unspecified {
val += format!(" tcptype {}", self.tcp_type()).as_str();
}
if let Some(related_address) = self.related_address() {
val += format!(
" raddr {} rport {}",
related_address.address, related_address.port,
)
.as_str();
}
val
}
fn addr(&self) -> SocketAddr {
*self.resolved_addr.lock()
}
/// Stops the recvLoop.
async fn close(&self) -> Result<()> {
{
let mut closed_ch = self.closed_ch.lock().await;
if closed_ch.is_none() {
return Err(Error::ErrClosed);
}
closed_ch.take();
}
if let Some(relay_client) = &self.relay_client {
let _ = relay_client.close().await;
}
if let Some(conn) = &self.conn {
let _ = conn.close().await;
}
Ok(())
}
fn seen(&self, outbound: bool) {
let d = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_else(|_| Duration::from_secs(0));
if outbound {
self.set_last_sent(d);
} else {
self.set_last_received(d);
}
}
async fn write_to(&self, raw: &[u8], dst: &(dyn Candidate + Send + Sync)) -> Result<usize> {
let n = if let Some(conn) = &self.conn {
let addr = dst.addr();
conn.send_to(raw, addr).await?
} else {
0
};
self.seen(true);
Ok(n)
}
/// Used to compare two candidateBases.
fn equal(&self, other: &dyn Candidate) -> bool {
self.network_type() == other.network_type()
&& self.candidate_type() == other.candidate_type()
&& self.address() == other.address()
&& self.port() == other.port()
&& self.tcp_type() == other.tcp_type()
&& self.related_address() == other.related_address()
}
fn set_ip(&self, ip: &IpAddr) -> Result<()> {
let network_type = determine_network_type(&self.network, ip)?;
self.network_type
.store(network_type as u8, Ordering::SeqCst);
let addr = create_addr(network_type, *ip, self.port);
*self.resolved_addr.lock() = addr;
Ok(())
}
fn get_conn(&self) -> Option<&Arc<dyn util::Conn + Send + Sync>> {
self.conn.as_ref()
}
fn get_closed_ch(&self) -> Arc<Mutex<Option<broadcast::Sender<()>>>> {
self.closed_ch.clone()
}
}
impl CandidateBase {
pub fn set_last_received(&self, d: Duration) {
#[allow(clippy::cast_possible_truncation)]
self.last_received
.store(d.as_nanos() as u64, Ordering::SeqCst);
}
pub fn set_last_sent(&self, d: Duration) {
#[allow(clippy::cast_possible_truncation)]
self.last_sent.store(d.as_nanos() as u64, Ordering::SeqCst);
}
/// Returns the local preference for this candidate.
pub fn local_preference(&self) -> u16 {
if self.network_type().is_tcp() {
// RFC 6544, section 4.2
//
// In Section 4.1.2.1 of [RFC5245], a recommended formula for UDP ICE
// candidate prioritization is defined. For TCP candidates, the same
// formula and candidate type preferences SHOULD be used, and the
// RECOMMENDED type preferences for the new candidate types defined in
// this document (see Section 5) are 105 for NAT-assisted candidates and
// 75 for UDP-tunneled candidates.
//
// (...)
//
// With TCP candidates, the local preference part of the recommended
// priority formula is updated to also include the directionality
// (active, passive, or simultaneous-open) of the TCP connection. The
// RECOMMENDED local preference is then defined as:
//
// local preference = (2^13) * direction-pref + other-pref
//
// The direction-pref MUST be between 0 and 7 (both inclusive), with 7
// being the most preferred. The other-pref MUST be between 0 and 8191
// (both inclusive), with 8191 being the most preferred. It is
// RECOMMENDED that the host, UDP-tunneled, and relayed TCP candidates
// have the direction-pref assigned as follows: 6 for active, 4 for
// passive, and 2 for S-O. For the NAT-assisted and server reflexive
// candidates, the RECOMMENDED values are: 6 for S-O, 4 for active, and
// 2 for passive.
//
// (...)
//
// If any two candidates have the same type-preference and direction-
// pref, they MUST have a unique other-pref. With this specification,
// this usually only happens with multi-homed hosts, in which case
// other-pref is the preference for the particular IP address from which
// the candidate was obtained. When there is only a single IP address,
// this value SHOULD be set to the maximum allowed value (8191).
let other_pref: u16 = 8191;
let direction_pref: u16 = match self.candidate_type() {
CandidateType::Host | CandidateType::Relay => match self.tcp_type() {
TcpType::Active => 6,
TcpType::Passive => 4,
TcpType::SimultaneousOpen => 2,
TcpType::Unspecified => 0,
},
CandidateType::PeerReflexive | CandidateType::ServerReflexive => {
match self.tcp_type() {
TcpType::SimultaneousOpen => 6,
TcpType::Active => 4,
TcpType::Passive => 2,
TcpType::Unspecified => 0,
}
}
CandidateType::Unspecified => 0,
};
(1 << 13) * direction_pref + other_pref
} else {
DEFAULT_LOCAL_PREFERENCE
}
}
}
/// Creates a Candidate from its string representation.
pub fn unmarshal_candidate(raw: &str) -> Result<impl Candidate> {
let split: Vec<&str> = raw.split_whitespace().collect();
if split.len() < 8 {
return Err(Error::Other(format!(
"{:?} ({})",
Error::ErrAttributeTooShortIceCandidate,
split.len()
)));
}
// Foundation
let foundation = split[0].to_owned();
// Component
let component: u16 = split[1].parse()?;
// Network
let network = split[2].to_owned();
// Priority
let priority: u32 = split[3].parse()?;
// Address
let address = split[4].to_owned();
// Port
let port: u16 = split[5].parse()?;
let typ = split[7];
let mut rel_addr = String::new();
let mut rel_port = 0;
let mut tcp_type = TcpType::Unspecified;
if split.len() > 8 {
let split2 = &split[8..];
if split2[0] == "raddr" {
if split2.len() < 4 {
return Err(Error::Other(format!(
"{:?}: incorrect length",
Error::ErrParseRelatedAddr
)));
}
// RelatedAddress
rel_addr = split2[1].to_owned();
// RelatedPort
rel_port = split2[3].parse()?;
} else if split2[0] == "tcptype" {
if split2.len() < 2 {
return Err(Error::Other(format!(
"{:?}: incorrect length",
Error::ErrParseType
)));
}
tcp_type = TcpType::from(split2[1]);
}
}
match typ {
"host" => {
let config = CandidateHostConfig {
base_config: CandidateBaseConfig {
network,
address,
port,
component,
priority,
foundation,
..CandidateBaseConfig::default()
},
tcp_type,
};
config.new_candidate_host()
}
"srflx" => {
let config = CandidateServerReflexiveConfig {
base_config: CandidateBaseConfig {
network,
address,
port,
component,
priority,
foundation,
..CandidateBaseConfig::default()
},
rel_addr,
rel_port,
};
config.new_candidate_server_reflexive()
}
"prflx" => {
let config = CandidatePeerReflexiveConfig {
base_config: CandidateBaseConfig {
network,
address,
port,
component,
priority,
foundation,
..CandidateBaseConfig::default()
},
rel_addr,
rel_port,
};
config.new_candidate_peer_reflexive()
}
"relay" => {
let config = CandidateRelayConfig {
base_config: CandidateBaseConfig {
network,
address,
port,
component,
priority,
foundation,
..CandidateBaseConfig::default()
},
rel_addr,
rel_port,
..CandidateRelayConfig::default()
};
config.new_candidate_relay()
}
_ => Err(Error::Other(format!(
"{:?} ({})",
Error::ErrUnknownCandidateType,
typ
))),
}
}
+45
View File
@@ -0,0 +1,45 @@
use std::sync::atomic::{AtomicU16, AtomicU8};
use super::candidate_base::*;
use super::*;
use crate::rand::generate_cand_id;
/// The config required to create a new `CandidateHost`.
#[derive(Default)]
pub struct CandidateHostConfig {
pub base_config: CandidateBaseConfig,
pub tcp_type: TcpType,
}
impl CandidateHostConfig {
/// Creates a new host candidate.
pub fn new_candidate_host(self) -> Result<CandidateBase> {
let mut candidate_id = self.base_config.candidate_id;
if candidate_id.is_empty() {
candidate_id = generate_cand_id();
}
let c = CandidateBase {
id: candidate_id,
address: self.base_config.address.clone(),
candidate_type: CandidateType::Host,
component: AtomicU16::new(self.base_config.component),
port: self.base_config.port,
tcp_type: self.tcp_type,
foundation_override: self.base_config.foundation,
priority_override: self.base_config.priority,
network: self.base_config.network,
network_type: AtomicU8::new(NetworkType::Udp4 as u8),
conn: self.base_config.conn,
..CandidateBase::default()
};
if !self.base_config.address.ends_with(".local") {
let ip = self.base_config.address.parse()?;
c.set_ip(&ip)?;
};
Ok(c)
}
}
+155
View File
@@ -0,0 +1,155 @@
use super::*;
use crate::candidate::candidate_host::CandidateHostConfig;
use crate::candidate::candidate_peer_reflexive::CandidatePeerReflexiveConfig;
use crate::candidate::candidate_relay::CandidateRelayConfig;
use crate::candidate::candidate_server_reflexive::CandidateServerReflexiveConfig;
pub(crate) fn host_candidate() -> Result<CandidateBase> {
CandidateHostConfig {
base_config: CandidateBaseConfig {
network: "udp".to_owned(),
address: "0.0.0.0".to_owned(),
component: COMPONENT_RTP,
..Default::default()
},
..Default::default()
}
.new_candidate_host()
}
pub(crate) fn prflx_candidate() -> Result<CandidateBase> {
CandidatePeerReflexiveConfig {
base_config: CandidateBaseConfig {
network: "udp".to_owned(),
address: "0.0.0.0".to_owned(),
component: COMPONENT_RTP,
..Default::default()
},
..Default::default()
}
.new_candidate_peer_reflexive()
}
pub(crate) fn srflx_candidate() -> Result<CandidateBase> {
CandidateServerReflexiveConfig {
base_config: CandidateBaseConfig {
network: "udp".to_owned(),
address: "0.0.0.0".to_owned(),
component: COMPONENT_RTP,
..Default::default()
},
..Default::default()
}
.new_candidate_server_reflexive()
}
pub(crate) fn relay_candidate() -> Result<CandidateBase> {
CandidateRelayConfig {
base_config: CandidateBaseConfig {
network: "udp".to_owned(),
address: "0.0.0.0".to_owned(),
component: COMPONENT_RTP,
..Default::default()
},
..Default::default()
}
.new_candidate_relay()
}
#[test]
fn test_candidate_pair_priority() -> Result<()> {
let tests = vec![
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(host_candidate()?),
false,
),
9151314440652587007,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(host_candidate()?),
true,
),
9151314440652587007,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(prflx_candidate()?),
true,
),
7998392936314175488,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(prflx_candidate()?),
false,
),
7998392936314175487,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(srflx_candidate()?),
true,
),
7277816996102668288,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(srflx_candidate()?),
false,
),
7277816996102668287,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(relay_candidate()?),
true,
),
72057593987596288,
),
(
CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(relay_candidate()?),
false,
),
72057593987596287,
),
];
for (pair, want) in tests {
let got = pair.priority();
assert_eq!(
got, want,
"CandidatePair({pair}).Priority() = {got}, want {want}"
);
}
Ok(())
}
#[test]
fn test_candidate_pair_equality() -> Result<()> {
let pair_a = CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(srflx_candidate()?),
true,
);
let pair_b = CandidatePair::new(
Arc::new(host_candidate()?),
Arc::new(srflx_candidate()?),
false,
);
assert_eq!(pair_a, pair_b, "Expected {pair_a} to equal {pair_b}");
Ok(())
}
@@ -0,0 +1,54 @@
use std::sync::atomic::{AtomicU16, AtomicU8};
use util::sync::Mutex as SyncMutex;
use super::candidate_base::*;
use super::*;
use crate::error::*;
use crate::rand::generate_cand_id;
use crate::util::*;
/// The config required to create a new `CandidatePeerReflexive`.
#[derive(Default)]
pub struct CandidatePeerReflexiveConfig {
pub base_config: CandidateBaseConfig,
pub rel_addr: String,
pub rel_port: u16,
}
impl CandidatePeerReflexiveConfig {
/// Creates a new peer reflective candidate.
pub fn new_candidate_peer_reflexive(self) -> Result<CandidateBase> {
let ip: IpAddr = match self.base_config.address.parse() {
Ok(ip) => ip,
Err(_) => return Err(Error::ErrAddressParseFailed),
};
let network_type = determine_network_type(&self.base_config.network, &ip)?;
let mut candidate_id = self.base_config.candidate_id;
if candidate_id.is_empty() {
candidate_id = generate_cand_id();
}
let c = CandidateBase {
id: candidate_id,
network_type: AtomicU8::new(network_type as u8),
candidate_type: CandidateType::PeerReflexive,
address: self.base_config.address,
port: self.base_config.port,
resolved_addr: SyncMutex::new(create_addr(network_type, ip, self.base_config.port)),
component: AtomicU16::new(self.base_config.component),
foundation_override: self.base_config.foundation,
priority_override: self.base_config.priority,
related_address: Some(CandidateRelatedAddress {
address: self.rel_addr,
port: self.rel_port,
}),
conn: self.base_config.conn,
..CandidateBase::default()
};
Ok(c)
}
}
+57
View File
@@ -0,0 +1,57 @@
use std::sync::atomic::{AtomicU16, AtomicU8};
use std::sync::Arc;
use util::sync::Mutex as SyncMutex;
use super::candidate_base::*;
use super::*;
use crate::error::*;
use crate::rand::generate_cand_id;
use crate::util::*;
/// The config required to create a new `CandidateRelay`.
#[derive(Default)]
pub struct CandidateRelayConfig {
pub base_config: CandidateBaseConfig,
pub rel_addr: String,
pub rel_port: u16,
pub relay_client: Option<Arc<turn::client::Client>>,
}
impl CandidateRelayConfig {
/// Creates a new relay candidate.
pub fn new_candidate_relay(self) -> Result<CandidateBase> {
let mut candidate_id = self.base_config.candidate_id;
if candidate_id.is_empty() {
candidate_id = generate_cand_id();
}
let ip: IpAddr = match self.base_config.address.parse() {
Ok(ip) => ip,
Err(_) => return Err(Error::ErrAddressParseFailed),
};
let network_type = determine_network_type(&self.base_config.network, &ip)?;
let c = CandidateBase {
id: candidate_id,
network_type: AtomicU8::new(network_type as u8),
candidate_type: CandidateType::Relay,
address: self.base_config.address,
port: self.base_config.port,
resolved_addr: SyncMutex::new(create_addr(network_type, ip, self.base_config.port)),
component: AtomicU16::new(self.base_config.component),
foundation_override: self.base_config.foundation,
priority_override: self.base_config.priority,
related_address: Some(CandidateRelatedAddress {
address: self.rel_addr,
port: self.rel_port,
}),
conn: self.base_config.conn,
relay_client: self.relay_client.clone(),
..CandidateBase::default()
};
Ok(c)
}
}
+114
View File
@@ -0,0 +1,114 @@
use std::result::Result;
use std::time::Duration;
use tokio::net::UdpSocket;
use turn::auth::AuthHandler;
use super::*;
use crate::agent::agent_config::AgentConfig;
use crate::agent::agent_vnet_test::{connect_with_vnet, on_connected};
use crate::agent::Agent;
use crate::error::Error;
use crate::url::{ProtoType, SchemeType, Url};
pub(crate) struct OptimisticAuthHandler;
impl AuthHandler for OptimisticAuthHandler {
fn auth_handle(
&self,
_username: &str,
_realm: &str,
_src_addr: SocketAddr,
) -> Result<Vec<u8>, turn::Error> {
Ok(turn::auth::generate_auth_key(
"username",
"webrtc.rs",
"password",
))
}
}
//use std::io::Write;
#[tokio::test]
async fn test_relay_only_connection() -> Result<(), Error> {
/*env_logger::Builder::new()
.format(|buf, record| {
writeln!(
buf,
"{}:{} [{}] {} - {}",
record.file().unwrap_or("unknown"),
record.line().unwrap_or(0),
record.level(),
chrono::Local::now().format("%H:%M:%S.%6f"),
record.args()
)
})
.filter(None, log::LevelFilter::Trace)
.init();*/
let server_listener = Arc::new(UdpSocket::bind("127.0.0.1:0").await?);
let server_port = server_listener.local_addr()?.port();
let server = turn::server::Server::new(turn::server::config::ServerConfig {
realm: "webrtc.rs".to_owned(),
auth_handler: Arc::new(OptimisticAuthHandler {}),
conn_configs: vec![turn::server::config::ConnConfig {
conn: server_listener,
relay_addr_generator: Box::new(turn::relay::relay_none::RelayAddressGeneratorNone {
address: "127.0.0.1".to_owned(),
net: Arc::new(util::vnet::net::Net::new(None)),
}),
}],
channel_bind_timeout: Duration::from_secs(0),
alloc_close_notify: None,
})
.await?;
let cfg0 = AgentConfig {
network_types: supported_network_types(),
urls: vec![Url {
scheme: SchemeType::Turn,
host: "127.0.0.1".to_owned(),
username: "username".to_owned(),
password: "password".to_owned(),
port: server_port,
proto: ProtoType::Udp,
}],
candidate_types: vec![CandidateType::Relay],
..Default::default()
};
let a_agent = Arc::new(Agent::new(cfg0).await?);
let (a_notifier, mut a_connected) = on_connected();
a_agent.on_connection_state_change(a_notifier);
let cfg1 = AgentConfig {
network_types: supported_network_types(),
urls: vec![Url {
scheme: SchemeType::Turn,
host: "127.0.0.1".to_owned(),
username: "username".to_owned(),
password: "password".to_owned(),
port: server_port,
proto: ProtoType::Udp,
}],
candidate_types: vec![CandidateType::Relay],
..Default::default()
};
let b_agent = Arc::new(Agent::new(cfg1).await?);
let (b_notifier, mut b_connected) = on_connected();
b_agent.on_connection_state_change(b_notifier);
connect_with_vnet(&a_agent, &b_agent).await?;
let _ = a_connected.recv().await;
let _ = b_connected.recv().await;
a_agent.close().await?;
b_agent.close().await?;
server.close().await?;
Ok(())
}
@@ -0,0 +1,54 @@
use std::sync::atomic::{AtomicU16, AtomicU8};
use util::sync::Mutex as SyncMutex;
use super::candidate_base::*;
use super::*;
use crate::error::*;
use crate::rand::generate_cand_id;
use crate::util::*;
/// The config required to create a new `CandidateServerReflexive`.
#[derive(Default)]
pub struct CandidateServerReflexiveConfig {
pub base_config: CandidateBaseConfig,
pub rel_addr: String,
pub rel_port: u16,
}
impl CandidateServerReflexiveConfig {
/// Creates a new server reflective candidate.
pub fn new_candidate_server_reflexive(self) -> Result<CandidateBase> {
let ip: IpAddr = match self.base_config.address.parse() {
Ok(ip) => ip,
Err(_) => return Err(Error::ErrAddressParseFailed),
};
let network_type = determine_network_type(&self.base_config.network, &ip)?;
let mut candidate_id = self.base_config.candidate_id;
if candidate_id.is_empty() {
candidate_id = generate_cand_id();
}
let c = CandidateBase {
id: candidate_id,
network_type: AtomicU8::new(network_type as u8),
candidate_type: CandidateType::ServerReflexive,
address: self.base_config.address,
port: self.base_config.port,
resolved_addr: SyncMutex::new(create_addr(network_type, ip, self.base_config.port)),
component: AtomicU16::new(self.base_config.component),
foundation_override: self.base_config.foundation,
priority_override: self.base_config.priority,
related_address: Some(CandidateRelatedAddress {
address: self.rel_addr,
port: self.rel_port,
}),
conn: self.base_config.conn,
..CandidateBase::default()
};
Ok(c)
}
}
@@ -0,0 +1,91 @@
use std::time::Duration;
use tokio::net::UdpSocket;
use super::candidate_relay_test::OptimisticAuthHandler;
use super::*;
use crate::agent::agent_config::AgentConfig;
use crate::agent::agent_vnet_test::{connect_with_vnet, on_connected};
use crate::agent::Agent;
use crate::url::{SchemeType, Url};
//use std::io::Write;
#[tokio::test]
async fn test_server_reflexive_only_connection() -> Result<()> {
/*env_logger::Builder::new()
.format(|buf, record| {
writeln!(
buf,
"{}:{} [{}] {} - {}",
record.file().unwrap_or("unknown"),
record.line().unwrap_or(0),
record.level(),
chrono::Local::now().format("%H:%M:%S.%6f"),
record.args()
)
})
.filter(None, log::LevelFilter::Trace)
.init();*/
let server_listener = Arc::new(UdpSocket::bind("127.0.0.1:0").await?);
let server_port = server_listener.local_addr()?.port();
let server = turn::server::Server::new(turn::server::config::ServerConfig {
realm: "webrtc.rs".to_owned(),
auth_handler: Arc::new(OptimisticAuthHandler {}),
conn_configs: vec![turn::server::config::ConnConfig {
conn: server_listener,
relay_addr_generator: Box::new(turn::relay::relay_none::RelayAddressGeneratorNone {
address: "127.0.0.1".to_owned(),
net: Arc::new(util::vnet::net::Net::new(None)),
}),
}],
channel_bind_timeout: Duration::from_secs(0),
alloc_close_notify: None,
})
.await?;
let cfg0 = AgentConfig {
network_types: vec![NetworkType::Udp4],
urls: vec![Url {
scheme: SchemeType::Stun,
host: "127.0.0.1".to_owned(),
port: server_port,
..Default::default()
}],
candidate_types: vec![CandidateType::ServerReflexive],
..Default::default()
};
let a_agent = Arc::new(Agent::new(cfg0).await?);
let (a_notifier, mut a_connected) = on_connected();
a_agent.on_connection_state_change(a_notifier);
let cfg1 = AgentConfig {
network_types: vec![NetworkType::Udp4],
urls: vec![Url {
scheme: SchemeType::Stun,
host: "127.0.0.1".to_owned(),
port: server_port,
..Default::default()
}],
candidate_types: vec![CandidateType::ServerReflexive],
..Default::default()
};
let b_agent = Arc::new(Agent::new(cfg1).await?);
let (b_notifier, mut b_connected) = on_connected();
b_agent.on_connection_state_change(b_notifier);
connect_with_vnet(&a_agent, &b_agent).await?;
let _ = a_connected.recv().await;
let _ = b_connected.recv().await;
a_agent.close().await?;
b_agent.close().await?;
server.close().await?;
Ok(())
}
Loaded 100 of 132 files, more files were not shown because too many files have changed in this diff. Show more