Update server/server.js

server/server.js

@@ -21,7 +21,7 @@ const app = express();
 app.use(cors());
 app.use(express.json());
 
-// --- Helpful small utils ---
+// --- small utils ---
 function short(v, n = 400) {
   try {
     const s = typeof v === 'string' ? v : JSON.stringify(v);
@@ -30,11 +30,22 @@ function short(v, n = 400) {
     return String(v).slice(0, n) + '…';
   }
 }
-
 function log(...args) {
   console.log(new Date().toISOString(), ...args);
 }
 
+// ---------- Room state ----------
+/*
+room = {
+  id, name, hostId,
+  users: Map<socketId, { name, role: 'host'|'cohost'|'member', muted?: boolean }>,
+  track: { url, title, meta, kind, thumb? },
+  isPlaying, anchor, anchorAt,
+  queue: Array<track>
+}
+*/
+const rooms = new Map();
+
 function ensureRoom(roomId) {
   if (!rooms.has(roomId)) {
     rooms.set(roomId, {
@@ -52,21 +63,6 @@ function ensureRoom(roomId) {
   return rooms.get(roomId);
 }
 
-// Health check
-app.get('/healthz', (_req, res) => res.send('OK'));
-
-// ---------- Room state ----------
-/*
-room = {
-  id, name, hostId,
-  users: Map<socketId, { name, role: 'host'|'cohost'|'member', muted?: boolean }>,
-  track: { url, title, meta, kind, thumb? },
-  isPlaying, anchor, anchorAt,
-  queue: Array<track>
-}
-*/
-const rooms = new Map();
-
 function currentState(room) {
   return {
     track: room.track,
@@ -87,6 +83,7 @@ function membersPayload(room) {
   }));
 }
 
+// broadcastMembers uses `io` at runtime (ok because called after io is created)
 function broadcastMembers(roomId) {
   const room = rooms.get(roomId);
   if (!room) return;
@@ -130,6 +127,9 @@ function findUserByName(room, targetNameRaw) {
   return null;
 }
 
+// Health check
+app.get('/healthz', (_req, res) => res.send('OK'));
+
 // ---------- JioSaavn proxies ----------
 app.get('/api/result', async (req, res) => {
   try {
@@ -137,7 +137,7 @@ app.get('/api/result', async (req, res) => {
     const data = await searchUniversal(q);
     res.json(data);
   } catch (e) {
-    log('/api/result error', e?.message || e);
+    log('/api/result error', e?.message || short(e?.response?.data));
     res.status(500).json({ error: e.message });
   }
 });
@@ -146,28 +146,28 @@ app.get('/api/song', async (req, res) => {
     const q = req.query.q || '';
     const data = await getSong(q);
     res.json(data);
-  } catch (e) { log('/api/song error', e?.message || e); res.status(500).json({ error: e.message }); }
+  } catch (e) { log('/api/song error', e?.message || short(e?.response?.data)); 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) { log('/api/album error', e?.message || e); res.status(500).json({ error: e.message }); }
+  } catch (e) { log('/api/album error', e?.message || short(e?.response?.data)); 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) { log('/api/playlist error', e?.message || e); res.status(500).json({ error: e.message }); }
+  } catch (e) { log('/api/playlist error', e?.message || short(e?.response?.data)); 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) { log('/api/lyrics error', e?.message || e); res.status(500).json({ error: e.message }); }
+  } catch (e) { log('/api/lyrics error', e?.message || short(e?.response?.data)); res.status(500).json({ error: e.message }); }
 });
 
 // ---------- YouTube search (YouTube Data API v3; optional) ----------
@@ -193,108 +193,75 @@ app.get('/api/ytsearch', async (req, res) => {
   }
 });
 
-// ---------- YouTube resolve via your ytdl.php API ----------
+// ---------- YouTube resolve via VidFly API ----------
 /*
-  Env variables:
-    - YTDL_API_KEY  (required to call remote ytdl.php if you need to)
-    - YTDL_API_BASE (optional) base host for ytdl.php, e.g. https://akborana.serv00.net
+  This route uses api.vidfly.ai -> expects response shape like:
+  { code: 0, data: { title, cover, duration, items: [ { ext, fps, height, width, label, type, url } ] } }
 */
 app.get('/api/yt/source', async (req, res) => {
   try {
-    const key = process.env.YTDL_API_KEY;
-    if (!key) {
-      // Allow it to proceed if you want to use a ytdl endpoint that doesn't require a key;
-      // but prefer to warn the user.
-      log('Warning: YTDL_API_KEY not set. If your ytdl.php requires a key, requests will fail.');
-    }
-
     let raw = (req.query.url || '').trim();
     if (!raw) return res.status(400).json({ error: 'Missing url' });
 
-    // If it's just an 11-char YouTube id, convert to full watch URL:
+    // If input is just a video id, convert
     if (/^[a-zA-Z0-9_-]{11}$/.test(raw)) {
       raw = `https://www.youtube.com/watch?v=${raw}`;
     }
 
-    const base = process.env.YTDL_API_BASE || 'https://akborana.serv00.net';
-    const apiPath = process.env.YTDL_API_PATH || '/ytdl.php';
-    const apiUrl = `${base.replace(/\/+$/, '')}${apiPath}?mode=formats&url=${encodeURIComponent(raw)}${key ? `&key=${encodeURIComponent(key)}` : ''}`;
+    const vidflyUrl = `https://api.vidfly.ai/api/media/youtube/download?url=${encodeURIComponent(raw)}`;
+    log('Calling VidFly API:', vidflyUrl);
 
-    log('Calling ytdl.php at', apiUrl);
+    const resp = await axios.get(vidflyUrl, { timeout: 20000, validateStatus: () => true });
+    const data = resp.data;
 
-    const resp = await axios.get(apiUrl, { timeout: 20000, validateStatus: () => true });
+    if (!data || typeof data !== 'object') {
+      log('/api/yt/source vidfly non-object response:', short(data, 1000));
+      return res.status(502).json({ error: 'Invalid VidFly response', snippet: short(data, 1000) });
+    }
 
-    // normalize response
-    let data = resp.data;
-    // If we received HTML (common when HF space errors), show helpful snippet
-    if (typeof data === 'string') {
-      // try parse JSON if it is JSON-like
-      try { data = JSON.parse(data); } catch (err) {
-        log('/api/yt/source got non-JSON response snippet:', short(data, 800));
-        return res.status(502).json({ error: 'ytdl.php returned non-JSON response', snippet: short(data, 800) });
-      }
+    if (Number(data.code) !== 0 || !data.data || !Array.isArray(data.data.items)) {
+      log('/api/yt/source vidfly returned error shape:', short(data, 1000));
+      return res.status(502).json({ error: 'Invalid VidFly API response', detail: data });
     }
 
-    // Some ytdl wrappers return { formats: [...] } while others nest deeper.
-    const formats = Array.isArray(data) ? data :
-                    Array.isArray(data.formats) ? data.formats :
-                    Array.isArray(data.result?.formats) ? data.result.formats :
-                    Array.isArray(data.data?.formats) ? data.data.formats : null;
+    const items = data.data.items;
 
-    if (!formats || !Array.isArray(formats)) {
-      log('/api/yt/source invalid formats from ytdl.php:', short(data, 800));
-      return res.status(502).json({ error: 'Invalid formats response from ytdl.php', snippet: short(data, 800) });
-    }
+    // Prefer video_with_audio, pick highest resolution (height) available
+    const progressive = items
+      .filter(f => f.type === 'video_with_audio')
+      .sort((a, b) => (Number(b.height || 0) - Number(a.height || 0)))[0];
+
+    // Fallback: video-only highest resolution
+    const videoOnly = items
+      .filter(f => f.type === 'video')
+      .sort((a, b) => (Number(b.height || 0) - Number(a.height || 0)))[0];
+
+    // Fallback: any item with a URL
+    const anyItem = items.find(f => f.url);
 
-    // Find best progressive (video+audio) MP4/WebM preferably, fallback to best audio only
-    const progressive = formats
-      .filter(f => f.vcodec !== 'none' && f.acodec !== 'none')
-      // prefer mp4 container (but don't filter out other containers)
-      .sort((a, b) => {
-        const szA = Number(a.filesize || a.filesizeBytes || 0);
-        const szB = Number(b.filesize || b.filesizeBytes || 0);
-        // prefer mp4 slightly
-        const prefA = (String(a.ext || a.container || '').toLowerCase().includes('mp4')) ? 1 : 0;
-        const prefB = (String(b.ext || b.container || '').toLowerCase().includes('mp4')) ? 1 : 0;
-        return (prefB - prefA) || (szB - szA);
-      })[0];
-
-    const audioOnly = formats
-      .filter(f => f.vcodec === 'none' && (String(f.ext || '').toLowerCase() === 'm4a' || String(f.ext || '').toLowerCase() === 'webm' || String(f.container || '').toLowerCase() === 'm4a'))
-      .sort((a, b) => (Number(b.filesize || 0) - Number(a.filesize || 0)))[0];
-
-    const chosen = progressive || audioOnly;
+    const chosen = progressive || videoOnly || anyItem;
 
     if (!chosen || !chosen.url) {
-      log('/api/yt/source no playable format; formats snippet:', short(formats, 1000));
-      return res.status(502).json({ error: 'No playable format found in ytdl.php response', snippet: short(formats, 1000) });
+      log('/api/yt/source no playable item found:', short(items, 1200));
+      return res.status(502).json({ error: 'No playable format found in VidFly API response' });
     }
 
-    const title = data.title || data.name || data.videoTitle || raw;
-    const thumbnail = data.thumbnail || data.thumb || data.thumbnail_url || data.thumbnailUrl || null;
-    const duration = data.duration || data.length || null;
-    const kind = progressive ? 'video' : 'audio';
-
-    // Return useful info back to client
     res.json({
       url: chosen.url,
-      title,
-      thumbnail,
-      duration,
-      kind,
-      // small helpful debug info
+      title: data.data.title || raw,
+      thumbnail: data.data.cover || null,
+      duration: data.data.duration || null,
+      kind: chosen.type || 'video',
       format: {
-        ext: chosen.ext || chosen.container || null,
-        vcodec: chosen.vcodec || null,
-        acodec: chosen.acodec || null,
-        filesize: chosen.filesize || chosen.filesizeBytes || null
+        ext: chosen.ext || null,
+        fps: chosen.fps || null,
+        resolution: `${chosen.width || '?'}x${chosen.height || '?'}`,
+        label: chosen.label || null
       }
     });
   } catch (e) {
-    // extract useful debug info if remote responded non-200
-    const remoteData = e?.response?.data ?? e?.message ?? String(e);
-    log('/api/yt/source error', short(remoteData, 1000));
-    res.status(500).json({ error: 'Failed to fetch ytdl.php data', detail: short(remoteData, 1000) });
+    log('/api/yt/source unexpected error:', e?.response?.data ?? e?.message ?? String(e));
+    res.status(500).json({ error: 'Failed to fetch from VidFly API', detail: e?.response?.data ?? e?.message ?? String(e) });
   }
 });
 
@@ -310,7 +277,6 @@ app.get('/api/rooms', (_req, res) => {
     }));
   res.json({ rooms: data });
 });
