Update server/server.js

server/server.js

@@ -1,3 +1,4 @@
+// server.js
 import express from 'express';
 import http from 'http';
 import cors from 'cors';
@@ -20,20 +21,19 @@ const app = express();
 app.use(cors());
 app.use(express.json());
 
-// Health check
-app.get('/healthz', (req, res) => res.send('OK'));
+// --- Helpful small utils ---
+function short(v, n = 400) {
+  try {
+    const s = typeof v === 'string' ? v : JSON.stringify(v);
+    return s.length > n ? s.slice(0, n) + '…' : s;
+  } catch {
+    return String(v).slice(0, n) + '…';
+  }
+}
 
-// ---------- 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>
+function log(...args) {
+  console.log(new Date().toISOString(), ...args);
 }
-*/
-const rooms = new Map();
 
 function ensureRoom(roomId) {
   if (!rooms.has(roomId)) {
@@ -52,6 +52,21 @@ 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,
@@ -122,6 +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);
     res.status(500).json({ error: e.message });
   }
 });
@@ -130,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) { res.status(500).json({ error: e.message }); }
+  } catch (e) { log('/api/song error', e?.message || 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) { log('/api/album error', e?.message || 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) { log('/api/playlist error', e?.message || 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) { log('/api/lyrics error', e?.message || e); res.status(500).json({ error: e.message }); }
 });
 
 // ---------- YouTube search (YouTube Data API v3; optional) ----------
@@ -172,57 +188,116 @@ app.get('/api/ytsearch', async (req, res) => {
     })).filter(x => x.videoId);
     res.json({ items });
   } catch (e) {
+    log('/api/ytsearch error', e?.message || short(e?.response?.data));
     res.status(500).json({ error: e.message });
   }
 });
 
 // ---------- YouTube resolve via your ytdl.php API ----------
-// Replace the old /api/yt/source in server/server.js with this:
+/*
+  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
+*/
 app.get('/api/yt/source', async (req, res) => {
   try {
     const key = process.env.YTDL_API_KEY;
-    if (!key) return res.status(500).json({ error: 'Missing YTDL_API_KEY env var' });
+    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 ID, make it a full watch URL
+    // If it's just an 11-char YouTube id, convert to full watch URL:
     if (/^[a-zA-Z0-9_-]{11}$/.test(raw)) {
       raw = `https://www.youtube.com/watch?v=${raw}`;
     }
 
-    const apiUrl = `https://akborana.serv00.net/ytdl.php?mode=formats&url=${encodeURIComponent(raw)}&key=${encodeURIComponent(key)}`;
-    const resp = await axios.get(apiUrl, { timeout: 15000 });
-    const data = resp.data;
+    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)}` : ''}`;
+
+    log('Calling ytdl.php at', apiUrl);
+
+    const resp = await axios.get(apiUrl, { timeout: 20000, validateStatus: () => true });
 
-    if (!data || !Array.isArray(data.formats)) {
-      return res.status(502).json({ error: 'Invalid formats response' });
+    // 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) });
+      }
     }
 
-    const progressive = data.formats
-      .filter(f => f.ext === 'mp4' && f.vcodec !== 'none' && f.acodec !== 'none')
-      .sort((a, b) => (b.filesize || 0) - (a.filesize || 0))[0];
+    // 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;
+
+    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) });
+    }
 
-    const audioOnly = data.formats
-      .filter(f => f.vcodec === 'none' && (f.ext === 'm4a' || f.ext === 'webm'))
-      .sort((a, b) => (b.filesize || 0) - (a.filesize || 0))[0];
+    // 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;
-    if (!chosen) return res.status(502).json({ error: 'No playable format found' });
 
+    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) });
+    }
+
+    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: data.title || raw,
-      thumbnail: data.thumbnail || null,
-      duration: data.duration || null,
-      kind: progressive ? 'video' : 'audio'
+      title,
+      thumbnail,
+      duration,
+      kind,
+      // small helpful debug info
+      format: {
+        ext: chosen.ext || chosen.container || null,
+        vcodec: chosen.vcodec || null,
+        acodec: chosen.acodec || null,
+        filesize: chosen.filesize || chosen.filesizeBytes || null
+      }
     });
   } catch (e) {
-    res.status(500).json({ error: e.message });
+    // 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) });
   }
 });
 
-
 // ---------- Lobby ----------
 app.get('/api/rooms', (_req, res) => {
   const data = [...rooms.values()]
@@ -461,5 +536,5 @@ io.on('connection', (socket) => {
 
 const PORT = process.env.PORT || 3000;
 server.listen(PORT, () => {
-  console.log(`Server running on port ${PORT}`);
-});
+  log(`Server running on port ${PORT}`);
+});