Merge branch 'devel-0.0.1'

Author: dmitryro

server/Cargo.toml

@@ -73,6 +73,7 @@ proto = { path = "../proto", version = "0.1.0", features = ["server"] }
 models = { path = "../models", version = "0.1.0" }
 reqwest = { version = "0.12.22", features = ["json"] }
 shell-words="1.1.0"
+shlex="1.3.0"
 
 [dev-dependencies]
 serde_json = "1.0.140"

server/src/cli/cli.rs

@@ -1,29 +1,40 @@
 // server/src/cli/cli.rs
+// Refactored: 2025-07-04 - Updated to use new storage engine names and removed obsolete imports.
+// Fixed: 2025-07-04 - Corrected argument types for handle_restart_command_interactive.
+// Fixed: 2025-07-04 - Corrected function name for run_cli_interactive.
+// Fixed: 2025-07-04 - Resolved Mutex type mismatches and argument wrapping for handlers.
+// Reverted: 2025-07-04 - Reverted to user-provided base code structure, re-applying necessary fixes.
+// Fixed: 2025-07-04 - Corrected argument count for run_cli_interactive calls.
+// FIX: 2025-07-04 - Removed #[tokio::main] from start_cli to resolve E0277.
+// FIX: 2025-07-04 - Corrected argument count for handle_reload_command and run_cli_interactive calls.
+// UPDATED: 2025-07-04 - Added Clear, Exit, Quit commands. Corrected run_cli_interactive argument passing.
+// UPDATED: 2025-07-04 - Removed duplicate HelpArgs struct, now relying on import.
+// FIX: 2025-07-04 - Corrected import path for `handle_internal_daemon_run`.
 
-use anyhow::Result;
 use clap::{Parser, Subcommand, CommandFactory};
-use std::collections::HashMap;
+use anyhow::Result;
 use std::path::PathBuf;
 use std::sync::Arc;
-use tokio::sync::{oneshot, Mutex};
+use tokio::sync::Mutex;
+use tokio::sync::oneshot;
 use tokio::task::JoinHandle;
 use std::process;
 use std::env;
+use std::collections::HashMap;
 
 // Import modules
 use crate::cli::commands::{
     DaemonCliCommand, RestCliCommand, StorageAction,
     StatusArgs, StopArgs, ReloadArgs, RestartArgs,
     ReloadAction, RestartAction, StartAction, StopAction, StatusAction
 };
-use crate::cli::config as config_mod; // Alias for config module
+use crate::cli::config as config_mod;
 use crate::cli::handlers as handlers_mod;
 use crate::cli::interactive as interactive_mod;
-use crate::cli::help_display as help_display_mod; // Alias the module directly
-use crate::cli::daemon_management::handle_internal_daemon_run; // Corrected: Imported directly
+use crate::cli::help_display as help_display_mod;
+use crate::cli::daemon_management::handle_internal_daemon_run; // DIRECT IMPORT for handle_internal_daemon_run
 
 use lib::query_parser::{parse_query_from_string, QueryType};
-// Removed unused import: use lib::storage_engine::config::StorageEngineType as LibStorageEngineType;
 
 /// GraphDB Command Line Interface
 #[derive(Parser, Debug)]
