Skip to content

Error overhaul #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nab138 merged 5 commits into from
Apr 6, 2026
Merged

Error overhaul #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
204c854
Start the great error overhaul
nab138 Apr 5, 2026
436e19b
More work on errors
nab138 Apr 5, 2026
94f6720
Intelligent error suggestions for common errors
nab138 Apr 6, 2026
9469018
Update house arrest errors
nab138 Apr 6, 2026
a0b10f0
detect a few more common errors
nab138 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ rustls = "0.23.36"
plist = "1.8.0"
plist-macro = "0.1.6"
tokio-util = "0.7.18"
rootcause = "0.12.1"
thiserror = "2.0.18"
strum = {version = "0.28.0", features = ["derive"] }

[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-updater = "2"
167 changes: 71 additions & 96 deletions src-tauri/src/account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use tauri_plugin_store::StoreExt;
use tracing::debug;

use crate::{
error::AppError,
secure_storage::create_sideloading_storage,
sideload::{SideloaderGuard, SideloaderMutex},
};
Expand All @@ -30,20 +31,24 @@ pub async fn login_new(
password: String,
anisette_server: String,
save_credentials: bool,
) -> Result<(), String> {
) -> Result<(), AppError> {
let account = login(&handle, &window, &email, &password, anisette_server).await?;
let mut sideloader_guard = sideloader_state.lock().unwrap();
*sideloader_guard = Some(account);

if save_credentials {
let pass_entry = Entry::new("iloader", &email)
.map_err(|e| format!("Failed to create keyring entry for credentials: {:?}.", e))?;
pass_entry
.set_password(&password)
.map_err(|e| format!("Failed to save credentials to keyring: {:?}", e))?;
let pass_entry = Entry::new("iloader", &email).map_err(|e| {
AppError::KeyringWithMessage(
"Failed to create entry for credentials".into(),
e.to_string(),
)
})?;
pass_entry.set_password(&password).map_err(|e| {
AppError::KeyringWithMessage("Failed to save credentials".into(), e.to_string())
})?;
let store = handle
.store("data.json")
.map_err(|e| format!("Failed to get store: {:?}", e))?;
.map_err(|e| AppError::Misc(format!("Failed to get store: {:?}", e)))?;
let mut existing_ids = store
.get("ids")
.unwrap_or_else(|| Value::Array(vec![]))
Expand All @@ -66,12 +71,16 @@ pub async fn login_stored(
email: String,
anisette_server: String,
sideloader_state: State<'_, SideloaderMutex>,
) -> Result<(), String> {
let pass_entry = Entry::new("iloader", &email)
.map_err(|e| format!("Failed to create keyring entry for credentials: {:?}.", e))?;
let password = pass_entry
.get_password()
.map_err(|e| format!("Failed to get credentials: {:?}", e))?;
) -> Result<(), AppError> {
let pass_entry = Entry::new("iloader", &email).map_err(|e| {
AppError::KeyringWithMessage(
"Failed to create keyring entry for credentials".to_string(),
e.to_string(),
)
})?;
let password = pass_entry.get_password().map_err(|e| {
AppError::KeyringWithMessage("Failed to get credentials".to_string(), e.to_string())
})?;
let account = login(&handle, &window, &email, &password, anisette_server).await?;
let mut sideloader_guard = sideloader_state.lock().unwrap();
*sideloader_guard = Some(account);
Expand All @@ -80,40 +89,28 @@ pub async fn login_stored(
}

#[tauri::command]
pub fn delete_account(handle: AppHandle, email: String) -> Result<(), String> {
let mut errors: Vec<String> = Vec::new();

match Entry::new("iloader", &email) {
Ok(pass_entry) => {
if let Err(e) = pass_entry.delete_credential() {
errors.push(format!("Failed to delete credentials: {:?}.", e));
}
}
Err(e) => errors.push(format!(
"Failed to create keyring entry for credentials: {:?}.",
e
)),
}

match handle.store("data.json") {
Ok(store) => {
let mut existing_ids = store
.get("ids")
.unwrap_or_else(|| Value::Array(vec![]))
.as_array()
.cloned()
.unwrap_or_else(std::vec::Vec::new);
existing_ids.retain(|v| v.as_str().is_none_or(|s| s != email));
store.set("ids", Value::Array(existing_ids));
}
Err(e) => errors.push(format!("Failed to get store: {:?}.", e)),
}

if errors.is_empty() {
Ok(())
} else {
Err(errors.join("\n"))
}
pub fn delete_account(handle: AppHandle, email: String) -> Result<(), AppError> {
let store = handle
.store("data.json")
.map_err(|e| AppError::Misc(format!("Failed to get store: {:?}", e)))?;
let mut existing_ids = store
.get("ids")
.unwrap_or_else(|| Value::Array(vec![]))
.as_array()
.cloned()
.unwrap_or_else(std::vec::Vec::new);
existing_ids.retain(|v| v.as_str().is_none_or(|s| s != email));
store.set("ids", Value::Array(existing_ids));
let pass_entry = Entry::new("iloader", &email).map_err(|e| {
AppError::KeyringWithMessage(
"Failed to create keyring entry for credentials".into(),
e.to_string(),
)
})?;
pass_entry.delete_credential().map_err(|e| {
AppError::KeyringWithMessage("Failed to delete credentials".into(), e.to_string())
})?;
Ok(())
}

#[tauri::command]
Expand All @@ -132,9 +129,13 @@ pub fn invalidate_account(sideloader_state: State<'_, SideloaderMutex>) {
}

#[tauri::command]
pub fn reset_anisette_state() -> Result<bool, String> {
let state_entry = Entry::new("iloader", "anisette_state")
.map_err(|e| format!("Failed to create keyring entry for anisette: {:?}.", e))?;
pub fn reset_anisette_state() -> Result<bool, AppError> {
let state_entry = Entry::new("iloader", "anisette_state").map_err(|e| {
AppError::KeyringWithMessage(
"Failed to create keyring entry for anisette".into(),
e.to_string(),
)
})?;

match state_entry.delete_credential() {
Ok(_) => {
Expand All @@ -145,7 +146,10 @@ pub fn reset_anisette_state() -> Result<bool, String> {
debug!("No existing anisette state found in keyring, nothing to delete.");
Ok(false)
}
Err(e) => Err(format!("Failed to delete anisette state: {:?}", e)),
Err(e) => Err(AppError::KeyringWithMessage(
"Failed to delete anisette state".into(),
e.to_string(),
)),
}
}

Expand All @@ -155,7 +159,7 @@ async fn login(
email: &str,
password: &str,
anisette_server: String,
) -> Result<Sideloader, String> {
) -> Result<Sideloader, AppError> {
let window_clone = window.clone();
let tfa_closure = move || -> Option<String> {
window_clone
Expand Down Expand Up @@ -194,14 +198,11 @@ async fn login(
.set_url(&anisette_url),
)
.login(password, tfa_closure)
.await
.map_err(|e| e.to_string())?;
.await?;

debug!("Logged in");

let dev_session = DeveloperSession::from_account(&mut account)
.await
.map_err(|e| e.to_string())?;
let dev_session = DeveloperSession::from_account(&mut account).await?;

debug!("Created developer session");

Expand Down Expand Up @@ -238,7 +239,7 @@ async fn login(
// TODO: Team Selection

let sideloader = SideloaderBuilder::new(dev_session, email.to_lowercase())
.machine_name("iloader".to_string())
.machine_name("iloader".into())
.storage(create_sideloading_storage(app)?)
.max_certs_behavior(MaxCertsBehavior::Prompt(Box::new(max_certs_callback)))
.build();
Expand All @@ -261,20 +262,13 @@ pub struct CertificateInfo {
#[tauri::command]
pub async fn get_certificates(
sideloader_state: State<'_, SideloaderMutex>,
) -> Result<Vec<CertificateInfo>, String> {
) -> Result<Vec<CertificateInfo>, AppError> {
let mut sideloader = SideloaderGuard::take(&sideloader_state)?;

let team = sideloader
.get_mut()
.get_team()
.await
.map_err(|e| e.to_string())?;
let team = sideloader.get_mut().get_team().await?;
let dev_session = sideloader.get_mut().get_dev_session();

let certificates = dev_session
.list_all_development_certs(&team, None)
.await
.map_err(|e| format!("Failed to get development certificates: {:?}.", e))?;
let certificates = dev_session.list_all_development_certs(&team, None).await?;

Ok(certificates
.into_iter()
Expand All @@ -292,41 +286,29 @@ pub async fn get_certificates(
pub async fn revoke_certificate(
serial_number: String,
sideloader_state: State<'_, SideloaderMutex>,
) -> Result<(), String> {
) -> Result<(), AppError> {
let mut sideloader = SideloaderGuard::take(&sideloader_state)?;

let team = sideloader
.get_mut()
.get_team()
.await
.map_err(|e| e.to_string())?;
let team = sideloader.get_mut().get_team().await?;
let dev_session = sideloader.get_mut().get_dev_session();

dev_session
.revoke_development_cert(&team, &serial_number, None)
.await
.map_err(|e| format!("Failed to revoke development certificates: {:?}.", e))?;
.await?;

Ok(())
}

#[tauri::command]
pub async fn list_app_ids(
sideloader_state: State<'_, SideloaderMutex>,
) -> Result<ListAppIdsResponse, String> {
) -> Result<ListAppIdsResponse, AppError> {
let mut sideloader = SideloaderGuard::take(&sideloader_state)?;

let team = sideloader
.get_mut()
.get_team()
.await
.map_err(|e| e.to_string())?;
let team = sideloader.get_mut().get_team().await?;
let dev_session = sideloader.get_mut().get_dev_session();

let response = dev_session
.list_app_ids(&team, None)
.await
.map_err(|e| e.to_string())?;
let response = dev_session.list_app_ids(&team, None).await?;

Ok(response.clone())
}
Expand All @@ -335,20 +317,13 @@ pub async fn list_app_ids(
pub async fn delete_app_id(
app_id_id: String,
sideloader_state: State<'_, SideloaderMutex>,
) -> Result<(), String> {
) -> Result<(), AppError> {
let mut sideloader = SideloaderGuard::take(&sideloader_state)?;

let team = sideloader
.get_mut()
.get_team()
.await
.map_err(|e| e.to_string())?;
let team = sideloader.get_mut().get_team().await?;
let dev_session = sideloader.get_mut().get_dev_session();

dev_session
.delete_app_id(&team, &app_id_id, None)
.await
.map_err(|e| format!("Failed to delete App ID: {:?}.", e))?;
dev_session.delete_app_id(&team, &app_id_id, None).await?;

Ok(())
}
Loading
Loading