Upload app.py

app.py

@@ -395,19 +395,65 @@ async def vkmovie_stream(url: str, request: Request):
     if range_header:
         req_headers["range"] = range_header
 
-    # Визначаємо чи це HLS сегмент (.ts, .aac, .vtt) чи великий MP4
     url_lower = url.lower().split("?")[0]
+    # Якщо це явно m3u8 або sub-playlist — обробляємо як /vkmovie/hls
+    is_playlist = url_lower.endswith(".m3u8") or "type%2f2" in url.lower() or "type/2" in url_lower
+
+    if is_playlist:
+        # Делегуємо до /vkmovie/hls логіки
+        hf = str(request.base_url).rstrip("/").replace("http://", "https://")
+        async with httpx.AsyncClient(timeout=15, follow_redirects=True) as client:
+            try:
+                r = await client.get(url, headers=req_headers)
+                text = r.text
+            except Exception as e:
+                return Response(content=f"error: {e}", status_code=500)
+
+        content_type = r.headers.get("content-type", "")
+        if "mpegurl" in content_type or text.strip().startswith("#EXTM3U"):
+            base = url.rsplit("/", 1)[0] + "/"
+            def rewrite(seg):
+                seg = seg.strip()
+                if not seg: return seg
+                if seg.startswith("http://") or seg.startswith("https://"):
+                    abs_url = seg
+                elif seg.startswith("//"):
+                    abs_url = "https:" + seg
+                else:
+                    abs_url = urljoin(base, seg)
+                return f"{hf}/vkmovie/stream?url={quote(abs_url, safe='')}"
+
+            lines = text.splitlines()
+            out = []
+            for line in lines:
+                stripped = line.strip()
+                if not stripped:
+                    out.append(line)
+                elif stripped.startswith("#"):
+                    rewritten = re.sub(r'URI="([^"]+)"', lambda m: f'URI="{rewrite(m.group(1))}"', line)
+                    out.append(rewritten)
+                else:
+                    out.append(rewrite(stripped))
+            return Response(
+                content="\n".join(out),
+                media_type="application/vnd.apple.mpegurl",
+                headers={"Access-Control-Allow-Origin": "*"}
+            )
+        else:
+            return Response(content=r.content, status_code=r.status_code,
+                            media_type=content_type,
+                            headers={"Access-Control-Allow-Origin": "*"})
+
+    # Визначаємо чи це HLS сегмент чи великий MP4
     is_segment = (
         any(url_lower.endswith(ext) for ext in [".ts", ".aac", ".vtt", ".webvtt", ".m4s", ".m4a"]) or
-        # VK path-based URLs для сегментів містять /video/ або /type/5/
         "/video/" in url_lower or
         "type%2f5" in url.lower() or
         "type/5" in url_lower
     )
 
     if is_segment:
-        # HLS сегменти — завантажуємо повністю і повертаємо як Response
-        # (уникаємо ERR_HTTP2_PROTOCOL_ERROR при стримінгу)
+        # HLS сегменти — завантажуємо повністю
         async with httpx.AsyncClient(timeout=30, follow_redirects=True) as client:
             try:
                 r = await client.get(url, headers=req_headers)