Upload static/shorts_fresh.js

static/shorts_fresh.js

@@ -1,6 +1,7 @@
 /**
- * VNEWS Fresh Shorts Fetcher v6 - YouTube RSS + Invidious API
- * No CORS proxy needed, uses public APIs
+ * VNEWS Fresh Shorts Fetcher v7 - Final
+ * Uses server-side /api/shorts endpoint (which has yt-dlp fallback)
+ * + YouTube RSS as backup
  */
 (function() {
   'use strict';
@@ -34,8 +35,8 @@
     return url;
   }
   
-  // Fetch via server-side proxy (our own /api/shorts endpoint)
-  async function fetchShortsFromServer() {
+  // Method 1: Server-side API (uses yt-dlp on server)
+  async function fetchFromServer() {
     try {
       const r = await fetch('/api/shorts?t=' + Date.now());
       if (r.ok) {
@@ -52,55 +53,25 @@
         }
       }
     } catch(e) {
-      console.warn('Server fetch failed:', e);
+      console.warn('Server API failed:', e);
     }
     return [];
   }
   
-  // Fetch from YouTube RSS (no CORS issue when proxied)
-  async function fetchShortsFromRSS(channel) {
+  // Method 2: Server-side RSS proxy
+  async function fetchFromRSS() {
     try {
-      const rssUrl = `https://www.youtube.com/feeds/videos.xml?channel_id=${channel.id}`;
-      const r = await fetch('/api/proxy/rss?url=' + encodeURIComponent(rssUrl));
-      if (!r.ok) return [];
-      const text = await r.text();
-      
-      const shorts = [];
-      const parser = new DOMParser();
-      const doc = parser.parseFromString(text, 'text/xml');
-      const entries = doc.querySelectorAll('entry');
-      
-      for (const entry of entries) {
-        const title = entry.querySelector('title')?.textContent || '';
-        const link = entry.querySelector('link')?.getAttribute('href') || '';
-        const vidEl = entry.querySelector('videoId');
-        const vid = vidEl?.textContent || link.match(/(?:v=|shorts\/)([A-Za-z0-9_-]{11})/)?.[1] || '';
-        
-        if (!vid) continue;
-        
-        // Filter shorts only
-        const isShort = title.toLowerCase().includes('#shorts') || 
-                       title.toLowerCase().includes('#short') ||
-                       link.includes('/shorts/');
-        
-        if (!isShort && shorts.length < 15) continue;
-        
-        shorts.push({
-          id: vid,
-          title: title.replace(/#shorts?/gi, '').trim().substring(0, 120) || 'YouTube Short',
-          img: `https://i.ytimg.com/vi/${vid}/hqdefault.jpg`,
-          link: `https://www.youtube.com/shorts/${vid}`,
-          channel: channel.handle,
-          source: 'yt'
-        });
-        
-        if (shorts.length >= 20) break;
+      const r = await fetch('/api/shorts/rss?t=' + Date.now());
+      if (r.ok) {
+        const data = await r.json();
+        if (data.shorts && data.shorts.length > 0) {
+          return data.shorts;
+        }
       }
-      return shorts;
     } catch(e) {
-      console.warn('RSS fetch failed for', channel.handle, e);
-      return [];
+      console.warn('RSS fetch failed:', e);
     }
+    return [];
   }
   
   function interleaveShorts(shorts) {
@@ -156,17 +127,15 @@
     try {
       toast('🔄 Đang tải shorts mới...');
       
-      // Method 1: Try server-side API first (uses yt-dlp/scraping on server)
-      let all = await fetchShortsFromServer();
+      // Try server API first
+      let all = await fetchFromServer();
       
-      // Method 2: If server returns old data, try RSS
-      if (all.length === 0) {
-        for (const ch of CHANNELS) {
-          const shorts = await fetchShortsFromRSS(ch);
-          if (shorts.length > 0) {
-            all.push(...shorts);
-          }
-          await new Promise(r => setTimeout(r, 500));
+      // If server returns old/fallback data, try RSS
+      if (all.length === 0 || (all.length > 0 && all[0].id === 'Lu_iCQ5YwNM')) {
+        console.log('[Shorts] Server returned fallback, trying RSS...');
+        const rssShorts = await fetchFromRSS();
+        if (rssShorts.length > 0) {
+          all = rssShorts;
         }
       }
       
@@ -211,5 +180,5 @@
   // Fetch fresh after delay
   setTimeout(() => { window.refreshShorts().catch(() => {}); }, 3000);
   
-  console.log('[Shorts] Fresh fetcher v6 loaded (RSS + server API)');
+  console.log('[Shorts] Fresh fetcher v7 loaded (server API + RSS)');
 })();