Update server/server.js

server/server.js

@@ -5,6 +5,7 @@ import { Server as SocketIOServer } from 'socket.io';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import axios from 'axios';
+import { spawn } from 'child_process';
 import {
   searchUniversal,
   getSong,
@@ -84,15 +85,14 @@ function requireHostOrCohost(room, socketId) {
 
 function normalizeThumb(meta) {
   const candidates = [
+    meta?.thumb,
     meta?.image,
     meta?.thumbnail,
     meta?.song_image,
     meta?.album_image,
     meta?.image_url,
-    meta?.images?.[0],
-    meta?.images?.medium,
     meta?.images?.cover,
-    meta?.thumb
+    meta?.images?.[0]
   ].filter(Boolean);
   return candidates[0] || null;
 }
@@ -100,7 +100,6 @@ function normalizeThumb(meta) {
 function findUserByName(room, targetNameRaw) {
   if (!targetNameRaw) return null;
   const targetName = String(targetNameRaw).replace(/^@/, '').trim().toLowerCase();
-  // Prefer exact match, else startsWith, else includes
   let candidate = null;
   for (const [id, u] of room.users.entries()) {
     const n = (u.name || '').toLowerCase();
@@ -115,7 +114,7 @@ function findUserByName(room, targetNameRaw) {
   return null;
 }
 
-// ---------- API endpoints (JioSaavn proxy) ----------
+// ---------- JioSaavn proxies ----------
 app.get('/api/result', async (req, res) => {
   try {
     const q = req.query.q || '';
@@ -125,48 +124,36 @@ app.get('/api/result', async (req, res) => {
     res.status(500).json({ error: e.message });
   }
 });
-
 app.get('/api/song', async (req, res) => {
   try {
     const q = req.query.q || '';
     const data = await getSong(q);
     res.json(data);
-  } catch (e) {
-    res.status(500).json({ error: e.message });
-  }
+  } catch (e) { res.status(500).json({ error: e.message }); }
 });
-
 app.get('/api/album', async (req, res) => {
   try {
     const q = req.query.q || '';
     const data = await getAlbum(q);
     res.json(data);
-  } catch (e) {
-    res.status(500).json({ error: e.message });
-  }
+  } catch (e) { res.status(500).json({ error: e.message }); }
 });
-
 app.get('/api/playlist', async (req, res) => {
   try {
     const q = req.query.q || '';
     const data = await getPlaylist(q);
     res.json(data);
-  } catch (e) {
-    res.status(500).json({ error: e.message });
-  }
+  } catch (e) { res.status(500).json({ error: e.message }); }
 });
-
 app.get('/api/lyrics', async (req, res) => {
   try {
     const q = req.query.q || '';
     const data = await getLyrics(q);
     res.json(data);
-  } catch (e) {
-    res.status(500).json({ error: e.message });
-  }
+  } catch (e) { res.status(500).json({ error: e.message }); }
 });
 
-// ---------- YouTube search (requires YT_API_KEY env) ----------
+// ---------- YouTube search (YT_API_KEY) ----------
 app.get('/api/ytsearch', async (req, res) => {
   try {
     const key = process.env.YT_API_KEY;
@@ -188,6 +175,67 @@ app.get('/api/ytsearch', async (req, res) => {
   }
 });
 
+// ---------- YouTube resolve via yt-dlp (stream URL) ----------
+function runYtDlp(url) {
+  return new Promise((resolve, reject) => {
+    const args = ['-J', '--no-warnings', '--no-call-home'];
+    const cookies = process.env.YT_COOKIES;
+    if (cookies) { args.push('--cookies', cookies); }
+    args.push(url);
+
+    const proc = spawn('yt-dlp', args, { stdio: ['ignore', 'pipe', 'pipe'] });
+    let out = '';
+    let err = '';
+    proc.stdout.on('data', (d) => { out += d.toString('utf8'); });
+    proc.stderr.on('data', (d) => { err += d.toString('utf8'); });
+    proc.on('close', (code) => {
+      if (code !== 0) return reject(new Error(err || `yt-dlp failed with code ${code}`));
+      try {
+        const json = JSON.parse(out);
+        resolve(json);
+      } catch (e) { reject(e); }
+    });
+  });
+}
+
+// Choose a decent progressive MP4 or best video/audio URL
+function selectBestFormat(info) {
+  const entries = info.entries || null;
+  const base = entries ? entries[0] : info;
+  const formats = base.formats || [];
+  // Prefer mp4 progressive (has both audio+video)
+  let best = formats
+    .filter(f => f.ext === 'mp4' && f.vcodec && f.acodec && f.vcodec !== 'none' && f.acodec !== 'none')
+    .sort((a, b) => (b.height || 0) - (a.height || 0))[0];
+  if (!best) {
+    // Fallback: bestvideo+bestaudio (we pick bestvideo with audio if available)
+    best = formats
+      .filter(f => f.url && (f.acodec !== 'none' || f.vcodec !== 'none'))
+      .sort((a, b) => (b.tbr || 0) - (a.tbr || 0))[0];
+  }
+  return {
+    url: best?.url,
+    title: base.title || info.title,
+    thumbnail: base.thumbnail || info.thumbnail,
+    duration: base.duration || info.duration,
+    kind: 'video'
+  };
+}
+
+app.get('/api/yt/source', async (req, res) => {
+  try {
+    const raw = (req.query.url || '').trim();
+    if (!raw) return res.status(400).json({ error: 'Missing url' });
+    const url = /^[a-zA-Z0-9_-]{11}$/.test(raw) ? `https://www.youtube.com/watch?v=${raw}` : raw;
+    const info = await runYtDlp(url);
+    const best = selectBestFormat(info);
+    if (!best.url) return res.status(500).json({ error: 'No playable format found' });
+    res.json(best);
+  } catch (e) {
+    res.status(500).json({ error: e.message });
+  }
+});
+
 // Active rooms for lobby
 app.get('/api/rooms', (_req, res) => {
   const data = [...rooms.values()]
@@ -237,6 +285,7 @@ io.on('connection', (socket) => {
       roomName: room.name || room.id
     });
 
+    // Broadcast one clean system message to everyone
     io.to(roomId).emit('system', { text: `System: ${cleanName} has joined the chat` });
     broadcastMembers(roomId);
   });
@@ -418,11 +467,8 @@ io.on('connection', (socket) => {
       const nm = leftUser.name || 'User';
       io.to(joinedRoom).emit('system', { text: `System: ${nm} has left the chat` });
     }
-    if (room.users.size === 0) {
-      rooms.delete(joinedRoom);
-    } else {
-      broadcastMembers(joinedRoom);
-    }
+    if (room.users.size === 0) rooms.delete(joinedRoom);
+    else broadcastMembers(joinedRoom);
   });
 });