compilable with cargo build

Author: lherman-cs

Cargo.lock

@@ -61,9 +61,9 @@ members = [
   "pulsebeam-simulator",
 ]
 
-default-members = [
-  "pulsebeam", 
-  "pulsebeam-agent", 
-  "pulsebeam-cli",
-  "pulsebeam-runtime",
-]
+# default-members = [
+#   "pulsebeam", 
+#   "pulsebeam-agent", 
+#   "pulsebeam-cli",
+#   "pulsebeam-runtime",
+# ]

Cargo.toml

@@ -11,7 +11,6 @@ authors.workspace = true
 
 [features]
 default = []
-sim = ["dep:turmoil"]
 # default = ["ffmpeg-static"]
 #
 # # Force static linking (default)
@@ -26,7 +25,6 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 str0m = { workspace = true }
 bytes = { workspace = true }
-turmoil = { workspace = true, optional = true }
 
 tokio = { workspace = true }
 metrics = "0.24.3"
@@ -35,6 +33,7 @@ maybe-async = "0.2.10"
 http = "1.4.0"
 tokio-stream = "0.1.17"
 if-addrs = "0.14.0"
+pulsebeam-core = { version = "0.1.0", path = "../pulsebeam-core" }
 
 # FFmpeg integration
 # ffmpeg-next = { version = "8.0.0", default-features = false, features = ["codec", "format", "filter", "software-resampling", "software-scaling"] }

pulsebeam-agent/Cargo.toml

@@ -1,4 +1,7 @@
+use crate::signaling::{HttpSignalingClient, SignalingError};
+use crate::{MediaFrame, TransceiverDirection};
 use futures_lite::StreamExt;
+use pulsebeam_core::net::UdpSocket;
 use std::collections::HashMap;
 use std::net::{IpAddr, SocketAddr};
 use std::sync::Arc;
@@ -15,16 +18,6 @@ use tokio::time::Instant;
 use tokio_stream::StreamMap;
 use tokio_stream::wrappers::ReceiverStream;
 
-use crate::signaling::{HttpSignalingClient, SignalingError};
-use crate::{MediaFrame, TransceiverDirection};
-
-#[cfg(not(feature = "sim"))]
-use tokio::net as async_net;
-#[cfg(feature = "sim")]
-use turmoil::net as async_net;
-
-use async_net::UdpSocket;
-
 #[derive(Debug)]
 pub struct TrackSender {
     pub mid: Mid,

pulsebeam-agent/src/actor.rs

@@ -15,3 +15,4 @@ tracing = { workspace = true }
 
 pulsebeam-agent = { version = "0.1.0", path = "../pulsebeam-agent" }
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
+pulsebeam-core = { version = "0.1.0", path = "../pulsebeam-core" }

pulsebeam-cli/Cargo.toml

@@ -4,8 +4,8 @@ use pulsebeam_agent::{
     media::H264Looper,
     signaling::HttpSignalingClient,
 };
+use pulsebeam_core::net::UdpSocket;
 use std::time::Duration;
-use tokio::net::UdpSocket;
 
 const RAW_H264: &[u8] = include_bytes!("video.h264");
 

pulsebeam-cli/src/main.rs

@@ -25,6 +25,10 @@ mod sim {
             Ok(Self(inner))
         }
 
+        pub async fn accept(&self) -> io::Result<(TurmoilStream, SocketAddr)> {
+            self.0.accept().await
+        }
+
         pub fn local_addr(&self) -> io::Result<SocketAddr> {
             self.0.local_addr()
         }

pulsebeam-core/src/net.rs

@@ -40,7 +40,7 @@ dashmap = "6.1.0"
 async-channel = "2.5.0"
 tokio-util = "0.7.17"
 systemstat = "0.2.5"
-pulsebeam-core = { version = "0.1.0", path = "../pulsebeam-core" }
+pulsebeam-core = { version = "0.1.0", path = "../pulsebeam-core" } 
 
 [dev-dependencies]
 criterion = { version = "0.8.1", features = ["async", "async_tokio"] }

pulsebeam-runtime/Cargo.toml

@@ -17,6 +17,7 @@ turmoil.workspace = true
 pulsebeam = { version = "0.3.1", path = "../pulsebeam" }
 pulsebeam-runtime = { version = "0.1.0", path = "../pulsebeam-runtime" }
 pulsebeam-agent = { version = "0.1.0", path = "../pulsebeam-agent" }
+pulsebeam-core = { version = "0.1.0", path = "../pulsebeam-core", features = ["sim"] }
 
 proptest = "1.9.0"
 test-strategy = "0.4.3"