* chore: typo fix and formatting tidyups * refactor(theseus): extend auth subsystem to fetch complete user profiles * chore: fix new `prettier` lints * chore: document differences between similar `Credentials` methods * chore: remove dead `profile_run_credentials` plugin command * feat(app): skin selector backend * enh(app/skin-selector): better DB intension through deferred FKs, further PNG validations * chore: fix comment typo spotted by Copilot * fix: less racy auth token refresh logic This may help with issues reported by users where the access token is invalid and can't be used to join servers over long periods of time. * tweak(app-lib): improve consistency of skin field serialization case * fix(app-lib/minecraft_skins): fix custom skin removal from DB not working * Begin skins frontend * Cape preview * feat: start on SkinPreviewRenderer * feat: setting for nametag * feat: hide nametag setting (sql) * fix: positioning of meshes * fix: lighting * fix: allow dragging off-bounds * fix: better color mapping * feat: hide nametag setting (impl) * feat: Start on edit modal + cape button cleanup + renderer fixes * feat: Finish new skin modal * feat: finish cape modal * feat: skin rendering on load * fix: logic for Skins.vue * fix: types * fix: types (for modal + renderer) * feat: Editing? * fix: renderer not updating variant * fix: mojang username not modrinth username * feat: batched skin rendering - remove vzge references (apart from capes, wip) * feat: fix sizing on SkinButton and SkinLikeButton, also implement bust positioning * feat: capes in preview renderer & baked renders * fix: lint fixes * refactor: Start on cleanup and polish * fix: hide error notification when logged out * revert: .gltf formatting * chore(app-frontend): fix typos * fix(app-lib): delay account skin data deletion to next reboot This gives users an opportunity to not unexpectedly lose skin data in case they log off on accident. * fix: login button & provide/inject AccountsCard * polish: skin buttons * fix: imports * polish: use figma values * polish: tweak underneath shadow * polish: cursor grab * polish: remove green bg from CapeLikeTextButton when selected. * polish: modal tweaks * polish: grid tweaks + start on upload skin modal * polish: drag and drop file flow * polish: button positioning in SkinButton * fix: lint issues * polish: deduplicate model+cape stuff and fix layout * fix: lint issues * fix: camel case requirement for make-default * polish: use indexed db to persist skin previews * fix: lint issues * polish: add skin icon sizing * polish: theme fixes * feat: animation system for skin preview renderer * feat(app/minecraft_skins): save current custom external skin when equipping skins * fix: cape button & dynamic nametag sizing * feat(theseus): add `normalize_skin_texture` Tauri command This command lets the app frontend opt in to normalizing the texture of any skin, which may be in either the legacy 64x32 or newer 64x64 format, to the newer 64x64 format for display purposes. * chore: Rust build fixes * feat: start impl of skin normalization on frontend * feat(theseus): change parameter type of `normalize_skin_texture` Tauri command * fix: normalization * fix(theseus): make new `normalize_skin_texture` command usable * feat: finish normalization impl * fix: vueuse issue * fix: use optimistic approach when changing skins/capes. * fix: nametag cleanup + scroll fix * fix: edit modal computedAsync not fast enough for skin preview renderer * feat: classic player model animations * chore: fix new Clippy lint * fix(app-lib): actually delete custom skins with no cape overrides * fix(app-lib): handle repeated addition of the same skin properly * refactor(app-lib): simplify DB connection logic a little * fix: various improvements * feat: slim animations * fix: z-fighting on models * fix: shading + lighting improvements * fix: shadows * fix: polish * fix: polish * fix: accounts card not having the right head * fix: lint issues * fix: build issue * feat: drag and drop func * fix: temp disable drag and drop in the modal * Revert "fix: temp disable drag and drop in the modal" This reverts commit 33500c564e3f85e6c0a2e83dd9700deda892004d. * fix: drag and drop working * fix: lint * fix: better media queries * feat(app/skins): revert current custom external skin storing on equip This reverts commit 0155262ddd081c8677654619a09e814088fdd8b0. * regen pnpm lock * pnpm fix * Make default capes a little more clear * Lint --------- Co-authored-by: Alejandro González <me@alegon.dev> Co-authored-by: Prospector <prospectordev@gmail.com>
193 lines
5.1 KiB
Rust
193 lines
5.1 KiB
Rust
//! Theseus error type
|
|
use std::sync::Arc;
|
|
|
|
use crate::{profile, util};
|
|
use data_url::DataUrlError;
|
|
use tracing_error::InstrumentError;
|
|
|
|
#[derive(thiserror::Error, Debug)]
|
|
pub enum ErrorKind {
|
|
#[error("Filesystem error: {0}")]
|
|
FSError(String),
|
|
|
|
#[error("Serialization error (INI): {0}")]
|
|
INIError(#[from] serde_ini::de::Error),
|
|
|
|
#[error("Serialization error (JSON): {0}")]
|
|
JSONError(#[from] serde_json::Error),
|
|
|
|
#[error("Serialization error (NBT): {0}")]
|
|
NBTError(#[from] quartz_nbt::io::NbtIoError),
|
|
|
|
#[error("NBT data structure error: {0}")]
|
|
NBTReprError(#[from] quartz_nbt::NbtReprError),
|
|
|
|
#[error("Serialization error (websocket): {0}")]
|
|
WebsocketSerializationError(
|
|
#[from] ariadne::networking::serialization::SerializationError,
|
|
),
|
|
|
|
#[error("Error parsing UUID: {0}")]
|
|
UUIDError(#[from] uuid::Error),
|
|
|
|
#[error("Error parsing URL: {0}")]
|
|
URLError(#[from] url::ParseError),
|
|
|
|
#[error("Unable to read {0} from any source")]
|
|
NoValueFor(String),
|
|
|
|
#[error("Metadata error: {0}")]
|
|
MetadataError(#[from] daedalus::Error),
|
|
|
|
#[error("Minecraft authentication error: {0}")]
|
|
MinecraftAuthenticationError(
|
|
#[from] crate::state::MinecraftAuthenticationError,
|
|
),
|
|
|
|
#[error("I/O error: {0}")]
|
|
IOError(#[from] util::io::IOError),
|
|
|
|
#[error("I/O (std) error: {0}")]
|
|
StdIOError(#[from] std::io::Error),
|
|
|
|
#[error("Error launching Minecraft: {0}")]
|
|
LauncherError(String),
|
|
|
|
#[error("Error fetching URL: {0}")]
|
|
FetchError(#[from] reqwest::Error),
|
|
|
|
#[error("Websocket error: {0}")]
|
|
WSError(#[from] async_tungstenite::tungstenite::Error),
|
|
|
|
#[error("Websocket closed before {0} could be received!")]
|
|
WSClosedError(String),
|
|
|
|
#[error("Incorrect Sha1 hash for download: {0} != {1}")]
|
|
HashError(String, String),
|
|
|
|
#[error("Regex error: {0}")]
|
|
RegexError(#[from] regex::Error),
|
|
|
|
#[error("Paths stored in the database need to be valid UTF-8: {0}")]
|
|
UTFError(std::path::PathBuf),
|
|
|
|
#[error("Invalid input: {0}")]
|
|
InputError(String),
|
|
|
|
#[error("Join handle error: {0}")]
|
|
JoinError(#[from] tokio::task::JoinError),
|
|
|
|
#[error("Recv error: {0}")]
|
|
RecvError(#[from] tokio::sync::oneshot::error::RecvError),
|
|
|
|
#[error("Error acquiring semaphore: {0}")]
|
|
AcquireError(#[from] tokio::sync::AcquireError),
|
|
|
|
#[error("Profile {0} is not managed by the app!")]
|
|
UnmanagedProfileError(String),
|
|
|
|
#[error("Could not create profile: {0}")]
|
|
ProfileCreationError(#[from] profile::create::ProfileCreationError),
|
|
|
|
#[error("User is not logged in, no credentials available!")]
|
|
NoCredentialsError,
|
|
|
|
#[error("JRE error: {0}")]
|
|
JREError(#[from] crate::util::jre::JREError),
|
|
|
|
#[error("Error parsing date: {0}")]
|
|
ChronoParseError(#[from] chrono::ParseError),
|
|
|
|
#[error("Event error: {0}")]
|
|
EventError(#[from] crate::event::EventError),
|
|
|
|
#[error("Zip error: {0}")]
|
|
ZipError(#[from] async_zip::error::ZipError),
|
|
|
|
#[error("File watching error: {0}")]
|
|
NotifyError(#[from] notify::Error),
|
|
|
|
#[error("Error stripping prefix: {0}")]
|
|
StripPrefixError(#[from] std::path::StripPrefixError),
|
|
|
|
#[error("Error: {0}")]
|
|
OtherError(String),
|
|
|
|
#[cfg(feature = "tauri")]
|
|
#[error("Tauri error: {0}")]
|
|
TauriError(#[from] tauri::Error),
|
|
|
|
#[error("Error interacting with database: {0}")]
|
|
Sqlx(#[from] sqlx::Error),
|
|
|
|
#[error("Error while applying migrations: {0}")]
|
|
SqlxMigrate(#[from] sqlx::migrate::MigrateError),
|
|
|
|
#[error("Move directory error: {0}")]
|
|
DirectoryMoveError(String),
|
|
|
|
#[error("Error resolving DNS: {0}")]
|
|
DNSError(#[from] hickory_resolver::ResolveError),
|
|
|
|
#[error("An online profile for {user_name} is not available")]
|
|
OnlineMinecraftProfileUnavailable { user_name: String },
|
|
|
|
#[error("Invalid data URL: {0}")]
|
|
InvalidDataUrl(#[from] DataUrlError),
|
|
|
|
#[error("Invalid data URL: {0}")]
|
|
InvalidDataUrlBase64(#[from] data_url::forgiving_base64::InvalidBase64),
|
|
|
|
#[error("Invalid PNG")]
|
|
InvalidPng,
|
|
|
|
#[error("Invalid PNG: {0}")]
|
|
PngDecodingError(#[from] png::DecodingError),
|
|
|
|
#[error("PNG encoding error: {0}")]
|
|
PngEncodingError(#[from] png::EncodingError),
|
|
|
|
#[error(
|
|
"A skin texture must have a dimension of either 64x64 or 64x32 pixels"
|
|
)]
|
|
InvalidSkinTexture,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Error {
|
|
pub raw: Arc<ErrorKind>,
|
|
pub source: tracing_error::TracedError<Arc<ErrorKind>>,
|
|
}
|
|
|
|
impl std::error::Error for Error {
|
|
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
|
|
self.source.source()
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Display for Error {
|
|
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
write!(fmt, "{}", self.source)
|
|
}
|
|
}
|
|
|
|
impl<E: Into<ErrorKind>> From<E> for Error {
|
|
fn from(source: E) -> Self {
|
|
let error = Into::<ErrorKind>::into(source);
|
|
let boxed_error = Arc::new(error);
|
|
|
|
Self {
|
|
raw: boxed_error.clone(),
|
|
source: boxed_error.in_current_span(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ErrorKind {
|
|
pub fn as_error(self) -> Error {
|
|
self.into()
|
|
}
|
|
}
|
|
|
|
pub type Result<T> = core::result::Result<T, Error>;
|