browserfetch 0.15.0__tar.gz → 0.16.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: browserfetch
-Version: 0.15.0
+Version: 0.16.0
 Summary: fetch in Python using your browser!
 Keywords: browser,fetch,python,cookies
 License: GNU General Public License v3 (GPLv3)
@@ -26,14 +26,14 @@ Usage
 
     from asyncio import gather, new_event_loop
 
-    from browserfetch import fetch, get, post, run_server
+    from browserfetch import fetch, run_server
 
 
     async def main():
         response1, response2, reponse3 = await gather(
-            get('https://example.com/path1', params={'a': 1}),
+            fetch('https://example.com/path1', params={'a': 1}),
             fetch('https://example.com/image.png'),
-            post('https://example.com/path2', data={'a': 1}),
+            fetch('https://example.com/path2', data={'a': 1}, method='post'),
         )
         # do stuff with retrieved responses
 

{browserfetch-0.15.0 → browserfetch-0.16.0}/README.rst

@@ -12,14 +12,14 @@ Usage
 
     from asyncio import gather, new_event_loop
 
-    from browserfetch import fetch, get, post, run_server
+    from browserfetch import fetch, run_server
 
 
     async def main():
         response1, response2, reponse3 = await gather(
-            get('https://example.com/path1', params={'a': 1}),
+            fetch('https://example.com/path1', params={'a': 1}),
             fetch('https://example.com/image.png'),
-            post('https://example.com/path2', data={'a': 1}),
+            fetch('https://example.com/path2', data={'a': 1}, method='post'),
         )
         # do stuff with retrieved responses
 

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

@@ -1,4 +1,4 @@
-__version__ = '0.15.0'
+__version__ = '0.16.0'
 __all__ = [
     'BrowserError',
     'Response',
@@ -6,12 +6,10 @@ __all__ = [
     'fetch',
     'start_server',
 ]
-import atexit
 from asyncio import (
-    AbstractEventLoop,
+    CancelledError,
     Event,
-    Task,
-    get_running_loop,
+    Future,
     wait_for,
 )
 from collections import defaultdict
@@ -134,7 +132,7 @@ async def receive_responses(ws: WebSocketResponse | ClientWebSocketResponse):
 
 
 routes = RouteTableDef()
-PROTOCOL = '3'
+PROTOCOL = '4'
 
 
 @routes.get('/ws')
@@ -325,12 +323,6 @@ async def fetch(
 
 app = Application()
 app.add_routes(routes)
-app_runner = AppRunner(app)
-
-
-def _cancel_relay_task(loop: AbstractEventLoop, task: Task):
-    logger.info('cancelling relay task')
-    task.cancel()
 
 
 _server = False
@@ -341,9 +333,9 @@ _port = 9404
 async def start_server(*, host=_host, port=_port):
     global _server, _host, _port
     _host, _port = host, port
-    loop = get_running_loop()
-    await app_runner.setup()
-    site = TCPSite(app_runner, host, port)
+    runner = AppRunner(app)
+    await runner.setup()
+    site = TCPSite(runner, host, port)
     try:
         await site.start()  # does not block
     except OSError as e:
@@ -352,8 +344,19 @@ async def start_server(*, host=_host, port=_port):
             port,
             e,
         )
-        relay_task = loop.create_task(relay_client(host, port))
-        atexit.register(_cancel_relay_task, loop, relay_task)
-    else:
-        _server = True
-        logger.info('server started at http://%s:%s', host, port)
+        try:
+            await relay_client(host, port)  # blocks
+        finally:
+            logger.error('relay failed: %s', e)
+        return
+
+    _server = True
+    logger.info('server started at http://%s:%s', host, port)
+    try:
+        await Future()
+    except CancelledError:
+        pass  # python raises CancelledError on KeyboardInterrupt
+    finally:
+        await runner.shutdown()
+        await runner.cleanup()
+        logger.info('server shutdown')

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

@@ -75,7 +75,7 @@
     /**
      * 
      * @param {any} req
-     * @returns {Promise<Uint8Array>}
+     * @returns {Promise<Blob>}
      */
     async function doEval(req) {
         var evalled, resp;
@@ -96,9 +96,10 @@
         } catch (/**@type {any} */err) {
             resp = { 'result': err.toString(), 'event_id': req['event_id'] };
         }
-        return new TextEncoder().encode(JSON.stringify(resp));
+        return new Blob([JSON.stringify(resp)]);
     }
 
+
     /**
      * 
      * @param {ArrayBuffer} d 
@@ -126,7 +127,7 @@
     var hostName;
 
     function connect() {
-        var protocol = '3'
+        var protocol = '4'
         var ws = new WebSocket("ws://127.0.0.1:9404/ws");
         ws.binaryType = "arraybuffer";
 
@@ -143,7 +144,7 @@
         };
 
         ws.onmessage = async (evt) => {
-            var /**@type {Uint8Array | Blob} */ result, /**@type {any} */ j, b;
+            var /**@type {Blob} */ result, /**@type {any} */ j, b;
             [b, j] = parseData(evt.data);
             switch (j['action']) {
                 case 'close_ws':
@@ -158,10 +159,11 @@
                     result = await doEval(j);
                     break;
                 default:
-                    result = new TextEncoder().encode(JSON.stringify({
+                    result = new Blob([JSON.stringify({
                         'event_id': j['event_id'],
                         'error': `Action ${j['action']} is not defined.`
-                    }));
+                    })]);
+
                     break;
             }
             ws.send(result);

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

@@ -10,12 +10,8 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
 requires-python = ">=3.13"
-dependencies = [
-    "aiohttp",
-    "pyperclip",
-    "cyclopts",
-]
-version = "0.15.0"
+dependencies = ["aiohttp", "pyperclip", "cyclopts"]
+version = "0.16.0"
 
 [[authors]]
 name = "5j9"
@@ -37,17 +33,18 @@ format.quote-style = 'single'
 lint.isort.combine-as-imports = true
 lint.extend-select = [
     'W605', # invalid-escape-sequence
-    'FA',  # flake8-future-annotations
-    'I',  # isort
-    'UP',  # pyupgrade
-    'RUF', # Ruff-specific rules (RUF)
+    'FA',   # flake8-future-annotations
+    'I',    # isort
+    'UP',   # pyupgrade
+    'RUF',  # Ruff-specific rules (RUF)
 ]
 lint.ignore = [
-    'E721',  # Do not compare types, use `isinstance()`
-    'RUF001',  # ambiguous-unicode-character-string	
-    'RUF002',  # ambiguous-unicode-character-docstring
-    'RUF003',  # ambiguous-unicode-character-comment
-    'RUF012',  # mutable-class-default
+    'E721',   # Do not compare types, use `isinstance()`
+    'RUF001', # ambiguous-unicode-character-string
+    'RUF002', # ambiguous-unicode-character-docstring
+    'RUF003', # ambiguous-unicode-character-comment
+    'RUF012', # mutable-class-default
+    'RUF059', # Unpacked variable never used
 ]
 
 [tool.pytest.ini_options]
@@ -68,6 +65,8 @@ reportInvalidStringEscapeSequence = false
 reportConstantRedefinition = 'error'
 reportTypeCommentUsage = 'warning'
 reportUnnecessaryComparison = 'warning'
+venvPath = "."
+venv = ".venv"
 
 [tool.uv.build-backend]
 module-root = ""