@ionyx-apps/cli 0.1.9 → 0.2.1

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

@@ -3,12 +3,14 @@ name = "my-ionyx-app"
 version = "0.1.0"
 edition = "2021"
 
+[workspace]
+
 [[bin]]
 name = "my-ionyx-app"
 path = "main.rs"
 
 [dependencies]
-ionyx = { git = "https://github.com/ionyx-apps/ionyx", branch = "quantum" }
+ionyx = { path = "../../../../../../src-ionyx" }
 anyhow = "1.0"
 
 [profile.release]

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

@@ -0,0 +1,105 @@
+use std::borrow::Cow;
+use wry::http::{Request, Response, StatusCode};
+use std::path::Path;
+
+#[cfg(not(debug_assertions))]
+use include_dir::{include_dir, Dir};
+
+// Configuration'dan frontendDist path'ini oku
+fn get_frontend_dist_path() -> String {
+    // Önce Ionyx config dosyasını okumaya çalış
+    if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
+        for line in config_content.lines() {
+            if line.trim().starts_with("frontendDist") {
+                if let Some(path) = line.split('=').nth(1) {
+                    return path.trim().trim_matches('"').to_string();
+                }
+            }
+        }
+    }
+    
+    // Varsayılan path
+    "../frontend/dist".to_string()
+}
+
+// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
+// Configuration'dan dinamik path okur.
+#[cfg(not(debug_assertions))]
+static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+
+pub struct CustomProtocolHandler;
+
+impl CustomProtocolHandler {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let path = request.uri().path();
+        
+        // Debug modunda (npm run dev açıkken) bu handler'ın işi yok aslında, 
+        // WebView doğrudan localhost'a gitmeli. Ama bir şekilde buraya düşerse 
+        // 404 yerine temiz bir hata dönüyoruz.
+        if cfg!(debug_assertions) {
+            return Response::builder()
+                .status(StatusCode::NOT_FOUND)
+                .header("Content-Type", "text/plain")
+                .body(Cow::Borrowed(&b"Debug mode: Assets are served from Vite (localhost:5173)"[..]))
+                .unwrap();
+        }
+
+        // Release modunda gömülü dosyaları işle
+        #[cfg(not(debug_assertions))]
+        {
+            let clean_path = path.trim_start_matches('/');
+            let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+
+            match EMBEDDED_ASSETS.get_file(file_path) {
+                Some(file) => {
+                    let content_type = Self::get_content_type(file_path);
+                    Response::builder()
+                        .status(StatusCode::OK)
+                        .header("Content-Type", content_type)
+                        .body(Cow::Borrowed(file.contents()))
+                        .unwrap()
+                }
+                None => {
+                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
+                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
+                        Response::builder()
+                            .status(StatusCode::OK)
+                            .header("Content-Type", "text/html")
+                            .body(Cow::Borrowed(index_file.contents()))
+                            .unwrap()
+                    } else {
+                        Response::builder()
+                            .status(StatusCode::NOT_FOUND)
+                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
+                            .unwrap()
+                    }
+                }
+            }
+        }
+        
+        // Burası teknik olarak unreachable ancak derleyiciyi tatmin etmek için
+        #[cfg(debug_assertions)]
+        Response::builder().status(StatusCode::NOT_FOUND).body(Cow::Borrowed(&b"Not Found"[..])).unwrap()
+    }
+
+    fn get_content_type(file_path: &str) -> &'static str {
+        let path = std::path::Path::new(file_path);
+        match path.extension().and_then(|s| s.to_str()) {
+            Some("html") => "text/html",
+            Some("css") => "text/css",
+            Some("js") => "application/javascript",
+            Some("json") => "application/json",
+            Some("svg") => "image/svg+xml",
+            Some("png") => "image/png",
+            Some("jpg") | Some("jpeg") => "image/jpeg",
+            Some("gif") => "image/gif",
+            Some("woff") => "font/woff",
+            Some("woff2") => "font/woff2",
+            _ => "application/octet-stream",
+        }
+    }
+}

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

