buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

daemon: scaffolding for settings / sync

Browse Source
This commit is contained in:
James Magahern
2025-04-25 18:02:54 -07:00
parent 0c6b55fa38
commit fe32efef2c
10 changed files with 204 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -851,6 +851,7 @@ dependencies = [
"kordophone",
"kordophone-db",
"log",
"thiserror",
"tokio",
]

1
kordophoned/Cargo.toml
View File

@@ -14,6 +14,7 @@ env_logger = "0.11.6"
kordophone = { path = "../kordophone" }
kordophone-db = { path = "../kordophone-db" }
log = "0.4.25"
thiserror = "2.0.12"
tokio = { version = "1", features = ["full"] }
[build-dependencies]

38
kordophoned/include/net.buzzert.kordophonecd.Server.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<node name="/">
<interface name="net.buzzert.kordophone.Server">
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="net.buzzert.kordophone.Repository">
<method name="GetVersion">
<arg type="s" name="version" direction="out" />
</method>
@@ -15,5 +16,36 @@
'is_unread' (boolean): Unread status"/>
</arg>
</method>
<method name="SyncAllConversations">
<arg type="b" name="success" direction="out" />
</method>
</interface>
<interface name="net.buzzert.kordophone.Settings">
<!-- editable properties -->
<property name="ServerURL" type="s" access="readwrite"/>
<property name="Username" type="s" access="readwrite"/>
<!-- Secret-Service handle (object path) -->
<property name="CredentialItem" type="o" access="readwrite">
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal"
value="true"/>
</property>
<!-- helpers for atomic updates -->
<method name="SetServer">
<arg name="url" type="s" direction="in"/>
<arg name="user" type="s" direction="in"/>
</method>
<method name="SetCredentialItem">
<arg name="item_path" type="o" direction="in"/>
</method>
<!-- emitted when anything changes -->
<signal name="ConfigChanged"/>
</interface>
</node>

28
kordophoned/src/daemon/mod.rs
View File

