bookmarkmgr: cronet: Handle cookies

This is supposed to help with some rate limiting.

Author: lubo

bookmarkmgr/bookmarkmgr/cronet/models.py

@@ -1,6 +1,8 @@
 from dataclasses import dataclass, field
 from email.message import Message
 from http import HTTPStatus
+from typing import Any
+from urllib.request import Request
 
 
 @dataclass(slots=True)
@@ -16,11 +18,20 @@ def ok(self) -> bool:
         )
 
 
-@dataclass(slots=True)
-class RequestParameters:
-    method: str
-    url: str
-    allow_redirects: bool = True
+class RequestParameters(Request):
+    def __init__(
+            self,
+            *args: Any,
+            allow_redirects: bool = True,
+            **kwargs: Any,
+        ) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.allow_redirects = allow_redirects
+
+    @property
+    def url(self) -> str:
+        return self.full_url
 
 
 @dataclass(slots=True)
@@ -32,6 +43,9 @@ class Response(ResponseStatus):
     headers: Message = field(default_factory=Message)
     redirect_url: str | None = None
 
+    def info(self) -> Message:
+        return self.headers
+
     @property
     def text(self) -> str:
         return self.content.decode(self.charset, "replace")

bookmarkmgr/bookmarkmgr/cronet/session.py

@@ -2,7 +2,9 @@
 from collections.abc import Awaitable, Callable, Iterable, Mapping
 from contextlib import nullcontext
 from http import HTTPStatus
-from typing import Any, Self, TYPE_CHECKING
+from http.cookiejar import CookieJar
+from itertools import chain
+from typing import Any, cast, Self, TYPE_CHECKING
 from urllib.parse import urlparse
 
 from yarl import URL
@@ -24,6 +26,8 @@
 from .utils import adestroying, destroying
 
 if TYPE_CHECKING:
+    from http.client import HTTPResponse
+
     from .types import Engine
 
 INIT_MAX_RETRY_ATTEMPTS = 5
@@ -48,6 +52,7 @@
 
 class Session:
     def __init__(self) -> None:
+        self._cookie_jar = CookieJar()
         self._engine: Engine | None = None
 
     async def __aenter__(self) -> Self:
@@ -128,6 +133,13 @@ async def request(
         if params is not None:
             url = str(URL(url).update_query(params))
 
+        request_params = RequestParameters(
+            method=method,
+            url=url,
+           **kwargs,
+        )
+        self._cookie_jar.add_cookie_header(request_params)
+
         async with (
             adestroying(
                 lib.Cronet_UrlRequestParams_Create(),
@@ -138,19 +150,18 @@ async def request(
                 lib.Cronet_UrlRequest_Destroy,
             ) as request,
             RequestCallbackManager(
-                RequestParameters(
-                    method=method,
-                    url=url,
-                    **kwargs,
-                ),
+                request_params,
             ) as callback_manager,
             ExecutorManager() as executor_manager,
         ):
             lib.Cronet_UrlRequestParams_http_method_set(
                 parameters,
                 method.encode(),
             )
-            for name, value in DEFAULT_HEADERS:
+            for name, value in chain(
+                DEFAULT_HEADERS,
+                request_params.headers.items(),
+            ):
                 with destroying(
                     lib.Cronet_HttpHeader_Create(),
                     lib.Cronet_HttpHeader_Destroy,
@@ -177,11 +188,18 @@ async def request(
             _raise_for_error_result(lib.Cronet_UrlRequest_Start(request))
 
             try:
-                return await callback_manager.response()
+                response = await callback_manager.response()
             except:
                 lib.Cronet_UrlRequest_Cancel(request)
                 raise
 
+        self._cookie_jar.extract_cookies(
+            cast("HTTPResponse", response),
+            request_params,
+        )
+
+        return response
+
 
 class RetrySession(Session):
     def __init__(