feat: add runners to pb protocol

Author: MasterPtato

Cargo.toml

@@ -133,14 +133,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,7 @@
 {
 	"client": {
 		"runner": {
-			"flavor": "container",
+			// Enables running in non-privileged Docker containers
 			"use_resource_constraints": false
 		},
 		"cluster": {

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
@@ -137,7 +137,7 @@ RUN apt-get install -y skopeo iproute2 runc && \
 	mkdir -p /opt/cni/bin /opt/cni/config && \
 	curl -L https://github.com/containernetworking/plugins/releases/download/v${CNI_PLUGINS_VERSION}/cni-plugins-linux-amd64-v${CNI_PLUGINS_VERSION}.tgz | \
 		tar -xz -C /opt/cni/bin
-COPY --from=builder /app/dist/rivet-client /app/dist/rivet-container-runner /usr/local/bin/
+COPY --from=builder /app/dist/rivet-container-runner /usr/local/bin/
 ENTRYPOINT ["/usr/bin/tini", "--", "rivet-client"]
 
 # MARK: Monlith
@@ -180,7 +180,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

@@ -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?;
 

packages/core/api/actor/src/route/builds.rs

@@ -0,0 +1,3 @@
+ALTER TABLE builds
+	ADD allocation_type INT NOT NULL DEFAULT 0,
+	ADD allocation_total_slots INT NOT NULL DEFAULT 1;