httpdbg 2.4.0__tar.gz → 2.4.1__tar.gz

{httpdbg-2.4.0 → httpdbg-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.4.0
+Version: 2.4.1
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License-Expression: Apache-2.0

{httpdbg-2.4.0 → httpdbg-2.4.1}/httpdbg/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.4.0"
+__version__ = "2.4.1"
 
 __all__ = ["export_html", "httprecord", "HTTPRecords"]
 

{httpdbg-2.4.0 → httpdbg-2.4.1}/httpdbg/hooks/record.py

@@ -238,3 +238,23 @@ class HTTPRecord(ABC):
             }
 
         return json.dumps(payload).encode("utf-8")
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, HTTPRecord):
+            return False
+
+        return (
+            self.url == other.url
+            and self.method == other.method
+            and self.status_code == other.status_code
+            and self.protocol == other.protocol
+            and self.tag == other.tag
+            and self.initiator_id == other.initiator_id
+            and self.group_id == other.group_id
+            and self.is_client == other.is_client
+            and self.http100 == other.http100
+            and type(self.exception) is type(other.exception)
+            and str(self.exception) == str(other.exception)
+            and self.request == other.request
+            and self.response == other.response
+        )

{httpdbg-2.4.0 → httpdbg-2.4.1}/httpdbg/hooks/recordhttp1.py

@@ -77,6 +77,12 @@ class HTTP1RecordReqResp(HTTPRecordReqResp):
         self.last_update = datetime.datetime.now(datetime.timezone.utc)
         self._rawdata = value
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, HTTP1RecordReqResp):
+            return False
+
+        return self.rawdata == other.rawdata and self.last_update == other.last_update
+
 
 class HTTP1RecordRequest(HTTPRecordRequest, HTTP1RecordReqResp):
     def __init__(self) -> None:
@@ -211,7 +217,8 @@ class HTTP1Record(HTTPRecord):
             "sent": base64.b64encode(
                 self.request.rawdata if self.is_client else self.response.rawdata,
             ).decode("ascii"),
-            "last_update": self.last_update.isoformat(),
+            "last_update_request": self.request.last_update.isoformat(),
+            "last_update_response": self.response.last_update.isoformat(),
         }
 
     @staticmethod
@@ -224,6 +231,12 @@ class HTTP1Record(HTTPRecord):
             data["is_client"],
         )
         http1record.id = data["id"]
-        http1record.receive_data(base64.b64decode(data["received"]))
         http1record.send_data(base64.b64decode(data["sent"]))
+        http1record.receive_data(base64.b64decode(data["received"]))
+        http1record.request.last_update = datetime.datetime.fromisoformat(
+            data["last_update_request"]
+        )
+        http1record.response.last_update = datetime.datetime.fromisoformat(
+            data["last_update_response"]
+        )
         return http1record

{httpdbg-2.4.0 → httpdbg-2.4.1}/httpdbg/hooks/recordhttp2.py

@@ -42,6 +42,16 @@ class HTTP2RecordReqResp(HTTPRecordReqResp):
             self.get_header("Content-Encoding"),
         )
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, HTTP2RecordReqResp):
+            return False
+
+        return (
+            self.headers == other.headers
+            and self.content == other.content
+            and self.last_update == other.last_update
+        )
+
 
 class HTTP2RecordRequest(HTTPRecordRequest, HTTP2RecordReqResp):
 
@@ -129,7 +139,8 @@ class HTTP2Record(HTTPRecord):
                 "headers": [header.to_json() for header in self.response.headers],
                 "content": base64.b64encode(self.response.content).decode("ascii"),
             },
-            "last_update": self.last_update.isoformat(),
+            "last_update_request": self.request.last_update.isoformat(),
+            "last_update_response": self.response.last_update.isoformat(),
         }
 
     @staticmethod