@@ -3,12 +3,14 @@ name = "my-ionyx-app"
 version = "0.1.0"
 edition = "2021"
 
+[workspace]
+
 [[bin]]
 name = "my-ionyx-app"
 path = "main.rs"
 
 [dependencies]
-ionyx = { git = "https://github.com/ionyx-apps/ionyx", branch = "quantum" }
+ionyx = { path = "../../../../../../src-ionyx" }
 anyhow = "1.0"
 
 [profile.release]

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

@@ -0,0 +1,105 @@
+use std::borrow::Cow;
+use wry::http::{Request, Response, StatusCode};
+use std::path::Path;
+
+#[cfg(not(debug_assertions))]
+use include_dir::{include_dir, Dir};
+
+// Configuration'dan frontendDist path'ini oku
+fn get_frontend_dist_path() -> String {
+    // Önce Ionyx config dosyasını okumaya çalış
+    if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
+        for line in config_content.lines() {
+            if line.trim().starts_with("frontendDist") {
+                if let Some(path) = line.split('=').nth(1) {
+                    return path.trim().trim_matches('"').to_string();
+                }
+            }
+        }
+    }
+    
+    // Varsayılan path
+    "../frontend/dist".to_string()
+}
+
+// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
+// Configuration'dan dinamik path okur.
+#[cfg(not(debug_assertions))]
+static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+
+pub struct CustomProtocolHandler;
+
+impl CustomProtocolHandler {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let path = request.uri().path();
+        
+        // Debug modunda (npm run dev açıkken) bu handler'ın işi yok aslında, 
+        // WebView doğrudan localhost'a gitmeli. Ama bir şekilde buraya düşerse 
+        // 404 yerine temiz bir hata dönüyoruz.
+        if cfg!(debug_assertions) {
+            return Response::builder()
+                .status(StatusCode::NOT_FOUND)
+                .header("Content-Type", "text/plain")
+                .body(Cow::Borrowed(&b"Debug mode: Assets are served from Vite (localhost:5173)"[..]))
+                .unwrap();
+        }
+
+        // Release modunda gömülü dosyaları işle
+        #[cfg(not(debug_assertions))]
+        {
+            let clean_path = path.trim_start_matches('/');
+            let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+
+            match EMBEDDED_ASSETS.get_file(file_path) {
+                Some(file) => {
+                    let content_type = Self::get_content_type(file_path);
+                    Response::builder()
+                        .status(StatusCode::OK)
+                        .header("Content-Type", content_type)
+                        .body(Cow::Borrowed(file.contents()))
+                        .unwrap()
+                }
+                None => {
+                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
+                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
+                        Response::builder()
+                            .status(StatusCode::OK)
+                            .header("Content-Type", "text/html")
+                            .body(Cow::Borrowed(index_file.contents()))
+                            .unwrap()
+                    } else {
+                        Response::builder()
+                            .status(StatusCode::NOT_FOUND)
+                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
+                            .unwrap()
+                    }
+                }
+            }
+        }
+        
+        // Burası teknik olarak unreachable ancak derleyiciyi tatmin etmek için
+        #[cfg(debug_assertions)]
+        Response::builder().status(StatusCode::NOT_FOUND).body(Cow::Borrowed(&b"Not Found"[..])).unwrap()
+    }
+
+    fn get_content_type(file_path: &str) -> &'static str {
+        let path = std::path::Path::new(file_path);
+        match path.extension().and_then(|s| s.to_str()) {
+            Some("html") => "text/html",
+            Some("css") => "text/css",
+            Some("js") => "application/javascript",
+            Some("json") => "application/json",
+            Some("svg") => "image/svg+xml",
+            Some("png") => "image/png",
+            Some("jpg") | Some("jpeg") => "image/jpeg",
+            Some("gif") => "image/gif",
+            Some("woff") => "font/woff",
+            Some("woff2") => "font/woff2",
+            _ => "application/octet-stream",
+        }
+    }
+}

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

@@ -51,6 +51,11 @@ 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\" }"
+        );
         fs::write(&backend_cargo_path, content)?;
     }