Bump version

Fix error 401 connect

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iSponsorBlockTV"
-version = "2.4.0"
+version = "2.5.2"
 authors = [
     {"name" = "dmunozv04"}
 ]

src/iSponsorBlockTV/debug_helpers.py

@@ -0,0 +1,25 @@
+class AiohttpTracer:
+    def __init__(self, logger):
+        self.logger = logger
+
+    async def on_request_start(self, session, context, params):
+        self.logger.debug(f"Request started ({id(context):#x}): {params.method} {params.url}")
+
+    async def on_request_end(self, session, context, params):
+        self.logger.debug(f"Request ended ({id(context):#x}): {params.response.status}")
+
+    async def on_request_exception(self, session, context, params):
+        self.logger.debug(f"Request exception ({id(context):#x}): {params.exception}")
+
+    async def on_response_chunk_received(self, session, context, params):
+        chunk_size = len(params.chunk)
+        try:
+            # Try to decode as text
+            text = params.chunk.decode("utf-8")
+            self.logger.debug(f"Response chunk ({id(context):#x}) {chunk_size} bytes: {text}")
+        except UnicodeDecodeError:
+            # If not valid UTF-8, show as hex
+            hex_data = params.chunk.hex()
+            self.logger.debug(
+                f"Response chunk ({id(context):#x}) ({chunk_size} bytes) [HEX]: {hex_data}"
+            )

src/iSponsorBlockTV/helpers.py

@@ -131,6 +131,7 @@ class Config:
     help="data directory",
 )
 @click.option("--debug", is_flag=True, help="debug mode")
+@click.option("--http-tracing", is_flag=True, help="Enable HTTP request/response tracing")
 # legacy commands as arguments
 @click.option("--setup", is_flag=True, help="Setup the program graphically", hidden=True)
 @click.option(
@@ -140,11 +141,12 @@ class Config:
     hidden=True,
 )
 @click.pass_context
-def cli(ctx, data, debug, setup, setup_cli):
+def cli(ctx, data, debug, http_tracing, setup, setup_cli):
     """iSponsorblockTV"""
     ctx.ensure_object(dict)
     ctx.obj["data_dir"] = data
     ctx.obj["debug"] = debug
+    ctx.obj["http_tracing"] = http_tracing
 
     logger = logging.getLogger()
     ctx.obj["logger"] = logger
@@ -189,7 +191,7 @@ def start(ctx):
     """Start the main program"""
     config = Config(ctx.obj["data_dir"])
     config.validate()
-    main.main(config, ctx.obj["debug"])
+    main.main(config, ctx.obj["debug"], ctx.obj["http_tracing"])
 
 
 # Create fake "self" group to show pyapp options in help menu

src/iSponsorBlockTV/main.py

@@ -7,6 +7,7 @@ from typing import Optional
 import aiohttp
 
 from . import api_helpers, ytlounge
+from .debug_helpers import AiohttpTracer
 
 
 class DeviceListener:
@@ -153,14 +154,28 @@ def handle_signal(signum, frame):
     raise KeyboardInterrupt()
 
 
-async def main_async(config, debug):
+async def main_async(config, debug, http_tracing):
     loop = asyncio.get_event_loop_policy().get_event_loop()
     tasks = []  # Save the tasks so the interpreter doesn't garbage collect them
     devices = []  # Save the devices to close them later
     if debug:
         loop.set_debug(True)
+
     tcp_connector = aiohttp.TCPConnector(ttl_dns_cache=300)
-    web_session = aiohttp.ClientSession(connector=tcp_connector)
+
+    # Configure session with tracing if enabled
+    if http_tracing:
+        root_logger = logging.getLogger("aiohttp_trace")
+        tracer = AiohttpTracer(root_logger)
+        trace_config = aiohttp.TraceConfig()
+        trace_config.on_request_start.append(tracer.on_request_start)
+        trace_config.on_response_chunk_received.append(tracer.on_response_chunk_received)
+        trace_config.on_request_end.append(tracer.on_request_end)
+        trace_config.on_request_exception.append(tracer.on_request_exception)
+        web_session = aiohttp.ClientSession(connector=tcp_connector, trace_configs=[trace_config])
+    else:
+        web_session = aiohttp.ClientSession(connector=tcp_connector)
+
     api_helper = api_helpers.ApiHelper(config, web_session)
     for i in config.devices:
         device = DeviceListener(api_helper, config, i, debug, web_session)
@@ -184,5 +199,5 @@ async def main_async(config, debug):
         print("Exited")
 
 
