Merge pull request #44 from silicon-heaven/implement-root-node-methods

Implement version and uptime methods on the root node

Author: syyyr

Cargo.lock

@@ -27,6 +27,7 @@ serde_yaml_ng = "0.10.0"
 tokio-stream = { version = "0.1.17", features = ["fs"] }
 time = { version = "0.3.41", features = ["formatting"] }
 chrono = "0.4.42"
+humantime = "2.3.0"
 
 # [patch."https://github.com/silicon-heaven/libshvclient-rs"]
 # shvclient = { path = "../libshvclient-rs" }

Cargo.toml

@@ -68,6 +68,7 @@ impl From<AlarmWithTimestamp> for RpcValue {
 }
 
 struct State {
+    start_time: std::time::Instant,
     sites_data: RwLock<sites::SitesData>,
     sync_info: sync::SyncInfo,
     alarms: RwLock<BTreeMap<String, Vec<AlarmWithTimestamp>>>,
@@ -89,6 +90,7 @@ pub async fn run(hp_config: &HpConfig, client_config: &ClientConfig) -> shvrpc::
     let (dirtylog_cmd_tx, dirtylog_cmd_rx) = unbounded();
 
     let app_state = AppState::new(State {
+        start_time: std::time::Instant::now(),
         sites_data: RwLock::default(),
         sync_info: Default::default(),
         alarms: Default::default(),

src/lib.rs

@@ -570,8 +570,6 @@ pub(crate) async fn sites_task(
 
                 }
                 _ => {
-                    // TODO: Drain subscribers
-
                     subscribers.clear();
                     mntchng_subscribers.clear();
                     online_status_channels.clear();

src/sites.rs

@@ -805,7 +805,7 @@ pub(crate) async fn sync_task(
                             sync_tasks.push(sync_task);
                         }
                         SubHpInfo::PushLog => {
-                            // TODO
+                            // No op
                         }
                     }
                 }
@@ -876,7 +876,7 @@ pub(crate) async fn sync_task(
                             sync_logger.log(log::Level::Info, "syncing done");
                         }
                         SubHpInfo::PushLog => {
-                            // TODO
+                            // No op
                         }
                     }
                     app_state.dirtylog_cmd_tx.unbounded_send(DirtyLogCommand::Trim { site: site.clone() })

src/sync.rs

@@ -69,6 +69,7 @@ const META_METHOD_PUSH_LOG: MetaMethod = MetaMethod {
 };
 
 // Root node methods
+const METH_VERSION: &str = "version";
 const METH_UPTIME: &str = "uptime";
 const METH_RELOAD_SITES: &str = "reloadSites";
 
@@ -218,7 +219,6 @@ async fn shvjournal_methods_getter(path: impl AsRef<str>, app_state: AppState<St
     // probe the path on the fs
     let path_meta = tokio::fs::metadata(path).await.ok()?;
     if path_meta.is_dir() {
-        // TODO: mkfile, mkdir, rmdir
         Some(MetaMethods::from(&[
                 &MetaMethod {
                     name: METH_LS_FILES,
@@ -301,6 +301,8 @@ async fn root_request_handler(
 
     const ROOT_PATH: &str = "";
     match method {
+        METH_VERSION => Ok(env!("CARGO_PKG_VERSION").into()),
+        METH_UPTIME => Ok(humantime::format_duration(std::time::Duration::from_secs(app_state.start_time.elapsed().as_secs())).to_string().into()),
         METH_LS => {
             let mut nodes = vec![
                 ".app".to_string(),
@@ -761,6 +763,15 @@ pub(crate) async fn methods_getter(
             ])),
         NodeType::Root =>
             Some(MetaMethods::from(&[
+                    &MetaMethod {
+                        name: METH_VERSION,
+                        flags: 0,
+                        access: shvrpc::metamethod::AccessLevel::Read,
+                        param: "Null",
+                        result: "String",
+                        signals: &[],
+                        description: "",
+                    },
                     &MetaMethod {
                         name: METH_UPTIME,
                         flags: 0,
@@ -785,11 +796,9 @@ pub(crate) async fn methods_getter(
                     // appName
                     // deviceId
                     // deviceType
-                    // version
                     // gitCommit
                     // shvVersion
                     // shvGitCommit
-                    // uptime
                     // reloadSites (wr) -> Bool
         ])),
         NodeType::History => {
@@ -816,7 +825,6 @@ pub(crate) async fn methods_getter(
             }
         }
     }
-    // TODO: put the processed data to a request cache in the app state: path -> children
 }
 
 pub(crate) async fn request_handler(

src/tree.rs

@@ -396,6 +396,7 @@ pub mod testing {
         }
 
         let state = AppState::new(State {
+            start_time: std::time::Instant::now(),
             config: crate::HpConfig {
                 journal_dir: journal_dir.path().to_str().expect("path must work").to_string(),
                 max_sync_tasks: None,