fix: more Windows shite

Author: JSKitty

src-tauri/src/lib.rs

@@ -4911,8 +4911,8 @@ pub fn run() {
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_notification::init())
         .plugin(tauri_plugin_deep_link::init())
-        // Register the webxdc:// custom protocol for Mini Apps
-        .register_uri_scheme_protocol("webxdc", miniapps::scheme::miniapp_protocol)
+        // Register the webxdc:// custom protocol for Mini Apps (async to avoid deadlocks on Windows)
+        .register_asynchronous_uri_scheme_protocol("webxdc", miniapps::scheme::miniapp_protocol)
         // Register Mini Apps state
         .manage(miniapps::state::MiniAppsState::new());
 

src-tauri/src/miniapps/commands.rs

@@ -163,7 +163,9 @@ fn get_chromium_hardening_browser_args(dummy_proxy_url: &url::Url) -> String {
     // These are default parameters from Tauri's wry
     let default_tauri_browser_args = "--disable-features=msWebOOUI,msPdfOOUI,msSmartScreenProtection --enable-features=RemoveRedirectionBitmap";
 
-    // The `~NOTFOUND` string blocks DNS resolution
+    // The `~NOTFOUND` string blocks DNS resolution.
+    // Note: webxdc.localhost requests are intercepted by Tauri's custom protocol
+    // handler BEFORE the Chromium network stack, so no EXCLUDE is needed.
     let host_rules = "MAP * ~NOTFOUND";
 
     // `host-resolver-rules` and `host-rules` primarily block DNS prefetching

src-tauri/src/miniapps/scheme.rs

@@ -7,7 +7,7 @@ use std::borrow::Cow;
 use std::collections::HashMap;
 use tauri::{
     utils::config::{Csp, CspDirectiveSources},
-    Manager, UriSchemeContext,
+    Manager, UriSchemeContext, UriSchemeResponder,
 };
 use log::{error, trace};
 use nostr_sdk::prelude::ToBech32;
@@ -196,11 +196,13 @@ const PERMISSIONS_POLICY_DENY_ALL: &str = concat!(
     "window-placement=()",
 );
 
-/// Handle requests to the webxdc:// protocol (synchronous version for Tauri 2)
+/// Handle requests to the webxdc:// protocol (async version for Tauri 2)
+/// Uses UriSchemeResponder to avoid blocking the WebView thread on Windows
 pub fn miniapp_protocol<R: tauri::Runtime>(
     ctx: UriSchemeContext<'_, R>,
     request: http::Request<Vec<u8>>,
-) -> http::Response<Cow<'static, [u8]>> {
+    responder: UriSchemeResponder,
+) {
     trace!(
         "webxdc_protocol: {} {}",
         request.uri(),
@@ -218,28 +220,18 @@ pub fn miniapp_protocol<R: tauri::Runtime>(
         error!(
             "Prevented non-miniapp window from accessing webxdc:// scheme (webview label: {webview_label})"
         );
-        return make_error_response(http::StatusCode::FORBIDDEN, "Access denied");
+        responder.respond(make_error_response(http::StatusCode::FORBIDDEN, "Access denied"));
+        return;
     }
 
     let app_handle = ctx.app_handle().clone();
 
-    // On Windows, using block_on directly can cause a deadlock because the WebView2
-    // runs on the main thread. We spawn a new thread to run the async code and
-    // use a channel to get the result back.
-    // See: https://github.com/nicholasrice/tauri-v2-webview-deadlock
-    let (tx, rx) = std::sync::mpsc::channel();
-    
-    std::thread::spawn(move || {
-        let result = tauri::async_runtime::block_on(async move {
-            handle_miniapp_request(&app_handle, &webview_label, &request).await
-        });
-        let _ = tx.send(result);
+    // Spawn an async task to handle the request without blocking
+    // This is the pattern used by DeltaChat to avoid deadlocks on Windows
+    tauri::async_runtime::spawn(async move {
+        let response = handle_miniapp_request(&app_handle, &webview_label, &request).await;
+        responder.respond(response);
     });
-    
-    // Wait for the result from the spawned thread
-    rx.recv().unwrap_or_else(|_| {
-        make_error_response(http::StatusCode::INTERNAL_SERVER_ERROR, "Failed to handle request")
-    })
 }
 
 async fn handle_miniapp_request<R: tauri::Runtime>(