@devaloop/devalang 0.0.1-alpha.9 → 0.0.1-beta.2

package/rust/cli/install/plugin.rs

@@ -0,0 +1,80 @@
+use crate::{
+    config::ops::load_config,
+    web::cdn::{download_from_cdn, get_cdn_url},
+};
+use devalang_core::config::driver::ProjectConfigExt;
+use devalang_types::ProjectConfigPluginEntry;
+use devalang_utils::path as path_utils;
+use std::{fs, path::Path};
+
+pub async fn install_plugin(name: &str, target_dir: &Path) -> Result<(), String> {
+    let cdn_url = get_cdn_url();
+    let url = format!("{}/plugin/{}/download", cdn_url, name);
+
+    let plugin_dir = target_dir.join("plugins");
+
+    // Ensure .deva/tmp exists and build archive path
+    let deva_dir = path_utils::ensure_deva_dir()?;
+    let tmp_dir = deva_dir.join("tmp");
+    if !tmp_dir.exists() {
+        fs::create_dir_all(&tmp_dir)
+            .map_err(|e| format!("Failed to create tmp dir '{}': {}", tmp_dir.display(), e))?;
+    }
+
+    let archive_path = tmp_dir.join(format!("{}.devaplugin", name));
+    let extract_path = plugin_dir.join(name);
+
+    if extract_path.exists() {
+        println!(
+            "Plugin '{}' already exists at '{}'. Skipping install.",
+            name,
+            extract_path.display()
+        );
+        return Ok(());
+    }
+
+    download_from_cdn(&url, &archive_path)
+        .await
+        .map_err(|e| format!("Failed to download: {}", e))?;
+
+    // Add the plugin to the config: locate project root from target_dir
+    let project_root = path_utils::find_project_root_from(target_dir)
+        .ok_or_else(|| "Failed to determine project root from target_dir".to_string())?;
+
+    let config_path = project_root.join(path_utils::DEVALANG_CONFIG);
+    if !config_path.exists() {
+        return Err(format!(
+            "Config file not found at '{}'. Please run 'devalang init' before adding an addon",
+            config_path.display()
+        ));
+    }
+
+    let mut config = load_config(Some(&config_path))
+        .ok_or_else(|| format!("Failed to load config from '{}'", config_path.display()))?;
+
+    let dependency_path = format!("devalang://plugin/{}", name);
+
+    devalang_utils::file::extract_zip_safely(&archive_path, &extract_path)
+        .map_err(|e| format!("Failed to extract: {}", e))?;
+
+    // Add the plugin to the config if not already present
+    if config.plugins.is_none() {
+        config.plugins = Some(Vec::new());
+    }
+
+    if let Some(plugins) = config.plugins.as_mut() {
+        let exists = plugins.iter().any(|p| p.path == dependency_path);
+        if !exists {
+            plugins.push(ProjectConfigPluginEntry {
+                path: dependency_path.clone(),
+                version: None,
+            });
+
+            if let Err(e) = config.write_config(&config) {
+                eprintln!("Warning: failed to write config: {}", e);
+            }
+        }
+    }
+
+    Ok(())
+}

package/rust/cli/login/commands.rs