@@ -146,8 +157,16 @@ class HTTP2Record(HTTPRecord):
             HTTPDBGHeader.from_json(header) for header in data["request"]["headers"]
         ]
         http2record.request.content = base64.b64decode(data["request"]["content"])
+        http2record.request.last_update = datetime.datetime.fromisoformat(
+            data["last_update_request"]
+        )
+
         http2record.response._headers = [
             HTTPDBGHeader.from_json(header) for header in data["response"]["headers"]
         ]
         http2record.response.content = base64.b64decode(data["response"]["content"])
+        http2record.response.last_update = datetime.datetime.fromisoformat(
+            data["last_update_response"]
+        )
+
         return http2record

{httpdbg-2.4.0 → httpdbg-2.4.1}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.4.0
+Version: 2.4.1
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License-Expression: Apache-2.0

{httpdbg-2.4.0 → httpdbg-2.4.1}/httpdbg.egg-info/SOURCES.txt

@@ -91,6 +91,7 @@ tests/test_mode_script.py
 tests/test_multiprocess.py
 tests/test_preview.py
 tests/test_pyhttpdbg_server.py
+tests/test_serialization.py
 tests/test_server.py
 tests/test_server_hook_fastapi.py
 tests/test_server_hook_flask.py

httpdbg-2.4.1/tests/test_serialization.py

@@ -0,0 +1,82 @@
+import httpx
+import pytest
+import requests
+
+from httpdbg.hooks.all import httprecord
+from httpdbg.hooks.recordhttp1 import HTTP1Record
+from httpdbg.hooks.recordhttp2 import HTTP2Record
+from httpdbg.utils import HTTPDBGCookie
+from httpdbg.utils import HTTPDBGHeader
+
+
+from tests.demo_http2 import http2_httpbin_server
+from tests.utils import get_free_tcp_port
+
+
+@pytest.fixture(scope="module")
+def httpbin2():
+    host = "127.0.0.1"
+    port = get_free_tcp_port(host)
+    with http2_httpbin_server(host, port) as url:
+        yield url
+
+
+@pytest.mark.serialization
+def test_serialization_http1record(httpbin):
+    with httprecord() as records:
+        requests.get(
+            f"{httpbin.url}/cookies/set/confiture/oignon",
+            cookies={"jam": "strawberry"},
+            allow_redirects=False,
+        )
+
+    assert len(records) == 1
+    http_record = records[0]
+    http_record_copy = HTTP1Record.from_json(http_record.to_json())
+
+    assert HTTPDBGCookie("jam", "strawberry") in http_record_copy.request.cookies
+
+    assert (
+        HTTPDBGCookie(
+            "confiture",
+            "oignon",
+            [
+                {"attr": "/", "name": "path"},
+            ],
+        )
+        in http_record_copy.response.cookies
+    )
+
+    assert http_record_copy == http_record
+
+
+@pytest.mark.serialization
+def test_serialization_http2record(httpbin2):
+    with httprecord() as records:
+        client = httpx.Client(http2=True, verify=False)
+        client.post(f"{httpbin2}/post", content="abc")
+
+    assert len(records) == 1
+    http_record = records[0]
+    http_record_copy = HTTP2Record.from_json(http_record.to_json())
+
+    assert http_record_copy.protocol == "HTTP/2"
+
+    assert http_record_copy.method.upper() == "POST"
+    assert http_record_copy.status_code == 200
+
+    assert HTTPDBGHeader("content-length", "3") in http_record_copy.request.headers
+    assert http_record_copy.request.cookies == []
+    assert http_record_copy.request.content == b"abc"
+
+    assert http_record_copy.last_update == http_record.last_update
+
+    assert http_record_copy == http_record
+
+
+@pytest.mark.serialization
+def test_serialization_compatibility():
+    http1record = HTTP1Record("a", "b")
+    http2record = HTTP2Record("a", "b")
+    assert not (http1record == http2record)
+    assert not (http2record == http1record)