use http and refactor slot auto subscribe

Author: lherman-cs

demo/index.html

@@ -14,7 +14,7 @@ <h2>PulseBeam</h2>
 
     <form id="controls" class="field middle-align mb-2">
       <input type="text" id="endpoint" placeholder="Enter WHIP/WHEP endpoint"
-        value="https://localhost:3000/api/v1/rooms/test" required />
+        value="http://localhost:3000/api/v1/rooms/test" required />
       <button type="submit" id="toggle" class="small-round">Start</button>
     </form>
 

demo/vite.config.js

@@ -2,6 +2,6 @@ import basicSsl from '@vitejs/plugin-basic-ssl'
 
 export default {
   plugins: [
-    basicSsl()
+    // basicSsl()
   ],
 }

pulsebeam/src/main.rs

@@ -77,7 +77,7 @@ pub async fn run(cpu_rt: rt::Runtime) {
         external_ip,
     );
 
-    node::run(cpu_rt, external_addr, unified_socket, http_socket, true)
+    node::run(cpu_rt, external_addr, unified_socket, http_socket, false)
         .await
         .unwrap();
 }

pulsebeam/src/participant.rs

@@ -270,34 +270,32 @@ impl ParticipantActor {
     }
 
     async fn auto_subscribe(&mut self, ctx: &mut actor::ActorContext<Self>) {
-        let mut slot_iter = self.subscribed_video_tracks.iter_mut();
+        let mut available_tracks = self.available_video_tracks.iter_mut();
 
-        'outer: for (track_id, track) in self.available_video_tracks.iter_mut() {
-            if track.mid.is_some() {
+        for (slot_id, slot) in self.subscribed_video_tracks.iter_mut() {
+            if slot.track_id.is_some() {
                 continue;
             }
 
-            loop {
-                let (slot_id, slot) = if let Some(slot) = slot_iter.next() {
-                    slot
-                } else {
-                    break 'outer;
-                };
+            for (track_id, track) in &mut available_tracks {
+                if track.mid.is_some() {
+                    continue;
+                }
 
-                if slot.track_id.is_some() {
+                if track
+                    .track
+                    .send_high(track::TrackControlMessage::Subscribe(ctx.handle.clone()))
+                    .await
+                    .is_err()
+                {
                     continue;
                 }
 
                 track.mid.replace(*slot_id);
                 let meta = &track.track.meta;
                 slot.track_id.replace(meta.id.clone());
-
-                // TODO: handle rejection
-                track
-                    .track
-                    .send_high(track::TrackControlMessage::Subscribe(ctx.handle.clone()))
-                    .await;
                 tracing::info!("allocated slot: {track_id} -> {slot_id}");
+                break;
             }
         }
     }
@@ -589,7 +587,6 @@ impl ParticipantActor {
             return;
         };
 
-        tracing::trace!("wrote to rtp");
         if let Err(err) = writer.write(pt, data.network_time, data.time, data.data.clone()) {
             tracing::error!("failed to write media: {}", err);
             self.rtc.disconnect();

pulsebeam/src/signaling.rs

@@ -78,7 +78,7 @@ async fn join_room(
 
     // TODO: remove hardcoded URI
     let location_url = format!(
-        "https://localhost:3000/api/v1/rooms/{}/participants/{}",
+        "http://localhost:3000/api/v1/rooms/{}/participants/{}",
         &room_id.external, &participant_id
     );
     let mut response_headers = HeaderMap::new();