v0.1.4-pre.008-fix.001
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
# file: Cargo.toml
|
# file: Cargo.toml
|
||||||
# version: 72
|
# version: 73
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
resolver = "3"
|
resolver = "3"
|
||||||
members = ["crates/ksp-app-config-desk", "crates/ksp-config-lib", "crates/ksp-core-lib", "crates/ksp-logging-lib"]
|
members = ["crates/ksp-app-config-desk", "crates/ksp-config-lib", "crates/ksp-core-lib", "crates/ksp-logging-lib"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.1.4-pre.8"
|
version = "0.1.4-pre.8.fix.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://git.sasedev.com/Sasedev/khadhroony-solana-project"
|
repository = "https://git.sasedev.com/Sasedev/khadhroony-solana-project"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// file: crates/ksp-app-config-desk/src/lib.rs
|
// file: crates/ksp-app-config-desk/src/lib.rs
|
||||||
// version: 4
|
// version: 5
|
||||||
|
|
||||||
//! Tauri desktop application for managing and validating KSP configuration.
|
//! Tauri desktop application for managing and validating KSP configuration.
|
||||||
|
|
||||||
@@ -47,7 +47,5 @@ pub(crate) use self::frontend_logging::FrontendLogPayloadDto;
|
|||||||
pub(crate) use self::frontend_logging::emit_frontend_log_event;
|
pub(crate) use self::frontend_logging::emit_frontend_log_event;
|
||||||
pub(crate) use self::splash::SplashOrderDto;
|
pub(crate) use self::splash::SplashOrderDto;
|
||||||
pub(crate) use self::splash::SplashSettings;
|
pub(crate) use self::splash::SplashSettings;
|
||||||
pub(crate) use self::tw_main::WINDOW_LABEL_MAIN;
|
|
||||||
pub(crate) use self::tw_main::show_and_focus as show_main_window;
|
pub(crate) use self::tw_main::show_and_focus as show_main_window;
|
||||||
pub(crate) use self::tw_splash::WINDOW_LABEL_SPLASH;
|
|
||||||
pub(crate) use self::tw_splash::frontend_ready as splash_frontend_ready_service;
|
pub(crate) use self::tw_splash::frontend_ready as splash_frontend_ready_service;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// file: crates/ksp-app-config-desk/src/splash.rs
|
// file: crates/ksp-app-config-desk/src/splash.rs
|
||||||
// version: 1
|
// version: 2
|
||||||
|
|
||||||
//! Common splash settings and frontend event contracts for Config Desk.
|
//! Common splash settings and frontend event contracts for Config Desk.
|
||||||
|
|
||||||
@@ -105,7 +105,7 @@ fn parse_u64_setting(variable_name: &str, value: &str, maximum: u64) -> ksp_core
|
|||||||
return std::result::Result::Err(
|
return std::result::Result::Err(
|
||||||
ksp_core_lib::Error::new(crate::ERROR_CODE_SPLASH_SETTING_INVALID, "KSP desk splash duration exceeds the allowed bound")
|
ksp_core_lib::Error::new(crate::ERROR_CODE_SPLASH_SETTING_INVALID, "KSP desk splash duration exceeds the allowed bound")
|
||||||
.with_context("variable_name", variable_name)
|
.with_context("variable_name", variable_name)
|
||||||
.with_context("maximum_ms", maximum),
|
.with_context("maximum_ms", maximum.to_string()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return std::result::Result::Ok(parsed);
|
return std::result::Result::Ok(parsed);
|
||||||
@@ -127,7 +127,7 @@ fn parse_u32_setting(variable_name: &str, value: &str, maximum: u32) -> ksp_core
|
|||||||
return std::result::Result::Err(
|
return std::result::Result::Err(
|
||||||
ksp_core_lib::Error::new(crate::ERROR_CODE_SPLASH_SETTING_INVALID, "KSP desk splash duration exceeds the allowed bound")
|
ksp_core_lib::Error::new(crate::ERROR_CODE_SPLASH_SETTING_INVALID, "KSP desk splash duration exceeds the allowed bound")
|
||||||
.with_context("variable_name", variable_name)
|
.with_context("variable_name", variable_name)
|
||||||
.with_context("maximum_ms", maximum),
|
.with_context("maximum_ms", maximum.to_string()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return std::result::Result::Ok(parsed);
|
return std::result::Result::Ok(parsed);
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ fn configure_plugins(builder: tauri::Builder<tauri::Wry>) -> tauri::Builder<taur
|
|||||||
return builder.plugin(tracing_plugin);
|
return builder.plugin(tracing_plugin);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::question_mark_used)]
|
||||||
fn configure_commands(builder: tauri::Builder<tauri::Wry>) -> tauri::Builder<tauri::Wry> {
|
fn configure_commands(builder: tauri::Builder<tauri::Wry>) -> tauri::Builder<tauri::Wry> {
|
||||||
return builder.invoke_handler(tauri::generate_handler![get_app_snapshot, emit_frontend_log, splash_frontend_ready]);
|
return builder.invoke_handler(tauri::generate_handler![get_app_snapshot, emit_frontend_log, splash_frontend_ready]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// file: crates/ksp-app-config-desk/unit_tests/splash.rs
|
// file: crates/ksp-app-config-desk/unit_tests/splash.rs
|
||||||
// version: 1
|
// version: 2
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn fallback_splash_settings_are_short_and_ordered() {
|
fn fallback_splash_settings_are_short_and_ordered() {
|
||||||
@@ -20,7 +20,15 @@ fn splash_order_contract_keeps_action_message_and_duration() {
|
|||||||
#[test]
|
#[test]
|
||||||
fn splash_duration_parser_rejects_invalid_or_unbounded_values() {
|
fn splash_duration_parser_rejects_invalid_or_unbounded_values() {
|
||||||
let malformed = super::parse_u64_setting("KSP_DESK_SPLASH_MINIMUM_MS", "invalid", 60_000);
|
let malformed = super::parse_u64_setting("KSP_DESK_SPLASH_MINIMUM_MS", "invalid", 60_000);
|
||||||
let oversized = super::parse_u32_setting("KSP_DESK_SPLASH_FADE_MS", "10001", 10_000);
|
let oversized_minimum = super::parse_u64_setting("KSP_DESK_SPLASH_MINIMUM_MS", "60001", 60_000);
|
||||||
|
let oversized_fade = super::parse_u32_setting("KSP_DESK_SPLASH_FADE_MS", "10001", 10_000);
|
||||||
assert!(malformed.is_err());
|
assert!(malformed.is_err());
|
||||||
assert!(oversized.is_err());
|
assert!(oversized_minimum.is_err());
|
||||||
|
assert!(oversized_fade.is_err());
|
||||||
|
if let std::result::Result::Err(error) = oversized_minimum {
|
||||||
|
assert!(error.context().iter().any(|field| field.key() == "maximum_ms" && field.value() == "60000"));
|
||||||
|
}
|
||||||
|
if let std::result::Result::Err(error) = oversized_fade {
|
||||||
|
assert!(error.context().iter().any(|field| field.key() == "maximum_ms" && field.value() == "10000"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
120
deltas/0.1.4/pre.008-fix.001.md
Normal file
120
deltas/0.1.4/pre.008-fix.001.md
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
<!-- file: deltas/0.1.4/pre.008-fix.001.md -->
|
||||||
|
<!-- version: 1 -->
|
||||||
|
|
||||||
|
# `0.1.4-pre.008-fix.001` — Contextes splash numériques et réexports de labels inutiles
|
||||||
|
|
||||||
|
## 1. Motif du fix
|
||||||
|
|
||||||
|
`pre.008` a introduit le lifecycle réel `splash -> main`, les modules `tw_splash` / `tw_main` et la validation des timings du splash, mais la première validation locale a révélé deux défauts Rust bloquants ou bruyants :
|
||||||
|
|
||||||
|
- `Error::with_context()` reçoit deux bornes numériques (`u64` et `u32`) alors que son contrat exige une valeur convertible en `String`, ce qui provoque deux erreurs `E0277` dans `splash.rs` ;
|
||||||
|
- `lib.rs` réexporte `WINDOW_LABEL_MAIN` et `WINDOW_LABEL_SPLASH` alors que ces constantes ne sont utilisées qu'à l'intérieur de leurs modules propriétaires, ce qui provoque deux warnings `unused_imports`.
|
||||||
|
|
||||||
|
Le correctif ne modifie ni la séquence fonctionnelle du splash, ni les labels de fenêtres, ni les contrats frontend introduits en `pre.008`.
|
||||||
|
|
||||||
|
## 2. Version technique
|
||||||
|
|
||||||
|
Le fix touche du Rust compilé. Le signal Cargo devient :
|
||||||
|
|
||||||
|
```text
|
||||||
|
workspace.package.version = "0.1.4-pre.8.fix.1"
|
||||||
|
```
|
||||||
|
|
||||||
|
La version applicative frontend/Tauri reste `0.1.4` selon la politique KSP actuelle.
|
||||||
|
|
||||||
|
## 3. Contextes d'erreur numériques
|
||||||
|
|
||||||
|
Le contrat Core est :
|
||||||
|
|
||||||
|
```rust
|
||||||
|
pub fn with_context(mut self, key: &'static str, value: impl Into<String>) -> Self
|
||||||
|
```
|
||||||
|
|
||||||
|
Les bornes applicatives du splash ne peuvent donc pas être passées directement comme entiers.
|
||||||
|
|
||||||
|
Les deux branches deviennent explicitement :
|
||||||
|
|
||||||
|
```rust
|
||||||
|
.with_context("maximum_ms", maximum.to_string())
|
||||||
|
```
|
||||||
|
|
||||||
|
Cela concerne :
|
||||||
|
|
||||||
|
- `parse_u64_setting()` pour `KSP_DESK_SPLASH_MINIMUM_MS` ;
|
||||||
|
- `parse_u32_setting()` pour `KSP_DESK_SPLASH_FADE_MS`.
|
||||||
|
|
||||||
|
Aucune modification de `ksp-core-lib::Error` n'est nécessaire : la représentation textuelle du contexte reste le contrat commun voulu par Core.
|
||||||
|
|
||||||
|
## 4. Ownership des labels de fenêtre
|
||||||
|
|
||||||
|
L'audit des usages confirme :
|
||||||
|
|
||||||
|
```text
|
||||||
|
tw_main::WINDOW_LABEL_MAIN
|
||||||
|
-> utilisé uniquement dans tw_main.rs
|
||||||
|
|
||||||
|
tw_splash::WINDOW_LABEL_SPLASH
|
||||||
|
-> utilisé uniquement dans tw_splash.rs
|
||||||
|
```
|
||||||
|
|
||||||
|
Les deux lignes suivantes sont donc supprimées de `lib.rs` :
|
||||||
|
|
||||||
|
```rust
|
||||||
|
pub(crate) use self::tw_main::WINDOW_LABEL_MAIN;
|
||||||
|
pub(crate) use self::tw_splash::WINDOW_LABEL_SPLASH;
|
||||||
|
```
|
||||||
|
|
||||||
|
Il serait artificiel de modifier `tw_main.rs` / `tw_splash.rs` pour consommer `crate::WINDOW_LABEL_*` uniquement afin de rendre ces réexports utilisés. Chaque module conserve légitimement la propriété et l'usage direct de son label.
|
||||||
|
|
||||||
|
Les réexports réellement utilisés restent inchangés :
|
||||||
|
|
||||||
|
```rust
|
||||||
|
pub(crate) use self::tw_main::show_and_focus as show_main_window;
|
||||||
|
pub(crate) use self::tw_splash::frontend_ready as splash_frontend_ready_service;
|
||||||
|
```
|
||||||
|
|
||||||
|
## 5. Test renforcé
|
||||||
|
|
||||||
|
Le test unitaire `splash_duration_parser_rejects_invalid_or_unbounded_values` couvre désormais explicitement les deux types de bornes :
|
||||||
|
|
||||||
|
```text
|
||||||
|
u64 -> maximum_ms = "60000"
|
||||||
|
u32 -> maximum_ms = "10000"
|
||||||
|
```
|
||||||
|
|
||||||
|
Il vérifie que les erreurs bornées conservent bien ces valeurs dans `Error::context()` sous forme textuelle.
|
||||||
|
|
||||||
|
## 6. Fichiers modifiés
|
||||||
|
|
||||||
|
| Fichier | Action |
|
||||||
|
| ------------------------------------------------------ | ------: |
|
||||||
|
| `Cargo.toml` | modifié |
|
||||||
|
| `crates/ksp-app-config-desk/src/lib.rs` | modifié |
|
||||||
|
| `crates/ksp-app-config-desk/src/splash.rs` | modifié |
|
||||||
|
| `crates/ksp-app-config-desk/unit_tests/splash.rs` | modifié |
|
||||||
|
| `deltas/0.1.4/pre.008-fix.001.md` | ajouté |
|
||||||
|
|
||||||
|
## 7. Validations demandées
|
||||||
|
|
||||||
|
Depuis la racine du workspace :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo fmt --all
|
||||||
|
cargo check --workspace
|
||||||
|
cargo clippy --workspace --all-targets
|
||||||
|
cargo test -p ksp-app-config-desk
|
||||||
|
cargo test -p ksp-config-lib
|
||||||
|
cargo tree -p ksp-app-config-desk
|
||||||
|
cargo tauri dev -c crates/ksp-app-config-desk/tauri.conf.json
|
||||||
|
```
|
||||||
|
|
||||||
|
Les validations doivent confirmer :
|
||||||
|
|
||||||
|
- disparition des deux erreurs `E0277` sur `maximum_ms` ;
|
||||||
|
- absence des warnings `unused import` pour `WINDOW_LABEL_MAIN` / `WINDOW_LABEL_SPLASH` ;
|
||||||
|
- maintien des tests du lifecycle splash ;
|
||||||
|
- transition réelle `splash -> main` toujours fonctionnelle.
|
||||||
|
|
||||||
|
## 8. Suite
|
||||||
|
|
||||||
|
Après validation de ce fix, la suite reste celle de `pre.008` : `pre.009` doit introduire la surface Documents + diagnostics sans réouvrir le lifecycle de fenêtres, sauf défaut runtime découvert pendant la validation desktop.
|
||||||
Reference in New Issue
Block a user