Fix VTV proxy: separate m3u8 variant proxy from segment proxy, fix content-type handling, add verify=False for self-signed certs

vtv_api.py

@@ -61,6 +61,9 @@ FPTPLAY_URLS = {
     "vtv6":  "https://live-a.fptplay53.net/live/media/vtv6/live247-hls-avc/vtv6-avc1_5600000=10000-mp4a_131600=20000.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
 UNAVAILABLE_CHANNELS = {"vtv10", "vtvprime"}
 
@@ -182,10 +185,12 @@ def proxy_page(url: str = Query(...)):
 
 @router.get("/api/proxy/m3u8/vtv")
 def proxy_vtv_m3u8(url: str = Query(...)):
-    """Proxy m3u8 playlist, rewriting segment URLs through our proxy."""
+    """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/"}
-        verify = "vtvdigital.vn" in url
+        # 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)
         if r.status_code != 200:
             return Response(status_code=502, content="upstream error")
@@ -193,6 +198,9 @@ def proxy_vtv_m3u8(url: str = Query(...)):
         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('#'):
@@ -201,25 +209,42 @@ def proxy_vtv_m3u8(url: str = Query(...)):
                 seg_url = line
                 if not seg_url.startswith('http'):
                     seg_url = base_url + seg_url
-                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"})
+                # 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": "*"})
     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)."""
+    """Proxy video segments (.ts files) and other binary content."""
     try:
         headers = {"User-Agent": UA["User-Agent"], "Accept": "*/*", "Referer": "https://vtv.vn/"}
-        verify = "vtvdigital.vn" in url
+        # 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)
         if r.status_code != 200:
             return Response(status_code=502, content="upstream error")
         data = r.content
-        # Fix: some segments start with PNG header (188 bytes offset)
-        if len(data) > 188 and data[0:4] == b'\x89PNG' and data[188] == 0x47:
+        # 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:
             data = data[188:]
-        return Response(content=data, media_type="video/mp2t", headers={"Access-Control-Allow-Origin": "*", "Cache-Control": "public, max-age=3600"})
+        return Response(content=data, media_type=content_type, headers={"Access-Control-Allow-Origin": "*", "Cache-Control": "public, max-age=3600", "Access-Control-Allow-Headers": "*"})
     except:
         return Response(status_code=502, content="proxy error")