feat: tag starts proxy (#880)

Author: andrewgazelka

.github/workflows/integration.yml

@@ -33,6 +33,7 @@ members = [
     'crates/hyperion-permission',
     'crates/hyperion-proto',
     'crates/hyperion-proxy',
+    'crates/hyperion-proxy-module',
     'crates/hyperion-rank-tree',
     'crates/hyperion-respawn',
     'crates/hyperion-scheduled',
@@ -114,6 +115,9 @@ toml = '0.8.14'
 tracing-appender = '0.2.3'
 uuid = '1.16.0'
 
+[workspace.dependencies.hyperion-proxy-module]
+path = "crates/hyperion-proxy-module"
+
 [workspace.dependencies.bvh]
 git = 'https://github.com/andrewgazelka/bvh-data'
 

Cargo.lock

@@ -0,0 +1,17 @@
+[dependencies]
+hyperion-proxy = { workspace = true }
+hyperion = { workspace = true }
+flecs_ecs = { workspace = true }
+tracing = { workspace = true }
+tokio = { workspace = true , features = ["full"]}
+
+[lints]
+workspace = true
+
+[package]
+authors = ["Andrew Gazelka <[email protected]>"]
+edition.workspace = true
+name = "hyperion-proxy-module"
+publish = false
+readme = "README.md"
+version.workspace = true

Cargo.toml

@@ -0,0 +1 @@
+todo: write readme

crates/hyperion-proxy-module/Cargo.toml

@@ -0,0 +1,62 @@
+use std::net::SocketAddr;
+
+use flecs_ecs::{core::World, prelude::*};
+use hyperion::runtime::AsyncRuntime;
+use tokio::net::TcpListener;
+
+#[derive(Component)]
+pub struct HyperionProxyModule;
+
+#[derive(Component)]
+pub struct ProxyAddress {
+    pub proxy: String,
+    pub server: String,
+}
+
+impl Default for ProxyAddress {
+    fn default() -> Self {
+        Self {
+            proxy: "0.0.0.0:25565".to_string(),
+            server: "127.0.0.1:35565".to_string(),
+        }
+    }
+}
+
+impl Module for HyperionProxyModule {
+    fn module(world: &World) {
+        world.import::<hyperion::HyperionCore>();
+        world.component::<ProxyAddress>();
+
+        proxy_address_observer(world);
+    }
+}
+
+fn proxy_address_observer(world: &World) {
+    let mut query = world.observer_named::<flecs::OnSet, (
+        &ProxyAddress, // (0)
+        &AsyncRuntime, // (1)
+    )>("proxy_address");
+
+    #[rustfmt::skip]
+    query
+        .term_at(0).singleton()
+        .term_at(1).filter().singleton();
+
+    query.each(|(addresses, runtime)| {
+        let proxy = addresses.proxy.clone();
+        let server = addresses.server.clone();
+
+        runtime.spawn(async move {
+            let listener = TcpListener::bind(&proxy).await.unwrap();
+            tracing::info!("Listening on {proxy}");
+
+            let server: SocketAddr = tokio::net::lookup_host(&server)
+                .await
+                .unwrap()
+                .next()
+                .unwrap();
+
+            hyperion_proxy::run_proxy(listener, server).await.unwrap();
+        });
+    });
+}

crates/hyperion-proxy-module/README.md

@@ -50,7 +50,7 @@ pub mod server_sender;
 pub mod util;
 
 #[tracing::instrument(level = "trace", skip_all)]
-pub async fn connect(addr: impl ToSocketAddrs + Debug + Clone) -> TcpStream {
+async fn connect(addr: impl ToSocketAddrs + Debug + Clone) -> TcpStream {
     loop {
         if let Ok(stream) = TcpStream::connect(addr.clone()).await {
             return stream;

crates/hyperion-proxy-module/src/lib.rs

@@ -4,6 +4,7 @@ clap = { workspace = true }
 compact_str = { workspace = true }
 derive_more = { workspace = true }
 dotenvy = { workspace = true }
+envy = "0.4"
 fastrand = { workspace = true }
 flecs_ecs = { workspace = true }
 geometry = { workspace = true }
@@ -15,22 +16,21 @@ hyperion-gui = { workspace = true }
 hyperion-inventory = { workspace = true }
 hyperion-item = { workspace = true }
 hyperion-permission = { workspace = true }
+hyperion-proxy-module = { workspace = true }
 hyperion-rank-tree = { workspace = true }
+hyperion-respawn = { workspace = true }
 hyperion-scheduled = { workspace = true }
 hyperion-text = { workspace = true }
 hyperion-utils = { workspace = true }
 rayon = { workspace = true }
 roaring = { workspace = true }
 rustc-hash = { workspace = true }
+serde = { version = "1.0", features = ["derive"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-# tracing-tracy = { workspace = true }
 uuid = { workspace = true }
-hyperion-respawn = { workspace = true }
 valence_protocol = { workspace = true }
 valence_server = { workspace = true }
-serde = { version = "1.0", features = ["derive"] }
-envy = "0.4"
 
 [dev-dependencies]
 tracing = { workspace = true, features = ["release_max_level_info"] }

crates/hyperion-proxy/src/lib.rs

@@ -9,12 +9,14 @@ use flecs_ecs::prelude::*;
 use hyperion::{GameServerEndpoint, HyperionCore, simulation::Player};
 use hyperion_clap::hyperion_command::CommandRegistry;
 use hyperion_gui::Gui;
+use hyperion_proxy_module::ProxyAddress;
 use module::{block::BlockModule, damage::DamageModule, vanish::VanishModule};
 
 mod module;
 
 use derive_more::{Deref, DerefMut};
 use hyperion::{glam::IVec3, simulation::Position, spatial};
+use hyperion_proxy_module::HyperionProxyModule;
 use hyperion_rank_tree::Team;
 use module::{attack::AttackModule, level::LevelModule, regeneration::RegenerationModule};
 use spatial::SpatialIndex;
@@ -135,8 +137,14 @@ pub fn init_game(address: SocketAddr) -> anyhow::Result<()> {
     let world = World::new();
 
     world.import::<HyperionCore>();
+    world.import::<HyperionProxyModule>();
     world.import::<TagModule>();
 
+    world.set(ProxyAddress {
+        server: address.to_string(),
+        ..ProxyAddress::default()
+    });
+
     world.set(GameServerEndpoint::from(address));
 
     let mut app = world.app();