@ionyx-apps/cli 0.4.8 → 0.4.9

package/ionyx-cli/src/templates/angular/src-ionyx/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+build = "build.rs"
+name = "my-ionyx-app"
+version = "0.4.2"
+edition = "2021"
+
+[dependencies]
+include_dir = "0.7"
+# Web framework dependencies
+wry = "0.54"
+tao = "0.34"
+tokio = { version = "1.50", features = ["full"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+anyhow = "1.0"
+toml = "0.8"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+os_info = "3"
+gethostname = "0.4"
+
+[[bin]]
+name = "my-ionyx-app"
+path = "main.rs"
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+panic = "abort"

package/ionyx-cli/src/templates/angular/src-ionyx/build.rs

@@ -0,0 +1,5 @@
+fn main() {
+    // Build script for Ionyx Angular template
+    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=Cargo.toml");
+}

package/ionyx-cli/src/templates/angular/src-ionyx/main.rs

@@ -0,0 +1,48 @@
+use ionyx::{config, security, protocol};
+
+#[tokio::main]
+async fn main() {
+    println!("🚀 Ionyx Application starting...");
+
+    // Load application configuration
+    let app_config = match config::Config::load().await {
+        Ok(config) => {
+            println!("✅ Configuration loaded successfully");
+            config
+        }
+        Err(e) => {
+            eprintln!("⚠️  Failed to load config, using defaults: {}", e);
+            config::Config::default()
+        }
+    };
+
+    // Initialize security manager for demonstration
+    let security_manager: crate::security::SecurityManager = security::SecurityManager::new(app_config.clone());
+
+    // Demonstrate comprehensive security manager functionality
+    let test_paths = ["./app-data", "/system", "../outside"];
+    for &test_path in &test_paths {
+        let is_secure = security_manager.is_path_allowed(test_path);
+        println!("🔒 Security check: '{}' -> {}",
+                 test_path,
+                 if is_secure { "ALLOWED" } else { "DENIED" });
+    }
+
+    // Demonstrate security validation
+    if let Ok(()) = security_manager.validate_path_operation("./app-data", "read") {
+        println!("🔒 Security validation: Path operation approved");
+    }
+
+    // Initialize protocol handler for demonstration
+    let _protocol_handler = protocol::CustomProtocolHandler::new();
+    println!("🌐 Protocol handler initialized");
+
+    // Create and run the Ionyx application with automatic Vite server startup
+    println!("🚀 Launching Ionyx application...");
+    let builder = ionyx::Builder::new().config(app_config);
+
+    if let Err(e) = builder.run() {
+        eprintln!("❌ Application failed to start: {}", e);
+        std::process::exit(1);
+    }
+}

package/ionyx-cli/src/templates/angular/src-ionyx/src/lib.rs

@@ -0,0 +1,267 @@
+// Ionyx Angular Template Library
+
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+pub mod config;
+pub mod ipc_bridge;
+pub mod protocol;
+pub mod security;
+pub mod window;
+pub mod fusion;
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct DevConfig {
+    pub port: u16,
+    pub host: String,
+    pub before_dev_command: Option<String>,
+    pub dev_url: String,
+    pub hot: bool,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct AppConfig {
+    pub name: String,
+    pub version: String,
+    pub description: String,
+    pub dev: DevConfig,
+    pub window: HashMap<String, serde_json::Value>,
+}
+
+#[derive(Debug, Clone)]
+pub struct Builder {
+    config: Option<AppConfig>,
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Builder {
+    pub fn new() -> Self {
+        Self { config: None }
+    }
+
+    pub fn config(mut self, config: AppConfig) -> Self {
+        self.config = Some(config);
+        self
+    }
+
+    pub fn run(self) -> anyhow::Result<()> {
+        let rt = tokio::runtime::Runtime::new()?;
+        rt.block_on(async {
+            self.run_async().await
+        })
+    }
+
+    async fn run_async(self) -> anyhow::Result<()> {
+        // Load configuration if not provided
+        let config = if let Some(cfg) = self.config {
+            cfg
+        } else {
+            config::Config::load().await
+                .map_err(|e| anyhow::anyhow!("Failed to load config: {}", e))?
+        };
+
+        println!("🚀 Ionyx Framework starting...");
+        println!("📱 App: {} v{}", config.name, config.version);
+        println!("🔧 Debug mode: true");
+
+        // Initialize security manager for demonstration
+        let security_manager: crate::security::SecurityManager = security::SecurityManager::new(config.clone());
+
+        // Demonstrate comprehensive security manager functionality
+        let test_paths = ["./app-data", "/system", "../outside"];
+        for &test_path in &test_paths {
+            let is_secure = security_manager.is_path_allowed(test_path);
+            println!("🔒 Security check: '{}' -> {}",
+                     test_path,
+                     if is_secure { "ALLOWED" } else { "DENIED" });
+        }
+
+        // Demonstrate security validation
+        if let Ok(()) = security_manager.validate_path_operation("./app-data", "read") {
+            println!("🔒 Security validation: Path operation approved");
+        }
+
+        // Initialize protocol handler for demonstration
+        let _protocol_handler = protocol::CustomProtocolHandler::new();
+        println!("🌐 Protocol handler initialized");
+
+        // Handle dev server based on configuration (Tauri-like approach)
+        if let Some(before_dev_command) = &config.dev.before_dev_command {
+            println!("🔧 Starting dev server with command: {}", before_dev_command);
+            let vite_child = start_vite_dev_server(before_dev_command)?;
+            monitor_vite_server(vite_child)?;
+
+            // Wait for Vite to be ready
+            println!("⏳ Waiting for Vite dev server to be ready...");
+            thread::sleep(Duration::from_secs(5));
+        } else {
+            println!("⚠️  No beforeDevCommand configured, skipping dev server startup");
+        }
+
+        // Create event loop
+        let event_loop: EventLoop<String> = EventLoopBuilder::with_user_event().build();
+        let _web_context = WebContext::new(Some(Default::default()));
+
+        // Create window
+        let window = tao::window::WindowBuilder::new()
+            .with_title(&config.name)
+            .with_inner_size(tao::dpi::LogicalSize::new(1200.0, 800.0))
+            .with_resizable(true)
+            .build(&event_loop)?;
+
+        // Use configured dev URL
+        println!("🌐 Connecting to Vite dev server at {}", config.dev.dev_url);
+
+        // Create IPC dispatcher
+        let ipc_dispatcher = Arc::new(IpcDispatcher::new(event_loop.create_proxy()));
+        let webview = Arc::new(Mutex::new(
+            WebViewBuilder::new()
+                .with_initialization_script(include_str!("ionyx.js"))
+                .with_ipc_handler(move |request| {
+                    let dispatcher = ipc_dispatcher.clone();
+                    let request_body = request.body().clone();
+                    tokio::spawn(async move {
+                        if let Ok(request_str) = String::from_utf8(request_body) {
+                            if let Ok(ipc_request) = serde_json::from_str::<serde_json::Value>(&request_str) {
+                                if let Some(command) = ipc_request.get("command").and_then(|c| c.as_str()) {
+                                    if let Some(id) = ipc_request.get("id").and_then(|i| i.as_str()) {
+                                        match command {
+                                            "app.getVersion" => {
+                                                let data = json!({
+                                                    "name": config.name,
+                                                    "version": config.version,
+                                                    "platform": std::env::consts::OS
+                                                });
+                                                dispatcher.resolve_promise(id, true, Some(data), None);
+                                                info!("✅ IPC response sent for: {}", command);
+                                            }
+                                            "os.info" => {
+                                                let data = json!({
+                                                    "platform": std::env::consts::OS,
+                                                    "arch": std::env::consts::ARCH,
+                                                    "version": "1.0.0",
+                                                    "hostname": "localhost"
+                                                });
+                                                dispatcher.resolve_promise(id, true, Some(data), None);
+                                                info!("✅ IPC response sent for: {}", command);
+                                            }
+                                            _ => {
+                                                let error = format!("Unknown command: {}", command);
+                                                dispatcher.resolve_promise(id, false, None, Some(error));
+                                                error!("Unknown IPC command: {}", command);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    });
+                })
+                .with_navigation_handler(|url| {
+                    url.starts_with("http://127.0.0.1:") ||
+                    url.starts_with("https://127.0.0.1:") ||
+                    url.starts_with("file://") ||
+                    url.starts_with("ionyx://")
+                })
+                .with_url(&config.dev.dev_url)
+                .with_devtools(true)
+                .build(&window)?
+        ));
+
+        println!("✅ Ionyx application initialized successfully!");
+        println!("🎉 Both Vite dev server and Ionyx application are running!");
+        println!("🌐 Open {} to access your application", config.dev.dev_url);
+
+        // Run event loop
+        event_loop.run(move |event, _, control_flow| {
+            *control_flow = ControlFlow::Wait;
+
+            match event {
+                tao::event::Event::UserEvent(js_code) => {
+                    info!("Executing JavaScript code: {}", js_code);
+                    if let Ok(webview_guard) = webview.lock() {
+                        if let Err(e) = webview_guard.evaluate_script(&js_code) {
+                            error!("Failed to execute JavaScript code: {}", e);
+                        } else {
+                            info!("JavaScript code executed successfully");
+                        }
+                    }
+                }
+                tao::event::Event::WindowEvent {
+                    event: tao::event::WindowEvent::CloseRequested,
+                    ..
+                } => {
+                    println!("👋 Application closing...");
+                    *control_flow = ControlFlow::Exit;
+                }
+                _ => (),
+            }
+        });
+    }
+}
+
+fn start_vite_dev_server(command: &str) -> anyhow::Result<std::process::Child> {
+    info!("🚀 Starting Vite dev server with command: {}", command);
+
+    // Parse the command (e.g., "npm run dev" -> ["npm", "run", "dev"])
+    let parts: Vec<&str> = command.split_whitespace().collect();
+    if parts.is_empty() {
+        return Err(anyhow::anyhow!("Invalid beforeDevCommand"));
+    }
+
+    let mut child = Command::new(parts[0])
+        .args(&parts[1..])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .map_err(|e| anyhow::anyhow!("Failed to start Vite dev server: {}", e))?;
+
+    Ok(child)
+}
+
+fn monitor_vite_server(mut child: std::process::Child) -> anyhow::Result<()> {
+    info!("👀 Monitoring Vite dev server output...");
+
+    if let Some(stdout) = child.stdout.take() {
+        let reader = BufReader::new(stdout);
+        thread::spawn(move || {
+            for line in reader.lines() {
+                match line {
+                    Ok(line) => {
+                        println!("📝 Vite: {}", line);
+                        // Check for ready indicators
+                        if line.contains("ready") || line.contains("Ready") ||
+                           line.contains("Local:") || line.contains("http://") {
+                            info!("✅ Vite dev server is ready!");
+                        }
+                    }
+                    Err(e) => error!("Error reading Vite output: {}", e),
+                }
+            }
+        });
+    }
+
+    // Also monitor stderr
+    if let Some(stderr) = child.stderr.take() {
+        let reader = BufReader::new(stderr);
+        thread::spawn(move || {
+            for line in reader.lines() {
+                match line {
+                    Ok(line) => {
+                        if !line.contains("webpack") && !line.contains("built in") {
+                            eprintln!("⚠️  Vite stderr: {}", line);
+                        }
+                    }
+                    Err(e) => error!("Error reading Vite stderr: {}", e),
+                }
+            }
+        });
+    }
+
+    Ok(())
+}

package/ionyx-cli/src/templates/basic/ionyx.config.json

@@ -13,6 +13,9 @@
   },
   "dev": {
     "port": 5173,
+    "host": "127.0.0.1",
+    "beforeDevCommand": "npm run dev",
+    "devUrl": "http://127.0.0.1:5173",
     "hot": true
   },
   "build": {

package/ionyx-cli/src/templates/basic/package.json

@@ -10,7 +10,12 @@
     "preview": "vite preview",
     "start": "vite preview --port 5173",
     "ionyx:dev": "cd src-ionyx && cargo run --bin my-ionyx-app",
-    "ionyx:build": "cd src-ionyx && cargo build --release",
+    "ionyx:build": "cd src-ionyx && cargo build --release && npm run bundle:create",
+    "bundle:create": "node -e \"const fs=require('fs');const path=require('path');const dist=path.join(__dirname,'dist');if(!fs.existsSync(dist))fs.mkdirSync(dist);const target=path.join(__dirname,'src-ionyx','target','release','my-ionyx-app.exe');if(fs.existsSync(target)){const bundle=path.join(dist,'my-ionyx-app-v1.0.0.exe');fs.copyFileSync(target,bundle);console.log('✅ Bundle created:',bundle);}else{console.log('❌ Executable not found');}\"",
+    "bundle": "npm run bundle:create",
+    "bundle:windows": "npm run bundle:create",
+    "bundle:macos": "npm run bundle:create",
+    "bundle:linux": "npm run bundle:create",
     "ionyx": "npx ionyx",
     "ionyx:dev2": "npx ionyx dev",
     "ionyx:build2": "npx ionyx build",

package/ionyx-cli/src/templates/basic/src-ionyx/Cargo.toml

@@ -4,22 +4,24 @@ name = "my-ionyx-app"
 version = "0.4.2"
 edition = "2021"
 
-[workspace]
-
-[lib]
-name = "my_ionyx_app"
-path = "src/lib.rs"
-
-[[bin]]
-name = "my-ionyx-app"
-path = "main.rs"
-
 [dependencies]
 include_dir = "0.7"
-ionyx = { path = "../../../../../../src-ionyx" }
-anyhow = "1.0"
+# Web framework dependencies
 wry = "0.54"
 tao = "0.34"
+tokio = { version = "1.50", features = ["full"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+anyhow = "1.0"
+toml = "0.8"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+os_info = "3"
+gethostname = "0.4"
+
+[[bin]]
+name = "my-ionyx-app"
+path = "main.rs"
 
 [profile.release]
 opt-level = 3

package/ionyx-cli/src/templates/basic/src-ionyx/main.rs

@@ -1,5 +1,48 @@
-//! my-ionyx-app backend - Ionyx Framework
+use ionyx::{config, security, protocol};
 
-fn main() -> anyhow::Result<()> {
-    ionyx::Builder::default().run()
+#[tokio::main]
+async fn main() {
+    println!("🚀 Ionyx Application starting...");
+
+    // Load application configuration
+    let app_config = match config::Config::load().await {
+        Ok(config) => {
+            println!("✅ Configuration loaded successfully");
+            config
+        }
+        Err(e) => {
+            eprintln!("⚠️  Failed to load config, using defaults: {}", e);
+            config::Config::default()
+        }
+    };
+
+    // Initialize security manager for demonstration
+    let security_manager: crate::security::SecurityManager = security::SecurityManager::new(app_config.clone());
+
+    // Demonstrate comprehensive security manager functionality
+    let test_paths = ["./app-data", "/system", "../outside"];
+    for &test_path in &test_paths {
+        let is_secure = security_manager.is_path_allowed(test_path);
+        println!("🔒 Security check: '{}' -> {}",
+                 test_path,
+                 if is_secure { "ALLOWED" } else { "DENIED" });
+    }
+
+    // Demonstrate security validation
+    if let Ok(()) = security_manager.validate_path_operation("./app-data", "read") {
+        println!("🔒 Security validation: Path operation approved");
+    }
+
+    // Initialize protocol handler for demonstration
+    let _protocol_handler = protocol::CustomProtocolHandler::new();
+    println!("🌐 Protocol handler initialized");
+
+    // Create and run the Ionyx application with automatic Vite server startup
+    println!("🚀 Launching Ionyx application...");
+    let builder = ionyx::Builder::new().config(app_config);
+
+    if let Err(e) = builder.run() {
+        eprintln!("❌ Application failed to start: {}", e);
+        std::process::exit(1);
+    }
 }

package/ionyx-cli/src/templates/leptos/package.json

@@ -8,7 +8,12 @@
     "build": "vite build",
     "preview": "vite preview",
     "ionyx:dev": "cd src-ionyx && cargo run --bin my-ionyx-app",
-    "ionyx:build": "cd src-ionyx && cargo build --release",
+    "ionyx:build": "cd src-ionyx && cargo build --release && npm run bundle:create",
+    "bundle:create": "node -e \"const fs=require('fs');const path=require('path');const dist=path.join(__dirname,'dist');if(!fs.existsSync(dist))fs.mkdirSync(dist);const target=path.join(__dirname,'src-ionyx','target','release','my-ionyx-app.exe');if(fs.existsSync(target)){const bundle=path.join(dist,'my-ionyx-app-v1.0.0.exe');fs.copyFileSync(target,bundle);console.log('✅ Bundle created:',bundle);}else{console.log('❌ Executable not found');}\"",
+    "bundle": "npm run bundle:create",
+    "bundle:windows": "npm run bundle:create",
+    "bundle:macos": "npm run bundle:create",
+    "bundle:linux": "npm run bundle:create",
     "ionyx": "npx ionyx",
     "ionyx:dev2": "npx ionyx dev",
     "ionyx:build2": "npx ionyx build",

package/ionyx-cli/src/templates/leptos/src-ionyx/Cargo.toml

@@ -4,18 +4,24 @@ name = "my-ionyx-app"
 version = "0.4.2"
 edition = "2021"
 
-[workspace]
-
-[[bin]]
-name = "my-ionyx-app"
-path = "main.rs"
-
 [dependencies]
 include_dir = "0.7"
-ionyx = { path = "../../../../../../src-ionyx" }
-anyhow = "1.0"
+# Web framework dependencies
 wry = "0.54"
 tao = "0.34"
+tokio = { version = "1.50", features = ["full"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+anyhow = "1.0"
+toml = "0.8"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+os_info = "3"
+gethostname = "0.4"
+
+[[bin]]
+name = "my-ionyx-app"
+path = "main.rs"
 
 [profile.release]
 opt-level = 3

package/ionyx-cli/src/templates/leptos/src-ionyx/main.rs

@@ -1,5 +1,48 @@
-//! my-ionyx-app backend - Ionyx Framework
+use ionyx::{config, security, protocol};
 
-fn main() -> anyhow::Result<()> {
-    ionyx::Builder::default().run()
+#[tokio::main]
+async fn main() {
+    println!("🚀 Ionyx Application starting...");
+
+    // Load application configuration
+    let app_config = match config::Config::load().await {
+        Ok(config) => {
+            println!("✅ Configuration loaded successfully");
+            config
+        }
+        Err(e) => {
+            eprintln!("⚠️  Failed to load config, using defaults: {}", e);
+            config::Config::default()
+        }
+    };
+
+    // Initialize security manager for demonstration
+    let security_manager: crate::security::SecurityManager = security::SecurityManager::new(app_config.clone());
+
+    // Demonstrate comprehensive security manager functionality
+    let test_paths = ["./app-data", "/system", "../outside"];
+    for &test_path in &test_paths {
+        let is_secure = security_manager.is_path_allowed(test_path);
+        println!("🔒 Security check: '{}' -> {}",
+                 test_path,
+                 if is_secure { "ALLOWED" } else { "DENIED" });
+    }
+
+    // Demonstrate security validation
+    if let Ok(()) = security_manager.validate_path_operation("./app-data", "read") {
+        println!("🔒 Security validation: Path operation approved");
+    }
+
+    // Initialize protocol handler for demonstration
+    let _protocol_handler = protocol::CustomProtocolHandler::new();
+    println!("🌐 Protocol handler initialized");
+
+    // Create and run the Ionyx application with automatic Vite server startup
+    println!("🚀 Launching Ionyx application...");
+    let builder = ionyx::Builder::new().config(app_config);
+
+    if let Err(e) = builder.run() {
+        eprintln!("❌ Application failed to start: {}", e);
+        std::process::exit(1);
+    }
 }

package/ionyx-cli/src/templates/mod.rs

@@ -51,11 +51,7 @@ pub async fn copy_template(project_name: &str, dest_path: &str, template: &str)
     if Path::new(&backend_cargo_path).exists() {
         let mut content = fs::read_to_string(&backend_cargo_path)?;
         content = content.replace("my-ionyx-app", project_name);
-        // Use Git dependency for generated projects
-        content = content.replace(
-            "ionyx = { path = \"../../../../../../src-ionyx\" }",
-            "ionyx = { git = \"https://github.com/ionyx-apps/ionyx\", branch = \"quantum\" }"
-        );
+        // Keep the native framework implementation instead of forcing git dependency
         fs::write(&backend_cargo_path, content)?;
     }
     

package/ionyx-cli/src/templates/react/ionyx.config.json

@@ -1,7 +1,7 @@
 {
   "name": "{{PROJECT_NAME}}",
   "version": "1.0.0",
-  "description": "Ionyx Framework Application",
+  "description": "React + TypeScript + Vite application with Ionyx Framework",
   "type": "app",
   "src": "src",
   "dist": "dist",
@@ -13,6 +13,9 @@
   },
   "dev": {
     "port": 5173,
+    "host": "127.0.0.1",
+    "beforeDevCommand": "npm run dev",
+    "devUrl": "http://127.0.0.1:5173",
     "hot": true
   },
   "build": {

package/ionyx-cli/src/templates/react/package.json

@@ -8,7 +8,12 @@
     "build": "tsc && vite build",
     "preview": "vite preview",
     "ionyx:dev": "cd src-ionyx && cargo run --bin my-ionyx-app",
-    "ionyx:build": "cd src-ionyx && cargo build --release",
+    "ionyx:build": "cd src-ionyx && cargo build --release && npm run bundle:create",
+    "bundle:create": "node -e \"const fs=require('fs');const path=require('path');const dist=path.join(__dirname,'dist');if(!fs.existsSync(dist))fs.mkdirSync(dist);const target=path.join(__dirname,'src-ionyx','target','release','my-ionyx-app.exe');if(fs.existsSync(target)){const bundle=path.join(dist,'my-ionyx-app-v1.0.0.exe');fs.copyFileSync(target,bundle);console.log('✅ Bundle created:',bundle);}else{console.log('❌ Executable not found');}\"",
+    "bundle": "npm run bundle:create",
+    "bundle:windows": "npm run bundle:create",
+    "bundle:macos": "npm run bundle:create",
+    "bundle:linux": "npm run bundle:create",
     "ionyx": "npx ionyx",
     "ionyx:dev2": "npx ionyx dev",
     "ionyx:build2": "npx ionyx build",

package/ionyx-cli/src/templates/react/src-ionyx/Cargo.toml

@@ -4,22 +4,24 @@ name = "my-ionyx-app"
 version = "0.4.2"
 edition = "2021"
 
-[workspace]
-
-[lib]
-name = "my_ionyx_app"
-path = "src/lib.rs"
-
-[[bin]]
-name = "my-ionyx-app"
-path = "main.rs"
-
 [dependencies]
 include_dir = "0.7"
-ionyx = { path = "../../../../../../src-ionyx" }
-anyhow = "1.0"
+# Web framework dependencies
 wry = "0.54"
 tao = "0.34"
+tokio = { version = "1.50", features = ["full"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+anyhow = "1.0"
+toml = "0.8"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+os_info = "3"
+gethostname = "0.4"
+
+[[bin]]
+name = "my-ionyx-app"
+path = "main.rs"
 
 [profile.release]
 opt-level = 3