M3U8/fetch.py

@@ -69,8 +69,9 @@ async def main() -> None:
                 asyncio.create_task(roxie.scrape(hdl_brwsr)),
                 asyncio.create_task(sport9.scrape(xtrnl_brwsr)),
                 asyncio.create_task(streamcenter.scrape(xtrnl_brwsr)),
-                # asyncio.create_task(streamhub.scrape(xtrnl_brwsr)),
+                asyncio.create_task(streamhub.scrape(xtrnl_brwsr)),
                 asyncio.create_task(streamsgate.scrape(xtrnl_brwsr)),
+                # asyncio.create_task(tvapp.scrape(hdl_brwsr)),
                 asyncio.create_task(webcast.scrape(hdl_brwsr)),
             ]
 
@@ -82,7 +83,6 @@ async def main() -> None:
                 asyncio.create_task(shark.scrape()),
                 asyncio.create_task(streambtw.scrape()),
                 asyncio.create_task(totalsportek.scrape()),
-                asyncio.create_task(tvapp.scrape()),
                 asyncio.create_task(xstreameast.scrape()),
             ]
 

M3U8/scrapers/cdnlivetv.py

@@ -99,15 +99,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         log=log,
@@ -121,10 +121,11 @@ async def scrape(browser: Browser) -> None:
                     )
 
                     if url:
-                        sport, event, ts = (
+                        sport, event, ts, link = (
                             ev["sport"],
                             ev["event"],
                             ev["timestamp"],
+                            ev["link"],
                         )
 
                         key = f"[{sport}] {event} ({TAG})"

M3U8/scrapers/embedhd.py

@@ -89,15 +89,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         log=log,
@@ -111,9 +111,10 @@ async def scrape(browser: Browser) -> None:
                     )
 
                     if url:
-                        sport, event, ts = (
+                        sport, event, link, ts = (
                             ev["sport"],
                             ev["event"],
+                            ev["link"],
                             ev["timestamp"],
                         )
 

M3U8/scrapers/fawa.py

@@ -101,15 +101,15 @@ async def scrape() -> None:
 
     events = await get_events(cached_hrefs)
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -120,7 +120,11 @@ async def scrape() -> None:
                 log=log,
             )
 
-            sport, event = ev["sport"], ev["event"]
+            sport, event, link = (
+                ev["sport"],
+                ev["event"],
+                ev["link"],
+            )
 
             key = f"[{sport}] {event} ({TAG})"
 

M3U8/scrapers/istreameast.py

@@ -114,15 +114,15 @@ async def scrape() -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -133,7 +133,11 @@ async def scrape() -> None:
                 log=log,
             )
 
-            sport, event = ev["sport"], ev["event"]
+            sport, event, link = (
+                ev["sport"],
+                ev["event"],
+                ev["link"],
+            )
 
             key = f"[{sport}] {event} ({TAG})"
 

M3U8/scrapers/livetvsx.py

@@ -18,14 +18,12 @@ XML_CACHE = Cache(f"{TAG}-xml", exp=28_000)
 
 BASE_URL = "https://cdn.livetv873.me/rss/upcoming_en.xml"
 
-VALID_SPORTS = [
+VALID_SPORTS = {
-    "MLB. Preseason",
-    "MLB",
-    "Basketball",
     "Football",
+    "Basketball",
     "Ice Hockey",
     "Olympic Games",
-]
+}
 
 
 async def process_event(
@@ -50,7 +48,7 @@ async def process_event(
         await page.goto(
             url,
             wait_until="domcontentloaded",
-            timeout=10_000,
+            timeout=15_000,
         )
 
         await page.wait_for_timeout(1_500)
@@ -110,7 +108,7 @@ async def process_event(
         return
 
     except Exception as e:
-        log.warning(f"URL {url_num}) {e}")
+        log.warning(f"URL {url_num}) Exception while processing: {e}")
         return
 
     finally:
@@ -207,15 +205,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser, ignore_https=True) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                     )
@@ -228,11 +226,12 @@ async def scrape(browser: Browser) -> None:
                         timeout=20,
                     )
 
