KekikStream 2.2.7__py3-none-any.whl → 2.2.8__py3-none-any.whl

KekikStream/Extractors/CloseLoad.py

@@ -3,22 +3,59 @@
 from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle
 from Kekik.Sifreleme   import Packer, StreamDecoder
 from selectolax.parser import HTMLParser
-import re
+import re, json
 
 class CloseLoadExtractor(ExtractorBase):
     name     = "CloseLoad"
     main_url = "https://closeload.filmmakinesi.to"
 
+    def _extract_from_json_ld(self, html: str) -> str | None:
+        """JSON-LD script tag'inden contentUrl'i çıkar (Kotlin versiyonundaki gibi)"""
+        secici = HTMLParser(html)
+        for script in secici.css("script[type='application/ld+json']"):
+            try:
+                data = json.loads(script.text(strip=True))
+                if content_url := data.get("contentUrl"):
+                    if content_url.startswith("http"):
+                        return content_url
+            except (json.JSONDecodeError, TypeError):
+                # Regex ile contentUrl'i çıkarmayı dene
+                match = re.search(r'"contentUrl"\s*:\s*"([^"]+)"', script.text())
+                if match and match.group(1).startswith("http"):
+                    return match.group(1)
+        return None
+
+    def _extract_from_packed(self, html: str) -> str | None:
+        """Packed JavaScript'ten video URL'sini çıkar (fallback)"""
+        try:
+            eval_func = re.compile(r'\s*(eval\(function[\s\S].*)').findall(html)
+            if eval_func:
+                return StreamDecoder.extract_stream_url(Packer.unpack(eval_func[0]))
+        except Exception:
+            pass
+        return None
+
     async def extract(self, url, referer=None) -> ExtractResult:
         if referer:
             self.httpx.headers.update({"Referer": referer})
+        
+        self.httpx.headers.update({
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36 Edg/140.0.0.0",
+            "Origin": self.main_url
+        })
 
         istek = await self.httpx.get(url)
         istek.raise_for_status()
 
-        # Video URL'sini çıkar
-        eval_func = re.compile(r'\s*(eval\(function[\s\S].*)').findall(istek.text)[0]
-        m3u_link  = StreamDecoder.extract_stream_url(Packer.unpack(eval_func))
+        # Önce JSON-LD'den dene (daha güvenilir - Kotlin versiyonu gibi)
+        m3u_link = self._extract_from_json_ld(istek.text)
+        
+        # Fallback: Packed JavaScript'ten çıkar
+        if not m3u_link:
+            m3u_link = self._extract_from_packed(istek.text)
+
+        if not m3u_link:
+            raise Exception("Video URL bulunamadı (ne JSON-LD ne de packed script'ten)")
 
         # Subtitle'ları parse et (Kotlin referansı: track elementleri)
         subtitles = []

KekikStream/Plugins/HDFilmCehennemi.py

@@ -205,30 +205,23 @@ class HDFilmCehennemi(PluginBase):
 
         return results
 