-def main(config, debug):
-    asyncio.run(main_async(config, debug))
+def main(config, debug, http_tracing):
+    asyncio.run(main_async(config, debug, http_tracing))

src/iSponsorBlockTV/ytlounge.py

@@ -1,10 +1,14 @@
 import asyncio
 import json
+import sys
 from typing import Any, List
 
 import pyytlounge
 from aiohttp import ClientSession
 
+from pyytlounge.wrapper import NotLinkedException, api_base, as_aiter, Dict
+from uuid import uuid4
+
 from .constants import youtube_client_blacklist
 
 create_task = asyncio.create_task
@@ -236,3 +240,111 @@ class YtLoungeApi(pyytlounge.YtLoungeApi):
         if self.conn is not None:
             await self.conn.close()
         self.session = web_session
+
+    def _common_connection_parameters(self) -> Dict[str, Any]:
+        return {
+            "name": self.device_name,
+            "loungeIdToken": self.auth.lounge_id_token,
+            "SID": self._sid,
+            "AID": self._last_event_id,
+            "gsessionid": self._gsession,
+            "device": "REMOTE_CONTROL",
+            "app": "ytios-phone-20.15.1",
+            "VER": "8",
+            "v": "2",
+        }
+
+    async def connect(self) -> bool:
+        """Attempt to connect using the previously set tokens"""
+        if not self.linked():
+            raise NotLinkedException("Not linked")
+
+        connect_body = {
+            "id": str(uuid4()),
+            "mdx-version": "3",
+            "TYPE": "xmlhttp",
+            "theme": "cl",
+            "sessionSource": "MDX_SESSION_SOURCE_UNKNOWN",
+            "connectParams": '{"setStatesParams": "{"playbackSpeed":0}"}',
+            "sessionNonce": str(uuid4()),
+            "RID": "1",
+            "CVER": "1",
+            "capabilities": "que,dsdtr,atp,vsp",
+            "ui": "false",
+            "app": "ytios-phone-20.15.1",
+            "pairing_type": "manual",
+            "VER": "8",
+            "loungeIdToken": self.auth.lounge_id_token,
+            "device": "REMOTE_CONTROL",
+            "name": self.device_name,
+        }
+        connect_url = f"{api_base}/bc/bind"
+        async with self.session.post(url=connect_url, data=connect_body) as resp:
+            try:
+                text = await resp.text()
+                if resp.status == 401:
+                    if "Connection denied" in text:
+                        self._logger.warning(
+                            "Connection denied, attempting to circumvent the issue"
+                        )
+                        await self.connect_as_screen()
+                    # self._lounge_token_expired()
+                    return False
+
+                if resp.status != 200:
+                    self._logger.warning("Unknown reply to connect %i %s", resp.status, resp.reason)
+                    return False
+                lines = text.splitlines()
+                async for events in self._parse_event_chunks(as_aiter(lines)):
+                    self._process_events(events)
+                self._command_offset = 1
+                return self.connected()
+            except:
+                self._logger.exception(
+                    "Handle connect failed, status %s reason %s",
+                    resp.status,
+                    resp.reason,
+                )
+                raise
+
+    async def connect_as_screen(self) -> bool:
+        """Attempt to connect using the previously set tokens"""
+        if not self.linked():
+            raise NotLinkedException("Not linked")
+
+        connect_body = {
+            "id": str(uuid4()),
+            "mdx-version": "3",
+            "TYPE": "xmlhttp",
+            "theme": "cl",
+            "sessionSource": "MDX_SESSION_SOURCE_UNKNOWN",
+            "connectParams": '{"setStatesParams": "{"playbackSpeed":0}"}',
+            "sessionNonce": str(uuid4()),
+            "RID": "1",
+            "CVER": "1",
+            "capabilities": "que,dsdtr,atp,vsp",
+            "ui": "false",
+            "app": "ytios-phone-20.15.1",
+            "pairing_type": "manual",
+            "VER": "8",
+            "loungeIdToken": self.auth.lounge_id_token,
+            "device": "LOUNGE_SCREEN",
+            "name": self.device_name,
+        }
+        connect_url = f"{api_base}/bc/bind"
+        async with self.session.post(url=connect_url, data=connect_body) as resp:
+            try:
+                await resp.text()
+                self.logger.error(
+                    "Connected as screen: please force close the app on the device for iSponsorBlockTV to work properly"
+                )
+                self.logger.warn("Exiting in 5 seconds")
+                await asyncio.sleep(5)
+                sys.exit(0)
+            except:
+                self._logger.exception(
+                    "Handle connect failed, status %s reason %s",
+                    resp.status,
+                    resp.reason,
+                )
+                raise