browserfetch 0.8.1__tar.gz → 0.9.0__tar.gz

{browserfetch-0.8.1 → browserfetch-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: browserfetch
-Version: 0.8.1
+Version: 0.9.0
 Summary: fetch in Python using your browser! 
 Keywords: browser,fetch,python,cookies
 Requires-Python: >=3.11

{browserfetch-0.8.1 → browserfetch-0.9.0}/browserfetch/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.8.1'
+__version__ = '0.9.0'
 
 import atexit
 from asyncio import (
@@ -137,6 +137,7 @@ async def _(request):
     except TypeError:
         logger.info('host WebSocket was closed')
         hosts[host] = Event()
+    return ws
 
 
 @routes.get('/relay')
@@ -202,11 +203,11 @@ async def evaluate(
 async def fetch(
     url: str,
     *,
-    params: dict = None,
-    body: bytes = None,
+    params: dict | None = None,
+    body: bytes | None = None,
     timeout: int | float = 95,
-    options: dict = None,
-    host=None,
+    options: dict | None = None,
+    host: str | None = None,
 ) -> Response:
     """Fetch using browser fetch API available on host.
 
@@ -242,9 +243,9 @@ async def fetch(
 async def get(
     url: str,
     *,
-    params: dict = None,
-    options: dict = None,
-    host: str = None,
+    params: dict | None = None,
+    options: dict | None = None,
+    host: str | None = None,
     timeout: int | float = 95,
 ) -> Response:
     if options is None:
@@ -259,28 +260,31 @@ async def get(
 async def post(
     url: str,
     *,
-    params: dict = None,
-    body: bytes = None,
-    data: dict = None,
-    json=None,
+    params: dict | None = None,
+    data: bytes | dict | str | None = None,
+    form: dict | None = None,
     timeout: int | float = 95,
-    options: dict = None,
-    host: str = None,
+    options: dict | None = None,
+    host: str | None = None,
 ) -> Response:
     if options is None:
         options: dict[str, Any] = {'method': 'POST'}
     else:
         options['method'] = 'POST'
 
-    if json is not None:
-        assert body is None
-        body = dumps(json).encode()
-        headers = options.setdefault('headers', {})
-        headers['Content-Type'] = 'application/json'
-
     if data is not None:
-        assert body is None
-        body = urlencode(data).encode()
+        if isinstance(data, str):
+            body = data.encode()
+        elif isinstance(data, bytes):
+            body = data
+        else:
+            body = dumps(data).encode()
+            headers = options.setdefault('headers', {})
+            headers['Content-Type'] = 'application/json'
+
+    if form is not None:
+        assert data is None
+        body = urlencode(form).encode()
         headers = options.setdefault('headers', {})
         headers['Content-Type'] = 'application/x-www-form-urlencoded'
 

{browserfetch-0.8.1 → browserfetch-0.9.0}/browserfetch/browserfetch.js

@@ -55,6 +55,17 @@
         var evalled, resp;
         try {
             evalled = eval(req['string']);
+            switch (evalled.constructor.name) {
+                case 'AsyncFunction':
+                    evalled = await evalled;
+                    break;
+                case 'Promise':
+                    evalled = await evalled;
+                    break;
+                case 'Function':
+                    evalled = evalled();
+                    break;
+            }
             resp = { 'result': evalled, 'event_id': req['event_id'] };
         } catch (err) {
             resp = { 'result': err.toString(), 'event_id': req['event_id'] };
@@ -92,7 +103,7 @@
         }
 
         ws.onclose = () => {
-            console.error('browserfetch: WebSocket was closed; will retry in 5 seconds');
+            console.error('WebSocket was closed; will retry in 5 seconds');
             setTimeout(connect, 5000);
         };
 

{browserfetch-0.8.1 → browserfetch-0.9.0}/pyproject.toml

@@ -35,13 +35,22 @@ line-length = 79
 format.quote-style = 'single'
 lint.isort.combine-as-imports = true
 lint.extend-select = [
+    'FA',  # flake8-future-annotations
     'I',  # isort
     'UP',  # pyupgrade
 ]
 lint.ignore = [
-    'UP027',  # list comprehensions are faster than generator expressions
     'E721',  # Do not compare types, use `isinstance()`
 ]
 
 [tool.pytest.ini_options]
 addopts = '--quiet --tb=short'
+
+[tool.pyright]
+typeCheckingMode = 'standard'
+reportDeprecated = "warning"
+reportPropertyTypeMismatch = "warning"
+reportUnnecessaryCast = "warning"
+reportUnnecessaryContains = "warning"
+reportUnnecessaryIsInstance = "warning"
+reportUnnecessaryTypeIgnoreComment = true