-    def extract_hdch_url(self, unpacked: str) -> str:
-        """HDFilmCehennemi unpacked script'ten video URL'sini çıkar"""
-        # 1) Decode fonksiyonunun adını bul: function <NAME>(value_parts)
-        match_fn = re.search(r'function\s+(\w+)\s*\(\s*value_parts\s*\)', unpacked)
-        if not match_fn:
-            return ""
-        
-        fn_name = match_fn.group(1)
-        
-        # 2) Bu fonksiyonun array ile çağrıldığı yeri bul: <NAME>([ ... ])
-        array_call_regex = re.compile(rf'{re.escape(fn_name)}\(\s*\[(.*?)\]\s*\)', re.DOTALL)
-        match_call = array_call_regex.search(unpacked)
-        if not match_call:
-            return ""
-
-        array_body = match_call.group(1)
-
-        # 3) Array içindeki string parçalarını topla
-        parts = re.findall(r'["\']([^"\']+)["\']', array_body)
-        if not parts:
-            return ""
-
-        # 4) Özel decoder ile çöz
-        return StreamDecoder.extract_stream_url(unpacked)
+    def _extract_from_json_ld(self, html: str) -> str | None:
+        """JSON-LD script tag'inden contentUrl'i çıkar (Kotlin versiyonundaki gibi)"""
+        # Önce JSON-LD'den dene
+        json_ld_match = re.search(r'<script[^>]+type=["\']application/ld\+json["\'][^>]*>(.*?)</script>', html, re.DOTALL)
+        if json_ld_match:
+            try:
+                import json
+                data = json.loads(json_ld_match.group(1).strip())
+                if content_url := data.get("contentUrl"):
+                    if content_url.startswith("http"):
+                        return content_url
+            except Exception:
+                # Regex ile contentUrl'i çıkarmayı dene
+                match = re.search(r'"contentUrl"\s*:\s*"([^"]+)"', html)
+                if match and match.group(1).startswith("http"):
+                    return match.group(1)
+        return None
 
     async def invoke_local_source(self, iframe: str, source: str, url: str):
         self.httpx.headers.update({
@@ -240,18 +233,21 @@ class HDFilmCehennemi(PluginBase):
         if not istek.text:
             return await self.cehennempass(iframe.split("/")[-1])
 
-        # eval(function...) içeren packed script bul
-        eval_match = re.search(r'(eval\(function[\s\S]+)', istek.text)
-        if not eval_match:
-            return await self.cehennempass(iframe.split("/")[-1])
+        # Önce JSON-LD'den dene (Kotlin versiyonu gibi - daha güvenilir)
+        video_url = self._extract_from_json_ld(istek.text)
 
-        try:
-            unpacked = Packer.unpack(eval_match.group(1))
-        except Exception:
-            return await self.cehennempass(iframe.split("/")[-1])
-
-        # HDFilmCehennemi özel decoder ile video URL'sini çıkar
-        video_url = self.extract_hdch_url(unpacked)
+        # Fallback: Packed JavaScript'ten çıkar
+        if not video_url:
+            # eval(function...) içeren packed script bul
+            eval_match = re.search(r'(eval\(function[\s\S]+)', istek.text)
+            if not eval_match:
+                return await self.cehennempass(iframe.split("/")[-1])
+
+            try:
+                unpacked = Packer.unpack(eval_match.group(1))
+                video_url = StreamDecoder.extract_stream_url(unpacked)
+            except Exception:
+                return await self.cehennempass(iframe.split("/")[-1])
         
         if not video_url:
             return await self.cehennempass(iframe.split("/")[-1])

{kekikstream-2.2.7.dist-info → kekikstream-2.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.2.7
+Version: 2.2.8
 Summary: terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı
 Home-page: https://github.com/keyiflerolsun/KekikStream
 Author: keyiflerolsun

{kekikstream-2.2.7.dist-info → kekikstream-2.2.8.dist-info}/RECORD

@@ -16,7 +16,7 @@ KekikStream/Core/Plugin/PluginLoader.py,sha256=GcDqN1u3nJeoGKH_oDFHCpwteJlLCxHNb
 KekikStream/Core/Plugin/PluginManager.py,sha256=CZVg1eegi8vfMfccx0DRV0Box8kXz-aoULTQLgbPbvM,893
 KekikStream/Core/Plugin/PluginModels.py,sha256=Yvx-6Fkn8QCIcuqAkFbCP5EJcq3XBkK_P8S0tRNhS6E,2476
 KekikStream/Core/UI/UIManager.py,sha256=T4V_kdTTWa-UDamgLSKa__dWJuzcvRK9NuwBlzU9Bzc,1693
-KekikStream/Extractors/CloseLoad.py,sha256=WRiodN7-3PVhtq1OzAZywJs5aWIJt-yq43U4a_kglIU,1537
+KekikStream/Extractors/CloseLoad.py,sha256=xlNcUnPfCJJAu1O-YxzjbbA-i14KZ7DADAfTK1biF-s,3197
 KekikStream/Extractors/ContentX.py,sha256=x0j67e1OAw4L1m7ejUTyiIxqr1EhvpjaA_0U-s4IQ-I,3617
 KekikStream/Extractors/DonilasPlay.py,sha256=Lr60pEht96SMlXICYWo9J5dOwV4ty8fetBCCqJ3ARUY,3221
 KekikStream/Extractors/DzenRu.py,sha256=X0Rhm1-W4YjQwVrJs8YFqVcCxMaZi8rsKiLhK_ZsYlU,1185
@@ -60,7 +60,7 @@ KekikStream/Plugins/FilmMakinesi.py,sha256=jdQ1Ger72Wf402h-RpOx1TmvCWD0_gDSafKkA
 KekikStream/Plugins/FilmModu.py,sha256=ZUrBAq1mK2na8YuZEmev64tGhLrql-n-KK1wYDLICn0,7730
 KekikStream/Plugins/FullHDFilm.py,sha256=B8ckb2TftuzfAgxNBs_rkIuAHc9YNVqjG_H9Y3QqGQM,10822
 KekikStream/Plugins/FullHDFilmizlesene.py,sha256=Y6wzW4JnALT91FR_RAmbi1KhM6m7NYlCBh8UGXkKeSs,7900
-KekikStream/Plugins/HDFilmCehennemi.py,sha256=_MwrKGijMTpzXU-UpWB6tZgFBcmxba1pIkBKD6Z0syg,13755
+KekikStream/Plugins/HDFilmCehennemi.py,sha256=Snwdnt1AhmKN535J4G8US8DeJVNpXZtxxW7hUo7Szp0,13867
 KekikStream/Plugins/JetFilmizle.py,sha256=zqSk1NbOsClViJfETX64jiqREaEDfRskQseIBOzwl-c,8860
 KekikStream/Plugins/KultFilmler.py,sha256=eUWXuo3I_qg3Z8k9uM-Xyy4DLfK1jKeFR2I284MjNks,10240
 KekikStream/Plugins/RecTV.py,sha256=Nj4AdeetPMzvZ-VKUdUGhBC1SiFSBRYRebODgE2UeI8,7228
@@ -74,9 +74,9 @@ KekikStream/Plugins/SinemaCX.py,sha256=6mYz7Yqja_weEfCiLrzMhji1eiSKaYHj0vX4aomDW
 KekikStream/Plugins/Sinezy.py,sha256=zBpxUpIIfdnZdolPdkxLMkTsWeGUMW1lht3dNwp_AYU,6756
 KekikStream/Plugins/SuperFilmGeldi.py,sha256=zrTMpAP4NTxhQ4lgprBPXkihE7oQu2jNY7IFA7NWWYA,7144
 KekikStream/Plugins/UgurFilm.py,sha256=S4Zrml9I3W3iW_2feLJWSkvsVZHpQQQlXRJk4E8li-c,5999
-kekikstream-2.2.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-kekikstream-2.2.7.dist-info/METADATA,sha256=WXcND4A50bT4zUn-YZz1e48NvfBR0hhrMIubZmStc2U,10761
-kekikstream-2.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kekikstream-2.2.7.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
-kekikstream-2.2.7.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
-kekikstream-2.2.7.dist-info/RECORD,,
+kekikstream-2.2.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+kekikstream-2.2.8.dist-info/METADATA,sha256=MjxtPrvZeBBjFYTnTuvHKaILY-HSjENche8fOtE_BOE,10761
+kekikstream-2.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kekikstream-2.2.8.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
+kekikstream-2.2.8.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
+kekikstream-2.2.8.dist-info/RECORD,,