@@ -0,0 +1,124 @@
+use crate::config::settings::set_user_config_value;
+use crate::web::sso::get_sso_url;
+use std::str::FromStr;
+use tiny_http::Header;
+use tiny_http::{Response, Server};
+use webbrowser;
+
+/// Handle the login command
+/// This function initiates the login process by opening the browser and waiting for the callback.
+#[cfg(feature = "cli")]
+pub async fn handle_login_command() -> Result<(), String> {
+    use devalang_utils::logger::LogLevel;
+    use devalang_utils::logger::Logger;
+    use devalang_utils::spinner::start_spinner;
+
+    let logger = Logger::new();
+
+    let mut listener_port = 7878;
+
+    let test_port_already_in_use = format!("127.0.0.1:{}", listener_port);
+    while std::net::TcpListener::bind(&test_port_already_in_use).is_err() {
+        listener_port += 1;
+    }
+
+    let redirect_uri = format!("http://127.0.0.1:{}/callback", listener_port);
+    let login_url = format!(
+        "{}/?response_type=code&referer=cli&redirect_uri={}",
+        get_sso_url(),
+        redirect_uri
+    );
+
+    if webbrowser::open(&login_url).is_ok() {
+        logger.log_message(LogLevel::Info, "Opening browser for login...");
+        logger.log_message(
+            LogLevel::Info,
+            &format!(
+                "If the browser does not open, please visit the following URL: {}",
+                login_url
+            ),
+        );
+    } else {
+        logger.log_message(
+            LogLevel::Info,
+            "Please open the following URL in your browser to login:",
+        );
+        logger.log_message(LogLevel::Info, &login_url);
+    }
+
+    let server = Server::http(format!("127.0.0.1:{}", listener_port)).unwrap();
+
+    let spinner = start_spinner("Waiting for authentication...");
+
+    for request in server.incoming_requests() {
+        let query = request.url().to_string();
+        if request.url().starts_with("/callback") {
+            if query.contains("session=") || query.contains("error=") {
+                let token = query.split("session=").nth(1).unwrap_or("").to_string();
+
+                if !token.is_empty() {
+                    let response_html = r#"
+                        <html>
+                            <body>
+                                <h1>Authentication Successful</h1>
+                                <h2>You can now close this window.</h2>
+                            </body>
+                        </html>
+                    "#;
+
+                    let response = Response::from_string(response_html)
+                        .with_status_code(200)
+                        .with_header(Header::from_str("Content-Type: text/html").unwrap());
+
+                    request.respond(response).unwrap();
+
+                    save_token(&token);
+
+                    spinner.finish_and_clear();
+
+                    logger.log_message(
+                        LogLevel::Success,
+                        "Authentication successful. Token saved to ~/.devalang/config.json",
+                    );
+
+                    break;
+                } else {
+                    spinner.finish_and_clear();
+                    logger.log_message(LogLevel::Error, "Invalid session token.");
+                    request
+                        .respond(Response::from_string("Invalid session token."))
+                        .unwrap();
+
+                    break;
+                }
+            } else {
+                println!("Invalid callback: {}", request.url());
+
+                spinner.finish_and_clear();
+                logger.log_message(LogLevel::Error, "Invalid callback.");
+                request
+                    .respond(Response::from_string("Invalid callback."))
+                    .unwrap();
+
+                break;
+            }
+        } else if request.url().starts_with("/favicon.ico") {
+            // Ignore favicon requests
+        } else {
+            spinner.finish_and_clear();
+            logger.log_message(LogLevel::Error, "Invalid request.");
+            request
+                .respond(Response::from_string("Invalid request."))
+                .unwrap();
+
+            break;
+        }
+    }
+
+    Ok(())
+}
+
+/// Save the session token to a file in the user's home directory
+fn save_token(token: &str) {
+    set_user_config_value("session", serde_json::Value::String(token.to_string()));
+}

package/rust/cli/login/mod.rs

@@ -0,0 +1 @@
+pub mod commands;

package/rust/cli/mod.rs

@@ -1,205 +1,12 @@
-pub mod check;
+pub mod bank;
 pub mod build;
+pub mod check;
+pub mod discover;
 pub mod init;
-pub mod template;
+pub mod install;
+pub mod login;
+pub mod parser;
 pub mod play;
