aeronet working?

Cargo.toml

@@ -38,4 +38,3 @@ lto = true
 [profile.wasm-release]
 inherits = "release"
 opt-level = 'z'
-codegen-units = 1

unavi-app/Cargo.toml

@@ -9,7 +9,15 @@ edition.workspace = true
 workspace = true
 
 [dependencies]
+aeronet = { version = "0.3.0", features = ["bevy"] }
+aeronet_wt_core = "0.3.0"
+aeronet_wt_native = { version = "0.3.0", features = ["bevy"] }
+anyhow = "1.0.75"
 bevy = "0.12.0"
 bevy_rapier3d = { version = "0.23.0", features = ["simd-stable"] }
 bevy_vrm = "0.0.5"
+serde = { version = "1.0.193", features = ["derive"] }
+tokio = { version = "1.34.0", features = ["full"] }
+tracing = "0.1.40"
 wired-protocol = { path = "../wired-protocol" }
+wtransport = "0.1.8"

unavi-app/examples/demo.rs

@@ -2,16 +2,33 @@ use std::f32::consts::PI;
 
 use bevy::{prelude::*, render::mesh::VertexAttributeValues};
 use bevy_rapier3d::prelude::{Real, *};
+use unavi_app::networking::JoinWorld;
 
 fn main() {
     unavi_app::App::new()
         .add_plugins(unavi_app::UnaviPlugin {
             file_path: "../assets".to_string(),
+            log_level: tracing::Level::DEBUG,
         })
         .add_systems(Startup, setup_world)
+        .add_systems(Update, join_world)
         .run();
 }
 
+fn join_world(mut joined: Local<bool>, time: Res<Time>, mut writer: EventWriter<JoinWorld>) {
+    if *joined {
+        return;
+    }
+
+    if time.elapsed_seconds() < 1.0 {
+        return;
+    }
+
+    *joined = true;
+
+    writer.send(JoinWorld { world_id: 4 });
+}
+
 const GROUND_SIZE: f32 = 40.0;
 const GROUND_THICKNESS: f32 = 0.01;
 

unavi-app/src/lib.rs

@@ -1,21 +1,24 @@
-use bevy::prelude::*;
+use bevy::{log::LogPlugin, prelude::*};
 use bevy_rapier3d::prelude::*;
 
-mod avatar;
-mod player;
-mod settings;
-mod world;
+pub mod avatar;
+pub mod networking;
+pub mod player;
+pub mod settings;
+pub mod world;
 
 pub use bevy::app::App;
 
 pub struct UnaviPlugin {
     pub file_path: String,
+    pub log_level: tracing::Level,
 }
 
 impl Default for UnaviPlugin {
     fn default() -> Self {
         Self {
             file_path: "assets".to_string(),
+            log_level: tracing::Level::INFO,
         }
     }
 }
@@ -34,13 +37,18 @@ impl Plugin for UnaviPlugin {
                 .set(AssetPlugin {
                     file_path: self.file_path.clone(),
                     ..default()
+                })
+                .set(LogPlugin {
+                    level: self.log_level,
+                    ..default()
                 }),
             RapierPhysicsPlugin::<NoUserData>::default(),
             RapierDebugRenderPlugin::default(),
             avatar::AvatarPlugin,
-            world::WorldPlugin,
-            settings::SettingsPlugin,
+            networking::NetworkingPlugin,
             player::PlayerPlugin,
+            settings::SettingsPlugin,
+            world::WorldPlugin,
             // bevy::diagnostic::LogDiagnosticsPlugin::default(),
             // bevy::diagnostic::FrameTimeDiagnosticsPlugin::default(),
         ));

unavi-app/src/networking/mod.rs

