From 8a37144cd8e0cde7599e5ba2aefb137c4d1fa994 Mon Sep 17 00:00:00 2001 From: javis-bot Date: Sun, 15 Nov 2026 23:46:30 +0900 Subject: [PATCH] fix(app): a speech speed saved while the services start reaches them once they run The start may have read the settings before the save, and the controller dropped a speed saved with nothing running yet. It now keeps the latest speed and hands it to the services when they come up. Version 0.1.5. Co-Authored-By: Claude Opus 5.5 --- app/Cargo.lock | 2 +- app/Cargo.toml | 2 +- app/shell/Cargo.lock | 4 ++-- app/shell/Cargo.toml | 2 +- app/src/control.rs | 34 +++++++++++++++++++++++++++++----- app/src/discord_core.spec.md | 2 +- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/Cargo.lock b/app/Cargo.lock index 1f0a510..a41599e 100644 --- a/app/Cargo.lock +++ b/app/Cargo.lock @@ -1484,7 +1484,7 @@ checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "jarvis-app" -version = "0.1.4" +version = "0.1.5" dependencies = [ "async-trait", "base64 0.22.1", diff --git a/app/Cargo.toml b/app/Cargo.toml index e3ccfef..f631499 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jarvis-app" -version = "0.1.4" +version = "0.1.5" edition = "2021" rust-version = "1.85" description = "Jarvis v2 Windows app core: Discord voice, voice worker supervisor, chat channels" diff --git a/app/shell/Cargo.lock b/app/shell/Cargo.lock index 0601ffb..a36792a 100644 --- a/app/shell/Cargo.lock +++ b/app/shell/Cargo.lock @@ -2380,7 +2380,7 @@ checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "jarvis-app" -version = "0.1.4" +version = "0.1.5" dependencies = [ "async-trait", "base64 0.22.1", @@ -2408,7 +2408,7 @@ dependencies = [ [[package]] name = "jarvis-shell" -version = "0.1.4" +version = "0.1.5" dependencies = [ "jarvis-app", "serde_json", diff --git a/app/shell/Cargo.toml b/app/shell/Cargo.toml index 3b7e144..4c3a74c 100644 --- a/app/shell/Cargo.toml +++ b/app/shell/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jarvis-shell" -version = "0.1.4" +version = "0.1.5" edition = "2021" rust-version = "1.85" description = "Jarvis v2 management app window (Tauri 2 over the app core's AdminApi)" diff --git a/app/src/control.rs b/app/src/control.rs index dcf0489..eec1564 100644 --- a/app/src/control.rs +++ b/app/src/control.rs @@ -66,6 +66,9 @@ struct Inner { feeder: Option>, /// Stop was asked for while starting. stop_asked: bool, + /// The latest speech speed saved (equal to the settings file's): a start may have read the + /// settings before it was saved, so the services get it again once they run. + tts_speed: Option, } pub struct Controller { @@ -77,7 +80,7 @@ pub struct Controller { impl Controller { pub fn new(host: impl Host) -> Arc { Arc::new(Self { host: Box::new(host), inner: Mutex::new(Inner { state: State::Stopped, error: None, running: None, - dashboard: Arc::default(), feeder: None, stop_asked: false }), usage: tokio::sync::Mutex::new(None) }) + dashboard: Arc::default(), feeder: None, stop_asked: false, tts_speed: None }), usage: tokio::sync::Mutex::new(None) }) } pub fn state(&self) -> State { @@ -133,6 +136,9 @@ impl Controller { d2.lock().unwrap().on_event(&ev, Instant::now()); } }); + if let Some(speed) = i.tts_speed { + running.set_tts_speed(speed); + } i.state = State::Running; i.running = Some(running); i.dashboard = dash; @@ -169,10 +175,14 @@ impl Controller { Err("cancelled".into()) } - /// Give the running services a new speech speed. False when nothing runs (the next start reads it - /// from the settings). + /// Give the running services a new speech speed. False when nothing runs yet; a start in + /// progress passes it on once the services run. pub fn set_tts_speed(&self, speed: f64) -> bool { - let running = self.inner.lock().unwrap().running.clone(); + let running = { + let mut i = self.inner.lock().unwrap(); + i.tts_speed = Some(speed); + i.running.clone() + }; running.map(|r| r.set_tts_speed(speed)).is_some() } @@ -495,10 +505,24 @@ mod tests { assert!(!c.set_tts_speed(1.7), "nothing runs: the next start reads the settings"); c.start().await.unwrap(); assert!(c.set_tts_speed(1.8)); - assert_eq!(*counts.speeds.lock().unwrap(), [1.8]); + assert_eq!(counts.speeds.lock().unwrap().last(), Some(&1.8), "the latest speed is the one they use"); assert_eq!(counts.starts.load(Ordering::SeqCst), 1, "no restart"); } + #[tokio::test] + async fn a_speech_speed_saved_while_starting_reaches_the_services_once_they_run() { + // The start read the settings before the save, so the new speed must follow it. + let counts = Arc::new(Counts::default()); + let c = Controller::new(FakeHost { counts: counts.clone(), fail_first: AtomicU32::new(0), events: Mutex::new(None) }); + c.start_in_background().unwrap(); + assert_eq!(c.state(), State::Starting); + assert!(!c.set_tts_speed(1.9), "not running yet"); + tokio::time::timeout(Duration::from_secs(2), async { + while c.state() != State::Running { tokio::time::sleep(Duration::from_millis(5)).await; } + }).await.unwrap(); + assert_eq!(*counts.speeds.lock().unwrap(), [1.9]); + } + #[tokio::test] async fn a_stop_while_starting_cancels_the_start_or_stops_what_came_up() { for honours_cancel in [true, false] { diff --git a/app/src/discord_core.spec.md b/app/src/discord_core.spec.md index 8c43bf3..8a32646 100644 --- a/app/src/discord_core.spec.md +++ b/app/src/discord_core.spec.md @@ -70,7 +70,7 @@ strings (numbers would lose precision). | `voice.wakeWords` | `["자비스"]` | Sent to the worker as STT `hotwords`, and the voice wake words of call detection. | | `voice.stt` | `{}` | Other worker STT settings (`partials`, `end_silence_ms`, `final_beam`, `language`, ...); the worker validates them. | | `chatChannels` | `[]` | `{id, name, description, read (true), send (true), edit (true), react (true), delete (false), pin (false), answer ("wakeWord"), syncDiscord (true)}` per channel; `answer` is in `conversation.spec.md`, `syncDiscord` (the channel's Discord name and topic follow `name` and `description`) in `admin.spec.md`. | -| `voice.tts.speed` | `1.5` | How fast the voice speaks, 0.5-2.0 (1.0 is MeloTTS's natural pace; above it the worker stretches the speech and keeps its pitch, `voice_worker.spec.md`, "TTS"). Passed to the worker as `--melo-speed` when it speaks (`--melo-python`) and its arguments set no speed. A change saved while the services run goes to the worker at once (`tts_speed`) and applies from the next sentence, without a restart; it is sent again whenever the worker connects again. MeloTTS's Korean model has one voice, so there is no voice choice. | +| `voice.tts.speed` | `1.5` | How fast the voice speaks, 0.5-2.0 (1.0 is MeloTTS's natural pace; above it the worker stretches the speech and keeps its pitch, `voice_worker.spec.md`, "TTS"). Passed to the worker as `--melo-speed` when it speaks (`--melo-python`) and its arguments set no speed. A change saved while the services run goes to the worker at once (`tts_speed`) and applies from the next sentence, without a restart (saved while they start, it goes once they run, since the start may have read the settings before); it is sent again whenever the worker connects again. MeloTTS's Korean model has one voice, so there is no voice choice. | | `voiceWorker.python` | `python3` (`python.exe` on Windows) | Python of the worker venv. | | `voiceWorker.cwd` | `python-src` next to the app's executable when it is there (the Windows build), else the repo's `src/` | Folder holding the `voice_worker` package. | | `voiceWorker.args` | `[]` | Extra worker arguments, e.g. `["--melo-python", ""]`. |