mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-25 14:53:34 +00:00
* refactor: split large files and consolidate test stubs for contributor velocity - Extract 7 Database sub-traits (ConversationStore, JobStore, SandboxStore, RoutineStore, ToolFailureStore, SettingsStore, WorkspaceStore) with Database as a supertrait combining them all - Split libsql_backend.rs (2769 lines) into src/db/libsql/ directory with one file per sub-trait implementation - Split config.rs (1753 lines) into src/config/ directory with 16 domain files - Consolidate 3 duplicate test LLM stubs into shared StubLlm in src/testing.rs - Split server.rs handlers into src/channels/web/handlers/ directory - Extract main.rs init phases into AppBuilder (src/app.rs) - Add developer setup script (scripts/dev-setup.sh) Co-Authored-By: Claude Opus 4.6 <[email protected]> * refactor: move heartbeat test from examples/ to tests/ Convert standalone example binary into a proper #[ignore] integration test, matching the convention of the other integration tests. Co-Authored-By: Claude Opus 4.6 <[email protected]> * style: fix rustfmt formatting for CI Co-Authored-By: Claude Opus 4.6 <[email protected]> * fix: address PR review comments from Copilot - tunnel.rs: replace .ok().flatten() with ? to propagate env var errors - secrets.rs: remove misleading "process-wide cache" comment - database.rs: use uppercase "DATABASE_URL" in error key - testing.rs: gate harness tests with #[cfg(feature = "libsql")] Co-Authored-By: Claude Opus 4.6 <[email protected]> --------- Co-authored-by: Illia Polosukhin <[email protected]> Co-authored-by: Claude Opus 4.6 <[email protected]>
131 lines
4.1 KiB
Rust
131 lines
4.1 KiB
Rust
use std::path::PathBuf;
|
|
|
|
use secrecy::{ExposeSecret, SecretString};
|
|
|
|
use crate::config::helpers::{optional_env, parse_optional_env};
|
|
use crate::error::ConfigError;
|
|
|
|
/// Which database backend to use.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
|
pub enum DatabaseBackend {
|
|
/// PostgreSQL via deadpool-postgres (default).
|
|
#[default]
|
|
Postgres,
|
|
/// libSQL/Turso embedded database.
|
|
LibSql,
|
|
}
|
|
|
|
impl std::fmt::Display for DatabaseBackend {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
Self::Postgres => write!(f, "postgres"),
|
|
Self::LibSql => write!(f, "libsql"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::str::FromStr for DatabaseBackend {
|
|
type Err = String;
|
|
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
match s.to_lowercase().as_str() {
|
|
"postgres" | "postgresql" | "pg" => Ok(Self::Postgres),
|
|
"libsql" | "turso" | "sqlite" => Ok(Self::LibSql),
|
|
_ => Err(format!(
|
|
"invalid database backend '{}', expected 'postgres' or 'libsql'",
|
|
s
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Database configuration.
|
|
#[derive(Debug, Clone)]
|
|
pub struct DatabaseConfig {
|
|
/// Which backend to use (default: Postgres).
|
|
pub backend: DatabaseBackend,
|
|
|
|
// -- PostgreSQL fields --
|
|
pub url: SecretString,
|
|
pub pool_size: usize,
|
|
|
|
// -- libSQL fields --
|
|
/// Path to local libSQL database file (default: ~/.ironclaw/ironclaw.db).
|
|
pub libsql_path: Option<PathBuf>,
|
|
/// Turso cloud URL for remote sync (optional).
|
|
pub libsql_url: Option<String>,
|
|
/// Turso auth token (required when libsql_url is set).
|
|
pub libsql_auth_token: Option<SecretString>,
|
|
}
|
|
|
|
impl DatabaseConfig {
|
|
pub(crate) fn resolve() -> Result<Self, ConfigError> {
|
|
let backend: DatabaseBackend = if let Some(b) = optional_env("DATABASE_BACKEND")? {
|
|
b.parse().map_err(|e| ConfigError::InvalidValue {
|
|
key: "DATABASE_BACKEND".to_string(),
|
|
message: e,
|
|
})?
|
|
} else {
|
|
DatabaseBackend::default()
|
|
};
|
|
|
|
// PostgreSQL URL is required only when using the postgres backend.
|
|
// For libsql backend, default to an empty placeholder.
|
|
// DATABASE_URL is loaded from ~/.ironclaw/.env via dotenvy early in startup.
|
|
let url = optional_env("DATABASE_URL")?
|
|
.or_else(|| {
|
|
if backend == DatabaseBackend::LibSql {
|
|
Some("unused://libsql".to_string())
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
.ok_or_else(|| ConfigError::MissingRequired {
|
|
key: "DATABASE_URL".to_string(),
|
|
hint: "Run 'ironclaw onboard' or set DATABASE_URL environment variable".to_string(),
|
|
})?;
|
|
|
|
let pool_size = parse_optional_env("DATABASE_POOL_SIZE", 10)?;
|
|
|
|
let libsql_path = optional_env("LIBSQL_PATH")?.map(PathBuf::from).or_else(|| {
|
|
if backend == DatabaseBackend::LibSql {
|
|
Some(default_libsql_path())
|
|
} else {
|
|
None
|
|
}
|
|
});
|
|
|
|
let libsql_url = optional_env("LIBSQL_URL")?;
|
|
let libsql_auth_token = optional_env("LIBSQL_AUTH_TOKEN")?.map(SecretString::from);
|
|
|
|
if libsql_url.is_some() && libsql_auth_token.is_none() {
|
|
return Err(ConfigError::MissingRequired {
|
|
key: "LIBSQL_AUTH_TOKEN".to_string(),
|
|
hint: "LIBSQL_AUTH_TOKEN is required when LIBSQL_URL is set".to_string(),
|
|
});
|
|
}
|
|
|
|
Ok(Self {
|
|
backend,
|
|
url: SecretString::from(url),
|
|
pool_size,
|
|
libsql_path,
|
|
libsql_url,
|
|
libsql_auth_token,
|
|
})
|
|
}
|
|
|
|
/// Get the database URL (exposes the secret).
|
|
pub fn url(&self) -> &str {
|
|
self.url.expose_secret()
|
|
}
|
|
}
|
|
|
|
/// Default libSQL database path (~/.ironclaw/ironclaw.db).
|
|
pub fn default_libsql_path() -> PathBuf {
|
|
dirs::home_dir()
|
|
.unwrap_or_else(|| PathBuf::from("."))
|
|
.join(".ironclaw")
|
|
.join("ironclaw.db")
|
|
}
|