From e20e1c16a4821830c7045ec6f5f5a1e57184ade9 Mon Sep 17 00:00:00 2001 From: cBournhonesque Date: Tue, 14 May 2024 10:45:37 -0400 Subject: [PATCH 1/4] fix wasm --- examples/common/Cargo.toml | 7 +-- examples/common/src/settings.rs | 2 - lightyear/src/client/io/config.rs | 2 +- lightyear/src/client/io/mod.rs | 2 +- lightyear/src/connection/netcode/server.rs | 4 +- lightyear/src/server/io/config.rs | 4 +- lightyear/src/server/io/mod.rs | 2 +- lightyear/src/server/io/transport.rs | 3 +- lightyear/src/transport/dummy.rs | 1 - lightyear/src/transport/error.rs | 8 +++ lightyear/src/transport/local.rs | 1 - lightyear/src/transport/mod.rs | 3 -- lightyear/src/transport/udp.rs | 1 + .../src/transport/websocket/client_wasm.rs | 4 +- .../src/transport/webtransport/client_wasm.rs | 51 ++++++++++--------- 15 files changed, 49 insertions(+), 46 deletions(-) diff --git a/examples/common/Cargo.toml b/examples/common/Cargo.toml index 7e19b26d2..701469c8a 100644 --- a/examples/common/Cargo.toml +++ b/examples/common/Cargo.toml @@ -6,9 +6,9 @@ description = "Common harness for the lightyear examples" [dependencies] lightyear = { path = "../../lightyear", features = [ - "steam", - "webtransport", - "websocket", + "steam", + "webtransport", + "websocket", ] } # utils @@ -17,6 +17,7 @@ async-compat = "0.2.3" cfg-if = "1.0.0" clap = { version = "4.5.4", features = ["derive"] } crossbeam-channel = "0.5.12" +rand = "0.8.5" serde = { version = "1.0.201", features = ["derive"] } diff --git a/examples/common/src/settings.rs b/examples/common/src/settings.rs index f4b353f5c..73cd9ef57 100644 --- a/examples/common/src/settings.rs +++ b/examples/common/src/settings.rs @@ -2,10 +2,8 @@ #![allow(unused_variables)] use std::net::{Ipv4Addr, SocketAddr}; -use async_compat::Compat; use bevy::asset::ron; use bevy::prelude::Resource; -use bevy::tasks::IoTaskPool; use bevy::utils::Duration; use serde::de::DeserializeOwned; use serde::{Deserialize, Serialize}; diff --git a/lightyear/src/client/io/config.rs b/lightyear/src/client/io/config.rs index fba460855..1f8ed21cf 100644 --- a/lightyear/src/client/io/config.rs +++ b/lightyear/src/client/io/config.rs @@ -72,7 +72,7 @@ impl ClientTransport { client_addr, server_addr, certificate_digest, - } => TransportBuilderEnum::WebTransportClient(WebTransportClientSocketBuilder { + } => ClientTransportBuilderEnum::WebTransportClient(WebTransportClientSocketBuilder { client_addr, server_addr, certificate_digest, diff --git a/lightyear/src/client/io/mod.rs b/lightyear/src/client/io/mod.rs index e1101281b..47501b171 100644 --- a/lightyear/src/client/io/mod.rs +++ b/lightyear/src/client/io/mod.rs @@ -22,7 +22,7 @@ impl Io { self.state = IoState::Disconnected; if let Some(event_sender) = self.context.event_sender.as_mut() { event_sender - .send_blocking(ClientIoEvent::Disconnected( + .try_send(ClientIoEvent::Disconnected( std::io::Error::other("client requested disconnection").into(), )) .map_err(Error::from)?; diff --git a/lightyear/src/connection/netcode/server.rs b/lightyear/src/connection/netcode/server.rs index 839224c24..cb5e729a3 100644 --- a/lightyear/src/connection/netcode/server.rs +++ b/lightyear/src/connection/netcode/server.rs @@ -1016,7 +1016,7 @@ impl NetServer for Server { if let Some(mut io) = self.io.take() { if let Some(sender) = &mut self.server.cfg.context.sender { sender - .send_blocking(ServerIoEvent::ServerDisconnected( + .try_send(ServerIoEvent::ServerDisconnected( crate::transport::error::Error::UserRequest, )) .context("Could not send 'ServerStopped' event to io")?; @@ -1108,7 +1108,7 @@ impl Server { if let Some(sender) = &mut ctx.sender { debug!("Notify the io that client {id:?} got disconnected, so that we can stop the corresponding task"); let _ = sender - .send_blocking(ServerIoEvent::ClientDisconnected(addr)) + .try_send(ServerIoEvent::ClientDisconnected(addr)) .inspect_err(|e| { error!("Error sending 'ClientDisconnected' event to io: {:?}", e) }); diff --git a/lightyear/src/server/io/config.rs b/lightyear/src/server/io/config.rs index 1e742b2fb..798c48a4c 100644 --- a/lightyear/src/server/io/config.rs +++ b/lightyear/src/server/io/config.rs @@ -13,6 +13,7 @@ use crate::transport::middleware::conditioner::LinkConditioner; use crate::transport::middleware::{PacketReceiverWrapper, PacketSenderWrapper}; #[cfg(not(target_family = "wasm"))] use crate::transport::udp::UdpSocketBuilder; +use crate::transport::udp::UdpSocketBuilder; #[cfg(all(feature = "websocket", not(target_family = "wasm")))] use crate::transport::websocket::server::WebSocketServerSocketBuilder; #[cfg(all(feature = "webtransport", not(target_family = "wasm")))] @@ -28,7 +29,6 @@ use wtransport::Identity; #[derive(Debug, TypePath)] pub enum ServerTransport { /// Use a [`UdpSocket`](std::net::UdpSocket) - #[cfg(not(target_family = "wasm"))] UdpSocket(SocketAddr), /// Use [`WebTransport`](https://wicg.github.io/web-transport/) as a transport layer #[cfg(all(feature = "webtransport", not(target_family = "wasm")))] @@ -58,7 +58,6 @@ impl Clone for ServerTransport { #[inline] fn clone(&self) -> ServerTransport { match self { - #[cfg(not(target_family = "wasm"))] ServerTransport::UdpSocket(__self_0) => { ServerTransport::UdpSocket(Clone::clone(__self_0)) } @@ -87,7 +86,6 @@ impl Clone for ServerTransport { impl ServerTransport { fn build(self) -> ServerTransportBuilderEnum { match self { - #[cfg(not(target_family = "wasm"))] ServerTransport::UdpSocket(addr) => { ServerTransportBuilderEnum::UdpSocket(UdpSocketBuilder { local_addr: addr }) } diff --git a/lightyear/src/server/io/mod.rs b/lightyear/src/server/io/mod.rs index ec519a5c9..a3d93fecc 100644 --- a/lightyear/src/server/io/mod.rs +++ b/lightyear/src/server/io/mod.rs @@ -23,7 +23,7 @@ impl Io { self.state = IoState::Disconnected; if let Some(event_sender) = self.context.event_sender.as_mut() { event_sender - .send_blocking(ServerIoEvent::ServerDisconnected( + .try_send(ServerIoEvent::ServerDisconnected( std::io::Error::other("server requested disconnection").into(), )) .map_err(Error::from)?; diff --git a/lightyear/src/server/io/transport.rs b/lightyear/src/server/io/transport.rs index 0417672c7..cba92aaa9 100644 --- a/lightyear/src/server/io/transport.rs +++ b/lightyear/src/server/io/transport.rs @@ -5,6 +5,7 @@ use crate::transport::error::Result; use crate::transport::io::IoState; #[cfg(not(target_family = "wasm"))] use crate::transport::udp::{UdpSocket, UdpSocketBuilder}; +use crate::transport::udp::{UdpSocket, UdpSocketBuilder}; #[cfg(all(feature = "websocket", not(target_family = "wasm")))] use crate::transport::websocket::server::{WebSocketServerSocket, WebSocketServerSocketBuilder}; #[cfg(all(feature = "webtransport", not(target_family = "wasm")))] @@ -29,7 +30,6 @@ pub(crate) trait ServerTransportBuilder: Send + Sync { #[enum_dispatch(ServerTransportBuilder)] pub(crate) enum ServerTransportBuilderEnum { - #[cfg(not(target_family = "wasm"))] UdpSocket(UdpSocketBuilder), #[cfg(all(feature = "webtransport", not(target_family = "wasm")))] WebTransportServer(WebTransportServerSocketBuilder), @@ -42,7 +42,6 @@ pub(crate) enum ServerTransportBuilderEnum { #[allow(clippy::large_enum_variant)] #[enum_dispatch(Transport)] pub(crate) enum ServerTransportEnum { - #[cfg(not(target_family = "wasm"))] UdpSocket(UdpSocket), #[cfg(all(feature = "webtransport", not(target_family = "wasm")))] WebTransportServer(WebTransportServerSocket), diff --git a/lightyear/src/transport/dummy.rs b/lightyear/src/transport/dummy.rs index 1d88df686..9462553d8 100644 --- a/lightyear/src/transport/dummy.rs +++ b/lightyear/src/transport/dummy.rs @@ -4,7 +4,6 @@ use crate::client::io::{ClientIoEventReceiver, ClientNetworkEventSender}; use crate::server::io::transport::{ServerTransportBuilder, ServerTransportEnum}; use crate::server::io::{ServerIoEventReceiver, ServerNetworkEventSender}; use crate::transport::io::IoState; -use crate::transport::udp::{UdpSocket, UdpSocketBuffer, UdpSocketBuilder}; use crate::transport::{ BoxedReceiver, BoxedSender, PacketReceiver, PacketSender, Transport, LOCAL_SOCKET, MTU, }; diff --git a/lightyear/src/transport/error.rs b/lightyear/src/transport/error.rs index 0e697ff57..71c7d3414 100644 --- a/lightyear/src/transport/error.rs +++ b/lightyear/src/transport/error.rs @@ -26,6 +26,14 @@ impl ::core::convert::From> for Error { } } +#[allow(unused_qualifications)] +impl ::core::convert::From> for Error { + #[allow(deprecated)] + fn from(source: async_channel::TrySendError) -> Self { + Error::Channel(source.to_string()) + } +} + #[allow(unused_qualifications)] impl ::core::convert::From> for Error { #[allow(deprecated)] diff --git a/lightyear/src/transport/local.rs b/lightyear/src/transport/local.rs index 5785398e9..eefd26c20 100644 --- a/lightyear/src/transport/local.rs +++ b/lightyear/src/transport/local.rs @@ -9,7 +9,6 @@ use crate::client::io::{ClientIoEventReceiver, ClientNetworkEventSender}; use crate::server::io::transport::{ServerTransportBuilder, ServerTransportEnum}; use crate::server::io::{ServerIoEventReceiver, ServerNetworkEventSender}; use crate::transport::io::IoState; -use crate::transport::udp::UdpSocketBuilder; use crate::transport::{ BoxedReceiver, BoxedSender, PacketReceiver, PacketSender, Transport, LOCAL_SOCKET, }; diff --git a/lightyear/src/transport/mod.rs b/lightyear/src/transport/mod.rs index 611d14c64..c3948d9f7 100644 --- a/lightyear/src/transport/mod.rs +++ b/lightyear/src/transport/mod.rs @@ -13,7 +13,6 @@ use crate::transport::channels::Channels; use crate::transport::dummy::DummyIo; use crate::transport::io::IoState; use crate::transport::local::{LocalChannel, LocalChannelBuilder}; -#[cfg(not(target_family = "wasm"))] use crate::transport::udp::{UdpSocket, UdpSocketBuilder}; #[cfg(feature = "websocket")] use crate::transport::websocket::client::{WebSocketClientSocket, WebSocketClientSocketBuilder}; @@ -35,8 +34,6 @@ pub mod io; pub(crate) mod local; /// The transport is a UDP socket -#[cfg_attr(docsrs, doc(cfg(not(target_family = "wasm"))))] -#[cfg(not(target_family = "wasm"))] pub(crate) mod udp; /// The transport is a map of channels (used for server, during testing) diff --git a/lightyear/src/transport/udp.rs b/lightyear/src/transport/udp.rs index fd35893d0..500edf050 100644 --- a/lightyear/src/transport/udp.rs +++ b/lightyear/src/transport/udp.rs @@ -36,6 +36,7 @@ impl UdpSocketBuilder { } } +#[cfg(not(target_family = "wasm"))] impl ClientTransportBuilder for UdpSocketBuilder { fn connect( self, diff --git a/lightyear/src/transport/websocket/client_wasm.rs b/lightyear/src/transport/websocket/client_wasm.rs index 7720d533c..1069df6bd 100644 --- a/lightyear/src/transport/websocket/client_wasm.rs +++ b/lightyear/src/transport/websocket/client_wasm.rs @@ -40,7 +40,7 @@ impl ClientTransportBuilder for WebSocketClientSocketBuilder { )> { let (serverbound_tx, serverbound_rx) = unbounded_channel::>(); let (clientbound_tx, clientbound_rx) = unbounded_channel::>(); - let (close_tx, mut close_rx) = crossbeam_channel::bounded(1); + let (close_tx, close_rx) = async_channel::bounded(1); let sender = WebSocketClientSocketSender { serverbound_tx }; @@ -97,7 +97,7 @@ impl ClientTransportBuilder for WebSocketClientSocketBuilder { let ws_clone = ws.clone(); let listen_close_signal_callback = Closure::::once(move || { IoTaskPool::get().spawn_local(async move { - close_rx.recv().await; + let _ = close_rx.recv().await; info!("Close websocket connection"); ws_clone.close().unwrap(); }); diff --git a/lightyear/src/transport/webtransport/client_wasm.rs b/lightyear/src/transport/webtransport/client_wasm.rs index 24a9d2e57..2092f32e4 100644 --- a/lightyear/src/transport/webtransport/client_wasm.rs +++ b/lightyear/src/transport/webtransport/client_wasm.rs @@ -12,7 +12,7 @@ use tracing::{debug, error, info, trace}; use xwt_core::prelude::*; use crate::client::io::transport::{ClientTransportBuilder, ClientTransportEnum}; -use crate::client::io::{ClientIoEventReceiver, ClientNetworkEventSender}; +use crate::client::io::{ClientIoEvent, ClientIoEventReceiver, ClientNetworkEventSender}; use crate::server::io::transport::{ServerTransportBuilder, ServerTransportEnum}; use crate::server::io::{ServerIoEventReceiver, ServerNetworkEventSender}; use crate::transport::error::{Error, Result}; @@ -38,7 +38,7 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { let (to_server_sender, mut to_server_receiver) = mpsc::unbounded_channel(); let (from_server_sender, from_server_receiver) = mpsc::unbounded_channel(); // channels used to cancel the task - let (close_tx, mut close_rx) = crossbeam_channel::bounded(1); + let (close_tx, close_rx) = async_channel::bounded(1); // channels used to check the status of the io task let (status_tx, status_rx) = async_channel::bounded(1); @@ -62,14 +62,15 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { let (send, recv) = tokio::sync::oneshot::channel(); let (send2, recv2) = tokio::sync::oneshot::channel(); let (send3, recv3) = tokio::sync::oneshot::channel(); - IoTaskPool::get().spawn_local(async move { + let status_tx_clone = status_tx.clone(); + wasm_bindgen_futures::spawn_local(async move { info!("Starting webtransport io thread"); let connecting = match endpoint.connect(&server_url).await { Ok(e) => e, Err(e) => { error!("Error creating webtransport connection: {:?}", e); - status_tx + status_tx_clone .send(ClientIoEvent::Disconnected( std::io::Error::other("error creating webtransport connection").into(), )) @@ -82,7 +83,7 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { Ok(c) => c, Err(e) => { error!("Error connecting to server: {:?}", e); - status_tx + status_tx_clone .send(ClientIoEvent::Disconnected( std::io::Error::other( "error connecting webtransport endpoint to server", @@ -95,7 +96,10 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { } }; // signal that the io is connected - status_tx.send(ClientIoEvent::Connected).await.unwrap(); + status_tx_clone + .send(ClientIoEvent::Connected) + .await + .unwrap(); let connection = Rc::new(connection); send.send(connection.clone()).unwrap(); send2.send(connection.clone()).unwrap(); @@ -109,7 +113,7 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { // to poll the existing one. This is FAULTY behaviour // - if you want to use tokio::Select, you have to first pin the Future, and then select on &mut Future. Only the reference gets // cancelled - IoTaskPool::get().spawn(async move { + wasm_bindgen_futures::spawn_local(async move { let Ok(connection) = recv.await else { return; }; @@ -130,7 +134,7 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { } } }); - IoTaskPool::get().spawn(async move { + wasm_bindgen_futures::spawn_local(async move { let Ok(connection) = recv2.await else { return; }; @@ -148,23 +152,22 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder { } } }); - IoTaskPool::get() - .spawn(async move { - let Ok(connection) = recv3.await else { - return; - }; - // Wait for a close signal from the close channel, or for the quic connection to be closed - tokio::select! { - reason = wasm_bindgen_futures::JsFuture::from(connection.transport.closed()) => { - info!("WebTransport connection closed. Reason: {reason:?}") - status_tx.send(ClientIoEvent::Disconnected(std::io::Error::other(format!("Error: {:?}", reason)).into())).await.unwrap(); - }, - _ = close_rx.recv() => { - connection.transport.close(); - info!("WebTransport connection closed. Reason: client requested disconnection."); - } + wasm_bindgen_futures::spawn_local(async move { + let Ok(connection) = recv3.await else { + return; + }; + // Wait for a close signal from the close channel, or for the quic connection to be closed + tokio::select! { + reason = wasm_bindgen_futures::JsFuture::from(connection.transport.closed()) => { + info!("WebTransport connection closed. Reason: {reason:?}"); + status_tx.send(ClientIoEvent::Disconnected(std::io::Error::other(format!("Error: {:?}", reason)).into())).await.unwrap(); + }, + _ = close_rx.recv() => { + connection.transport.close(); + info!("WebTransport connection closed. Reason: client requested disconnection."); } - }); + } + }); let sender = WebTransportClientPacketSender { to_server_sender }; let receiver = WebTransportClientPacketReceiver { From 359de5118cc14422c02f23240921148b7cd664a6 Mon Sep 17 00:00:00 2001 From: cBournhonesque Date: Tue, 14 May 2024 10:56:05 -0400 Subject: [PATCH 2/4] more fixes --- examples/common/src/settings.rs | 5 +++++ lightyear/src/server/io/config.rs | 2 -- lightyear/src/server/io/transport.rs | 2 -- lightyear/src/transport/websocket/client_wasm.rs | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/common/src/settings.rs b/examples/common/src/settings.rs index 73cd9ef57..5bda25c3f 100644 --- a/examples/common/src/settings.rs +++ b/examples/common/src/settings.rs @@ -8,6 +8,11 @@ use bevy::utils::Duration; use serde::de::DeserializeOwned; use serde::{Deserialize, Serialize}; +#[cfg(not(target_family = "wasm"))] +use async_compat::Compat; +#[cfg(not(target_family = "wasm"))] +use bevy::tasks::IoTaskPool; + use lightyear::prelude::client::Authentication; #[cfg(not(target_family = "wasm"))] use lightyear::prelude::client::SteamConfig; diff --git a/lightyear/src/server/io/config.rs b/lightyear/src/server/io/config.rs index 798c48a4c..136a90438 100644 --- a/lightyear/src/server/io/config.rs +++ b/lightyear/src/server/io/config.rs @@ -11,8 +11,6 @@ use crate::transport::middleware::compression::zstd::compression::ZstdCompressor use crate::transport::middleware::compression::zstd::decompression::ZstdDecompressor; use crate::transport::middleware::conditioner::LinkConditioner; use crate::transport::middleware::{PacketReceiverWrapper, PacketSenderWrapper}; -#[cfg(not(target_family = "wasm"))] -use crate::transport::udp::UdpSocketBuilder; use crate::transport::udp::UdpSocketBuilder; #[cfg(all(feature = "websocket", not(target_family = "wasm")))] use crate::transport::websocket::server::WebSocketServerSocketBuilder; diff --git a/lightyear/src/server/io/transport.rs b/lightyear/src/server/io/transport.rs index cba92aaa9..1b6b976d0 100644 --- a/lightyear/src/server/io/transport.rs +++ b/lightyear/src/server/io/transport.rs @@ -3,8 +3,6 @@ use crate::transport::channels::Channels; use crate::transport::dummy::DummyIo; use crate::transport::error::Result; use crate::transport::io::IoState; -#[cfg(not(target_family = "wasm"))] -use crate::transport::udp::{UdpSocket, UdpSocketBuilder}; use crate::transport::udp::{UdpSocket, UdpSocketBuilder}; #[cfg(all(feature = "websocket", not(target_family = "wasm")))] use crate::transport::websocket::server::{WebSocketServerSocket, WebSocketServerSocketBuilder}; diff --git a/lightyear/src/transport/websocket/client_wasm.rs b/lightyear/src/transport/websocket/client_wasm.rs index 1069df6bd..2c5efc317 100644 --- a/lightyear/src/transport/websocket/client_wasm.rs +++ b/lightyear/src/transport/websocket/client_wasm.rs @@ -83,7 +83,7 @@ impl ClientTransportBuilder for WebSocketClientSocketBuilder { let on_open_callback = Closure::::once(move || { info!("WebSocket handshake has been successfully completed"); let serverbound_rx = serverbound_rx.clone(); - IoTaskPool::get().spawn_local(async move { + wasm_bindgen_futures::spawn_local(async move { while let Some(msg) = serverbound_rx.lock().await.recv().await { if ws_clone.ready_state() != 1 { warn!("Tried to send packet through closed websocket connection"); @@ -96,7 +96,7 @@ impl ClientTransportBuilder for WebSocketClientSocketBuilder { let ws_clone = ws.clone(); let listen_close_signal_callback = Closure::::once(move || { - IoTaskPool::get().spawn_local(async move { + wasm_bindgen_futures::spawn_local(async move { let _ = close_rx.recv().await; info!("Close websocket connection"); ws_clone.close().unwrap(); From 30fe00a204bdff1f96cb9c04db9a664359a515b6 Mon Sep 17 00:00:00 2001 From: cBournhonesque Date: Tue, 14 May 2024 11:03:03 -0400 Subject: [PATCH 3/4] update wasm index.html files --- examples/auth/index.html | 1 + examples/bullet_prespawn/index.html | 1 + examples/client_replication/index.html | 1 + examples/interest_management/index.html | 1 + examples/leafwing_inputs/index.html | 1 + examples/lobby/index.html | 1 + examples/priority/index.html | 1 + examples/replication_groups/index.html | 1 + examples/simple_box/assets/settings.ron | 12 ++++++------ examples/simple_box/index.html | 1 + 10 files changed, 15 insertions(+), 6 deletions(-) diff --git a/examples/auth/index.html b/examples/auth/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/auth/index.html +++ b/examples/auth/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/bullet_prespawn/index.html b/examples/bullet_prespawn/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/bullet_prespawn/index.html +++ b/examples/bullet_prespawn/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/client_replication/index.html b/examples/client_replication/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/client_replication/index.html +++ b/examples/client_replication/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/interest_management/index.html b/examples/interest_management/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/interest_management/index.html +++ b/examples/interest_management/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/leafwing_inputs/index.html b/examples/leafwing_inputs/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/leafwing_inputs/index.html +++ b/examples/leafwing_inputs/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/lobby/index.html b/examples/lobby/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/lobby/index.html +++ b/examples/lobby/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/priority/index.html b/examples/priority/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/priority/index.html +++ b/examples/priority/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/replication_groups/index.html b/examples/replication_groups/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/replication_groups/index.html +++ b/examples/replication_groups/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file diff --git a/examples/simple_box/assets/settings.ron b/examples/simple_box/assets/settings.ron index 3c9e9a630..21e5ac017 100644 --- a/examples/simple_box/assets/settings.ron +++ b/examples/simple_box/assets/settings.ron @@ -9,16 +9,16 @@ Settings( jitter_ms: 20, packet_loss: 0.05 )), - server_port: 5000, - transport: WebTransport( + // server_port: 5000, + // transport: WebTransport( // this is only needed for wasm, the self-signed certificates are only valid for 2 weeks // the server will print the certificate digest on startup - certificate_digest: "24:48:ea:6f:13:a4:4f:2f:42:b9:f3:71:3f:79:c5:7a:d1:1d:29:ab:de:b0:03:4d:94:92:7b:84:69:01:85:1d", - ), + // certificate_digest: "24:48:ea:6f:13:a4:4f:2f:42:b9:f3:71:3f:79:c5:7a:d1:1d:29:ab:de:b0:03:4d:94:92:7b:84:69:01:85:1d", + // ), // server_port: 5001, // transport: Udp, - // server_port: 5002, - // transport: WebSocket, + server_port: 5002, + transport: WebSocket, // server_port: 5003, // transport: Steam( // app_id: 480, diff --git a/examples/simple_box/index.html b/examples/simple_box/index.html index 5d79e3838..1c08d6101 100644 --- a/examples/simple_box/index.html +++ b/examples/simple_box/index.html @@ -4,5 +4,6 @@ Bevy game + \ No newline at end of file From b8743ae4cdcbfbfe87f6a2f08c1df72f676bb429 Mon Sep 17 00:00:00 2001 From: cBournhonesque Date: Tue, 14 May 2024 16:37:29 -0400 Subject: [PATCH 4/4] fix --- examples/simple_box/assets/settings.ron | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/simple_box/assets/settings.ron b/examples/simple_box/assets/settings.ron index 21e5ac017..3c9e9a630 100644 --- a/examples/simple_box/assets/settings.ron +++ b/examples/simple_box/assets/settings.ron @@ -9,16 +9,16 @@ Settings( jitter_ms: 20, packet_loss: 0.05 )), - // server_port: 5000, - // transport: WebTransport( + server_port: 5000, + transport: WebTransport( // this is only needed for wasm, the self-signed certificates are only valid for 2 weeks // the server will print the certificate digest on startup - // certificate_digest: "24:48:ea:6f:13:a4:4f:2f:42:b9:f3:71:3f:79:c5:7a:d1:1d:29:ab:de:b0:03:4d:94:92:7b:84:69:01:85:1d", - // ), + certificate_digest: "24:48:ea:6f:13:a4:4f:2f:42:b9:f3:71:3f:79:c5:7a:d1:1d:29:ab:de:b0:03:4d:94:92:7b:84:69:01:85:1d", + ), // server_port: 5001, // transport: Udp, - server_port: 5002, - transport: WebSocket, + // server_port: 5002, + // transport: WebSocket, // server_port: 5003, // transport: Steam( // app_id: 480,