-
-use clap::{ Parser, Subcommand };
-use crate::utils::version::get_version;
-
-#[derive(Parser)]
-#[command(name = "devalang")]
-#[command(author = "Devaloop")]
-#[command(version = get_version())]
-#[command(about = "🦊 Devalang – A programming language for music and sound.")]
-pub struct Cli {
-    #[arg(long, global = true)]
-    /// Skips loading the configuration file.
-    pub no_config: bool,
-
-    #[command(subcommand)]
-    pub command: Commands,
-}
-
-#[derive(Subcommand)]
-pub enum TemplateCommand {
-    /// Lists all available templates for Devalang projects.
-    List,
-    /// Displays information about a specific template.
-    Info {
-        name: String,
-    },
-}
-
-#[derive(Subcommand)]
-pub enum Commands {
-    /// Create a new Devalang project.
-    ///
-    /// ### Arguments
-    /// - `name` - The name of the project to create.
-    /// - `template` - The template to use for the project. Defaults to "default".
-    ///
-    /// ### Example
-    /// ```bash
-    /// devalang init --name my_project --template default
-    ///
-    Init {
-        #[arg(short, long)]
-        /// The optional name (directory) of the project to create.
-        name: Option<String>,
-
-        #[arg(short, long)]
-        /// The template to use for the project.
-        ///
-        /// ### Default value
-        /// - `default`
-        ///
-        template: Option<String>,
-    },
-
-    Template {
-        #[command(subcommand)]
-        /// The template command to execute.
-        command: TemplateCommand,
-    },
-
-    /// Build the program and generate output files.
-    ///
-    /// ### Arguments
-    /// - `entry` - The entry point of the program to build. Defaults to "./src".
-    /// - `output` - The directory where the output files will be generated. Defaults to "./output".
-    /// - `watch` - Whether to watch for changes and rebuild. Defaults to "true".
-    ///
-    /// ### Example
-    /// ```bash
-    /// devalang build --entry ./src --output ./output --watch true
-    /// ```
-    ///
-    Build {
-        #[arg(short, long)]
-        /// The entry point of the program to build.
-        ///
-        entry: Option<String>,
-
-        #[arg(short, long)]
-        /// The directory where the output files will be generated.
-        ///
-        output: Option<String>,
-
-        #[arg(long, default_value_t = false)]
-        /// Whether to watch for changes and rebuild.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        watch: bool,
-
-        #[arg(long, default_value = "real-time")]
-        /// The mode of compilation.
-        ///
-        /// ### Default value
-        /// - `real-time`
-        ///
-        /// ### Possible values
-        /// - `real-time` - Compiles files as soon as possible.
-        /// - `batch` - Compiles files one by one.
-        /// - `check` - Analyzes the code without compiling it.
-        ///
-        compilation_mode: String,
-
-        #[arg(short, long, default_value_t = false)]
-        /// Whether to print debug information.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        debug: bool,
-
-        #[arg(short, long, default_value_t = false)]
-        /// Whether to compress the output files.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        compress: bool,
-    },
-
-    /// Analyze the program for errors and warnings.
-    ///
-    /// ### Arguments
-    /// - `entry` - The entry point of the program to analyze. Defaults to "./src".
-    /// - `watch` - Whether to watch for changes and re-analyze. Defaults to "true".
-    ///
-    /// ### Example
-    /// ```bash
-    /// devalang check --entry ./src --watch true --compilation-mode real-time
-    /// ```
-    Check {
-        #[arg(short, long)]
-        /// The entry point of the program to analyze.
-        ///
-        entry: Option<String>,
-
-        #[arg(short, long)]
-        /// The directory where the output files will be generated.
-        ///
-        output: Option<String>,
-
-        #[arg(long, default_value_t = false)]
-        /// Whether to watch for changes and re-analyze.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        watch: bool,
-
-        #[arg(short, long, default_value = "real-time")]
-        /// The mode of compilation.
-        ///
-        /// ### Default value
-        /// - `real-time`
-        ///
-        /// ### Possible values
-        /// - `real-time` - Analyzes files as soon as possible.
-        /// - `batch` - Analyzes files one by one.
-        /// - `check` - Analyzes the code without compiling it.
-        ///
-        compilation_mode: String,
-
-        #[arg(short, long, default_value_t = false)]
-        /// Whether to print debug information.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        debug: bool,
-    },
-
-    Play {
-        #[arg(short, long)]
-        /// The entry point of the program to play.
-        ///
-        entry: Option<String>,
-
-        #[arg(short, long)]
-        /// The directory where the output files will be generated.
-        ///
-        output: Option<String>,
-
-        #[arg(long, default_value_t = false)]
-        /// Whether to watch for changes and re-play.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        watch: bool,
-
-        #[arg(long, default_value_t = false)]
-        /// Whether to replay the program after it finishes.
-        ///
-        /// ### Default value
-        /// - `false`
-        ///
-        repeat: bool,
-    },
-}
+pub mod telemetry;
+pub mod template;
+pub mod update;