feat: add runners to pb protocol

Author: MasterPtato

Cargo.toml

@@ -131,14 +131,13 @@ services:
     restart: unless-stopped
     command: /usr/bin/rivet-guard
     environment:
-      - RUST_LOG=debug
+      # - RUST_LOG=debug
       - RUST_BACKTRACE=1
       - RUST_LOG_ANSI_COLOR=1
       - RIVET_OTEL_ENABLED=1
       - RIVET_OTEL_SAMPLER_RATIO=1
       - RIVET_SERVICE_NAME=rivet-guard
       - RIVET_OTEL_ENDPOINT=http://otel-collector:4317
-      # - RUST_LOG=debug,hyper=info
     stop_grace_period: 0s
     ports:
       # HTTP

docker/dev-full/docker-compose.yml

@@ -1,7 +1,6 @@
 {
 	"client": {
 		"runner": {
-			"flavor": "isolate",
 			// Enables running in non-privileged Docker containers
 			"use_mounts": false
 		},

docker/dev-full/rivet-client/config.jsonc

@@ -47,10 +47,10 @@ RUN \
     --mount=type=cache,target=/root/.cache,id=universal-user-cache \
     --mount=type=cache,target=/root/.npm,id=universal-user-npm \
     --mount=type=cache,target=/root/.yarn,id=universal-user-yarn \
-    RUSTFLAGS="--cfg tokio_unstable" RIVET_BUILD_HUB=0 cargo build --bin rivet-server --bin rivet-edge-server --bin rivet-guard --bin rivet-client --bin rivet-isolate-v8-runner --bin rivet-container-runner && \
+    RUSTFLAGS="--cfg tokio_unstable" RIVET_BUILD_HUB=0 cargo build --bin rivet-server --bin rivet-edge-server --bin rivet-guard --bin rivet-client --bin rivet-container-runner && \
     # cargo install --locked tokio-console && \
     mkdir /app/dist/ && \
-    cp target/debug/rivet-server target/debug/rivet-edge-server target/debug/rivet-guard target/debug/rivet-client target/debug/rivet-isolate-v8-runner target/debug/rivet-container-runner /app/dist/
+    cp target/debug/rivet-server target/debug/rivet-edge-server target/debug/rivet-guard target/debug/rivet-client target/debug/rivet-container-runner /app/dist/
 
 # MARK: Server (full, base)
 FROM debian:12.9-slim AS server-full-base
@@ -122,19 +122,9 @@ RUN apt-get update -y && \
 
 # MARK: Runner (Full)
 FROM --platform=linux/amd64 base-runner AS client-full
-COPY --from=builder /app/dist/rivet-client /app/dist/rivet-isolate-v8-runner /app/dist/rivet-container-runner /usr/local/bin/
+COPY --from=builder /app/dist/rivet-client /app/dist/rivet-container-runner /usr/local/bin/
 ENTRYPOINT ["/usr/bin/tini", "--", "rivet-client"]
 
-# MARK: Runner (Isolate V8)
-FROM --platform=linux/amd64 base-runner AS isolate-v8-runner
-COPY --from=builder /app/dist/rivet-isolate-v8-runner /usr/local/bin/
-ENTRYPOINT ["rivet-client"]
-
-# MARK: Runner (Container)
-FROM --platform=linux/amd64 base-runner AS container-runner
-COPY --from=builder /app/dist/rivet-container-runner /usr/local/bin/
-ENTRYPOINT ["rivet-client"]
-
 # MARK: Monlith
 FROM --platform=linux/amd64 debian:12.9-slim AS monolith
 ENV DEBIAN_FRONTEND=noninteractive
@@ -175,7 +165,7 @@ COPY ./docker/monolith/rivet-client /etc/rivet-client
 
 # === Copy Build Artifacts === 
 COPY --from=builder /app/dist/rivet-server /usr/local/bin/
-COPY --from=builder /app/dist/rivet-client /app/dist/rivet-isolate-v8-runner /app/dist/rivet-container-runner /usr/local/bin/
+COPY --from=builder /app/dist/rivet-client /app/dist/rivet-container-runner /usr/local/bin/
 
 VOLUME ["/data"]
 

docker/universal/Dockerfile

@@ -49,6 +49,13 @@ async function run() {
 								guard: {},
 							},
 						},
+						http2: {
+							protocol: "http",
+							internalPort: 8085,
+							routing: {
+								guard: {},
+							},
+						},
 						udp: {
 							protocol: "udp",
 							// internalPort: 80,

examples/system-test-actor/tests/client.ts

@@ -46,6 +46,11 @@ pub const SQLITE: usize = 44;
 pub const INTERNAL: usize = 45;
 pub const METADATA: usize = 46;
 pub const COMPRESSED_DATA: usize = 47;
+pub const RUNNER: usize = 48;
+pub const RUNNERS_BY_REMAINING_SLOTS: usize = 49;
+pub const REMAINING_SLOTS: usize = 50;
+pub const TOTAL_SLOTS: usize = 51;
+pub const IMAGE_ID: usize = 52;
 
 // Directories with fdbrs must use string paths instead of tuples
 pub mod dir {
@@ -103,6 +108,12 @@ pub fn key_from_str(key: &str) -> Option<usize> {
 		"sqlite" => Some(SQLITE),
 		"internal" => Some(INTERNAL),
 		"metadata" => Some(METADATA),
+		"compressed_data" => Some(COMPRESSED_DATA),
+		"runner" => Some(RUNNER),
+		"runners_by_remaining_slots" => Some(RUNNERS_BY_REMAINING_SLOTS),
+		"remaining_slots" => Some(REMAINING_SLOTS),
+		"total_slots" => Some(TOTAL_SLOTS),
+		"image_id" => Some(IMAGE_ID),
 		_ => None,
 	}
 }

packages/common/fdb-util/src/keys.rs

@@ -1,13 +1,6 @@
 use std::{env, fs, path::Path, path::PathBuf, process::Command};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-	// Check if yarn is installed
-	let yarn_check = Command::new("yarn").arg("--version").status();
-	assert!(
-		yarn_check.is_ok() && yarn_check.unwrap().success(),
-		"yarn is not installed, please install yarn to build this project"
-	);
-
 	// Get the output directory from the cargo environment variable
 	let target_dir = env::var("OUT_DIR")?;
 	let manifest_dir = env::var("CARGO_MANIFEST_DIR")?;
@@ -18,10 +11,17 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 		fs::remove_dir_all(out_dir)?;
 	}
 
+	let project_root = PathBuf::from(manifest_dir.clone()).join("../../..");
+	let hub_path = project_root.join("frontend/apps/hub");
+	
+	// Build hub
 	if std::env::var("RIVET_BUILD_HUB").map_or(false, |x| x == "1") {
-		// Build hub
-		let project_root = PathBuf::from(manifest_dir.clone()).join("../../..");
-		let hub_path = project_root.join("frontend/apps/hub");
+		// Check if yarn is installed
+		let yarn_check = Command::new("yarn").arg("--version").status();
+		assert!(
+			yarn_check.is_ok() && yarn_check.unwrap().success(),
+			"yarn is not installed, please install yarn to build this project"
+		);
 
 		println!("Running yarn install");
 		let output = Command::new("yarn")
@@ -42,21 +42,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 		println!("stdout:\n{}", String::from_utf8_lossy(&output.stdout));
 		println!("stderr:\n{}", String::from_utf8_lossy(&output.stderr));
 		assert!(output.status.success(), "hub build failed");
-
-		// Copy dist directory to out_dir
-		let dist_path = hub_path.join("dist");
-		fs_extra::dir::copy(
-			dist_path.clone(),
-			out_dir,
-			&fs_extra::dir::CopyOptions::new().content_only(true),
-		)?;
-
-		println!("cargo:rerun-if-changed={}", hub_path.display());
-		println!("cargo:rerun-if-env-changed=FONTAWESOME_PACKAGE_TOKEN");
-	} else {
-		// Create empty dist dir
-		std::fs::create_dir_all(out_dir)?;
 	}
+	
+	// Copy dist directory to out_dir
+	let dist_path = hub_path.join("dist");
+	fs_extra::dir::copy(
+		dist_path.clone(),
+		out_dir,
+		&fs_extra::dir::CopyOptions::new().content_only(true),
+	)?;
+
+	println!("cargo:rerun-if-changed={}", hub_path.display());
+	println!("cargo:rerun-if-env-changed=FONTAWESOME_PACKAGE_TOKEN");
 
 	// Set the path in the env
 	println!("cargo:rustc-env=HUB_PATH={}", out_dir.display());

packages/common/hub-embed/build.rs

@@ -3,7 +3,7 @@ use std::{
 	fmt,
 	hash::{Hash, Hasher},
 	marker::PhantomData,
-	ops::Deref,
+	ops::{Deref, DerefMut},
 };
 
 use indexmap::IndexMap;
@@ -125,6 +125,10 @@ impl<K: Eq + Hash, V: Hash> HashableMap<K, V> {
 	pub fn new() -> Self {
 		HashableMap(IndexMap::new())
 	}
+
+	pub fn with_capacity(capacity: usize) -> Self {
+		HashableMap(IndexMap::with_capacity(capacity))
+	}
 }
 
 impl<K: Eq + Hash, V: Hash> Default for HashableMap<K, V> {
@@ -141,6 +145,12 @@ impl<K: Eq + Hash, V: Hash> Deref for HashableMap<K, V> {
 	}
 }
 
+impl<K: Eq + Hash, V: Hash> DerefMut for HashableMap<K, V> {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
 impl<K: Eq + Ord + Hash, V: Hash> Hash for HashableMap<K, V> {
 	fn hash<H: Hasher>(&self, state: &mut H) {
 		let mut kv = Vec::from_iter(&self.0);

packages/common/util/core/src/serde.rs

@@ -361,6 +361,8 @@ pub async fn create_build(
 				.compression
 				.map(ApiInto::api_into)
 				.unwrap_or(build::types::BuildCompression::None),
+			allocation_type: build::types::BuildAllocationType::Single,
+			allocation_total_slots: 1,
 		})
 		.await?;