(#78) Network Viewer - New Suibase.toml for package management

rust/demo-app/move/Suibase.toml

@@ -0,0 +1,5 @@
+[meta]
+creation_timestamp = "1697828010924574 2023-10-20 14:53:30.924574678 -04:00"
+
+[packages]
+demo = { output_dir = "HPDM7J4PRD6OTJTGEMMPTFN2TM", output_dir_custom = false }

rust/suibase/Cargo.toml

@@ -9,7 +9,8 @@ version = "0.0.3"
 edition = "2021"
 
 [workspace.dependencies]
-
+data-encoding = "2.4.0"
+chrono = "0.4.31" 
 futures = "0.3.25"
 
 jsonrpsee = { git = "https://github.com/wlmyng/jsonrpsee.git", rev = "b1b300784795f6a64d0fcdf8f03081a9bc38bde8", features = [
@@ -18,6 +19,7 @@ jsonrpsee = { git = "https://github.com/wlmyng/jsonrpsee.git", rev = "b1b3007847
     "jsonrpsee-core",
 ] }
 jsonrpsee-proc-macros = { git = "https://github.com/wlmyng/jsonrpsee.git", rev = "b1b300784795f6a64d0fcdf8f03081a9bc38bde8" }
+md5 = "0.7"
 schemars = { version = "0.8.10", features = ["either"] }
 serde_with = { version = "2.1.0", features = ["hex"] }
 serde_json = { version = "1.0.95", features = [

rust/suibase/crates/suibase-daemon/Cargo.toml

@@ -19,6 +19,7 @@ mime = "0.3.16"
 
 memchr = "2.5.0"
 
+toml_edit = { version = "0.20.0" }
 
 tokio.workspace = true
 tokio-graceful-shutdown.workspace = true
@@ -28,6 +29,9 @@ notify = { version = "6.0", default-features = false, features = [
     "macos_kqueue",
 ] }
 
+data-encoding.workspace = true
+md5.workspace = true
+chrono.workspace = true
 uuid.workspace = true
 uuid7.workspace = true
 anyhow.workspace = true

rust/suibase/crates/suibase-daemon/src/admin_controller.rs

@@ -1,14 +1,8 @@
-use std::fmt::Debug;
-use std::vec;
-
 use crate::basic_types::*;
 
 use crate::network_monitor::NetMonTx;
 use crate::proxy_server::ProxyServer;
-use crate::shared_types::{
-    Globals, GlobalsProxyMT, GlobalsStatusMT, GlobalsWorkdirsMT, GlobalsWorkdirsST, InputPort,
-    WorkdirProxyConfig,
-};
+use crate::shared_types::{Globals, InputPort, WorkdirProxyConfig};
 use crate::workdirs_watcher::WorkdirsWatcher;
 use crate::workers::ShellWorker;
 
@@ -463,6 +457,9 @@ impl ManagedElement for AdminController {
     }
 }
 
+#[cfg(test)]
+use crate::shared_types::GlobalsWorkdirsST;
+
 #[test]
 fn test_load_config_from_suibase_default() {
     // Note: More of a functional test. Suibase need to be installed.

rust/suibase/crates/suibase-daemon/src/api/api_server.rs

@@ -8,30 +8,26 @@
 // A JSONRPCServer owns a jsonrpsee Server to handle the JSON-RPC requests.
 // ( https://github.com/paritytech/jsonrpsee )
 
-use reqwest::Proxy;
-use tokio::time::{interval, Duration};
+use tokio::time::Duration;
 
 use anyhow::Result;
 use tokio_graceful_shutdown::{FutureExt, SubsystemHandle, Toplevel};
 
-use crate::{
-    admin_controller::AdminControllerTx,
-    shared_types::{Globals, GlobalsProxyMT, GlobalsStatusMT},
-};
+use crate::{admin_controller::AdminControllerTx, shared_types::Globals};
 
 use super::GeneralApiServer;
 use crate::api::impl_general_api::GeneralApiImpl;
 
 use super::ProxyApiServer;
 use crate::api::impl_proxy_api::ProxyApiImpl;
 
-use super::ModulesApiServer;
-use crate::api::impl_modules_api::ModulesApiImpl;
+use super::PackagesApiServer;
+use crate::api::impl_packages_api::PackagesApiImpl;
 
 use hyper::Method;
 use jsonrpsee::{
     core::server::rpc_module::Methods,
-    server::{AllowHosts, RpcModule, Server, ServerBuilder},
+    server::{AllowHosts, ServerBuilder},
 };
 use std::net::SocketAddr;
 use tower_http::cors::{Any, CorsLayer};
@@ -139,7 +135,7 @@ impl JSONRPCServer {
         }
 
         {
-            let api = ModulesApiImpl::new(self.globals.clone(), self.admctrl_tx.clone());
+            let api = PackagesApiImpl::new(self.globals.clone(), self.admctrl_tx.clone());
             let methods = api.into_rpc();
             if let Err(e) = all_methods.merge(methods) {
                 log::error!("Error merging ModulesApiImpl methods: {}", e);

rust/suibase/crates/suibase-daemon/src/api/def_header.rs

@@ -82,8 +82,7 @@ impl<T: Clone + PartialEq> Versioned<T> {
 
     // Write version into a Header structure.
     pub fn init_header_uuids(&self, header: &mut Header) {
-        let (method_uuid, data_uuid) = self.uuid.get();
-        header.method_uuid = Some(method_uuid.to_string());
-        header.data_uuid = Some(data_uuid.to_string());
+        header.method_uuid = Some(self.uuid.get_method_uuid());
+        header.data_uuid = Some(self.uuid.get_data_uuid());
     }
 }