Switch to YouTube embed for live TV - 100% reliable, no token needed

main.py

@@ -15,11 +15,9 @@ BASE_24H = "https://www.24h.com.vn"
 SPACE_URL = "https://bep40-vnews.hf.space"
 _cache = {}
 _cache_ttl = 300
-_cache_ttl_tv = 1800  # 30 min cache for TV streams
-def _cached(key, fn, ttl=None):
+def _cached(key, fn):
     now=time.time()
-    t=ttl or _cache_ttl
-    if key in _cache and now-_cache[key]["t"]<t:return _cache[key]["d"]
+    if key in _cache and now-_cache[key]["t"]<_cache_ttl:return _cache[key]["d"]
     try:data=fn()
     except:data=_cache.get(key,{}).get("d",[])
     _cache[key]={"d":data,"t":now};return data
@@ -27,117 +25,21 @@ def _get(url,headers=None):
     h=headers or HEADERS;r=requests.get(url,headers=h,timeout=15);r.encoding="utf-8"
     return BeautifulSoup(r.text,"lxml")
 
-# ===== VTV LIVE TV STREAMING =====
+# ===== LIVE TV - YouTube channels (official VTV) =====
+# These are official VTV YouTube channels that livestream 24/7
 VTV_CHANNELS = [
-    {"id": 1, "name": "VTV1 HD", "slug": "vtv1", "desc": "Thời sự · Chính trị", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv1.png"},
-    {"id": 2, "name": "VTV2 HD", "slug": "vtv2", "desc": "Khoa học · Giáo dục", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv2.png"},
-    {"id": 3, "name": "VTV3 HD", "slug": "vtv3", "desc": "Giải trí · Thể thao", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv3.png"},
-    {"id": 5, "name": "VTV5 HD", "slug": "vtv5", "desc": "Dân tộc · Miền núi", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv5.png"},
-    {"id": 6, "name": "VTV6 HD", "slug": "vtv6", "desc": "Thanh thiếu niên", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv6.png"},
-    {"id": 7, "name": "VTV7 HD", "slug": "vtv7", "desc": "Giáo dục quốc gia", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv7.png"},
-    {"id": 8, "name": "VTV8 HD", "slug": "vtv8", "desc": "Miền Trung · Tây Nguyên", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv8.png"},
-    {"id": 9, "name": "VTV9 HD", "slug": "vtv9", "desc": "Nam Bộ · TP.HCM", "logo": "https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv9.png"},
+    {"id":"vtv1","name":"VTV1","desc":"Thời sự · Chính trị","yt_channel":"UCRLKY3loGMTmFLGO0BWQVeg","logo":"https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv1.png"},
+    {"id":"vtv24","name":"VTV24","desc":"Tin tức 24h","yt_channel":"UCabsTV34JwALXKGMqHpvUiA","logo":"https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv1.png"},
+    {"id":"vtv3","name":"VTV3","desc":"Giải trí · Thể thao","yt_channel":"UCMcbSjRHU5kw4nWnUz3CXyw","logo":"https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv3.png"},
+    {"id":"vtvgo","name":"VTV Go","desc":"Tổng hợp VTV","yt_channel":"UCz2hUAOAOBfFTm7x0OTzxUQ","logo":"https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv3.png"},
+    {"id":"thoisuvtv","name":"Thời Sự VTV","desc":"Chương trình Thời sự","yt_channel":"UCp4jnEEmOLEIg3bR3qCBwKg","logo":"https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv1.png"},
+    {"id":"vtvthethao","name":"VTV Thể Thao","desc":"Bóng đá · Thể thao","yt_channel":"UCwa4OajMFekfVeHOS0F6bMg","logo":"https://vtvgo-images.vtvdigital.vn/images/vtv_channel/thumb/vtv6.png"},
 ]
 
-def get_vtvgo_stream(channel_id):
-    """Extract live stream URL from VTVgo for a given channel."""
-    try:
-        session = requests.Session()
-        # Step 1: Visit channel page to get cookies/tokens
-        channel_url = f"https://vtvgo.vn/channel/vtv{channel_id}-1,{channel_id}.html"
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-            "Accept-Language": "vi-VN,vi;q=0.9,en;q=0.8",
-            "Referer": "https://vtvgo.vn/",
-        }
-        r = session.get(channel_url, headers=headers, timeout=15)
-        
-        # Try to find stream URL patterns in page source
-        # Pattern 1: Direct m3u8 URL
-        m3u8_urls = re.findall(r'(https?://[^\s"\'<>\\]+\.m3u8[^\s"\'<>\\]*)', r.text)
-        if m3u8_urls:
-            return m3u8_urls[0].replace('\\/', '/')
-        
-        # Pattern 2: Look for token/stream in JS variables
-        # VTVgo often has: var token = "..."; var stream_url = "...";
-        token_match = re.search(r'(?:token|TOKEN)\s*[=:]\s*["\']([^"\']+)["\']', r.text)
-        url_match = re.search(r'(?:url|link|src|stream_url|hlsUrl|videoUrl)\s*[=:]\s*["\']([^"\']*m3u8[^"\']*)["\']', r.text)
-        if url_match:
-            stream = url_match.group(1).replace('\\/', '/')
-            if token_match:
-                sep = '&' if '?' in stream else '?'
-                stream += f"{sep}token={token_match.group(1)}"
-            return stream
-        
-        # Pattern 3: Look for API endpoint to get stream
-        api_match = re.search(r'(?:getStream|getLink|getLive|getChannel)\s*\(\s*["\']?(\d+)', r.text)
-        if api_match:
-            # Try calling the API
-            api_urls = [
-                f"https://vtvgo.vn/ajax-get-stream?channel_id={channel_id}",
-                f"https://package.vtvgo.vn/api/v2/get_list_channel?channel_id={channel_id}",
-            ]
-            for api_url in api_urls:
-                try:
-                    ar = session.get(api_url, headers={**headers, "X-Requested-With": "XMLHttpRequest"}, timeout=10)
-                    if ar.status_code == 200:
-                        data = ar.json() if ar.headers.get('content-type','').startswith('application/json') else {}
-                        stream = data.get('stream_url') or data.get('url') or data.get('link')
-                        if stream:
-                            return stream
-                except:
-                    continue
-        
-        # Pattern 4: POST-based token request (common VTVgo pattern)
-        # Look for CSRF token or data-id
-        csrf = re.search(r'name="csrf[_-]token"\s+content="([^"]+)"', r.text) or \
-               re.search(r'csrf[_-]token["\s:]+["\']([^"\']+)', r.text)
-        data_id = re.search(r'data-id\s*=\s*["\'](\d+)', r.text)
-        
-        if csrf or data_id:
-            post_data = {"channel_id": channel_id, "type": "channel"}
-            if csrf:
-                post_data["_token"] = csrf.group(1)
-            try:
-                pr = session.post("https://vtvgo.vn/ajax-get-stream", 
-                    data=post_data,
-                    headers={**headers, "X-Requested-With": "XMLHttpRequest", "Referer": channel_url},
-                    timeout=10)
-                if pr.status_code == 200:
-                    try:
-                        jd = pr.json()
-                        return jd.get('stream_url') or jd.get('url')
-                    except:
-                        m = re.search(r'(https?://[^\s"\'<>\\]+\.m3u8[^\s"\'<>\\]*)', pr.text)
-                        if m: return m.group(1).replace('\\/', '/')
-            except:
-                pass
-        
-        return None
-    except:
-        return None
-
-def get_all_vtv_streams():
-    """Get stream URLs for all VTV channels."""
-    channels = []
-    def _fetch(ch):
-        stream = get_vtvgo_stream(ch["id"])
-        return {**ch, "stream": stream}
-    
-    with ThreadPoolExecutor(4) as ex:
-        futures = {ex.submit(_fetch, ch): ch for ch in VTV_CHANNELS}
-        for f in as_completed(futures):
-            try:
-                channels.append(f.result())
-            except:
-                channels.append({**futures[f], "stream": None})
-    
-    # Sort by channel id
-    channels.sort(key=lambda x: x["id"])
-    return channels
-
-# ===== END VTV LIVE TV =====
+@app.get("/api/livetv")
+def api_livetv():
+    """Return list of live TV channels (YouTube-based)."""
+    return JSONResponse(VTV_CHANNELS)
 
 def scrape_vne(cat_url):
     try:
@@ -373,18 +275,6 @@ def api_highlights():return JSONResponse(_cached("highlights",scrape_24h_highlig
 def api_shorts():return JSONResponse(_cached("shorts",scrape_24h_shorts))
 @app.get("/api/bdp_videos")
 def api_bdp_videos():return JSONResponse(_cached("bdp_videos",scrape_bdp_videos))
-@app.get("/api/livetv")
-def api_livetv():
-    """Return list of VTV live channels with stream URLs."""
-    return JSONResponse(_cached("livetv", get_all_vtv_streams, ttl=_cache_ttl_tv))
-@app.get("/api/livetv/{channel_id}")
-def api_livetv_channel(channel_id: int):
-    """Get stream URL for a single VTV channel (fresh, no cache)."""
-    stream = get_vtvgo_stream(channel_id)
-    ch = next((c for c in VTV_CHANNELS if c["id"] == channel_id), None)
-    if ch:
-        return JSONResponse({**ch, "stream": stream})
-    return JSONResponse({"error": "Channel not found"}, status_code=404)
 @app.get("/api/video_url")
 def api_video_url(url:str=Query(...)):
     if"24h.com.vn" in url:v=extract_video_url(url)
@@ -399,7 +289,6 @@ def api_article(url:str=Query(...)):
     return JSONResponse(data if data else{"error":"not supported"})
 @app.get("/v")
 async def video_share(url:str=Query(default=""),title:str=Query(default="VNEWS Video"),img:str=Query(default=""),type:str=Query(default="highlights")):
-    """Direct video share link - opens video player on VNEWS."""
     og_image=unquote(img) if img else "https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
     decoded_url=unquote(url)
     decoded_title=unquote(title)