Refactor and clean up code across multiple modules

- Simplified token type assignment in OAuth service.
- Removed unused session_lock module and re-exported Session from zesdex_entities.
- Cleaned up session entity by removing unnecessary comments and code.
- Consolidated session handling in HTTP handlers for better readability.
- Improved formatting and readability in OAuth repository tests.
- Enhanced session lock repository with clearer match statements.
- Streamlined session repository error handling.
- Refined RNG tests for better clarity.
- Adjusted module visibility and organization in lib.rs.
- Updated IPC client and connection code for better error handling and clarity.
- Improved frame handling in IPC for better readability.
- Organized module imports and added test utilities for IPC.
- Enhanced database connection error handling.
- Simplified JWT token creation error handling.
- Improved password verification error handling.
- Cleaned up state management code for better readability.
- Refactored middleware for session authentication and rate limiting.
- Simplified clipboard utility for better error handling.
- Enhanced logging initialization for better error reporting.
- Improved pagination utility with clearer method annotations.
- Cleaned up sanitization functions for filenames and paths.
- Enhanced slug generation functions for better clarity and usability.
This commit is contained in:
asepharyana
2026-07-17 09:08:41 +07:00
parent 22dd6fdda7
commit 1f0ae9f551
95 changed files with 1792 additions and 2131 deletions
@@ -135,8 +135,8 @@ impl AppConfigRepository for JsonAppConfigRepository {
.with_context(|| format!("failed to create base dir '{}'", base_dir.display()))?;
let path = base_dir.join("app_config.json");
let tmp = base_dir.join("app_config.json.tmp");
let json = serde_json::to_string_pretty(config)
.context("failed to serialize app config")?;
let json =
serde_json::to_string_pretty(config).context("failed to serialize app config")?;
{
let mut f = std::fs::OpenOptions::new()
.create(true)
@@ -147,8 +147,13 @@ impl AppConfigRepository for JsonAppConfigRepository {
f.write_all(json.as_bytes())?;
f.sync_all()?;
}
std::fs::rename(&tmp, &path)
.with_context(|| format!("failed to rename '{}' -> '{}'", tmp.display(), path.display()))?;
std::fs::rename(&tmp, &path).with_context(|| {
format!(
"failed to rename '{}' -> '{}'",
tmp.display(),
path.display()
)
})?;
if let Some(parent) = path.parent() {
if let Ok(d) = std::fs::File::open(parent) {
let _ = d.sync_all();
@@ -57,8 +57,13 @@ impl ConversationRepository for JsonConversationRepository {
f.write_all(json.as_bytes())?;
f.sync_all()?;
}
std::fs::rename(&tmp, &path)
.with_context(|| format!("failed to rename '{}' -> '{}'", tmp.display(), path.display()))?;
std::fs::rename(&tmp, &path).with_context(|| {
format!(
"failed to rename '{}' -> '{}'",
tmp.display(),
path.display()
)
})?;
if let Some(parent) = path.parent() {
if let Ok(d) = std::fs::File::open(parent) {
let _ = d.sync_all();
@@ -74,9 +74,8 @@ impl EditLogRepository for JsonlEditLogRepository {
fn append(&self, session_dir: &Path, log: &mut EditLog, entry: EditLogEntry) -> Result<()> {
let path = session_dir.join("edits.jsonl");
let line = serde_json::to_string(&entry)
.context("failed to serialize edit log entry")?
+ "\n";
let line =
serde_json::to_string(&entry).context("failed to serialize edit log entry")? + "\n";
if let Some(parent) = path.parent() {
std::fs::create_dir_all(parent)
.with_context(|| format!("failed to create session dir '{}'", parent.display()))?;
@@ -89,8 +88,7 @@ impl EditLogRepository for JsonlEditLogRepository {
.with_context(|| format!("failed to open edits.jsonl at '{}'", path.display()))?;
file.write_all(line.as_bytes())
.context("failed to write edit log entry")?;
file.sync_all()
.context("failed to fsync edit log")?;
file.sync_all().context("failed to fsync edit log")?;
}
log.entries.push(entry);
// Enforce in-memory cap
@@ -84,10 +84,7 @@ impl MarkdownMemoryRepository {
.lines()
.filter_map(|l| {
let mut it = l.splitn(2, ':');
Some((
it.next()?.trim().to_string(),
it.next()?.trim().to_string(),
))
Some((it.next()?.trim().to_string(), it.next()?.trim().to_string()))
})
.collect()
}
@@ -155,7 +152,8 @@ impl MemoryRepository for MarkdownMemoryRepository {
if name == "MEMORY.md" {
return None;
}
name.strip_suffix(".md").map(std::string::ToString::to_string)
name.strip_suffix(".md")
.map(std::string::ToString::to_string)
})
.collect();
Ok(slugs)
@@ -190,8 +188,13 @@ impl MemoryRepository for MarkdownMemoryRepository {
f.write_all(content.as_bytes())?;
f.sync_all()?;
}
std::fs::rename(&tmp, &path)
.with_context(|| format!("failed to rename '{}' -> '{}'", tmp.display(), path.display()))?;
std::fs::rename(&tmp, &path).with_context(|| {
format!(
"failed to rename '{}' -> '{}'",
tmp.display(),
path.display()
)
})?;
if let Some(p) = path.parent() {
if let Ok(d) = std::fs::File::open(p) {
let _ = d.sync_all();
@@ -204,11 +207,15 @@ impl MemoryRepository for MarkdownMemoryRepository {
fn delete(&self, memory_dir: &Path, name: &str) -> Result<()> {
let path = Memory::path(memory_dir, name);
if path.exists() {
std::fs::remove_file(&path)
.with_context(|| format!("failed to delete memory '{name}' at '{}'", path.display()))?;
std::fs::remove_file(&path).with_context(|| {
format!("failed to delete memory '{name}' at '{}'", path.display())
})?;
tracing::debug!("memory deleted: '{}'", path.display());
} else {
tracing::warn!("memory '{name}' not found at '{}', skipping delete", path.display());
tracing::warn!(
"memory '{name}' not found at '{}', skipping delete",
path.display()
);
}
Ok(())
}
@@ -128,10 +128,8 @@ mod tests {
use super::*;
fn tmp_dir() -> std::path::PathBuf {
let dir = std::env::temp_dir().join(format!(
"zesdex-cms-blob-test-{}",
uuid::Uuid::new_v4()
));
let dir =
std::env::temp_dir().join(format!("zesdex-cms-blob-test-{}", uuid::Uuid::new_v4()));
std::fs::create_dir_all(&dir).unwrap();
dir
}
@@ -179,10 +177,7 @@ mod tests {
vec!["k".to_string()],
"key must appear exactly once even after being overwritten"
);
assert_eq!(
repo.retrieve_blob(&dir, "k").unwrap(),
Some(b"v2".to_vec())
);
assert_eq!(repo.retrieve_blob(&dir, "k").unwrap(), Some(b"v2".to_vec()));
let _ = std::fs::remove_dir_all(&dir);
}
}
@@ -57,8 +57,8 @@ impl SettingsRepository for JsonSettingsRepository {
.with_context(|| format!("failed to create base dir '{}'", base_dir.display()))?;
let path = base_dir.join("settings.json");
let tmp = base_dir.join("settings.json.tmp");
let json = serde_json::to_string_pretty(settings)
.context("failed to serialize settings")?;
let json =
serde_json::to_string_pretty(settings).context("failed to serialize settings")?;
{
let mut f = std::fs::OpenOptions::new()
.create(true)
@@ -69,8 +69,13 @@ impl SettingsRepository for JsonSettingsRepository {
f.write_all(json.as_bytes())?;
f.sync_all()?;
}
std::fs::rename(&tmp, &path)
.with_context(|| format!("failed to rename '{}' -> '{}'", tmp.display(), path.display()))?;
std::fs::rename(&tmp, &path).with_context(|| {
format!(
"failed to rename '{}' -> '{}'",
tmp.display(),
path.display()
)
})?;
if let Some(parent) = path.parent() {
if let Ok(d) = std::fs::File::open(parent) {
let _ = d.sync_all();
@@ -87,7 +92,8 @@ mod tests {
#[test]
fn load_defaults_hive_mind_timeout_when_field_missing_from_old_settings_json() {
let dir = std::env::temp_dir().join(format!("zesdex-cms-settings-test-{}", uuid::Uuid::new_v4()));
let dir =
std::env::temp_dir().join(format!("zesdex-cms-settings-test-{}", uuid::Uuid::new_v4()));
std::fs::create_dir_all(&dir).unwrap();
// Simulate a settings.json written before `hive_mind_node_timeout_ms` existed.
std::fs::write(
@@ -96,7 +102,9 @@ mod tests {
).unwrap();
let repo = JsonSettingsRepository::new();
let settings = repo.load(&dir).expect("load must not fail on a pre-existing settings.json missing the new field");
let settings = repo
.load(&dir)
.expect("load must not fail on a pre-existing settings.json missing the new field");
assert_eq!(settings.hive_mind_node_timeout_ms, 600_000);
let _ = std::fs::remove_dir_all(&dir);