-                    sport, league, event, ts = (
+                    sport, league, event, ts, link = (
                         ev["sport"],
                         ev["league"],
                         ev["event"],
                         ev["event_ts"],
+                        ev["link"],
                     )
 
                     key = f"[{sport} - {league}] {event} ({TAG})"

M3U8/scrapers/ovogoal.py

@@ -135,13 +135,13 @@ async def scrape() -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -152,9 +152,10 @@ async def scrape() -> None:
                 log=log,
             )
 
-            sport, event, ts = (
+            sport, event, link, ts = (
                 ev["sport"],
                 ev["event"],
+                ev["link"],
                 ev["event_ts"],
             )
 

M3U8/scrapers/pawa.py

@@ -101,15 +101,15 @@ async def scrape() -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -120,7 +120,11 @@ async def scrape() -> None:
                 log=log,
             )
 
-            sport, event = ev["sport"], ev["event"]
+            sport, event, link = (
+                ev["sport"],
+                ev["event"],
+                ev["link"],
+            )
 
             key = f"[{sport}] {event} ({TAG})"
 

M3U8/scrapers/pixel.py

@@ -22,7 +22,7 @@ async def get_api_data(page: Page) -> dict[str, list[dict, str, str]]:
         await page.goto(
             url := urljoin(BASE_URL, "backend/livetv/events"),
             wait_until="domcontentloaded",
-            timeout=6_000,
+            timeout=10_000,
         )
 
         raw_json = await page.locator("pre").inner_text(timeout=5_000)

M3U8/scrapers/ppv.py

@@ -100,15 +100,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(base_url, cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser, stealth=False) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         timeout=6,
@@ -122,11 +122,12 @@ async def scrape(browser: Browser) -> None:
                         log=log,
                     )
 
-                    sport, event, logo, ts = (
+                    sport, event, logo, ts, link = (
                         ev["sport"],
                         ev["event"],
                         ev["logo"],
                         ev["timestamp"],
+                        ev["link"],
                     )
 
                     key = f"[{sport}] {event} ({TAG})"

M3U8/scrapers/roxie.py

@@ -21,13 +21,12 @@ BASE_URL = "https://roxiestreams.info"
 
 SPORT_ENDPOINTS = {
     "fighting": "Fighting",
-    "mlb": "MLB",
+    # "mlb": "MLB",
     "motorsports": "Racing",
     "nba": "NBA",
     # "nfl": "American Football",
     "nhl": "NHL",
     "soccer": "Soccer",
-    "olympics": "Olympics",
 }
 
 
@@ -97,12 +96,12 @@ async def process_event(
         await page.goto(
             url,
             wait_until="domcontentloaded",
-            timeout=6_000,
+            timeout=15_000,
         )
 
         try:
             if btn := await page.wait_for_selector(
-                "button.streambutton:nth-of-type(1)",
+                "button:has-text('Stream 1')",
                 timeout=5_000,
             ):
                 await btn.click(force=True, click_count=2)
@@ -140,7 +139,7 @@ async def process_event(
         return
 
     except Exception as e:
-        log.warning(f"URL {url_num}) {e}")
+        log.warning(f"URL {url_num}) Exception while processing: {e}")
         return
 
     finally:
@@ -202,15 +201,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                     )
@@ -222,10 +221,11 @@ async def scrape(browser: Browser) -> None:
                         log=log,
                     )
 
-                    sport, event, ts = (
+                    sport, event, ts, link = (
                         ev["sport"],
                         ev["event"],
                         ev["event_ts"],
+                        ev["link"],
                     )
 
                     tvg_id, logo = leagues.get_tvg_info(sport, event)

M3U8/scrapers/shark.py

@@ -124,13 +124,13 @@ async def scrape() -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -142,10 +142,11 @@ async def scrape() -> None:
             )
 
             if url:
-                sport, event, ts = (
+                sport, event, ts, link = (
                     ev["sport"],
                     ev["event"],
                     ev["event_ts"],
+                    ev["link"],
                 )
 
                 tvg_id, logo = leagues.get_tvg_info(sport, event)

M3U8/scrapers/sport9.py

@@ -101,9 +101,9 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         async with network.event_context(browser, stealth=False) as context:
@@ -111,7 +111,7 @@ async def scrape(browser: Browser) -> None:
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         log=log,
@@ -125,7 +125,11 @@ async def scrape(browser: Browser) -> None:
                     )
 
                     if url:
-                        sport, event = ev["sport"], ev["event"]
+                        sport, event, link = (
+                            ev["sport"],
+                            ev["event"],
+                            ev["link"],
+                        )
 
                         key = f"[{sport}] {event} ({TAG})"
 

M3U8/scrapers/streambtw.py

@@ -105,15 +105,15 @@ async def scrape() -> None:
 
     events = await get_events()
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -125,7 +125,11 @@ async def scrape() -> None:
             )
 
             if url:
-                sport, event = ev["sport"], ev["event"]
+                sport, event, link = (
+                    ev["sport"],
+                    ev["event"],
+                    ev["link"],
+                )
 
                 key = f"[{sport}] {event} ({TAG})"
 

M3U8/scrapers/streamcenter.py

@@ -19,12 +19,13 @@ BASE_URL = "https://backend.streamcenter.live/api/Parties"
 CATEGORIES = {
     4: "Basketball",
     9: "Football",
-    13: "Baseball",
+    # 13: "Baseball",
     # 14: "American Football",
     15: "Motor Sport",
     16: "Hockey",
     17: "Fight MMA",
     18: "Boxing",
+    19: "NCAA Sports",
     20: "WWE",
     21: "Tennis",
 }
@@ -102,15 +103,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser, stealth=False) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         log=log,
@@ -124,10 +125,11 @@ async def scrape(browser: Browser) -> None:
                     )
 
                     if url:
-                        sport, event, ts = (
+                        sport, event, ts, link = (
                             ev["sport"],
                             ev["event"],
                             ev["timestamp"],
+                            ev["link"],
                         )
 
                         key = f"[{sport}] {event} ({TAG})"

M3U8/scrapers/streamhub.py

@@ -20,14 +20,17 @@ HTML_CACHE = Cache(f"{TAG}-html", exp=28_800)
 BASE_URL = "https://livesports4u.net"
 
 CATEGORIES = {
+    "Soccer": "sport_68c02a4464a38",
     # "American Football": "sport_68c02a4465113",
-    "Baseball": "sport_68c02a446582f",
+    # "Baseball": "sport_68c02a446582f",
     "Basketball": "sport_68c02a4466011",
+    "Cricket": "sport_68c02a44669f3",
     "Hockey": "sport_68c02a4466f56",
     "MMA": "sport_68c02a44674e9",
     "Racing": "sport_68c02a4467a48",
-    "Soccer": "sport_68c02a4464a38",
+    # "Rugby": "sport_68c02a4467fc1",
     "Tennis": "sport_68c02a4468cf7",
+    # "Volleyball": "sport_68c02a4469422",
 }
 
 
@@ -145,15 +148,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser, stealth=False) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         timeout=5,
@@ -167,10 +170,11 @@ async def scrape(browser: Browser) -> None:
                         log=log,
                     )
 
-                    sport, event, logo, ts = (
+                    sport, event, logo, link, ts = (
                         ev["sport"],
                         ev["event"],
                         ev["logo"],
+                        ev["link"],
                         ev["event_ts"],
                     )
 

M3U8/scrapers/streamsgate.py

@@ -21,15 +21,15 @@ API_FILE = Cache(f"{TAG}-api", exp=19_800)
 BASE_URL = "https://streamingon.org"
 
 SPORT_ENDPOINTS = [
-    "boxing",
-    # "cfb",
-    "f1",
-    "mlb",
-    "nba",
-    # "nfl",
-    "nhl",
     "soccer",
+    # "nfl",
+    "nba",
+    "cfb",
+    # "mlb",
+    "nhl",
     "ufc",
+    "boxing",
+    "f1",
 ]
 
 
@@ -133,15 +133,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser, stealth=False) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         log=log,
@@ -155,10 +155,11 @@ async def scrape(browser: Browser) -> None:
                     )
 
                     if url:
-                        sport, event, ts = (
+                        sport, event, ts, link = (
                             ev["sport"],
                             ev["event"],
                             ev["timestamp"],
+                            ev["link"],
                         )
 
                         key = f"[{sport}] {event} ({TAG})"

M3U8/scrapers/totalsportek.py

@@ -147,15 +147,15 @@ async def scrape() -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -166,7 +166,11 @@ async def scrape() -> None:
                 log=log,
             )
 
-            sport, event = ev["sport"], ev["event"]
+            sport, event, link = (
+                ev["sport"],
+                ev["event"],
+                ev["link"],
+            )
 
             key = f"[{sport}] {event} ({TAG})"
 

M3U8/scrapers/tvapp.py

@@ -1,6 +1,7 @@
 from functools import partial
-from urllib.parse import urljoin
+from urllib.parse import urljoin, urlparse
 
+from playwright.async_api import Browser
 from selectolax.parser import HTMLParser
 
 from .utils import Cache, Time, get_logger, leagues, network
@@ -16,27 +17,12 @@ CACHE_FILE = Cache(TAG, exp=86_400)
 BASE_URL = "https://thetvapp.to"
 
 
-async def process_event(url: str, url_num: int) -> str | None:
+def fix_url(s: str) -> str:
-    if not (html_data := await network.request(url, log=log)):
+    parsed = urlparse(s)
-        log.info(f"URL {url_num}) Failed to load url.")
 
-        return
+    base = f"origin.{parsed.netloc.split('.', 1)[-1]}"
 
-    soup = HTMLParser(html_data.content)
+    return urljoin(f"http://{base}", parsed.path.replace("tracks-v1a1/", ""))
-
-    if not (channel_name_elem := soup.css_first("#stream_name")):
-        log.warning(f"URL {url_num}) No channel found.")
-
-        return
-
-    if not (channel_name := channel_name_elem.attributes.get("name")):
-        log.warning(f"URL {url_num}) No channel found.")
-
-        return
-
-    log.info(f"URL {url_num}) Captured M3U8")
-
-    return f"http://origin.thetvapp.to/hls/{channel_name.strip().upper()}/mono.m3u8"
 
 
 async def get_events() -> list[dict[str, str]]:
@@ -73,7 +59,7 @@ async def get_events() -> list[dict[str, str]]:
     return events
 
 
-async def scrape() -> None:
+async def scrape(browser: Browser) -> None:
     if cached := CACHE_FILE.load():
         urls.update(cached)
 
@@ -85,42 +71,50 @@ async def scrape() -> None:
 
     events = await get_events()
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
-        for i, ev in enumerate(events, start=1):
+        async with network.event_context(browser) as context:
-            handler = partial(
+            for i, ev in enumerate(events, start=1):
-                process_event,
+                async with network.event_page(context) as page:
-                url=(link := ev["link"]),
+                    handler = partial(
-                url_num=i,
+                        network.process_event,
-            )
+                        url=ev["link"],
+                        url_num=i,
+                        page=page,
+                        log=log,
+                    )
 
-            url = await network.safe_process(
+                    url = await network.safe_process(
-                handler,
+                        handler,
-                url_num=i,
+                        url_num=i,
-                semaphore=network.HTTP_S,
+                        semaphore=network.PW_S,
-                log=log,
+                        log=log,
-            )
+                    )
 
-            if url:
+                    if url:
-                sport, event = ev["sport"], ev["event"]
+                        sport, event, link = (
+                            ev["sport"],
+                            ev["event"],
+                            ev["link"],
+                        )
 
-                key = f"[{sport}] {event} ({TAG})"
+                        key = f"[{sport}] {event} ({TAG})"
 
-                tvg_id, logo = leagues.get_tvg_info(sport, event)
+                        tvg_id, logo = leagues.get_tvg_info(sport, event)
 
-                entry = {
+                        entry = {
-                    "url": url,
+                            "url": fix_url(url),
-                    "logo": logo,
+                            "logo": logo,
-                    "base": BASE_URL,
+                            "base": BASE_URL,
-                    "timestamp": now.timestamp(),
+                            "timestamp": now.timestamp(),
-                    "id": tvg_id or "Live.Event.us",
+                            "id": tvg_id or "Live.Event.us",
-                    "link": link,
+                            "link": link,
-                }
+                        }
 
