Fix: đổi default channel VTV6→VTV3, fix lỗi VTV6 (thêm VTVGo CDN fallback + cập nhật fptplay URL + bỏ XEMTV_ONLY restriction)

static/yt_live.js

@@ -1,6 +1,6 @@
-// === VNEWS — VTV LIVE + Inline Recorder v6 ===
+// === VNEWS — VTV LIVE + Inline Recorder v7 ===
 // Features: PiP, mini-player, INLINE RECORDER with ratio crop + AI title + Short AI upload
-// FIX v6: audio from captureStream (unmute during record), video.ended for crop, AI title generation
+// FIX v7: uploadToWall robust JSON parse, processRatio timeout fallback, no premature revoke
 
 (function(){
   if(window._ytLiveLoaded) return;
@@ -14,7 +14,7 @@
     {id:'vtv9',name:'VTV9',badge:'Miền Bắc'},{id:'vtv10',name:'VTV10',badge:'Cần Thơ'},
     {id:'vtvprime',name:'VTVPrime',badge:'Prime'},
   ];
-  const DEFAULT_CHANNEL = 'vtv6';
+  const DEFAULT_CHANNEL = 'vtv3';
   const NEEDS_PROXY = /fptplay\.net/;
   const STREAMS = {};
   let _currentCh = null, _hls = null, _loading = false, _blockInserted = false;
@@ -171,7 +171,7 @@
     if (el) el.style.display = 'none';
   }
 