@@ -62,11 +73,9 @@ pub enum Commands {
     Start {
         #[clap(subcommand)]
         action: Option<StartAction>,
-        // Removed top-level port, cluster, listen_port, storage_port, storage_config_file
-        // These are now only available within StartAction::All
     },
     /// Stop GraphDB components (daemon, rest, storage, or all)
-    Stop(StopArgs), // Corrected: Changed to directly use StopArgs
+    Stop(StopArgs),
     /// Get status of GraphDB components (daemon, rest, storage, cluster, or all)
     Status(StatusArgs),
     /// Manage GraphDB daemon instances
@@ -104,26 +113,19 @@ pub enum Commands {
     /// Perform a health check on the REST API server
     Health,
     /// Display help message
-    Help(HelpArgs),
-    // Added missing top-level commands to the Commands enum definition
-    // These were missing from the enum definition but present in the match arm
-    // No explicit variants needed for Clear/Clean as they are not top-level subcommands
-}
-
-#[derive(Parser, Debug)]
-pub struct HelpArgs {
-    /// Filter help for a specific command (e.g., "start daemon")
-    #[clap(long, short = 'c')]
-    pub filter_command: Option<String>,
-    /// Positional arguments for the command path (e.g., "start", "daemon")
-    pub command_path: Vec<String>,
+    Help(help_display_mod::HelpArgs),
+    /// Clear the terminal screen
+    Clear,
+    /// Exit the CLI
+    Exit,
+    /// Quit the CLI (alias for 'exit')
+    Quit,
 }
 
 /// Main entry point for CLI command handling.
 ///
 /// This function dispatches commands based on `CliArgs` and manages the lifecycle
 /// of daemon and REST API processes.
-#[tokio::main]
 pub async fn start_cli() -> Result<()> {
     // --- Custom Help Command Handling ---
     let args_vec: Vec<String> = env::args().collect();
@@ -147,10 +149,11 @@ pub async fn start_cli() -> Result<()> {
             se_cli.into()
         });
 
+        // Call directly from daemon_management
         return handle_internal_daemon_run(
             args.internal_rest_api_run,
             args.internal_storage_daemon_run,
-            args.internal_port, // Corrected: Pass Option<u16> directly
+            args.internal_port,
             args.internal_storage_config_path,
             converted_storage_engine,
         ).await;
@@ -189,6 +192,7 @@ pub async fn start_cli() -> Result<()> {
     let rest_api_handle: Arc<Mutex<Option<JoinHandle<()>>>> = Arc::new(Mutex::new(None));
     let storage_daemon_shutdown_tx_opt: Arc<Mutex<Option<oneshot::Sender<()>>>> = Arc::new(Mutex::new(None));
     let storage_daemon_handle: Arc<Mutex<Option<JoinHandle<()>>>> = Arc::new(Mutex::new(None));
+    let storage_daemon_port_arc: Arc<Mutex<Option<u16>>> = Arc::new(Mutex::new(None));
 
     let should_enter_interactive_mode = args.cli || args.command.is_none();
 
@@ -197,14 +201,14 @@ pub async fn start_cli() -> Result<()> {
             println!("Experimental plugins are enabled.");
         }
         match command {
-            // Updated Commands::Start to only have 'action'
-            Commands::Start { action } => { // Removed port, cluster, listen_port, storage_port, storage_config_file
+            Commands::Start { action } => {
                 match action {
                     Some(StartAction::All { port, cluster, listen_port, storage_port, storage_config_file }) => {
                         handlers_mod::handle_start_all_interactive(
                             port, cluster, listen_port, storage_port, storage_config_file,
                             daemon_handles.clone(), rest_api_shutdown_tx_opt.clone(), rest_api_port_arc.clone(), rest_api_handle.clone(),
                             storage_daemon_shutdown_tx_opt.clone(), storage_daemon_handle.clone(),
+                            storage_daemon_port_arc.clone(),
                         ).await?;
                     }
                     Some(StartAction::Daemon { port, cluster }) => {
@@ -213,30 +217,28 @@ pub async fn start_cli() -> Result<()> {
                             daemon_handles.clone(),
                         ).await?;
                     }
-                    // FIX: Updated StartAction::Rest destructuring and call to match commands.rs
-                    Some(StartAction::Rest { port: rest_start_port }) => { // 'port' is now the listen-port
+                    Some(StartAction::Rest { port: rest_start_port }) => {
                         handlers_mod::handle_rest_command_interactive(
-                            // Pass the 'port' argument as the single port for RestCliCommand::Start
                             RestCliCommand::Start { port: rest_start_port },
                             rest_api_shutdown_tx_opt.clone(),
                             rest_api_port_arc.clone(),
                             rest_api_handle.clone(),
                         ).await?;
                     }
-                    // FIX: Updated StartAction::Storage destructuring to use `port`
-                    Some(StartAction::Storage { port, config_file: storage_start_config_file }) => { // Corrected: Destructure `port`
+                    Some(StartAction::Storage { port, config_file: storage_start_config_file }) => {
                         handlers_mod::handle_storage_command_interactive(
-                            StorageAction::Start { port, config_file: storage_start_config_file }, // FIX: Pass `port`
+                            StorageAction::Start { port, config_file: storage_start_config_file },
                             storage_daemon_shutdown_tx_opt.clone(),
                             storage_daemon_handle.clone(),
+                            storage_daemon_port_arc.clone(),
                         ).await?;
                     }
                     None => {
-                        // Default `start` command now implies `start all` without specific args
                         handlers_mod::handle_start_all_interactive(
-                            None, None, None, None, None, // Pass None for all options
+                            None, None, None, None, None,
                             daemon_handles.clone(), rest_api_shutdown_tx_opt.clone(), rest_api_port_arc.clone(), rest_api_handle.clone(),
                             storage_daemon_shutdown_tx_opt.clone(), storage_daemon_handle.clone(),
+                            storage_daemon_port_arc.clone(),
                         ).await?;
                     }
                 }
@@ -245,7 +247,11 @@ pub async fn start_cli() -> Result<()> {
                 handlers_mod::handle_stop_command(stop_args).await?;
             }
             Commands::Status(status_args) => {
-                handlers_mod::handle_status_command(status_args, rest_api_port_arc.clone()).await?;
+                handlers_mod::handle_status_command(
+                    status_args,
+                    rest_api_port_arc.clone(),
+                    storage_daemon_port_arc.clone(),
+                ).await?;
             }
             Commands::Reload(reload_args) => {
                 handlers_mod::handle_reload_command(reload_args).await?;
@@ -259,13 +265,15 @@ pub async fn start_cli() -> Result<()> {
                     rest_api_handle.clone(),
                     storage_daemon_shutdown_tx_opt.clone(),
                     storage_daemon_handle.clone(),
+                    storage_daemon_port_arc.clone(),
                 ).await?;
             }
             Commands::Storage(storage_action) => {
                 handlers_mod::handle_storage_command_interactive(
                     storage_action,
                     storage_daemon_shutdown_tx_opt.clone(),
                     storage_daemon_handle.clone(),
+                    storage_daemon_port_arc.clone(),
                 ).await?;
             }
             Commands::Daemon(daemon_cmd) => {
@@ -287,6 +295,7 @@ pub async fn start_cli() -> Result<()> {
                     rest_api_handle,
                     storage_daemon_shutdown_tx_opt,
                     storage_daemon_handle,
+                    storage_daemon_port_arc,
                 ).await?;
             }
             Commands::Help(help_args) => {
@@ -315,6 +324,14 @@ pub async fn start_cli() -> Result<()> {
             Commands::Health => {
                 handlers_mod::display_rest_api_health().await;
             }
+            Commands::Clear => {
+                handlers_mod::clear_terminal_screen().await?;
+                handlers_mod::print_welcome_screen();
+            }
+            Commands::Exit | Commands::Quit => {
+                println!("Exiting CLI. Goodbye!");
+                process::exit(0);
+            }
         }
         return Ok(());
     }
@@ -330,6 +347,7 @@ pub async fn start_cli() -> Result<()> {
             rest_api_handle,
             storage_daemon_shutdown_tx_opt,
             storage_daemon_handle,
+            storage_daemon_port_arc,
         ).await?;
     } else if args.enable_plugins {
         println!("Experimental plugins is enabled.");