chore: merge tunnel in to runner

Author: NathanFlurry

Cargo.lock

@@ -1,7 +1,7 @@
 
 [workspace]
 resolver = "2"
-members = ["packages/common/api-builder","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner","packages/core/pegboard-serverless","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol","sdks/rust/ups-protocol"]
+members = ["packages/common/api-builder","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner","packages/core/pegboard-serverless","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/ups-protocol"]
 
 [workspace.package]
 version = "25.7.1"
@@ -365,9 +365,6 @@ path = "packages/core/pegboard-runner"
 [workspace.dependencies.pegboard-serverless]
 path = "packages/core/pegboard-serverless"
 
-[workspace.dependencies.pegboard-tunnel]
-path = "packages/core/pegboard-tunnel"
-
 [workspace.dependencies.rivet-workflow-worker]
 path = "packages/core/workflow-worker"
 
@@ -401,9 +398,6 @@ path = "sdks/rust/epoxy-protocol"
 [workspace.dependencies.rivet-runner-protocol]
 path = "sdks/rust/runner-protocol"
 
-[workspace.dependencies.rivet-tunnel-protocol]
-path = "sdks/rust/tunnel-protocol"
-
 [workspace.dependencies.rivet-ups-protocol]
 path = "sdks/rust/ups-protocol"
 

Cargo.toml

@@ -8,6 +8,7 @@
 		"dev:inspector": "vite --config vite.inspector.config.ts",
 		"dev:engine": "vite --config vite.engine.config.ts",
 		"ts-check": "tsc --noEmit",
+		"build": "echo 'Please use build:engine or build:inspector' && exit 1",
 		"build:inspector": "vite build --mode=production --config vite.inspector.config.ts",
 		"build:engine": "vite build --mode=production --config vite.engine.config.ts",
 		"preview:inspector": "vite preview --config vite.inspector.config.ts",

frontend/package.json

@@ -24,7 +24,6 @@ hyper = "1.6.0"
 indoc.workspace = true
 once_cell.workspace = true
 pegboard-gateway.workspace = true
-pegboard-tunnel.workspace = true
 pegboard.workspace = true
 pegboard-runner.workspace = true
 regex.workspace = true

packages/core/guard/server/Cargo.toml

@@ -9,7 +9,6 @@ use crate::{errors, shared_state::SharedState};
 
 mod api_public;
 pub mod pegboard_gateway;
-mod pegboard_tunnel;
 mod runner;
 
 pub(crate) const X_RIVET_TARGET: HeaderName = HeaderName::from_static("x-rivet-target");
@@ -54,12 +53,6 @@ pub fn create_routing_function(ctx: StandaloneCtx, shared_state: SharedState) ->
 							return Ok(routing_output);
 						}
 
-						if let Some(routing_output) =
-							pegboard_tunnel::route_request(&ctx, target, host, path).await?
-						{
-							return Ok(routing_output);
-						}
-
 						if let Some(routing_output) =
 							api_public::route_request(&ctx, target, host, path).await?
 						{

packages/core/guard/server/src/routing/mod.rs

@@ -173,38 +173,11 @@ async fn find_actor(
 
 	tracing::debug!(?actor_id, ?runner_id, "actor ready");
 
-	// TODO: Remove round trip, return key from get_runner op above
-	// Get runner key, namespace_id, and runner_name from runner_id
-	let (runner_key, namespace_id, runner_name) = ctx
-		.udb()?
-		.run(|tx| async move {
-			let tx = tx.with_subspace(pegboard::keys::subspace());
-
-			let runner_key_key = pegboard::keys::runner::KeyKey::new(runner_id);
-			let namespace_id_key = pegboard::keys::runner::NamespaceIdKey::new(runner_id);
-			let runner_name_key = pegboard::keys::runner::NameKey::new(runner_id);
-
-			let (runner_key, namespace_id, runner_name) = tokio::try_join!(
-				tx.read_opt(&runner_key_key, Serializable),
-				tx.read_opt(&namespace_id_key, Serializable),
-				tx.read_opt(&runner_name_key, Serializable),
-			)?;
-
-			let runner_key = runner_key.context("runner key not found")?;
-			let namespace_id = namespace_id.context("runner namespace_id not found")?;
-			let runner_name = runner_name.context("runner name not found")?;
-
-			Ok((runner_key, namespace_id, runner_name))
-		})
-		.await?;
-
 	// Return pegboard-gateway instance
 	let gateway = pegboard_gateway::PegboardGateway::new(
 		ctx.clone(),
 		shared_state.pegboard_gateway.clone(),
-		namespace_id,
-		runner_name,
-		runner_key,
+		runner_id,
 		actor_id,
 	);
 	Ok(Some(RoutingOutput::CustomServe(std::sync::Arc::new(

packages/core/guard/server/src/routing/pegboard_gateway.rs

@@ -15,10 +15,10 @@ http-body-util.workspace = true
 hyper = "1.6"
 hyper-tungstenite.workspace = true
 pegboard.workspace = true
+rivet-runner-protocol.workspace = true
 rand.workspace = true
 rivet-error.workspace = true
 rivet-guard-core.workspace = true
-rivet-tunnel-protocol.workspace = true
 rivet-util.workspace = true
 thiserror.workspace = true
 tokio-tungstenite.workspace = true