browserfetch 0.14.0__tar.gz → 0.15.0__tar.gz

{browserfetch-0.14.0 → browserfetch-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: browserfetch
-Version: 0.14.0
+Version: 0.15.0
 Summary: fetch in Python using your browser!
 Keywords: browser,fetch,python,cookies
 License: GNU General Public License v3 (GPLv3)
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Dist: aiohttp
 Requires-Dist: pyperclip
 Requires-Dist: cyclopts
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Project-URL: Homepage, https://github.com/5j9/browserfetch
 Description-Content-Type: text/x-rst
 

{browserfetch-0.14.0 → browserfetch-0.15.0}/browserfetch/__init__.py

@@ -1,11 +1,9 @@
-__version__ = '0.14.0'
+__version__ = '0.15.0'
 __all__ = [
     'BrowserError',
     'Response',
     'evaluate',
     'fetch',
-    'get',
-    'post',
     'start_server',
 ]
 import atexit
@@ -23,7 +21,6 @@ from html import escape
 from json import dumps as _dumps, loads as _loads
 from logging import getLogger
 from typing import Any as _Any
-from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 
 from aiohttp import ClientSession, ClientWebSocketResponse
 from aiohttp.web import (
@@ -260,23 +257,29 @@ async def evaluate(
 async def fetch(
     url: str,
     *,
+    method: str | None = None,
     params: dict | None = None,
     data: _Any = None,
     form: dict | None = None,
     timeout: int | float = 95,
-    options: dict | None = None,
+    headers: dict | None = None,
     host: str | None = None,
+    options: dict | None = None,
 ) -> Response:
     """Fetch using browser fetch API available on host.
 
-    This refactored version handles the 'data' and 'form' parameters
-    directly, making it a more unified and powerful fetch function,
-    similar to Playwright's API.
+    This function tries to be similar to Playwright's API.
+    (but it's not identical)
 
     :param url: the URL of the resource you want to fetch.
     :param params: parameters to be url-encoded and added to url.
     :param data: the JSON-serializable body of the request.
+        If data is str or bytes, `application/octet-stream` content-type
+        header will be set. Otherwise, the object will be encoded and sent as
+        `application/json`.
     :param form: a dict of form data to be url-encoded.
+        Passing `form` will automatically set
+        `application/x-www-form-urlencoded` header.
     :param timeout: timeout in seconds (do not add to options).
     :param options: See https://developer.mozilla.org/en-US/docs/Web/API/fetch
     :param host: `location.host` of the tab that is supposed to handle this
@@ -288,40 +291,28 @@ async def fetch(
         assert form is None
         if isinstance(data, str):
             body = data.encode()
+            content_type = 'application/octet-stream'
         elif isinstance(data, bytes):
             body = data
+            content_type = 'application/octet-stream'
         else:
             body = _jdumps(data).encode()
-            if options is None:
-                options = {}
-            headers = options.setdefault('headers', {})
-            headers['Content-Type'] = 'application/json'
-    elif form is not None:
-        body = urlencode(form).encode()
-        if options is None:
-            options = {}
-        headers = options.setdefault('headers', {})
-        headers['Content-Type'] = 'application/x-www-form-urlencoded'
+            content_type = 'application/json'
     else:
-        body = None
-
-    if params is not None:
-        parsed_url = urlparse(url)
-        url = urlunparse(
-            parsed_url._replace(
-                query=urlencode(
-                    [*parse_qsl(parsed_url.query), *params.items()]
-                )
-            )
-        )
+        content_type = body = None
 
     d = await _request(
         host,
         {
             'action': 'fetch',
             'url': url,
+            'method': method,
+            'headers': headers,
             'options': options,
             'timeout': timeout,
+            'params': params,
+            'form': form,
+            'content_type': content_type,
         },
         body,
     )
@@ -332,51 +323,6 @@ async def fetch(
     return Response(**d)
 
 
-async def get(
-    url: str,
-    *,
-    params: dict | None = None,
-    options: dict | None = None,
-    host: str | None = None,
-    timeout: int | float = 95,
-) -> Response:
-    """Convenience function for a GET request."""
-    if options is None:
-        options = {'method': 'GET'}
-    else:
-        options['method'] = 'GET'
-    return await fetch(
-        url, options=options, host=host, timeout=timeout, params=params
-    )
-
-
-async def post(
-    url: str,
-    *,
-    params: dict | None = None,
-    data: _Any = None,
-    form: dict | None = None,
-    timeout: int | float = 95,
-    options: dict | None = None,
-    host: str | None = None,
-) -> Response:
-    """Convenience function for a POST request."""
-    if options is None:
-        options = {'method': 'POST'}
-    else:
-        options['method'] = 'POST'
-
-    return await fetch(
-        url,
-        options=options,
-        host=host,
-        timeout=timeout,
-        params=params,
-        data=data,
-        form=form,
-    )
-
-
 app = Application()
 app.add_routes(routes)
 app_runner = AppRunner(app)

{browserfetch-0.14.0 → browserfetch-0.15.0}/browserfetch/browserfetch.js

@@ -7,16 +7,42 @@
 // @ts-check
 (async () => {
     /**
-     * @param {Uint8Array | null} body 
+     * @param {Uint8Array | URLSearchParams | null} body 
      * @param {any} req
      * @returns {Promise<Blob>}
      */
     async function doFetch(req, body) {
-        var returnData, response;
-        var options = req['options'] || {};
+        var returnData, response, headers;
+        var url = req.url;
+        var options = req.options || {};
 
-        if (req['timeout']) {
-            options.signal = AbortSignal.timeout(req['timeout'] * 1000);
+        if (req.method) {
+            options.method = req.method;
+        }
+
+        if (req.headers) {
+            headers = { ...options.headers, ...req.headers };
+        } else {
+            headers = options.headers || {};
+        }
+        options.headers = headers;
+
+        if (req.params) {
+            url = new URL(url);
+            for (const [key, value] of Object.entries(req.params)) {
+                url.searchParams.set(key, value);
+            }
+        }
+
+        if (req.form) {
+            body = new URLSearchParams(req.form);
+            headers['Content-Type'] = 'application/x-www-form-urlencoded';
+        } else if (req.content_type) {
+            headers['Content-Type'] = req.content_type;
+        }
+
+        if (req.timeout) {
+            options.signal = AbortSignal.timeout(req.timeout * 1000);
         }
 
         if (body !== null) {
@@ -24,9 +50,9 @@
         }
 
         try {
-            var r = await fetch(req['url'], options);
+            var r = await fetch(url, options);
             returnData = {
-                'event_id': req['event_id'],
+                'event_id': req.event_id,
                 'headers': Object.fromEntries([...r.headers]),
                 'ok': r.ok,
                 'redirected': r.redirected,
@@ -38,7 +64,7 @@
             response = await r.blob();
         } catch (/**@type {any} */err) {
             returnData = {
-                'event_id': req['event_id'],
+                'event_id': req.event_id,
                 'error': err.toString()
             };
             response = "";

{browserfetch-0.14.0 → browserfetch-0.15.0}/pyproject.toml

@@ -9,13 +9,13 @@ keywords = ["browser", "fetch", "python", "cookies"]
 classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 dependencies = [
     "aiohttp",
     "pyperclip",
     "cyclopts",
 ]
-version = "0.14.0"
+version = "0.15.0"
 
 [[authors]]
 name = "5j9"
@@ -76,5 +76,6 @@ module-name = "browserfetch"
 dev = [
     "playwright>=1.52.0",
     "pytest>=8.4.0",
+    "pytest-aiohttp>=1.1.0",
     "pytest-asyncio>=1.0.0",
 ]