Merge pull request #174 from viu-media/minor-fixes

Author: Benexl

viu_media/core/downloader/yt_dlp.py

@@ -30,6 +30,9 @@ def download(self, params: DownloadParams) -> DownloadResult:
             sub_paths = []
             merged_path = None
 
+            logger.debug(f"Starting download for URL: {params.url}")
+            logger.debug(f"Using Headers: {params.headers}")
+
             if TORRENT_REGEX.match(params.url):
                 from .torrents import download_torrent_with_webtorrent_cli
 

viu_media/libs/provider/anime/animepahe/constants.py

@@ -3,6 +3,8 @@
 ANIMEPAHE = "animepahe.si"
 ANIMEPAHE_BASE = f"https://{ANIMEPAHE}"
 ANIMEPAHE_ENDPOINT = f"{ANIMEPAHE_BASE}/api"
+CDN_PROVIDER = "kwik.cx"
+CDN_PROVIDER_BASE = f"https://{CDN_PROVIDER}"
 
 SERVERS_AVAILABLE = ["kwik"]
 REQUEST_HEADERS = {
@@ -25,13 +27,30 @@
     "Accept-Encoding": "Utf-8",
     "DNT": "1",
     "Connection": "keep-alive",
-    "Referer": "https://animepahe.si/",
+    "Referer": ANIMEPAHE_BASE + '/',
     "Upgrade-Insecure-Requests": "1",
     "Sec-Fetch-Dest": "iframe",
     "Sec-Fetch-Mode": "navigate",
     "Sec-Fetch-Site": "cross-site",
     "Priority": "u=4",
     "TE": "trailers",
 }
+
+STREAM_HEADERS = {
+    # "Host": "vault-16.owocdn.top", # This will have to be the actual host of the stream (behind Kwik)
+    "Accept": "*/*",
+    "Accept-Language": "en-US,en;q=0.5",
+    "Accept-Encoding": "gzip, deflate, br, zstd",
+    "Origin": CDN_PROVIDER_BASE,
+    "Sec-GPC": "1",
+    "Connection": "keep-alive",
+    "Referer": CDN_PROVIDER_BASE + '/',
+    "Sec-Fetch-Dest": "empty",
+    "Sec-Fetch-Mode": "cors",
+    "Sec-Fetch-Site": "cross-site",
+    "TE": "trailers",
+}
+
+
 JUICY_STREAM_REGEX = re.compile(r"source='(.*)';")
 KWIK_RE = re.compile(r"Player\|(.+?)'")

viu_media/libs/provider/anime/animepahe/mappers.py

@@ -88,6 +88,7 @@ def map_to_server(
     episode: AnimeEpisodeInfo,
     translation_type: str,
     stream_links: list[tuple[str, str]],
+    headers: dict[str, str],
 ) -> Server:
     links = [
         EpisodeStream(
@@ -97,4 +98,4 @@ def map_to_server(
         )
         for link in stream_links
     ]
-    return Server(name="kwik", links=links, episode_title=episode.title)
+    return Server(name="kwik", links=links, episode_title=episode.title, headers=headers)

viu_media/libs/provider/anime/animepahe/provider.py

@@ -1,6 +1,7 @@
 import logging
 from functools import lru_cache
 from typing import Iterator, Optional
+from urllib.parse import urlparse
 
 from ..base import BaseAnimeProvider
 from ..params import AnimeParams, EpisodeStreamsParams, SearchParams
@@ -9,9 +10,11 @@
 from .constants import (
     ANIMEPAHE_BASE,
     ANIMEPAHE_ENDPOINT,
+    CDN_PROVIDER,
     JUICY_STREAM_REGEX,
     REQUEST_HEADERS,
     SERVER_HEADERS,
+    STREAM_HEADERS,
 )
 from .extractor import process_animepahe_embed_page
 from .mappers import map_to_anime_result, map_to_search_results, map_to_server
@@ -132,6 +135,7 @@ def episode_streams(self, params: EpisodeStreamsParams) -> Iterator[Server] | No
         quality = None
         translation_type = None
         stream_links = []
+        stream_host = None
 
         # TODO: better document the scraping process
         for res_dict in res_dicts:
@@ -170,13 +174,19 @@ def episode_streams(self, params: EpisodeStreamsParams) -> Iterator[Server] | No
                 continue
             logger.debug(f"Found juicy stream: {juicy_stream.group(1)}")
             juicy_stream = juicy_stream.group(1)
+            stream_host = urlparse(juicy_stream).hostname
             quality = res_dict["resolution"]
             logger.debug(f"Found quality: {quality}")
             translation_type = data_audio
             stream_links.append((quality, juicy_stream))
 
         if translation_type and stream_links:
-            yield map_to_server(episode, translation_type, stream_links)
+            headers = {
+                "User-Agent": self.client.headers["User-Agent"],
+                "Host": stream_host or CDN_PROVIDER,
+                **STREAM_HEADERS
+            }
+            yield map_to_server(episode, translation_type, stream_links, headers=headers)
 
     @lru_cache()
     def _get_episode_info(