@@ -1,16 +1,24 @@
use directories::ProjectDirs;
use std::path::PathBuf;
use anyhow::Result;
use thiserror::Error;
use kordophone_db::{
database::Database,
settings::Settings,
models::Conversation,
};
use kordophone::api::http_client::HTTPAPIClient;
#[derive(Debug, Error)]
pub enum DaemonError {
#[error("Client Not Configured")]
ClientNotConfigured,
}
pub struct Daemon {
pub version: String,
database: Database,
client: Option<HTTPAPIClient>,
}
impl Daemon {
@@ -23,17 +31,25 @@ impl Daemon {
std::fs::create_dir_all(database_dir)?;
let database = Database::new(&database_path.to_string_lossy())?;
Ok(Self { version: "0.1.0".to_string(), database })
}
pub fn get_version(&self) -> String {
self.version.clone()
// TODO: Check to see if we have client settings in the database
Ok(Self { version: "0.1.0".to_string(), database, client: None })
}
pub fn get_conversations(&mut self) -> Vec<Conversation> {
self.database.with_repository(|r| r.all_conversations().unwrap())
}
pub fn sync_all_conversations(&mut self) -> Result<()> {
let client = self.client
.as_mut()
.ok_or(DaemonError::ClientNotConfigured)?;
Ok(())
}
fn get_database_path() -> PathBuf {
if let Some(proj_dirs) = ProjectDirs::from("com", "kordophone", "kordophone") {
let data_dir = proj_dirs.data_dir();

38
kordophoned/src/dbus/endpoint.rs
View File

@@ -1,6 +1,5 @@
use log::info;
use std::sync::{Arc, Mutex};
use crate::{daemon::Daemon, dbus::interface};
use dbus_crossroads::Crossroads;
use dbus_tokio::connection;
@@ -11,13 +10,13 @@ use dbus::{
Path,
};
pub struct Endpoint {
pub struct Endpoint<T: Send + Clone + 'static> {
connection: Arc<SyncConnection>,
daemon: Arc<Mutex<Daemon>>,
implementation: T,
}
impl Endpoint {
pub fn new(daemon: Daemon) -> Self {
impl<T: Send + Clone + 'static> Endpoint<T> {
pub fn new(implementation: T) -> Self {
let (resource, connection) = connection::new_session_sync().unwrap();
// The resource is a task that should be spawned onto a tokio compatible
@@ -31,15 +30,24 @@ impl Endpoint {
Self {
connection,
daemon: Arc::new(Mutex::new(daemon))
implementation
}
}
pub async fn start(&self) {
use crate::dbus::interface;
pub async fn register<F, R>(
&self,
name: &str,
path: &str,
register_fn: F
)
where
F: Fn(&mut Crossroads) -> R,
R: IntoIterator<Item = dbus_crossroads::IfaceToken<T>>,
{
let dbus_path = String::from(path);
self.connection
.request_name(interface::NAME, false, true, false)
.request_name(name, false, true, false)
.await
.expect("Unable to acquire dbus name");
@@ -54,9 +62,9 @@ impl Endpoint {
}),
)));
// Register the daemon as a D-Bus object.
let token = interface::register_net_buzzert_kordophone_server(&mut cr);
cr.insert(interface::OBJECT_PATH, &[token], self.daemon.clone());
// Register the daemon as a D-Bus object with multiple interfaces
let tokens: Vec<_> = register_fn(&mut cr).into_iter().collect();
cr.insert(dbus_path, &tokens, self.implementation.clone());
// Start receiving messages.
self.connection.start_receive(
@@ -66,14 +74,14 @@ impl Endpoint {
),
);
info!(target: "dbus", "DBus server started");
info!(target: "dbus", "Registered endpoint at {} with {} interfaces", path, tokens.len());
}
pub fn send_signal<S>(&self, signal: S) -> Result<u32, ()>
pub fn send_signal<S>(&self, path: &str, signal: S) -> Result<u32, ()>
where
S: dbus::message::SignalArgs + dbus::arg::AppendAll,
{
let message = signal.to_emit_message(&Path::new(interface::OBJECT_PATH).unwrap());
let message = signal.to_emit_message(&Path::new(path).unwrap());
self.connection.send(message)
}
}

6
kordophoned/src/dbus/mod.rs
View File

@@ -1,11 +1,11 @@
pub mod endpoint;
mod server_impl;
pub mod server_impl;
mod interface {
pub mod interface {
#![allow(unused)]
pub const NAME: &str = "net.buzzert.kordophonecd";
pub const OBJECT_PATH: &str = "/net/buzzert/kordophonecd";
pub const OBJECT_PATH: &str = "/net/buzzert/kordophonecd/daemon";
include!(concat!(env!("OUT_DIR"), "/kordophone-server.rs"));
}

72
kordophoned/src/dbus/server_impl.rs
View File

@@ -1,19 +1,36 @@
use dbus::arg;
use dbus_tree::MethodErr;
use std::sync::{Arc, Mutex};
use std::sync::{Arc, Mutex, MutexGuard};
use log::info;
use crate::daemon::Daemon;
use crate::dbus::interface::NetBuzzertKordophoneServer as DbusServer;
use crate::dbus::interface::NetBuzzertKordophoneRepository as DbusRepository;
use crate::dbus::interface::NetBuzzertKordophoneSettings as DbusSettings;
impl DbusServer for Arc<Mutex<Daemon>> {
#[derive(Clone)]
pub struct ServerImpl {
daemon: Arc<Mutex<Daemon>>,
}
impl ServerImpl {
pub fn new(daemon: Arc<Mutex<Daemon>>) -> Self {
Self { daemon }
}
pub fn get_daemon(&self) -> Result<MutexGuard<'_, Daemon>, MethodErr> {
self.daemon.lock().map_err(|_| MethodErr::failed("Failed to lock daemon"))
}
}
impl DbusRepository for ServerImpl {
fn get_version(&mut self) -> Result<String, MethodErr> {
let daemon = self.lock().map_err(|_| MethodErr::failed("Failed to lock daemon"))?;
let daemon = self.get_daemon()?;
Ok(daemon.version.clone())
}
fn get_conversations(&mut self) -> Result<Vec<arg::PropMap>, dbus::MethodErr> {
// Get a repository instance and use it to fetch conversations
let mut daemon = self.lock().map_err(|_| MethodErr::failed("Failed to lock daemon"))?;
let mut daemon = self.get_daemon()?;
let conversations = daemon.get_conversations();
// Convert conversations to DBus property maps
@@ -27,4 +44,49 @@ impl DbusServer for Arc<Mutex<Daemon>> {
Ok(result)
}
fn sync_all_conversations(&mut self) -> Result<bool, dbus::MethodErr> {
let mut daemon = self.get_daemon()?;
daemon.sync_all_conversations().map_err(|e| {
log::error!("Failed to sync conversations: {}", e);
MethodErr::failed(&format!("Failed to sync conversations: {}", e))
})?;
Ok(true)
}
}
impl DbusSettings for ServerImpl {
fn set_server(&mut self, url: String, user: String) -> Result<(), dbus::MethodErr> {
todo!()
}
fn set_credential_item_(&mut self, item_path: dbus::Path<'static>) -> Result<(), dbus::MethodErr> {
todo!()
}
fn server_url(&self) -> Result<String, dbus::MethodErr> {
todo!()
}
fn set_server_url(&self, value: String) -> Result<(), dbus::MethodErr> {
todo!()
}
fn username(&self) -> Result<String, dbus::MethodErr> {
todo!()
}
fn set_username(&self, value: String) -> Result<(), dbus::MethodErr> {
todo!()
}
fn credential_item(&self) -> Result<dbus::Path<'static>, dbus::MethodErr> {
todo!()
}
fn set_credential_item(&self, value: dbus::Path<'static>) -> Result<(), dbus::MethodErr> {
todo!()
}
}

37
kordophoned/src/main.rs
View File

@@ -2,10 +2,13 @@ mod dbus;
mod daemon;
use std::future;
use std::sync::{Arc, Mutex};
use log::LevelFilter;
use daemon::Daemon;
use dbus::endpoint::Endpoint as DbusEndpoint;
use dbus::interface;
use dbus::server_impl::ServerImpl;
fn initialize_logging() {
env_logger::Builder::from_default_env()
@@ -19,16 +22,32 @@ async fn main() {
initialize_logging();
// Create the daemon
let daemon = Daemon::new()
.map_err(|e| {
log::error!("Failed to start daemon: {}", e);
std::process::exit(1);
})
.unwrap();
let daemon = Arc::new(
Mutex::new(
Daemon::new()
.map_err(|e| {
log::error!("Failed to start daemon: {}", e);
std::process::exit(1);
})
.unwrap()
)
);
// Create the D-Bus endpoint
let endpoint = DbusEndpoint::new(daemon);
endpoint.start().await;
// Create the server implementation
let server = ServerImpl::new(daemon);
// Register DBus interfaces with endpoint
let endpoint = DbusEndpoint::new(server.clone());
endpoint.register(
interface::NAME,
interface::OBJECT_PATH,
|cr| {
vec![
interface::register_net_buzzert_kordophone_repository(cr),
interface::register_net_buzzert_kordophone_settings(cr)
]
}
).await;
future::pending::<()>().await;
unreachable!()

24
kpcli/src/daemon/mod.rs
View File

@@ -10,10 +10,16 @@ mod dbus_interface {
include!(concat!(env!("OUT_DIR"), "/kordophone-client.rs"));
}
use dbus_interface::NetBuzzertKordophoneServer as KordophoneServer;
use dbus_interface::NetBuzzertKordophoneRepository as KordophoneRepository;
#[derive(Subcommand)]
pub enum Commands {
/// Gets all known conversations.
Conversations,
/// Runs a sync operation.
Sync,
/// Prints the server Kordophone version.
Version,
}
@@ -23,6 +29,8 @@ impl Commands {
let mut client = DaemonCli::new()?;
match cmd {
Commands::Version => client.print_version().await,
Commands::Conversations => client.print_conversations().await,
Commands::Sync => client.sync_conversations().await,
}
}
}
@@ -43,8 +51,20 @@ impl DaemonCli {
}
pub async fn print_version(&mut self) -> Result<()> {
let version = KordophoneServer::get_version(&self.proxy())?;
let version = KordophoneRepository::get_version(&self.proxy())?;
println!("Server version: {}", version);
Ok(())
}
pub async fn print_conversations(&mut self) -> Result<()> {
let conversations = KordophoneRepository::get_conversations(&self.proxy())?;
println!("Conversations: {:?}", conversations);
Ok(())
}
pub async fn sync_conversations(&mut self) -> Result<()> {
let success = KordophoneRepository::sync_all_conversations(&self.proxy())?;
println!("Synced conversations: {}", success);
Ok(())
}
}

2
kpcli/src/main.rs
View File

@@ -48,6 +48,6 @@ async fn main() {
let cli = Cli::parse();
run_command(cli.command).await
.map_err(|e| log::error!("Error: {}", e))
.map_err(|e| println!("Error: {}", e))
.err();
}