-                urls[key] = entry
+                        urls[key] = entry
 
     log.info(f"Collected and cached {len(urls)} new event(s)")
 

M3U8/scrapers/utils/logger.py

@@ -15,6 +15,7 @@ LOG_FMT = (
 )
 
 COLORS = {
+    "DEBUG": "\033[36m",
     "INFO": "\033[32m",
     "WARNING": "\033[33m",
     "ERROR": "\033[31m",

M3U8/scrapers/utils/stealth.js

@@ -1,27 +0,0 @@
-Object.defineProperty(navigator, "webdriver", {
-  get: () => undefined,
-});
-
-Object.defineProperty(navigator, "languages", {
-  get: () => ["en-US", "en"],
-});
-
-Object.defineProperty(navigator, "hardwareConcurrency", {
-  get: () => 8,
-});
-
-Object.defineProperty(navigator, "deviceMemory", {
-  get: () => 8,
-});
-
-Object.defineProperty(navigator, "plugins", {
-  get: () => [],
-});
-
-const getParameter = WebGLRenderingContext.prototype.getParameter;
-WebGLRenderingContext.prototype.getParameter = function (param) {
-  if (param === 37445) return "Google Inc.";
-  if (param === 37446)
-    return "ANGLE (Intel(R) UHD Graphics Direct3D11 vs_5_0 ps_5_0)";
-  return getParameter.apply(this, [param]);
-};

M3U8/scrapers/utils/webwork.py

@@ -4,20 +4,11 @@ import random
 import re
 from collections.abc import Awaitable, Callable
 from contextlib import asynccontextmanager
-from functools import cache, partial
+from functools import partial
-from pathlib import Path
 from typing import AsyncGenerator, TypeVar
-from urllib.parse import urlparse
 
 import httpx
-from playwright.async_api import (
+from playwright.async_api import Browser, BrowserContext, Page, Playwright, Request
-    Browser,
-    BrowserContext,
-    Page,
-    Playwright,
-    Request,
-    Route,
-)
 
 from .logger import get_logger
 
@@ -82,7 +73,7 @@ class Network:
         fn: Callable[[], Awaitable[T]],
         url_num: int,
         semaphore: asyncio.Semaphore,
-        timeout: int | float = 30,
+        timeout: int | float = 10,
         log: logging.Logger | None = None,
     ) -> T | None:
 
@@ -107,7 +98,7 @@ class Network:
                     pass
 
                 except Exception as e:
-                    log.warning(f"URL {url_num}) Ignore exception after timeout: {e}")
+                    log.debug(f"URL {url_num}) Ignore exception after timeout: {e}")
 
                 return
             except Exception as e:
@@ -115,35 +106,6 @@ class Network:
 
                 return
 
-    @staticmethod
-    @cache
-    def blocked_domains() -> list[str]:
-        return (
-            (Path(__file__).parent / "easylist.txt")
-            .read_text(encoding="utf-8")
-            .splitlines()
-        )
-
-    @staticmethod
-    def to_block(request: Request) -> bool:
-        hostname = (urlparse(request.url).hostname or "").lower()
-
-        return any(
-            hostname == domain or hostname.endswith(f".{domain}")
-            for domain in Network.blocked_domains()
-        )
-
-    @staticmethod
-    async def _adblock(route: Route) -> None:
-        request = route.request
-
-        if request.resource_type not in ["script", "image", "media", "xhr"]:
-            await route.continue_()
-
-            return
-
-        await route.abort() if Network.to_block(request) else await route.continue_()
-
     @staticmethod
     @asynccontextmanager
     async def event_context(
@@ -151,30 +113,78 @@ class Network:
         stealth: bool = True,
         ignore_https: bool = False,
     ) -> AsyncGenerator[BrowserContext, None]:
-
         context: BrowserContext | None = None
 
         try:
