httpdbg 1.1.2__tar.gz → 1.2.0__tar.gz

{httpdbg-1.1.2 → httpdbg-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 1.1.2
+Version: 1.2.0
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -114,7 +114,6 @@ Press CTRL+C to quit
 
 ![httpdbg 1.1.0 - pyhttpdbg -m flask --app demoflask run](https://github.com/cle-b/httpdbg/blob/main/ui_server.png?raw=true)
 
-This feature is new and not fully implemented. See [limitations](#limitations) for more details.
 
 ## initiators and groups
  
@@ -146,7 +145,8 @@ The initiator is the low-level socket method that receives the data. The group i
 
 | packages       | status                              | initiator | group     |
 |----------------|-------------------------------------|-----------|-----------|
-| flask          | supported                           | no        | yes       |
+| flask          | supported                           | -         | yes       |
+| fastapi        | supported                           | -         | yes       |
 
 ### supported test framework
 
@@ -154,8 +154,8 @@ The requests are grouped by tests.
 
 | packages       | status                              | initiator | group     |
 |----------------|-------------------------------------|-----------|-----------|
-| pytest         | supported                           | no        | yes       |
-| unittest       | supported                           | no        | yes       |
+| pytest         | supported                           | -         | yes       |
+| unittest       | supported                           | -         | yes       |
 
 ## configuration
 
@@ -218,7 +218,7 @@ The requests:
 
 Theoretically, if your HTTP client or server uses a standard Python socket, the HTTP requests will be recorded.
 
-Support for recording requests on the server side is new in `httpdbg 1.0.0` and is currently limited. For example, it doesn't work with `FastAPI`, which uses `uvloop`, but it does work with `Uvicorn` if the loop is `asyncio`. Work is in progress to improve this.
+Support for recording requests on the server side is new in `httpdbg 1.0.0`. In some cases, like with |FastAPI| using |uvloop|, we had to implement a new mechanism to make request recording possible. This is still a work in progress as we aim to support more frameworks.
 
 ## documentation
 

{httpdbg-1.1.2 → httpdbg-1.2.0}/README.md

@@ -87,7 +87,6 @@ Press CTRL+C to quit
 
 ![httpdbg 1.1.0 - pyhttpdbg -m flask --app demoflask run](https://github.com/cle-b/httpdbg/blob/main/ui_server.png?raw=true)
 
-This feature is new and not fully implemented. See [limitations](#limitations) for more details.
 
 ## initiators and groups
  
@@ -119,7 +118,8 @@ The initiator is the low-level socket method that receives the data. The group i
 
 | packages       | status                              | initiator | group     |
 |----------------|-------------------------------------|-----------|-----------|
-| flask          | supported                           | no        | yes       |
+| flask          | supported                           | -         | yes       |
+| fastapi        | supported                           | -         | yes       |
 
 ### supported test framework
 
@@ -127,8 +127,8 @@ The requests are grouped by tests.
 
 | packages       | status                              | initiator | group     |
 |----------------|-------------------------------------|-----------|-----------|
-| pytest         | supported                           | no        | yes       |
-| unittest       | supported                           | no        | yes       |
+| pytest         | supported                           | -         | yes       |
+| unittest       | supported                           | -         | yes       |
 
 ## configuration
 
@@ -191,7 +191,7 @@ The requests:
 
 Theoretically, if your HTTP client or server uses a standard Python socket, the HTTP requests will be recorded.
 
-Support for recording requests on the server side is new in `httpdbg 1.0.0` and is currently limited. For example, it doesn't work with `FastAPI`, which uses `uvloop`, but it does work with `Uvicorn` if the loop is `asyncio`. Work is in progress to improve this.
+Support for recording requests on the server side is new in `httpdbg 1.0.0`. In some cases, like with |FastAPI| using |uvloop|, we had to implement a new mechanism to make request recording possible. This is still a work in progress as we aim to support more frameworks.
 
 ## documentation
 

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/__init__.py

@@ -3,6 +3,6 @@ from httpdbg.hooks.all import httprecord
 from httpdbg.records import HTTPRecords
 
 
-__version__ = "1.1.2"
+__version__ = "1.2.0"
 
 __all__ = ["httprecord", "HTTPRecords"]

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/hooks/all.py

@@ -7,15 +7,19 @@ from typing import Union
 
 from httpdbg.hooks.aiohttp import hook_aiohttp
 from httpdbg.hooks.external import watcher_external
+from httpdbg.hooks.fastapi import hook_fastapi
+from httpdbg.hooks.flask import hook_flask
 from httpdbg.hooks.generic import hook_generic
 from httpdbg.hooks.http import hook_http
 from httpdbg.hooks.httpx import hook_httpx
 from httpdbg.hooks.pytest import hook_pytest
 from httpdbg.hooks.requests import hook_requests
 from httpdbg.hooks.socket import hook_socket
+from httpdbg.hooks.starlette import hook_starlette
 from httpdbg.hooks.unittest import hook_unittest
 from httpdbg.hooks.urllib3 import hook_urllib3
-from httpdbg.hooks.flask import hook_flask
+from httpdbg.hooks.uvicorn import hook_uvicorn
+
 from httpdbg.records import HTTPRecords
 
 
@@ -33,12 +37,17 @@ def httprecord(
     with watcher_external(records, initiators, server):
         with hook_flask(records):
             with hook_socket(records):
-                with hook_http(records):
-                    with hook_httpx(records):
-                        with hook_requests(records):
-                            with hook_urllib3(records):
-                                with hook_aiohttp(records):
-                                    with hook_pytest(records):
-                                        with hook_unittest(records):
-                                            with hook_generic(records, initiators):
-                                                yield records
+                with hook_fastapi(records):
+                    with hook_starlette(records):
+                        with hook_uvicorn(records):
+                            with hook_http(records):
+                                with hook_httpx(records):
+                                    with hook_requests(records):
+                                        with hook_urllib3(records):
+                                            with hook_aiohttp(records):
+                                                with hook_pytest(records):
+                                                    with hook_unittest(records):
+                                                        with hook_generic(
+                                                            records, initiators
+                                                        ):
+                                                            yield records

httpdbg-1.2.0/httpdbg/hooks/fastapi.py

@@ -0,0 +1,156 @@
+# -*- coding: utf-8 -*-
+from collections.abc import Callable
+from contextlib import contextmanager
+import functools
+from functools import wraps
+from typing import Dict
+from typing import Generator
+from typing import Union
+
+import datetime
+
+from httpdbg.hooks.utils import decorate
+from httpdbg.hooks.utils import getcallargs
+from httpdbg.hooks.utils import undecorate
+from httpdbg.initiator import httpdbg_endpoint
+from httpdbg.records import HTTPRecords
+
+
+# decorate the function decorated by @app.get; @app.post etc.
+def set_hook_fastapi_endpoint(records: HTTPRecords, method: Callable):
+
+    @wraps(method)
+    def hook(*args, **kwargs):
+
+        with httpdbg_endpoint(
+            records,
+            method,
+            *args,
+            **kwargs,
+        ):
+            ret = method(*args, **kwargs)
+        return ret
+
+    return hook
+
+
+def set_hook_fastapi_apirouter_add_api_route(
+    records: HTTPRecords,
+    method: Callable,
+    already_mapped: Union[Dict[Callable, Callable], None] = None,
+):
+
+    @wraps(method)
+    def hook(*args, **kwargs):
+        callargs = getcallargs(method, *args, **kwargs)
+
+        param = "endpoint"
+
+        if param in callargs:
+            original_view_func = callargs[param]
+            if original_view_func not in already_mapped:
+                callargs[param] = decorate(
+                    records, callargs[param], set_hook_fastapi_endpoint
+                )
+                already_mapped[original_view_func] = callargs[param]
+            else:
+                callargs[param] = already_mapped[original_view_func]
+
+            args = [callargs[param] if x == original_view_func else x for x in args]
+            if param in kwargs:
+                kwargs[param] = callargs[param]
+
+        return method(*args, **kwargs)
+
+    return hook
+
+
+# decorate the "app" returned by fastapi.routing.get_request_handler to link the socketdata and the endpoint group
+def set_hook_fastapi_app(records: HTTPRecords, method: Callable):
+
+    @wraps(method)
+    async def hook(*args, **kwargs):
+
+        socketdata_id = None
+
+        callargs = getcallargs(method, *args, **kwargs)
+
+        if "request" in callargs:
+            if hasattr(callargs["request"], "__httpdbg_socketdata_id"):
+                socketdata_id = callargs["request"].__httpdbg_socketdata_id
+
+        with httpdbg_endpoint(
+            records,
+            method,
+            *args,
+            **kwargs,
+        ) as group:
+            if group and (group.id in records.groups):
+                if socketdata_id and (socketdata_id in records._sockets):
+                    records.groups[group.id].tbegin = records._sockets[
+                        socketdata_id
+                    ].record.tbegin - datetime.timedelta(milliseconds=1)
+                    records._sockets[socketdata_id].record.group_id = group.id
+
+            ret = await method(*args, **kwargs)
+
+        return ret
+
+    return hook
+
+
+def set_hook_fastapi_routing_get_request_handler(
+    records: HTTPRecords, method: Callable
+):
+
+    @wraps(method)
+    def hook(*args, **kwargs):
+
+        app = method(*args, **kwargs)
+
+        app = decorate(records, app, set_hook_fastapi_app)
+
+        return app
+
+    return hook
+
+
+@contextmanager
+def hook_fastapi(records: HTTPRecords) -> Generator[None, None, None]:
+    hooks = False
+    try:
+        import fastapi.routing
+
+        already_mapped: Dict[Callable, Callable] = {}
+
+        set_hook_fastapi_apirouter_add_api_route_with_already_mapped = (
+            functools.partial(
+                set_hook_fastapi_apirouter_add_api_route, already_mapped=already_mapped
+            )
+        )
+
+        fastapi.routing.APIRouter.add_api_route = decorate(
+            records,
+            fastapi.routing.APIRouter.add_api_route,
+            set_hook_fastapi_apirouter_add_api_route_with_already_mapped,
+        )
+
+        fastapi.routing.get_request_handler = decorate(
+            records,
+            fastapi.routing.get_request_handler,
+            set_hook_fastapi_routing_get_request_handler,
+        )
+
+        hooks = True
+    except ImportError:
+        pass
+
+    yield
+
+    if hooks:
+        fastapi.routing.APIRouter.add_api_route = undecorate(
+            fastapi.routing.APIRouter.add_api_route
+        )
+        fastapi.routing.get_request_handler = undecorate(
+            fastapi.routing.get_request_handler
+        )

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/hooks/flask.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 from collections.abc import Callable
 from contextlib import contextmanager
+import functools
 from functools import wraps
+from typing import Dict
 from typing import Generator
+from typing import Union
 
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate
@@ -30,12 +33,11 @@ def set_hook_flask_endpoint(records: HTTPRecords, method: Callable):
     return hook
 
 
-# we must not apply the hook more than once on a mapped endpoint function
-# AssertionError: View function mapping is overwriting an existing endpoint function: xxxx
-already_mapped = {}
-
-
-def set_hook_flask_add_url_rule(records: HTTPRecords, method: Callable):
+def set_hook_flask_add_url_rule(
+    records: HTTPRecords,
+    method: Callable,
+    already_mapped: Union[Dict[Callable, Callable], None] = None,
+):
 
     def hook(*args, **kwargs):
 
@@ -62,7 +64,11 @@ def set_hook_flask_add_url_rule(records: HTTPRecords, method: Callable):
     return hook
 
 
-def set_hook_flask_register_error_handler(records: HTTPRecords, method: Callable):
+def set_hook_flask_register_error_handler(
+    records: HTTPRecords,
+    method: Callable,
+    already_mapped: Union[Dict[Callable, Callable], None] = None,
+):
 
     def hook(*args, **kwargs):
 
@@ -95,14 +101,28 @@ def hook_flask(records: HTTPRecords) -> Generator[None, None, None]:
     try:
         import flask
 
+        # we must not apply the hook more than once on a mapped endpoint function
+        # AssertionError: View function mapping is overwriting an existing endpoint function: xxxx
+        already_mapped: Dict[Callable, Callable] = {}
+
+        set_hook_flask_add_url_rule_with_already_mapped = functools.partial(
+            set_hook_flask_add_url_rule, already_mapped=already_mapped
+        )
+
         flask.Flask.add_url_rule = decorate(
-            records, flask.Flask.add_url_rule, set_hook_flask_add_url_rule
+            records,
+            flask.Flask.add_url_rule,
+            set_hook_flask_add_url_rule_with_already_mapped,
+        )
+
+        set_hook_flask_register_error_handler_with_already_mapped = functools.partial(
+            set_hook_flask_register_error_handler, already_mapped=already_mapped
         )
 
         flask.Flask.register_error_handler = decorate(
             records,
             flask.Flask.register_error_handler,
-            set_hook_flask_register_error_handler,
+            set_hook_flask_register_error_handler_with_already_mapped,
         )
         flask.Flask.handle_exception = decorate(
             records, flask.Flask.handle_exception, set_hook_flask_endpoint

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/hooks/socket.py

@@ -186,50 +186,53 @@ def set_hook_for_socket_recv_into(records: HTTPRecords, method: Callable):
 
         nbytes = method(self, buffer, *args, **kwargs)
 
-        if socketdata:
-            if socketdata.record:
-                logger().info(
-                    f"RECV_INTO (after) - id={id(self)} buffer={(b''+buffer)[:20]}"
-                )
-                socketdata.record.receive_data(buffer[:nbytes])
-            else:
-                socketdata.rawdata += buffer[:nbytes]
-                http_detected = socketdata.http_detected()
-                if http_detected:
-                    logger().info("RECV_INTO - http detected")
+        if buffer:  # it appears that the buffer may be None (observed on Windows).
+            if socketdata:
+                if socketdata.record:
                     logger().info(
                         f"RECV_INTO (after) - id={id(self)} buffer={(b''+buffer)[:20]}"
                     )
-                    with httpdbg_initiator(
-                        records,
-                        traceback.extract_stack(),
-                        method,
-                        self,
-                        buffer,
-                        *args,
-                        **kwargs,
-                    ) as initiator_and_group:
-                        initiator, group, is_new = initiator_and_group
-                        if is_new:
-                            tbegin = socketdata.tbegin - datetime.timedelta(
-                                milliseconds=1
-                            )
-                            initiator.tbegin = tbegin
-                            group.tbegin = tbegin
-                        socketdata.record = HTTPRecord(
-                            records.current_initiator,
-                            records.current_group,
-                            records.current_tag,
-                            tbegin=socketdata.tbegin,
-                            is_client=False,
+                    socketdata.record.receive_data(buffer[:nbytes])
+                else:
+                    socketdata.rawdata += buffer[:nbytes]
+                    http_detected = socketdata.http_detected()
+                    if http_detected:
+                        logger().info("RECV_INTO - http detected")
+                        logger().info(
+                            f"RECV_INTO (after) - id={id(self)} buffer={(b''+buffer)[:20]}"
                         )
-                        socketdata.record.address = socketdata.address
-                        socketdata.record.ssl = socketdata.ssl
-                        socketdata.record.receive_data(socketdata.rawdata)
-                        if records.server:
-                            records.requests[socketdata.record.id] = socketdata.record
-                elif http_detected is False:  # if None, there is nothing to do
-                    records._sockets[id(self)] = None
+                        with httpdbg_initiator(
+                            records,
+                            traceback.extract_stack(),
+                            method,
+                            self,
+                            buffer,
+                            *args,
+                            **kwargs,
+                        ) as initiator_and_group:
+                            initiator, group, is_new = initiator_and_group
+                            if is_new:
+                                tbegin = socketdata.tbegin - datetime.timedelta(
+                                    milliseconds=1
+                                )
+                                initiator.tbegin = tbegin
+                                group.tbegin = tbegin
+                            socketdata.record = HTTPRecord(
+                                records.current_initiator,
+                                records.current_group,
+                                records.current_tag,
+                                tbegin=socketdata.tbegin,
+                                is_client=False,
+                            )
+                            socketdata.record.address = socketdata.address
+                            socketdata.record.ssl = socketdata.ssl
+                            socketdata.record.receive_data(socketdata.rawdata)
+                            if records.server:
+                                records.requests[socketdata.record.id] = (
+                                    socketdata.record
+                                )
+                    elif http_detected is False:  # if None, there is nothing to do
+                        records._sockets[id(self)] = None
 
         return nbytes
 

httpdbg-1.2.0/httpdbg/hooks/starlette.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+from collections.abc import Callable
+from contextlib import contextmanager
+from functools import wraps
+from typing import Generator
+
+from httpdbg.hooks.utils import decorate
+from httpdbg.hooks.utils import getcallargs
+from httpdbg.hooks.utils import undecorate
+from httpdbg.records import HTTPRecords
+
+
+def set_hook_starlette_request_init(records: HTTPRecords, method: Callable):
+
+    @wraps(method)
+    def hook(self, *args, **kwargs):
+
+        callargs = getcallargs(method, self, *args, **kwargs)
+
+        if "receive" in callargs:
+            if hasattr(callargs["receive"], "__self__"):
+                if hasattr(callargs["receive"].__self__, "transport"):
+                    if hasattr(
+                        callargs["receive"].__self__.transport,
+                        "_TCPTransport__httpdbg_socketdata",
+                    ):
+                        # make the link between starlette.requests.Request (self) and uvicorn.protocols.http.httptools_impl.HttpToolsProtocol (socketdata)
+                        self.__httpdbg_socketdata_id = callargs[
+                            "receive"
+                        ].__self__.transport._TCPTransport__httpdbg_socketdata.id
+
+        return method(self, *args, **kwargs)
+
+    return hook
+
+
+@contextmanager
+def hook_starlette(records: HTTPRecords) -> Generator[None, None, None]:
+    hooks = False
+    try:
+        import starlette.requests
+
+        starlette.requests.Request.__init__ = decorate(
+            records,
+            starlette.requests.Request.__init__,
+            set_hook_starlette_request_init,
+        )
+
+        hooks = True
+    except ImportError:
+        pass
+
+    yield
+
+    if hooks:
+        starlette.requests.Request.__init__ = undecorate(
+            starlette.requests.Request.__init__
+        )

httpdbg-1.2.0/httpdbg/hooks/uvicorn.py

@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+from collections.abc import Callable
+from contextlib import contextmanager
+import datetime
+import traceback
+from typing import Generator
+
+from httpdbg.hooks.utils import decorate
+from httpdbg.hooks.utils import undecorate
+from httpdbg.initiator import httpdbg_initiator
+from httpdbg.log import logger
+from httpdbg.records import HTTPRecord
+from httpdbg.records import HTTPRecords
+from httpdbg.records import SocketRawData
+
+
+# we use a proxy class to be able to override the write method
+class TCPTransport:
+    def __init__(self, transport, socketdata: SocketRawData):
+        self.__httpdbg_original_transport = transport
+        self.__httpdbg_socketdata = socketdata
+
+    def write(self, buf):
+        if self.__httpdbg_socketdata:
+            if self.__httpdbg_socketdata.record:
+                self.__httpdbg_socketdata.record.send_data(buf)
+        return self.__httpdbg_original_transport.write(buf)
+
+    def __getattr__(self, attr):
+        return getattr(self.__httpdbg_original_transport, attr)
+
+
+def set_hook_uvicorn_connection_made(records: HTTPRecords, method: Callable):
+
+    def hook(self, transport):
+
+        socketdata = records.get_socket_data(self, force_new=True, is_uvicorn=True)
+        logger().debug(f"UVICORN - connection made - {socketdata}")
+
+        return method(self, TCPTransport(transport, socketdata))
+
+    return hook
+
+
+def set_hook_uvicorn_data_received(records: HTTPRecords, method: Callable):
+
+    def hook(self, data):
+
+        socketdata = records.get_socket_data(self)
+        if socketdata:
+            if socketdata.record:
+                socketdata.record.receive_data(data)
+            else:
+                socketdata.rawdata += data
+                http_detected = socketdata.http_detected()
+                if http_detected:
+                    logger().info("UVICORN - http detected")
+                    with httpdbg_initiator(
+                        records,
+                        traceback.extract_stack(),
+                        method,
+                        self,
+                        data,
+                    ) as initiator_and_group:
+                        initiator, group, is_new = initiator_and_group
+                        if is_new:
+                            tbegin = socketdata.tbegin - datetime.timedelta(
+                                milliseconds=1
+                            )
+                            initiator.tbegin = tbegin
+                            group.tbegin = tbegin
+                        socketdata.record = HTTPRecord(
+                            initiator.id,
+                            group.id,
+                            tbegin=socketdata.tbegin,
+                            is_client=False,
+                        )
+                        socketdata.record.address = socketdata.address
+                        socketdata.record.ssl = socketdata.ssl
+                        socketdata.record.receive_data(socketdata.rawdata)
+                        if records.server:
+                            records.requests[socketdata.record.id] = socketdata.record
+                elif http_detected is False:  # if None, there is nothing to do
+                    records._sockets[id(self)] = None
+
+        return method(self, data)
+
+    return hook
+
+
+@contextmanager
+def hook_uvicorn(records: HTTPRecords) -> Generator[None, None, None]:
+    hooks = False
+    try:
+        import uvicorn.protocols.http.httptools_impl
+
+        uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.connection_made = (
+            decorate(
+                records,
+                uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.connection_made,
+                set_hook_uvicorn_connection_made,
+            )
+        )
+
+        uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.data_received = (
+            decorate(
+                records,
+                uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.data_received,
+                set_hook_uvicorn_data_received,
+            )
+        )
+
+        hooks = True
+    except ImportError:
+        pass
+
+    yield
+
+    if hooks:
+        uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.connection_made = (
+            undecorate(
+                uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.connection_made
+            )
+        )
+        uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.data_received = (
+            undecorate(
+                uvicorn.protocols.http.httptools_impl.HttpToolsProtocol.data_received
+            )
+        )

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/initiator.py

@@ -341,7 +341,7 @@ def httpdbg_group(
 @contextmanager
 def httpdbg_endpoint(
     records: "HTTPRecords", original_method: Callable, *args, **kwargs
-) -> Generator[None, None, None]:
+) -> Generator[Union[Group, None], None, None]:
 
     filename = inspect.getsourcefile(original_method)
     if filename:
@@ -355,7 +355,7 @@ def httpdbg_endpoint(
             original_method, *args, **kwargs
         )
 
-        with httpdbg_group(records, instruction, full_label, update=True):
-            yield
+        with httpdbg_group(records, instruction, full_label, update=True) as group:
+            yield group
     else:
-        yield
+        yield None

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/records.py

@@ -353,7 +353,7 @@ class HTTPRecords:
         return len(self.requests)
 
     def get_socket_data(
-        self, obj, extra_sock=None, force_new=False, request=None
+        self, obj, extra_sock=None, force_new=False, request=None, is_uvicorn=False
     ) -> Union[SocketRawData, None]:
         """Record a new SocketRawData (or get an existing one) and return it."""
         socketdata = None
@@ -397,6 +397,9 @@ class HTTPRecords:
                 # only for async HTTP requests (not HTTPS) on Windows
                 self._sockets[id(obj)] = SocketRawData(id(obj), ("", 0), False)
                 socketdata = self._sockets[id(obj)]
+            elif is_uvicorn:
+                self._sockets[id(obj)] = SocketRawData(id(obj), ("", 0), False)
+                socketdata = self._sockets[id(obj)]
             else:
                 if extra_sock:
                     try:
@@ -453,3 +456,9 @@ class HTTPRecords:
     def add_group(self, group: Group):
         self.groups[group.id] = group
         self.current_group = group.id
+
+    def _print_for_debug(self):
+        for request in self.requests.values():
+            print(f"+ {request.url}")
+            print(f"  - initiator: {self.initiators[request.initiator_id].label}")
+            print(f"  - group: {self.groups[request.group_id].label}")

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg/webapp/api.py

@@ -102,7 +102,7 @@ class RequestListPayload(JSONEncoder):
             }
 
         for id, initiator in records.initiators.items():
-            payload["initiators"][id] = initiator.to_json()
+            payload["initiators"][id] = initiator.to_json(full=True)
 
         for id, group in records.groups.items():
             payload["groups"][id] = group.to_json()

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 1.1.2
+Version: 1.2.0
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -114,7 +114,6 @@ Press CTRL+C to quit
 
 ![httpdbg 1.1.0 - pyhttpdbg -m flask --app demoflask run](https://github.com/cle-b/httpdbg/blob/main/ui_server.png?raw=true)
 
-This feature is new and not fully implemented. See [limitations](#limitations) for more details.
 
 ## initiators and groups
  
@@ -146,7 +145,8 @@ The initiator is the low-level socket method that receives the data. The group i
 
 | packages       | status                              | initiator | group     |
 |----------------|-------------------------------------|-----------|-----------|
-| flask          | supported                           | no        | yes       |
+| flask          | supported                           | -         | yes       |
+| fastapi        | supported                           | -         | yes       |
 
 ### supported test framework
 
@@ -154,8 +154,8 @@ The requests are grouped by tests.
 
 | packages       | status                              | initiator | group     |
 |----------------|-------------------------------------|-----------|-----------|
-| pytest         | supported                           | no        | yes       |
-| unittest       | supported                           | no        | yes       |
+| pytest         | supported                           | -         | yes       |
+| unittest       | supported                           | -         | yes       |
 
 ## configuration
 
@@ -218,7 +218,7 @@ The requests:
 
 Theoretically, if your HTTP client or server uses a standard Python socket, the HTTP requests will be recorded.
 
-Support for recording requests on the server side is new in `httpdbg 1.0.0` and is currently limited. For example, it doesn't work with `FastAPI`, which uses `uvloop`, but it does work with `Uvicorn` if the loop is `asyncio`. Work is in progress to improve this.
+Support for recording requests on the server side is new in `httpdbg 1.0.0`. In some cases, like with |FastAPI| using |uvloop|, we had to implement a new mechanism to make request recording possible. This is still a work in progress as we aim to support more frameworks.
 
 ## documentation
 

{httpdbg-1.1.2 → httpdbg-1.2.0}/httpdbg.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ httpdbg/hooks/__init__.py
 httpdbg/hooks/aiohttp.py
 httpdbg/hooks/all.py
 httpdbg/hooks/external.py
+httpdbg/hooks/fastapi.py
 httpdbg/hooks/flask.py
 httpdbg/hooks/generic.py
 httpdbg/hooks/http.py
@@ -32,10 +33,12 @@ httpdbg/hooks/httpx.py
 httpdbg/hooks/pytest.py
 httpdbg/hooks/requests.py
 httpdbg/hooks/socket.py
+httpdbg/hooks/starlette.py
 httpdbg/hooks/template_sitecustomize.py
 httpdbg/hooks/unittest.py
 httpdbg/hooks/urllib3.py
 httpdbg/hooks/utils.py
+httpdbg/hooks/uvicorn.py
 httpdbg/webapp/__init__.py
 httpdbg/webapp/api.py
 httpdbg/webapp/app.py
@@ -71,7 +74,6 @@ tests/test_api.py
 tests/test_cli.py
 tests/test_context_manager.py
 tests/test_hook_aiohttp.py
-tests/test_hook_flask.py
 tests/test_hook_httpx.py
 tests/test_hook_pytest.py
 tests/test_hook_requests.py
@@ -84,4 +86,6 @@ tests/test_mode_script.py
 tests/test_multiprocess.py
 tests/test_preview.py
 tests/test_pyhttpdbg_server.py
-tests/test_server.py
+tests/test_server.py
+tests/test_server_hook_fastapi.py
+tests/test_server_hook_flask.py

httpdbg-1.2.0/tests/test_server_hook_fastapi.py

@@ -0,0 +1,115 @@
+import contextlib
+import platform
+import threading
+import time
+
+import pytest
+import requests
+import uvicorn
+
+from httpdbg.hooks.all import httprecord
+
+
+@contextlib.contextmanager
+def fastapi_app(port):
+    try:
+        config = uvicorn.Config("tests.demo_fastapi:app", port=port, log_level="debug")
+        server = uvicorn.Server(config)
+
+        thread = threading.Thread(target=server.run)
+        thread.start()
+
+        time.sleep(5)
+        yield
+    finally:
+        server.should_exit = True
+        thread.join(timeout=5)
+
+
+# For some reason I don't yet understand, it looks like the hook for fastapi.routing.get_request_handler
+# is applied only once when starting multiple FastAPI apps sequentially.
+@pytest.mark.xfail(
+    platform.system().lower() == "windows",
+    reason="on windows, the server requests are recorded twice for fastapi",
+)
+def test_fastapi_endpoint(httpdbg_port):
+
+    with httprecord(client=False, server=True) as records:
+        with fastapi_app(httpdbg_port):
+            requests.get(f"http://localhost:{httpdbg_port}/")
+
+            # endpoint no parameters
+            assert len(records) == 1, records._print_for_debug()
+            record = records[0]
+            group = records.groups[record.group_id]
+
+            assert record.is_client is False
+            assert record.response.content == b'"Hello, World!"'
+            assert group.label == '@app.get("/")'
+            assert "hello_world()" in group.full_label
+
+            records.reset()
+
+            # endpoint with parameters
+
+            requests.get(f"http://localhost:{httpdbg_port}/items/123")
+
+            assert len(records) == 1, records._print_for_debug()
+            record = records[0]
+            group = records.groups[record.group_id]
+
+            assert record.is_client is False
+            assert record.response.content == b'{"item_id":123,"q":null}'
+            assert group.label == '@app.get("/items/{item_id}")'
+            full_label = (
+                group.full_label.replace(" ", "").replace("\t", "").replace("\n", "")
+            )
+            assert "get_item(item_id=123,q=None,)" in full_label
+
+            records.reset()
+
+            # http error
+            requests.get(f"http://localhost:{httpdbg_port}/items/456")
+
+            assert len(records) == 1
+            record = records[0]
+            group = records.groups[record.group_id]
+
+            assert record.is_client is False
+            assert record.status_code == 456
+            assert record.response.content == b'{"detail":"custom exception"}'
+            assert group.label == '@app.get("/items/{item_id}")'
+            full_label = (
+                group.full_label.replace(" ", "").replace("\t", "").replace("\n", "")
+            )
+            assert "get_item(item_id=456,q=None,)" in full_label
+
+
+@pytest.mark.xfail(
+    platform.system().lower() == "windows",
+    reason="[#188] on windows, the server requests are recorded twice for fastapi",
+)
+def test_fastapi_client_request_in_endpoint(httpdbg_port, httpbin):
+
+    with httprecord(
+        client=True,
+        server=True,
+        ignore=[
+            (httpbin.host, httpbin.port),
+        ],
+    ) as records:
+        with fastapi_app(httpdbg_port):
+            requests.post(
+                f"http://localhost:{httpdbg_port}/withclientrequest",
+                json={"port": httpbin.port},
+            )
+
+    assert len(records) == 3  # 2 + 1
+
+    assert records[0].is_client is True  # the client request to /withclientrequest
+    assert records[1].is_client is False  # the same request, received by the server
+    assert records[2].is_client is True  # the request made inside the endpoint method
+    assert records[0].group_id == records[1].group_id
+    assert records[1].group_id == records[2].group_id
+
+    assert records[2].url == f"http://localhost:{httpbin.port}/"

httpdbg-1.1.2/tests/test_hook_flask.py → httpdbg-1.2.0/tests/test_server_hook_flask.py

@@ -1,8 +1,10 @@
 import contextlib
-import time
+import platform
 import threading
+import time
 
 from flask import Flask
+import pytest
 import requests
 
 from httpdbg.hooks.all import httprecord
@@ -118,6 +120,10 @@ def test_flask_not_found(httpdbg_port):
     assert "not_found(e=" in full_label
 
 
+@pytest.mark.xfail(
+    platform.system().lower() == "windows",
+    reason="[#189] on Windows, the group label is empty in case of Internal Server Error in a Flask endpoint",
+)
 def test_flask_internal_server_error(httpdbg_port):
 
     with httprecord(client=False, server=True) as records:
@@ -131,7 +137,7 @@ def test_flask_internal_server_error(httpdbg_port):
     assert record.is_client is False
     assert record.status_code == 500
     assert b"Internal Server Error" in record.response.content
-    assert "def handle_exception" in group.label
+    assert "def handle_exception" in group.label, records._print_for_debug()
     assert "division by zero" in group.full_label