Two changes developed together in one session; they share the same module
structure (db/mod.rs, the core lib root) and only compile together, so they
land as one commit.
## UserManager + per-user encryption (§9/§11)
New `users::UserManager`: owns the system.db pool plus a map
`userid -> SqlitePool` of unlocked databases. The pool *is* the unlock token —
its connect options carry the DEK as SQLCipher's raw key, so an open pool means
the key is in RAM until restart and dropping it re-locks (§9). Knows nothing
about cookies.
New `crypto` module: envelope encryption. A random 256-bit DEK encrypts
`{userid}.db`; `users.database_password` holds it sealed with AES-256-GCM under
`Argon2id(password, salt)`. The AEAD tag is the password verifier — one
derivation both authenticates and yields the key, so encrypted users store no
second hash. Cleartext users store the Argon2id output directly, compared in
constant time. Argon2 runs in spawn_blocking behind a 2-permit semaphore
(256 MiB per derivation).
- SQLCipher via `libsqlite3-sys` `bundled-sqlcipher-vendored-openssl`, pinned
<0.38 so it unifies with the one sqlx-sqlite links (a newer copy would apply
the feature to a SQLite sqlx never uses). OpenSSL is vendored and static, so
the binary stays self-contained.
- Schema split into `create_registry_tables` (instance-wide, no user key) and
`create_owner_tables` (one owner's content, identical in every file). No FK in
the owner bucket may reach the registry — enforced by a standalone test.
Dropped `chat_history.model_db_id` (write-only, and the only registry-crossing
key); moved `projects`/`project_tickets` into the owner bucket.
- Provisioning invariant: the file is written before the row, deleted after it,
so a crash leaves an orphan file, never a user without a database. `open_db`
never creates: a missing file is an error, not a silent empty database.
Not consumed yet: no login, call sites still use the shared system.db pool.
## Extract crates/skald-core
The headless core moves out of `src/` into its own crate; `skald` (server) and
the coming `skald-setup` are shells around it. Two dependencies on the shell
were inverted rather than dragged along, so the core names neither Tauri nor any
concrete plugin:
- `Plugin::tools(self: Arc<Self>)` — plugins contribute tools through this hook
(sibling of `http_router`), so the core no longer downcasts to
`MobileConnectorPlugin`.
- `tools::restart::set_restart_handler` — the desktop shell installs its
teardown-and-respawn; the core defaults to the supervisor exit code. The core
loses its `desktop` feature.
- `boot`'s stdout formatter moves to the binary (`src/boot_format.rs`); the core
only emits tracing events.
All 79 core tests pass; the binary boots and serves in a clean directory, and
the mobile-connector tools still register through the new hook.
286 lines
11 KiB
Rust
286 lines
11 KiB
Rust
/// TtsManager — DB-aware registry of Text-to-Speech providers.
|
|
///
|
|
/// Two kinds of providers coexist:
|
|
/// - **DB-backed**: rows in `tts_models`, built from `llm_providers` credentials.
|
|
/// Managed via `add_model` / `update_model` / `delete_model`. Loaded on startup
|
|
/// and after every mutation.
|
|
/// - **Plugin-registered**: ephemeral providers registered at runtime by plugins
|
|
/// (e.g. a local Kokoro or Piper TTS plugin). Not persisted — they disappear on plugin stop.
|
|
///
|
|
/// `get()` returns the first plugin provider if any is running, otherwise the
|
|
/// first DB-backed provider ordered by `priority ASC`.
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::{Context, Result, anyhow};
|
|
use sqlx::SqlitePool;
|
|
use tokio::sync::RwLock;
|
|
use tokio_util::sync::CancellationToken;
|
|
use tracing::{info, warn};
|
|
|
|
use core_api::system_bus::{SystemEvent, SystemEventBus};
|
|
|
|
use async_trait::async_trait;
|
|
|
|
use crate::llm::LlmProviderRecord;
|
|
use crate::llm::db as llm_db;
|
|
use crate::provider::ProviderRegistry;
|
|
|
|
use super::{TextToSpeech, TtsModelInfo, TtsModelRecord};
|
|
use super::db as tts_db;
|
|
|
|
pub use core_api::tts::{TtsProvider, TtsRegistry};
|
|
|
|
// ── Internal state ────────────────────────────────────────────────────────────
|
|
|
|
struct TtsSlot {
|
|
record: TtsModelRecord,
|
|
provider: LlmProviderRecord,
|
|
synthesiser: Arc<dyn TextToSpeech>,
|
|
}
|
|
|
|
struct ManagerState {
|
|
/// DB-backed synthesisers, ordered by priority ASC. Rebuilt on every reload().
|
|
db_slots: Vec<TtsSlot>,
|
|
/// Plugin-registered providers (ephemeral — not in DB).
|
|
plugins: Vec<Arc<dyn TextToSpeech>>,
|
|
}
|
|
|
|
// ── TtsManager ────────────────────────────────────────────────────────────────
|
|
|
|
pub struct TtsManager {
|
|
pool: Arc<SqlitePool>,
|
|
registry: Arc<ProviderRegistry>,
|
|
state: RwLock<ManagerState>,
|
|
}
|
|
|
|
impl TtsManager {
|
|
pub async fn new(
|
|
pool: Arc<SqlitePool>,
|
|
registry: Arc<ProviderRegistry>,
|
|
system_bus: Arc<SystemEventBus>,
|
|
shutdown: CancellationToken,
|
|
) -> Result<Arc<Self>> {
|
|
let mgr = Arc::new(Self {
|
|
pool,
|
|
registry,
|
|
state: RwLock::new(ManagerState {
|
|
db_slots: Vec::new(),
|
|
plugins: Vec::new(),
|
|
}),
|
|
});
|
|
mgr.reload().await?;
|
|
|
|
// Reload whenever an ApiProvider is registered or unregistered.
|
|
let weak = Arc::downgrade(&mgr);
|
|
let mut rx = system_bus.subscribe();
|
|
tokio::spawn(async move {
|
|
loop {
|
|
tokio::select! {
|
|
_ = shutdown.cancelled() => {
|
|
info!("tts_manager: reload watcher shutdown");
|
|
break;
|
|
}
|
|
event = rx.recv() => match event {
|
|
Ok(SystemEvent::ApiProviderRegistered { .. } | SystemEvent::ApiProviderUnregistered { .. }) => {
|
|
match weak.upgrade() {
|
|
Some(m) => { if let Err(e) = m.reload().await { warn!(error = %e, "tts_manager: reload failed"); } }
|
|
None => break,
|
|
}
|
|
}
|
|
Ok(_) => {}
|
|
Err(core_api::system_bus::RecvError::Lagged(n)) => warn!(n, "tts_manager: system_bus lagged"),
|
|
Err(core_api::system_bus::RecvError::Closed) => break,
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
Ok(mgr)
|
|
}
|
|
|
|
// ── Resolution ────────────────────────────────────────────────────────────
|
|
|
|
/// Returns the first available synthesiser:
|
|
/// plugin-registered providers take precedence over DB-backed ones.
|
|
pub async fn get(&self) -> Option<Arc<dyn TextToSpeech>> {
|
|
let state = self.state.read().await;
|
|
if let Some(p) = state.plugins.first() {
|
|
return Some(Arc::clone(p));
|
|
}
|
|
state.db_slots.first().map(|s| Arc::clone(&s.synthesiser))
|
|
}
|
|
|
|
// ── Plugin registration (ephemeral) ───────────────────────────────────────
|
|
|
|
/// Register an ephemeral provider. If a provider with the same `id()` is
|
|
/// already present it is replaced.
|
|
pub async fn register(&self, provider: Arc<dyn TextToSpeech>) {
|
|
let mut state = self.state.write().await;
|
|
let id = provider.id().to_string();
|
|
state.plugins.retain(|p| p.id() != id);
|
|
state.plugins.push(provider);
|
|
info!(provider = %id, "tts provider registered (ephemeral)");
|
|
}
|
|
|
|
/// Deregister an ephemeral provider by id. No-op if not found.
|
|
pub async fn unregister(&self, id: &str) {
|
|
let mut state = self.state.write().await;
|
|
let before = state.plugins.len();
|
|
state.plugins.retain(|p| p.id() != id);
|
|
if state.plugins.len() < before {
|
|
info!(provider = %id, "tts provider unregistered (ephemeral)");
|
|
}
|
|
}
|
|
|
|
// ── Model CRUD (DB-backed) ────────────────────────────────────────────────
|
|
|
|
/// Fetch the list of TTS models available from a configured provider.
|
|
/// Returns an error if the provider doesn't support model listing.
|
|
pub async fn list_provider_models(&self, provider_id: i64) -> Result<Vec<crate::tts::RemoteTtsModelInfo>> {
|
|
let record = llm_db::load_all_providers(&self.pool).await?
|
|
.into_iter().find(|p| p.id == provider_id)
|
|
.ok_or_else(|| anyhow!("provider {provider_id} not found"))?;
|
|
let provider = self.registry.get(&record.provider)
|
|
.ok_or_else(|| anyhow!("unknown provider type '{}' for provider {provider_id}", record.provider))?;
|
|
provider.list_tts_models(&record).await?
|
|
.ok_or_else(|| anyhow!("provider '{}' does not support TTS model listing", record.name))
|
|
}
|
|
|
|
pub async fn add_model(&self, record: TtsModelRecord) -> Result<i64> {
|
|
let id = tts_db::insert(&self.pool, &record).await?;
|
|
self.reload().await?;
|
|
Ok(id)
|
|
}
|
|
|
|
pub async fn update_model(&self, id: i64, record: TtsModelRecord) -> Result<()> {
|
|
tts_db::update(&self.pool, id, &record).await?;
|
|
self.reload().await
|
|
}
|
|
|
|
pub async fn delete_model(&self, id: i64) -> Result<()> {
|
|
tts_db::soft_delete(&self.pool, id).await?;
|
|
self.reload().await
|
|
}
|
|
|
|
pub async fn get_model(&self, id: i64) -> Option<TtsModelRecord> {
|
|
self.state.read().await
|
|
.db_slots.iter()
|
|
.find(|s| s.record.id == id)
|
|
.map(|s| s.record.clone())
|
|
}
|
|
|
|
pub async fn list_models_info(&self) -> Vec<TtsModelInfo> {
|
|
self.state.read().await.db_slots.iter().map(|s| TtsModelInfo {
|
|
id: s.record.id,
|
|
provider_id: s.provider.id,
|
|
provider_name: s.provider.name.clone(),
|
|
model_id: s.record.model_id.clone(),
|
|
voice_id: s.record.voice_id.clone(),
|
|
name: s.record.name.clone(),
|
|
description: s.record.description.clone(),
|
|
instructions: s.record.instructions.clone(),
|
|
response_format: s.record.response_format.clone(),
|
|
priority: s.record.priority,
|
|
from_plugin: false,
|
|
}).collect()
|
|
}
|
|
|
|
/// Returns all active providers: plugin-registered first, then DB-backed.
|
|
pub async fn list_all_info(&self) -> Vec<TtsModelInfo> {
|
|
let state = self.state.read().await;
|
|
|
|
let plugins = state.plugins.iter().map(|p| TtsModelInfo {
|
|
id: 0,
|
|
provider_id: 0,
|
|
provider_name: "Plugin".into(),
|
|
model_id: p.id().to_string(),
|
|
voice_id: None,
|
|
name: p.name().to_string(),
|
|
description: p.description().map(str::to_string),
|
|
instructions: p.instructions().map(str::to_string),
|
|
response_format: None,
|
|
priority: 0,
|
|
from_plugin: true,
|
|
});
|
|
|
|
let db = state.db_slots.iter().map(|s| TtsModelInfo {
|
|
id: s.record.id,
|
|
provider_id: s.provider.id,
|
|
provider_name: s.provider.name.clone(),
|
|
model_id: s.record.model_id.clone(),
|
|
voice_id: s.record.voice_id.clone(),
|
|
name: s.record.name.clone(),
|
|
description: s.record.description.clone(),
|
|
instructions: s.record.instructions.clone(),
|
|
response_format: s.record.response_format.clone(),
|
|
priority: s.record.priority,
|
|
from_plugin: false,
|
|
});
|
|
|
|
plugins.chain(db).collect()
|
|
}
|
|
|
|
// ── Private ───────────────────────────────────────────────────────────────
|
|
|
|
async fn reload(&self) -> Result<()> {
|
|
let model_records: Vec<TtsModelRecord> =
|
|
tts_db::load_all(&self.pool).await?;
|
|
let provider_records: Vec<LlmProviderRecord> =
|
|
llm_db::load_all_providers(&self.pool).await?;
|
|
|
|
let providers: std::collections::HashMap<i64, LlmProviderRecord> =
|
|
provider_records.into_iter().map(|p| (p.id, p)).collect();
|
|
|
|
let mut db_slots = Vec::new();
|
|
|
|
for model in model_records {
|
|
let provider = match providers.get(&model.provider_id) {
|
|
Some(p) => p.clone(),
|
|
None => {
|
|
warn!(
|
|
model = %model.name,
|
|
provider_id = model.provider_id,
|
|
"orphaned tts model — provider not found, skipping",
|
|
);
|
|
continue;
|
|
}
|
|
};
|
|
|
|
let result = self.registry.get(&provider.provider)
|
|
.and_then(|p| p.build_tts(&provider, &model))
|
|
.unwrap_or_else(|| anyhow::bail!("provider '{}' does not support TTS", provider.provider));
|
|
match result {
|
|
Ok(synthesiser) => db_slots.push(TtsSlot { record: model, provider, synthesiser }),
|
|
Err(e) => warn!(model = %model.name, error = %e, "failed to build tts synthesiser, skipping"),
|
|
}
|
|
}
|
|
|
|
let slot_count = db_slots.len();
|
|
self.state.write().await.db_slots = db_slots;
|
|
|
|
info!(db_backed = slot_count, "tts manager reloaded");
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
// ── TtsProvider / TtsRegistry impls ──────────────────────────────────────────
|
|
|
|
#[async_trait]
|
|
impl TtsProvider for TtsManager {
|
|
async fn get(&self) -> Option<Arc<dyn TextToSpeech>> {
|
|
TtsManager::get(self).await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl TtsRegistry for TtsManager {
|
|
async fn register(&self, provider: Arc<dyn TextToSpeech>) {
|
|
TtsManager::register(self, provider).await
|
|
}
|
|
|
|
async fn unregister(&self, id: &str) {
|
|
TtsManager::unregister(self, id).await
|
|
}
|
|
}
|
|
|