@@ -0,0 +1,82 @@
+use aeronet::{AsyncRuntime, ClientTransportPlugin, TryFromBytes, TryIntoBytes};
+use aeronet_wt_native::{Channels, OnChannel, WebTransportClient};
+use anyhow::Result;
+use bevy::prelude::*;
+use std::time::Duration;
+use wtransport::ClientConfig;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Channels)]
+#[channel_kind(Datagram)]
+struct AppChannel;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, OnChannel)]
+#[channel_type(AppChannel)]
+#[on_channel(AppChannel)]
+struct AppMessage(String);
+
+impl TryFromBytes for AppMessage {
+    fn try_from_bytes(buf: &[u8]) -> Result<Self> {
+        String::from_utf8(buf.to_vec())
+            .map(AppMessage)
+            .map_err(Into::into)
+    }
+}
+
+impl TryIntoBytes for AppMessage {
+    fn try_into_bytes(self) -> Result<Vec<u8>> {
+        Ok(self.0.into_bytes())
+    }
+}
+
+type Client = WebTransportClient<AppMessage, AppMessage, AppChannel>;
+
+pub struct NetworkingPlugin;
+
+impl Plugin for NetworkingPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(ClientTransportPlugin::<_, _, Client>::default())
+            .init_resource::<AsyncRuntime>()
+            .add_event::<JoinWorld>()
+            .add_systems(Startup, setup)
+            .add_systems(Update, join_world);
+    }
+}
+
+fn setup(mut commands: Commands, rt: Res<AsyncRuntime>) {
+    match create(&rt) {
+        Ok(client) => {
+            commands.insert_resource(client);
+        }
+        Err(err) => panic!("Failed to create server: {err:#}"),
+    }
+}
+
+fn create(rt: &AsyncRuntime) -> Result<Client> {
+    let config = ClientConfig::builder()
+        .with_bind_default()
+        .with_no_cert_validation()
+        .keep_alive_interval(Some(Duration::from_secs(5)))
+        .build();
+
+    let (front, back) = aeronet_wt_native::create_client(config);
+
+    rt.0.spawn(async move {
+        back.start().await.unwrap();
+    });
+
+    Ok(front)
+}
+
+#[derive(Event)]
+pub struct JoinWorld {
+    pub world_id: u32,
+}
+
+fn join_world(mut events: EventReader<JoinWorld>, client: Res<Client>) {
+    for event in events.read() {
+        info!("Joining world {}", event.world_id);
+
+        let url = "https://localhost:4433";
+        client.connect(url);
+    }
+}

unavi-native/src/main.rs

@@ -4,6 +4,7 @@ fn main() {
     unavi_app::App::new()
         .add_plugins(unavi_app::UnaviPlugin {
             file_path: "../assets".to_string(),
+            ..Default::default()
         })
         .run();
 }

unavi-server/Cargo.toml

@@ -16,13 +16,18 @@ web = [
   "dep:unavi-web-app"
 ]
 world = [
+  "dep:aeronet",
+  "dep:aeronet_wt_core",
+  "dep:aeronet_wt_native",
+  "dep:bevy",
   "dep:rcgen",
   "dep:rustls",
   "dep:time",
   "dep:wtransport"
 ]
 
 [dependencies]
+anyhow = "1.0.75"
 axum = "0.6.20"
 tokio = { version = "1.33.0", features = ["full"] }
 tower = "0.4.13"
@@ -34,6 +39,10 @@ leptos = { version = "0.5.1", features = ["ssr"], optional = true }
 leptos_axum = { version = "0.5.1", optional = true }
 unavi-web-app = { path = "../unavi-web/app", features = ["ssr"], optional = true }
 
+aeronet = { version = "0.3.0",  features = ["bevy"], optional = true }
+aeronet_wt_core = { version = "0.3.0", optional = true }
+aeronet_wt_native = { version = "0.3.0", features = ["bevy"], optional = true } 
+bevy = { version = "0.12.0", optional = true }
 rcgen = { version = "0.11.3", optional = true }
 rustls = { version = "0.21.9", optional = true }
 time = { version = "0.3.30", optional = true }

unavi-server/src/lib.rs

@@ -29,11 +29,13 @@ pub async fn start_server(opts: ServerOptions) -> Result<(), Box<dyn std::error:
 
     #[cfg(feature = "world")]
     tokio::spawn(async move {
+        let ca = world::cert::new_ca();
+
         if let Err(e) = world::start_server(world::WorldOptions {
             address: opts.address,
             cert_pair: world::CertPair {
-                cert: rustls::Certificate(world::cert::new_ca().serialize_der().unwrap()),
-                key: rustls::PrivateKey(world::cert::new_ca().serialize_private_key_der()),
+                cert: ca.serialize_der().unwrap(),
+                key: ca.serialize_private_key_der(),
             },
         })
         .await

unavi-server/src/main.rs

@@ -5,6 +5,7 @@ async fn main() {
     tracing_subscriber::fmt()
         .with_target(true)
         .with_level(true)
+        .with_max_level(tracing::Level::DEBUG)
         .init();
 
     info!("Features:");