create-ekka-desktop-app 0.3.10 → 0.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ekka-desktop-app",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "Create an EKKA desktop app with built-in demo backend. No setup required.",
   "type": "module",
   "bin": {

package/template/src-tauri/src/main.rs

@@ -2,10 +2,12 @@
 //!
 //! Standalone demo implementation for CDA-generated apps.
 //! Returns demo responses for all operations (no SDK dependencies).
-//! Reads branding/app.json to configure app name and home path.
+//! Uses app.config.json values baked at build time.
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+mod config;
+
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use std::path::PathBuf;
@@ -56,45 +58,12 @@ impl EngineResponse {
 }
 
 // =============================================================================
-// Branding
+// Home Path
 // =============================================================================
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct Branding {
-    name: String,
-    #[serde(rename = "bundleId")]
-    bundle_id: String,
-    version: String,
-}
-
-impl Default for Branding {
-    fn default() -> Self {
-        Self {
-            name: "EKKA Desktop".to_string(),
-            bundle_id: "ai.ekka.desktop".to_string(),
-            version: "0.1.0".to_string(),
-        }
-    }
-}
-
-/// Convert app name to folder slug (lowercase, spaces to hyphens)
-fn app_name_to_slug(name: &str) -> String {
-    name.to_lowercase()
-        .chars()
-        .map(|c| if c.is_alphanumeric() { c } else { '-' })
-        .collect::<String>()
-        .split('-')
-        .filter(|s| !s.is_empty())
-        .collect::<Vec<_>>()
-        .join("-")
-}
-
-/// Compute home path based on app name
-/// Default: ~/.{slug} (dot-home) for all platforms
+/// Compute home path using baked config from app.config.json
 /// Override: Set EKKA_DATA_HOME env var for custom location
-fn compute_home_path(app_name: &str) -> PathBuf {
-    let slug = app_name_to_slug(app_name);
-
+fn compute_home_path() -> PathBuf {
     // Check for env override first
     if let Ok(env_path) = std::env::var("EKKA_DATA_HOME") {
         if !env_path.is_empty() {
@@ -102,38 +71,12 @@ fn compute_home_path(app_name: &str) -> PathBuf {
         }
     }
 
-    // Default: dot-home (~/.{slug}) for all platforms
+    // Use baked home folder name from app.config.json
+    let home_folder = config::home_folder();
+
     dirs::home_dir()
         .unwrap_or_else(|| PathBuf::from("/tmp"))
-        .join(format!(".{}", slug))
-}
-
-/// Load branding from app.json
-fn load_branding() -> Branding {
-    // Try to find branding/app.json relative to executable or current dir
-    let paths_to_try = [
-        // Relative to current directory (dev mode)
-        PathBuf::from("branding/app.json"),
-        PathBuf::from("../branding/app.json"),
-        // Relative to executable (production bundle)
-        std::env::current_exe()
-            .ok()
-            .and_then(|p| p.parent().map(|p| p.join("../Resources/branding/app.json")))
-            .unwrap_or_default(),
-    ];
-
-    for path in &paths_to_try {
-        if path.exists() {
-            if let Ok(content) = std::fs::read_to_string(path) {
-                if let Ok(branding) = serde_json::from_str::<Branding>(&content) {
-                    return branding;
-                }
-            }
-        }
-    }
-
-    // Fallback to default
-    Branding::default()
+        .join(home_folder)
 }
 
 // =============================================================================
@@ -144,19 +87,16 @@ pub struct EngineState {
     connected: Mutex<bool>,
     auth: Mutex<Option<AuthContext>>,
     home_granted: Mutex<bool>,
-    branding: Branding,
     home_path: PathBuf,
 }
 
 impl Default for EngineState {
     fn default() -> Self {
-        let branding = load_branding();
-        let home_path = compute_home_path(&branding.name);
+        let home_path = compute_home_path();
         Self {
             connected: Mutex::new(false),
             auth: Mutex::new(None),
             home_granted: Mutex::new(false),
-            branding,
             home_path,
         }
     }
@@ -198,8 +138,8 @@ fn engine_disconnect(state: State<EngineState>) {
 fn engine_request(req: EngineRequest, state: State<EngineState>) -> EngineResponse {
     let home_path_str = state.home_path.display().to_string();
 
-    // Check connected (except for status operations)
-    if !matches!(req.op.as_str(), "runtime.info" | "home.status") {
+    // Check connected (except for status operations that run pre-connect)
+    if !matches!(req.op.as_str(), "runtime.info" | "home.status" | "setup.status" | "nodeCredentials.status") {
         let connected = match state.connected.lock() {
             Ok(guard) => *guard,
             Err(e) => return EngineResponse::err("INTERNAL_ERROR", &e.to_string()),
@@ -224,8 +164,8 @@ fn engine_request(req: EngineRequest, state: State<EngineState>) -> EngineRespon
                 "mode": "demo",
                 "homeState": home_state,
                 "homePath": home_path_str,
-                "appName": state.branding.name,
-                "appVersion": state.branding.version
+                "appName": config::app_name(),
+                "appVersion": env!("CARGO_PKG_VERSION")
             }))
         }