chore(pegboard): migrate pegboard-ws to custom serve

Author: NathanFlurry

Cargo.lock

@@ -10,7 +10,6 @@ pub mod clickhouse;
 pub mod db;
 pub mod guard;
 pub mod logs;
-pub mod pegboard;
 pub mod pegboard_gateway;
 pub mod pegboard_tunnel;
 pub mod pubsub;
@@ -25,7 +24,6 @@ pub use clickhouse::*;
 pub use db::Database;
 pub use guard::*;
 pub use logs::*;
-pub use pegboard::*;
 pub use pegboard_gateway::*;
 pub use pegboard_tunnel::*;
 pub use pubsub::PubSub;
@@ -73,9 +71,6 @@ pub struct Root {
 	#[serde(default)]
 	pub api_peer: Option<ApiPeer>,
 
-	#[serde(default)]
-	pub pegboard: Option<Pegboard>,
-
 	#[serde(default)]
 	pub pegboard_gateway: Option<PegboardGateway>,
 
@@ -113,7 +108,6 @@ impl Default for Root {
 			guard: None,
 			api_public: None,
 			api_peer: None,
-			pegboard: None,
 			pegboard_gateway: None,
 			pegboard_tunnel: None,
 			logs: None,
@@ -144,11 +138,6 @@ impl Root {
 		self.api_peer.as_ref().unwrap_or(&DEFAULT)
 	}
 
-	pub fn pegboard(&self) -> &Pegboard {
-		static DEFAULT: LazyLock<Pegboard> = LazyLock::new(Pegboard::default);
-		self.pegboard.as_ref().unwrap_or(&DEFAULT)
-	}
-
 	pub fn pegboard_gateway(&self) -> &PegboardGateway {
 		static DEFAULT: LazyLock<PegboardGateway> = LazyLock::new(PegboardGateway::default);
 		self.pegboard_gateway.as_ref().unwrap_or(&DEFAULT)

packages/common/config/src/config/mod.rs

@@ -60,13 +60,10 @@ pub async fn setup_single_datacenter(
 		dc = dc.datacenter_label,
 		"containers started, waiting for services to be ready"
 	);
-	// Pick ports for other services
-	let pegboard_port = portpicker::pick_unused_port().context("pegboard_port")?;
 
 	tracing::info!(
 		dc = dc.datacenter_label,
 		api_peer_port,
-		pegboard_port,
 		guard_port,
 		"using ports for test services"
 	);
@@ -80,10 +77,6 @@ pub async fn setup_single_datacenter(
 		port: Some(api_peer_port),
 		..Default::default()
 	});
-	root.pegboard = Some(rivet_config::config::Pegboard {
-		port: Some(pegboard_port),
-		..Default::default()
-	});
 
 	root.topology = Some(rivet_config::config::topology::Topology {
 		datacenter_label: dc.datacenter_label,
@@ -111,7 +104,6 @@ pub async fn setup_single_datacenter(
 		container_names,
 		api_peer_port,
 		guard_port,
-		pegboard_port,
 		stop_docker_containers_on_drop: true,
 	})
 }

packages/common/config/src/config/pegboard.rs

@@ -13,7 +13,6 @@ pub struct TestDeps {
 	pub config: rivet_config::Config,
 	container_names: Vec<String>,
 	api_peer_port: u16,
-	pegboard_port: u16,
 	guard_port: u16,
 	stop_docker_containers_on_drop: bool,
 }
@@ -87,10 +86,6 @@ impl TestDeps {
 		self.api_peer_port
 	}
 
-	pub fn pegboard_port(&self) -> u16 {
-		self.pegboard_port
-	}
-
 	pub fn guard_port(&self) -> u16 {
 		self.guard_port
 	}

packages/common/test-deps/src/datacenter.rs

@@ -26,6 +26,7 @@ once_cell.workspace = true
 pegboard-gateway.workspace = true
 pegboard-tunnel.workspace = true
 pegboard.workspace = true
+pegboard-runner-ws.workspace = true
 regex.workspace = true
 rivet-api-public.workspace = true
 rivet-cache.workspace = true

packages/common/test-deps/src/lib.rs

@@ -1,6 +1,7 @@
 use anyhow::*;
 use gas::prelude::*;
 use rivet_guard_core::proxy_service::{RouteConfig, RouteTarget, RoutingOutput, RoutingTimeout};
+use std::sync::Arc;
 
 /// Route requests to the API service
 #[tracing::instrument(skip_all)]
@@ -10,22 +11,10 @@ pub async fn route_request(
 	_host: &str,
 	path: &str,
 ) -> Result<Option<RoutingOutput>> {
-	// Check target
 	if target != "runner-ws" {
 		return Ok(None);
 	}
 
-	let targets = vec![RouteTarget {
-		actor_id: None,
-		host: ctx.config().pegboard().lan_host().to_string(),
-		port: ctx.config().pegboard().port(),
-		path: path.to_owned(),
-	}];
-
-	return Ok(Some(RoutingOutput::Route(RouteConfig {
-		targets,
-		timeout: RoutingTimeout {
-			routing_timeout: 10, // 10 seconds for API routing timeout
-		},
-	})));
+	let tunnel = pegboard_runner_ws::PegboardRunnerWsCustomServe::new(ctx.clone());
+	Ok(Some(RoutingOutput::CustomServe(Arc::new(tunnel))))
 }

packages/core/guard/server/Cargo.toml

@@ -7,11 +7,19 @@ edition.workspace = true
 
 [dependencies]
 anyhow.workspace = true
+async-trait.workspace = true
+bytes.workspace = true
+futures-util.workspace = true
 gas.workspace = true
+http-body.workspace = true
+http-body-util.workspace = true
 # Idk how to get this working with the workspace version
 hyper = "1.6"
+hyper-tungstenite.workspace = true
+hyper-util = "0.1"
 rivet-config.workspace = true
 rivet-error.workspace = true
+rivet-guard-core.workspace = true
 rivet-metrics.workspace = true
 rivet-runner-protocol.workspace = true
 rivet-runtime.workspace = true