+            context = await browser.new_context(
+                user_agent=Network.UA if stealth else None,
+                ignore_https_errors=ignore_https,
+                viewport={"width": 1366, "height": 768},
+                device_scale_factor=1,
+                locale="en-US",
+                timezone_id="America/New_York",
+                color_scheme="dark",
+                permissions=["geolocation"],
+                extra_http_headers=(
+                    {
+                        "Accept-Language": "en-US,en;q=0.9",
+                        "Upgrade-Insecure-Requests": "1",
+                    }
+                    if stealth
+                    else None
+                ),
+            )
+
             if stealth:
-                context = await browser.new_context(
+                await context.add_init_script("""
-                    user_agent=Network.UA,
+                    Object.defineProperty(navigator, "webdriver", { get: () => undefined });
-                    ignore_https_errors=ignore_https,
+
-                    viewport={"width": 1366, "height": 768},
+                    Object.defineProperty(navigator, "languages", {
-                    device_scale_factor=1,
+                    get: () => ["en-US", "en"],
-                    locale="en-US",
+                    });
-                    timezone_id="America/New_York",
+
-                    color_scheme="dark",
+                    Object.defineProperty(navigator, "plugins", {
-                    extra_http_headers=(
+                    get: () => [1, 2, 3, 4],
-                        {
+                    });
-                            "Accept-Language": "en-US,en;q=0.9",
+
-                            "Upgrade-Insecure-Requests": "1",
+                    const elementDescriptor = Object.getOwnPropertyDescriptor(
+                    HTMLElement.prototype,
+                    "offsetHeight"
+                    );
+
+                    Object.defineProperty(HTMLDivElement.prototype, "offsetHeight", {
+                    ...elementDescriptor,
+                    get: function () {
+                        if (this.id === "modernizr") {
+                        return 24;
                         }
-                    ),
+                        return elementDescriptor.get.apply(this);
-                )
+                    },
+                    });
 
-                await context.add_init_script(path=Path(__file__).parent / "stealth.js")
+                    Object.defineProperty(window.screen, "width", { get: () => 1366 });
+                    Object.defineProperty(window.screen, "height", { get: () => 768 });
 
-                await context.route("**/*", Network._adblock)
+                    const getParameter = WebGLRenderingContext.prototype.getParameter;
+
+                    WebGLRenderingContext.prototype.getParameter = function (param) {
+                    if (param === 37445) return "Intel Inc."; //  UNMASKED_VENDOR_WEBGL
+                    if (param === 37446) return "Intel Iris OpenGL    Engine"; // UNMASKED_RENDERER_WEBGL
+                    return getParameter.apply(this, [param]);
+                    };
+
+                    const observer = new MutationObserver((mutations) => {
+                    mutations.forEach((mutation) => {
+                        mutation.addedNodes.forEach((node) => {
+                        if (node.tagName === "IFRAME" && node.hasAttribute("sandbox")) {
+                            node.removeAttribute("sandbox");
+                        }
+                        });
+                    });
+                    });
+
+                    observer.observe(document.documentElement, { childList: true, subtree: true });
+                """)
 
             else:
                 context = await browser.new_context()
@@ -251,7 +261,7 @@ class Network:
             await page.goto(
                 url,
                 wait_until="domcontentloaded",
-                timeout=6_000,
+                timeout=15_000,
             )
 
             wait_task = asyncio.create_task(got_one.wait())
@@ -282,7 +292,7 @@ class Network:
             return
 
         except Exception as e:
-            log.warning(f"URL {url_num}) {e}")
+            log.warning(f"URL {url_num}) Exception while processing: {e}")
 
             return
 

M3U8/scrapers/watchfooty.py

@@ -29,13 +29,17 @@ BASE_MIRRORS = [
 
 VALID_SPORTS = [
     # "american-football",
-    "baseball",
+    # "australian-football",
+    # "baseball",
     "basketball",
+    "cricket",
+    "darts",
     "fighting",
     "football",
     "golf",
     "hockey",
     "racing",
+    # "rugby",
     "tennis",
     "volleyball",
 ]
@@ -92,7 +96,7 @@ async def process_event(
         await page.goto(
             url,
             wait_until="domcontentloaded",
-            timeout=8_000,
+            timeout=10_000,
         )
 
         await page.wait_for_timeout(2_000)
@@ -166,7 +170,7 @@ async def process_event(
         return nones
 
     except Exception as e:
-        log.warning(f"URL {url_num}) {e}")
+        log.warning(f"URL {url_num}) Exception while processing: {e}")
 
         return nones
 
@@ -252,15 +256,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(base_url, cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser, stealth=False) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                     )
@@ -273,11 +277,12 @@ async def scrape(browser: Browser) -> None:
                         timeout=20,
                     )
 
-                    sport, event, logo, ts = (
+                    sport, event, logo, ts, link = (
                         ev["sport"],
                         ev["event"],
                         ev["logo"],
                         ev["timestamp"],
+                        ev["link"],
                     )
 
                     key = f"[{sport}] {event} ({TAG})"

M3U8/scrapers/webcast.py

@@ -126,15 +126,15 @@ async def scrape(browser: Browser) -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         async with network.event_context(browser) as context:
             for i, ev in enumerate(events, start=1):
                 async with network.event_page(context) as page:
                     handler = partial(
                         network.process_event,
-                        url=(link := ev["link"]),
+                        url=ev["link"],
                         url_num=i,
                         page=page,
                         log=log,
@@ -148,10 +148,11 @@ async def scrape(browser: Browser) -> None:
                     )
 
                     if url:
-                        sport, event, ts = (
+                        sport, event, ts, link = (
                             ev["sport"],
                             ev["event"],
                             ev["event_ts"],
+                            ev["link"],
                         )
 
                         key = f"[{sport}] {event} ({TAG})"

M3U8/scrapers/xstreameast.py

@@ -18,7 +18,8 @@ CACHE_FILE = Cache(TAG, exp=10_800)
 BASE_URL = "https://xstreameast.com"
 
 SPORT_ENDPOINTS = [
-    "mlb",
+    # "f1",
+    # "mlb",
     "mma",
     "nba",
     # "nfl",
@@ -136,15 +137,15 @@ async def scrape() -> None:
 
     events = await get_events(cached_urls.keys())
 
-    if events:
+    log.info(f"Processing {len(events)} new URL(s)")
-        log.info(f"Processing {len(events)} new URL(s)")
 
+    if events:
         now = Time.clean(Time.now())
 
         for i, ev in enumerate(events, start=1):
             handler = partial(
                 process_event,
-                url=(link := ev["link"]),
+                url=ev["link"],
                 url_num=i,
             )
 
@@ -155,7 +156,11 @@ async def scrape() -> None:
                 log=log,
             )
 
-            sport, event = ev["sport"], ev["event"]
+            sport, event, link = (
+                ev["sport"],
+                ev["event"],
+                ev["link"],
+            )
 
             key = f"[{sport}] {event} ({TAG})"
 

readme.md

@@ -1,14 +1,12 @@
-## Base Log @ 2026-02-20 04:25 UTC
+## Base Log @ 2026-02-19 04:30 UTC
 
-### ✅ Working Streams: 149<br>❌ Dead Streams: 6
+### ✅ Working Streams: 151<br>❌ Dead Streams: 4
 
 | Channel | Error (Code) | Link |
 | ------- | ------------ | ---- |
-| BET | HTTP Error (000) | `http://mytvstream.net:8080/live/30550113/30550113/46703.m3u8` |
 | Cleo TV | HTTP Error (404) | `http://fl41.moveonjoy.com/Cleo_TV/index.m3u8` |
 | Comedy TV | HTTP Error (404) | `http://fl41.moveonjoy.com/Comedy_TV/index.m3u8` |
 | Crime & Investigation Network | HTTP Error (404) | `http://fl41.moveonjoy.com/Crime_and_Investigation_Network/index.m3u8` |
-| Food Network | HTTP Error (000) | `http://23.237.104.106:8080/USA_FOOD_NETWORK/index.m3u8` |
 | Ovation | HTTP Error (404) | `http://fl41.moveonjoy.com/Ovation/index.m3u8` |
 ---
 #### Base Channels URL