-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add signalling utils to
bevy_matchbox (#215)
* Move socket extensions to own module * Tidy socket docs * Make matchbox_signaling topologies public * Add bevy_matchbox signaling feature * Move task handles to components / resources * Feature gate bevy signaling server
- Loading branch information
Showing
9 changed files
with
368 additions
and
169 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| use std::net::SocketAddr; | ||
|
|
||
| use bevy::{ | ||
| ecs::system::Command, | ||
| prelude::{Commands, Resource}, | ||
| tasks::{IoTaskPool, Task}, | ||
| }; | ||
| pub use matchbox_signaling; | ||
| use matchbox_signaling::{ | ||
| topologies::{ | ||
| client_server::{ClientServer, ClientServerCallbacks, ClientServerState}, | ||
| full_mesh::{FullMesh, FullMeshCallbacks, FullMeshState}, | ||
| SignalingTopology, | ||
| }, | ||
| Error, SignalingCallbacks, SignalingServer, SignalingServerBuilder, SignalingState, | ||
| }; | ||
|
|
||
| /// A [`SignalingServer`] as a [`Resource`]. | ||
| /// | ||
| /// As a [`Resource`], with [`Commands`] | ||
| /// ``` | ||
| /// use std::net::Ipv4Addr; | ||
| /// use bevy_matchbox::{ | ||
| /// prelude::*, | ||
| /// matchbox_signaling::topologies::full_mesh::{FullMesh, FullMeshState} | ||
| /// }; | ||
| /// use bevy::prelude::*; | ||
| /// | ||
| /// fn start_server_system(mut commands: Commands) { | ||
| /// let builder = SignalingServerBuilder::new( | ||
| /// (Ipv4Addr::UNSPECIFIED, 3536), | ||
| /// FullMesh, | ||
| /// FullMeshState::default(), | ||
| /// ); | ||
| /// commands.start_server(builder); | ||
| /// } | ||
| /// | ||
| /// fn stop_server_system(mut commands: Commands) { | ||
| /// commands.stop_server(); | ||
| /// } | ||
| /// ``` | ||
| /// | ||
| /// As a [`Resource`], directly | ||
| /// ``` | ||
| /// use std::net::Ipv4Addr; | ||
| /// use bevy_matchbox::{ | ||
| /// prelude::*, | ||
| /// matchbox_signaling::topologies::full_mesh::{FullMesh, FullMeshState} | ||
| /// }; | ||
| /// use bevy::prelude::*; | ||
| /// | ||
| /// fn start_server_system(mut commands: Commands) { | ||
| /// let server: MatchboxServer = SignalingServerBuilder::new( | ||
| /// (Ipv4Addr::UNSPECIFIED, 3536), | ||
| /// FullMesh, | ||
| /// FullMeshState::default(), | ||
| /// ).into(); | ||
| /// | ||
| /// commands.insert_resource(MatchboxServer::from(server)); | ||
| /// } | ||
| /// | ||
| /// fn stop_server_system(mut commands: Commands) { | ||
| /// commands.remove_resource::<MatchboxServer>(); | ||
| /// } | ||
| /// ``` | ||
| #[derive(Debug, Resource)] | ||
| pub struct MatchboxServer(Task<Result<(), Error>>); | ||
|
|
||
| impl<Topology, Cb, S> From<SignalingServerBuilder<Topology, Cb, S>> for MatchboxServer | ||
| where | ||
| Topology: SignalingTopology<Cb, S>, | ||
| Cb: SignalingCallbacks, | ||
| S: SignalingState, | ||
| { | ||
| fn from(value: SignalingServerBuilder<Topology, Cb, S>) -> Self { | ||
| MatchboxServer::from(value.build()) | ||
| } | ||
| } | ||
|
|
||
| impl From<SignalingServer> for MatchboxServer { | ||
| fn from(server: SignalingServer) -> Self { | ||
| let task_pool = IoTaskPool::get(); | ||
| let task = task_pool.spawn(server.serve()); | ||
| MatchboxServer(task) | ||
| } | ||
| } | ||
|
|
||
| struct StartServer<Topology, Cb, S>(SignalingServerBuilder<Topology, Cb, S>) | ||
| where | ||
| Topology: SignalingTopology<Cb, S>, | ||
| Cb: SignalingCallbacks, | ||
| S: SignalingState; | ||
|
|
||
| impl<Topology, Cb, S> Command for StartServer<Topology, Cb, S> | ||
| where | ||
| Topology: SignalingTopology<Cb, S> + Send + 'static, | ||
| Cb: SignalingCallbacks, | ||
| S: SignalingState, | ||
| { | ||
| fn write(self, world: &mut bevy::prelude::World) { | ||
| world.insert_resource(MatchboxServer::from(self.0)) | ||
| } | ||
| } | ||
|
|
||
| /// A [`Commands`] extension used to start a [`MatchboxServer`]. | ||
| pub trait StartServerExt< | ||
| Topology: SignalingTopology<Cb, S>, | ||
| Cb: SignalingCallbacks, | ||
| S: SignalingState, | ||
| > | ||
| { | ||
| /// Starts a [`MatchboxServer`] and allocates it as a resource. | ||
| fn start_server(&mut self, builder: SignalingServerBuilder<Topology, Cb, S>); | ||
| } | ||
|
|
||
| impl<'w, 's, Topology, Cb, S> StartServerExt<Topology, Cb, S> for Commands<'w, 's> | ||
| where | ||
| Topology: SignalingTopology<Cb, S> + Send + 'static, | ||
| Cb: SignalingCallbacks, | ||
| S: SignalingState, | ||
| { | ||
| fn start_server(&mut self, builder: SignalingServerBuilder<Topology, Cb, S>) { | ||
| self.add(StartServer(builder)) | ||
| } | ||
| } | ||
|
|
||
| struct StopServer; | ||
|
|
||
| impl Command for StopServer { | ||
| fn write(self, world: &mut bevy::prelude::World) { | ||
| world.remove_resource::<MatchboxServer>(); | ||
| } | ||
| } | ||
|
|
||
| /// A [`Commands`] extension used to stop a [`MatchboxServer`]. | ||
| pub trait StopServerExt { | ||
| /// Delete the [`MatchboxServer`] resource. | ||
| fn stop_server(&mut self); | ||
| } | ||
|
|
||
| impl<'w, 's> StopServerExt for Commands<'w, 's> { | ||
| fn stop_server(&mut self) { | ||
| self.add(StopServer) | ||
| } | ||
| } | ||
|
|
||
| impl MatchboxServer { | ||
| /// Creates a new builder for a [`SignalingServer`] with full-mesh topology. | ||
| pub fn full_mesh_builder( | ||
| socket_addr: impl Into<SocketAddr>, | ||
| ) -> SignalingServerBuilder<FullMesh, FullMeshCallbacks, FullMeshState> { | ||
| SignalingServer::full_mesh_builder(socket_addr) | ||
| } | ||
|
|
||
| /// Creates a new builder for a [`SignalingServer`] with client-server topology. | ||
| pub fn client_server_builder( | ||
| socket_addr: impl Into<SocketAddr>, | ||
| ) -> SignalingServerBuilder<ClientServer, ClientServerCallbacks, ClientServerState> { | ||
| SignalingServer::client_server_builder(socket_addr) | ||
| } | ||
| } |
Oops, something went wrong.