chore: merge tunnel in to runner

Author: NathanFlurry

packages/core/pegboard-serverless/src/lib.rs

@@ -12,7 +12,7 @@ use gas::prelude::*;
 use namespace::types::RunnerConfig;
 use pegboard::keys;
 use reqwest_eventsource as sse;
-use rivet_runner_protocol::protocol;
+use rivet_runner_protocol as protocol;
 use tokio::{sync::oneshot, task::JoinHandle, time::Duration};
 use universaldb::options::StreamingMode;
 use universaldb::utils::IsolationLevel::*;

packages/services/pegboard/src/workflows/actor/destroy.rs

@@ -1,6 +1,6 @@
 use gas::prelude::*;
 use rivet_data::converted::ActorByKeyKeyData;
-use rivet_runner_protocol::protocol;
+use rivet_runner_protocol as protocol;
 use universaldb::options::MutationType;
 use universaldb::utils::IsolationLevel::*;
 

packages/services/pegboard/src/workflows/actor/mod.rs

@@ -1,6 +1,6 @@
 use futures_util::FutureExt;
 use gas::prelude::*;
-use rivet_runner_protocol::protocol;
+use rivet_runner_protocol as protocol;
 use rivet_types::actors::CrashPolicy;
 
 use crate::{errors, workflows::runner::AllocatePendingActorsInput};

packages/services/pegboard/src/workflows/actor/runtime.rs

@@ -4,7 +4,7 @@ use futures_util::StreamExt;
 use futures_util::{FutureExt, TryStreamExt};
 use gas::prelude::*;
 use rivet_metrics::KeyValue;
-use rivet_runner_protocol::protocol;
+use rivet_runner_protocol as protocol;
 use universaldb::options::{ConflictRangeType, MutationType, StreamingMode};
 use universaldb::utils::{FormalKey, IsolationLevel::*};
 

packages/services/pegboard/src/workflows/runner.rs

@@ -1,7 +1,7 @@
 use futures_util::{FutureExt, StreamExt, TryStreamExt};
 use gas::prelude::*;
 use rivet_data::converted::{ActorNameKeyData, MetadataKeyData, RunnerByKeyKeyData};
-use rivet_runner_protocol::protocol;
+use rivet_runner_protocol as protocol;
 use universaldb::options::{ConflictRangeType, StreamingMode};
 use universaldb::utils::{FormalChunkedKey, IsolationLevel::*};
 
@@ -1093,20 +1093,9 @@ pub(crate) async fn allocate_pending_actors(
 	Ok(AllocatePendingActorsOutput { allocations: res })
 }
 
-#[message("pegboard_runner_to_ws")]
-pub struct ToWs {
-	pub runner_id: Id,
-	pub inner: protocol::ToClient,
-}
-
 #[signal("pegboard_runner_check_queue")]
 pub struct CheckQueue {}
 
-#[message("pegboard_runner_close_ws")]
-pub struct CloseWs {
-	pub runner_id: Id,
-}
-
 join_signal!(Main {
 	Command(protocol::Command),
 	// Forwarded from the ws to this workflow