-  // ===== UPLOAD TO WALL (Short AI) =====
+  // ===== UPLOAD TO WALL (Short AI) — v7: robust JSON parse =====
   function uploadToWall(blob, title, source) {
     const formData = new FormData();
     formData.append('video', blob, `vtv-${_currentCh}-${Date.now()}.webm`);
@@ -179,18 +179,32 @@
     formData.append('source', source || 'vtv_inline_recorder');
     showProc('⏳ Đang upload lên Short AI...');
     return fetch('/api/wall', { method: 'POST', body: formData })
-      .then(r => r.json())
+      .then(r => {
+        console.log('[VTV Upload] HTTP status:', r.status, r.statusText);
+        // Read as text first, then parse JSON manually for robustness
+        return r.text().then(text => {
+          console.log('[VTV Upload] Response text:', text.substring(0, 200));
+          let data;
+          try { data = JSON.parse(text); } catch(e) {
+            console.error('[VTV Upload] JSON parse failed:', e, 'Raw:', text.substring(0, 500));
+            throw new Error('Server trả về lỗi (không phải JSON). Status: ' + r.status);
+          }
+          return data;
+        });
+      })
       .then(data => {
         hideProc();
-        if (data.ok) {
+        console.log('[VTV Upload] Parsed data:', data);
+        if (data && data.ok === true) {
           recStatus('✅ Đã tạo Short AI! Xem trong mục Tường AI.', 'ok');
           return data;
         } else {
-          throw new Error(data.error || 'Upload lỗi');
+          throw new Error(data && data.error ? data.error : 'Upload thất bại (ok=false)');
         }
       })
       .catch(e => {
         hideProc();
+        console.error('[VTV Upload] Error:', e);
         recStatus('⚠️ ' + e.message + '. Đang tải về...', 'err');
         setTimeout(() => downloadBlob(blob, `vtv-${_currentCh}-${Date.now()}.webm`), 800);
         throw e;
@@ -199,7 +213,6 @@
 
   // ===== AI TITLE GENERATION =====
   async function generateAITitle(blob, channelName) {
-    // Get video info for AI context
     return new Promise((resolve) => {
       const video = document.createElement('video');
       video.src = URL.createObjectURL(blob);
@@ -207,8 +220,6 @@
       video.onloadedmetadata = function() {
         URL.revokeObjectURL(video.src);
         const dur = Math.round(video.duration || 0);
-        const w = video.videoWidth, h = video.videoHeight;
-        // Generate title based on channel + duration + timestamp
         const now = new Date();
         const timeStr = now.toLocaleTimeString('vi-VN',{hour:'2-digit',minute:'2-digit'});
         const dateStr = now.toLocaleDateString('vi-VN',{day:'2-digit',month:'2-digit'});
@@ -219,7 +230,6 @@
           `⚡ ${channelName} Highlights - ${dateStr}`,
           `📱 ${channelName} Short - ${timeStr} ${dateStr}`,
         ];
-        // Pick one based on duration
         const idx = dur < 15 ? 4 : dur < 30 ? 1 : dur < 45 ? 2 : 0;
         resolve(titles[idx % titles.length]);
       };
@@ -447,7 +457,6 @@
     // CRITICAL: Unmute video so captureStream includes audio tracks
     const wasMuted = video.muted;
     video.muted = false;
-    // Also set volume low so user doesn't hear double audio
     const wasVolume = video.volume;
     video.volume = 0.3;
 
@@ -490,7 +499,6 @@
       pv.src = URL.createObjectURL(_rec.blob);
       document.getElementById('vtv-rec-preview-wrap').style.display = 'block';
       const sizeMB = (_rec.blob.size/1024/1024).toFixed(1);
-      const hasAudio = _rec.blob.size > 50000; // rough heuristic
       recStatus('✅ Record xong! ' + sizeMB + 'MB' + (audioTracks.length > 0 ? ' (có audio)' : ' (video only)'), 'ok');
     };
     _rec.recorder.onerror = e => {
@@ -499,7 +507,7 @@
       recStatus('❌ Lỗi: ' + (e.error?.message||'?'), 'err');
     };
 
-    _rec.recorder.start(500); // 500ms timeslice
+    _rec.recorder.start(500);
     video.currentTime = _rec.startTime;
 
     const btn = document.getElementById('vtv-rec-btn');
@@ -558,22 +566,22 @@
     }
   };
 
-  // ===== RATIO CROP — v6: reliable render =====
-  // Key fixes:
-  //   1. video.volume=0 (not muted) to avoid autoplay block
-  //   2. video.ended event to stop (NOT setTimeout with duration)
-  //   3. 200ms timeslice for frequent data collection
-  //   4. rec.requestData() flush before stop
-  //   5. Parallel audioVideo element to capture audio from blob
+  // ===== RATIO CROP — v7: reliable render with timeout fallback =====
   function processRatio(blob, ratio, action, title) {
     showProc(`🔄 Đang xử lý ${ratio}...`);
 
+    const blobUrl = URL.createObjectURL(blob);
     const video = document.createElement('video');
-    video.src = URL.createObjectURL(blob);
+    video.src = blobUrl;
     video.volume = 0;
     video.preload = 'auto';
     video.playsInline = true;
 
+    function cleanup() {
+      // Don't revoke blobUrl here — audioVideo may still need it
+      // It will be revoked after recording stops
+    }
+
     function onReady() {
       video.removeEventListener('loadedmetadata', onReady);
       video.removeEventListener('canplay', onReady);
@@ -581,7 +589,7 @@
       const vw = video.videoWidth, vh = video.videoHeight;
       if (!vw || !vh) {
         hideProc(); recStatus('❌ Video không có kích thước hợp lệ.', 'err');
-        URL.revokeObjectURL(video.src); return;
+        URL.revokeObjectURL(blobUrl); return;
       }
 
       let cw, ch, sx, sy;
@@ -603,7 +611,7 @@
       // Parallel video to capture audio from blob
       let recordStream = canvasStream;
       const audioVideo = document.createElement('video');
-      audioVideo.src = video.src;
+      audioVideo.src = blobUrl;
       audioVideo.muted = true;
       audioVideo.volume = 0;
       audioVideo.preload = 'auto';
@@ -629,14 +637,15 @@
 
       let rec;
       try { rec = new MediaRecorder(recordStream, {mimeType: mime}); }
-      catch(e) { hideProc(); recStatus('❌ Lỗi MediaRecorder: ' + e.message, 'err'); URL.revokeObjectURL(video.src); return; }
+      catch(e) { hideProc(); recStatus('❌ Lỗi MediaRecorder: ' + e.message, 'err'); URL.revokeObjectURL(blobUrl); return; }
 
       const chunks = [];
       rec.ondataavailable = e => { if(e.data && e.data.size > 0) chunks.push(e.data); };
       rec.onstop = () => {
-        hideProc(); URL.revokeObjectURL(video.src);
+        hideProc();
+        URL.revokeObjectURL(blobUrl);
         if (chunks.length === 0) {
-          recStatus('❌ Render thất bại. Thử lại hoặc chọn "Gốc".', 'err');
+          recStatus('❌ Render thất bại (không có data). Thử lại hoặc chọn "Gốc".', 'err');
           return;
         }
         const out = new Blob(chunks, {type: 'video/webm'});
@@ -646,7 +655,7 @@
           uploadToWall(out, title);
         }
       };
-      rec.onerror = e => { hideProc(); recStatus('❌ Lỗi render: ' + (e.error?.message || '?'), 'err'); URL.revokeObjectURL(video.src); };
+      rec.onerror = e => { hideProc(); recStatus('❌ Lỗi render: ' + (e.error?.message || '?'), 'err'); URL.revokeObjectURL(blobUrl); };
 
       rec.start(200);
 
@@ -657,6 +666,7 @@
         function finish() {
           if (finished) return;
           finished = true;
+          console.log('[VTV Crop] finish() called');
           try { rec.requestData(); } catch(e) {}
           setTimeout(() => {
             if (rec.state !== 'inactive') rec.stop();
@@ -666,6 +676,26 @@
         video.onended = finish;
         audioVideo.onended = finish;
 
+        // TIMEOUT FALLBACK: if video.ended doesn't fire within expected duration + 3s
+        const expectedDur = (video.duration || 0) * 1000;
+        if (expectedDur > 0 && isFinite(expectedDur)) {
+          setTimeout(() => {
+            if (!finished) {
+              console.warn('[VTV Crop] Timeout fallback after', expectedDur + 3000, 'ms');
+              finish();
+            }
+          }, expectedDur + 3000);
+        } else {
+          // If duration is unknown (e.g. blob), use a generous timeout
+          console.warn('[VTV Crop] Duration unknown, using 60s timeout');
+          setTimeout(() => {
+            if (!finished) {
+              console.warn('[VTV Crop] 60s timeout fallback');
+              finish();
+            }
+          }, 60000);
+        }
+
         function draw() {
           if (video.paused || video.ended) return;
           ctx.drawImage(video, sx, sy, cw, ch, 0, 0, cw, ch);
@@ -674,13 +704,13 @@
         draw();
       }).catch(e => {
         hideProc(); recStatus('❌ Lỗi phát video: ' + e.message, 'err');
-        URL.revokeObjectURL(video.src);
+        URL.revokeObjectURL(blobUrl);
       });
     }
 
     video.onerror = function() {
       hideProc(); recStatus('❌ Không đọc được video.', 'err');
-      URL.revokeObjectURL(video.src);
+      URL.revokeObjectURL(blobUrl);
     };
 
     video.addEventListener('loadedmetadata', onReady);
@@ -833,4 +863,4 @@
     window.loadHome=async function(){const old=document.getElementById('vtv-block');if(old)old.remove();_blockInserted=false;const r=await _origLoadHome.apply(this,arguments);try{pinBlock();}catch(e){}return r;};
     window.loadHome.__vtvWrapped=true;
   }
-})();
+})();

