Restore main to commit 0cc342c (#17)

- Upload main.py (086fe3ad0e052b0e0ded65187c9533bbd244197a)
- Restore README.md from 0cc342c (5c187791c671b742e48ec45d546e40dec5dced33)
- Restore app_v2_entry.py from 0cc342c (48dd5bcc1a710520531c708ce3c333a9e6799b80)
- Restore main.py from 0cc342c (ed786d76259fc9d08bafe72d472e08e63d74effa)
- Restore static/app_v2.js from 0cc342c (ce16b6052f38c50a4d32bd6ed8788f2d66fb3357)
- Restore static/index_v2.html from 0cc342c (e9642a30a475801db0302798a9366ee2dcc37883)
- Restore static/wc_shorts_inject.js from 0cc342c (90e304f837cb3b149d906eac95b089870a14cb33)
- Restore static/wc_shorts_slide.js from 0cc342c (fadc98259762ee58607328ffbc6fb5acc851378e)
- Restore static/yt_live.js from 0cc342c (1b5364650afc6a29b0ce5941f6a16dcdbadb6807)
- Restore vtv_api.py from 0cc342c (14679a6bf84446832cbe53ac8d74bad689c88ab2)
- Restore yt_scraper.py from 0cc342c (4ca19c39190a4c64f279cc348b55daef705544b3)

README.md

@@ -1,9 +1,9 @@
 ---
-sdk: docker
 title: VNEWS
 emoji: 📰
 colorFrom: green
 colorTo: yellow
+sdk: docker
 pinned: false
 tags:
 - ml-intern

app_v2_entry.py

@@ -350,11 +350,7 @@ def _scrape_generic(url):
 
 @app.get('/api/article')
 def api_article_v2(url:str=Query(...)):
-    from main import scrape_vne as scrape_vne_article, scrape_genk_ai as scrape_genk_article
-    # Stubs for missing functions
-    def scrape_bbc_article(url): return scrape_vne_article(url)
-    def scrape_dantri_article(url): return scrape_vne_article(url)
-    def scrape_ttvh_article(url): return scrape_vne_article(url)
+    from main import scrape_vne_article,scrape_bbc_article,scrape_dantri_article,scrape_genk_article,scrape_ttvh_article
     if 'vnexpress.net' in url:data=scrape_vne_article(url)
     elif 'bbc.com' in url:data=scrape_bbc_article(url)
     elif 'dantri.com.vn' in url:data=scrape_dantri_article(url)

static/app_v2.js

@@ -21,22 +21,22 @@ async function loadHome(){
     +'<div class="ai-compose"><div class="ai-compose-title">🤖 AI viết bài</div><div class="ai-compose-row"><input id="topic-input" placeholder="Nhập chủ đề..."><button onclick="searchTopic()">Tìm nguồn</button></div><div class="ai-compose-row"><input id="url-input" placeholder="Dán URL bài viết..."><button class="secondary" onclick="rewriteUrl()">Rewrite</button></div><div id="hot-topics" class="hot-topic-row"></div></div>'
     +'<div id="hashtag-box"></div>'
     +'<div class="ls-section"><div class="ls-header"><h3>⚽ Livescore</h3></div><div class="ls-tabs"><span class="ls-tab active" data-tab="today" onclick="loadLivescore(\'today\')">📅 Hôm nay</span><span class="ls-tab" data-tab="live" onclick="loadLivescore(\'live\')">🔴 Live</span><span class="ls-tab" data-tab="incoming" onclick="loadLivescore(\'incoming\')">⏰ Sắp tới</span><span class="ls-tab" data-tab="results" onclick="loadLivescore(\'results\')">✅ Kết quả</span><span class="ls-tab" data-tab="bxh_nha" onclick="loadLivescore(\'bxh_nha\')">🏆 NHA</span><span class="ls-tab" data-tab="bxh_laliga" onclick="loadLivescore(\'bxh_laliga\')">🏆 La Liga</span></div><div class="ls-content" id="ls-content"><div class="loading">Đang tải...</div></div></div>'
-    
+    +'<div id="wc2026-live-section" class="wc2026-section"><div class="wc-header"><h2>🏆 World Cup 2026</h2><span class="wc-live-badge">● LIVE</span></div><div class="wc-tabs"><span class="wc-tab active" onclick="switchWCTab(\'news\')">📰 Tin tức</span><span class="wc-tab" onclick="switchWCTab(\'fixtures\')">📅 Lịch thi đấu</span><span class="wc-tab" onclick="switchWCTab(\'standings\')">🏆 BXH</span><span class="wc-tab" onclick="switchWCTab(\'highlights\')">🎬 Highlight</span><span class="wc-tab" onclick="switchWCTab(\'shorts\')">📱 Shorts</span><span class="wc-tab" onclick="switchWCTab(\'stats\')">📊 Thống kê</span></div><div class="wc-content" id="wc-content"><div class="loading">Đang tải World Cup 2026...</div></div></div>'
     +'<div id="home-after-wc"></div>';
 
   const afterEl = homeEl.querySelector('#home-after-wc');
 
   loadLivescore('today');
-  if(window.loadHotTopics){window.loadHotTopics();}else{loadHotTopics();}
+  loadHotTopics();
 
-  // Shorts load separately — don't block main render
-  _fetchWithTimeout('/api/shorts', 3000).then(d=>{_shortsData=d||[];_renderShortsIn(afterEl);}).catch(()=>{_shortsData=[];});
-
-  const [featuredData, wallData, hlLeagues, aiData] = await Promise.allSettled([
-    _fetchWithTimeout('/api/livescore/featured', 4000),
-    _fetchWithTimeout('/api/wall', 4000),
-    _fetchWithTimeout('/api/highlights/leagues', 6000),
-    _fetchWithTimeout('/api/genk_ai', 4000),
+  const [featuredData, shortsData, wallData, hlLeagues, aiData, wcData, vtvShortsData] = await Promise.allSettled([
+    _fetchWithTimeout('/api/livescore/featured', 5000),
+    _fetchWithTimeout('/api/shorts', 8000),
+    _fetchWithTimeout('/api/wall', 5000),
+    _fetchWithTimeout('/api/highlights/leagues', 10000),
+    _fetchWithTimeout('/api/genk_ai', 8000),
+    _fetchWithTimeout('/api/wc2026', 8000),
+    _fetchWithTimeout('/api/shorts/vtvnamo?count=50', 12000),
   ]).then(results => results.map(r => r.status === 'fulfilled' ? r.value : null));
 
   if(featuredData && featuredData.home){
@@ -46,15 +46,19 @@ async function loadHome(){
     if(area) area.innerHTML=`<div class="featured-match" onclick="openMatch('${featuredData.event_id}')"><div class="fm-league">${featuredData.league}</div><div class="fm-teams"><div class="fm-team"><img src="${featuredData.home_logo}" onerror="this.style.display='none'"><span>${featuredData.home}</span></div><div class="fm-score">${featuredData.score||'VS'}</div><div class="fm-team"><img src="${featuredData.away_logo}" onerror="this.style.display='none'"><span>${featuredData.away}</span></div></div><div class="fm-status ${sc}">${st}</div></div>`;
   }
 
+  _shortsData = shortsData || [];
   _wallPosts = (wallData && wallData.posts) || [];
   _hlLeagueData = hlLeagues || {};
+  _wc2026Data = wcData;
+  _wcShortsData = vtvShortsData || [];
+
+  if(wcData) switchWCTab('news');
 
+  _renderShortsIn(afterEl);
   _renderWallIn(afterEl);
   _renderHLIn(afterEl);
   if(aiData && aiData.length) _renderSlidesIn('ai-articles','Ứng dụng AI','🤖',aiData,afterEl);
 }
-window.loadHome = loadHome;
-
 
 function _renderSlidesIn(key, label, emoji, vids, afterEl){
   if(!vids||!vids.length||!afterEl) return;
@@ -212,6 +216,7 @@ function prependWallPost(post){
 
 let _shortsData=[];
 let _wallPosts=[];
+let _wcShortsData=[];
 let _currentView='home';
 let _currentEventId=null;
 let _currentMatchUrl=null;
@@ -332,9 +337,4 @@ async function loadCat(id){const el=document.getElementById('view-cat');el.inner
 fetch('/api/storage_status').then(r=>r.json()).then(j=>{if(!j.persistent){const home=document.getElementById('view-home');if(home){const w=document.createElement('div');w.className='storage-warn';w.innerHTML='⚠️ Persistent Storage chưa bật.';home.prepend(w)}}}).catch(()=>{});
 (function(){try{var hash=window.location.hash;if(hash&&hash.length>1){var articleUrl=decodeURIComponent(hash.substring(1));if(articleUrl.startsWith('http')){history.replaceState(null,'',window.location.pathname);setTimeout(function(){if(typeof readArticle==='function')readArticle(articleUrl);},1500);}}}catch(e){}})();
 (function(){try{const pa=localStorage.getItem('pending_article');const pv=localStorage.getItem('pending_video');if(pa){localStorage.removeItem('pending_article');setTimeout(()=>{if(typeof readArticle==='function')readArticle(pa);},1500);}if(pv){localStorage.removeItem('pending_video');try{const v=JSON.parse(pv);if(v&&v.url)setTimeout(()=>{window.open(v.url,'_blank')},1500);}catch(e){}}}catch(e){}})();
-// Auto-call loadHome on first load via window (respects yt_live.js override)
-if(document.readyState==='loading'){
-  document.addEventListener('DOMContentLoaded',function(){if(typeof window.loadHome==='function')window.loadHome();});
-}else{
-  if(typeof window.loadHome==='function')window.loadHome();
-}
+if(document.readyState==='loading'){document.addEventListener('DOMContentLoaded',function(){if(typeof loadHome==='function')loadHome();});}else{if(typeof loadHome==='function')loadHome();}

static/index_v2.html

@@ -30,7 +30,7 @@
 var _cats=[],_hlLeagueData={},_currentArticle=null;window._currentEventId='';
 function esc(s){return String(s||'').replace(/[&<>"']/g,m=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]))}
 function showView(id){document.querySelectorAll('.view').forEach(v=>v.classList.remove('active'));document.getElementById(id)?.classList.add('active')}
-function switchCat(id){document.querySelectorAll('.cat').forEach(c=>c.classList.remove('active'));document.querySelector(`[data-cat="${id}"]`)?.classList.add('active');document.querySelectorAll('.view').forEach(v=>v.classList.remove('active'));document.querySelectorAll('video').forEach(v=>{v.pause();if(v._hls){v._hls.destroy();v._hls=null}});document.querySelectorAll('iframe[data-yt-src]').forEach(f=>{f.src=''});if(id==='home'){document.getElementById('view-home').classList.add('active');if(typeof loadHome==='function')loadHome();}else if(id==='news-all'){document.getElementById('view-cat').classList.add('active');loadNewsTab()}else{document.getElementById('view-cat').classList.add('active');loadCat(id)}}
+function switchCat(id){document.querySelectorAll('.cat').forEach(c=>c.classList.remove('active'));document.querySelector(`[data-cat="${id}"]`)?.classList.add('active');document.querySelectorAll('.view').forEach(v=>v.classList.remove('active'));document.querySelectorAll('video').forEach(v=>{v.pause();if(v._hls){v._hls.destroy();v._hls=null}});document.querySelectorAll('iframe[data-yt-src]').forEach(f=>{f.src=''});if(id==='home')document.getElementById('view-home').classList.add('active');else if(id==='news-all'){document.getElementById('view-cat').classList.add('active');loadNewsTab()}else{document.getElementById('view-cat').classList.add('active');loadCat(id)}}
 function toast(msg){let t=document.getElementById('progress-toast');if(t){t.textContent=msg;t.style.display='block';setTimeout(()=>{t.style.display='none'},3500)}}
 function doShare(title,url,img){const shareUrl=SPACE+'/s?url='+encodeURIComponent(url)+'&title='+encodeURIComponent(title)+'&img='+encodeURIComponent(img||'');if(navigator.share)navigator.share({title,url:shareUrl}).catch(()=>{});else navigator.clipboard.writeText(shareUrl).then(()=>alert('Đã sao chép!')).catch(()=>{})}
 async function init(){_cats=await fetch('/api/categories').then(r=>r.json()).catch(()=>[]);let bar='<div class="cat active" data-cat="home">🏠</div><div class="cat" data-cat="news-all">📰 Tin tức</div>';_cats.forEach(c=>{bar+=`<div class="cat" data-cat="${c.id}">${c.name}</div>`});document.getElementById('cat-bar').innerHTML=bar;document.querySelectorAll('.cat').forEach(t=>{t.onclick=()=>switchCat(t.dataset.cat)});}
@@ -39,8 +39,11 @@ var SPACE=location.origin;
 <script src="/static/app_v2.js"></script>
 <script src="/static/yt_live.js"></script>
 <script src="/static/hot_multi.js"></script>
+<script src="/static/wc2026_v2.js"></script>
 <script src="/static/live_mode.js"></script>
 <script src="/static/match_detail_v6.js"></script>
+<script src="/static/wc_shorts_slide.js"></script>
+<script src="/static/wc_shorts_inject.js"></script>
 <script>init();</script>
 </body>
 </html>

static/wc_shorts_inject.js

@@ -1 +1,76 @@
-// removed
+/**
+ * WC Shorts Inject — Chạy SAU app_v2.js
+ * Tự tạo anchor DIV rồi render WC Shorts slide TRÊN World Cup section
+ */
+(function(){
+  'use strict';
+
+  function inject(){
+    // Tìm WC section
+    const wcSection = document.getElementById('wc2026-live-section');
+    const homeEl = document.getElementById('view-home');
+    if(!homeEl) return;
+
+    // Đã inject?
+    if(document.getElementById('wc-shorts-slide-section')) return;
+
+    // Đảm bảo renderWCSSlideSection đã load
+    if(typeof renderWCSSlideSection !== 'function'){
+      // Chờ rồi thử lại
+      setTimeout(inject, 500);
+      return;
+    }
+
+    // Tạo container rồi render vào
+    const div = document.createElement('div');
+    div.id = 'wc-shorts-slide-container-tmp';
+    div.style.display = 'none';
+
+    // Insert TRƯỚC WC section, hoặc vào đầu home
+    if(wcSection && wcSection.parentNode){
+      wcSection.parentNode.insertBefore(div, wcSection);
+    } else {
+      homeEl.insertBefore(div, homeEl.firstChild);
+    }
+
+    // Render slide section vào div
+    renderWCSSlideSection(div);
+
+    // Bỏ wrapper thừa, di chuyển section ra đúng vị trí
+    const section = div.querySelector('.wc-shorts-slide-section');
+    if(section){
+      section.id = 'wc-shorts-slide-section';
+      if(wcSection && wcSection.parentNode){
+        wcSection.parentNode.insertBefore(section, wcSection);
+      }
+      div.remove();
+    }
+  }
+
+  // Chạy khi DOM sẵn sàng
+  if(document.readyState === 'loading'){
+    document.addEventListener('DOMContentLoaded', ()=> setTimeout(inject, 800));
+  } else {
+    setTimeout(inject, 800);
+  }
+
+  // Cũng chạy sau khi loadHome xong
+  const origLoadHome = window.loadHome;
+  if(origLoadHome){
+    window.loadHome = function(){
+      const result = origLoadHome.apply(this, arguments);
+      setTimeout(inject, 200);
+      setTimeout(inject, 800);
+      setTimeout(inject, 2000);
+      return result;
+    };
+  }
+
+  // Fallback: retry nhiều lần
+  let retries = 0;
+  const retryIv = setInterval(()=>{
+    retries++;
+    inject();
+    if(retries > 20) clearInterval(retryIv);
+  }, 1000);
+})();

static/wc_shorts_slide.js

@@ -1 +1,597 @@
-// removed
+/**
+ * WC Shorts Slide — A standalone slide section ABOVE the World Cup section
+ * TikTok-style vertical feed with autoplay, titles, interaction buttons
+ * Each short = 1 fullscreen slide with scroll-snap
+ */
+(function(){
+  'use strict';
+
+  // ===== Inject CSS =====
+  if(document.getElementById('wc-shorts-slide-css')) return;
+  const style = document.createElement('style');
+  style.id = 'wc-shorts-slide-css';
+  style.textContent = `
+    /* === WC SHORTS SLIDE SECTION (above WC section) === */
+    .wc-shorts-slide-section {
+      margin: 6px 4px;
+      background: linear-gradient(135deg, #000 0%, #0a0a2e 50%, #0d1117 100%);
+      border: 1px solid #1a3a5a;
+      border-radius: 10px;
+      overflow: hidden;
+    }
+    .wc-shorts-slide-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 10px 12px 6px;
+    }
+    .wc-shorts-slide-header h3 {
+      font-size: 15px;
+      color: #fff;
+      font-weight: 800;
+      margin: 0;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+    .wc-shorts-slide-header h3 .emoji { font-size: 18px; }
+    .wc-shorts-slide-header .badge-live {
+      font-size: 9px;
+      color: #e74c3c;
+      font-weight: 700;
+      animation: wc-slide-pulse 1.5s infinite;
+    }
+    @keyframes wc-slide-pulse { 0%,100%{opacity:1} 50%{opacity:.4} }
+    .wc-shorts-slide-header .view-all-btn {
+      background: #0b6bcb;
+      border: none;
+      color: #fff;
+      padding: 5px 12px;
+      border-radius: 12px;
+      font-size: 10px;
+      font-weight: 700;
+      cursor: pointer;
+      white-space: nowrap;
+    }
+    .wc-shorts-slide-header .view-all-btn:active { opacity: .8; }
+
+    /* Horizontal thumbnail slider */
+    .wc-shorts-h-slider {
+      display: flex;
+      overflow-x: auto;
+      gap: 8px;
+      padding: 4px 10px 12px;
+      scroll-snap-type: x mandatory;
+      scrollbar-width: none;
+    }
+    .wc-shorts-h-slider::-webkit-scrollbar { display: none; }
+    .wc-shorts-h-item {
+      flex: 0 0 130px;
+      scroll-snap-align: start;
+      cursor: pointer;
+      border-radius: 8px;
+      overflow: hidden;
+      background: #0a1520;
+      border: 1px solid #1a3a5a;
+      transition: border-color .2s, transform .2s;
+      position: relative;
+    }
+    .wc-shorts-h-item:hover { border-color: #0b6bcb; transform: scale(1.03); }
+    .wc-shorts-h-item:active { transform: scale(.97); }
+    .wc-shorts-h-thumb {
+      position: relative;
+      width: 100%;
+      aspect-ratio: 9/16;
+      background: #1a2a3a;
+      overflow: hidden;
+    }
+    .wc-shorts-h-thumb img {
+      width: 100%; height: 100%; object-fit: cover;
+    }
+    .wc-shorts-h-thumb .h-play-icon {
+      position: absolute; left: 50%; top: 50%;
+      transform: translate(-50%, -50%);
+      width: 36px; height: 36px;
+      border-radius: 50%;
+      background: rgba(0,0,0,.6);
+      display: flex; align-items: center; justify-content: center;
+      color: #fff; font-size: 14px;
+    }
+    .wc-shorts-h-thumb .h-duration {
+      position: absolute; bottom: 4px; right: 4px;
+      background: rgba(0,0,0,.7);
+      font-size: 8px; color: #fff;
+      padding: 1px 4px; border-radius: 3px;
+    }
+    .wc-shorts-h-thumb .h-vtv-badge {
+      position: absolute; top: 4px; left: 4px;
+      background: rgba(11,107,203,.85);
+      font-size: 7px; color: #fff;
+      padding: 1px 5px; border-radius: 3px;
+      font-weight: 700;
+    }
+    .wc-shorts-h-info { padding: 5px 6px; }
+    .wc-shorts-h-info .h-title {
+      font-size: 9px; color: #ccc; line-height: 1.25;
+      display: -webkit-box; -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical; overflow: hidden;
+    }
+    .wc-shorts-empty-slider {
+      text-align: center; padding: 20px 10px; color: #666; font-size: 12px;
+      width: 100%;
+    }
+    .wc-shorts-empty-slider .reload-btn {
+      background: #0b6bcb; border: none; color: #fff;
+      padding: 6px 16px; border-radius: 14px; font-size: 11px;
+      font-weight: 700; cursor: pointer; margin-top: 10px;
+    }
+
+    /* === FULL-SCREEN TIKTOK OVERLAY (opened from slide) === */
+    .wc-st-overlay {
+      position: fixed; inset: 0; background: #000;
+      z-index: 99999; display: none; flex-direction: column;
+    }
+    .wc-st-overlay.active { display: flex; }
+    .wc-st-top-bar {
+      position: absolute; top: 0; left: 0; right: 0;
+      z-index: 10; padding: 10px 12px;
+      display: flex; align-items: center; justify-content: space-between;
+      background: linear-gradient(rgba(0,0,0,.7), transparent);
+    }
+    .wc-st-top-bar .back-btn {
+      background: rgba(255,255,255,.15);
+      border: none; color: #fff;
+      width: 36px; height: 36px; border-radius: 50%;
+      font-size: 18px; cursor: pointer;
+      display: flex; align-items: center; justify-content: center;
+    }
+    .wc-st-top-bar .st-counter {
+      color: #fff; font-size: 12px; font-weight: 600;
+      background: rgba(0,0,0,.4); padding: 3px 10px;
+      border-radius: 10px; backdrop-filter: blur(4px);
+    }
+
+    .wc-st-feed {
+      flex: 1; overflow-y: scroll;
+      scroll-snap-type: y mandatory;
+      scrollbar-width: none;
+    }
+    .wc-st-feed::-webkit-scrollbar { display: none; }
+
+    .wc-st-slide {
+      height: 100vh; width: 100%;
+      scroll-snap-align: start;
+      position: relative;
+      background: #000;
+      display: flex; align-items: center; justify-content: center;
+      overflow: hidden;
+    }
+    .wc-st-slide iframe {
+      width: 100%; height: 100%; border: none; background: #000;
+    }
+
+    /* Title & info overlay */
+    .wc-st-info {
+      position: absolute; bottom: 0; left: 0; right: 65px;
+      padding: 12px 14px 18px;
+      background: linear-gradient(transparent 0%, rgba(0,0,0,.65) 35%, rgba(0,0,0,.9) 100%);
+      z-index: 3; pointer-events: none;
+    }
+    .wc-st-info .st-channel {
+      display: inline-block; font-size: 9px; font-weight: 700;
+      padding: 2px 8px; border-radius: 10px; color: #fff;
+      background: #0b6bcb; margin-bottom: 8px;
+    }
+    .wc-st-info .st-title {
+      font-size: 14px; color: #fff; font-weight: 700;
+      line-height: 1.35; text-shadow: 0 1px 4px rgba(0,0,0,.7);
+      display: -webkit-box; -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical; overflow: hidden;
+    }
+    .wc-st-info .st-link {
+      display: inline-block; margin-top: 8px;
+      font-size: 11px; color: #8ab4d8; text-decoration: underline;
+      pointer-events: auto; cursor: pointer;
+    }
+
+    /* Right-side action buttons */
+    .wc-st-actions {
+      position: absolute; right: 8px; bottom: 90px;
+      display: flex; flex-direction: column; align-items: center;
+      gap: 16px; z-index: 5;
+    }
+    .wc-st-action {
+      display: flex; flex-direction: column; align-items: center; gap: 2px;
+      background: none; border: none; color: #fff; cursor: pointer;
+      font-size: 10px; text-shadow: 0 1px 3px rgba(0,0,0,.5);
+    }
+    .wc-st-action .a-icon {
+      width: 46px; height: 46px; border-radius: 50%;
+      background: rgba(255,255,255,.15);
+      display: flex; align-items: center; justify-content: center;
+      font-size: 20px; backdrop-filter: blur(4px);
+      transition: background .2s, transform .15s;
+    }
+    .wc-st-action:active .a-icon { transform: scale(.88); background: rgba(255,255,255,.3); }
+    .wc-st-action .a-count { font-size: 10px; color: #eee; font-weight: 600; }
+
+    /* Loading state */
+    .wc-st-loading {
+      position: absolute; inset: 0; display: flex;
+      flex-direction: column; align-items: center; justify-content: center;
+      gap: 12px; color: #888; font-size: 13px;
+    }
+    .wc-st-loading .spinner {
+      width: 28px; height: 28px;
+      border: 3px solid #333; border-top-color: #0b6bcb;
+      border-radius: 50%; animation: wcst-spin .8s linear infinite;
+    }
+    @keyframes wcst-spin { to { transform: rotate(360deg); } }
+
+    /* No shorts message */
+    .wc-st-nosho {
+      position: absolute; inset: 0; display: flex;
+      flex-direction: column; align-items: center; justify-content: center;
+      gap: 10px; color: #666; font-size: 14px; text-align: center; padding: 20px;
+    }
+    .wc-st-nosho .icon { font-size: 48px; }
+    .wc-st-nosho .retry-btn {
+      background: #0b6bcb; border: none; color: #fff;
+      padding: 10px 28px; border-radius: 20px;
+      font-size: 13px; font-weight: 700; cursor: pointer;
+    }
+  `;
+  document.head.appendChild(style);
+
+  // ===== State =====
+  let _wcSCached = null;        // cached shorts data
+  let _wcSOverlayTimer = null;   // auto-advance timer
+  let _wcSManualScroll = false;
+
+  // ===== Fetch shorts =====
+  async function fetchShorts(){
+    const endpoints = [
+      '/api/shorts/wc?count=50',
+      '/api/shorts/vtvnamo?count=50',
+      '/api/shorts?channel=vtvnambo',
+    ];
+    for(const ep of endpoints){
+      try{
+        const r = await fetch(ep, {signal: AbortSignal.timeout(12000)});
+        const data = await r.json();
+        if(Array.isArray(data) && data.length > 0){
+          // Deduplicate
+          const seen = new Set(), deduped = [];
+          for(const s of data){
+            if(!seen.has(s.id)){ seen.add(s.id); deduped.push(s); }
+          }
+          if(deduped.length > 0) return deduped;
+        }
+      }catch(e){ console.warn('WC Shorts fetch failed for', ep, e); }
+    }
+    return [];
+  }
+
+  // ===== Render the HORIZONTAL SLIDE (placed above WC section) =====
+  window.renderWCSSlideSection = async function(container){
+    const section = document.createElement('div');
+    section.className = 'wc-shorts-slide-section';
+    section.id = 'wc-shorts-slide-section';
+
+    // Header
+    section.innerHTML = `
+      <div class="wc-shorts-slide-header">
+        <h3><span class="emoji">📱</span> Shorts World Cup <span class="badge-live">● LIVE</span></h3>
+        <button class="view-all-btn" id="wc-st-viewall">Xem tất cả →</button>
+      </div>
+      <div class="wc-shorts-h-slider" id="wc-st-hslider">
+        <div style="width:100%;text-align:center;padding:20px;color:#666;font-size:12px">
+          <div class="spinner" style="width:20px;height:20px;border:2px solid #333;border-top-color:#0b6bcb;border-radius:50%;animation:wcst-spin .8s linear infinite;margin:0 auto 8px"></div>
+          Đang tải shorts...
+        </div>
+      </div>
+    `;
+    container.appendChild(section);
+
+    const slider = section.querySelector('#wc-st-hslider');
+    const viewAllBtn = section.querySelector('#wc-st-viewall');
+
+    // Fetch data
+    let shorts = await fetchShorts();
+    _wcSCached = shorts;
+
+    if(!shorts || !shorts.length){
+      slider.innerHTML = `<div class="wc-shorts-empty-slider">
+        <div>📱</div><div style="margin-top:6px;color:#888">Đang cập nhật shorts...</div>
+        <button class="reload-btn" onclick="renderWCSSlideSection(document.getElementById('wc-shorts-slide-section').parentNode)">Thử lại</button>
+      </div>`;
+      viewAllBtn.onclick = () => openWCSF(shorts || [], 0);
+      return;
+    }
+
+    // Render horizontal slider items
+    let h = '';
+    shorts.forEach((s, i)=>{
+      const thumbImg = s.img || `https://i.ytimg.com/vi/${s.id}/hqdefault.jpg`;
+      h += `<div class="wc-shorts-h-item" data-idx="${i}" onclick="openWCSF(_wcSCached, ${i})">`;
+      h += `<div class="wc-shorts-h-thumb">`;
+      h += `<img src="${escHtml(thumbImg)}" loading="lazy" onerror="this.style.display='none'">`;
+      h += `<span class="h-vtv-badge">VTV Nam Bộ</span>`;
+      h += `<div class="h-play-icon">▶</div>`;
+      h += `</div>`;
+      h += `<div class="wc-shorts-h-info"><div class="h-title">${escHtml(s.title)}</div></div>`;
+      h += `</div>`;
+    });
+    slider.innerHTML = h;
+
+    viewAllBtn.onclick = () => openWCSF(shorts, 0);
+  };
+
+  // ===== FULL-SCREEN TIKTOK OVERLAY =====
+  window.openWCSF = function(shorts, startIdx){
+    if(!shorts || !shorts.length){
+      // Try to fetch fresh
+      openWCSFLoading(startIdx);
+      return;
+    }
+    buildWCSF(shorts, startIdx);
+  };
+
+  function openWCSFLoading(startIdx){
+    const overlay = getOrCreateWCSFOverlay();
+    overlay.classList.add('active');
+    overlay.innerHTML = `<div class="wc-st-loading" style="position:absolute;inset:0;background:#000;z-index:100">
+      <div class="spinner"></div>Đang tải shorts...
+    </div>`;
+    fetchShorts().then(shorts => {
+      _wcSCached = shorts;
+      if(shorts && shorts.length){
+        buildWCSF(shorts, startIdx || 0);
+      } else {
+        overlay.innerHTML = `<div class="wc-st-nosho">
+          <div class="icon">📱</div><div>Không tải được shorts</div>
+          <button class="retry-btn" onclick="openWCSF(_wcSCached, ${startIdx||0})">Thử lại</button>
+          <button class="retry-btn" style="background:#333;margin-top:4px" onclick="closeWCSF()">Đóng</button>
+        </div>`;
+      }
+    }).catch(() => {
+      overlay.innerHTML = `<div class="wc-st-nosho">
+        <div class="icon">📱</div><div>Lỗi kết nối</div>
+        <button class="retry-btn" onclick="openWCSF(_wcSCached, ${startIdx||0})">Thử lại</button>
+      </div>`;
+    });
+  }
+
+  function getOrCreateWCSFOverlay(){
+    let overlay = document.getElementById('wc-st-overlay');
+    if(!overlay){
+      overlay = document.createElement('div');
+      overlay.id = 'wc-st-overlay';
+      overlay.className = 'wc-st-overlay';
+      document.body.appendChild(overlay);
+    }
+    return overlay;
+  }
+
+  window.closeWCSF = function(){
+    const overlay = document.getElementById('wc-st-overlay');
+    if(!overlay) return;
+    overlay.classList.remove('active');
+    overlay.innerHTML = '';
+    if(_wcSOverlayTimer){ clearInterval(_wcSOverlayTimer); _wcSOverlayTimer = null; }
+    // Stop any playing iframes
+    overlay.querySelectorAll('iframe').forEach(f => { f.src = ''; });
+  };
+
+  function buildWCSF(shorts, startIdx){
+    const overlay = getOrCreateWCSFOverlay();
+    overlay.classList.add('active');
+
+    // Rotate so startIdx is first
+    const ordered = startIdx > 0
+      ? [...shorts.slice(startIdx), ...shorts.slice(0, startIdx)]
+      : [...shorts];
+    const total = ordered.length;
+
+    // Build HTML
+    let h = '';
+    // Top bar
+    h += `<div class="wc-st-top-bar">
+      <button class="back-btn" onclick="closeWCSF()">←</button>
+      <span class="st-counter" id="wc-st-counter">1/${total}</span>
+    </div>`;
+
+    // Feed
+    h += `<div class="wc-st-feed" id="wc-st-feed">`;
+
+    ordered.forEach((s, i)=>{
+      const id = s.id || '';
+      const embedSrc = `https://www.youtube.com/embed/${id}?autoplay=0&rel=0&playsinline=1&mute=1&loop=1&playlist=${id}&enablejsapi=1&origin=${encodeURIComponent(location.origin)}`;
+
+      h += `<div class="wc-st-slide" data-vid="${escHtml('wcst-'+id)}" data-idx="${i}" data-ytid="${escHtml(id)}">`;
+      // iframe — lazy loaded, autoplay handled by scroll observer
+      h += `<iframe data-yt-src="${embedSrc}" allowfullscreen allow="accelerometer;autoplay;clipboard-write;encrypted-media;gyroscope;picture-in-picture;fullscreen"></iframe>`;
+
+      // Info overlay (title)
+      h += `<div class="wc-st-info">`;
+      h += `<span class="st-channel">VTV Nam Bộ</span>`;
+      h += `<div class="st-title">${escHtml(s.title)}</div>`;
+      h += `<span class="st-link" onclick="window.open('https://youtube.com/shorts/${escHtml(id)}','_blank')">Mở trên YouTube →</span>`;
+      h += `</div>`;
+
+      // Right action buttons
+      h += `<div class="wc-st-actions">`;
+      h += `<button class="wc-st-action" title="Xem" onclick="event.stopPropagation();wcSTTrack('${escHtml(id)}','view',${i})"><div class="a-icon">👁</div><span class="a-count" id="wcst-vc-${i}">0</span></button>`;
+      h += `<button class="wc-st-action" title="Thích" onclick="event.stopPropagation();wcSTTrack('${escHtml(id)}','like',${i})"><div class="a-icon">❤️</div><span class="a-count" id="wcst-lc-${i}">0</span></button>`;
+      h += `<button class="wc-st-action" title="Chia sẻ" onclick="event.stopPropagation();wcSTShare('${escHtml(id)}')"><div class="a-icon">📤</div></button>`;
+      h += `<button class="wc-st-action" title="YouTube" onclick="event.stopPropagation();window.open('https://youtube.com/shorts/${escHtml(id)}','_blank')"><div class="a-icon">🔗</div></button>`;
+      h += `</div>`;
+
+      h += `</div>`;
+    });
+
+    h += `</div>`; // end feed
+    overlay.innerHTML = h;
+
+    // Init autoplay on scroll
+    initWCSFAutoplay(ordered);
+
+    // Load stats
+    loadWCSFStats(ordered);
+  }
+
+  // ===== Autoplay on scroll (intersection observer) =====
+  function initWCSFAutoplay(shorts){
+    const feed = document.getElementById('wc-st-feed');
+    if(!feed) return;
+    const slides = feed.querySelectorAll('.wc-st-slide');
+    let curIdx = -1;
+    _wcSManualScroll = false;
+    let manualTimer = null;
+
+    function activate(idx){
+      if(idx === curIdx || idx < 0 || idx >= slides.length) return;
+      slides.forEach((sl, j)=>{
+        const fr = sl.querySelector('iframe');
+        if(j === idx){
+          // Load iframe if needed
+          if(fr && !fr.src && fr.dataset.ytSrc){ fr.src = fr.dataset.ytSrc; }
+          // Play (with mute to satisfy autoplay policy)
+          if(fr && fr.src){
+            setTimeout(()=>{
+              try{
+                fr.contentWindow.postMessage(JSON.stringify({event:'command',func:'mute',args:''}),'*');
+                fr.contentWindow.postMessage(JSON.stringify({event:'command',func:'playVideo',args:''}),'*');
+              }catch(e){}
+            }, 400);
+          }
+        } else {
+          // Pause others
+          if(fr && fr.src){
+            try{ fr.contentWindow.postMessage(JSON.stringify({event:'command',func:'pauseVideo',args:''}),'*'); }catch(e){}
+          }
+        }
+      });
+      curIdx = idx;
+      // Update counter
+      const counter = document.getElementById('wc-st-counter');
+      if(counter) counter.textContent = `${idx+1}/${shorts.length}`;
+    }
+
+    // Use IntersectionObserver for precise snap detection
+    const io = new IntersectionObserver((entries)=>{
+      if(_wcSManualScroll) return;
+      entries.forEach(entry=>{
+        if(entry.isIntersecting && entry.intersectionRatio > 0.6){
+          const idx = parseInt(entry.target.dataset.idx);
+          if(!isNaN(idx)) activate(idx);
+        }
+      });
+    }, {threshold: [0.6], root: feed});
+
+    slides.forEach(sl => io.observe(sl));
+
+    // Scroll event for manual detection (fallback)
+    let scrollTimer;
+    feed.addEventListener('scroll', ()=>{
+      _wcSManualScroll = true;
+      clearTimeout(manualTimer);
+      manualTimer = setTimeout(()=>{ _wcSManualScroll = false; }, 3000);
+      clearTimeout(scrollTimer);
+      scrollTimer = setTimeout(()=>{
+        const rect = feed.getBoundingClientRect();
+        const ctr = rect.top + rect.height / 2;
+        let best = -1, bestD = 1e9;
+        slides.forEach((sl,i)=>{
+          const r = sl.getBoundingClientRect();
+          const d = Math.abs(r.top + r.height/2 - ctr);
+          if(d < bestD){ bestD = d; best = i; }
+        });
+        if(best >= 0) activate(best);
+      }, 100);
+    }, {passive: true});
+
+    // Auto-advance every 12 seconds
+    if(_wcSOverlayTimer) clearInterval(_wcSOverlayTimer);
+    _wcSOverlayTimer = setInterval(()=>{
+      if(_wcSManualScroll) return;
+      if(!document.getElementById('wc-st-feed')){ clearInterval(_wcSOverlayTimer); _wcSOverlayTimer = null; return; }
+      const next = curIdx + 1;
+      if(next < slides.length){
+        slides[next].scrollIntoView({behavior:'smooth', block:'start'});
+      } else {
+        slides[0].scrollIntoView({behavior:'smooth', block:'start'});
+      }
+    }, 12000);
+
+    // Activate first after short delay
+    setTimeout(()=>{
+      if(slides.length > 0){ slides[0].scrollIntoView({behavior:'start'}); activate(0); }
+    }, 300);
+  }
+
+  // ===== Interaction tracking =====
+  window.wcSTTrack = async function(videoId, type, idx){
+    try{
+      const r = await fetch('/api/short-action', {
+        method:'POST', headers:{'Content-Type':'application/json'},
+        body: JSON.stringify({id:videoId, action:type})
+      });
+      const j = await r.json();
+      if(j && j.stats){
+        if(idx !== undefined){
+          const vc = document.getElementById(`wcst-vc-${idx}`);
+          const lc = document.getElementById(`wcst-lc-${idx}`);
+          if(type==='view' && vc) vc.textContent = fmtNum(j.stats.views);
+          if(type==='like' && lc) lc.textContent = fmtNum(j.stats.likes);
+        }
+      }
+    }catch(e){ console.warn('Track error:', e); }
+  };
+
+  window.wcSTShare = function(videoId){
+    const url = 'https://youtube.com/shorts/' + videoId;
+    if(navigator.share){
+      navigator.share({title:'Short World Cup', url}).catch(()=>{});
+    } else {
+      navigator.clipboard.writeText(url).then(()=>alert('Đã sao chép link!')).catch(()=>{});
+    }
+  };
+
+  async function loadWCSFStats(shorts){
+    const ids = shorts.map(s=>s.id).filter(Boolean);
+    if(!ids.length) return;
+    // Batch in groups of 20
+    for(let i=0;i<ids.length;i+=20){
+      const batch = ids.slice(i,i+20).join(',');
+      try{
+        const r = await fetch('/api/short-stats?ids='+batch);
+        const j = await r.json();
+        if(j.stats){
+          shorts.forEach((s,idx)=>{
+            const st = j.stats[s.id];
+            if(st){
+              const vc = document.getElementById(`wcst-vc-${idx}`);
+              const lc = document.getElementById(`wcst-lc-${idx}`);
+              if(vc) vc.textContent = fmtNum(st.views);
+              if(lc) lc.textContent = fmtNum(st.likes);
+            }
+          });
+        }
+      }catch(e){}
+    }
+  }
+
+  function fmtNum(n){
+    if(!n) return '0';
+    if(n>=1e6) return (n/1e6).toFixed(1)+'M';
+    if(n>=1e3) return (n/1e3).toFixed(1)+'K';
+    return String(n);
+  }
+
+  // ===== Helpers =====
+  function escHtml(s){
+    return String(s||'').replace(/[&<>"']/g,m=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));
+  }
+
+})();

static/yt_live.js

@@ -1,5 +1,3 @@
-
-
 // === VNEWS — VTV LIVE + Inline Recorder v6 ===
 // 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
@@ -750,7 +748,7 @@
   function activateMiniPlayer(){
     if(!_currentCh) return; createMiniPlayer(); _miniActive=true;
     const mini=document.getElementById('vtv-mini'); const mv=document.getElementById('vtv-mini-vid'); const v=document.getElementById('vtv-player');
-    if(_hls){const h=new Hls({enableWorker:false,lowLatencyMode:true,startLevel:0,capLevelToPlayerSize:true,maxBufferLength:6,maxMaxBufferLength:10,debug:false}); h.loadSource(STREAMS[_currentCh][0]); h.attachMedia(mv); mv.play().catch(e=>console.log('[VTV] mini play rejected:',e));}
+    if(_hls){const h=new Hls({enableWorker:true,lowLatencyMode:true,startLevel:-1,capLevelToPlayerSize:true,maxBufferLength:10}); h.loadSource(STREAMS[_currentCh][0]); h.attachMedia(mv); mv.play().catch(()=>{});}
     else if(v&&v.src){mv.src=v.src; mv.play().catch(()=>{});}
     const ch=CHANNELS.find(c=>c.id===_currentCh); if(ch) document.getElementById('vtv-mini-ch').textContent=ch.name;
     fetch('/api/vtv/epg/'+_currentCh).then(r=>r.json()).then(d=>{const p=d.programs||[]; const n=p.find(x=>x.now); document.getElementById('vtv-mini-epg').textContent=n?n.time+' '+n.title:(p[0]?p[0].time+' '+p[0].title:'');}).catch(()=>{});
@@ -761,9 +759,8 @@
   async function loadAllStreams(){
     if(_loading) return; _loading=true;
     const el=document.getElementById('vtv-load'); if(el) el.innerHTML='<div class="vtv-spinner"></div>Đang tải kênh...';
-    let d={};
-    try{const r=await fetch('/api/vtv/streams',{signal:AbortSignal.timeout(10000)}); if(r.ok){d=await r.json(); CHANNELS.forEach(ch=>{const i=d[ch.id]; if(i&&i.stream_url){let u='/api/proxy/stream/vtv?channel_id='+ch.id; STREAMS[ch.id]=[u];} else {STREAMS[ch.id]=[]; if(i&&i.status==='offline') STREAMS[ch.id]=['OFFLINE'];}});}}catch(e){}
-    CHANNELS.forEach(ch=>{const t=document.getElementById('vtvt-'+ch.id); if(t){const data=d[ch.id]; if(STREAMS[ch.id]&&STREAMS[ch.id].length>0){t.classList.remove('off'); t.textContent=ch.name;}else if(data&&data.status==='unavailable'){t.style.opacity='0.35'; t.textContent=ch.name+' 🔒';}else{t.style.opacity='0.35'; t.textContent=ch.name+' ✕';}}});
+    try{const r=await fetch('/api/vtv/streams',{signal:AbortSignal.timeout(10000)}); if(r.ok){const d=await r.json(); CHANNELS.forEach(ch=>{const i=d[ch.id]; if(i&&i.stream_url){let u=i.stream_url; if(NEEDS_PROXY.test(u)) u='/api/proxy/m3u8/vtv?url='+encodeURIComponent(u); STREAMS[ch.id]=[u];} else STREAMS[ch.id]=[];});}}catch(e){}
+    CHANNELS.forEach(ch=>{const t=document.getElementById('vtvt-'+ch.id); if(t){if(STREAMS[ch.id]&&STREAMS[ch.id].length>0){t.classList.remove('off'); t.textContent=ch.name;}else{t.style.opacity='0.35'; t.textContent=ch.name+' ✕';}}});
     _loading=false; _streamsLoaded=true;
   }
 
@@ -772,7 +769,7 @@
     let tabs=''; CHANNELS.forEach(ch=>{tabs+='<button class="vtv-tab off" id="vtvt-'+ch.id+'" onclick="window._vtvPlay(\''+ch.id+'\')">'+ch.name+'</button>';});
     w.innerHTML='<div class="vtv-head"><span class="vtv-title">📺 VTV Trực Tuyến</span><span class="vtv-badge">● LIVE</span></div>'+
       '<div class="vtv-tabs">'+tabs+'</div>'+
-      '<div class="vtv-frame"><div class="vtv-load" id="vtv-load"><div class="vtv-spinner"></div>Đang tải kênh...</div><video id="vtv-player" playsinline muted controls preload="auto" style="display:block;opacity:0.3" onclick="this.play()"></video><div class="vtv-err" id="vtv-err" style="display:none"><span id="vtv-err-msg">Không thể tải kênh</span><button onclick="window._vtvRetry()">Thử lại</button></div></div>'+
+      '<div class="vtv-frame"><div class="vtv-load" id="vtv-load"><div class="vtv-spinner"></div>Đang tải kênh...</div><video id="vtv-player" playsinline muted controls preload="auto" style="display:none"></video><div class="vtv-err" id="vtv-err" style="display:none"><span id="vtv-err-msg">Không thể tải kênh</span><button onclick="window._vtvRetry()">Thử lại</button></div></div>'+
       '<div class="vtv-controls"><button class="vtv-pip-btn" id="vtv-pip-btn" onclick="window._vtvTogglePiP()"><svg viewBox="0 0 24 24"><rect x="2" y="4" width="20" height="16" rx="2" fill="none" stroke="currentColor" stroke-width="2"/><rect x="12" y="10" width="8" height="6" rx="1" fill="currentColor"/></svg>PiP</button><span style="flex:1"></span><span style="font-size:9px;color:#666" id="vtv-status"></span></div>'+
       '<div class="vtv-epg" id="vtv-epg"><div class="vtv-epg-header"><span class="vtv-epg-title">📋 Lịch phát sóng</span><button class="vtv-epg-toggle" id="vtv-epg-toggle" onclick="window._vtvToggleEpg()">Ẩn</button></div><div class="vtv-epg-list" id="vtv-epg-list"><div class="vtv-epg-loading"><div class="vtv-epg-sp"></div>Đang tải...</div></div></div>';
     return w;
@@ -796,79 +793,28 @@
 
   window._vtvRetry=function(){if(_currentCh)window._vtvPlay(_currentCh);};
 
-  window._vtvPlay=function(chId){try{
+  window._vtvPlay=function(chId){
     const ch=CHANNELS.find(c=>c.id===chId); if(!ch) return; _currentCh=chId;
     document.querySelectorAll('.vtv-tab').forEach(t=>t.classList.remove('on'));
     const tab=document.getElementById('vtvt-'+chId); if(tab) tab.classList.add('on');
     const video=document.getElementById('vtv-player'); const errEl=document.getElementById('vtv-err'); const loadEl=document.getElementById('vtv-load'); const errMsg=document.getElementById('vtv-err-msg');
-    video.style.display='block'; video.style.opacity='0.3'; errEl.style.display='none'; loadEl.style.display='flex';
+    video.style.display='none'; errEl.style.display='none'; loadEl.style.display='flex';
     loadEl.innerHTML='<div class="vtv-spinner"></div>Đang kết nối '+ch.name+'...';
     if(_hls){_hls.destroy();_hls=null;}
     const urls=STREAMS[chId]||[];
-    if(!urls.length||urls[0]==='OFFLINE'){loadEl.style.display='none';errEl.style.display='flex';errMsg.textContent=chId==='vtvprime'?'VTVPrime: Kênh trả phí/chưa hỗ trợ.':chId==='vtv10'?'VTV Cần Thơ: Chưa có luồng public.':chId==='vtv3'||chId==='vtv9'?ch.name+': Kênh đang bảo trì, vui lòng thử lại sau.':ch.name+': Không có luồng.';return;}
+    if(!urls.length){loadEl.style.display='none';errEl.style.display='flex';errMsg.textContent=chId==='vtvprime'?'VTVPrime: Kênh trả phí.':ch.name+': Không có luồng.';return;}
     _tryPlay(video,urls,0,ch.name,loadEl,errEl,errMsg);
     loadEpg(chId);
-    }catch(e){console.log('[VTV] Play error:',e);} if(_miniActive){document.getElementById('vtv-mini-ch').textContent=ch.name;fetch('/api/vtv/epg/'+_currentCh).then(r=>r.json()).then(d=>{const p=d.programs||[];const n=p.find(x=>x.now);document.getElementById('vtv-mini-epg').textContent=n?n.time+' '+n.title:(p[0]?p[0].time+' '+p[0].title:'');}).catch(()=>{});}
+    if(_miniActive){document.getElementById('vtv-mini-ch').textContent=ch.name;fetch('/api/vtv/epg/'+_currentCh).then(r=>r.json()).then(d=>{const p=d.programs||[];const n=p.find(x=>x.now);document.getElementById('vtv-mini-epg').textContent=n?n.time+' '+n.title:(p[0]?p[0].time+' '+p[0].title:'');}).catch(()=>{});}
   };
 
-  function _tryPlay(video,urls,idx,name,loadEl,errEl,errMsg){try{
+  function _tryPlay(video,urls,idx,name,loadEl,errEl,errMsg){
     if(idx>=urls.length){loadEl.style.display='none';errEl.style.display='flex';errMsg.textContent=name+': Tất cả nguồn lỗi.';return;}
     const src=urls[idx]; loadEl.innerHTML='<div class="vtv-spinner"></div>Kết nối '+name+' ('+(idx+1)+'/'+urls.length+')...';
     if(typeof Hls!=='undefined'&&Hls.isSupported()){
-      const hls=new Hls({enableWorker:false,lowLatencyMode:true,startLevel:0,capLevelToPlayerSize:true,maxBufferLength:8,maxMaxBufferLength:16,debug:false}); _hls=hls;
-      // Log ALL events for debugging
-      hls.on(Hls.Events.MEDIA_ATTACHING,()=>console.log('[VTV] MEDIA_ATTACHING'));
-      hls.on(Hls.Events.MEDIA_ATTACHED,()=>console.log('[VTV] MEDIA_ATTACHED'));
-      hls.on(Hls.Events.MANIFEST_LOADING,()=>console.log('[VTV] MANIFEST_LOADING',src));
-      hls.on(Hls.Events.MANIFEST_LOADED,()=>console.log('[VTV] MANIFEST_LOADED'));
-      hls.on(Hls.Events.MANIFEST_PARSED,(ev,data)=>{
-        const st=document.getElementById('vtv-status');
-        if(st) st.textContent='✅ Manifest OK | '+data.levels.length+' levels | '+(data.levels[0]?data.levels[0].width+'x'+data.levels[0].height:'?');
-        console.log('[VTV] MANIFEST_PARSED levels:',data.levels.length);
-        loadEl.style.display='none';video.style.opacity='1';video.style.display='block';setTimeout(()=>{
-          video.play().then(()=>{
-            if(st) st.textContent+=' | ▶ Playing';
-            console.log('[VTV] play OK');
-          }).catch(e=>{
-            if(st) st.textContent+=' | ⚠️ Play blocked: '+e;
-            console.log('[VTV] play:',e);
-          });
-        },100);
-      });
-      hls.on(Hls.Events.LEVEL_LOADING,(ev,l)=>console.log('[VTV] LEVEL_LOADING',l));
-      hls.on(Hls.Events.LEVEL_LOADED,(ev,l)=>console.log('[VTV] LEVEL_LOADED',l));
-      hls.on(Hls.Events.FRAG_LOADING,(ev,f)=>console.log('[VTV] FRAG_LOADING',f&&f.url&&f.url.substring(0,80)));
-      hls.on(Hls.Events.FRAG_LOADED,(ev,f)=>console.log('[VTV] FRAG_LOADED size:',f&&f.frag&&f.frag.data&&f.frag.data.length));
-      hls.on(Hls.Events.FRAG_BUFFERED,(ev,f)=>{
-        try{
-          const _n=f&&f.frag&&f.frag.sn;
-          const _st2=document.getElementById('vtv-status');
-          if(_st2&&_n) _st2.textContent='📦 Buffered frag #'+_n;
-          console.log('[VTV] FRAG_BUFFERED',f&&f.frag&&f.frag.url&&f.frag.url.substring(0,60));
-        }catch(e){}});
-      hls.on(Hls.Events.FRAG_PARSING_INIT_SEGMENT,()=>console.log('[VTV] FRAG_PARSING_INIT_SEGMENT'));
-      hls.on(Hls.Events.FRAG_PARSING_DATA,()=>console.log('[VTV] FRAG_PARSING_DATA'));
-      hls.on(Hls.Events.FRAG_PARSED,()=>console.log('[VTV] FRAG_PARSED'));
-      hls.on(Hls.Events.BUFFER_CREATED,()=>console.log('[VTV] BUFFER_CREATED'));
-      hls.on(Hls.Events.BUFFER_APPENDING,()=>console.log('[VTV] BUFFER_APPENDING'));
-      hls.on(Hls.Events.BUFFER_APPENDED,()=>console.log('[VTV] BUFFER_APPENDED'));
-      hls.on(Hls.Events.BUFFER_EOS,()=>console.log('[VTV] BUFFER_EOS'));
-      hls.on(Hls.Events.BUFFER_FLUSHING,()=>console.log('[VTV] BUFFER_FLUSHING'));
-      hls.on(Hls.Events.LEVEL_SWITCHING,(ev,d)=>console.log('[VTV] LEVEL_SWITCHING',d));
-      hls.on(Hls.Events.LEVEL_SWITCHED,(ev,d)=>console.log('[VTV] LEVEL_SWITCHED',d));
-      let rec=0; hls.on(Hls.Events.ERROR,(ev,data)=>{
-        const _st=document.getElementById('vtv-status');
-        if(_st) _st.textContent='❌ '+data.type+' | '+data.details+(data.fatal?' [FATAL]':'');
-        console.log('[VTV] ERROR type:',data.type,'details:',data.details,'fatal:',data.fatal,'reason:',data.reason,'url:',data.url&&data.url.substring(0,80));
-        if(data.fatal){
-          if(data.type===Hls.ErrorTypes.NETWORK_ERROR){
-            rec++;if(rec<=3){console.log('[VTV] retry',rec);setTimeout(()=>hls.startLoad(),2000);}
-            else{hls.destroy();_hls=null;_tryPlay(video,urls,idx+1,name,loadEl,errEl,errMsg);}
-          }else if(data.type===Hls.ErrorTypes.MEDIA_ERROR){
-            console.log('[VTV] MEDIA_ERROR, trying recover');
-            try{hls.recoverMediaError();}catch(e){console.log('[VTV] recover failed',e);hls.destroy();_hls=null;}
-          }else{console.log('[VTV] other fatal error');hls.destroy();_hls=null;_tryPlay(video,urls,idx+1,name,loadEl,errEl,errMsg);}
-        }});
+      const hls=new Hls({enableWorker:true,lowLatencyMode:true,startLevel:-1,capLevelToPlayerSize:true,maxBufferLength:20}); _hls=hls; hls.loadSource(src); hls.attachMedia(video);
+      hls.on(Hls.Events.MANIFEST_PARSED,()=>{video.play().catch(()=>{});loadEl.style.display='none';video.style.display='block';});
+      let rec=0; hls.on(Hls.Events.ERROR,(ev,data)=>{if(data.fatal){if(data.type===Hls.ErrorTypes.NETWORK_ERROR){rec++;if(rec<=3)setTimeout(()=>hls.startLoad(),2000);else{hls.destroy();_hls=null;_tryPlay(video,urls,idx+1,name,loadEl,errEl,errMsg);}}else if(data.type===Hls.ErrorTypes.MEDIA_ERROR){try{hls.recoverMediaError();}catch(e){}}else{hls.destroy();_hls=null;_tryPlay(video,urls,idx+1,name,loadEl,errEl,errMsg);}}});
     }else if(video.canPlayType('application/vnd.apple.mpegurl')){
       video.src=src;
       video.addEventListener('loadedmetadata',()=>{video.play().catch(()=>{});loadEl.style.display='none';video.style.display='block';},{once:true});
@@ -876,44 +822,15 @@
     }else{loadEl.style.display='none';errEl.style.display='flex';errMsg.textContent='Không hỗ trợ HLS';}
   }
 
-  }catch(e){console.log('[VTV] _tryPlay error:',e);}
-
   // ===== NAV HOOKS =====
   const _origShowView=window.showView;
   window.showView=function(id){if(id==='view-home'&&_miniActive)closeMiniPlayer();else if(id!=='view-home'&&_currentCh&&STREAMS[_currentCh]&&STREAMS[_currentCh].length>0&&!_miniActive)activateMiniPlayer();return _origShowView.apply(this,arguments);};
   const _origReadArticle=window.readArticle; if(_origReadArticle){window.readArticle=function(url){if(_currentCh&&STREAMS[_currentCh]&&STREAMS[_currentCh].length>0&&!_miniActive)activateMiniPlayer();return _origReadArticle.apply(this,arguments);};}
-  const _origSwitchCat=window.switchCat;
-  if(_origSwitchCat){
-    window.switchCat=function(id){
-      if(id==='home'){if(_miniActive)closeMiniPlayer();}
-      else if(_currentCh&&STREAMS[_currentCh]&&STREAMS[_currentCh].length>0&&!_miniActive)activateMiniPlayer();
-      const r=_origSwitchCat.apply(this,arguments);
-      // Pin VTV block whenever home tab becomes active
-      if(id==='home'){setTimeout(()=>pinBlock(),100);}
-      return r;
-    };
-  }
+  const _origSwitchCat=window.switchCat; if(_origSwitchCat){window.switchCat=function(id){if(id==='home'){if(_miniActive)closeMiniPlayer();}else if(_currentCh&&STREAMS[_currentCh]&&STREAMS[_currentCh].length>0&&!_miniActive)activateMiniPlayer();return _origSwitchCat.apply(this,arguments);};}
 
-  // ===== SELF-PIN: pin VTV block directly, no dependency on loadHome =====
-  // Try immediately if DOM ready, otherwise wait for DOMContentLoaded
-  let _pinAttempts=0;
-  function _tryPin(){
-    if(_blockInserted) return;
-    _pinAttempts++;
-    if(_pinAttempts>30) return; // give up after ~15s
-    const h=document.getElementById('view-home');
-    if(h && h.children.length>0 && document.getElementById('vtv-block')){
-      _blockInserted=true; return; // already pinned
-    }
-    if(h && h.children.length>0){
-      pinBlock();
-    } else {
-      setTimeout(_tryPin, 500);
-    }
-  }
-  if(document.readyState==='loading'){
-    document.addEventListener('DOMContentLoaded', _tryPin);
-  } else {
-    _tryPin();
+  const _origLoadHome=window.loadHome;
+  if(_origLoadHome&&!_origLoadHome.__vtvWrapped){
+    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

@@ -1,19 +1,14 @@
 """
 VTV Channels API - Backend endpoints for VTV1-VTV10 + VTVPrime
-Stream sources:
-  1. VTVGo CDN (vtvgolive-failover.vtvdigital.vn) — PRIMARY, works for vtv1-vtv9
-  2. fptplay CDN — FALLBACK for vtv6 only (others blocked)
-  3. xemtv.net PHP — DEAD (all 403 from Cloudflare)
+Fetches stream URLs from hd.xemtv.net PHP endpoints
 EPG data scraped from https://vtv.vn/lich-phat-song.htm
 """
 import re, time, threading
 import requests
 from fastapi import APIRouter, Query
-from fastapi.responses import JSONResponse, Response, HTMLResponse
+from fastapi.responses import JSONResponse, Response
 from bs4 import BeautifulSoup
 from datetime import datetime, timedelta, timezone
-import warnings
-warnings.filterwarnings("ignore")
 
 VN_TZ = timezone(timedelta(hours=7))
 
@@ -22,10 +17,23 @@ router = APIRouter()
 UA = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
     "Accept-Language": "vi-VN,vi;q=0.9",
-    "Referer": "https://vtv.vn/",
+    "Referer": "https://hd.xemtv.net/",
+}
+
+XEMTV_PHP_ENDPOINTS = {
+    "vtv1":  "https://hd.xemtv.net/kenh/vtv1.php",
+    "vtv2":  "https://hd.xemtv.net/kenh/vtv2.php",
+    "vtv3":  "https://hd.xemtv.net/kenh/vtv3.php",
+    "vtv4":  "https://hd.xemtv.net/kenh/vtv4.php",
+    "vtv5":  "https://hd.xemtv.net/kenh/vtv5.php",
+    "vtv6":  "https://hd.xemtv.net/kenh/vtv6.php",
+    "vtv7":  "https://hd.xemtv.net/kenh/vtv7.php",
+    "vtv8":  "https://hd.xemtv.net/kenh/vtv8.php",
+    "vtv9":  "https://hd.xemtv.net/kenh/vtv9.php",
+    "vtv10": "https://hd.xemtv.net/kenh/vtv10.php",
+    "vtvprime": "https://hd.xemtv.net/kenh/vtvprime.php",
 }
 
-# ===== CHANNEL DEFINITIONS =====
 CHANNEL_NAMES = {
     "vtv1":  "VTV1",
     "vtv2":  "VTV2",
@@ -36,37 +44,36 @@ CHANNEL_NAMES = {
     "vtv7":  "VTV7",
     "vtv8":  "VTV8",
     "vtv9":  "VTV9",
-    "vtv10": "VTV Cần Thơ",
+    "vtv10": "VTV10",
     "vtvprime": "VTVPrime",
 }
 
-# ===== PRIMARY: VTVGo CDN (self-signed cert, need verify=False) =====
-# Confirmed working (2026-06-16): vtv1, vtv2, vtv4, vtv5, vtv6, vtv7, vtv8
-# Not available: vtv3 (404), vtv9 (404), vtv10 (404), vtvprime (404)
-VTVGO_CDN = {
+VTVGO_FAILOVER = {
     "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",
 }
 
-# ===== FALLBACK: fptplay CDN =====
-# Only vtv6 confirmed working (others return 403)
+XEMTV_ONLY_CHANNELS = {"vtv6", "vtv10"}
+
 FPTPLAY_URLS = {
+    "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",
     "vtv6":  "https://live-a.fptplay53.net/live/media/vtv6/live247-hls-avc/vtv6-avc1_5600000=10000-mp4a_131600=20000.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",
 }
 
-# ===== DEAD: xemtv.net (all 403 from Cloudflare, kept for reference) =====
-# XEMTV_PHP_ENDPOINTS = { ... }  # All dead as of 2026-06
-
-# Channels with no public stream available on any CDN
-# vtv3, vtv9: VTVGo CDN returned 404 as of 2026-06-16
-# vtv10, vtvprime: never had public streams
-UNAVAILABLE_CHANNELS = {"vtv3", "vtv9", "vtv10", "vtvprime"}
-
 _vtv_cache = {}
 _vtv_lock = threading.Lock()
 _CACHE_TTL = 180
@@ -81,32 +88,50 @@ def _set_cache(key, data):
     with _vtv_lock:
         _vtv_cache[key] = {'t': time.time(), 'd': data}
 
-def check_vtvgo_stream(url):
-    """Check if a VTVGo CDN URL returns valid m3u8. Uses verify=False for self-signed cert."""
-    try:
-        r = requests.get(url, headers=UA, timeout=10, allow_redirects=True, verify=False)
-        if r.status_code == 200 and "#EXTM3U" in (r.text[:200] if r.text else ""):
+def extract_m3u8_from_html(html):
+    if not html:
+        return None
+    m = re.search(r"file\s*:\s*['\"]([^'\"]*\.m3u8[^'\"]*)['\"]", html, re.IGNORECASE)
+    if m:
+        url = m.group(1).strip()
+        if len(url) > 20:
             return url
+    m = re.search(r"(https?://[^\s\"'<>\\]+\.m3u8[^\s\"'<>\\]*)", html, re.IGNORECASE)
+    if m:
+        url = m.group(1).strip()
+        if len(url) > 20:
+            return url
+    return None
+
+def fetch_xemtv_stream(channel_id):
+    php_url = XEMTV_PHP_ENDPOINTS.get(channel_id)
+    if not php_url:
+        return None
+    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:
+                return m3u8
     except:
         pass
     return None
 
-def check_fptplay_stream(url):
-    """Check if a fptplay URL returns valid m3u8."""
+def fetch_fptplay_stream(channel_id):
+    url = FPTPLAY_URLS.get(channel_id)
+    if not url:
+        return None
     try:
         headers = {"User-Agent": UA["User-Agent"], "Referer": "https://fptplay.vn/", "Origin": "https://fptplay.vn"}
-        r = requests.get(url, headers=headers, timeout=10, allow_redirects=True)
-        if r.status_code == 200 and "#EXTM3U" in (r.text[:200] if r.text else ""):
+        r = requests.get(url, headers=headers, timeout=15, allow_redirects=True)
+        if r.status_code == 200:
             return url
     except:
         pass
     return None
 
 def fetch_vtv_stream(channel_id):
-    """Fetch stream URL for a VTV channel. Tries VTVGo CDN first, then fptplay fallback."""
     channel_id = channel_id.lower().strip()
-    
-    # Normalize name
     name_map = {
         'vtvct': 'vtv10', 'vtv-can-tho': 'vtv10', 'vtv can tho': 'vtv10',
         'vtv_can_tho': 'vtv10', 'cantho': 'vtv10',
@@ -115,63 +140,65 @@ def fetch_vtv_stream(channel_id):
         'vietnam_vtv7': 'vtv7', 'vietnam_vtv8': 'vtv8', 'vietnam_vtv9': 'vtv9',
     }
     channel_id = name_map.get(channel_id, channel_id)
-    
     cached = _cached(channel_id)
     if cached is not None:
         return cached
 
-    # Check if channel is known to be unavailable
-    if channel_id in UNAVAILABLE_CHANNELS:
+    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
 
-    # PRIMARY: VTVGo CDN (vtv1-vtv9)
-    if channel_id in VTVGO_CDN:
-        result = check_vtvgo_stream(VTVGO_CDN[channel_id])
-        if result:
-            _set_cache(channel_id, result)
-            return result
+    if channel_id in VTVGO_FAILOVER:
+        result = VTVGO_FAILOVER[channel_id]
+        _set_cache(channel_id, result)
+        return result
 
-    # FALLBACK: fptplay CDN
-    if channel_id in FPTPLAY_URLS:
-        result = check_fptplay_stream(FPTPLAY_URLS[channel_id])
-        if result:
-            _set_cache(channel_id, result)
-            return result
+    if channel_id == 'vtvprime':
+        xemtv_url = fetch_xemtv_stream('vtvprime')
+        if xemtv_url:
+            _set_cache(channel_id, xemtv_url)
+            return xemtv_url
+        _set_cache(channel_id, None)
+        return None
+
+    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)
+    if fpt_url:
+        _set_cache(channel_id, fpt_url)
+        return fpt_url
 
     _set_cache(channel_id, None)
     return None
 
 @router.get("/api/vtv/streams")
 def api_vtv_streams():
-    """Get all VTV channel streams. Returns status for each channel."""
     result = {}
-    for ch_id, name in CHANNEL_NAMES.items():
-        stream_url = None
-        if ch_id not in UNAVAILABLE_CHANNELS:
-            stream_url = fetch_vtv_stream(ch_id)
-        
-        if stream_url:
-            result[ch_id] = {"name": name, "stream_url": stream_url, "status": "ok"}
-        elif ch_id in UNAVAILABLE_CHANNELS:
-            result[ch_id] = {"name": name, "stream_url": None, "status": "unavailable"}
-        else:
-            result[ch_id] = {"name": name, "stream_url": None, "status": "offline"}
+    for ch_id in CHANNEL_NAMES:
+        stream_url = fetch_vtv_stream(ch_id)
+        result[ch_id] = {"name": CHANNEL_NAMES[ch_id], "stream_url": stream_url, "status": "ok" if stream_url else "offline"}
     return JSONResponse(result)
 
 @router.get("/api/vtv/stream/{channel_id}")
 def api_vtv_stream(channel_id: str):
-    """Get stream URL for a specific VTV channel."""
     stream_url = fetch_vtv_stream(channel_id)
     if stream_url:
         return JSONResponse({"stream_url": stream_url, "status": "ok"})
-    if channel_id.lower().strip() in UNAVAILABLE_CHANNELS:
-        return JSONResponse({"error": "channel not available (premium/geo-restricted)", "status": "unavailable"}, status_code=404)
     return JSONResponse({"error": "stream not found", "status": "offline"}, status_code=404)
 
 @router.get("/api/proxy/page")
 def proxy_page(url: str = Query(...)):
-    """Proxy HTML pages (CORS workaround)."""
     try:
         headers = {**UA}
         if "xemtv.net" in url:
@@ -185,22 +212,20 @@ def proxy_page(url: str = Query(...)):
 
 @router.get("/api/proxy/m3u8/vtv")
 def proxy_vtv_m3u8(url: str = Query(...)):
-    """Proxy m3u8 playlist. Rewrites .ts segments and .m3u8 variants through our proxy chain.
-    Uses fully-qualified absolute URLs so HLS.js resolves them correctly."""
     try:
-        headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*", "Referer": "https://vtv.vn/"}
-        # Determine if we need verify=False (self-signed cert on some CDNs)
-        verify = "vtvdigital.vn" not in url
-        r = requests.get(url, headers=headers, timeout=15, allow_redirects=True, verify=verify)
+        headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*"}
+        if "fptplay" in url:
+            headers["Referer"] = "https://fptplay.vn/"
+            headers["Origin"] = "https://fptplay.vn"
+        elif "xemtv" in url:
+            headers["Referer"] = "https://hd.xemtv.net/"
+        r = requests.get(url, headers=headers, timeout=15, allow_redirects=True)
         if r.status_code != 200:
             return Response(status_code=502, content="upstream error")
         content = r.text
         lines = content.split('\n')
         rewritten = []
         base_url = url.rsplit('/', 1)[0] + '/'
-        # Build the base URL for this proxy endpoint
-        proxy_base = "/api/proxy/m3u8/vtv?url="
-        seg_proxy_base = "/api/proxy/seg/vtv?url="
         for line in lines:
             line = line.strip()
             if not line or line.startswith('#'):
@@ -209,156 +234,29 @@ def proxy_vtv_m3u8(url: str = Query(...)):
                 seg_url = line
                 if not seg_url.startswith('http'):
                     seg_url = base_url + seg_url
-                # Distinguish between .m3u8 variant playlists and .ts segments
-                if seg_url.endswith('.m3u8'):
-                    # Variant playlist → proxy through this same m3u8 endpoint (full URL)
-                    rewritten.append(proxy_base + requests.utils.quote(seg_url, safe=""))
-                else:
-                    # .ts segment → proxy through segment endpoint (full URL)
-                    rewritten.append(seg_proxy_base + requests.utils.quote(seg_url, safe=""))
-        return Response(content='\n'.join(rewritten).encode("utf-8"), media_type="application/vnd.apple.mpegurl", headers={"Access-Control-Allow-Origin": "*", "Cache-Control": "no-cache, no-store", "Access-Control-Allow-Headers": "*"})
+                rewritten.append("/api/proxy/seg/vtv?url=" + requests.utils.quote(seg_url, safe=""))
+        return Response(content='\n'.join(rewritten).encode("utf-8"), media_type="application/vnd.apple.mpegurl", headers={"Access-Control-Allow-Origin": "*", "Cache-Control": "no-cache"})
     except Exception as e:
         return Response(status_code=502, content="proxy error: " + str(e))
 
 @router.get("/api/proxy/seg/vtv")
 def proxy_vtv_segment(url: str = Query(...)):
-    """Proxy video segments (.ts files) and other binary content."""
     try:
-        headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*", "Referer": "https://vtv.vn/"}
-        # Determine if we need verify=False (self-signed cert on some CDNs)
-        verify = "vtvdigital.vn" not in url
-        r = requests.get(url, headers=headers, timeout=30, allow_redirects=True, verify=verify)
+        headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*"}
+        if "fptplay" in url:
+            headers["Referer"] = "https://fptplay.vn/"
+            headers["Origin"] = "https://fptplay.vn"
+        r = requests.get(url, headers=headers, timeout=30, allow_redirects=True)
         if r.status_code != 200:
             return Response(status_code=502, content="upstream error")
         data = r.content
-        # Determine content type from URL
-        content_type = "video/mp2t"  # default for .ts
-        if url.endswith('.m3u8') or url.endswith('.m3u'):
-            content_type = "application/vnd.apple.mpegurl"
-        elif url.endswith('.mp4'):
-            content_type = "video/mp4"
-        elif url.endswith('.aac'):
-            content_type = "audio/aac"
-        elif url.endswith('.webm'):
-            content_type = "video/webm"
-        # Fix: some TS segments start with PNG header (188 bytes offset)
-        if content_type == "video/mp2t" and len(data) > 188 and data[0:4] == b'\x89PNG' and data[188] == 0x47:
+        if len(data) > 188 and data[0:4] == b'\x89PNG' and data[188] == 0x47:
             data = data[188:]
-        return Response(content=data, media_type=content_type, headers={"Access-Control-Allow-Origin": "*", "Cache-Control": "public, max-age=3600", "Access-Control-Allow-Headers": "*"})
+        return Response(content=data, media_type="video/mp2t", headers={"Access-Control-Allow-Origin": "*", "Cache-Control": "public, max-age=3600"})
     except:
         return Response(status_code=502, content="proxy error")
 
 
-@router.get("/api/proxy/stream/vtv")
-def proxy_vtv_stream(channel_id: str = Query(...)):
-    """Unified streaming proxy: fetches VTV manifest, rewrites ALL segment URLs
-    to go through this same endpoint (self-referencing).
-    
-    HLS.js loads ONE URL and all segments are automatically proxied.
-    This avoids the double-hop latency issue.
-    """
-    # Resolve channel to VTVGo manifest URL
-    ch = channel_id.lower().strip()
-    name_map = {
-        'vtvct': 'vtv10', 'vtv-can-tho': 'vtv10', 'vtv can tho': 'vtv10',
-        'vietnam_vtv1': 'vtv1', 'vietnam_vtv2': 'vtv2', 'vietnam_vtv3': 'vtv3',
-    }
-    ch = name_map.get(ch, ch)
-    
-    manifest_url = VTVGO_CDN.get(ch)
-    if not manifest_url:
-        return JSONResponse({"error": "channel not found"}, status_code=404)
-    
-    # Stream the variant through ourselves
-    # Return a variant m3u8 with segments pointing to this same endpoint
-    try:
-        headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*", "Referer": "https://vtv.vn/"}
-        r = requests.get(manifest_url, headers=headers, timeout=15, allow_redirects=True, verify=False)
-        if r.status_code != 200:
-            return Response(status_code=502, content="upstream error")
-        
-        content = r.text
-        lines = content.split('\n')
-        
-        # For each variant in the master, return its segment list with self-referencing URLs
-        rewritten = []
-        base_url = manifest_url.rsplit('/', 1)[0] + '/'
-        
-        for line in lines:
-            line_stripped = line.strip()
-            if not line_stripped or line_stripped.startswith('#EXTM3U') or line_stripped.startswith('#EXT-X-VERSION'):
-                rewritten.append(line_stripped)
-            elif line_stripped.startswith('#EXT-X-STREAM-INF'):
-                rewritten.append(line_stripped)
-            elif line_stripped.startswith('#'):
-                rewritten.append(line_stripped)
-            else:
-                # This could be a variant .m3u8 URL (from master) or segment (from variant)
-                seg_url = line_stripped
-                if not seg_url.startswith('http'):
-                    seg_url = base_url + seg_url
-                
-                if seg_url.endswith('.m3u8'):
-                    # This is a variant playlist URL from master manifest
-                    # Return a rewritten variant with self-referencing segment URLs
-                    rewritten.append("/api/proxy/stream/vtv/" + ch + "/variant?url=" + requests.utils.quote(seg_url, safe=""))
-                else:
-                    # TS segment - proxy through seg endpoint
-                    rewritten.append("/api/proxy/seg/vtv?url=" + requests.utils.quote(seg_url, safe=""))
-        
-        return Response(
-            content='\n'.join(rewritten).encode("utf-8"),
-            media_type="application/vnd.apple.mpegurl",
-            headers={
-                "Access-Control-Allow-Origin": "*",
-                "Cache-Control": "no-cache, no-store",
-                "Access-Control-Allow-Headers": "*"
-            }
-        )
-    except Exception as e:
-        return Response(status_code=502, content="proxy error: " + str(e))
-
-
-@router.get("/api/proxy/stream/vtv/{channel_id}/variant")
-def proxy_vtv_variant(channel_id: str, url: str = Query(...)):
-    """Fetch a variant m3u8 and rewrite its .ts segments to go through seg proxy."""
-    try:
-        headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*", "Referer": "https://vtv.vn/"}
-        r = requests.get(url, headers=headers, timeout=15, allow_redirects=True, verify=False)
-        if r.status_code != 200:
-            return Response(status_code=502, content="upstream error")
-        
-        content = r.text
-        lines = content.split('\n')
-        rewritten = []
-        base_url = url.rsplit('/', 1)[0] + '/'
-        
-        for line in lines:
-            line_stripped = line.strip()
-            if not line_stripped or line_stripped.startswith('#'):
-                rewritten.append(line_stripped)
-            else:
-                seg_url = line_stripped
-                if not seg_url.startswith('http'):
-                    seg_url = base_url + seg_url
-                if seg_url.endswith('.ts'):
-                    rewritten.append("/api/proxy/seg/vtv?url=" + requests.utils.quote(seg_url, safe=""))
-                else:
-                    rewritten.append(seg_url)
-        
-        return Response(
-            content='\n'.join(rewritten).encode("utf-8"),
-            media_type="application/vnd.apple.mpegurl",
-            headers={
-                "Access-Control-Allow-Origin": "*",
-                "Cache-Control": "no-cache, no-store",
-                "Access-Control-Allow-Headers": "*"
-            }
-        )
-    except Exception as e:
-        return Response(status_code=502, content="proxy error: " + str(e))
-
-
 # ===== EPG from vtv.vn/lich-phat-song.htm =====
 
 _epg_cache = {}
@@ -564,78 +462,4 @@ def api_vtv_epg_refresh():
         "status": "refreshed",
         "channels": len(epg_data),
         "total_programmes": sum(len(v) for v in epg_data),
-    })
-
-@router.get("/api/vtv/test", response_class=HTMLResponse)
-def vtv_test_page():
-    """VTV stream test page for debugging."""
-    return """
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>VTV Test</title>
-<style>
-body{background:#111;color:#eee;font-family:monospace;padding:16px;margin:0}
-h2{color:#5cb87a;font-size:16px;margin:0 0 10px}
-video{width:100%;max-width:640px;background:#000;margin:10px 0;border:2px solid #333}
-#log{background:#1a1a1a;border:1px solid #333;padding:10px;max-height:250px;overflow-y:auto;white-space:pre-wrap;font-size:11px;line-height:1.5;margin-top:10px}
-.ok{color:#5cb87a}.err{color:#e74c3c}.warn{color:#f0c040}.info{color:#888}
-button{background:#2d8659;border:0;color:#fff;padding:8px 16px;border-radius:8px;cursor:pointer;margin:4px;font-size:12px}
-select{background:#222;color:#eee;border:1px solid #444;padding:6px;border-radius:6px;font-size:12px}
-</style>
-</head>
-<body>
-<h2>📺 VTV Stream Test</h2>
-<div>
-<select id="ch">
-<option value="vtv1">VTV1</option><option value="vtv2">VTV2</option>
-<option value="vtv4">VTV4</option><option value="vtv5">VTV5</option>
-<option value="vtv6" selected>VTV6</option><option value="vtv7">VTV7</option>
-<option value="vtv8">VTV8</option>
-</select>
-<button onclick="playHLS()">▶ Play (HLS.js)</button>
-<button onclick="playNative()">▶ Play (Native)</button>
-</div>
-<video id="v" controls autoplay muted playsinline></video>
-<div id="log"></div>
-<script src="https://cdn.jsdelivr.net/npm/hls.js@1.5.13/dist/hls.min.js"></script>
-<script>
-const LOG=(msg,t)=>{const e=document.getElementById('log');e.innerHTML+='<span class="'+(t||'info')+'">['+new Date().toISOString().substr(11,12)+'] '+msg+'\\n</span>';e.scrollTop=e.scrollHeight;};
-const V={"vtv1":"/api/proxy/stream/vtv?channel_id=vtv1","vtv2":"/api/proxy/stream/vtv?channel_id=vtv2","vtv4":"/api/proxy/stream/vtv?channel_id=vtv4","vtv5":"/api/proxy/stream/vtv?channel_id=vtv5","vtv6":"/api/proxy/stream/vtv?channel_id=vtv6","vtv7":"/api/proxy/stream/vtv?channel_id=vtv7","vtv8":"/api/proxy/stream/vtv?channel_id=vtv8"};
-const video=document.getElementById('v');
-let hls=null;
-LOG('Ready. HLS.js '+(Hls.version||'unknown')+' | supported: '+Hls.isSupported(),'ok');
-function playHLS(){
-  const ch=document.getElementById('ch').value,url=V[ch];
-  LOG('\\n--- HLS.js: '+ch+' ---','info');
-  if(hls){hls.destroy();hls=null;}
-  video.pause();video.src='';
-  if(!Hls.isSupported()){LOG('HLS.js not supported, trying native','warn');playNative();return;}
-  hls=new Hls({enableWorker:false,lowLatencyMode:true,startLevel:-1,capLevelToPlayerSize:true,maxBufferLength:6});
-  hls.on(Hls.Events.MANIFEST_PARSED,(ev,d)=>{LOG('✅ MANIFEST '+d.levels.length+' levels '+(d.levels[0]?d.levels[0].width+'x'+d.levels[0].height:''),'ok');video.play().then(()=>LOG('▶ Playing','ok')).catch(e=>LOG('Play: '+e,'warn'));});
-  hls.on(Hls.Events.FRAG_BUFFERED,(ev,d)=>{LOG('📦 Buf #'+d.frag.sn+' video.w='+video.videoWidth,'ok');});
-  hls.on(Hls.Events.ERROR,(ev,d)=>{LOG('❌ '+d.type+' '+d.details+' fatal='+d.fatal,'err');if(d.fatal){hls.destroy();hls=null;}});
-  hls.loadSource(url);
-  hls.attachMedia(video);
-  let c=0;const iv=setInterval(()=>{c++;if(c>15)clearInterval(iv);
-    LOG('State '+c+': readyState='+video.readyState+' videoWidth='+video.videoWidth+' paused='+video.paused,'info');
-    if(video.videoWidth>0){LOG('🎉 VIDEO HAS FRAMES!','ok');clearInterval(iv);}
-  },1000);
-}
-function playNative(){
-  const ch=document.getElementById('ch').value,url=V[ch];
-  LOG('\\n--- Native: '+ch+' ---','info');
-  if(hls){hls.destroy();hls=null;}
-  video.pause();video.src=url;
-  video.play().then(()=>LOG('▶ Native playing','ok')).catch(e=>LOG('Native play: '+e,'warn'));
-  let c=0;const iv=setInterval(()=>{c++;if(c>15)clearInterval(iv);
-    LOG('State '+c+': readyState='+video.readyState+' videoWidth='+video.videoWidth,'info');
-    if(video.videoWidth>0){LOG('🎉 VIDEO HAS FRAMES!','ok');clearInterval(iv);}
-  },1000);
-}
-</script>
-</body>
-</html>
-"""
+    })

yt_scraper.py

@@ -188,7 +188,7 @@ def get_vtvnambo_shorts(max_count=50):
     # Method 2: /videos page with duration filter
     if len(all_shorts) < 5:
         print(f"[yt-dlp] Fetching /videos page with filter...")
-        videos_filtered = get_channel_videos_filter_shorts('vtvnambo', (max_count if isinstance(max_count, int) else 50) * 2)
+        videos_filtered = get_channel_videos_filter_shorts('vtvnambo', max_count * 2)
         for s in videos_filtered:
             if s['id'] not in seen_ids:
                 seen_ids.add(s['id'])