...

Author: despiegk

install.sh

@@ -8,7 +8,9 @@ YELLOW='\033[0;33m'
 NC='\033[0m' # No Color
 
 echo -e "${GREEN}stop zinit...${NC}"
-curl -fsSL https://raw.githubusercontent.com/threefoldtech/zinit/refs/heads/master/stop.sh | bash
+rm -f /tmp/stop.sh
+curl -fsSL https://raw.githubusercontent.com/threefoldtech/zinit/refs/heads/master/stop.sh > /tmp/stop.sh
+bash /tmp/stop.sh
 
 
 # GitHub repository information

install_run.sh

@@ -7,60 +7,29 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 NC='\033[0m' # No Color
 
+# Function to check if zinit is running
+is_zinit_running() {
+    if zinit list &>/dev/null; then
+        return 0  # Command successful, zinit is running
+    else
+        return 1  # Command failed, zinit is not running
+    fi
+}
+
 echo -e "${GREEN}Starting zinit installation and setup...${NC}"
 # Download and execute install.sh
 echo -e "${YELLOW}Downloading and executing install.sh...${NC}"
 curl -fsSL https://raw.githubusercontent.com/threefoldtech/zinit/refs/heads/master/install.sh | bash
 
-# Determine the path to zinit based on OS
-if [ "$(uname -s)" = "Darwin" ]; then
-    ZINIT_PATH="$HOME/hero/bin/zinit"
-else
-    if [ "$(id -u)" -eq 0 ]; then
-        ZINIT_PATH="/usr/local/bin/zinit"
-    else
-        ZINIT_PATH="$HOME/.local/bin/zinit"
-    fi
-fi
-
-# Ensure zinit is in PATH
-export PATH="$PATH:$(dirname "$ZINIT_PATH")"
+echo -e "${GREEN}install zinit...${NC}"
+rm -f /tmp/install.sh
+curl -fsSL https://raw.githubusercontent.com/threefoldtech/zinit/refs/heads/master/install.sh > /tmp/install.sh
+bash /tmp/install.sh
 
-# Function to check if zinit is running
-is_zinit_running() {
-    pgrep -f "zinit$" > /dev/null
-    return $?
-}
-
-# Try to shutdown zinit gracefully if it's running
-if is_zinit_running; then
-    echo -e "${YELLOW}Zinit is already running. Attempting graceful shutdown...${NC}"
-    "$ZINIT_PATH" shutdown || true
-    
-    # Give it a moment to shut down
-    sleep 2
-    
-    # Check if it's still running
-    if is_zinit_running; then
-        echo -e "${YELLOW}Zinit is still running. Attempting to kill the process...${NC}"
-        pkill -f "zinit$" || true
-        sleep 1
-    fi
-else
-    echo -e "${YELLOW}No existing zinit process found.${NC}"
-fi
-
-# Double-check no zinit is running
-if is_zinit_running; then
-    echo -e "${RED}Warning: Could not terminate existing zinit process. You may need to manually kill it.${NC}"
-    ps aux | grep "zinit" | grep -v grep
-else
-    echo -e "${GREEN}No zinit process is running. Ready to start a new instance.${NC}"
-fi
 
 # Launch zinit in the background
 echo -e "${GREEN}Starting zinit in the background...${NC}"
-"$ZINIT_PATH" &
+zinit &
 
 # Give it a moment to start
 sleep 1

openrpc.json

@@ -16,7 +16,7 @@
   ],
   "methods": [
     {
-      "name": "rpc_discover",
+      "name": "rpc.discover",
       "description": "Returns the OpenRPC specification for the API",
       "params": [],
       "result": {

src/app/rpc.rs

@@ -25,16 +25,15 @@ const OPENRPC_SPEC: &str = include_str!("../../openrpc.json");
 /// RPC methods for discovery.
 #[rpc(server, client)]
 pub trait ZinitRpcApi {
-    /// Returns the OpenRPC specification as a JSON Value.
+    /// Returns the OpenRPC specification as a string.
     #[method(name = "rpc.discover")]
-    async fn discover(&self) -> RpcResult<Value>;
+    async fn discover(&self) -> RpcResult<String>;
 }
 
 #[async_trait]
 impl ZinitRpcApiServer for Api {
-    async fn discover(&self) -> RpcResult<Value> {
-        let spec = serde_json::from_str(OPENRPC_SPEC).expect("Failed to parse OpenRPC spec");
-        Ok(spec)
+    async fn discover(&self) -> RpcResult<String> {
+        Ok(OPENRPC_SPEC.to_string())
     }
 }
 

src/zinit/lifecycle.rs

@@ -326,29 +326,35 @@ impl LifecycleManager {
 
     /// Get memory and CPU usage for a process
     async fn get_process_stats(&self, pid: i32) -> Result<(u64, f32)> {
-        // Create a new System instance
-        let mut system = System::new();
-
+        // Create a new System instance with all information
+        let mut system = System::new_all();
+        
         // Convert i32 pid to sysinfo::Pid
         let sys_pid = sysinfo::Pid::from(pid as usize);
-
+        
+        // Make sure we're refreshing CPU information
+        system.refresh_cpu();
+        system.refresh_processes();
+        
         // First refresh to get initial CPU values
-        system.refresh_process(sys_pid);
-
-        // Wait a short time for CPU measurement
-        sleep(std::time::Duration::from_millis(100)).await;
-
+        system.refresh_all();
+        
+        // Wait longer for CPU measurement (500ms instead of 100ms)
+        sleep(std::time::Duration::from_millis(500)).await;
+        
         // Refresh again to get updated CPU values
-        system.refresh_process(sys_pid);
-
+        system.refresh_cpu();
+        system.refresh_processes();
+        system.refresh_all();
+        
         // Get the process
         if let Some(process) = system.process(sys_pid) {
             // Get memory in bytes
             let memory_usage = process.memory();
-
+            
             // Get CPU usage as percentage
             let cpu_usage = process.cpu_usage();
-
+            
             Ok((memory_usage, cpu_usage))
         } else {
             // Process not found
@@ -360,16 +366,22 @@ impl LifecycleManager {
     async fn get_child_process_stats(&self, parent_pid: i32) -> Result<Vec<ProcessStats>> {
         // Create a new System instance with all processes information
         let mut system = System::new_all();
+        
+        // Make sure we're refreshing CPU information
+        system.refresh_cpu();
+        system.refresh_processes();
         system.refresh_all();
-
+        
         // Convert i32 pid to sysinfo::Pid
         let sys_pid = sysinfo::Pid::from(parent_pid as usize);
-
-        // Wait a short time for CPU measurement
-        sleep(std::time::Duration::from_millis(100)).await;
-
-        // Refresh processes to get updated CPU values
+        
+        // Wait longer for CPU measurement (500ms instead of 100ms)
+        sleep(std::time::Duration::from_millis(500)).await;
+        
+        // Refresh all system information to get updated CPU values
+        system.refresh_cpu();
         system.refresh_processes();
+        system.refresh_all();
 
         let mut children = Vec::new();