eaf-base-api 2.4.8__tar.gz → 2.5.0__tar.gz

{eaf_base_api-2.4.8/eaf_base_api.egg-info → eaf_base_api-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.4.8
+Version: 2.5.0
 Summary: A base API for EchterAlsFake's Porn APIs
 Author-email: Johannes Habel <EchterAlsFake@proton.me>
 License: LGPLv3

eaf_base_api-2.5.0/base_api/__init__.py

@@ -0,0 +1,7 @@
+__all__ = ["BaseCore", "Callback", "config", "errors", "setup_logger", "Cache"]
+
+
+from base_api.modules import errors
+from base_api.modules.config import config
+from base_api.modules.progress_bars import Callback
+from base_api.base import BaseCore, setup_logger, Cache

{eaf_base_api-2.4.8 → eaf_base_api-2.5.0}/base_api/base.py

@@ -7,6 +7,7 @@ import time
 import m3u8
 import httpx
 import random
+import certifi
 import logging
 import traceback
 import threading
@@ -14,10 +15,11 @@ import threading
 from itertools import islice
 from collections import deque
 from functools import lru_cache
-from urllib.parse import urljoin
 from email.utils import parsedate_to_datetime
+from datetime import datetime, timezone, timedelta
+from urllib.parse import urljoin, urlparse, parse_qs
+from concurrent.futures import ThreadPoolExecutor, wait, FIRST_COMPLETED
 from typing import Any, Dict, List, Optional, Union, Callable, Tuple, Iterable
-from concurrent.futures import ThreadPoolExecutor, as_completed, wait, FIRST_COMPLETED
 
 try:
     from modules.errors import *
@@ -34,6 +36,37 @@ loggers = {}
 HEIGHT_FROM_URI = re.compile(r'(?<!\d)(\d{3,4})[pP](?!\d)')  # e.g., 1080p, 720P
 
 
+def _normalize_quality_value(q) -> Union[str, int]:
+    if isinstance(q, int):
+        return q
+    s = str(q).lower().strip()
+    if s in {"best", "half", "worst"}:
+        return s
+    m = re.search(r'(\d{3,4})', s)
+    if m:
+        return int(m.group(1))
+    raise ValueError(f"Invalid quality: {q}")
+
+
+def _choose_quality_from_list(available: List[str | int], target: Union[str, int]):
+    # available like ["240", "360", "480", "720", "1080"]
+    av = sorted({int(x) for x in available})
+    if isinstance(target, str):
+        if target == "best":
+            return av[-1]
+        if target == "worst":
+            return av[0]
+        if target == "half":
+            return av[len(av) // 2]
+        raise ValueError("Invalid label.")
+    # numeric: highest ≤ target, else closest
+    le = [h for h in av if h <= target]
+    if le:
+        return le[-1]
+    # fallback closest (ties -> higher)
+    return min(av, key=lambda h: (abs(h - target), -h))
+
+
 class ErrorVideo:
     """
     Why?:
@@ -278,6 +311,15 @@ class Cache:
 
             self.cache_dictionary[url] = content
 
+    def save_segments_to_cache(self, m3u8_url: str, segments: list):
+        with self.lock:
+            self.cache_dictionary[m3u8_url] = segments
+
+    def get_segments_from_cache(self, m3u8_url: str):
+        with self.lock:
+            segments = self.cache_dictionary.get(m3u8_url, None)
+            return segments
+
 
 class Helper:
     def __init__(
@@ -691,18 +733,12 @@ class BaseCore:
             raise KillSwitch("CRITICAL PROXY ERROR, CHECK LOGS!")
 
     def initialize_session(self):
-        limits = httpx.Limits(
-            max_connections=getattr(self.config, "max_connections", 128),
-            max_keepalive_connections=getattr(self.config, "max_keepalive", 4),
-            keepalive_expiry=10,
-        )
-        ctx = ssl.create_default_context()
+        ctx = ssl.create_default_context(cafile=certifi.where())
         if not self.config.verify_ssl:
             ctx.check_hostname = False
             ctx.verify_mode = ssl.CERT_NONE
 
         self.session = httpx.Client(
-            limits=limits,
             proxy=self.config.proxy,
             timeout=self.config.timeout,  # e.g. 5s on good connections
             http2=self.config.use_http2,
@@ -897,7 +933,14 @@ class BaseCore:
 
                 # 410: permanent gone
                 if status == 410:
-                    raise ResourceGone(f"Resource: {url} is Gone (410).")
+                    self.logger.warning(f"""
+The resource: {url} is gone. This can happen because of an expired token. I will try to fix this automatically, by creating
+a new session and getting a fresh m3u8 URL. This fix is very experimental and I don't know if it works. """)
+                    self.initialize_session()
+
+
+
+
 
                 # 429: rate limited — respect Retry-After if present, else backoff and retry up to cap
                 if status == 429:
@@ -1087,7 +1130,37 @@ class BaseCore:
         # Return rank numbers instead of heights if we truly can't infer—kept simple:
         return [i for i, _ in enumerate(by_bw, start=1)]
 
+    def _to_epoch(self, v: str) -> int:
+        n = int(v)
+        return n // 1000 if n > 10 ** 12 else n  # handle ms too
+
+    def m3u8_expiry_validto(self, url: str, safety_seconds: int = 60):
+        q = {k: v[0] for k, v in parse_qs(urlparse(url).query).items() if v}
+        vf = q.get("validfrom")
+        vt = q.get("validto")
+        if not vt:
+            return None  # not this scheme
+        start_utc = datetime.fromtimestamp(self._to_epoch(vf), tz=timezone.utc) if vf else None
+        expires_utc = datetime.fromtimestamp(self._to_epoch(vt), tz=timezone.utc)
+        refresh_utc = expires_utc - timedelta(seconds=safety_seconds)
+        secs_left = int((expires_utc - datetime.now(timezone.utc)).total_seconds())
+        return {
+            "start_utc": start_utc,
+            "expires_utc": expires_utc,
+            "refresh_utc": refresh_utc,
+            "seconds_left": max(secs_left, 0),
+        }
+
+    # Example
+
+
     def get_segments(self, m3u8_url_master: str, quality: Union[str, int]) -> list:
+        _cache_url = f"{m3u8_url_master}{quality}"
+        _segments: list | None = self.cache.get_segments_from_cache(_cache_url)
+        if _segments:
+            self.logger.info(f"Received: {len(_segments)} from cache!")
+            return _segments
+
         # Resolve the quality-specific playlist URL (may still be a master in some edge cases)
         playlist_url = self.get_m3u8_by_quality(m3u8_url=m3u8_url_master, quality=quality)
         self.logger.debug(f"Trying to fetch segment from m3u8 -> {playlist_url}")
@@ -1133,6 +1206,8 @@ class BaseCore:
             segments.append(urljoin(base_url, seg.uri))
 
         self.logger.debug(f"Fetched {len(segments)} segments from m3u8 URL (including init if present)")
+        self.logger.info(f"Saving segments to cache....")
+        self.cache.save_segments_to_cache(_cache_url, segments)
         return segments
 
     def download_segment(self, url: str, timeout: int) -> tuple[str, bytes, bool]:
@@ -1209,41 +1284,49 @@ class BaseCore:
             with open(tmp_path, "wb") as out_fp:
                 # Submit all downloads
                 with ThreadPoolExecutor(max_workers=workers) as ex:
-                    futures = {ex.submit(self.download_segment, url, timeout): i for i, url in enumerate(segments)}
+                    # submit all segments
+                    pending = {ex.submit(self.download_segment, url, timeout): i
+                               for i, url in enumerate(segments)}
 
-                    # Optional: per-segment retry budget (on top of fetch() retries)
                     seg_retries = [0] * n
                     max_seg_retries = 2
 
-                    for fut in as_completed(futures):
-                        i = futures[fut]
-                        try:
-                            _, data, success = fut.result()
-                        except Exception as e:
-                            # Defensive: unexpected crash in worker
-                            self.logger.error(f"Worker exception for segment {i}: {e}")
-                            success, data = False, b""
-
-                        if success and data:
-                            parts[i] = data
-                        else:
-                            # Retry this segment a couple more times at the executor level
-                            if seg_retries[i] < max_seg_retries:
-                                seg_retries[i] += 1
-                                # Resubmit and continue without touching progress
-                                futures[ex.submit(self.download_segment, segments[i], timeout)] = i
-                                continue
-                            # Give up on this segment
-                            failures += 1
-                            parts[i] = b""  # placeholder (prevents NoneType issues)
-
-                        # After any completion (success or final failure), advance write cursor
-                        while next_to_write < n and parts[next_to_write] is not None:
-                            if parts[next_to_write]:
-                                out_fp.write(parts[next_to_write])
-                            next_to_write += 1
-                            completed += 1
-                            callback(completed, n)
+                    parts: List[Optional[bytes]] = [None] * n
+                    next_to_write = 0
+                    progressed = 0  # how many segments have finished (success or final failure)
+
+                    while pending:
+                        done, _ = wait(pending, return_when=FIRST_COMPLETED)
+
+                        for fut in done:
+                            i = pending.pop(fut)
+                            try:
+                                _, data, success = fut.result()
+                            except Exception as e:
+                                self.logger.error(f"Worker exception for segment {i}: {e}")
+                                success, data = False, b""
+
+                            if success and data:
+                                parts[i] = data
+                                # count immediately: a segment finished successfully
+                                progressed += 1
+                                callback(progressed, n)
+                            else:
+                                # retry a couple times
+                                if seg_retries[i] < max_seg_retries:
+                                    seg_retries[i] += 1
+                                    pending[ex.submit(self.download_segment, segments[i], timeout)] = i
+                                    continue
+                                # give up: mark placeholder and still advance progress
+                                parts[i] = b""
+                                progressed += 1
+                                callback(progressed, n)
+
+                            # now try to flush any contiguous ready parts
+                            while next_to_write < n and parts[next_to_write] is not None:
+                                if parts[next_to_write]:
+                                    out_fp.write(parts[next_to_write])
+                                next_to_write += 1
 
             if failures:
                 # Clean temp file to avoid leaving corrupted output
@@ -1545,4 +1628,4 @@ You need to install `ffmpeg-progress-yield` to use the FFmpeg download mode.""")
             return True
 
         elif value.lower() in ("false", "0", "no"):
-            return False
+            return False

{eaf_base_api-2.4.8 → eaf_base_api-2.5.0}/base_api/modules/config.py

@@ -7,7 +7,6 @@ class RuntimeConfig:
         self.max_bandwidth_mb = None # Set speed limit in megabytes per second e.g, 2.0, 3.5 etc...
         self.ffmpeg_path = "ffmpeg"
         self.proxy = None
-        self.raise_bot_protection = False
         self.verify_ssl = True
         self.cookies = None
         self.locale = "en-US,en;q=0.9" # If you override this, it could change regexes and thus make stuff not work...

{eaf_base_api-2.4.8 → eaf_base_api-2.5.0/eaf_base_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.4.8
+Version: 2.5.0
 Summary: A base API for EchterAlsFake's Porn APIs
 Author-email: Johannes Habel <EchterAlsFake@proton.me>
 License: LGPLv3

{eaf_base_api-2.4.8 → eaf_base_api-2.5.0}/eaf_base_api.egg-info/top_level.txt

@@ -1,3 +1,2 @@
 base_api
-build
 dist

{eaf_base_api-2.4.8 → eaf_base_api-2.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eaf_base_api"
-version = "2.4.8"
+version = "2.5.0"
 description = "A base API for EchterAlsFake's Porn APIs"
 readme = "README.md"
 requires-python = ">=3.6"

eaf_base_api-2.4.8/base_api/__init__.py

@@ -1,5 +0,0 @@
-__all__ = ["BaseCore", "Callback", "config"]
-
-from base_api.base import BaseCore
-from base_api.modules.progress_bars import Callback
-from base_api.modules.config import config