fix: align window creation and channel usage

Author: JakkuSakura

Cargo.lock

@@ -76,6 +76,7 @@ dioxus-asset-resolver = { version = "0.7" }
 manganis = { version = "0.7" }
 dioxus-document = { version = "0.7" }
 dioxus-history = { version = "0.7" }
+futures-channel = "0.3"
 
 # Dioxus hot reload
 dioxus-devtools = { version = "0.7" }

Cargo.toml

@@ -35,7 +35,7 @@ fn app() -> Element {
                         let attributes = WindowAttributes::default()
                             .with_title(title)
                             .with_inner_size(winit::dpi::LogicalSize::new(400.0, 300.0));
-                        let receiver = provider.create_document_window(vdom, attributes);
+                        let receiver = provider.new_window(vdom, attributes);
                         let mut spawned_windows = spawned_windows;
                         spawn(async move {
                             if let Ok((window_id, window)) = receiver.await {

examples/multi_window.rs

@@ -38,7 +38,7 @@ vello-cpu-base = ["alt-renderer", "dep:anyrender_vello_cpu"]
 alt-renderer = []
 
 # Other features
-net = ["dep:blitz-net"]
+net = ["dep:blitz-net", "dep:tokio"]
 html = ["dep:blitz-html"]
 
 # Dev
@@ -95,7 +95,8 @@ winit = { workspace = true }
 keyboard-types = { workspace = true }
 
 # Runtime + channels
-tokio = { workspace = true, features = ["rt-multi-thread", "sync"] }
+tokio = { workspace = true, features = ["rt-multi-thread"], optional = true }
+futures-channel = { workspace = true }
 webbrowser = { workspace = true }
 
 # Other dependencies

packages/dioxus-native/Cargo.toml

@@ -3,11 +3,12 @@ use blitz_shell::{BlitzApplication, View};
 use blitz_traits::{navigation::NavigationProvider, net::NetProvider};
 use dioxus_core::{provide_context, ScopeId};
 use dioxus_history::{History, MemoryHistory};
+use futures_channel::oneshot;
 use std::any::Any;
 use std::rc::Rc;
 use std::sync::Arc;
-use tokio::sync::oneshot;
 use winit::application::ApplicationHandler;
+
 use winit::event::{StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, EventLoopProxy};
 use winit::window::Window;
@@ -44,20 +45,29 @@ impl<T: ?Sized> OpaquePtr<T> {
 }
 
 #[doc(hidden)]
-pub struct UnsafeBox<T: ?Sized>(Box<T>);
+pub struct UnsafeBox<T: ?Sized> {
+    value: Box<T>,
+    owner: std::thread::ThreadId,
+}
 
-// Safety: this wrapper exists solely to satisfy the `Send + Sync` bound imposed by the embedder
-// event channel. The payloads are only ever created and consumed on the event loop thread.
 unsafe impl<T: ?Sized> Send for UnsafeBox<T> {}
 unsafe impl<T: ?Sized> Sync for UnsafeBox<T> {}
 
 impl<T: ?Sized> UnsafeBox<T> {
     pub fn new(value: Box<T>) -> Self {
-        Self(value)
+        Self {
+            value,
+            owner: std::thread::current().id(),
+        }
     }
 
     pub fn into_inner(self) -> Box<T> {
-        self.0
+        assert_eq!(
+            self.owner,
+            std::thread::current().id(),
+            "UnsafeBox accessed from a different thread",
+        );
+        self.value
     }
 }
 
@@ -142,6 +152,14 @@ impl DioxusNativeProvider {
         receiver
     }
 
+    pub fn new_window(
+        &self,
+        vdom: dioxus_core::VirtualDom,
+        attributes: winit::window::WindowAttributes,
+    ) -> oneshot::Receiver<(WindowId, Arc<Window>)> {
+        self.create_document_window(vdom, attributes)
+    }
+
     pub fn get_window(&self, window_id: WindowId) -> oneshot::Receiver<Option<Arc<Window>>> {
         let (sender, receiver) = oneshot::channel();
         let reply = UnsafeBox::new(Box::new(sender));
@@ -207,7 +225,7 @@ impl DioxusNativeApplication {
             provide_context(shared);
         });
 
-        let shell_provider = doc.as_ref().shell_provider.clone();
+        let shell_provider = doc.inner.borrow().shell_provider.clone();
         doc.vdom
             .in_scope(ScopeId::ROOT, move || provide_context(shell_provider));
 
@@ -287,7 +305,7 @@ impl DioxusNativeApplication {
                         // Reload changed assets
                         for asset_path in &hotreload_message.assets {
                             if let Some(url) = asset_path.to_str() {
-                                doc.reload_resource_by_href(url);
+                                doc.inner.borrow_mut().reload_resource_by_href(url);
                             }
                         }