commit 2a9fae336d1e109793246edbff7445048680ea2c
parent e8a8695dde2300c340528fe33dc72047da8f53d6
Author: triesap <triesap@radroots.dev>
Date: Tue, 20 Jan 2026 18:29:17 +0000
app: rename state/settings bootstrap helpers
- rename datastore config helpers to settings naming
- rename app data helpers to state naming
- update call sites in app/init/health modules
- refresh exports and tests for new helper names
Diffstat:
5 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/app/src/app.rs b/app/src/app.rs
@@ -20,8 +20,8 @@ use crate::{
app_log_error_emit,
app_log_error_store,
app_config_default,
- app_datastore_read_app_data,
- app_datastore_set_notifications_permission,
+ app_datastore_read_state,
+ app_state_set_notifications_permission,
app_health_check_all_logged,
RadrootsAppBackends,
RadrootsAppConfig,
@@ -91,7 +91,7 @@ fn spawn_health_checks(
&config.datastore.key_maps,
)
.await;
- let app_data = app_datastore_read_app_data(&datastore, &config.datastore.key_maps)
+ let app_data = app_datastore_read_state(&datastore, &config.datastore.key_maps)
.await
.ok();
let active_key_value = app_data.as_ref().and_then(|data| {
@@ -331,7 +331,7 @@ fn HomePage() -> impl IntoView {
match notifications.request_permission().await {
Ok(permission) => {
let value = permission.as_str().to_string();
- let _ = app_datastore_set_notifications_permission(
+ let _ = app_state_set_notifications_permission(
&datastore,
&config.datastore.key_maps,
&value,
diff --git a/app/src/bootstrap.rs b/app/src/bootstrap.rs
@@ -13,7 +13,7 @@ use crate::{
RadrootsAppKeyMapConfig,
};
-pub async fn app_datastore_write_config<T: RadrootsClientDatastore>(
+pub async fn app_datastore_write_settings<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
data: &RadrootsAppSettings,
@@ -27,7 +27,7 @@ pub async fn app_datastore_write_config<T: RadrootsClientDatastore>(
Ok(value)
}
-pub async fn app_datastore_has_config<T: RadrootsClientDatastore>(
+pub async fn app_datastore_has_settings<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
) -> RadrootsAppInitResult<bool> {
@@ -39,7 +39,7 @@ pub async fn app_datastore_has_config<T: RadrootsClientDatastore>(
}
}
-pub async fn app_datastore_write_app_data<T: RadrootsClientDatastore>(
+pub async fn app_datastore_write_state<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
data: &RadrootsAppState,
@@ -53,7 +53,7 @@ pub async fn app_datastore_write_app_data<T: RadrootsClientDatastore>(
Ok(value)
}
-pub async fn app_datastore_read_app_data<T: RadrootsClientDatastore>(
+pub async fn app_datastore_read_state<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
) -> RadrootsAppInitResult<RadrootsAppState> {
@@ -66,7 +66,7 @@ pub async fn app_datastore_read_app_data<T: RadrootsClientDatastore>(
Ok(value)
}
-pub async fn app_datastore_has_app_data<T: RadrootsClientDatastore>(
+pub async fn app_datastore_has_state<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
) -> RadrootsAppInitResult<bool> {
@@ -96,17 +96,17 @@ pub async fn app_datastore_clear_bootstrap<T: RadrootsClientDatastore>(
Ok(())
}
-pub async fn app_datastore_set_notifications_permission<T: RadrootsClientDatastore>(
+pub async fn app_state_set_notifications_permission<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
permission: &str,
) -> RadrootsAppInitResult<RadrootsAppState> {
- let mut data = match app_datastore_has_app_data(datastore, key_maps).await? {
- true => app_datastore_read_app_data(datastore, key_maps).await?,
+ let mut data = match app_datastore_has_state(datastore, key_maps).await? {
+ true => app_datastore_read_state(datastore, key_maps).await?,
false => RadrootsAppState::default(),
};
data.notifications_permission = Some(permission.to_string());
- let value = app_datastore_write_app_data(datastore, key_maps, &data).await?;
+ let value = app_datastore_write_state(datastore, key_maps, &data).await?;
Ok(value)
}
@@ -114,12 +114,12 @@ pub async fn app_datastore_set_notifications_permission<T: RadrootsClientDatasto
mod tests {
use super::{
app_datastore_clear_bootstrap,
- app_datastore_has_app_data,
- app_datastore_has_config,
- app_datastore_read_app_data,
- app_datastore_set_notifications_permission,
- app_datastore_write_app_data,
- app_datastore_write_config,
+ app_datastore_has_state,
+ app_datastore_has_settings,
+ app_datastore_read_state,
+ app_state_set_notifications_permission,
+ app_datastore_write_state,
+ app_datastore_write_settings,
};
use crate::{app_key_maps_default, RadrootsAppState, RadrootsAppSettings, RadrootsAppInitError};
use radroots_app_core::datastore::{RadrootsClientDatastoreError, RadrootsClientWebDatastore};
@@ -129,7 +129,7 @@ mod tests {
let datastore = RadrootsClientWebDatastore::new(None);
let key_maps = app_key_maps_default();
let data = RadrootsAppSettings::default();
- let err = futures::executor::block_on(app_datastore_write_config(
+ let err = futures::executor::block_on(app_datastore_write_settings(
&datastore,
&key_maps,
&data,
@@ -143,7 +143,7 @@ mod tests {
let datastore = RadrootsClientWebDatastore::new(None);
let key_maps = app_key_maps_default();
let data = RadrootsAppState::default();
- let err = futures::executor::block_on(app_datastore_write_app_data(
+ let err = futures::executor::block_on(app_datastore_write_state(
&datastore,
&key_maps,
&data,
@@ -156,7 +156,7 @@ mod tests {
fn app_data_read_maps_idb_errors() {
let datastore = RadrootsClientWebDatastore::new(None);
let key_maps = app_key_maps_default();
- let err = futures::executor::block_on(app_datastore_read_app_data(
+ let err = futures::executor::block_on(app_datastore_read_state(
&datastore,
&key_maps,
))
@@ -180,7 +180,7 @@ mod tests {
fn has_config_maps_idb_errors() {
let datastore = RadrootsClientWebDatastore::new(None);
let key_maps = app_key_maps_default();
- let err = futures::executor::block_on(app_datastore_has_config(&datastore, &key_maps))
+ let err = futures::executor::block_on(app_datastore_has_settings(&datastore, &key_maps))
.expect_err("idb undefined");
assert_eq!(err, RadrootsAppInitError::Datastore(RadrootsClientDatastoreError::IdbUndefined));
}
@@ -189,7 +189,7 @@ mod tests {
fn has_app_data_maps_idb_errors() {
let datastore = RadrootsClientWebDatastore::new(None);
let key_maps = app_key_maps_default();
- let err = futures::executor::block_on(app_datastore_has_app_data(&datastore, &key_maps))
+ let err = futures::executor::block_on(app_datastore_has_state(&datastore, &key_maps))
.expect_err("idb undefined");
assert_eq!(err, RadrootsAppInitError::Datastore(RadrootsClientDatastoreError::IdbUndefined));
}
@@ -198,7 +198,7 @@ mod tests {
fn set_notifications_permission_maps_idb_errors() {
let datastore = RadrootsClientWebDatastore::new(None);
let key_maps = app_key_maps_default();
- let err = futures::executor::block_on(app_datastore_set_notifications_permission(
+ let err = futures::executor::block_on(app_state_set_notifications_permission(
&datastore,
&key_maps,
"granted",
diff --git a/app/src/health.rs b/app/src/health.rs
@@ -80,10 +80,10 @@ impl RadrootsAppHealthReport {
}
use crate::{
- app_datastore_has_app_data,
- app_datastore_has_config,
+ app_datastore_has_state,
+ app_datastore_has_settings,
app_datastore_key_nostr_key,
- app_datastore_read_app_data,
+ app_datastore_read_state,
app_log_buffer_flush_critical,
app_log_debug_emit,
app_log_entry_new,
@@ -130,7 +130,7 @@ pub async fn app_health_check_bootstrap_config<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
) -> RadrootsAppHealthCheckResult {
- match app_datastore_has_config(datastore, key_maps).await {
+ match app_datastore_has_settings(datastore, key_maps).await {
Ok(true) => RadrootsAppHealthCheckResult::ok(),
Ok(false) => RadrootsAppHealthCheckResult::error("missing"),
Err(err) => RadrootsAppHealthCheckResult::error(err.to_string()),
@@ -141,7 +141,7 @@ pub async fn app_health_check_bootstrap_app_data<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
) -> RadrootsAppHealthCheckResult {
- match app_datastore_has_app_data(datastore, key_maps).await {
+ match app_datastore_has_state(datastore, key_maps).await {
Ok(true) => RadrootsAppHealthCheckResult::ok(),
Ok(false) => RadrootsAppHealthCheckResult::error("missing"),
Err(err) => RadrootsAppHealthCheckResult::error(err.to_string()),
@@ -152,7 +152,7 @@ pub async fn app_health_check_app_data_active_key<T: RadrootsClientDatastore>(
datastore: &T,
key_maps: &RadrootsAppKeyMapConfig,
) -> RadrootsAppHealthCheckResult {
- let app_data = match app_datastore_read_app_data(datastore, key_maps).await {
+ let app_data = match app_datastore_read_state(datastore, key_maps).await {
Ok(value) => value,
Err(err) => return RadrootsAppHealthCheckResult::error(err.to_string()),
};
@@ -281,7 +281,7 @@ pub async fn app_health_check_all<T: RadrootsClientDatastore, K: RadrootsClientK
let app_data_active_key = app_health_check_app_data_active_key(datastore, key_maps).await;
log_health_end("app_data_active_key", &app_data_active_key);
log_health_start("notifications");
- let stored_permission = app_datastore_read_app_data(datastore, key_maps)
+ let stored_permission = app_datastore_read_state(datastore, key_maps)
.await
.ok()
.and_then(|data| data.notifications_permission);
diff --git a/app/src/init.rs b/app/src/init.rs
@@ -20,12 +20,12 @@ use radroots_app_core::keystore::{
use crate::{
app_datastore_clear_bootstrap,
- app_datastore_has_app_data,
- app_datastore_has_config,
+ app_datastore_has_state,
+ app_datastore_has_settings,
app_datastore_key_nostr_key,
- app_datastore_read_app_data,
- app_datastore_write_app_data,
- app_datastore_write_config,
+ app_datastore_read_state,
+ app_datastore_write_state,
+ app_datastore_write_settings,
app_assets_geocoder_db_url,
app_assets_sql_wasm_url,
app_keystore_nostr_ensure_key,
@@ -391,11 +391,11 @@ pub async fn app_init_backends(config: RadrootsAppConfig) -> RadrootsAppInitResu
.await
.map_err(RadrootsAppInitError::Datastore)?;
let _ = app_log_debug_emit("log.app.init.backends", "datastore_ready", None);
- let has_config = app_datastore_has_config(&datastore, &config.datastore.key_maps).await?;
+ let has_config = app_datastore_has_settings(&datastore, &config.datastore.key_maps).await?;
if !has_config {
let config_data = RadrootsAppSettings::default();
let _ =
- app_datastore_write_config(&datastore, &config.datastore.key_maps, &config_data)
+ app_datastore_write_settings(&datastore, &config.datastore.key_maps, &config_data)
.await?;
}
let _ = app_log_debug_emit("log.app.init.backends", "config_ready", None);
@@ -432,9 +432,9 @@ pub async fn app_init_backends(config: RadrootsAppConfig) -> RadrootsAppInitResu
Err(err) => return Err(RadrootsAppInitError::Datastore(err)),
}
let _ = app_log_debug_emit("log.app.init.backends", "nostr_key_synced", None);
- let has_app_data = app_datastore_has_app_data(&datastore, &config.datastore.key_maps).await?;
+ let has_app_data = app_datastore_has_state(&datastore, &config.datastore.key_maps).await?;
let mut app_data = if has_app_data {
- app_datastore_read_app_data(&datastore, &config.datastore.key_maps).await?
+ app_datastore_read_state(&datastore, &config.datastore.key_maps).await?
} else {
RadrootsAppState::default()
};
@@ -442,7 +442,7 @@ pub async fn app_init_backends(config: RadrootsAppConfig) -> RadrootsAppInitResu
if should_write {
app_data.active_key = nostr_public_key;
let _ =
- app_datastore_write_app_data(&datastore, &config.datastore.key_maps, &app_data)
+ app_datastore_write_state(&datastore, &config.datastore.key_maps, &app_data)
.await?;
}
let _ = app_log_debug_emit("log.app.init.backends", "app_data_ready", None);
diff --git a/app/src/lib.rs b/app/src/lib.rs
@@ -17,12 +17,12 @@ mod entry;
pub use app::App;
pub use bootstrap::{
app_datastore_clear_bootstrap,
- app_datastore_has_app_data,
- app_datastore_has_config,
- app_datastore_read_app_data,
- app_datastore_set_notifications_permission,
- app_datastore_write_app_data,
- app_datastore_write_config,
+ app_datastore_has_state,
+ app_datastore_has_settings,
+ app_datastore_read_state,
+ app_state_set_notifications_permission,
+ app_datastore_write_state,
+ app_datastore_write_settings,
};
pub use context::{app_context, RadrootsAppContext};
pub use data::{RadrootsAppState, RadrootsAppSettings, RadrootsAppRole};
