create-ekka-desktop-app 0.4.3 → 0.4.5

package/package.json

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

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

@@ -88,7 +88,7 @@ pub fn engine_request(req: EngineRequest, state: State<EngineState>, app_handle:
         "auth.set" => auth::handle_set(&req.payload, &state),
 
         // Node Credentials (routed to Desktop Core process via JSON-RPC)
-        // After successful set, app restarts to run full startup with credentials
+        // After successful set, TS calls engine_connect and proceeds to login
         "nodeCredentials.set" => handle_node_credentials_set_via_core(&req.payload, &state, app_handle),
         "nodeCredentials.status" => state.core_process.request("nodeCredentials.status", &req.payload),
         "nodeCredentials.clear" => state.core_process.request("nodeCredentials.clear", &req.payload),
@@ -307,11 +307,11 @@ fn handle_setup_status(state: &EngineState) -> EngineResponse {
 // Node Credentials Handlers
 // =============================================================================
 
-/// Set node credentials via Desktop Core process, then restart app
+/// Set node credentials via Desktop Core process
 ///
 /// Core handles validation and encrypted storage.
-/// Host handles the app restart (Bridge-specific).
-fn handle_node_credentials_set_via_core(payload: &Value, state: &EngineState, app_handle: AppHandle) -> EngineResponse {
+/// TS handles the post-onboarding transition: handleSetupComplete() → ekka.connect() → login.
+fn handle_node_credentials_set_via_core(payload: &Value, state: &EngineState, _app_handle: AppHandle) -> EngineResponse {
     tracing::info!(op = "rust.local.op", opName = "nodeCredentials.set", "Routing nodeCredentials.set to Desktop Core");
 
     let resp = state.core_process.request("nodeCredentials.set", payload);
@@ -319,11 +319,8 @@ fn handle_node_credentials_set_via_core(payload: &Value, state: &EngineState, ap
     if resp.ok {
         tracing::info!(
             op = "desktop.onboarding.complete",
-            "Credentials stored via Core - restarting app for full startup"
+            "Credentials stored via Core - TS will call engine_connect and proceed"
         );
-        // Restart app to run full startup with credentials
-        // This triggers: updater check → node auth → engine spawn
-        app_handle.restart();
     }
 
     resp

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

@@ -303,33 +303,48 @@ fn find_core_binary() -> Result<std::path::PathBuf, String> {
         }
     }
 
-    // 3. Cargo target directory (dev builds)
+    // 3. Workspace target directory (dev builds)
     let manifest_dir = env!("CARGO_MANIFEST_DIR");
-    let dev_path = std::path::PathBuf::from(manifest_dir)
-        .join("crates")
-        .join("ekka-desktop-core")
-        .join("target")
-        .join("debug")
-        .join("ekka-desktop-core");
-    if dev_path.exists() {
-        return Ok(dev_path);
+    for profile in &["debug", "release"] {
+        let candidate = std::path::PathBuf::from(manifest_dir)
+            .join("target")
+            .join(profile)
+            .join("ekka-desktop-core");
+        if candidate.exists() {
+            return Ok(candidate);
+        }
     }
 
-    // Also check release
-    let release_path = std::path::PathBuf::from(manifest_dir)
-        .join("crates")
-        .join("ekka-desktop-core")
+    // 4. Dev convenience: auto-build on first run
+    tracing::info!(
+        op = "core.binary.auto_build",
+        "Desktop Core binary not found — building automatically..."
+    );
+    let status = Command::new("cargo")
+        .args(["build", "-p", "ekka-desktop-core"])
+        .current_dir(manifest_dir)
+        .status()
+        .map_err(|e| format!("Failed to run cargo build: {}", e))?;
+
+    if !status.success() {
+        return Err(format!(
+            "Failed to auto-build Desktop Core (exit {:?}). Build manually:\n  \
+             cd {} && cargo build -p ekka-desktop-core",
+            status.code(),
+            manifest_dir
+        ));
+    }
+
+    let built = std::path::PathBuf::from(manifest_dir)
         .join("target")
-        .join("release")
+        .join("debug")
         .join("ekka-desktop-core");
-    if release_path.exists() {
-        return Ok(release_path);
+    if built.exists() {
+        return Ok(built);
     }
 
     Err(format!(
-        "Desktop Core binary not found. Build it first:\n  \
-         cd {}/crates/ekka-desktop-core && cargo build\n  \
-         Or set EKKA_DESKTOP_CORE_BIN env var.",
-        manifest_dir
+        "Desktop Core binary not found after build. Expected at: {}",
+        built.display()
     ))
 }