-
 app.get('/api/ping', (_req, res) => res.json({ ok: true }));
 
 // ---------- Static client ----------
@@ -347,7 +313,6 @@ io.on('connection', (socket) => {
       roomName: room.name || room.id
     });
 
-    // Single clean system message to everyone
     io.to(roomId).emit('system', { text: `System: ${cleanName} has joined the chat` });
     broadcastMembers(roomId);
   });
@@ -384,7 +349,6 @@ io.on('connection', (socket) => {
     io.to(roomId).emit('system', { text: `System: ${requester} requested /play ${query}` });
   });
 
-  // Host handles request action
   socket.on('song_request_action', ({ roomId, action, track }) => {
     const room = rooms.get(roomId);
     if (!room) return;
@@ -413,7 +377,6 @@ io.on('connection', (socket) => {
     }
   });
 
-  // Host/cohost controls
   socket.on('set_track', ({ roomId, track }) => {
     const room = rooms.get(roomId);
     if (!room || !requireHostOrCohost(room, socket.id)) return;
@@ -453,7 +416,6 @@ io.on('connection', (socket) => {
     io.to(roomId).emit('seek', { anchor: room.anchor, anchorAt: room.anchorAt, isPlaying: room.isPlaying });
   });
 
-  // Ended -> auto next
   socket.on('ended', ({ roomId }) => {
     const room = rooms.get(roomId);
     if (!room || !requireHostOrCohost(room, socket.id)) return;
@@ -473,7 +435,6 @@ io.on('connection', (socket) => {
     }
   });
 
-  // Admin commands
   socket.on('admin_command', ({ roomId, cmd, targetName }) => {
     const room = rooms.get(roomId);
     if (!room) return;