vtv_api.py

@@ -54,12 +54,14 @@ VTVGO_FAILOVER = {
     "vtv3":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv3-manifest.m3u8",
     "vtv4":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv4-manifest.m3u8",
     "vtv5":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv5-manifest.m3u8",
+    "vtv6":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv6-manifest.m3u8",
     "vtv7":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv7-manifest.m3u8",
     "vtv8":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv8-manifest.m3u8",
     "vtv9":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv9-manifest.m3u8",
+    "vtv10": "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv10-manifest.m3u8",
 }
 
-XEMTV_ONLY_CHANNELS = {"vtv6", "vtv10"}
+XEMTV_ONLY_CHANNELS = set()  # No channels are xemtv-only; all use VTVGo CDN first
 
 FPTPLAY_URLS = {
     "vtv1":  "https://live.fptplay53.net/fnxch2/vtv1hd_abr.smil/chunklist.m3u8",
@@ -67,7 +69,7 @@ FPTPLAY_URLS = {
     "vtv3":  "https://live.fptplay53.net/fnxch2/vtv3hd_abr.smil/chunklist.m3u8",
     "vtv4":  "https://live.fptplay53.net/fnxch2/vtv4hd_abr.smil/chunklist.m3u8",
     "vtv5":  "https://live-a.fptplay53.net/live/media/VTV5HD/live_hls_avc/index.m3u8",
-    "vtv6":  "https://live-a.fptplay53.net/live/media/vtv6/live247-hls-avc/vtv6-avc1_5600000=10000-mp4a_131600=20000.m3u8",
+    "vtv6":  "https://live.fptplay53.net/fnxch2/vtv6hd_abr.smil/chunklist.m3u8",
     "vtv7":  "https://live.fptplay53.net/fnxhd1/vtv7hd_vhls.smil/chunklist_b5000000.m3u8",
     "vtv8":  "https://live.fptplay53.net/epzhd1/vtv8hd_vhls.smil/chunklist.m3u8",
     "vtv9":  "https://live.fptplay53.net/fnxhd1/vtv9hd_vhls.smil/chunklist.m3u8",
@@ -131,6 +133,12 @@ def fetch_fptplay_stream(channel_id):
     return None
 
 def fetch_vtv_stream(channel_id):
+    """Fetch VTV stream with multi-source fallback chain:
+    1. VTVGo CDN (primary, works for most channels)
+    2. xemtv.net PHP scraper (fresh signed URLs)
+    3. fptplay CDN (fallback)
+    Each channel gets the same fallback chain for reliability.
+    """
     channel_id = channel_id.lower().strip()
     name_map = {
         'vtvct': 'vtv10', 'vtv-can-tho': 'vtv10', 'vtv can tho': 'vtv10',
@@ -144,23 +152,7 @@ def fetch_vtv_stream(channel_id):
     if cached is not None:
         return cached
 
-    if channel_id in XEMTV_ONLY_CHANNELS:
-        xemtv_url = fetch_xemtv_stream(channel_id)
-        if xemtv_url:
-            _set_cache(channel_id, xemtv_url)
-            return xemtv_url
-        fpt_url = FPTPLAY_URLS.get(channel_id)
-        if fpt_url:
-            _set_cache(channel_id, fpt_url)
-            return fpt_url
-        _set_cache(channel_id, None)
-        return None
-
-    if channel_id in VTVGO_FAILOVER:
-        result = VTVGO_FAILOVER[channel_id]
-        _set_cache(channel_id, result)
-        return result
-
+    # Special case: VTVPrime only via xemtv
     if channel_id == 'vtvprime':
         xemtv_url = fetch_xemtv_stream('vtvprime')
         if xemtv_url:
@@ -169,12 +161,20 @@ def fetch_vtv_stream(channel_id):
         _set_cache(channel_id, None)
         return None
 
+    # Source 1: VTVGo CDN (primary for all standard channels)
+    vtvgourl = VTVGO_FAILOVER.get(channel_id)
+    if vtvgourl:
+        _set_cache(channel_id, vtvgourl)
+        return vtvgourl
+
+    # Source 2: xemtv.net PHP scraper (fresh signed URLs)
     xemtv_url = fetch_xemtv_stream(channel_id)
     if xemtv_url:
         _set_cache(channel_id, xemtv_url)
         return xemtv_url
 
-    fpt_url = fetch_fptplay_stream(channel_id)
+    # Source 3: fptplay CDN (last resort)
+    fpt_url = FPTPLAY_URLS.get(channel_id)
     if fpt_url:
         _set_cache(channel_id, fpt_url)
         return fpt_url
@@ -274,6 +274,7 @@ VTV_CHANNEL_MAP = {
     "vtv5-tay-nguyen": "vtv5",
     "vtv7": "vtv7",
     "vtv8": "vtv8",
+    "vtv6": "vtv6",
     "vtv9": "vtv9",
     "vtv-can-tho": "vtv10",
 }

vtv_scraper.py

@@ -42,17 +42,27 @@ CHANNEL_NAMES = {
 
 # Fallback CDN streams (fptplay) — used when xemtv scraping fails
 CDN_FALLBACK = {
-    "vtv1":  "https://live.fptplay53.net/fnxch2/vtv1hd_abr.smil/chunklist.m3u8",
-    "vtv2":  "https://live.fptplay53.net/fnxch2/vtv2hd_abr.smil/chunklist.m3u8",
-    "vtv3":  "https://live.fptplay53.net/fnxch2/vtv3hd_abr.smil/chunklist.m3u8",
-    "vtv4":  "https://live.fptplay53.net/fnxch2/vtv4hd_abr.smil/chunklist.m3u8",
-    "vtv5":  "https://live-a.fptplay53.net/live/media/VTV5HD/live_hls_avc/index.m3u8",
-    "vtv7":  "https://live.fptplay53.net/fnxhd1/vtv7hd_vhls.smil/chunklist_b5000000.m3u8",
-    "vtv8":  "https://live.fptplay53.net/epzhd1/vtv8hd_vhls.smil/chunklist.m3u8",
-    "vtv9":  "https://live.fptplay53.net/fnxhd1/vtv9hd_vhls.smil/chunklist.m3u8",
-    "vtv10": "https://live.fptplay53.net/fnxch2/vtvcantho_abr.smil/chunklist.m3u8",
-    # VTV6 fallback: try canthotv as alternative
-    "vtv6":  "https://live.canthotv.vn/live/tv/chunklist.m3u8",
+    "vtv1":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv1-manifest.m3u8",
+    "vtv2":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv2-manifest.m3u8",
+    "vtv3":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv3-manifest.m3u8",
+    "vtv4":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv4-manifest.m3u8",
+    "vtv5":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv5-manifest.m3u8",
+    "vtv6":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv6-manifest.m3u8",
+    "vtv7":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv7-manifest.m3u8",
+    "vtv8":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv8-manifest.m3u8",
+    "vtv9":  "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv9-manifest.m3u8",
+    "vtv10": "https://vtvgolive-failover.vtvdigital.vn/vtvgo/vtv10-manifest.m3u8",
+    # fptplay fallbacks (if VTVGo CDN fails)
+    "_fpt_vtv1":  "https://live.fptplay53.net/fnxch2/vtv1hd_abr.smil/chunklist.m3u8",
+    "_fpt_vtv2":  "https://live.fptplay53.net/fnxch2/vtv2hd_abr.smil/chunklist.m3u8",
+    "_fpt_vtv3":  "https://live.fptplay53.net/fnxch2/vtv3hd_abr.smil/chunklist.m3u8",
+    "_fpt_vtv4":  "https://live.fptplay53.net/fnxch2/vtv4hd_abr.smil/chunklist.m3u8",
+    "_fpt_vtv5":  "https://live-a.fptplay53.net/live/media/VTV5HD/live_hls_avc/index.m3u8",
+    "_fpt_vtv6":  "https://live.fptplay53.net/fnxch2/vtv6hd_abr.smil/chunklist.m3u8",
+    "_fpt_vtv7":  "https://live.fptplay53.net/fnxhd1/vtv7hd_vhls.smil/chunklist_b5000000.m3u8",
+    "_fpt_vtv8":  "https://live.fptplay53.net/epzhd1/vtv8hd_vhls.smil/chunklist.m3u8",
+    "_fpt_vtv9":  "https://live.fptplay53.net/fnxhd1/vtv9hd_vhls.smil/chunklist.m3u8",
+    "_fpt_vtv10": "https://live.fptplay53.net/fnxch2/vtvcantho_abr.smil/chunklist.m3u8",
 }
 
 _vtv_cache = {}
@@ -92,7 +102,9 @@ def extract_m3u8_from_html(html):
 
 
 def fetch_vtv_stream(channel_id):
-    """Fetch m3u8 stream URL for a VTV channel by scraping xemtv.net PHP endpoint."""
+    """Fetch m3u8 stream URL for a VTV channel.
+    Fallback chain: VTVGo CDN -> xemtv.net scraper -> fptplay CDN
+    """
     channel_id = channel_id.lower().strip()
 
     # Normalize name
@@ -110,30 +122,31 @@ def fetch_vtv_stream(channel_id):
     if cached:
         return cached
 
-    php_url = XEMTV_PHP_ENDPOINTS.get(channel_id)
-    if not php_url:
-        # Fallback
-        fallback = CDN_FALLBACK.get(channel_id)
-        if fallback:
-            _set_cache(channel_id, fallback)
-            return fallback
-        return None
+    # Source 1: VTVGo CDN (primary)
+    vtvgourl = CDN_FALLBACK.get(channel_id)
+    if vtvgourl:
+        _set_cache(channel_id, vtvgourl)
+        return vtvgourl
 
-    try:
-        r = requests.get(php_url, headers=UA, timeout=15, allow_redirects=True)
-        if r.status_code == 200:
-            m3u8 = extract_m3u8_from_html(r.text)
-            if m3u8:
-                _set_cache(channel_id, m3u8)
-                return m3u8
-    except:
-        pass
-
-    # Fallback to CDN
-    fallback = CDN_FALLBACK.get(channel_id)
-    if fallback:
-        _set_cache(channel_id, fallback)
-        return fallback
+    # Source 2: xemtv.net PHP scraper (fresh signed URLs)
+    php_url = XEMTV_PHP_ENDPOINTS.get(channel_id)
+    if php_url:
+        try:
+            r = requests.get(php_url, headers=UA, timeout=15, allow_redirects=True)
+            if r.status_code == 200:
+                m3u8 = extract_m3u8_from_html(r.text)
+                if m3u8:
+                    _set_cache(channel_id, m3u8)
+                    return m3u8
+        except:
+            pass
+
+    # Source 3: fptplay CDN (last resort)
+    fpt_key = f"_fpt_{channel_id}"
+    fpt_url = CDN_FALLBACK.get(fpt_key)
+    if fpt_url:
+        _set_cache(channel_id, fpt_url)
+        return fpt_url
 
     return None