feat(properties): harden standalone properties lifecycle

- synchronize child appearance and hidden-window readiness
- serialize native Torrent mutations transactionally without double-encoded rows
- preserve native lifecycle markers and fence stale or duplicate actions
- remove the obsolete modal surface and ignore implementation_plan.md
This commit is contained in:
NimBold
2026-08-04 12:02:30 +03:30
parent c342bcd347
commit 2ab292dd5d
20 changed files with 1230 additions and 2765 deletions
+1
View File
@@ -64,6 +64,7 @@ build/
# Local secrets and signing material
.env
.env.*
implementation_plan.md
*.key
*.pem
!src-tauri/binaries/_internal/certifi/cacert.pem
+230
View File
@@ -938,6 +938,91 @@ pub fn replace_downloads(
.map_err(|error| format!("failed to commit download save: {error}"))
}
/// Mutate exactly one persisted download inside a database transaction.
///
/// Native lifecycle code must not rebuild the renderer-owned download array:
/// doing so can overwrite a newer renderer snapshot, and encoding the loaded
/// JSON strings as an array produces double-encoded records. Validate the
/// complete persisted set before changing the target, then update only that
/// row while keeping the indexed columns in sync with its JSON document.
pub fn mutate_download<R, F>(
connection: &mut Connection,
id: &str,
portable: bool,
mutate: F,
) -> Result<R, String>
where
F: FnOnce(&mut serde_json::Map<String, Value>) -> Result<R, String>,
{
let transaction = connection
.transaction()
.map_err(|error| format!("failed to begin download mutation: {error}"))?;
let records = {
let mut statement = transaction
.prepare("SELECT id, data FROM downloads ORDER BY rowid")
.map_err(|error| format!("failed to prepare download mutation: {error}"))?;
let rows = statement
.query_map([], |row| {
Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?))
})
.map_err(|error| format!("failed to read downloads for mutation: {error}"))?;
rows.collect::<Result<Vec<_>, _>>()
.map_err(|error| format!("failed to read download for mutation: {error}"))?
};
let mut target = None;
for (stored_id, data) in records {
let value: Value = serde_json::from_str(&data)
.map_err(|error| format!("persisted download '{stored_id}' is malformed: {error}"))?;
let document_id = required_string(&value, "id")?;
required_string(&value, "status")?;
if document_id != stored_id {
return Err(format!(
"persisted download '{stored_id}' has mismatched document id"
));
}
if stored_id == id {
target = Some(value);
}
}
let mut value = target.ok_or_else(|| "download is no longer persisted".to_string())?;
let original_value = value.clone();
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
let result = mutate(object)?;
if object.get("id").and_then(Value::as_str) != Some(id) {
return Err("persisted download mutation cannot change its id".to_string());
}
if portable {
remove_persisted_transfer_secrets(&mut value);
}
if value == original_value {
return Ok(result);
}
let document_id = required_string(&value, "id")?;
let status = required_string(&value, "status")?;
let queue_id = value.get("queueId").and_then(Value::as_str);
let data = serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))?;
let changed = transaction
.execute(
"UPDATE downloads
SET status = ?1, queue_id = ?2, data = ?3
WHERE id = ?4",
params![status, queue_id, data, document_id],
)
.map_err(|error| format!("failed to mutate download '{id}': {error}"))?;
if changed != 1 {
return Err("download is no longer persisted".to_string());
}
transaction
.commit()
.map_err(|error| format!("failed to commit download mutation: {error}"))?;
Ok(result)
}
fn remove_persisted_transfer_secrets(value: &mut Value) {
let Some(object) = value.as_object_mut() else {
return;
@@ -2260,6 +2345,151 @@ mod tests {
assert_eq!(saved["torrentExcludeTrackers"], "https://tracker.example/exclude");
}
#[test]
fn native_download_mutation_keeps_object_records_and_unrelated_rows_unchanged() {
let temp = TempDir::new().unwrap();
let state = init_at_path(temp.path()).unwrap();
let mut connection = state.lock().unwrap();
replace_downloads(
&mut connection,
&json!([
{
"id": "torrent-1",
"status": "paused",
"queueId": "main",
"torrentUploadedBytes": 1
},
{
"id": "unrelated",
"status": "queued",
"queueId": "secondary",
"customMarker": {"revision": 7}
}
])
.to_string(),
false,
)
.unwrap();
let unrelated_before = load_downloads(&connection).unwrap()[1].clone();
mutate_download(&mut connection, "torrent-1", false, |object| {
object.insert("torrentUploadedBytes".to_string(), json!(99));
Ok(())
})
.unwrap();
let saved = load_downloads(&connection).unwrap();
assert_eq!(saved[1], unrelated_before);
for record in &saved {
let value: Value = serde_json::from_str(record).unwrap();
assert!(value.is_object());
assert!(required_string(&value, "id").is_ok());
assert!(required_string(&value, "status").is_ok());
}
let target: Value = serde_json::from_str(&saved[0]).unwrap();
assert_eq!(target["torrentUploadedBytes"], 99);
let changes_before = connection.total_changes();
mutate_download(&mut connection, "torrent-1", false, |object| {
object.insert("torrentUploadedBytes".to_string(), json!(99));
Ok(())
})
.unwrap();
assert_eq!(connection.total_changes(), changes_before);
}
#[test]
fn native_download_mutation_rolls_back_on_malformed_unrelated_row() {
let temp = TempDir::new().unwrap();
let state = init_at_path(temp.path()).unwrap();
let mut connection = state.lock().unwrap();
replace_downloads(
&mut connection,
&json!([{
"id": "torrent-1",
"status": "paused",
"torrentUploadedBytes": 1
}])
.to_string(),
false,
)
.unwrap();
connection
.execute(
"INSERT INTO downloads (id, status, data) VALUES (?1, ?2, ?3)",
params!["broken", "queued", "\"double-encoded\""],
)
.unwrap();
let target_before = load_downloads(&connection).unwrap()[0].clone();
let error = mutate_download(&mut connection, "torrent-1", false, |object| {
object.insert("torrentUploadedBytes".to_string(), json!(99));
Ok(())
})
.unwrap_err();
assert!(error.contains("persisted item is missing 'id'"));
assert_eq!(load_downloads(&connection).unwrap()[0], target_before);
}
#[test]
fn native_download_mutation_rolls_back_closure_errors_and_rejects_missing_targets() {
let temp = TempDir::new().unwrap();
let state = init_at_path(temp.path()).unwrap();
let mut connection = state.lock().unwrap();
replace_downloads(
&mut connection,
&json!([{"id": "torrent-1", "status": "paused"}]).to_string(),
false,
)
.unwrap();
let before = load_downloads(&connection).unwrap()[0].clone();
let error = mutate_download(&mut connection, "torrent-1", false, |object| {
object.insert("status".to_string(), json!("queued"));
Err::<(), _>("mutation rejected".to_string())
})
.unwrap_err();
assert_eq!(error, "mutation rejected");
assert_eq!(load_downloads(&connection).unwrap()[0], before);
let missing = mutate_download(&mut connection, "missing", false, |_| Ok(()))
.unwrap_err();
assert_eq!(missing, "download is no longer persisted");
}
#[test]
fn native_download_mutation_applies_portable_redaction_at_commit() {
let temp = TempDir::new().unwrap();
let state = init_at_path(temp.path()).unwrap();
let mut connection = state.lock().unwrap();
replace_downloads(
&mut connection,
&json!([{
"id": "torrent-1",
"status": "paused",
"url": "https://example.test/file",
"password": "secret"
}])
.to_string(),
false,
)
.unwrap();
mutate_download(&mut connection, "torrent-1", true, |object| {
object.insert("torrentUploadedBytes".to_string(), json!(9));
Ok(())
})
.unwrap();
let saved: Value =
serde_json::from_str(&load_downloads(&connection).unwrap()[0]).unwrap();
assert_eq!(saved["torrentUploadedBytes"], 9);
assert!(saved.get("password").is_none());
assert_eq!(saved["status"], "failed");
assert_eq!(saved["resumable"], false);
}
#[test]
fn portable_download_persistence_drops_malformed_tracker_fields() {
let temp = TempDir::new().unwrap();
+269 -319
View File
@@ -6890,45 +6890,30 @@ fn persist_torrent_destination(
relocation_check_pending: bool,
) -> Result<(), String> {
let mut connection = database.lock()?;
let records = crate::db::load_downloads(&connection)?;
let mut changed = false;
let next_records = records
.into_iter()
.map(|record| {
let mut value: serde_json::Value = serde_json::from_str(&record)
.map_err(|error| format!("persisted download is malformed: {error}"))?;
if value.get("id").and_then(serde_json::Value::as_str) == Some(id) {
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
crate::db::mutate_download(
&mut connection,
id,
database.is_portable(),
|object| {
object.insert(
"destination".to_string(),
serde_json::Value::String(destination.to_string()),
);
if relocation_check_pending {
object.insert(
"destination".to_string(),
serde_json::Value::String(destination.to_string()),
"torrentRelocationCheckPending".to_string(),
serde_json::Value::Bool(true),
);
if relocation_check_pending {
object.insert(
"torrentRelocationCheckPending".to_string(),
serde_json::Value::Bool(true),
);
} else {
object.remove("torrentRelocationCheckPending");
}
object.insert(
"torrentMoveDestination".to_string(),
serde_json::Value::String(destination.to_string()),
);
changed = true;
} else {
object.remove("torrentRelocationCheckPending");
}
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))
})
.collect::<Result<Vec<_>, _>>()?;
if !changed {
return Err("download is no longer persisted".to_string());
}
let data = serde_json::to_string(&next_records)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &data, database.is_portable())
object.insert(
"torrentMoveDestination".to_string(),
serde_json::Value::String(destination.to_string()),
);
Ok(())
},
)
}
fn persist_torrent_telemetry(
@@ -6937,38 +6922,22 @@ fn persist_torrent_telemetry(
snapshot: crate::queue::TorrentTelemetrySnapshot,
) -> Result<(), String> {
let mut connection = database.lock()?;
let records = crate::db::load_downloads(&connection)?;
let mut changed = false;
let next_records = records
.into_iter()
.map(|record| {
let mut value: serde_json::Value = serde_json::from_str(&record)
.map_err(|error| format!("persisted download is malformed: {error}"))?;
if value.get("id").and_then(serde_json::Value::as_str) == Some(id) {
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
let uploaded = serde_json::Value::from(snapshot.uploaded_bytes);
let seeded = serde_json::Value::from(snapshot.seeded_seconds);
if object.get("torrentUploadedBytes") != Some(&uploaded) {
object.insert("torrentUploadedBytes".to_string(), uploaded);
changed = true;
}
if object.get("torrentSeededSeconds") != Some(&seeded) {
object.insert("torrentSeededSeconds".to_string(), seeded);
changed = true;
}
}
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))
})
.collect::<Result<Vec<_>, _>>()?;
if !changed {
return Ok(());
}
let data = serde_json::to_string(&next_records)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &data, database.is_portable())
crate::db::mutate_download(
&mut connection,
id,
database.is_portable(),
|object| {
object.insert(
"torrentUploadedBytes".to_string(),
serde_json::Value::from(snapshot.uploaded_bytes),
);
object.insert(
"torrentSeededSeconds".to_string(),
serde_json::Value::from(snapshot.seeded_seconds),
);
Ok(())
},
)
}
fn persist_torrent_relocation_check(
@@ -6977,41 +6946,22 @@ fn persist_torrent_relocation_check(
pending: bool,
) -> Result<(), String> {
let mut connection = database.lock()?;
let records = crate::db::load_downloads(&connection)?;
let mut changed = false;
let next_records = records
.into_iter()
.map(|record| {
let mut value: serde_json::Value = serde_json::from_str(&record)
.map_err(|error| format!("persisted download is malformed: {error}"))?;
if value.get("id").and_then(serde_json::Value::as_str) == Some(id) {
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
if pending {
if object.get("torrentRelocationCheckPending")
!= Some(&serde_json::Value::Bool(true))
{
object.insert(
"torrentRelocationCheckPending".to_string(),
serde_json::Value::Bool(true),
);
changed = true;
}
} else if object.remove("torrentRelocationCheckPending").is_some() {
changed = true;
}
crate::db::mutate_download(
&mut connection,
id,
database.is_portable(),
|object| {
if pending {
object.insert(
"torrentRelocationCheckPending".to_string(),
serde_json::Value::Bool(true),
);
} else {
object.remove("torrentRelocationCheckPending");
}
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))
})
.collect::<Result<Vec<_>, _>>()?;
if !changed {
return Ok(());
}
let data = serde_json::to_string(&next_records)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &data, database.is_portable())
Ok(())
},
)
}
fn persist_torrent_file_selection(
@@ -7021,63 +6971,44 @@ fn persist_torrent_file_selection(
selected: Option<&[u32]>,
) -> Result<(), String> {
let mut connection = database.lock()?;
let records = crate::db::load_downloads(&connection)?;
let mut changed = false;
let next = records
.into_iter()
.map(|record| {
let mut value: serde_json::Value = match serde_json::from_str(&record) {
Ok(value) => value,
Err(_) => return Ok(record),
};
if value.get("id").and_then(serde_json::Value::as_str) == Some(id) {
let current = match value.get("torrentFileIndices") {
None => None,
Some(serde_json::Value::Array(indices)) => Some(
indices
.iter()
.map(serde_json::Value::as_u64)
.collect::<Option<Vec<_>>>()
.ok_or_else(|| {
"persisted Torrent file selection is malformed".to_string()
})?
.into_iter()
.map(|index| {
u32::try_from(index).map_err(|_| {
"persisted Torrent file selection is out of range".to_string()
})
crate::db::mutate_download(
&mut connection,
id,
database.is_portable(),
|object| {
let current = match object.get("torrentFileIndices") {
None => None,
Some(serde_json::Value::Array(indices)) => Some(
indices
.iter()
.map(serde_json::Value::as_u64)
.collect::<Option<Vec<_>>>()
.ok_or_else(|| {
"persisted Torrent file selection is malformed".to_string()
})?
.into_iter()
.map(|index| {
u32::try_from(index).map_err(|_| {
"persisted Torrent file selection is out of range".to_string()
})
.collect::<Result<Vec<_>, String>>()?,
),
Some(_) => {
return Err("persisted Torrent file selection is malformed".to_string())
}
};
if current.as_deref() != expected {
return Err("Torrent file selection changed; reload before applying".to_string());
})
.collect::<Result<Vec<_>, String>>()?,
),
Some(_) => {
return Err("persisted Torrent file selection is malformed".to_string())
}
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
if let Some(selected) = selected {
object.insert("torrentFileIndices".to_string(), serde_json::json!(selected));
} else {
object.remove("torrentFileIndices");
}
changed = true;
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))
} else {
Ok(record)
};
if current.as_deref() != expected {
return Err("Torrent file selection changed; reload before applying".to_string());
}
})
.collect::<Result<Vec<_>, String>>()?;
if !changed {
return Err("download is no longer persisted".to_string());
}
let next_data = serde_json::to_string(&next)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &next_data, database.is_portable())
if let Some(selected) = selected {
object.insert("torrentFileIndices".to_string(), serde_json::json!(selected));
} else {
object.remove("torrentFileIndices");
}
Ok(())
},
)
}
#[tauri::command]
@@ -8508,46 +8439,27 @@ async fn verify_torrent_data(
lifecycle_generation: None,
};
let original_records = {
let connection = database.lock()?;
crate::db::load_downloads(&connection)?
};
let mut next_records = Vec::with_capacity(original_records.len());
let mut changed = false;
for record in &original_records {
let mut value: serde_json::Value = match serde_json::from_str(record) {
Ok(value) => value,
Err(_) => {
next_records.push(record.clone());
continue;
}
};
if value.get("id").and_then(serde_json::Value::as_str) == Some(id.as_str()) {
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
object.insert("status".to_string(), serde_json::json!("queued"));
object.insert("hasBeenDispatched".to_string(), serde_json::json!(false));
object.insert("torrentVerifyOnly".to_string(), serde_json::json!(true));
object.insert(
"torrentVerifyRestoreStatus".to_string(),
serde_json::json!(restore_status),
);
changed = true;
}
next_records.push(
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))?,
);
}
if !changed {
return Err("download is no longer persisted".to_string());
}
{
let mut connection = database.lock()?;
let next_data = serde_json::to_string(&next_records)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &next_data, database.is_portable())?;
crate::db::mutate_download(
&mut connection,
&id,
database.is_portable(),
|object| {
object.insert("status".to_string(), serde_json::json!("queued"));
object.insert("hasBeenDispatched".to_string(), serde_json::json!(false));
object.insert("torrentVerifyOnly".to_string(), serde_json::json!(true));
object.insert(
"torrentVerifyRestoreStatus".to_string(),
serde_json::json!(restore_status),
);
object.insert(
"torrentVerifyNative".to_string(),
serde_json::json!(restore_status),
);
Ok(())
},
)?;
}
if let Err(error) =
@@ -8557,56 +8469,47 @@ async fn verify_torrent_data(
// still the queued verification lifecycle. Never restore the stale
// full array captured before enqueue: frontend persistence or another
// command may have changed unrelated rows in the meantime.
if let Ok(mut connection) = database.lock() {
if let Ok(records) = crate::db::load_downloads(&connection) {
let mut changed = false;
let next = records
.into_iter()
.map(|record| {
let mut value: serde_json::Value = match serde_json::from_str(&record) {
Ok(value) => value,
Err(_) => return record,
};
let is_target = value
.get("id")
let rollback_result = (|| {
let mut connection = database.lock()?;
crate::db::mutate_download(
&mut connection,
&id,
database.is_portable(),
|object| {
let is_verification_marker = object
.get("status")
.and_then(serde_json::Value::as_str)
== Some("queued")
&& object
.get("torrentVerifyOnly")
.and_then(serde_json::Value::as_bool)
== Some(true)
&& object
.get("torrentVerifyRestoreStatus")
.and_then(serde_json::Value::as_str)
== Some(id.as_str());
let is_verification_marker = value
.get("status")
.and_then(serde_json::Value::as_str)
== Some("queued")
&& value
.get("torrentVerifyOnly")
.and_then(serde_json::Value::as_bool)
== Some(true)
&& value
.get("torrentVerifyRestoreStatus")
.and_then(serde_json::Value::as_str)
== Some(restore_status.as_str());
if is_target && is_verification_marker {
if let Some(object) = value.as_object_mut() {
object.insert(
"status".to_string(),
serde_json::json!(restore_status),
);
object.remove("torrentVerifyOnly");
object.remove("torrentVerifyRestoreStatus");
changed = true;
}
}
serde_json::to_string(&value).unwrap_or(record)
})
.collect::<Vec<_>>();
if changed {
if let Ok(data) = serde_json::to_string(&next) {
let _ = crate::db::replace_downloads(
&mut connection,
&data,
database.is_portable(),
== Some(restore_status.as_str());
// The native marker is an additional persistence fence,
// not a prerequisite for rollback. A renderer snapshot
// may have already acknowledged and removed that native
// marker while enqueue is still in flight; the failed
// operation must still clear its own queued lifecycle.
if is_verification_marker {
object.insert(
"status".to_string(),
serde_json::json!(restore_status),
);
object.remove("torrentVerifyOnly");
object.remove("torrentVerifyRestoreStatus");
object.remove("torrentVerifyNative");
}
}
}
Ok(())
},
)
})();
if let Err(rollback_error) = rollback_result {
return Err(format!(
"{error}; failed to roll back Torrent verification state: {rollback_error}"
));
}
return Err(error.to_string());
}
@@ -8619,48 +8522,19 @@ fn replace_persisted_torrent_web_seeds(
seeds: &[crate::ipc::TorrentWebSeed],
) -> Result<Option<serde_json::Value>, String> {
let mut connection = database.lock()?;
let records = crate::db::load_downloads(&connection)?;
let next_seeds = serde_json::to_value(seeds)
.map_err(|error| format!("failed to encode Torrent web seeds: {error}"))?;
let mut previous_seeds = None;
let mut changed = false;
let mut next = Vec::with_capacity(records.len());
for record in records {
let mut value: serde_json::Value = match serde_json::from_str(&record) {
Ok(value) => value,
Err(_) => {
// Preserve unrelated legacy/corrupt rows byte-for-byte. A
// web-seed update must not fail its own transaction merely
// because another download cannot be decoded.
next.push(record);
continue;
}
};
if value
.get("id")
.and_then(serde_json::Value::as_str)
== Some(id)
{
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
previous_seeds = object.get("torrentWebSeeds").cloned();
crate::db::mutate_download(
&mut connection,
id,
database.is_portable(),
|object| {
let previous_seeds = object.get("torrentWebSeeds").cloned();
object.insert("torrentWebSeeds".to_string(), next_seeds.clone());
object.insert("torrentWebSeedsNative".to_string(), next_seeds.clone());
changed = true;
}
next.push(
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))?,
);
}
if !changed {
return Err("download is not persisted".to_string());
}
let next_data = serde_json::to_string(&next)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &next_data, database.is_portable())?;
Ok(previous_seeds)
Ok(previous_seeds)
},
)
}
fn restore_persisted_torrent_web_seeds(
@@ -8670,29 +8544,13 @@ fn restore_persisted_torrent_web_seeds(
previous_seeds: Option<serde_json::Value>,
) -> Result<(), String> {
let mut connection = database.lock()?;
let records = crate::db::load_downloads(&connection)?;
let expected_value = serde_json::to_value(expected_seeds)
.map_err(|error| format!("failed to encode expected Torrent web seeds: {error}"))?;
let mut found = false;
let mut changed = false;
let mut next = Vec::with_capacity(records.len());
for record in records {
let mut value: serde_json::Value = match serde_json::from_str(&record) {
Ok(value) => value,
Err(_) => {
next.push(record);
continue;
}
};
if value
.get("id")
.and_then(serde_json::Value::as_str)
== Some(id)
{
found = true;
let object = value
.as_object_mut()
.ok_or_else(|| "persisted download is not an object".to_string())?;
crate::db::mutate_download(
&mut connection,
id,
database.is_portable(),
|object| {
if object.get("torrentWebSeeds") == Some(&expected_value) {
match previous_seeds.clone() {
Some(previous) => {
@@ -8703,28 +8561,15 @@ fn restore_persisted_torrent_web_seeds(
}
}
object.remove("torrentWebSeedsNative");
changed = true;
} else {
log::warn!(
"Torrent web-seed rollback [{}] skipped because persisted state changed concurrently",
id
);
}
}
next.push(
serde_json::to_string(&value)
.map_err(|error| format!("failed to encode persisted download: {error}"))?,
);
}
if !found {
return Err("download is no longer persisted".to_string());
}
if changed {
let next_data = serde_json::to_string(&next)
.map_err(|error| format!("failed to encode persisted downloads: {error}"))?;
crate::db::replace_downloads(&mut connection, &next_data, database.is_portable())?;
}
Ok(())
Ok(())
},
)
}
async fn normalize_persisted_torrent_web_seeds(
@@ -9888,7 +9733,14 @@ fn persisted_destinations_equal(left: &str, right: &str) -> bool {
fn merge_durable_torrent_telemetry(existing: &[String], data: &str) -> Result<String, String> {
let mut native_state: HashMap<
String,
(u64, u64, Option<String>, Option<serde_json::Value>),
(
u64,
u64,
Option<String>,
bool,
Option<serde_json::Value>,
Option<String>,
),
> = HashMap::new();
for record in existing {
let Ok(value) = serde_json::from_str::<serde_json::Value>(record) else {
@@ -9917,7 +9769,15 @@ fn merge_durable_torrent_telemetry(existing: &[String], data: &str) -> Result<St
.get("torrentMoveDestination")
.and_then(serde_json::Value::as_str)
.map(ToString::to_string),
object
.get("torrentRelocationCheckPending")
.and_then(serde_json::Value::as_bool)
== Some(true),
object.get("torrentWebSeedsNative").cloned(),
object
.get("torrentVerifyNative")
.and_then(serde_json::Value::as_str)
.map(ToString::to_string),
),
);
}
@@ -9934,8 +9794,14 @@ fn merge_durable_torrent_telemetry(existing: &[String], data: &str) -> Result<St
let Some(id) = object.get("id").and_then(serde_json::Value::as_str) else {
continue;
};
let Some((existing_uploaded, existing_seeded, native_destination, native_web_seeds)) =
native_state.get(id).cloned()
let Some((
existing_uploaded,
existing_seeded,
native_destination,
relocation_check_pending,
native_web_seeds,
native_verify_restore_status,
)) = native_state.get(id).cloned()
else {
continue;
};
@@ -9958,6 +9824,12 @@ fn merge_durable_torrent_telemetry(existing: &[String], data: &str) -> Result<St
);
}
}
if relocation_check_pending {
object.insert(
"torrentRelocationCheckPending".to_string(),
serde_json::Value::Bool(true),
);
}
if let Some(native_web_seeds) = native_web_seeds {
if object.get("torrentWebSeeds") == Some(&native_web_seeds) {
object.remove("torrentWebSeedsNative");
@@ -9966,6 +9838,32 @@ fn merge_durable_torrent_telemetry(existing: &[String], data: &str) -> Result<St
object.insert("torrentWebSeedsNative".to_string(), native_web_seeds);
}
}
if let Some(restore_status) = native_verify_restore_status {
let incoming_acknowledges_marker = object
.get("torrentVerifyOnly")
.and_then(serde_json::Value::as_bool)
== Some(true)
&& object
.get("torrentVerifyRestoreStatus")
.and_then(serde_json::Value::as_str)
== Some(restore_status.as_str());
object.insert(
"torrentVerifyOnly".to_string(),
serde_json::Value::Bool(true),
);
object.insert(
"torrentVerifyRestoreStatus".to_string(),
serde_json::Value::String(restore_status.clone()),
);
if incoming_acknowledges_marker {
object.remove("torrentVerifyNative");
} else {
object.insert(
"torrentVerifyNative".to_string(),
serde_json::Value::String(restore_status),
);
}
}
let uploaded = object
.get("torrentUploadedBytes")
.and_then(serde_json::Value::as_u64)
@@ -10541,6 +10439,57 @@ mod tests {
assert!(acknowledged[0].get("torrentMoveDestination").is_none());
}
#[test]
fn renderer_download_snapshots_cannot_clear_native_relocation_or_verification_markers() {
let existing = vec![
json!({
"id": "torrent-1",
"status": "queued",
"destination": "/downloads/new",
"torrentMoveDestination": "/downloads/new",
"torrentRelocationCheckPending": true,
"torrentVerifyOnly": true,
"torrentVerifyRestoreStatus": "paused",
"torrentVerifyNative": "paused"
})
.to_string(),
];
let merged = merge_durable_torrent_telemetry(
&existing,
&json!([{
"id": "torrent-1",
"status": "paused",
"destination": "/downloads/old"
}])
.to_string(),
)
.unwrap();
let records: serde_json::Value = serde_json::from_str(&merged).unwrap();
assert_eq!(records[0]["destination"], "/downloads/new");
assert_eq!(records[0]["torrentRelocationCheckPending"], true);
assert_eq!(records[0]["torrentVerifyOnly"], true);
assert_eq!(records[0]["torrentVerifyRestoreStatus"], "paused");
assert_eq!(records[0]["torrentVerifyNative"], "paused");
let acknowledged = merge_durable_torrent_telemetry(
&existing,
&json!([{
"id": "torrent-1",
"status": "queued",
"destination": "/downloads/new",
"torrentVerifyOnly": true,
"torrentVerifyRestoreStatus": "paused"
}])
.to_string(),
)
.unwrap();
let acknowledged: serde_json::Value = serde_json::from_str(&acknowledged).unwrap();
assert_eq!(acknowledged[0]["torrentRelocationCheckPending"], true);
assert!(acknowledged[0].get("torrentMoveDestination").is_none());
assert!(acknowledged[0].get("torrentVerifyNative").is_none());
assert_eq!(acknowledged[0]["torrentVerifyOnly"], true);
}
#[test]
fn renderer_download_snapshots_cannot_roll_back_native_web_seed_changes() {
let native_seeds = json!([{ "fileIndex": 0, "uri": "https://mirror.example/file" }]);
@@ -14499,6 +14448,7 @@ pub fn run() {
properties_window::open_download_properties_window,
properties_window::get_properties_window_download_id,
properties_window::properties_window_send_ready,
properties_window::properties_window_reveal,
properties_window::properties_window_send_action,
properties_window::validate_properties_window_request,
properties_window::close_download_properties_window,
+66 -3
View File
@@ -1,4 +1,5 @@
use std::collections::HashMap;
use std::collections::HashSet;
use std::sync::Mutex;
use serde::Serialize;
@@ -21,6 +22,7 @@ pub struct PropertiesWindowRegistry {
struct RegistryState {
by_download: HashMap<String, String>,
by_window: HashMap<String, String>,
ready_windows: HashSet<String>,
}
#[derive(Clone, Serialize)]
@@ -72,6 +74,7 @@ impl PropertiesWindowRegistry {
.lock()
.map_err(|_| "Properties window registry is unavailable".to_string())?;
let download_id = state.by_window.remove(label);
state.ready_windows.remove(label);
if let Some(download_id) = &download_id {
state.by_download.remove(download_id);
}
@@ -86,6 +89,7 @@ impl PropertiesWindowRegistry {
let label = state.by_download.remove(download_id);
if let Some(label) = &label {
state.by_window.remove(label);
state.ready_windows.remove(label);
}
Ok(label)
}
@@ -99,6 +103,36 @@ impl PropertiesWindowRegistry {
.get(download_id)
.cloned())
}
pub fn mark_ready(&self, label: &str) -> Result<(), String> {
let mut state = self
.state
.lock()
.map_err(|_| "Properties window registry is unavailable".to_string())?;
if !state.by_window.contains_key(label) {
return Err("Properties window is no longer registered".to_string());
}
state.ready_windows.insert(label.to_string());
Ok(())
}
pub fn is_ready(&self, label: &str) -> Result<bool, String> {
Ok(self
.state
.lock()
.map_err(|_| "Properties window registry is unavailable".to_string())?
.ready_windows
.contains(label))
}
pub fn clear_ready(&self, label: &str) -> Result<(), String> {
self.state
.lock()
.map_err(|_| "Properties window registry is unavailable".to_string())?
.ready_windows
.remove(label);
Ok(())
}
}
pub fn is_properties_window_label(label: &str) -> bool {
@@ -152,6 +186,7 @@ fn is_properties_action(action: &str) -> bool {
action,
"apply-properties"
| "pause-resume"
| "verify-torrent"
| "set-download-limit"
| "set-torrent-upload-limit"
| "set-torrent-peer-options"
@@ -194,18 +229,25 @@ pub fn open_download_properties_window(
let label = registry.allocate(&id)?;
if let Some(window) = app.get_webview_window(&label) {
if !registry.is_ready(&label)? {
return Ok(label);
}
let _ = window.unminimize();
let _ = window.show();
let _ = window.set_focus();
return Ok(label);
}
// If the native window disappeared without delivering Destroyed, discard
// the old readiness bit before constructing a fresh hidden webview.
registry.clear_ready(&label)?;
let build_result = WebviewWindowBuilder::new(&app, &label, WebviewUrl::App("index.html".into()))
.title(PROPERTIES_WINDOW_TITLE)
.inner_size(1000.0, 720.0)
.min_inner_size(760.0, 560.0)
.resizable(true)
.always_on_top(false)
.visible(false)
.build();
if let Err(error) = build_result {
// Two rapid main-window requests can race between the native lookup
@@ -213,9 +255,11 @@ pub fn open_download_properties_window(
// registry entry and focus its window instead of treating the second
// request as a failed open.
if let Some(window) = app.get_webview_window(&label) {
let _ = window.unminimize();
let _ = window.show();
let _ = window.set_focus();
if registry.is_ready(&label)? {
let _ = window.unminimize();
let _ = window.show();
let _ = window.set_focus();
}
return Ok(label);
}
let _ = registry.remove_window(&label);
@@ -251,6 +295,17 @@ pub fn properties_window_send_ready(
.map_err(|error| error.to_string())
}
#[tauri::command]
pub fn properties_window_reveal(
caller: tauri::WebviewWindow,
registry: tauri::State<'_, PropertiesWindowRegistry>,
) -> Result<(), String> {
registered_download_for_caller(&caller, &registry)?;
registry.mark_ready(caller.label())?;
caller.show().map_err(|error| error.to_string())?;
caller.set_focus().map_err(|error| error.to_string())
}
#[tauri::command]
pub fn properties_window_send_action(
caller: tauri::WebviewWindow,
@@ -368,10 +423,17 @@ mod tests {
fn registry_reuses_one_label_per_download_and_cleans_both_indexes() {
let registry = PropertiesWindowRegistry::default();
let first = registry.allocate("download-a").unwrap();
assert!(!registry.is_ready(&first).unwrap());
registry.mark_ready(&first).unwrap();
assert!(registry.is_ready(&first).unwrap());
registry.clear_ready(&first).unwrap();
assert!(!registry.is_ready(&first).unwrap());
registry.mark_ready(&first).unwrap();
assert_eq!(registry.allocate("download-a").unwrap(), first);
assert_eq!(registry.download_for_window(&first).unwrap(), Some("download-a".to_string()));
assert_eq!(registry.remove_window(&first).unwrap(), Some("download-a".to_string()));
assert_eq!(registry.download_for_window(&first).unwrap(), None);
assert!(!registry.is_ready(&first).unwrap());
assert_ne!(registry.allocate("download-a").unwrap(), first);
}
@@ -385,6 +447,7 @@ mod tests {
#[test]
fn child_actions_are_allowlisted() {
assert!(is_properties_action("apply-properties"));
assert!(is_properties_action("verify-torrent"));
assert!(is_properties_action("set-torrent-peer-options"));
assert!(!is_properties_action("get_keychain_password"));
assert!(!is_properties_action(""));
+8 -44
View File
@@ -35,6 +35,7 @@ import { isTrustedFirelinkReleaseUrl } from './utils/releaseUrls';
import { changeAppLocale, localeDirection, resolveAppLocale, syncDocumentLocale } from './i18n';
import { useTranslation } from 'react-i18next';
import { formatDownloadBytes } from './utils/downloadProgress';
import { synchronizeDocumentAppearance } from './utils/documentAppearance';
const loadSettingsView = () => import('./components/SettingsView');
const loadSchedulerView = () => import('./components/SchedulerView');
@@ -669,17 +670,13 @@ function App() {
});
}, [addToast, coreReady, showKeychainModal]);
useEffect(() => {
window.document.documentElement.setAttribute('data-font-family', fontFamily);
}, [fontFamily]);
useEffect(() => {
window.document.documentElement.setAttribute('data-font-size', appFontSize);
}, [appFontSize]);
useEffect(() => {
window.document.documentElement.setAttribute('data-list-density', listRowDensity);
}, [listRowDensity]);
useEffect(() => synchronizeDocumentAppearance(window, {
theme,
fontFamily,
appFontSize,
listRowDensity,
locale: resolveAppLocale(i18n.language),
}), [appFontSize, fontFamily, i18n.language, listRowDensity, theme]);
useEffect(() => {
const checkForUpdate = () => {
@@ -1025,39 +1022,6 @@ function App() {
};
}, [autoAddClipboardLinks, coreReady, showKeychainModal]);
useEffect(() => {
const root = window.document.documentElement;
const applyTheme = () => {
// Remove all theme classes first
root.classList.remove('theme-dark', 'theme-light', 'theme-dracula', 'theme-nord', 'dark');
if (theme === 'system') {
const systemDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
root.classList.add(systemDark ? 'theme-dark' : 'theme-light');
root.dataset.resolvedTheme = systemDark ? 'dark' : 'light';
root.style.colorScheme = systemDark ? 'dark' : 'light';
if (systemDark) root.classList.add('dark');
} else {
root.classList.add(`theme-${theme}`);
if (['dark', 'dracula', 'nord'].includes(theme)) {
root.classList.add('dark');
}
root.dataset.resolvedTheme = ['dark', 'dracula', 'nord'].includes(theme) ? 'dark' : 'light';
root.style.colorScheme = ['dark', 'dracula', 'nord'].includes(theme) ? 'dark' : 'light';
}
};
applyTheme();
if (theme === 'system') {
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
const listener = () => applyTheme();
mediaQuery.addEventListener('change', listener);
return () => mediaQuery.removeEventListener('change', listener);
}
}, [theme]);
return (
<div className={`app-shell flex h-screen w-screen overflow-hidden text-text-primary ${
isSidebarOnRight ? 'app-shell--sidebar-right' : 'app-shell--sidebar-left'
File diff suppressed because it is too large Load Diff
+81 -13
View File
@@ -14,6 +14,7 @@ import {
PROPERTIES_WINDOW_ACTION_RESULT,
PROPERTIES_WINDOW_REMOVED,
PROPERTIES_WINDOW_SNAPSHOT,
getPropertiesLifecycleAction,
sendPropertiesActionRequest,
sendPropertiesReady,
type PropertiesAction,
@@ -24,6 +25,8 @@ import {
type PropertiesSnapshotEvent,
} from '../propertiesBridge';
import { formatDownloadBytes, formatTorrentRatio } from '../utils/downloadProgress';
import { changeAppLocale } from '../i18n';
import { synchronizeDocumentAppearance } from '../utils/documentAppearance';
type PropertiesTab = 'overview' | 'files' | 'trackers' | 'peers' | 'options' | 'transfer' | 'advanced';
@@ -73,7 +76,11 @@ export const PropertiesWindowApp = () => {
const closeAfterSaveRef = useRef(false);
const switchAfterSaveRef = useRef<PropertiesTab | null>(null);
const requestIdRef = useRef(0);
const pendingActionRef = useRef<PropertiesAction | null>(null);
const latestSnapshotRevisionRef = useRef(0);
const appearanceCleanupRef = useRef<(() => void) | null>(null);
const hasRevealedWindowRef = useRef(false);
const revealInFlightRef = useRef(false);
const diagnosticsInFlightRef = useRef(new Set<string>());
const snapshotRef = useRef(snapshot);
const activeTabRef = useRef(activeTab);
@@ -140,6 +147,7 @@ export const PropertiesWindowApp = () => {
useEffect(() => {
let cancelled = false;
let readyRetryTimer: number | undefined;
let unlistenSnapshot: UnlistenFn | undefined;
let unlistenResult: UnlistenFn | undefined;
let unlistenRemoved: UnlistenFn | undefined;
@@ -148,18 +156,40 @@ export const PropertiesWindowApp = () => {
const id = await invoke('get_properties_window_download_id');
if (cancelled) return;
setDownloadId(id);
unlistenSnapshot = await listen<PropertiesSnapshotEvent>(PROPERTIES_WINDOW_SNAPSHOT, event => {
unlistenSnapshot = await listen<PropertiesSnapshotEvent>(PROPERTIES_WINDOW_SNAPSHOT, async event => {
if (event.payload.windowLabel !== windowLabel || event.payload.downloadId !== id) return;
if (event.payload.revision <= latestSnapshotRevisionRef.current) return;
latestSnapshotRevisionRef.current = event.payload.revision;
await changeAppLocale(event.payload.snapshot.appearance.locale);
if (event.payload.revision !== latestSnapshotRevisionRef.current) return;
appearanceCleanupRef.current?.();
appearanceCleanupRef.current = synchronizeDocumentAppearance(
window,
event.payload.snapshot.appearance,
);
setSnapshot(event.payload.snapshot);
if (draftTabRef.current === null) hydrateDraft(event.payload.snapshot);
void currentWindow.setTitle(safeTitle(event.payload.snapshot.fileName)).catch(() => undefined);
if (!hasRevealedWindowRef.current && !revealInFlightRef.current) {
revealInFlightRef.current = true;
try {
await invoke('properties_window_reveal');
hasRevealedWindowRef.current = true;
if (readyRetryTimer !== undefined) {
window.clearInterval(readyRetryTimer);
readyRetryTimer = undefined;
}
} finally {
revealInFlightRef.current = false;
}
}
});
unlistenResult = await listen<PropertiesActionResult>(PROPERTIES_WINDOW_ACTION_RESULT, event => {
if (event.payload.windowLabel !== windowLabel || event.payload.downloadId !== id) return;
if (event.payload.requestId !== requestIdRef.current) return;
setIsSaving(false);
const completedAction = pendingActionRef.current;
pendingActionRef.current = null;
if (!event.payload.ok) setErrorMessage(event.payload.error ?? 'The action failed');
else {
const nextTab = switchAfterSaveRef.current;
@@ -167,7 +197,7 @@ export const PropertiesWindowApp = () => {
switchAfterSaveRef.current = null;
closeAfterSaveRef.current = false;
setErrorMessage('');
setNotice(t($ => $.properties.saved));
setNotice(completedAction === 'apply-properties' ? t($ => $.properties.saved) : '');
draftTabRef.current = null;
setDraftTab(null);
if (nextTab) {
@@ -182,11 +212,24 @@ export const PropertiesWindowApp = () => {
});
unlistenRemoved = await listen<{ windowLabel: string; downloadId: string }>(PROPERTIES_WINDOW_REMOVED, event => {
if (event.payload.windowLabel === windowLabel && event.payload.downloadId === id) {
if (readyRetryTimer !== undefined) {
window.clearInterval(readyRetryTimer);
readyRetryTimer = undefined;
}
setSnapshot(null);
setNotice(t($ => $.downloadTable.noDownloads));
}
});
await sendPropertiesReady();
if (cancelled) return;
// Tauri event listeners are registered asynchronously. If the main
// bridge was still installing its listener, the first ready event can
// legitimately be missed; retry until the first snapshot confirms
// the handshake rather than leaving a permanently hidden window.
readyRetryTimer = window.setInterval(() => {
if (cancelled || hasRevealedWindowRef.current) return;
void sendPropertiesReady().catch(() => undefined);
}, 500);
} catch (error) {
if (!cancelled) setErrorMessage(errorText(error));
}
@@ -194,9 +237,12 @@ export const PropertiesWindowApp = () => {
void start();
return () => {
cancelled = true;
if (readyRetryTimer !== undefined) window.clearInterval(readyRetryTimer);
unlistenSnapshot?.();
unlistenResult?.();
unlistenRemoved?.();
appearanceCleanupRef.current?.();
appearanceCleanupRef.current = null;
};
}, [currentWindow, hydrateDraft, t, windowLabel]);
@@ -228,8 +274,10 @@ export const PropertiesWindowApp = () => {
payload?: PropertiesActionRequest['payload'],
) => {
if (!downloadId) return;
if (pendingActionRef.current !== null) return;
const requestId = ++requestIdRef.current;
setIsSaving(action === 'apply-properties');
pendingActionRef.current = action;
setIsSaving(true);
try {
await sendPropertiesActionRequest({
windowLabel,
@@ -240,6 +288,7 @@ export const PropertiesWindowApp = () => {
});
} catch (error) {
setIsSaving(false);
pendingActionRef.current = null;
closeAfterSaveRef.current = false;
switchAfterSaveRef.current = null;
setErrorMessage(errorText(error));
@@ -328,8 +377,7 @@ export const PropertiesWindowApp = () => {
setNotice(t($ => $.properties.torrentMoveCompleted));
}
} else {
await invoke('verify_torrent_data', { id: downloadId });
setNotice(t($ => $.properties.torrentVerifyIntegrity));
await requestAction('verify-torrent');
}
} catch (error) {
setErrorMessage(errorText(error));
@@ -344,6 +392,7 @@ export const PropertiesWindowApp = () => {
}
const progress = Math.max(0, Math.min(1, snapshot.fraction ?? 0));
const lifecycleAction = getPropertiesLifecycleAction(snapshot.status);
const total = snapshot.size || (snapshot.totalBytes === undefined
? t($ => $.addDownloads.unknownSize)
: `${snapshot.totalIsEstimate ? '~' : ''}${formatDownloadBytes(snapshot.totalBytes)}`);
@@ -369,14 +418,32 @@ export const PropertiesWindowApp = () => {
<p className="mt-1 text-xs text-text-muted" role="status">{statusLabel} · {Math.round(progress * 100)}% · {total}</p>
</div>
<div className="flex flex-wrap items-center gap-2" aria-label={t($ => $.actions.continue)}>
<button type="button" className="app-button px-3 text-xs" onClick={() => void requestAction('pause-resume')}>
{['paused', 'ready', 'staged', 'completed', 'failed'].includes(snapshot.status) ? <Play size={14} /> : <Pause size={14} />}
{['paused', 'ready', 'staged', 'completed', 'failed'].includes(snapshot.status) ? t($ => $.downloads.actions.resume) : t($ => $.downloads.actions.pause)}
</button>
{lifecycleAction && <button
type="button"
className="app-button px-3 text-xs"
disabled={isSaving}
onClick={() => {
if (lifecycleAction === 'pause'
&& snapshot.resumable === false
&& !window.confirm(t($ => $.downloadTable.nonResumableOne))) {
return;
}
void requestAction('pause-resume');
}}
>
{lifecycleAction === 'pause' ? <Pause size={14} /> : <Play size={14} />}
{lifecycleAction === 'pause'
? t($ => $.downloads.actions.pause)
: lifecycleAction === 'resume'
? t($ => $.downloads.actions.resume)
: lifecycleAction === 'retry'
? t($ => $.downloads.actions.retry)
: t($ => $.downloads.actions.start)}
</button>}
{isTorrent && <>
<button type="button" className="app-button px-3 text-xs" onClick={() => void performTorrentAction('magnet')}><Copy size={14} />{t($ => $.properties.torrentCopyMagnet)}</button>
<button type="button" className="app-button px-3 text-xs" onClick={() => void performTorrentAction('export')}><FileDown size={14} />{t($ => $.properties.torrentExportMetadata)}</button>
<button type="button" className="app-button px-3 text-xs" onClick={() => void performTorrentAction('move')}><FolderOpen size={14} />{t($ => $.properties.torrentMove)}</button>
<button type="button" className="app-button px-3 text-xs" disabled={isSaving} onClick={() => void performTorrentAction('magnet')}><Copy size={14} />{t($ => $.properties.torrentCopyMagnet)}</button>
<button type="button" className="app-button px-3 text-xs" disabled={isSaving} onClick={() => void performTorrentAction('export')}><FileDown size={14} />{t($ => $.properties.torrentExportMetadata)}</button>
<button type="button" className="app-button px-3 text-xs" disabled={isSaving} onClick={() => void performTorrentAction('move')}><FolderOpen size={14} />{t($ => $.properties.torrentMove)}</button>
</>}
</div>
</div>
@@ -387,6 +454,7 @@ export const PropertiesWindowApp = () => {
<span>{formatDownloadBytes(snapshot.downloadedBytes ?? 0)} / {total}</span>
<span>{snapshot.speed || '—'}</span>
<span>{snapshot.eta || '—'}</span>
<span>{snapshot.activeConnections ?? '—'} / {snapshot.requestedConnections ?? snapshot.connections ?? '—'} {t($ => $.properties.connections)}</span>
{isTorrent && <span>{formatTorrentRatio(snapshot.torrentUploadedBytes ?? 0, snapshot.downloadedBytes ?? 0, 'en-US')}</span>}
</div>
</header>
@@ -432,7 +500,7 @@ export const PropertiesWindowApp = () => {
<span className="text-text-muted">{t($ => $.properties.torrentDetailsPieces)}</span><span>{details.pieceCount} × {formatDownloadBytes(details.pieceLength)}</span>
<span className="text-text-muted">{t($ => $.properties.torrentDetailsPrivate)}</span><span>{details.private ? t($ => $.properties.torrentDetailsPrivateYes) : t($ => $.properties.torrentDetailsPrivateNo)}</span>
</div>}
{isTorrent && <div className="flex flex-wrap gap-2"><button type="button" className="app-button px-3 text-xs" onClick={() => void performTorrentAction('verify')}><RefreshCw size={14} />{t($ => $.properties.torrentVerifyNow)}</button></div>}
{isTorrent && <div className="flex flex-wrap gap-2"><button type="button" className="app-button px-3 text-xs" disabled={isSaving || !['paused', 'completed', 'failed'].includes(snapshot.status)} onClick={() => void performTorrentAction('verify')}><RefreshCw size={14} />{t($ => $.properties.torrentVerifyNow)}</button></div>}
</div>}
{activeTab === 'files' && isTorrent && <div className="space-y-3">
+127 -13
View File
@@ -2,7 +2,8 @@ import { useEffect } from 'react';
import { listen, type UnlistenFn } from '@tauri-apps/api/event';
import { useDownloadStore } from '../store/useDownloadStore';
import type { DownloadItem } from '../store/useDownloadStore';
import { getPauseResumeAction } from '../utils/downloadActions';
import { useSettingsStore } from '../store/useSettingsStore';
import { useDownloadProgressStore } from '../store/downloadProgressStore';
import {
isValidTorrentExcludeTrackerList,
isValidTorrentTrackerList,
@@ -13,6 +14,9 @@ import {
PROPERTIES_WINDOW_CLOSED,
PROPERTIES_WINDOW_READY,
applySecretPatch,
beginExclusivePropertiesAction,
createFrameCoalescer,
getPropertiesLifecycleAction,
sanitizePropertiesSnapshot,
sendPropertiesActionResult,
sendPropertiesRemoved,
@@ -22,6 +26,7 @@ import {
type PropertiesWindowReady,
} from '../propertiesBridge';
import { invokeCommand as invoke } from '../ipc';
import i18n, { resolveAppLocale } from '../i18n';
const errorText = (error: unknown) => error instanceof Error ? error.message : String(error);
@@ -105,21 +110,41 @@ export const PropertiesWindowBridgeHost = () => {
useEffect(() => {
const windows = new Map<string, string>();
const snapshotRevisions = new Map<string, number>();
const actionsInFlight = new Set<string>();
let disposed = false;
let unlistenReady: UnlistenFn | undefined;
let unlistenAction: UnlistenFn | undefined;
let unlistenClosed: UnlistenFn | undefined;
const snapshotCoalescer = createFrameCoalescer(
windowLabel => {
const downloadId = windows.get(windowLabel);
if (downloadId) void sendFor(windowLabel, downloadId).catch(() => undefined);
},
callback => window.requestAnimationFrame(callback),
handle => window.cancelAnimationFrame(handle),
);
const sendFor = async (windowLabel: string, downloadId: string) => {
const item = useDownloadStore.getState().downloads.find(download => download.id === downloadId);
if (!item || disposed) return false;
const settings = useSettingsStore.getState();
const progress = useDownloadProgressStore.getState();
const revision = (snapshotRevisions.get(windowLabel) ?? 0) + 1;
snapshotRevisions.set(windowLabel, revision);
await sendPropertiesSnapshot(windowLabel, {
windowLabel,
downloadId,
revision,
snapshot: sanitizePropertiesSnapshot(item),
snapshot: sanitizePropertiesSnapshot(item, {
theme: settings.theme,
fontFamily: settings.fontFamily,
appFontSize: settings.appFontSize,
listRowDensity: settings.listRowDensity,
locale: resolveAppLocale(i18n.language),
}, {
progress: progress.progressMap[downloadId],
moveProgress: progress.moveProgressMap[downloadId],
}),
});
return true;
};
@@ -144,11 +169,14 @@ export const PropertiesWindowBridgeHost = () => {
const handleAction = async (request: PropertiesActionRequest) => {
let ok = false;
let error: string | undefined;
const actionKey = `${request.windowLabel}:${request.downloadId}`;
let releaseAction: (() => void) | undefined;
try {
await invoke('validate_properties_window_request', request);
if (windows.get(request.windowLabel) !== request.downloadId) {
throw new Error('Properties window is no longer registered');
}
releaseAction = beginExclusivePropertiesAction(actionsInFlight, actionKey);
const store = useDownloadStore.getState();
const item = store.downloads.find(download => download.id === request.downloadId);
if (!item) throw new Error('Download no longer exists');
@@ -172,10 +200,57 @@ export const PropertiesWindowBridgeHost = () => {
await store.applyProperties(request.downloadId, safePatch);
break;
}
case 'pause-resume':
if (getPauseResumeAction(item.status) === 'pause') await store.pauseDownload(request.downloadId);
else await store.resumeDownload(request.downloadId);
case 'pause-resume': {
const lifecycleAction = getPropertiesLifecycleAction(item.status);
if (!lifecycleAction) {
throw new Error('This download has no available lifecycle action');
}
if (lifecycleAction === 'pause') {
await store.pauseDownload(request.downloadId);
const current = useDownloadStore.getState().downloads.find(download => download.id === request.downloadId);
if (!current) throw new Error('Download was removed while pausing');
if (!['paused', 'completed', 'failed'].includes(current.status)) {
throw new Error('The download did not reach a paused or terminal state');
}
} else {
const resumed = await store.resumeDownload(request.downloadId);
if (!resumed) {
throw new Error(i18n.t($ => $.downloadTable.backendRejectedStart));
}
const current = useDownloadStore.getState().downloads.find(download => download.id === request.downloadId);
if (!current) throw new Error('Download was removed while starting');
// A fast completion is a valid outcome of a successful resume;
// only a status that proves the request never left its
// pre-action state is a rejected start. Preserve failed as an
// error so a real backend failure is not reported as success.
if (['paused', 'ready', 'staged', 'failed'].includes(current.status)) {
throw new Error(i18n.t($ => $.downloadTable.backendRejectedStart));
}
}
break;
}
case 'verify-torrent': {
if (item.isTorrent !== true
|| !['paused', 'completed', 'failed'].includes(item.status)) {
throw new Error('Pause the Torrent before verifying its data');
}
const previousVerifyOnly = item.torrentVerifyOnly;
const previousRestoreStatus = item.torrentVerifyRestoreStatus;
store.updateDownload(request.downloadId, {
torrentVerifyOnly: true,
torrentVerifyRestoreStatus: item.status,
});
try {
await invoke('verify_torrent_data', { id: request.downloadId });
} catch (verifyError) {
useDownloadStore.getState().updateDownload(request.downloadId, {
torrentVerifyOnly: previousVerifyOnly,
torrentVerifyRestoreStatus: previousRestoreStatus,
});
throw verifyError;
}
break;
}
case 'set-download-limit':
await store.setDownloadSpeedLimit(request.downloadId, request.payload && 'limit' in request.payload ? request.payload.limit : null);
break;
@@ -190,9 +265,21 @@ export const PropertiesWindowBridgeHost = () => {
default:
throw new Error('Invalid Properties action');
}
if (!useDownloadStore.getState().downloads.some(download => download.id === request.downloadId)) {
throw new Error('Download was removed while applying the action');
}
ok = true;
} catch (caught) {
error = errorText(caught);
} finally {
releaseAction?.();
}
if (ok) {
try {
await sendFor(request.windowLabel, request.downloadId);
} catch {
// Snapshot delivery is best effort across a close/reopen race.
}
}
try {
await sendPropertiesActionResult(request.windowLabel, {
@@ -206,20 +293,16 @@ export const PropertiesWindowBridgeHost = () => {
// The window may have closed between the request and its result.
return;
}
if (ok) {
try {
await sendFor(request.windowLabel, request.downloadId);
} catch {
// Snapshot delivery is best effort across a close/reopen race.
}
}
};
void listen<PropertiesWindowReady>(PROPERTIES_WINDOW_READY, event => void handleReady(event.payload)).then(value => { unlistenReady = value; });
void listen<PropertiesActionRequest>(PROPERTIES_WINDOW_ACTION_REQUEST, event => void handleAction(event.payload)).then(value => { unlistenAction = value; });
void listen<string>(PROPERTIES_WINDOW_CLOSED, event => {
const downloadId = windows.get(event.payload);
windows.delete(event.payload);
snapshotRevisions.delete(event.payload);
snapshotCoalescer.cancel(event.payload);
if (downloadId) actionsInFlight.delete(`${event.payload}:${downloadId}`);
}).then(value => { unlistenClosed = value; });
const unsubscribeStore = useDownloadStore.subscribe((state, previous) => {
@@ -227,19 +310,50 @@ export const PropertiesWindowBridgeHost = () => {
const next = state.downloads.find(download => download.id === downloadId);
const before = previous.downloads.find(download => download.id === downloadId);
if (!next) {
snapshotCoalescer.cancel(windowLabel);
void sendPropertiesRemoved(windowLabel, downloadId).catch(() => undefined);
windows.delete(windowLabel);
snapshotRevisions.delete(windowLabel);
void invoke('properties_window_registry_remove_for_download', { id: downloadId }).catch(() => undefined);
} else if (next !== before) {
void sendFor(windowLabel, downloadId).catch(() => undefined);
snapshotCoalescer.schedule(windowLabel);
}
}
});
const unsubscribeProgress = useDownloadProgressStore.subscribe((state, previous) => {
for (const [windowLabel, downloadId] of windows) {
if (state.progressMap[downloadId] !== previous.progressMap[downloadId]
|| state.moveProgressMap[downloadId] !== previous.moveProgressMap[downloadId]) {
snapshotCoalescer.schedule(windowLabel);
}
}
});
const unsubscribeSettings = useSettingsStore.subscribe((state, previous) => {
if (state.theme === previous.theme
&& state.fontFamily === previous.fontFamily
&& state.appFontSize === previous.appFontSize
&& state.listRowDensity === previous.listRowDensity
&& state.language === previous.language) {
return;
}
for (const windowLabel of windows.keys()) {
snapshotCoalescer.schedule(windowLabel);
}
});
const handleLanguageChanged = () => {
for (const windowLabel of windows.keys()) {
snapshotCoalescer.schedule(windowLabel);
}
};
i18n.on('languageChanged', handleLanguageChanged);
return () => {
disposed = true;
snapshotCoalescer.cancelAll();
unsubscribeStore();
unsubscribeProgress();
unsubscribeSettings();
i18n.off('languageChanged', handleLanguageChanged);
unlistenReady?.();
unlistenAction?.();
unlistenClosed?.();
+1
View File
@@ -77,6 +77,7 @@ const common = {
pause: 'Pause',
start: 'Start',
resume: 'Resume',
retry: 'Retry',
options: 'Options',
},
size: {
+1
View File
@@ -77,6 +77,7 @@ const fa = {
pause: 'توقف',
start: 'شروع',
resume: 'ادامه',
retry: 'تلاش مجدد',
options: 'گزینه‌ها',
},
size: {
+1
View File
@@ -77,6 +77,7 @@ const he = {
pause: 'השהייה',
start: 'הפעלה',
resume: 'חידוש',
retry: 'ניסיון חוזר',
options: 'אפשרויות',
},
size: {
+1
View File
@@ -77,6 +77,7 @@ const ru = {
pause: 'Приостановить',
start: 'Запустить',
resume: 'Возобновить',
retry: 'Повторить',
options: 'Параметры',
},
size: {
+1
View File
@@ -77,6 +77,7 @@ const uk = {
pause: 'Призупинити',
start: 'Запустити',
resume: 'Відновити',
retry: 'Повторити',
options: 'Опції',
},
size: {
+1
View File
@@ -77,6 +77,7 @@ const zhCN = {
pause: '暂停',
start: '开始',
resume: '恢复',
retry: '重试',
options: '选项',
},
size: {
-5
View File
@@ -643,11 +643,6 @@ html[data-list-density="relaxed"] {
max-height: min(680px, 100%);
}
.properties-modal {
max-width: 100%;
max-height: 100%;
}
/* Add Download window */
.add-download-modal {
width: min(900px, 100%);
+1
View File
@@ -158,6 +158,7 @@ type CommandMap = {
open_download_properties_window: { args: { id: string }; result: string };
get_properties_window_download_id: { args: undefined; result: string };
properties_window_send_ready: { args: undefined; result: void };
properties_window_reveal: { args: undefined; result: void };
properties_window_send_action: { args: { requestId: number; action: string; payload?: unknown }; result: void };
validate_properties_window_request: { args: { windowLabel: string; downloadId: string }; result: void };
close_download_properties_window: { args: { id: string }; result: void };
+141 -7
View File
@@ -10,7 +10,13 @@ vi.mock('@tauri-apps/api/event', () => ({
emitTo: vi.fn(),
}));
import { applySecretPatch, sanitizePropertiesSnapshot } from './propertiesBridge';
import {
applySecretPatch,
beginExclusivePropertiesAction,
createFrameCoalescer,
getPropertiesLifecycleAction,
sanitizePropertiesSnapshot,
} from './propertiesBridge';
describe('Properties window bridge', () => {
it('sanitizes transfer secrets while preserving presence flags', () => {
@@ -22,26 +28,154 @@ describe('Properties window bridge', () => {
cookies: 'sid=secret',
headers: 'Authorization: Bearer secret',
username: 'user',
mirrors: 'https://user:secret@example.test/mirror',
} as DownloadItem;
const snapshot = sanitizePropertiesSnapshot(item);
const snapshot = sanitizePropertiesSnapshot(item, {
theme: 'nord',
fontFamily: 'inter',
appFontSize: 'large',
listRowDensity: 'compact',
locale: 'fa',
});
expect(snapshot).not.toHaveProperty('password');
expect(snapshot).not.toHaveProperty('cookies');
expect(snapshot).not.toHaveProperty('headers');
expect(snapshot).not.toHaveProperty('username');
expect(snapshot).not.toHaveProperty('mirrors');
expect(snapshot.hasPassword).toBe(true);
expect(snapshot.hasCookies).toBe(true);
expect(snapshot.hasHeaders).toBe(true);
expect(snapshot.hasUsername).toBe(true);
expect(snapshot.hasMirrors).toBe(true);
expect(snapshot.appearance).toEqual({
theme: 'nord',
fontFamily: 'inter',
appFontSize: 'large',
listRowDensity: 'compact',
locale: 'fa',
});
});
it('projects the latest live telemetry without exposing secrets', () => {
const snapshot = sanitizePropertiesSnapshot({
id: 'torrent-1',
fileName: 'example',
url: 'https://example.test/file',
status: 'seeding',
category: 'Other',
dateAdded: '',
speed: '-',
eta: '-',
fraction: 0,
uploadedBytes: 1,
password: 'secret',
} as DownloadItem, {
theme: 'dark',
fontFamily: 'system',
appFontSize: 'standard',
listRowDensity: 'standard',
locale: 'en',
}, {
progress: {
id: 'torrent-1',
fraction: 0.75,
speed: '2 MiB/s',
eta: '10s',
size: '4 MiB',
size_is_final: true,
downloaded_bytes: 3,
total_bytes: 4,
total_is_estimate: false,
active_connections: 4,
requested_connections: 8,
uploaded_bytes: 9,
upload_speed: '1 MiB/s',
num_seeders: 6,
torrent_seeded_seconds: 12,
},
moveProgress: 0.5,
});
expect(snapshot).not.toHaveProperty('password');
expect(snapshot).toMatchObject({
fraction: 0.75,
speed: '1 MiB/s',
eta: '-',
downloadedBytes: 3,
totalBytes: 4,
totalIsEstimate: false,
activeConnections: 4,
requestedConnections: 8,
torrentUploadedBytes: 9,
uploadSpeed: '1 MiB/s',
torrentSeeders: 6,
torrentSeededSeconds: 12,
moveProgress: 0.5,
});
});
it('applies explicit secret changes without conflating unchanged fields', () => {
expect(applySecretPatch(undefined, 'existing')).toBe('existing');
expect(applySecretPatch({ kind: 'unchanged' }, 'existing')).toBe('existing');
expect(applySecretPatch({ kind: 'replace', value: 'new' }, 'existing')).toBe('new');
expect(applySecretPatch({ kind: 'clear' }, 'existing')).toBeUndefined();
expect(() => applySecretPatch({ kind: 'replace', value: 42 }, 'existing')).toThrow('Invalid secret value');
expect(() => applySecretPatch({ kind: 'unexpected' }, 'existing')).toThrow('Invalid secret patch');
});
expect(applySecretPatch({ kind: 'replace', value: 'new' }, 'existing')).toBe('new');
expect(applySecretPatch({ kind: 'clear' }, 'existing')).toBeUndefined();
expect(() => applySecretPatch({ kind: 'replace', value: 42 }, 'existing')).toThrow('Invalid secret value');
expect(() => applySecretPatch({ kind: 'unexpected' }, 'existing')).toThrow('Invalid secret patch');
});
it('derives truthful lifecycle commands from the current status', () => {
expect(getPropertiesLifecycleAction('downloading')).toBe('pause');
expect(getPropertiesLifecycleAction('retrying')).toBe('pause');
expect(getPropertiesLifecycleAction('paused')).toBe('resume');
expect(getPropertiesLifecycleAction('ready')).toBe('start');
expect(getPropertiesLifecycleAction('staged')).toBe('start');
expect(getPropertiesLifecycleAction('failed')).toBe('retry');
expect(getPropertiesLifecycleAction('completed')).toBeNull();
});
it('keeps the first action locked when a duplicate request is rejected', () => {
const inFlight = new Set<string>();
const release = beginExclusivePropertiesAction(inFlight, 'window:download');
expect(() => beginExclusivePropertiesAction(inFlight, 'window:download'))
.toThrow('Another Properties action is still in progress');
expect(inFlight.has('window:download')).toBe(true);
release();
release();
expect(inFlight.has('window:download')).toBe(false);
});
it('coalesces repeated snapshot requests to one callback per animation frame', () => {
const frames = new Map<number, FrameRequestCallback>();
const delivered: string[] = [];
let nextHandle = 0;
const coalescer = createFrameCoalescer(
key => delivered.push(key),
callback => {
const handle = ++nextHandle;
frames.set(handle, callback);
return handle;
},
handle => {
frames.delete(handle);
},
);
coalescer.schedule('properties-1');
coalescer.schedule('properties-1');
coalescer.schedule('properties-2');
expect(frames.size).toBe(2);
for (const [handle, callback] of [...frames]) {
frames.delete(handle);
callback(0);
}
expect(delivered).toEqual(['properties-1', 'properties-2']);
coalescer.schedule('properties-1');
coalescer.cancelAll();
expect(frames.size).toBe(0);
});
});
+183 -13
View File
@@ -1,5 +1,9 @@
import { emitTo } from '@tauri-apps/api/event';
import type { DownloadProgressEvent } from './bindings/DownloadProgressEvent';
import type { DownloadStatus } from './bindings/DownloadStatus';
import type { DownloadItem } from './store/useDownloadStore';
import { canPauseDownload } from './utils/downloadActions';
import type { DocumentAppearance } from './utils/documentAppearance';
import { invokeCommand as invoke } from './ipc';
export const PROPERTIES_WINDOW_READY = 'properties-window-ready' as const;
@@ -9,11 +13,77 @@ export const PROPERTIES_WINDOW_ACTION_RESULT = 'properties-window-action-result'
export const PROPERTIES_WINDOW_REMOVED = 'properties-window-removed' as const;
export const PROPERTIES_WINDOW_CLOSED = 'properties-window-closed' as const;
export type PropertiesSnapshot = Omit<DownloadItem, 'password' | 'cookies' | 'headers' | 'username'> & {
const PROPERTIES_SNAPSHOT_KEYS = [
'id',
'url',
'fileName',
'status',
'fraction',
'speed',
'eta',
'size',
'downloadedBytes',
'totalBytes',
'totalIsEstimate',
'category',
'dateAdded',
'resumable',
'connections',
'speedLimit',
'checksum',
'destination',
'isMedia',
'mediaFormatSelector',
'mediaQuality',
'queueId',
'queuePosition',
'hasBeenDispatched',
'lastError',
'lastTry',
'isTorrent',
'torrentFileIndices',
'torrentInfoHash',
'torrentSeedTime',
'torrentSeedRatio',
'torrentSeedRemaining',
'torrentUploadedBytes',
'torrentSeededSeconds',
'torrentRelocationCheckPending',
'torrentMoveDestination',
'torrentMoveRestoreStatus',
'torrentWebSeeds',
'torrentUploadLimit',
'torrentMaxPeers',
'torrentPeerSpeedLimit',
'torrentCheckIntegrity',
'torrentTrackers',
'torrentExcludeTrackers',
'torrentTrackerConnectTimeout',
'torrentTrackerTimeout',
'torrentTrackerInterval',
'torrentStopTimeout',
'torrentPrioritizePiece',
'torrentRemoveUnselectedFile',
'torrentEncryptionPolicy',
'torrentFileAllocation',
'torrentVerifyOnly',
'torrentVerifyRestoreStatus',
] as const satisfies readonly (keyof DownloadItem)[];
type SafePropertiesFields = Pick<DownloadItem, (typeof PROPERTIES_SNAPSHOT_KEYS)[number]>;
export type PropertiesSnapshot = SafePropertiesFields & {
appearance: DocumentAppearance;
activeConnections?: number;
requestedConnections?: number;
uploadSpeed?: string;
torrentSeeders?: number;
moveProgress?: number;
hasPassword: boolean;
hasCookies: boolean;
hasHeaders: boolean;
hasUsername: boolean;
hasMirrors: boolean;
};
export type SecretPatch =
@@ -31,10 +101,39 @@ export type PropertiesPatch = Partial<Omit<DownloadItem, 'password' | 'cookies'
export type PropertiesAction =
| 'apply-properties'
| 'pause-resume'
| 'verify-torrent'
| 'set-download-limit'
| 'set-torrent-upload-limit'
| 'set-torrent-peer-options';
export type PropertiesLifecycleAction = 'pause' | 'resume' | 'start' | 'retry';
export const getPropertiesLifecycleAction = (
status: DownloadStatus,
): PropertiesLifecycleAction | null => {
if (status === 'ready' || status === 'staged') return 'start';
if (canPauseDownload(status)) return 'pause';
if (status === 'paused') return 'resume';
if (status === 'failed') return 'retry';
return null;
};
export const beginExclusivePropertiesAction = (
inFlight: Set<string>,
key: string,
): (() => void) => {
if (inFlight.has(key)) {
throw new Error('Another Properties action is still in progress');
}
inFlight.add(key);
let released = false;
return () => {
if (released) return;
released = true;
inFlight.delete(key);
};
};
export type PropertiesWindowReady = {
windowLabel: string;
downloadId: string;
@@ -63,25 +162,96 @@ export type PropertiesSnapshotEvent = {
snapshot: PropertiesSnapshot;
};
const copyWithoutSecrets = (item: DownloadItem): PropertiesSnapshot => {
const {
password,
cookies,
headers,
username,
...safeItem
} = item;
const copyWithoutSecrets = (
item: DownloadItem,
appearance: DocumentAppearance,
live?: {
progress?: DownloadProgressEvent;
moveProgress?: number;
},
): PropertiesSnapshot => {
const safeItem = Object.fromEntries(
PROPERTIES_SNAPSHOT_KEYS.flatMap(key => (
Object.prototype.hasOwnProperty.call(item, key) ? [[key, item[key]]] : []
)),
) as SafePropertiesFields;
return {
...safeItem,
hasPassword: Boolean(password),
hasCookies: Boolean(cookies),
hasHeaders: Boolean(headers),
hasUsername: Boolean(username),
appearance,
...(live?.progress ? {
fraction: live.progress.fraction,
speed: item.status === 'seeding'
? live.progress.upload_speed ?? live.progress.speed
: live.progress.speed,
eta: item.status === 'seeding' ? '-' : live.progress.eta,
...(live.progress.size ? { size: live.progress.size } : {}),
...(live.progress.downloaded_bytes !== undefined
? { downloadedBytes: live.progress.downloaded_bytes }
: {}),
...(live.progress.total_bytes !== undefined
? { totalBytes: live.progress.total_bytes }
: {}),
...(live.progress.total_is_estimate !== undefined
? { totalIsEstimate: live.progress.total_is_estimate }
: {}),
...(live.progress.active_connections !== undefined
? { activeConnections: live.progress.active_connections }
: {}),
...(live.progress.requested_connections !== undefined
? { requestedConnections: live.progress.requested_connections }
: {}),
...(live.progress.uploaded_bytes !== undefined
? { torrentUploadedBytes: live.progress.uploaded_bytes }
: {}),
...(live.progress.upload_speed !== undefined
? { uploadSpeed: live.progress.upload_speed }
: {}),
...(live.progress.num_seeders !== undefined
? { torrentSeeders: live.progress.num_seeders }
: {}),
...(live.progress.torrent_seeded_seconds !== undefined
? { torrentSeededSeconds: live.progress.torrent_seeded_seconds }
: {}),
} : {}),
...(live?.moveProgress !== undefined ? { moveProgress: live.moveProgress } : {}),
hasPassword: Boolean(item.password),
hasCookies: Boolean(item.cookies),
hasHeaders: Boolean(item.headers),
hasUsername: Boolean(item.username),
hasMirrors: Boolean(item.mirrors),
};
};
export const sanitizePropertiesSnapshot = copyWithoutSecrets;
export const createFrameCoalescer = (
callback: (key: string) => void,
requestFrame: (callback: FrameRequestCallback) => number,
cancelFrame: (handle: number) => void,
) => {
const pending = new Map<string, number>();
return {
schedule(key: string) {
if (pending.has(key)) return;
const handle = requestFrame(() => {
pending.delete(key);
callback(key);
});
pending.set(key, handle);
},
cancel(key: string) {
const handle = pending.get(key);
if (handle === undefined) return;
pending.delete(key);
cancelFrame(handle);
},
cancelAll() {
for (const handle of pending.values()) cancelFrame(handle);
pending.clear();
},
};
};
export const openPropertiesWindow = (downloadId: string): Promise<string> =>
invoke('open_download_properties_window', { id: downloadId });
+62
View File
@@ -0,0 +1,62 @@
import { describe, expect, it } from 'vitest';
import { applyDocumentAppearance } from './documentAppearance';
const fakeDocument = () => {
const classes = new Set<string>(['theme-light', 'dark']);
const root = {
classList: {
add: (...values: string[]) => values.forEach(value => classes.add(value)),
remove: (...values: string[]) => values.forEach(value => classes.delete(value)),
},
dataset: {} as Record<string, string>,
style: {} as Record<string, string>,
lang: '',
dir: '',
};
return {
classes,
root,
document: { documentElement: root } as unknown as Document,
};
};
describe('document appearance synchronization', () => {
it('applies a complete dark RTL projection without retaining stale theme classes', () => {
const target = fakeDocument();
applyDocumentAppearance(target.document, {
theme: 'nord',
fontFamily: 'vazirmatn',
appFontSize: 'large',
listRowDensity: 'compact',
locale: 'fa',
}, false);
expect([...target.classes].sort()).toEqual(['dark', 'theme-nord']);
expect(target.root.dataset).toEqual({
resolvedTheme: 'dark',
fontFamily: 'vazirmatn',
fontSize: 'large',
listDensity: 'compact',
});
expect(target.root.style.colorScheme).toBe('dark');
expect(target.root.lang).toBe('fa');
expect(target.root.dir).toBe('rtl');
});
it('resolves system appearance while preserving an LTR locale', () => {
const target = fakeDocument();
applyDocumentAppearance(target.document, {
theme: 'system',
fontFamily: 'system',
appFontSize: 'standard',
listRowDensity: 'standard',
locale: 'en',
}, false);
expect([...target.classes]).toEqual(['theme-light']);
expect(target.root.dataset.resolvedTheme).toBe('light');
expect(target.root.style.colorScheme).toBe('light');
expect(target.root.lang).toBe('en');
expect(target.root.dir).toBe('ltr');
});
});
+55
View File
@@ -0,0 +1,55 @@
import type { AppFontSize } from '../bindings/AppFontSize';
import type { FontFamily } from '../bindings/FontFamily';
import type { ListRowDensity } from '../bindings/ListRowDensity';
import type { Theme } from '../bindings/Theme';
import { localeDirection, resolveAppLocale, type AppLocale } from '../i18n/locales';
export type DocumentAppearance = {
theme: Theme;
fontFamily: FontFamily;
appFontSize: AppFontSize;
listRowDensity: ListRowDensity;
locale: AppLocale;
};
const DARK_THEMES: ReadonlySet<Theme> = new Set(['dark', 'dracula', 'nord']);
const THEME_CLASSES = ['theme-dark', 'theme-light', 'theme-dracula', 'theme-nord', 'dark'] as const;
export const applyDocumentAppearance = (
document: Document,
appearance: DocumentAppearance,
systemDark: boolean,
): void => {
const root = document.documentElement;
const resolvedTheme = appearance.theme === 'system'
? (systemDark ? 'dark' : 'light')
: (DARK_THEMES.has(appearance.theme) ? 'dark' : 'light');
const themeClass = appearance.theme === 'system'
? `theme-${resolvedTheme}`
: `theme-${appearance.theme}`;
root.classList.remove(...THEME_CLASSES);
root.classList.add(themeClass);
if (resolvedTheme === 'dark') root.classList.add('dark');
root.dataset.resolvedTheme = resolvedTheme;
root.style.colorScheme = resolvedTheme;
root.dataset.fontFamily = appearance.fontFamily;
root.dataset.fontSize = appearance.appFontSize;
root.dataset.listDensity = appearance.listRowDensity;
const locale = resolveAppLocale(appearance.locale);
root.lang = locale;
root.dir = localeDirection(locale);
};
export const synchronizeDocumentAppearance = (
window: Window,
appearance: DocumentAppearance,
): (() => void) => {
const media = window.matchMedia('(prefers-color-scheme: dark)');
const apply = () => applyDocumentAppearance(window.document, appearance, media.matches);
apply();
if (appearance.theme !== 'system') return () => undefined;
media.addEventListener('change', apply);
return () => media.removeEventListener('change', apply);
};