mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e09778cc94 | ||
|
|
b1da297e42 | ||
|
|
c739036301 | ||
|
|
25893cd4ab | ||
|
|
5089c0343c | ||
|
|
5fdb98b0f5 | ||
|
|
89abae2369 | ||
|
|
0afc602e66 | ||
|
|
762cfccc44 | ||
|
|
9520b69730 | ||
|
|
c45e4749b5 | ||
|
|
c1b8bfe1b3 |
No files matched your search
@@ -39,7 +39,8 @@ Dependencies (Ubuntu/Debian):
|
|||||||
sudo apt install build-essential pkg-config \
|
sudo apt install build-essential pkg-config \
|
||||||
libx11-dev libxext-dev libxtst-dev libxfixes-dev libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev libgtk-3-dev ffmpeg
|
libx11-dev libxext-dev libxtst-dev libxfixes-dev libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev libgtk-3-dev ffmpeg
|
||||||
# --features inproc-av: libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
# --features inproc-av: libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
||||||
# (FFmpeg 6.x; in-process capture/encoding, Ubuntu 24.04 ships it)
|
# (FFmpeg 6.x only; in-process capture/encoding, Ubuntu 24.04 ships it. FFmpeg >= 7
|
||||||
|
# fails in ffmpeg-sys-next with "avfft.h file not found", before our build.rs runs)
|
||||||
# --features wayland: libwayland-dev libxkbcommon-dev wl-clipboard
|
# --features wayland: libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# --features wayland,portal: + libglib2.0-dev libpipewire-0.3-dev libei-dev (libei >= 1.1)
|
# --features wayland,portal: + libglib2.0-dev libpipewire-0.3-dev libei-dev (libei >= 1.1)
|
||||||
```
|
```
|
||||||
@@ -78,17 +79,21 @@ cargo build --release --features native-viewer,viewer-sdl --bin uuremote-viewer
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
Environment=DISPLAY=:0
|
|
||||||
# GNOME on Xorg usually needs: Environment=XAUTHORITY=/run/user/<uid>/gdm/Xauthority
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Same as packaging/deb. GNOME/KDE import DISPLAY / WAYLAND_DISPLAY and start graphical-session.target; do not hard-code
|
||||||
|
DISPLAY there (it overrides the session's real one, XWayland is often :1); under default.target the unit can
|
||||||
|
start before WAYLAND_DISPLAY is imported and fall back to X11. Desktops without that target (Xfce, i3) and the Xvfb
|
||||||
|
virtual desktop need `WantedBy=default.target` plus an explicit `Environment=DISPLAY=...`; headless
|
||||||
|
(`UU_DESKTOP_BACKEND=none` + linger) needs `WantedBy=default.target` only (GNOME on Xorg outside the session: `XAUTHORITY=/run/user/<uid>/gdm/Xauthority`).
|
||||||
Find the real display/Xauthority with `loginctl show-session <id> -p Display` / `ps -o args -C Xorg`.
|
Find the real display/Xauthority with `loginctl show-session <id> -p Display` / `ps -o args -C Xorg`.
|
||||||
5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service`
|
5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service`
|
||||||
6. Verify: `journalctl --user -u uuremote-native.service -f` must show
|
6. Verify: `journalctl --user -u uuremote-native.service -f` must show
|
||||||
|
|||||||
Generated
+1
-1
@@ -2741,7 +2741,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.18"
|
version = "0.2.21"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.18"
|
version = "0.2.21"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
|
|||||||
+16
-4
@@ -187,6 +187,11 @@ cargo build --release --features wayland # + Hyprland
|
|||||||
cargo build --release --features wayland,portal # + GNOME/KDE on Wayland
|
cargo build --release --features wayland,portal # + GNOME/KDE on Wayland
|
||||||
```
|
```
|
||||||
|
|
||||||
|
The optional `--features inproc-av` (in-process encoding) and the viewer's `viewer-ffmpeg` support **FFmpeg 6.x only**
|
||||||
|
(`pkg-config --modversion libavcodec` = 60.x). FFmpeg 7+ fails inside the `ffmpeg-sys-next` dependency with
|
||||||
|
`avfft.h file not found`; its build script runs before this project's, so no clearer check is possible (#63). The default
|
||||||
|
build and the release packages need neither feature.
|
||||||
|
|
||||||
### 3. Log in
|
### 3. Log in
|
||||||
|
|
||||||
Run inside your graphical session:
|
Run inside your graphical session:
|
||||||
@@ -206,17 +211,17 @@ machine, in `~/.config/uuremote/config.json` (mode 0600).
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
# X11 desktops need the display; on GNOME, XAUTHORITY is usually /run/user/<uid>/gdm/Xauthority
|
# GNOME/KDE import DISPLAY / WAYLAND_DISPLAY into the user manager and start graphical-session.target
|
||||||
Environment=DISPLAY=:0
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -228,6 +233,10 @@ journalctl --user -u uuremote-native.service -f # online once you see availabi
|
|||||||
|
|
||||||
If you have not logged in yet, the service opens the QR login window on your desktop.
|
If you have not logged in yet, the service opens the QR login window on your desktop.
|
||||||
|
|
||||||
|
Desktops that never start `graphical-session.target` (e.g. Xfce, i3) will not autostart this unit: change `[Install]` to
|
||||||
|
`WantedBy=default.target`, add `Environment=DISPLAY=:0` (your actual display) and `enable` again. Headless mode and the
|
||||||
|
virtual desktop below also need `default.target`.
|
||||||
|
|
||||||
### 5. uinput virtual keyboard/mouse on Wayland (recommended)
|
### 5. uinput virtual keyboard/mouse on Wayland (recommended)
|
||||||
|
|
||||||
On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts
|
On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts
|
||||||
@@ -278,7 +287,7 @@ the same account cannot assist each other, an official restriction).
|
|||||||
## Servers without a monitor
|
## Servers without a monitor
|
||||||
|
|
||||||
**Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the
|
**Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the
|
||||||
service and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus)
|
service, change `[Install]` to `WantedBy=default.target` (`graphical-session.target` never starts without a login), and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus)
|
||||||
starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected.
|
starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected.
|
||||||
Log in once with `uuremote-server login --no-gui` (QR in the terminal).
|
Log in once with `uuremote-server login --no-gui` (QR in the terminal).
|
||||||
|
|
||||||
@@ -323,6 +332,7 @@ Common environment variables:
|
|||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless) |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | Enable Hyprland physical monitor switching (off by default) |
|
| `UU_WAYLAND_MULTISCREEN=1` | Enable Hyprland physical monitor switching (off by default) |
|
||||||
| `UU_WAYLAND_OUTPUT` | Initial native Wayland output name, e.g. `HDMI-A-1` |
|
| `UU_WAYLAND_OUTPUT` | Initial native Wayland output name, e.g. `HDMI-A-1` |
|
||||||
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | Native Wayland skips the virtual keyboard (e.g. Denial reserves it for its input method); keys go through uinput. Without wlr-virtual-pointer the pointer also uses uinput (#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset: NVENC only when an NVIDIA driver is loaded, else CPU |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset: NVENC only when an NVIDIA driver is loaded, else CPU |
|
||||||
@@ -339,6 +349,8 @@ Common environment variables:
|
|||||||
Host settings such as "lock after remote session" and "mute host" are stored in
|
Host settings such as "lock after remote session" and "mute host" are stored in
|
||||||
`~/.config/uuremote/host_settings.json`.
|
`~/.config/uuremote/host_settings.json`.
|
||||||
|
|
||||||
|
Custom bitrate follows the Mbps value selected in the client; for example, 1 Mbps sets an encoder cap of 1000 kbit/s.
|
||||||
|
|
||||||
With external FFmpeg CPU encoding, the bitrate presets (Original / Ultra / HD / custom) use average bitrate (ABR) to avoid gray keyframes at 4K and low bitrates; Auto keeps constant rate factor (CRF).
|
With external FFmpeg CPU encoding, the bitrate presets (Original / Ultra / HD / custom) use average bitrate (ABR) to avoid gray keyframes at 4K and low bitrates; Auto keeps constant rate factor (CRF).
|
||||||
|
|
||||||
## Let an AI agent install or develop it
|
## Let an AI agent install or develop it
|
||||||
|
|||||||
@@ -171,6 +171,10 @@ cargo build --release --features wayland # + Hyprland
|
|||||||
cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
||||||
```
|
```
|
||||||
|
|
||||||
|
可选的 `--features inproc-av`(进程内编码)和控制端的 `viewer-ffmpeg` 只支持 **FFmpeg 6.x**(`pkg-config --modversion libavcodec` 为 60.x)。
|
||||||
|
FFmpeg 7 及以上会在依赖 `ffmpeg-sys-next` 里报 `avfft.h file not found`——它的构建脚本先于本项目运行,所以无法提前给出更清楚的提示(#63)。
|
||||||
|
默认构建和预编译包都不需要这两个特性。
|
||||||
|
|
||||||
### 3. 登录
|
### 3. 登录
|
||||||
|
|
||||||
在图形桌面里运行:
|
在图形桌面里运行:
|
||||||
@@ -190,17 +194,17 @@ cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
# X11 桌面需要指明显示器;GNOME 的 XAUTHORITY 一般在 /run/user/<uid>/gdm/Xauthority
|
# GNOME/KDE 等桌面会把 DISPLAY / WAYLAND_DISPLAY 导入用户管理器,并启动 graphical-session.target
|
||||||
Environment=DISPLAY=:0
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -212,6 +216,9 @@ journalctl --user -u uuremote-native.service -f # 看到 availability=Some("re
|
|||||||
|
|
||||||
如果还没有登录,服务会自动在桌面上弹出扫码窗口。
|
如果还没有登录,服务会自动在桌面上弹出扫码窗口。
|
||||||
|
|
||||||
|
Xfce、i3 等不启动 `graphical-session.target` 的桌面,按上面的写法开机不会自启:把 `[Install]` 改成 `WantedBy=default.target`,
|
||||||
|
并加上 `Environment=DISPLAY=:0`(按实际显示器填写),再重新 `enable`。下文的无头模式、虚拟桌面也要用 `default.target`。
|
||||||
|
|
||||||
### 5. Wayland 下使用 uinput 虚拟键鼠(推荐)
|
### 5. Wayland 下使用 uinput 虚拟键鼠(推荐)
|
||||||
|
|
||||||
Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。
|
Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。
|
||||||
@@ -251,7 +258,7 @@ install -Dm644 contrib/desktop/uu-remote-linux-viewer.desktop ~/.local/share/app
|
|||||||
## 没有显示器的服务器
|
## 没有显示器的服务器
|
||||||
|
|
||||||
**无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`,
|
**无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`,
|
||||||
再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。
|
把 `[Install]` 改成 `WantedBy=default.target`(无人登录时 `graphical-session.target` 不会启动),再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。
|
||||||
无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。
|
无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。
|
||||||
|
|
||||||
**群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。
|
**群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。
|
||||||
@@ -293,6 +300,7 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
|
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
|
||||||
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
|
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
|
||||||
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | 原生 Wayland 不创建虚拟键盘(如 Denial 只把它给自己的输入法),键盘改走 uinput。合成器没有 wlr-virtual-pointer 时鼠标也自动改走 uinput(#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置时检测到 NVIDIA 驱动才用 NVENC,否则用 CPU |
|
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置时检测到 NVIDIA 驱动才用 NVENC,否则用 CPU |
|
||||||
@@ -308,6 +316,8 @@ systemctl --user restart uuremote-native.service
|
|||||||
|
|
||||||
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。
|
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。
|
||||||
|
|
||||||
|
自定义码率按客户端选择的 Mbps 生效,例如 1 Mbps 对应 1000 kbit/s 的编码上限。
|
||||||
|
|
||||||
选择码率档(原画 / 超清 / 高清 / 自定义)时,外部 FFmpeg 的 CPU 编码以平均码率(ABR)为目标,避免 4K 低码率下关键帧发灰;「自动」档仍使用恒定质量(CRF)。
|
选择码率档(原画 / 超清 / 高清 / 自定义)时,外部 FFmpeg 的 CPU 编码以平均码率(ABR)为目标,避免 4K 低码率下关键帧发灰;「自动」档仍使用恒定质量(CRF)。
|
||||||
|
|
||||||
本地编码诊断 `desktop-video-probe [output.h264]` 可设置 `UU_PROBE_FPS`、`UU_PROBE_FRAMES`(默认 5)和 `UU_PROBE_QUALITY`(1–5);设置 `UU_PROBE_INPUT=clip.y4m`(也支持 `.mp4`、`frames/%05d.png`)可绕过桌面采集,以相同的生产 FFmpeg 编码参数测量固定输入并打印分辨率和编码统计,`UU_PROBE_LOOP=1` 循环到指定帧数,输入无法打开或帧数不足时以非零状态退出(固定输入始终使用外部 FFmpeg 管线)。
|
本地编码诊断 `desktop-video-probe [output.h264]` 可设置 `UU_PROBE_FPS`、`UU_PROBE_FRAMES`(默认 5)和 `UU_PROBE_QUALITY`(1–5);设置 `UU_PROBE_INPUT=clip.y4m`(也支持 `.mp4`、`frames/%05d.png`)可绕过桌面采集,以相同的生产 FFmpeg 编码参数测量固定输入并打印分辨率和编码统计,`UU_PROBE_LOOP=1` 循环到指定帧数,输入无法打开或帧数不足时以非零状态退出(固定输入始终使用外部 FFmpeg 管线)。
|
||||||
|
|||||||
@@ -46,7 +46,10 @@ static pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER;
|
|||||||
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
||||||
static GtkWidget *refresh_items[5], *footer_label;
|
static GtkWidget *refresh_items[5], *footer_label;
|
||||||
// Account card: QR login before sign-in, user info (+ logout) after.
|
// Account card: QR login before sign-in, user info (+ logout) after.
|
||||||
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label;
|
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label, *qr_refresh;
|
||||||
|
/* Like the official client, a failed or timed-out QR stays until the user asks for a new one. */
|
||||||
|
static atomic_int qr_refresh_requested;
|
||||||
|
static void on_qr_refresh(GtkButton *b, gpointer d) { (void)b; (void)d; atomic_store(&qr_refresh_requested, 1); gtk_widget_hide(qr_refresh); }
|
||||||
static int show_assist = 1, show_account;
|
static int show_assist = 1, show_account;
|
||||||
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
||||||
static GtkWidget *tray_menu, *tray_allow;
|
static GtkWidget *tray_menu, *tray_allow;
|
||||||
@@ -250,6 +253,11 @@ static GtkWidget *build_account_card(void) {
|
|||||||
login_status = label("", "status");
|
login_status = label("", "status");
|
||||||
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
||||||
|
qr_refresh = gtk_button_new_with_label("刷新二维码");
|
||||||
|
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);
|
||||||
|
gtk_box_pack_start(GTK_BOX(qr_text), qr_refresh, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
||||||
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
||||||
|
|
||||||
@@ -641,6 +649,16 @@ void uu_ui_set_user(const char *name) {
|
|||||||
if (!ui_started || init_state != 1) return;
|
if (!ui_started || init_state != 1) return;
|
||||||
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
||||||
}
|
}
|
||||||
|
static gboolean apply_qr_refresh(gpointer data) {
|
||||||
|
if (window && qr_refresh) { if (GPOINTER_TO_INT(data)) gtk_widget_show(qr_refresh); else gtk_widget_hide(qr_refresh); }
|
||||||
|
return G_SOURCE_REMOVE;
|
||||||
|
}
|
||||||
|
void uu_login_ui_offer_refresh(int visible) {
|
||||||
|
if (!ui_started || init_state != 1 || atomic_load(&closed)) return;
|
||||||
|
atomic_store(&qr_refresh_requested, 0);
|
||||||
|
g_idle_add(apply_qr_refresh, GINT_TO_POINTER(visible != 0));
|
||||||
|
}
|
||||||
|
int uu_login_ui_take_refresh(void) { return atomic_exchange(&qr_refresh_requested, 0); }
|
||||||
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
||||||
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
||||||
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
||||||
+59
-34
@@ -535,7 +535,10 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
wl_registry_add_listener(registry,®istry_listener,NULL);
|
wl_registry_add_listener(registry,®istry_listener,NULL);
|
||||||
if(sync_display()!=0 || sync_display()!=0) goto end;
|
if(sync_display()!=0 || sync_display()!=0) goto end;
|
||||||
dma_init();
|
dma_init();
|
||||||
if(!shm || !seat || !copy_manager || !pointer_manager || !keyboard_manager || !output_count) goto end;
|
/* wlr-virtual-pointer is an optional input path. When the compositor does not
|
||||||
|
advertise it, pointer injection is skipped and the caller may drive input
|
||||||
|
through uinput; screencopy + virtual keyboard are still enough to capture. */
|
||||||
|
if(!shm || !seat || !copy_manager || !output_count) goto end;
|
||||||
const char *name=getenv("UU_WAYLAND_OUTPUT"); selected=0;
|
const char *name=getenv("UU_WAYLAND_OUTPUT"); selected=0;
|
||||||
if(name && *name) {
|
if(name && *name) {
|
||||||
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
|
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
|
||||||
@@ -549,23 +552,30 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
|
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
|
||||||
zwlr_output_power_v1_add_listener(power,&power_listener,NULL);
|
zwlr_output_power_v1_add_listener(power,&power_listener,NULL);
|
||||||
}
|
}
|
||||||
pointer=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[selected].handle);
|
if(pointer_manager) pointer=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[selected].handle);
|
||||||
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
/* Some compositors reject a virtual keyboard from anything that is not their active
|
||||||
xkb=xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
input method (Denial does), and a rejected proxy poisons later requests. Allow the
|
||||||
if(!xkb) goto end;
|
caller to opt out and rely on uinput for key input instead. */
|
||||||
struct xkb_rule_names names={.layout="us"};
|
const char *skip_kbd=getenv("UU_WAYLAND_NO_VIRTUAL_KEYBOARD");
|
||||||
keymap=xkb_keymap_new_from_names(xkb,&names,XKB_KEYMAP_COMPILE_NO_FLAGS);
|
if(keyboard_manager && !(skip_kbd && *skip_kbd && strcmp(skip_kbd,"0")))
|
||||||
if(!keymap) goto end;
|
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
||||||
key_state=xkb_state_new(keymap); if(!key_state) goto end;
|
if(keyboard) {
|
||||||
keymap_text=xkb_keymap_get_as_string(keymap,XKB_KEYMAP_FORMAT_TEXT_V1);
|
xkb=xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||||
if(!keymap_text) goto end;
|
if(!xkb) goto end;
|
||||||
keymap_text_len=strlen(keymap_text)+1;
|
struct xkb_rule_names names={.layout="us"};
|
||||||
if(upload_keymap(keymap_text,keymap_text_len)!=0) goto end;
|
keymap=xkb_keymap_new_from_names(xkb,&names,XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||||
if(sync_display()!=0) goto end;
|
if(!keymap) goto end;
|
||||||
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
key_state=xkb_state_new(keymap); if(!key_state) goto end;
|
||||||
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
keymap_text=xkb_keymap_get_as_string(keymap,XKB_KEYMAP_FORMAT_TEXT_V1);
|
||||||
keymap_insert=symbols_close(keymap_text);
|
if(!keymap_text) goto end;
|
||||||
spare_count=find_spare_codes(spare_codes,sizeof(spare_codes)/sizeof(spare_codes[0]));
|
keymap_text_len=strlen(keymap_text)+1;
|
||||||
|
if(upload_keymap(keymap_text,keymap_text_len)!=0) goto end;
|
||||||
|
if(sync_display()!=0) goto end;
|
||||||
|
/* 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]));
|
||||||
|
}
|
||||||
initialized=1; *w=width; *h=height; result=0;
|
initialized=1; *w=width; *h=height; result=0;
|
||||||
end:
|
end:
|
||||||
if(result!=0) reset();
|
if(result!=0) reset();
|
||||||
@@ -581,9 +591,12 @@ int uu_wl_select_output(const char *name,uint32_t expected_w,uint32_t expected_h
|
|||||||
if(target==output_count || outputs[target].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
|
if(target==output_count || outputs[target].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
|
||||||
uint32_t w=outputs[target].width,h=outputs[target].height;
|
uint32_t w=outputs[target].width,h=outputs[target].height;
|
||||||
if(w!=expected_w || h!=expected_h || !w || !h || w>16384 || h>16384 || (uint64_t)w*h*4>256*1024*1024) goto end;
|
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=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[target].handle);
|
struct zwlr_virtual_pointer_v1 *next=NULL;
|
||||||
if(!next) goto end;
|
if(pointer_manager) {
|
||||||
if(sync_display()!=0) {zwlr_virtual_pointer_v1_destroy(next);goto end;}
|
next=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[target].handle);
|
||||||
|
if(!next) goto end;
|
||||||
|
if(sync_display()!=0) {zwlr_virtual_pointer_v1_destroy(next);goto end;}
|
||||||
|
}
|
||||||
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); shm_clear(&frames[i]); }
|
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); shm_clear(&frames[i]); }
|
||||||
pending=0;
|
pending=0;
|
||||||
if(pointer) zwlr_virtual_pointer_v1_destroy(pointer);
|
if(pointer) zwlr_virtual_pointer_v1_destroy(pointer);
|
||||||
@@ -601,7 +614,11 @@ end:
|
|||||||
int uu_wl_wake(void) {
|
int uu_wl_wake(void) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
/* Output power management is optional; missing it must not block screencopy. */
|
/* Output power management is optional; missing it must not block screencopy. */
|
||||||
if(initialized && !power) result=0;
|
if(initialized && (!power || power_failed)) {
|
||||||
|
/* No power manager, or the compositor refused the mode (outputs without DPMS,
|
||||||
|
headless outputs): streaming continues, the screen simply stays as it is. */
|
||||||
|
result=0;
|
||||||
|
}
|
||||||
if(initialized && power && !power_failed) {
|
if(initialized && power && !power_failed) {
|
||||||
zwlr_output_power_v1_set_mode(power,ZWLR_OUTPUT_POWER_V1_MODE_ON);
|
zwlr_output_power_v1_set_mode(power,ZWLR_OUTPUT_POWER_V1_MODE_ON);
|
||||||
if(sync_display()==0 && !power_failed) result=0;
|
if(sync_display()==0 && !power_failed) result=0;
|
||||||
@@ -650,6 +667,8 @@ end:
|
|||||||
}
|
}
|
||||||
int uu_wl_move(int32_t x,int32_t y,int relative) {
|
int uu_wl_move(int32_t x,int32_t y,int relative) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
/* -2: no virtual pointer at all, so the caller may use uinput; -1 stays a real failure. */
|
||||||
|
if(initialized && !pointer) { result=-2; goto end; }
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
if(relative) {
|
if(relative) {
|
||||||
/* UU reports pixels (source DPR=1); Wayland motion is in logical points. */
|
/* UU reports pixels (source DPR=1); Wayland motion is in logical points. */
|
||||||
@@ -664,6 +683,7 @@ end: pthread_mutex_unlock(&lock); return result;
|
|||||||
}
|
}
|
||||||
int uu_wl_button(int button,int pressed) {
|
int uu_wl_button(int button,int pressed) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
if(initialized && !pointer) { goto end; } /* no virtual pointer: report failure so the caller falls back to uinput */
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
if(button>=4 && button<=7) {
|
if(button>=4 && button<=7) {
|
||||||
if(pressed) {
|
if(pressed) {
|
||||||
@@ -683,6 +703,7 @@ end: pthread_mutex_unlock(&lock); return result;
|
|||||||
}
|
}
|
||||||
int uu_wl_key(uint64_t symbol,int pressed) {
|
int uu_wl_key(uint64_t symbol,int pressed) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
if(initialized && !keyboard) { pthread_mutex_unlock(&lock); return -1; } /* no virtual keyboard: caller falls back to uinput */
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
||||||
int matches=0;
|
int matches=0;
|
||||||
@@ -713,20 +734,24 @@ int uu_wl_release_all(void) {
|
|||||||
if(initialized) {
|
if(initialized) {
|
||||||
/* Sweep this client's virtual keyboard directly: a keysym lookup can
|
/* Sweep this client's virtual keyboard directly: a keysym lookup can
|
||||||
fail for unmapped OEM/keypad symbols before reaching held modifiers. */
|
fail for unmapped OEM/keypad symbols before reaching held modifiers. */
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
if(keyboard) {
|
||||||
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
||||||
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
||||||
if(held_keys[code]) xkb_state_update_key(key_state,code,XKB_KEY_UP);
|
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
||||||
|
if(held_keys[code]) xkb_state_update_key(key_state,code,XKB_KEY_UP);
|
||||||
|
}
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
||||||
|
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
||||||
}
|
}
|
||||||
memset(held_keys,0,sizeof(held_keys));
|
memset(held_keys,0,sizeof(held_keys));
|
||||||
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
if(pointer) {
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
for(unsigned code=0x110;code<=0x114;code++)
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
zwlr_virtual_pointer_v1_button(pointer,timestamp(),code,WL_POINTER_BUTTON_STATE_RELEASED);
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
zwlr_virtual_pointer_v1_frame(pointer);
|
||||||
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
}
|
||||||
for(unsigned code=0x110;code<=0x114;code++)
|
|
||||||
zwlr_virtual_pointer_v1_button(pointer,timestamp(),code,WL_POINTER_BUTTON_STATE_RELEASED);
|
|
||||||
zwlr_virtual_pointer_v1_frame(pointer);
|
|
||||||
result=wl_display_flush(display)<0?-1:0;
|
result=wl_display_flush(display)<0?-1:0;
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&lock);return result;
|
pthread_mutex_unlock(&lock);return result;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
||||||
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
ARG VERSION=v0.2.18
|
ARG VERSION=v0.2.20
|
||||||
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
||||||
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
||||||
org.opencontainers.image.licenses="GPL-3.0"
|
org.opencontainers.image.licenses="GPL-3.0"
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
无头 Wayland 出画面、自定义码率、`show` 与登录体验修复。/ Headless Wayland video, custom bitrate, `show` and login fixes.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **无头 Wayland 主机连上没有画面**(#64 / #65,感谢 @axlrose):输出不支持 DPMS 时电源握手失败不再中断视频;贡献者在 sway headless 上复现并验证。
|
||||||
|
- **自定义码率单位错误**(#67,感谢 @JuanZoran):手机端自定义码率按 bit/s 发送(1 Mbps = 1000000),此前被当成 kbit/s 而触发 100 Mbps 上限,
|
||||||
|
导致大量重传、画面滞留。贡献者在 Hyprland + NVENC 上用手机实测。另外对明显是 Mbps / kbps 的小数值做了兜底换算(维护者补充,未实测)。
|
||||||
|
- **`uuremote-server show` 静默卡 30 秒**(#62,感谢 @axlrose):服务被条件跳过、反复崩溃重启或启动失败时立即报出真实原因。贡献者已用真实 systemd 单元验证。
|
||||||
|
- **登录二维码反复立即失效**(#68,感谢 @axlrose):状态轮询在服务器立即应答时不再紧循环(2 秒退避);二维码连续在几秒内失效时指数退避,
|
||||||
|
并提示可备份删除 `~/.config/uuremote/config.json` 重新登录(注册新设备身份,#68 中以此恢复)。退避逻辑未在被标记的设备上实测。
|
||||||
|
|
||||||
|
### 改进 / Improved
|
||||||
|
- `doctor`:会话里没有 `DISPLAY` / `WAYLAND_DISPLAY` 时给出提示(#66,感谢 @axlrose)。
|
||||||
|
- 文档:`inproc-av` / `viewer-ffmpeg` 只支持 FFmpeg 6.x,FFmpeg 7+ 会在依赖里报 `avfft.h file not found`(#63)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.19_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.19-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.19`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
扫码登录改为与官方客户端一致,修复二维码刚生成就失效。/ QR sign-in now matches the official client.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **登录二维码反复立即失效(1190)**(#68,感谢 @axlrose 的详细排查):逆向官方 Mac 客户端(4.42)后确认,新版服务端在生成二维码时
|
||||||
|
返回 `status_query_ticket`,官方客户端查询扫码状态和确认登录时都用它(放在 `token` 键下);我们此前优先发送旧的 `token` 字段。现在与官方一致:
|
||||||
|
- 生成二维码不带请求体;状态查询用 `status_query_ticket`(服务端没有时才用旧 `token`);
|
||||||
|
- 状态查询是长轮询,每次应答后立即再问,单次超时 60 秒(此前 12 秒);
|
||||||
|
- 状态 3 立即换新码、状态 0 在 0.35 秒后换新码、状态 4 登录(状态 3 不再去调确认登录);
|
||||||
|
- 出错(如 HTTP 400 / 1190)或超时时停止轮询,等用户点击登录窗口新增的「刷新二维码」按钮(终端里按回车;既无窗口也无终端时 60 秒后自动换码)。
|
||||||
|
取代 v0.2.19 的临时退避和「重新注册设备」提示。已用全新设备身份实测:状态查询正常挂起,60 秒后按官方行为停止并等待刷新;
|
||||||
|
未在 #68 那台被标记的设备上实测,「刷新二维码」按钮的界面尚未在桌面上目视验收。
|
||||||
|
- QR sign-in mirrors the official Mac client: `status_query_ticket` as the status ticket, 60 s long poll, regenerate on status 3/0,
|
||||||
|
stop on errors (e.g. code 1190) until the user clicks the new “refresh QR” button.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.20_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.20-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.20`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
Wayland 合成器缺少虚拟指针或虚拟键盘时,桌面仍可使用;systemd 单元示例与 deb 包一致。/ Wayland desktops without virtual pointer/keyboard protocols still come up.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **只缺 wlr-virtual-pointer 或虚拟键盘受限的合成器整个桌面不可用**(#72、#73,感谢 @clionertr):Denial 等合成器不提供
|
||||||
|
`zwlr_virtual_pointer_manager_v1`,或只把虚拟键盘给它自己的输入法。现在这两个协议都是可选的:画面采集照常启动,
|
||||||
|
缺指针时绝对移动改走 uinput(需能访问 `/dev/uinput`,见 README);`UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` 可跳过虚拟键盘。
|
||||||
|
只有「完全没有虚拟指针」才回退 uinput;坐标超出当前采集输出等其他失败照旧返回,不会把指针移到别的屏幕(#78)。
|
||||||
|
CI 构建与测试通过,**未在 Denial 上实机验证**;Hyprland 等已有虚拟指针的合成器行为不变。
|
||||||
|
- Virtual pointer and keyboard are optional on Wayland; capture still starts and pointer motion falls back to uinput only when
|
||||||
|
the compositor has no wlr-virtual-pointer. Not tested on Denial.
|
||||||
|
|
||||||
|
### 文档 / Docs
|
||||||
|
- README 的用户 systemd 单元与 deb 包一致:不再写死 `DISPLAY=:0`,随 `graphical-session.target` 启动;无头模式、虚拟桌面和
|
||||||
|
Xfce/i3 等不启动该 target 的桌面改用 `WantedBy=default.target`(#69,感谢 @ferstar)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.21_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.21-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.21`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
+11
@@ -251,6 +251,17 @@ impl UUAuthClient {
|
|||||||
Ok((status, value))
|
Ok((status, value))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 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)))
|
||||||
|
}
|
||||||
|
|
||||||
/// Signed JSON POST to another API host (the signature covers the path only).
|
/// Signed JSON POST to another API host (the signature covers the path only).
|
||||||
pub async fn post_json_url(&self, base: &str, path: &str, body: &serde_json::Value) -> Result<(u16, serde_json::Value), String> {
|
pub async fn post_json_url(&self, base: &str, path: &str, body: &serde_json::Value) -> Result<(u16, serde_json::Value), String> {
|
||||||
let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?;
|
let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?;
|
||||||
|
|||||||
+50
-10
@@ -45,8 +45,8 @@ pub struct VideoSettings {
|
|||||||
pub fps: u32,
|
pub fps: u32,
|
||||||
pub codec: VideoCodec,
|
pub codec: VideoCodec,
|
||||||
pub quality: u64,
|
pub quality: u64,
|
||||||
/// Viewer max_custom_bitrate (only used for QUALITY_CUSTOM): Mbit/s, or kbit/s above 1000.
|
/// Viewer max_custom_bitrate in bits/s (only used for QUALITY_CUSTOM).
|
||||||
pub custom_mbps: u32,
|
pub custom_bps: u32,
|
||||||
/// Scaled stream size (其他分辨率); None streams the native desktop size.
|
/// Scaled stream size (其他分辨率); None streams the native desktop size.
|
||||||
pub output: Option<(u32, u32)>,
|
pub output: Option<(u32, u32)>,
|
||||||
/// CHROMA_420 or CHROMA_444 (真彩); 4:4:4 only when the encoder pipeline supports it.
|
/// CHROMA_420 or CHROMA_444 (真彩); 4:4:4 only when the encoder pipeline supports it.
|
||||||
@@ -54,7 +54,7 @@ pub struct VideoSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Default for VideoSettings {
|
impl Default for VideoSettings {
|
||||||
fn default() -> Self { let (source_id,source_generation)=crate::wayland::selection(); Self { source_id,source_generation, codec: VideoCodec::H264, fps: 60, quality: QUALITY_AUTO, custom_mbps: 0, output: None, chroma: CHROMA_420 } }
|
fn default() -> Self { let (source_id,source_generation)=crate::wayland::selection(); Self { source_id,source_generation, codec: VideoCodec::H264, fps: 60, quality: QUALITY_AUTO, custom_bps: 0, output: None, chroma: CHROMA_420 } }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Selectable smaller stream sizes with the desktop's aspect ratio (even dimensions).
|
/// Selectable smaller stream sizes with the desktop's aspect ratio (even dimensions).
|
||||||
@@ -86,8 +86,8 @@ impl VideoSettings {
|
|||||||
QUALITY_GENERAL => Some(2_000),
|
QUALITY_GENERAL => Some(2_000),
|
||||||
QUALITY_HD => Some(8_000),
|
QUALITY_HD => Some(8_000),
|
||||||
QUALITY_BLURAY => Some(20_000),
|
QUALITY_BLURAY => Some(20_000),
|
||||||
QUALITY_CUSTOM if self.custom_mbps > 0 =>
|
QUALITY_CUSTOM if self.custom_bps > 0 =>
|
||||||
Some(if self.custom_mbps > 1_000 { self.custom_mbps } else { self.custom_mbps * 1_000 }.min(100_000)),
|
Some((self.custom_bps / 1_000).clamp(1, 100_000)),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,6 +112,14 @@ fn fps_from_option(value: u64) -> Option<u64> {
|
|||||||
|
|
||||||
/// Applies a capture-setting RPC to `settings` and returns the RpcResponse payload (Message 22),
|
/// Applies a capture-setting RPC to `settings` and returns the RpcResponse payload (Message 22),
|
||||||
/// or None when the RPC is not a capture/fps/quality setting.
|
/// or None when the RPC is not a capture/fps/quality setting.
|
||||||
|
/// max_custom_bitrate (field 8) in bit/s: the mobile viewer sends 1_000_000 for 1 Mbps (#67). Values
|
||||||
|
/// that can only be a different unit stay usable instead of collapsing to a 1 kbit/s cap: below 1000
|
||||||
|
/// they are Mbit/s, below 200_000 kbit/s (no viewer offers custom rates under 200 kbit/s).
|
||||||
|
fn custom_bitrate_bps(value: u64) -> u32 {
|
||||||
|
let bps = if value < 1_000 { value * 1_000_000 } else if value < 200_000 { value * 1_000 } else { value };
|
||||||
|
bps.min(u64::from(u32::MAX)) as u32
|
||||||
|
}
|
||||||
|
|
||||||
pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32)) -> Option<Vec<u8>> {
|
pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32)) -> Option<Vec<u8>> {
|
||||||
handle_rpc_with_codecs(rpc, settings, native, true, false)
|
handle_rpc_with_codecs(rpc, settings, native, true, false)
|
||||||
}
|
}
|
||||||
@@ -148,7 +156,7 @@ fn apply_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native:
|
|||||||
// Field 1 is the viewer's fps option index (1 = 30, 2 = 60, ...); 18 fpsCount is the frame rate.
|
// Field 1 is the viewer's fps option index (1 = 30, 2 = 60, ...); 18 fpsCount is the frame rate.
|
||||||
if let Some(fps) = number(&fields, 18).filter(|v| *v > 0).or_else(|| number(&fields, 1).and_then(fps_from_option)) { next.fps = fps as u32; }
|
if let Some(fps) = number(&fields, 18).filter(|v| *v > 0).or_else(|| number(&fields, 1).and_then(fps_from_option)) { next.fps = fps as u32; }
|
||||||
if let Some(quality) = number(&fields, 2).filter(|v| *v > 0) { next.quality = quality; }
|
if let Some(quality) = number(&fields, 2).filter(|v| *v > 0) { next.quality = quality; }
|
||||||
if let Some(bitrate) = number(&fields, 8).filter(|v| *v > 0) { next.custom_mbps = bitrate as u32; }
|
if let Some(bitrate) = number(&fields, 8).filter(|v| *v > 0) { next.custom_bps = custom_bitrate_bps(bitrate); }
|
||||||
// Field 7 chorma_format (sic): 3 = 4:4:4 when 真彩 is on, 1 = 4:2:0. The Sync reports what is encoded.
|
// Field 7 chorma_format (sic): 3 = 4:4:4 when 真彩 is on, 1 = 4:2:0. The Sync reports what is encoded.
|
||||||
match number(&fields, 7) {
|
match number(&fields, 7) {
|
||||||
Some(CHROMA_444) if full_chroma => next.chroma = CHROMA_444,
|
Some(CHROMA_444) if full_chroma => next.chroma = CHROMA_444,
|
||||||
@@ -237,7 +245,7 @@ pub fn sync_payload(settings: &VideoSettings, native: (u32, u32)) -> Vec<u8> {
|
|||||||
put_varint(1, u64::from(settings.fps), &mut out);
|
put_varint(1, u64::from(settings.fps), &mut out);
|
||||||
put_varint(2, settings.quality, &mut out);
|
put_varint(2, settings.quality, &mut out);
|
||||||
put_varint(3, settings.chroma, &mut out);
|
put_varint(3, settings.chroma, &mut out);
|
||||||
if settings.custom_mbps > 0 { put_varint(4, u64::from(settings.custom_mbps), &mut out); }
|
if settings.custom_bps > 0 { put_varint(4, u64::from(settings.custom_bps), &mut out); }
|
||||||
put_varint(5, u64::from(size.0), &mut out);
|
put_varint(5, u64::from(size.0), &mut out);
|
||||||
put_varint(6, u64::from(size.1), &mut out);
|
put_varint(6, u64::from(size.1), &mut out);
|
||||||
put_varint(9, u64::from(size.0), &mut out);
|
put_varint(9, u64::from(size.0), &mut out);
|
||||||
@@ -284,7 +292,7 @@ mod tests {
|
|||||||
put_varint(18, 30, &mut body);
|
put_varint(18, 30, &mut body);
|
||||||
let request = rpc(77, 2, &body);
|
let request = rpc(77, 2, &body);
|
||||||
let response = handle_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080)).unwrap();
|
let response = handle_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
assert_eq!(*rx.borrow(), VideoSettings { source_id:0,source_generation:0, codec: VideoCodec::H264, fps: 30, quality: QUALITY_GENERAL, custom_mbps: 0, output: None, chroma: CHROMA_420 });
|
assert_eq!(*rx.borrow(), VideoSettings { source_id:0,source_generation:0, codec: VideoCodec::H264, fps: 30, quality: QUALITY_GENERAL, custom_bps: 0, output: None, chroma: CHROMA_420 });
|
||||||
assert_eq!(rx.borrow().max_kbps(), Some(2_000));
|
assert_eq!(rx.borrow().max_kbps(), Some(2_000));
|
||||||
let fields = decode_wire(&response).unwrap();
|
let fields = decode_wire(&response).unwrap();
|
||||||
assert_eq!(message(&fields, 1), Some(&[8u8, 77][..]));
|
assert_eq!(message(&fields, 1), Some(&[8u8, 77][..]));
|
||||||
@@ -468,8 +476,40 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn auto_quality_keeps_constant_quality_encoding() {
|
fn auto_quality_keeps_constant_quality_encoding() {
|
||||||
assert_eq!(VideoSettings::default().max_kbps(), None);
|
assert_eq!(VideoSettings::default().max_kbps(), None);
|
||||||
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_mbps: 0, ..Default::default() }.max_kbps(), None);
|
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_bps: 0, ..Default::default() }.max_kbps(), None);
|
||||||
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_mbps: 12, ..Default::default() }.max_kbps(), Some(12_000));
|
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_bps: 12_000_000, ..Default::default() }.max_kbps(), Some(12_000));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mobile_custom_bitrate_is_bits_per_second_in_request_and_sync() {
|
||||||
|
// Mobile viewer sends field 8 = 1_000_000 for 1 Mbps (observed live, 2026-10-20).
|
||||||
|
for (bps, kbps) in [(1_000_000, 1_000), (30_000_000, 30_000), (500_000, 500), (100_000_000, 100_000), (200_000_000, 100_000)] {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
let mut body = Vec::new();
|
||||||
|
put_varint(2, QUALITY_CUSTOM, &mut body);
|
||||||
|
put_varint(8, bps, &mut body);
|
||||||
|
handle_rpc(&decode_wire(&rpc(7, 2, &body)).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
|
assert_eq!(rx.borrow().max_kbps(), Some(kbps));
|
||||||
|
let sync = sync_payload(&rx.borrow(), (1920, 1080));
|
||||||
|
assert_eq!(number(&decode_wire(&sync).unwrap(), 4), Some(bps));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn small_custom_bitrates_are_read_as_larger_units() {
|
||||||
|
assert_eq!(custom_bitrate_bps(20), 20_000_000);
|
||||||
|
assert_eq!(custom_bitrate_bps(8_000), 8_000_000);
|
||||||
|
assert_eq!(custom_bitrate_bps(1_000_000), 1_000_000);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn oversized_custom_bitrate_does_not_wrap_before_encoder_limit() {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
let mut body = Vec::new();
|
||||||
|
put_varint(2, QUALITY_CUSTOM, &mut body);
|
||||||
|
put_varint(8, u64::from(u32::MAX) + 1, &mut body);
|
||||||
|
handle_rpc(&decode_wire(&rpc(8, 2, &body)).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
|
assert_eq!(rx.borrow().max_kbps(), Some(100_000));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -38,6 +38,14 @@ async fn command_output(program: &str, args: &[&str]) -> Option<String> {
|
|||||||
Some(String::from_utf8_lossy(&output.stdout).trim().to_owned())
|
Some(String::from_utf8_lossy(&output.stdout).trim().to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether the report must say that this session has no screen to capture: neither DISPLAY nor
|
||||||
|
/// WAYLAND_DISPLAY is set, and the backend is the X11 one that needs a display to open.
|
||||||
|
fn missing_display(backend: crate::desktop_backend::DesktopBackend, headless: bool,
|
||||||
|
display: Option<&std::ffi::OsStr>, wayland: Option<&std::ffi::OsStr>) -> bool {
|
||||||
|
!headless && backend == crate::desktop_backend::DesktopBackend::X11
|
||||||
|
&& display.is_none() && wayland.is_none()
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn run() -> Result<(), String> {
|
pub async fn run() -> Result<(), String> {
|
||||||
use crate::desktop_backend as backend;
|
use crate::desktop_backend as backend;
|
||||||
use crate::engine_plugin::{load, Engine};
|
use crate::engine_plugin::{load, Engine};
|
||||||
@@ -66,6 +74,13 @@ pub async fn run() -> Result<(), String> {
|
|||||||
if selected.as_ref().is_ok_and(|b| *b == backend::DesktopBackend::X11) && backend::wayland_session_running() && !backend::headless() {
|
if selected.as_ref().is_ok_and(|b| *b == backend::DesktopBackend::X11) && backend::wayland_session_running() && !backend::headless() {
|
||||||
println!(" ! X11 backend inside a Wayland session: the picture will be black");
|
println!(" ! X11 backend inside a Wayland session: the picture will be black");
|
||||||
}
|
}
|
||||||
|
// A session without any display cannot capture a screen; say so instead of naming a backend.
|
||||||
|
if let Ok(selected) = &selected {
|
||||||
|
if missing_display(*selected, backend::headless(), std::env::var_os("DISPLAY").as_deref(), std::env::var_os("WAYLAND_DISPLAY").as_deref()) {
|
||||||
|
println!(" ! DISPLAY and WAYLAND_DISPLAY are unset: the X11 engine will only try :0 and :1; without an X server there, no screen can be captured");
|
||||||
|
println!(" terminal, file transfer and port mapping still work; UU_DESKTOP_BACKEND=none marks the host as headless");
|
||||||
|
}
|
||||||
|
}
|
||||||
if cfg!(feature = "engine-plugins") {
|
if cfg!(feature = "engine-plugins") {
|
||||||
for engine in [Engine::Wayland, Engine::Portal] {
|
for engine in [Engine::Wayland, Engine::Portal] {
|
||||||
line(engine.file(), match load(engine) { Ok(()) => "loaded".to_owned(), Err(e) => e });
|
line(engine.file(), match load(engine) { Ok(()) => "loaded".to_owned(), Err(e) => e });
|
||||||
@@ -133,4 +148,18 @@ mod tests {
|
|||||||
if home.len() > 1 { assert_eq!(super::redact(&format!("{home}/.config/x")), "~/.config/x"); }
|
if home.len() > 1 { assert_eq!(super::redact(&format!("{home}/.config/x")), "~/.config/x"); }
|
||||||
assert_eq!(super::env_state("UU_DOCTOR_TEST_SURELY_UNSET"), "unset");
|
assert_eq!(super::env_state("UU_DOCTOR_TEST_SURELY_UNSET"), "unset");
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn a_session_without_any_display_is_reported() {
|
||||||
|
use crate::desktop_backend::DesktopBackend;
|
||||||
|
let display = std::ffi::OsStr::new(":0");
|
||||||
|
let wayland = std::ffi::OsStr::new("wayland-1");
|
||||||
|
// No DISPLAY and no WAYLAND_DISPLAY: nothing can be captured.
|
||||||
|
assert!(super::missing_display(DesktopBackend::X11, false, None, None));
|
||||||
|
// One of them present: the backend has a screen to open.
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, false, Some(display), None));
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, false, None, Some(wayland)));
|
||||||
|
// Another backend, or a headless host: not this warning.
|
||||||
|
assert!(!super::missing_display(DesktopBackend::Wayland, false, None, None));
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, true, None, None));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
-1
@@ -328,8 +328,11 @@ impl InputInjector {
|
|||||||
// uinput ABS axes span the compositor's whole desktop. A captured output
|
// uinput ABS axes span the compositor's whole desktop. A captured output
|
||||||
// uses its own pixel space; bind absolute motion to that Wayland output,
|
// uses its own pixel space; bind absolute motion to that Wayland output,
|
||||||
// including when uinput remains in use for keyboard/buttons/relative input.
|
// including when uinput remains in use for keyboard/buttons/relative input.
|
||||||
|
// Only a compositor without wlr-virtual-pointer (-2) falls through to the uinput
|
||||||
|
// absolute pointer; an out-of-range point must not land on another output.
|
||||||
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Wayland {
|
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Wayland {
|
||||||
return crate::wayland::move_pointer(x,y,false);
|
let result=crate::wayland::move_pointer(x,y,false);
|
||||||
|
if result!=-2 { return result; }
|
||||||
}
|
}
|
||||||
if let Some(uinput)=&self.uinput {
|
if let Some(uinput)=&self.uinput {
|
||||||
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
|
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
|
||||||
|
|||||||
+65
-33
@@ -268,13 +268,22 @@ pub async fn prepare_device() -> Result<(Value, Credentials), String> {
|
|||||||
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||||
let (mut cfg, creds) = prepare_device().await?;
|
let (mut cfg, creds) = prepare_device().await?;
|
||||||
let client = UUAuthClient::new(creds.clone());
|
let client = UUAuthClient::new(creds.clone());
|
||||||
|
// Mirrors the official Mac client (LoginViewController / LoginManager, UURemote 4.42): gen/login has
|
||||||
|
// no body; the status long poll sends gen's `status_query_ticket` under `token` with the last
|
||||||
|
// status, re-asks as soon as an answer arrives (60 s request timeout), regenerates on status 3
|
||||||
|
// at once and on status 0 after 0.35 s, logs in on 4, and on any error (e.g. HTTP 400 code 1190)
|
||||||
|
// stops until the user asks for a new QR. Sending gen's older `token` field made the cloud reject
|
||||||
|
// every QR within seconds (#68).
|
||||||
|
let timeout = Duration::from_secs(60);
|
||||||
loop {
|
loop {
|
||||||
let (status, resp) = client.post_json("/api/v1/qrcode/gen/login", &json!({})).await?;
|
let (status, resp) = client.post_with_timeout("/api/v1/qrcode/gen/login", None, timeout).await?;
|
||||||
let d = data("qrcode gen", status, &resp)?;
|
let d = match 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; }
|
||||||
|
};
|
||||||
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 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 = d.get("token").or_else(|| d.get("status_query_ticket")).and_then(|v| v.as_str())
|
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
||||||
.ok_or("qrcode gen returned no token")?.to_string();
|
ui.offer_refresh(false);
|
||||||
if ui.shown() {
|
if ui.shown() {
|
||||||
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
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)?;
|
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
||||||
@@ -289,40 +298,31 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
||||||
}
|
}
|
||||||
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
||||||
// Status is a long poll: send the state already shown (server enum 1..4; observed:
|
|
||||||
// 1 waiting, 2 scanned, 4 after the phone confirmed); the server answers when it changes.
|
|
||||||
let mut login_status = 1i64;
|
let mut login_status = 1i64;
|
||||||
let mut expired = false;
|
let failure = loop {
|
||||||
for _ in 0..150 {
|
|
||||||
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
||||||
let (status, resp) = match client.post_json("/api/v1/qrcode/login/status", &query).await {
|
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/login/status", Some(&query), timeout).await {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(_) => continue, // long-poll timeout: ask again
|
Err(_) => break "网络超时,二维码已停止刷新",
|
||||||
};
|
};
|
||||||
// Code 1190 (HTTP 400, "二维码已失效"): the QR expired; generate a new one.
|
let code = resp.get("code").and_then(|c| c.as_i64());
|
||||||
if resp.get("code").and_then(|c| c.as_i64()) == Some(QR_EXPIRED) {
|
if code == Some(QR_EXPIRED) { break "二维码已失效"; }
|
||||||
ui.status("二维码已过期,正在刷新…", Tone::Info);
|
let Ok(d) = data("qrcode status", status, &resp) else { break "二维码状态查询失败"; };
|
||||||
expired = true; break;
|
let st = d.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
||||||
}
|
|
||||||
let st = data("qrcode status", status, &resp)?.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
|
||||||
if st == login_status { continue; }
|
|
||||||
login_status = st;
|
|
||||||
match st {
|
match st {
|
||||||
2 => {
|
1 => {}
|
||||||
|
2 => if login_status != 2 {
|
||||||
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
||||||
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
||||||
}
|
},
|
||||||
3 | 4 => {
|
3 => { println!("QR code expired; generating a new one"); break ""; }
|
||||||
// A final state: confirmed logs in; cancelled/expired is refused and a new QR follows.
|
0 => { tokio::time::sleep(Duration::from_millis(350)).await; break ""; }
|
||||||
|
4 => {
|
||||||
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
||||||
let (status, resp) = client.post_json("/api/v1/login/by_qrcode", &body).await?;
|
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 d = match data("qrcode login", status, &resp) {
|
||||||
Ok(d) => d,
|
Ok(d) => d,
|
||||||
Err(e) => {
|
Err(e) => { println!("QR login not granted ({e})"); break "登录失败"; }
|
||||||
println!("QR status {st}: login not granted ({e})");
|
|
||||||
ui.status("手机端未确认登录,正在刷新二维码…", Tone::Error);
|
|
||||||
expired = true; break;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
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")?;
|
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
||||||
@@ -339,17 +339,49 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
||||||
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
||||||
}
|
}
|
||||||
_ => { println!("QR status: {st}"); ui.status("二维码已失效,正在刷新…", Tone::Error); expired = true; break; }
|
other => { println!("QR status: {other}"); break "二维码已失效"; }
|
||||||
}
|
}
|
||||||
}
|
login_status = st;
|
||||||
println!("{}", if expired { "QR code expired; generating a new one" } else { "QR code timed out; generating a new one" });
|
};
|
||||||
tokio::time::sleep(Duration::from_secs(1)).await; // never spin if the server keeps refusing
|
if !failure.is_empty() { wait_for_refresh(ui, failure).await; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// gen/login's status ticket: `status_query_ticket` (current cloud and official clients), else the
|
||||||
|
/// older `token` field for servers that do not send it.
|
||||||
|
fn qr_ticket(gen: &Value) -> Option<&str> {
|
||||||
|
gen.get("status_query_ticket").or_else(|| gen.get("token")).and_then(|v| v.as_str()).filter(|t| !t.is_empty())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stop like the official client and wait for the user: the 刷新二维码 button, Enter in a terminal,
|
||||||
|
/// 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.offer_refresh(true);
|
||||||
|
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
|
||||||
|
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
|
||||||
|
else { println!("{reason}; waiting for 刷新二维码{}", if ui.shown() { "" } else { " (a new QR code follows in 60 s)" }); }
|
||||||
|
let mut line = terminal.then(|| tokio::task::spawn_blocking(|| { let mut s = String::new(); let _ = std::io::stdin().read_line(&mut s); }));
|
||||||
|
let started = std::time::Instant::now();
|
||||||
|
loop {
|
||||||
|
if ui.take_refresh() || (ui.shown() && ui.closed()) { break; }
|
||||||
|
if let Some(handle) = line.as_mut() { if handle.is_finished() { break; } }
|
||||||
|
if !ui.shown() && !terminal && started.elapsed() >= Duration::from_secs(60) { break; }
|
||||||
|
tokio::time::sleep(Duration::from_millis(200)).await;
|
||||||
|
}
|
||||||
|
ui.offer_refresh(false);
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn status_ticket_prefers_status_query_ticket() {
|
||||||
|
assert_eq!(qr_ticket(&json!({"token": "old", "status_query_ticket": "new"})), Some("new"));
|
||||||
|
assert_eq!(qr_ticket(&json!({"token": "old"})), Some("old"));
|
||||||
|
assert_eq!(qr_ticket(&json!({"status_query_ticket": ""})), None);
|
||||||
|
}
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn service_waits_until_a_new_token_is_saved() {
|
async fn service_waits_until_a_new_token_is_saved() {
|
||||||
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ extern "C" {
|
|||||||
fn uu_login_ui_set_done(text: *const libc::c_char);
|
fn uu_login_ui_set_done(text: *const libc::c_char);
|
||||||
fn uu_login_ui_closed() -> libc::c_int;
|
fn uu_login_ui_closed() -> libc::c_int;
|
||||||
fn uu_login_ui_close();
|
fn uu_login_ui_close();
|
||||||
|
fn uu_login_ui_offer_refresh(visible: libc::c_int);
|
||||||
|
fn uu_login_ui_take_refresh() -> libc::c_int;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
@@ -56,6 +58,19 @@ impl LoginUi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unused_variables)]
|
#[allow(unused_variables)]
|
||||||
|
/// Show or hide the 刷新二维码 button (a failed QR waits for the user, like the official client).
|
||||||
|
pub fn offer_refresh(&self, visible: bool) {
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
if self.shown { unsafe { uu_login_ui_offer_refresh(libc::c_int::from(visible)) } }
|
||||||
|
#[cfg(not(uu_gtk))]
|
||||||
|
let _ = visible;
|
||||||
|
}
|
||||||
|
/// The user clicked 刷新二维码 since the last call.
|
||||||
|
pub fn take_refresh(&self) -> bool {
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
if self.shown { return unsafe { uu_login_ui_take_refresh() } != 0; }
|
||||||
|
false
|
||||||
|
}
|
||||||
pub fn status(&self, text: &str, tone: Tone) {
|
pub fn status(&self, text: &str, tone: Tone) {
|
||||||
#[cfg(uu_gtk)]
|
#[cfg(uu_gtk)]
|
||||||
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
||||||
|
|||||||
+34
-2
@@ -143,6 +143,35 @@ fn write_host_pid() {
|
|||||||
let _ = write!(f, "{}", std::process::id());
|
let _ = write!(f, "{}", std::process::id());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Why `unit` is not (going to be) running, from `systemctl --user show`; None while it is active or starting.
|
||||||
|
fn unit_not_running(unit: &str, settled: bool) -> Option<String> {
|
||||||
|
let output = std::process::Command::new("systemctl").args(["--user", "show", unit, "-p", "ActiveState,SubState,ConditionResult"]).output().ok()?;
|
||||||
|
let text = String::from_utf8_lossy(&output.stdout);
|
||||||
|
let value = |key: &str| text.lines().find_map(|l| l.strip_prefix(key).and_then(|v| v.strip_prefix('='))).unwrap_or("").to_owned();
|
||||||
|
unit_state_problem(unit, &value("ActiveState"), &value("SubState"), &value("ConditionResult"), settled)
|
||||||
|
}
|
||||||
|
fn unit_state_problem(unit: &str, active: &str, sub: &str, condition: &str, settled: bool) -> Option<String> {
|
||||||
|
let hint = format!("see `systemctl --user status {unit}` and `journalctl --user -u {unit}`");
|
||||||
|
if condition == "no" { return Some(format!("{unit} was skipped: a Condition in the unit is not met (e.g. ConditionEnvironment outside the graphical session); {hint}")); }
|
||||||
|
if active == "failed" { return Some(format!("{unit} failed to start; {hint}")); }
|
||||||
|
if sub == "auto-restart" { return Some(format!("{unit} keeps exiting and being restarted; {hint}")); }
|
||||||
|
if settled && active == "inactive" { return Some(format!("{unit} is not running; {hint}")); }
|
||||||
|
None
|
||||||
|
}
|
||||||
|
#[cfg(test)]
|
||||||
|
mod show_unit_tests {
|
||||||
|
#[test]
|
||||||
|
fn skipped_crashing_and_failed_units_are_reported() {
|
||||||
|
let p = |a, s, c, settled| super::unit_state_problem("u.service", a, s, c, settled);
|
||||||
|
assert!(p("inactive", "dead", "no", false).unwrap().contains("skipped"));
|
||||||
|
assert!(p("activating", "auto-restart", "yes", false).unwrap().contains("restarted"));
|
||||||
|
assert!(p("failed", "failed", "yes", false).unwrap().contains("failed"));
|
||||||
|
assert!(p("inactive", "dead", "yes", false).is_none());
|
||||||
|
assert!(p("inactive", "dead", "yes", true).unwrap().contains("not running"));
|
||||||
|
assert!(p("active", "running", "yes", true).is_none());
|
||||||
|
assert!(p("activating", "start", "yes", true).is_none());
|
||||||
|
}
|
||||||
|
}
|
||||||
/// `uuremote-server show` (desktop launcher): open the running host's window, or start the host in the
|
/// `uuremote-server show` (desktop launcher): open the running host's window, or start the host in the
|
||||||
/// foreground with its window when none runs (e.g. no systemd unit installed yet).
|
/// foreground with its window when none runs (e.g. no systemd unit installed yet).
|
||||||
fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
@@ -162,7 +191,10 @@ fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null()).status().is_ok_and(|s| s.success());
|
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null()).status().is_ok_and(|s| s.success());
|
||||||
if installed && std::process::Command::new("systemctl").args(["--user", "start", &unit]).status().is_ok_and(|s| s.success()) {
|
if installed && std::process::Command::new("systemctl").args(["--user", "start", &unit]).status().is_ok_and(|s| s.success()) {
|
||||||
let before = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok();
|
let before = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok();
|
||||||
for _ in 0..60 {
|
for attempt in 0..60 {
|
||||||
|
// `systemctl start` also returns 0 when the unit is skipped by a Condition or keeps
|
||||||
|
// crashing under Restart=; report that instead of waiting 30 s for a pid (#62).
|
||||||
|
if let Some(reason) = unit_not_running(&unit, attempt >= 2) { return Err(reason.into()); }
|
||||||
std::thread::sleep(std::time::Duration::from_millis(500));
|
std::thread::sleep(std::time::Duration::from_millis(500));
|
||||||
let fresh = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok().is_some_and(|t| Some(t) != before);
|
let fresh = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok().is_some_and(|t| Some(t) != before);
|
||||||
let pid = std::fs::read_to_string(host_pid_path()).ok().and_then(|s| s.trim().parse::<i32>().ok());
|
let pid = std::fs::read_to_string(host_pid_path()).ok().and_then(|s| s.trim().parse::<i32>().ok());
|
||||||
@@ -171,7 +203,7 @@ fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
if unsafe { libc::kill(pid, libc::SIGUSR1) } == 0 { return Ok(()); }
|
if unsafe { libc::kill(pid, libc::SIGUSR1) } == 0 { return Ok(()); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Err("the UU remote host service started but did not open its window".into());
|
return Err(format!("{unit} is running but did not open its window within 30 s; check `journalctl --user -u {unit}`").into());
|
||||||
}
|
}
|
||||||
use std::os::unix::process::CommandExt;
|
use std::os::unix::process::CommandExt;
|
||||||
Err(Box::new(std::process::Command::new("/proc/self/exe").env("UU_SHOW_WINDOW", "1").exec()))
|
Err(Box::new(std::process::Command::new("/proc/self/exe").env("UU_SHOW_WINDOW", "1").exec()))
|
||||||
|
|||||||
Reference in new issue
Block a user