httpdbg 1.2.4__tar.gz → 1.2.6__tar.gz

{httpdbg-1.2.4 → httpdbg-1.2.6}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 1.2.4
+Version: 1.2.6
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
 Project-URL: Source, https://github.com/cle-b/httpdbg/
 Project-URL: Documentation, https://httpdbg.readthedocs.io/
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Web Environment
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent

{httpdbg-1.2.4 → httpdbg-1.2.6}/httpdbg/__init__.py

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

httpdbg-1.2.6/httpdbg/hooks/all.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+from contextlib import contextmanager
+from typing import Generator
+from typing import List
+from typing import Tuple
+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.uvicorn import hook_uvicorn
+
+from httpdbg.records import HTTPRecords
+
+
+@contextmanager
+def httprecord(
+    records: HTTPRecords = None,
+    initiators: Union[List[str], None] = None,
+    client: bool = True,
+    server: bool = False,
+    ignore: Union[List[Tuple[str, int]], None] = None,
+    multiprocess: bool = True,
+) -> Generator[HTTPRecords, None, None]:
+    if records is None:
+        records = HTTPRecords(client=client, server=server, ignore=ignore)
+
+    with hook_flask(records):
+        with hook_socket(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
+                                                    ):
+                                                        if multiprocess:
+                                                            with watcher_external(
+                                                                records,
+                                                                initiators,
+                                                                server,
+                                                            ):
+                                                                yield records
+                                                        else:
+                                                            yield records

{httpdbg-1.2.4 → httpdbg-1.2.6}/httpdbg/hooks/template_sitecustomize.py

@@ -7,8 +7,10 @@ import threading
 from typing import Union
 import uuid
 
-from httpdbg.hooks.all import httprecord
 from httpdbg import HTTPRecords
+from httpdbg.env import HTTPDBG_MULTIPROCESS_DIR
+from httpdbg.hooks.all import httprecord
+from httpdbg.log import logger
 
 HTTPDBG_INITIATORS = []  # type: ignore
 HTTPDBG_RECORD_SERVER = False
@@ -20,14 +22,26 @@ class HttpdbgRecorder:
     def __init__(self):
         self._running: bool = False
         self.fname: str = os.path.join(
-            os.environ["HTTPDBG_MULTIPROCESS_DIR"], str(uuid.uuid1())
+            os.environ[HTTPDBG_MULTIPROCESS_DIR], str(uuid.uuid1())
         )
         self.context = None
         self.records: Union[HTTPRecords, None] = None
 
     def _save_to_disk_loop(self):
         while self._running:
-            self.save_to_disk()
+            try:
+                self.save_to_disk()
+            except RuntimeError as ex:
+                if "dictionary changed size during iteration" in str(ex):
+                    # This happens because some new requests are recorded (or existing ones updated) while
+                    # trying to save the HTTPRecords object on the disk to share it with the main process.
+                    # Here we can ignore that exception, because this is only a best effort attempt to refresh
+                    # the web interface. A last save is done before to exit the process.
+                    logger().info(
+                        "MultiProcess - _save_to_disk_loop - RuntimeError - dictionary changed size during iteration"
+                    )
+                else:
+                    raise
             time.sleep(1)
 
     def save_to_disk(self):
@@ -58,7 +72,7 @@ class HttpdbgRecorder:
             self.context.__exit__(None, None, None)
 
 
-if "HTTPDBG_MULTIPROCESS_DIR" in os.environ:
+if HTTPDBG_MULTIPROCESS_DIR in os.environ:
 
     if not hasattr(sys, "_httpdbg_enabled"):
         sys._httpdbg_enabled = True  # type: ignore[attr-defined]

{httpdbg-1.2.4 → httpdbg-1.2.6}/httpdbg/records.py

@@ -229,6 +229,7 @@ class HTTPRecord:
         self.is_client: bool = is_client
         if tbegin:
             self.tbegin = tbegin
+        self.http100: bool = False
 
     @property
     def url(self) -> str:
@@ -298,6 +299,16 @@ class HTTPRecord:
     def receive_data(self, data: bytes):
         if self.is_client:
             self.response.rawdata += data
+            if self.response.rawdata.lower() in {
+                b"http/1.1 100 continue\r\n\r\n",
+                b"http/1.0 100 continue\r\n\r\n",
+            }:
+                # in case we receive an HTTP 100 code, we do not record it as the final HTTP response headers
+                # but we keep the information to display it in the UI
+                self.http100 = True
+                self.response.rawdata = (
+                    bytes()
+                )  # very important to have the HTTP request body recorded.
         else:
             self.request.rawdata += data
 

{httpdbg-1.2.4 → httpdbg-1.2.6}/httpdbg/webapp/api.py

@@ -18,6 +18,7 @@ class RequestPayload(JSONEncoder):
             "urlext": req.urlext,
             "method": req.method,
             "status_code": req.status_code,
+            "http100": req.http100,
             "reason": req.reason,
             "request": None,
             "response": None,
@@ -90,6 +91,7 @@ class RequestListPayload(JSONEncoder):
                 "netloc": req.netloc,
                 "urlext": req.urlext,
                 "status_code": req.status_code,
+                "http100": req.http100,
                 "protocol": req.protocol,
                 "reason": req.reason,
                 "verb": req.method,

{httpdbg-1.2.4 → httpdbg-1.2.6}/httpdbg/webapp/static/index.htm

@@ -274,7 +274,7 @@
                                        <b>{{ method }}</b> <a href="{{ url }}">{{ url }}</a>
                                        <hr>
                                             <span class="header-cookie-key">status:</span>
-                                            <span class="header-cookie-value">{{ status_code }} {{ reason }}</span>
+                                            <span class="header-cookie-value">{{ status_code }} {{ reason }} {{#http100}}(after 100 Continue){{/http100}}</span>
                                             <br>
                                             {{#protocol}}
                                             <span class="header-cookie-key">protocol:</span>

{httpdbg-1.2.4 → httpdbg-1.2.6}/httpdbg.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 1.2.4
+Version: 1.2.6
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
 Project-URL: Source, https://github.com/cle-b/httpdbg/
 Project-URL: Documentation, https://httpdbg.readthedocs.io/
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Web Environment
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent

{httpdbg-1.2.4 → httpdbg-1.2.6}/pyproject.toml

@@ -12,8 +12,7 @@ readme="README.md"
 requires-python = ">=3.9"
 license = {text = "Apache-2.0"}
 classifiers = [
-    "Development Status :: 4 - Beta",
-    "Environment :: Web Environment",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",

httpdbg-1.2.4/httpdbg/hooks/all.py

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-from contextlib import contextmanager
-from typing import Generator
-from typing import List
-from typing import Tuple
-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.uvicorn import hook_uvicorn
-
-from httpdbg.records import HTTPRecords
-
-
-@contextmanager
-def httprecord(
-    records: HTTPRecords = None,
-    initiators: Union[List[str], None] = None,
-    client: bool = True,
-    server: bool = False,
-    ignore: Union[List[Tuple[str, int]], None] = None,
-) -> Generator[HTTPRecords, None, None]:
-    if records is None:
-        records = HTTPRecords(client=client, server=server, ignore=ignore)
-
-    with watcher_external(records, initiators, server):
-        with hook_flask(records):
-            with hook_socket(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