Update server.js

server.js

@@ -1247,6 +1247,17 @@ streamApp.post('/left/:streamId', async (req, res) => {
   res.json({ success: true, message: `User ${user.name} left stream ${streamId}`, totalUsers: stream.users.size });
 });
 
+// GET /listeners/:streamId — used by frontend watch page to show who's watching
+streamApp.get('/listeners/:streamId', async (req, res) => {
+  const streamId = await resolveStreamId(req.params.streamId);
+  const stream = streams[streamId];
+  if (!stream) return res.json({ success: true, listeners: [] });
+  const list = stream.users
+    ? Array.from(stream.users.values()).map(u => ({ name: u.name, isGuest: u.isGuest }))
+    : [];
+  res.json({ success: true, listeners: list });
+});
+
 // Viewer list
 streamApp.get('/list/:streamId', async (req, res) => {
   const rawId = req.params.streamId;
@@ -1274,8 +1285,9 @@ streamApp.post('/heartbeat/:streamId', async (req, res) => {
     activeViewers[userId] = streamId;
   }
   const user = stream.users.get(userId);
-  if (user) { user.lastHeartbeat = new Date().toISOString(); res.json({ success: true }); }
-  else res.status(404).json({ error: 'User not found in stream' });
+  if (user) { user.lastHeartbeat = new Date().toISOString(); }
+  // Return success regardless — constituent-stream viewers aren't in this map
+  res.json({ success: true });
 });
 
 // Current track info
@@ -1332,6 +1344,7 @@ streamApp.get('/api/streams', (req, res) => {
           currentSong:  current ? { title: current.meta.title, thumbnail: current.meta.thumbnail, duration: current.meta.duration } : null,
           nextSong:     next    ? { title: next.meta.title,    thumbnail: next.meta.thumbnail,    duration: next.meta.duration }    : null,
           activeListeners, queueLength: stream.queue.length, isPlaying: stream.isActive && current !== null,
+          hlsReady: !!(hlsState[streamId] && hlsState[streamId].segments.length > 0 && !hlsState[streamId].generating),
         };
       });
     if (filter === 'active')  activeStreams.sort((a, b) => b.activeListeners - a.activeListeners);
@@ -3089,12 +3102,16 @@ streamApp.post('/api/constituent/skip/:spaceName', requireRegistered, async (req
 // ═══════════════════════════════════════════════════════════════════════════
 
 streamApp.get('/api/stream-source/:streamId', async (req, res) => {
-  const raw      = req.params.streamId;
-  const streamId = await resolveStreamId(raw);
+  const raw             = req.params.streamId;
+  const streamId        = await resolveStreamId(raw);
+  const wantConstituent = req.query.constituentName || null; // optional filter
 
   // 1. Check constituents owned by this userId
   try {
-    const constituents = await db.collection('constituents').find({ userId: streamId }).toArray();
+    const query = wantConstituent
+      ? { userId: streamId, spaceName: wantConstituent }
+      : { userId: streamId };
+    const constituents = await db.collection('constituents').find(query).toArray();
     for (const c of constituents) {
       try {
         const r = await axios.get(