Fix VTV mapping: VTV6=VTV Cần Thơ, VTV10=VTV10 (not Cần Thơ)

static/yt_live.js

@@ -1,7 +1,8 @@
 // === VNEWS — VTV LIVE CHANNELS ===
-// VTV6 = VTV Cần Thơ, VTV10 = VTV10 (riêng biệt)
+// VTV6 = VTV Cần Thơ, VTV10 = VTV10 (riêng biệt, không phải Cần Thơ)
 // All streams played directly from user's browser (server IP blocked by fptplay CDN)
 // Sources: iptv-org M3U, Ykcitus M3U, xemtv.net PHP fallback
+// Uses HLS.js with auto-failover
 
 (function(){
   if(window._ytLiveLoaded) return;
@@ -31,4 +32,144 @@
     'https://hd.xemtv.net/kenh/vtv3.php',
     'https://hd.xemtv.net/kenh/vtv4.php',
     'https://hd.xemtv.net/kenh/vtv5.php',
-    'https:
+    'https://hd.xemtv.net/kenh/vtv6.php',
+    'https://hd.xemtv.net/kenh/vtv7.php',
+    'https://hd.xemtv.net/kenh/vtv8.php',
+    'https://hd.xemtv.net/kenh/vtv9.php',
+    'https://hd.xemtv.net/kenh/vtv10.php',
+  ];
+
+  const STREAMS = {};
+  let _currentCh = null;
+  let _hls = null;
+  let _loading = false;
+
+  const s=document.createElement('style');
+  s.textContent=`
+  .vtv-wrap{margin:6px 4px;background:#111;border:1px solid #0066cc;border-radius:10px;overflow:hidden}
+  .vtv-head{display:flex;align-items:center;gap:8px;padding:8px 10px;background:linear-gradient(90deg,#003366,#1a1a1a)}
+  .vtv-title{font-size:13px;font-weight:800;color:#00ccff}
+  .vtv-badge{font-size:10px;font-weight:800;color:#00ccff;animation:vtvp 1.3s infinite}
+  @keyframes vtvp{0%,100%{opacity:1}50%{opacity:.3}}
+  .vtv-tabs{display:flex;gap:3px;padding:6px 8px;overflow-x:auto;scrollbar-width:none;background:#0d1a2a}
+  .vtv-tabs::-webkit-scrollbar{display:none}
+  .vtv-tab{padding:4px 8px;background:#1a2a3a;border:1px solid #2a3a4a;border-radius:10px;color:#8ab4d8;font-size:9px;cursor:pointer;white-space:nowrap;flex-shrink:0;transition:all .2s}
+  .vtv-tab:hover{background:#0b4a7a;color:#fff}
+  .vtv-tab.on{background:#0066cc;border-color:#00ccff;color:#fff;font-weight:700}
+  .vtv-tab.off{opacity:.35;pointer-events:none}
+  .vtv-frame{position:relative;width:100%;aspect-ratio:16/9;background:#000;min-height:180px}
+  .vtv-frame video{position:absolute;inset:0;width:100%;height:100%;object-fit:contain}
+  .vtv-err{display:flex;align-items:center;justify-content:center;height:180px;color:#888;font-size:12px;text-align:center;padding:20px;flex-direction:column;gap:8px}
+  .vtv-err button{background:#0066cc;border:none;color:#fff;padding:6px 14px;border-radius:8px;font-size:11px;cursor:pointer}
+  .vtv-load{display:flex;align-items:center;justify-content:center;height:180px;color:#00ccff;font-size:12px;flex-direction:column;gap:8px}
+  .vtv-spinner{width:24px;height:24px;border:2px solid #333;border-top-color:#00ccff;border-radius:50%;animation:vtvspin .8s linear infinite}
+  @keyframes vtvspin{to{transform:rotate(360deg)}}
+  `;
+  document.head.appendChild(s);
+
+  function parseM3U(text){
+    const lines=text.split('\n');const entries=[];let cur=null;
+    for(let i=0;i<lines.length;i++){
+      const line=lines[i].trim();
+      if(line.startsWith('#EXTINF:')){cur={info:line,url:''};const nm=line.match(/,(.+)$/);cur.name=nm?nm[1].trim():'';const tv=line.match(/tvg-id="([^"]*)"/);cur.tvgId=tv?tv[1]:'';}
+      else if(line&&!line.startsWith('#')&&cur){cur.url=line;entries.push(cur);cur=null;}
+    }
+    return entries;
+  }
+
+  function matchChannel(entry,channel){
+    const search=(entry.name+' '+entry.tvgId+' '+entry.info).toLowerCase();
+    for(const pat of channel.patterns){
+      if(search.includes(pat.toLowerCase())){
+        if(channel.id==='vtv5'&&(search.includes('tây')||search.includes('tay')))continue;
+        return true;
+      }
+    }
+    return false;
+  }
+
+  async function fetchM3U(url){
+    try{const r=await fetch(url,{signal:AbortSignal.timeout(10000)});if(r.ok)return await r.text();}catch(e){}
+    return null;
+  }
+
+  async function fetchXemtvPhp(phpUrl){
+    try{
+      const r=await fetch('/api/proxy/page?url='+encodeURIComponent(phpUrl),{signal:AbortSignal.timeout(10000)});
+      if(r.ok){const text=await r.text();const m=text.match(/file\s*:\s*['"]([^'"]*\.m3u8[^'"]*)['"]/i);if(m&&m[1].length>20)return m[1];}
+    }catch(e){}
+    return null;
+  }
+
+  async function loadAllStreams(){
+    if(_loading)return;_loading=true;
+    const loadEl=document.getElementById('vtv-load');
+    if(loadEl)loadEl.innerHTML='<div class="vtv-spinner"></div>Đang tải danh sách kênh...';
+    const results=await Promise.allSettled(M3U_SOURCES.map(src=>fetchM3U(src.url)));
+    CHANNELS.forEach(ch=>{STREAMS[ch.id]=[];});
+    results.forEach(result=>{
+      if(result.status==='fulfilled'&&result.value){
+        const entries=parseM3U(result.value);
+        CHANNELS.forEach(ch=>{for(const entry of entries){if(matchChannel(entry,ch)){if(entry.url&&!STREAMS[ch.id].includes(entry.url))STREAMS[ch.id].push(entry.url);break;}}});
+      }
+    });
+    await Promise.allSettled(CHANNELS.map(async(ch,idx)=>{
+      if(STREAMS[ch.id].length===0&&XEMTV_PHP[idx]){const url=await fetchXemtvPhp(XEMTV_PHP[idx]);if(url)STREAMS[ch.id].push(url);}
+    }));
+    CHANNELS.forEach(ch=>{const tab=document.getElementById('vtvt-'+ch.id);if(tab){if(STREAMS[ch.id].length>0)tab.classList.remove('off');else{tab.style.opacity='0.35';tab.textContent=ch.name+' ✕';}}});
+    _loading=false;
+  }
+
+  function buildBlock(){
+    const w=document.createElement('div');w.className='vtv-wrap';w.id='vtv-block';
+    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 danh sách 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>';
+    return w;
+  }
+
+  function pinBlock(){
+    const h=document.getElementById('view-home');
+    if(!h||document.getElementById('vtv-block'))return;
+    h.insertBefore(buildBlock(),h.firstChild);
+    loadAllStreams().then(()=>{for(const ch of CHANNELS){if(STREAMS[ch.id]&&STREAMS[ch.id].length>0){setTimeout(()=>window._vtvPlay(ch.id),300);break;}}});
+  }
+
+  window._vtvRetry=function(){if(_currentCh)window._vtvPlay(_currentCh);};
+
+  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='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===0){loadEl.style.display='none';errEl.style.display='flex';errMsg.textContent=ch.name+': Không tìm thấy luồng. Thử lại sau.';return;}
+    _tryPlay(video,urls,0,ch.name,loadEl,errEl,errMsg);
+  };
+
+  function _tryPlay(video,urls,idx,name,loadEl,errEl,errMsg){
+    if(idx>=urls.length){loadEl.style.display='none';errEl.style.display='flex';errMsg.name+': Tất cả nguồn đều lỗi. Thử lại sau.';return;}
+    const src=urls[idx];const label=' ('+(idx+1)+'/'+urls.length+')';
+    loadEl.innerHTML='<div class="vtv-spinner"></div>Đang kết nối '+name+label+'...';
+    // All streams played directly from browser (server IP blocked by fptplay CDN)
+    if(typeof Hls!=='undefined'&&Hls.isSupported()){
+      const hls=new Hls({enableWorker:true,lowLatencyMode:true,startLevel:-1,capLevelToPlayerSize:true,maxBufferLength:20,xhrSetup:function(xhr,url){if(url.includes('fptplay')){xhr.setRequestHeader('Referer','https://fptplay.vn/');xhr.setRequestHeader('Origin','https://fptplay.vn');}}});
+      _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';});
+      hls.on(Hls.Events.ERROR,(ev,data)=>{if(data.fatal){if(data.type===Hls.ErrorTypes.NETWORK_ERROR){setTimeout(()=>{hls.destroy();_hls=null;_tryPlay(video,urls,idx+1,name,loadEl,errEl,errMsg);},1500);}else if(data.type===Hls.ErrorTypes.MEDIA_ERROR){hls.recoverMediaError();}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});
+      video.addEventListener('error',()=>{_tryPlay(video,urls,idx+1,name,loadEl,errEl,errMsg);},{once:true});
+    }else{loadEl.style.display='none';errEl.style.display='flex';errMsg.textContent='Trình duyệt không hỗ trợ HLS';}
+  }
+
+  const orig=window.loadHome;
+  if(orig&&!orig.__vtvWrapped){window.loadHome=async function(){const r=await orig.apply(this,arguments);try{pinBlock();}catch(e){}return r;};window.loadHome.__vtvWrapped=true;}
+  if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',()=>setTimeout(pinBlock,500));
+  else setTimeout(pinBlock,500);
+})();