feat(viewer): remove a device from the account (unbind)

POST /api/v1/device/{id}/unbind, the path the official Windows host and Mac
viewer use for 「删除设备」. Verified live on a disposable test device; the
shared-device path (/api/v1/device/share/{id}/unbind) comes from strings only.
CLI: uuremote-viewer unbind DEVICE [--shared]; launcher: 更多工具 → 删除设备
with a confirmation dialog.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
VallierDevandClaude Opus 5.5 committed 2026-10-17 22:26:14 +08:00
1 parent 664c96941c
commit 2815a01569
7 files changed
+61 -12

No files matched your search

+31 -4
View File
@@ -42,6 +42,18 @@ impl std::fmt::Display for Error {
}
// Mirrors Windows 0x140b77cd0 / 0x140b7a6d0, not host RoomData.
/// Treat the caller's device string as one opaque path segment, never a URL/query.
fn path_segment(device: &str) -> Result<String, Error> {
if device.is_empty() || device=="." || device==".." { return Err(Error::InvalidDevice); }
Ok(device.bytes().map(|b|if b.is_ascii_alphanumeric() || b"-._~".contains(&b) {(b as char).to_string()}else{format!("%{b:02X}")}).collect())
}
fn parse_ack(status: u16, body: Value) -> Result<(), Error> {
let code = body.get("code").and_then(Value::as_i64).unwrap_or(-1);
if code == 1120 { return Err(Error::AuthenticationExpired); }
if status == 200 && code == 0 { return Ok(()); }
let msg = body.get("msg").and_then(Value::as_str).unwrap_or("").chars().take(120).collect();
Err(Error::Api(i32::try_from(code).unwrap_or(-1), msg))
}
pub fn parse_join(status: u16, value: Value) -> Result<JoinData, Error> {
let code = value.get("code").and_then(Value::as_i64).and_then(|v| i32::try_from(v).ok()).ok_or(Error::InvalidResponse)?;
let msg = value.get("msg").and_then(Value::as_str).ok_or(Error::InvalidResponse)?.chars().take(120).collect::<String>();
@@ -110,10 +122,7 @@ impl Api {
Ok((status, response.json().await.map_err(|_| Error::InvalidResponse)?))
}
pub async fn join(&self, device: &str, force_join: bool, retry: bool) -> Result<JoinData, Error> {
// Treat the caller's device string as one opaque path segment, never a URL/query.
if device.is_empty() || device=="." || device==".." { return Err(Error::InvalidDevice); }
let encoded=device.bytes().map(|b|if b.is_ascii_alphanumeric() || b"-._~".contains(&b) {(b as char).to_string()}else{format!("%{b:02X}")}).collect::<String>();
let path = format!("/api/v1/room/join/by_device/{encoded}");
let path = format!("/api/v1/room/join/by_device/{}", path_segment(device)?);
let mut retries = 0;
loop {
let result = match self.request(reqwest::Method::POST, &path, Some(json!({"force_join":force_join}))).await {
@@ -143,6 +152,15 @@ impl Api {
}
}
}
/// Remove a device from the account (official 「删除设备」). Paths from the Windows host strings
/// `/api/v1/device/%s/unbind` and `/api/v1/device/share/%s/unbind` (own vs. shared-with-me device).
/// POST verified live against an own device; the shared-device path is from strings only.
pub async fn unbind(&self, device: &str, shared: bool) -> Result<(), Error> {
let segment = path_segment(device)?;
let path = if shared { format!("/api/v1/device/share/{segment}/unbind") } else { format!("/api/v1/device/{segment}/unbind") };
let (status, body) = self.request(reqwest::Method::POST, &path, None).await?;
parse_ack(status, body)
}
/// Structure-only probe of the device list (status, JSON keys/types/lengths, never values).
pub async fn devices_shape(&self, method: reqwest::Method) -> Result<String, Error> {
let path = "/api/v1/device/list";
@@ -188,6 +206,15 @@ impl Api {
#[cfg(test)]
mod tests {
#[test] fn unbind_ack_and_device_segment(){
use super::*;
assert_eq!(parse_ack(200,json!({"code":0,"msg":"ok"})),Ok(()));
assert_eq!(parse_ack(422,json!({"code":1120})),Err(Error::AuthenticationExpired));
assert_eq!(parse_ack(200,json!({"code":5003,"msg":"no such device"})),Err(Error::Api(5003,"no such device".into())));
assert_eq!(parse_ack(404,json!({})),Err(Error::Api(-1,String::new())));
assert_eq!(path_segment("a/b?c").unwrap(),"a%2Fb%3Fc");
for bad in ["",".",".."]{assert_eq!(path_segment(bad),Err(Error::InvalidDevice));}
}
use super::*;
#[test]
fn target_platform_matches_only_the_selected_device(){
+9
View File
@@ -195,6 +195,15 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
Err(_) => toast("电源指令失败:无法启动会话进程"),
}
}
["connect", id, "unbind"] => {
if let Some(s)=sessions.remove(*id){s.stop().await;}
let result=match credentials(){
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}"))}
next_refresh=Instant::now();
}
["connect", _, kind] => log::info!("Viewer UI: {kind} is not supported yet"),
_ => {}
}