create-ekka-desktop-app 0.4.4 → 0.4.6

package/package.json

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

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

@@ -38,6 +38,43 @@ pub fn engine_connect(state: State<EngineState>) -> Result<(), String> {
     }
 
     *connected = true;
+
+    // Ensure grant verification key is loaded (Phase 6 equivalent).
+    // On normal startup this is a no-op (key already fetched by main.rs Phase 6).
+    // After first-time onboarding, Phase 6 was skipped so we fetch it here.
+    if state.get_grant_verify_key().is_none() {
+        let response = state.core_process.request(
+            "wellKnown.fetch",
+            &serde_json::json!({}),
+        );
+        if response.ok {
+            if let Some(ref result) = response.result {
+                if let Some(key) = result
+                    .get("grant_verify_key_b64")
+                    .and_then(|v| v.as_str())
+                {
+                    state.set_grant_verify_key(key.to_string());
+                    std::env::set_var("ENGINE_GRANT_VERIFY_KEY_B64", key);
+                    tracing::info!(
+                        op = "desktop.well_known.loaded",
+                        source = "engine_connect",
+                        "Grant verification key loaded post-onboarding"
+                    );
+                }
+            }
+        } else {
+            let err_msg = response.error.as_ref()
+                .map(|e| e.message.as_str())
+                .unwrap_or("Unknown error");
+            tracing::warn!(
+                op = "desktop.well_known.failed",
+                source = "engine_connect",
+                error = %err_msg,
+                "Failed to fetch grant verification key"
+            );
+        }
+    }
+
     Ok(())
 }
 
@@ -88,7 +125,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 +344,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 +356,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/main.rs

@@ -9,13 +9,13 @@
 //!    a. Run node-gated updater → FATAL if fails
 //!    b. Authenticate node → FATAL if fails
 //!    c. Spawn engine → FATAL if fails
-//! 5. After onboarding stores credentials → app.restart()
+//! 5. After onboarding stores credentials → TS calls engine_connect → login
 //!
 //! # Design Constraints
 //!
 //! - Node ID is REQUIRED before updater/engine/runner
 //! - Fresh install loads UI for onboarding only
-//! - After onboarding → full restart → normal startup
+//! - After onboarding → engine_connect loads key via wellKnown.fetch → login
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
@@ -104,7 +104,7 @@ fn main() {
                     op = "desktop.onboarding.mode",
                     "Onboarding mode - UI will load, engine/updater/runner blocked"
                 );
-                // UI loads, user completes onboarding, nodeCredentials.set triggers restart
+                // UI loads, user completes onboarding, TS calls engine_connect (loads key)
                 return Ok(());
             }