httpdbg 0.32.1__tar.gz → 1.0.0__tar.gz

{httpdbg-0.32.1 → httpdbg-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httpdbg
-Version: 0.32.1
+Version: 1.0.0
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -26,7 +26,7 @@ License-File: LICENSE
 
 # httpdbg
 
-`httpdbg` is a tool for Python developers to easily debug the HTTP(S) client requests in a Python program.
+`httpdbg` is a tool for Python developers to easily debug the HTTP(S) client and server requests in a Python program.
 
 To use it, execute your program using the `pyhttpdbg` command instead of `python` and that's it. Open a browser to `http://localhost:4909` to view the requests:
 
@@ -42,6 +42,8 @@ pip install httpdbg
 
 ## usage
 
+By default, both client and server requests are recorded. To record only client requests, use the `--only-client` command line argument.
+
 ### interactive console
 
 Open an interactive console using the command `pyhttpdbg`.
@@ -101,7 +103,7 @@ pyhttpdbg -i api_client_pck --script my_script.py
 
 You can use any package as an initiator, this is not limited to HTTP requests.
 
-### Already supported packages
+### Already supported packages for HTTP client
 
 | packages       | status                              | 
 |----------------|-------------------------------------|
@@ -120,7 +122,9 @@ No configuration is necessary to start but some few settings are available for p
 ### command line
 
 ```console
-usage: pyhttpdbg [-h] [--host HOST] [--port PORT] [--version] [--initiator INITIATOR] [--keep-up | --force-quit]
+usage: pyhttpdbg [-h] [--host HOST] [--port PORT] [--version]
+                 [--initiator INITIATOR] [--only-client]
+                 [--keep-up | --force-quit]                 
                  [--console | --module MODULE | --script SCRIPT]
 
 httdbg - a very simple tool to debug HTTP(S) client requests
@@ -132,6 +136,7 @@ options:
   --version, -v         print the httpdbg version
   --initiator INITIATOR, -i INITIATOR
                         add a new initiator (package)
+  --only-client         record only HTTP client requests
   --keep-up, -k         keep the server up even if the requests have been read
   --force-quit, -q      stop the server even if the requests have not been read
   --console             run a python console (default)
@@ -167,6 +172,12 @@ The requests:
  * are still available in the web page even if the python process stopped (except if you force quit before the requests have been loaded by the web page).
  * are automatically cleaned if a new execution is detected.
 
+## limitations
+
+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.
+
 ## documentation
 
 https://httpdbg.readthedocs.io

{httpdbg-0.32.1 → httpdbg-1.0.0}/README.md

@@ -1,6 +1,6 @@
 # httpdbg
 
-`httpdbg` is a tool for Python developers to easily debug the HTTP(S) client requests in a Python program.
+`httpdbg` is a tool for Python developers to easily debug the HTTP(S) client and server requests in a Python program.
 
 To use it, execute your program using the `pyhttpdbg` command instead of `python` and that's it. Open a browser to `http://localhost:4909` to view the requests:
 
@@ -16,6 +16,8 @@ pip install httpdbg
 
 ## usage
 
+By default, both client and server requests are recorded. To record only client requests, use the `--only-client` command line argument.
+
 ### interactive console
 
 Open an interactive console using the command `pyhttpdbg`.
@@ -75,7 +77,7 @@ pyhttpdbg -i api_client_pck --script my_script.py
 
 You can use any package as an initiator, this is not limited to HTTP requests.
 
-### Already supported packages
+### Already supported packages for HTTP client
 
 | packages       | status                              | 
 |----------------|-------------------------------------|
@@ -94,7 +96,9 @@ No configuration is necessary to start but some few settings are available for p
 ### command line
 
 ```console
-usage: pyhttpdbg [-h] [--host HOST] [--port PORT] [--version] [--initiator INITIATOR] [--keep-up | --force-quit]
+usage: pyhttpdbg [-h] [--host HOST] [--port PORT] [--version]
+                 [--initiator INITIATOR] [--only-client]
+                 [--keep-up | --force-quit]                 
                  [--console | --module MODULE | --script SCRIPT]
 
 httdbg - a very simple tool to debug HTTP(S) client requests
@@ -106,6 +110,7 @@ options:
   --version, -v         print the httpdbg version
   --initiator INITIATOR, -i INITIATOR
                         add a new initiator (package)
+  --only-client         record only HTTP client requests
   --keep-up, -k         keep the server up even if the requests have been read
   --force-quit, -q      stop the server even if the requests have not been read
   --console             run a python console (default)
@@ -141,6 +146,12 @@ The requests:
  * are still available in the web page even if the python process stopped (except if you force quit before the requests have been loaded by the web page).
  * are automatically cleaned if a new execution is detected.
 
+## limitations
+
+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.
+
 ## documentation
 
 https://httpdbg.readthedocs.io

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/__init__.py

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

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/__main__.py

@@ -29,7 +29,8 @@ def pyhttpdbg(params, subparams, test_mode=False):
     sys.path.insert(0, "")  # to mimic the default python command behavior
 
     with httpdbg_srv(params.host, params.port) as records:
-        with httprecord(records, params.initiator):
+        records.server = not params.only_client
+        with httprecord(records, params.initiator, server=records.server):
             if params.module:
                 run_module(subparams)
             elif params.script:

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/args.py

@@ -36,6 +36,12 @@ def read_args(args: List[str]) -> Tuple[argparse.Namespace, List[str]]:
         "--initiator", "-i", action="append", help="add a new initiator (package)"
     )
 
+    parser.add_argument(
+        "--only-client",
+        action="store_true",
+        help="record only HTTP client requests",
+    )
+
     server_state = parser.add_mutually_exclusive_group()
 
     server_state.add_argument(

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/hooks/all.py

@@ -2,6 +2,7 @@
 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
@@ -18,12 +19,16 @@ from httpdbg.records import HTTPRecords
 
 @contextmanager
 def httprecord(
-    records: HTTPRecords = None, initiators: Union[List[str], None] = None
+    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()
+        records = HTTPRecords(client=client, server=server, ignore=ignore)
 
-    with watcher_external(records):
+    with watcher_external(records, initiators, server):
         with hook_socket(records):
             with hook_httpx(records):
                 with hook_requests(records):

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/hooks/external.py

@@ -4,10 +4,11 @@ from typing import Generator
 import glob
 import os
 import pickle
-import shutil
 import tempfile
 import time
 import threading
+from typing import List
+from typing import Union
 
 from httpdbg.env import HTTPDBG_MULTIPROCESS_DIR
 from httpdbg.log import logger
@@ -15,7 +16,11 @@ from httpdbg.records import HTTPRecords
 
 
 @contextmanager
-def watcher_external(records: HTTPRecords) -> Generator[HTTPRecords, None, None]:
+def watcher_external(
+    records: HTTPRecords,
+    initiators: Union[List[str], None] = None,
+    server: bool = False,
+) -> Generator[HTTPRecords, None, None]:
     if HTTPDBG_MULTIPROCESS_DIR not in os.environ:
         with tempfile.TemporaryDirectory(prefix="httpdbg_") as httpdbg_multiprocess_dir:
 
@@ -31,7 +36,20 @@ def watcher_external(records: HTTPRecords) -> Generator[HTTPRecords, None, None]
             )
             sitecustomize = os.path.join(httpdbg_multiprocess_dir, "sitecustomize.py")
 
-            shutil.copy(template, sitecustomize)
+            with open(template) as f:
+                template_content = f.read()
+
+            if initiators:
+                template_content = template_content.replace(
+                    "HTTPDBG_INITIATORS = []", f"HTTPDBG_INITIATORS = {initiators}", 1
+                )
+
+            template_content = template_content.replace(
+                "HTTPDBG_RECORD_SERVER = False", f"HTTPDBG_RECORD_SERVER = {server}", 1
+            )
+
+            with open(sitecustomize, "w") as f:
+                f.write(template_content)
 
             if "PYTHONPATH" in os.environ:
                 os.environ["PYTHONPATH"] = (

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/hooks/socket.py

@@ -49,16 +49,17 @@ def set_hook_for_socket_connect(records: HTTPRecords, method: Callable):
             if not isinstance(
                 ex, (BlockingIOError, OSError)
             ):  # BlockingIOError for async, OSError for ipv6
-                with httpdbg_initiator(
-                    records, traceback.extract_stack(), method, *args, **kwargs
-                ) as initiator_and_group:
-                    initiator, group, is_new = initiator_and_group
-                    if is_new:
-                        initiator.tbegin = tbegin
-                        group.tbegin = tbegin
-                        records.add_new_record_exception(
-                            initiator, group, "http:///", ex
-                        )
+                if records.client:
+                    with httpdbg_initiator(
+                        records, traceback.extract_stack(), method, *args, **kwargs
+                    ) as initiator_and_group:
+                        initiator, group, is_new = initiator_and_group
+                        if is_new:
+                            initiator.tbegin = tbegin
+                            group.tbegin = tbegin
+                            records.add_new_record_exception(
+                                initiator, group, "http:///", ex
+                            )
             raise
 
         return r
@@ -76,14 +77,17 @@ def set_hook_for_ssl_wrap_socket(records: HTTPRecords, method: Callable):
         try:
             sslsocket = method(sock, *args, **kwargs)
         except Exception as ex:
-            with httpdbg_initiator(
-                records, traceback.extract_stack(), method, *args, **kwargs
-            ) as initiator_and_group:
-                initiator, group, is_new = initiator_and_group
-                if is_new:
-                    initiator.tbegin = tbegin
-                    group.tbegin = tbegin
-                    records.add_new_record_exception(initiator, group, "http:///", ex)
+            if records.client:
+                with httpdbg_initiator(
+                    records, traceback.extract_stack(), method, *args, **kwargs
+                ) as initiator_and_group:
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        initiator.tbegin = tbegin
+                        group.tbegin = tbegin
+                        records.add_new_record_exception(
+                            initiator, group, "http:///", ex
+                        )
             raise
 
         logger().info(
@@ -108,14 +112,17 @@ def set_hook_for_sslcontext_wrap_socket(records: HTTPRecords, method: Callable):
         try:
             sslsocket = method(self, sock, *args, **kwargs)
         except Exception as ex:
-            with httpdbg_initiator(
-                records, traceback.extract_stack(), method, *args, **kwargs
-            ) as initiator_and_group:
-                initiator, group, is_new = initiator_and_group
-                if is_new:
-                    initiator.tbegin = tbegin
-                    group.tbegin = tbegin
-                    records.add_new_record_exception(initiator, group, "http:///", ex)
+            if records.client:
+                with httpdbg_initiator(
+                    records, traceback.extract_stack(), method, *args, **kwargs
+                ) as initiator_and_group:
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        initiator.tbegin = tbegin
+                        group.tbegin = tbegin
+                        records.add_new_record_exception(
+                            initiator, group, "http:///", ex
+                        )
             raise
 
         logger().info(
@@ -140,14 +147,17 @@ def set_hook_for_socket_wrap_bio(records: HTTPRecords, method: Callable):
         try:
             sslobject = method(self, *args, **kwargs)
         except Exception as ex:
-            with httpdbg_initiator(
-                records, traceback.extract_stack(), method, *args, **kwargs
-            ) as initiator_and_group:
-                initiator, group, is_new = initiator_and_group
-                if is_new:
-                    initiator.tbegin = tbegin
-                    group.tbegin = tbegin
-                    records.add_new_record_exception(initiator, group, "http:///", ex)
+            if records.client:
+                with httpdbg_initiator(
+                    records, traceback.extract_stack(), method, *args, **kwargs
+                ) as initiator_and_group:
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        initiator.tbegin = tbegin
+                        group.tbegin = tbegin
+                        records.add_new_record_exception(
+                            initiator, group, "http:///", ex
+                        )
             raise
 
         logger().info(
@@ -174,18 +184,48 @@ def set_hook_for_socket_recv_into(records: HTTPRecords, method: Callable):
                 f"RECV_INTO - self={self} id={id(self)} socketdata={socketdata} args={args} kwargs={kwargs}"
             )
 
-        try:
-            nbytes = method(self, buffer, *args, **kwargs)
-        except Exception as ex:
-            if socketdata and socketdata.record:
-                socketdata.record.exception = ex
-            raise
+        nbytes = method(self, buffer, *args, **kwargs)
 
-        if socketdata and socketdata.record:
-            logger().info(
-                f"RECV_INTO (after) - id={id(self)} buffer={(b''+buffer)[:20]}"
-            )
-            socketdata.record.response.rawdata += buffer[:nbytes]
+        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")
+                    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(
+                            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
 
@@ -203,15 +243,42 @@ def set_hook_for_socket_recv(records: HTTPRecords, method: Callable):
                 f"RECV - self={self} id={id(self)} socketdata={socketdata} bufsize={bufsize} args={args} kwargs={kwargs}"
             )
 
-        try:
-            buffer = method(self, bufsize, *args, **kwargs)
-        except Exception as ex:
-            if socketdata and socketdata.record:
-                socketdata.record.exception = ex
-            raise
+        buffer = method(self, bufsize, *args, **kwargs)
 
-        if socketdata and socketdata.record:
-            socketdata.record.response.rawdata += buffer
+        if socketdata:
+            if socketdata.record:
+                socketdata.record.receive_data(buffer)
+            else:
+                socketdata.rawdata += buffer
+                http_detected = socketdata.http_detected()
+                if http_detected:
+                    logger().info("RECV - http detected")
+                    with httpdbg_initiator(
+                        records,
+                        traceback.extract_stack(),
+                        method,
+                        self,
+                        bufsize,
+                        *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(
+                            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 buffer
 
@@ -223,22 +290,28 @@ def set_hook_for_socket_recv(records: HTTPRecords, method: Callable):
 # action: Append the data to an existing SocketRawData. Check if this is an HTTP request.
 # and record it if this is case, otherwise delete the temporay SocketRawData.
 def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
-    def hook(self, bytes, *args, **kwargs):
+    def hook(self, data, *args, **kwargs):
         socketdata = records.get_socket_data(self, request=True)
         if socketdata:
             logger().info(
-                f"SENDALL - self={self} id={id(self)} socketdata={socketdata} bytes={(b''+bytes)[:20]} type={type(bytes)} len={len(bytes)} args={args} kwargs={kwargs}"
+                f"SENDALL - self={self} id={id(self)} socketdata={socketdata} data={(b''+bytes(data))[:20]} type={type(data)} args={args} kwargs={kwargs}"
             )
         if socketdata:
             if socketdata.record:
-                socketdata.record.request.rawdata += bytes
+                socketdata.record.send_data(data)
             else:
-                socketdata.rawdata += bytes
+                socketdata.rawdata += data
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     logger().info("SENDALL - http detected")
                     with httpdbg_initiator(
-                        records, traceback.extract_stack(), method, *args, **kwargs
+                        records,
+                        traceback.extract_stack(),
+                        method,
+                        self,
+                        data,
+                        *args,
+                        **kwargs,
                     ) as initiator_and_group:
                         initiator, group, is_new = initiator_and_group
                         if is_new:
@@ -250,16 +323,13 @@ def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
                         socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
                         socketdata.record.address = socketdata.address
                         socketdata.record.ssl = socketdata.ssl
-                        socketdata.record.request.rawdata = socketdata.rawdata
-                        records.requests[socketdata.record.id] = socketdata.record
+                        socketdata.record.send_data(socketdata.rawdata)
+                        if records.client:
+                            records.requests[socketdata.record.id] = socketdata.record
                 elif http_detected is False:  # if None, there is nothing to do
                     records._sockets[id(self)] = None
-        try:
-            return method(self, bytes, *args, **kwargs)
-        except Exception as ex:
-            if socketdata and socketdata.record:
-                socketdata.record.exception = ex
-            raise
+
+        return method(self, data, *args, **kwargs)
 
     return hook
 
@@ -269,29 +339,30 @@ def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
 # action: Append the data to an existing SocketRawData. Check if this is an HTTP request.
 # and record it if this is case, otherwise delete the temporay SocketRawData.
 def set_hook_for_socket_send(records: HTTPRecords, method: Callable):
-    def hook(self, bytes, *args, **kwargs):
+    def hook(self, data, *args, **kwargs):
         socketdata = records.get_socket_data(self, request=True)
         if socketdata:
             logger().info(
-                f"SEND - self={self} id={id(self)} socketdata={socketdata} bytes={(b''+bytes)[:20]} args={args} kwargs={kwargs}"
+                f"SEND - self={self} id={id(self)} socketdata={socketdata} bytes={(b''+data)[:20]} args={args} kwargs={kwargs}"
             )
 
-        try:
-            size = method(self, bytes, *args, **kwargs)
-        except Exception as ex:
-            if socketdata and socketdata.record:
-                socketdata.record.exception = ex
-            raise
+        size = method(self, data, *args, **kwargs)
 
         if socketdata:
             if socketdata.record:
-                socketdata.record.request.rawdata += bytes[:size]
+                socketdata.record.send_data(data[:size])
             else:
-                socketdata.rawdata += bytes[:size]
+                socketdata.rawdata += data[:size]
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     with httpdbg_initiator(
-                        records, traceback.extract_stack(), method, *args, **kwargs
+                        records,
+                        traceback.extract_stack(),
+                        method,
+                        self,
+                        data,
+                        *args,
+                        **kwargs,
                     ) as initiator_and_group:
                         initiator, group, is_new = initiator_and_group
                         if is_new:
@@ -303,8 +374,9 @@ def set_hook_for_socket_send(records: HTTPRecords, method: Callable):
                         socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
                         socketdata.record.address = socketdata.address
                         socketdata.record.ssl = socketdata.ssl
-                        socketdata.record.request.rawdata = socketdata.rawdata
-                        records.requests[socketdata.record.id] = socketdata.record
+                        socketdata.record.send_data(socketdata.rawdata)
+                        if records.client:
+                            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 size
@@ -349,22 +421,23 @@ def set_hook_for_sslobject_write(records: HTTPRecords, method: Callable):
         if socketdata:
             logger().info(f"WRITE * - socketdata={socketdata}")
 
-        try:
-            size = method(self, buf, *args, **kwargs)
-        except Exception as ex:
-            if socketdata and socketdata.record:
-                socketdata.record.exception = ex
-            raise
+        size = method(self, buf, *args, **kwargs)
 
         if socketdata:
             if socketdata.record:
-                socketdata.record.request.rawdata += bytes(buf[:size])
+                socketdata.record.send_data(bytes(buf[:size]))
             else:
                 socketdata.rawdata += bytes(buf[:size])
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     with httpdbg_initiator(
-                        records, traceback.extract_stack(), method, *args, **kwargs
+                        records,
+                        traceback.extract_stack(),
+                        method,
+                        self,
+                        buf,
+                        *args,
+                        **kwargs,
                     ) as initiator_and_group:
                         initiator, group, is_new = initiator_and_group
                         if is_new:
@@ -376,8 +449,9 @@ def set_hook_for_sslobject_write(records: HTTPRecords, method: Callable):
                         socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
                         socketdata.record.address = socketdata.address
                         socketdata.record.ssl = socketdata.ssl
-                        socketdata.record.request.rawdata = socketdata.rawdata
-                        records.requests[socketdata.record.id] = socketdata.record
+                        socketdata.record.send_data(socketdata.rawdata)
+                        if records.client:
+                            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 size
@@ -395,20 +469,14 @@ def set_hook_for_sslobject_read(records: HTTPRecords, method: Callable):
         if socketdata:
             logger().info(f"READ * - socketdata={socketdata}")
 
-        try:
-            r = method(self, *args, **kwargs)
-        except Exception as ex:
-            if not isinstance(ex, ssl.SSLWantReadError):
-                if socketdata and socketdata.record:
-                    socketdata.record.exception = ex
-            raise
+        r = method(self, *args, **kwargs)
 
         if socketdata and socketdata.record:
             allargs = getcallargs(method, self, *args, **kwargs)
             if allargs.get("buffer"):
-                socketdata.record.response.rawdata += bytes(allargs.get("buffer"))[:r]
+                socketdata.record.receive_data(bytes(allargs.get("buffer"))[:r])
             else:
-                socketdata.record.response.rawdata += bytes(r)[: allargs.get("len")]
+                socketdata.record.receive_data(bytes(r)[: allargs.get("len")])
 
         return r
 

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/hooks/template_sitecustomize.py

@@ -10,6 +10,9 @@ import uuid
 from httpdbg.hooks.all import httprecord
 from httpdbg import HTTPRecords
 
+HTTPDBG_INITIATORS = []  # type: ignore
+HTTPDBG_RECORD_SERVER = False
+
 
 class HttpdbgRecorder:
     """Records the HTTP requests in subprocesses and saves them to disk."""
@@ -37,7 +40,9 @@ class HttpdbgRecorder:
 
     def start(self):
         """Start recording."""
-        self.context = httprecord()
+        self.context = httprecord(
+            initiators=HTTPDBG_INITIATORS, server=HTTPDBG_RECORD_SERVER
+        )
         self.records = self.context.__enter__()
         self._running = True
         self._thread = threading.Thread(target=self._save_to_disk_loop, daemon=True)

{httpdbg-0.32.1 → httpdbg-1.0.0}/httpdbg/hooks/utils.py

@@ -15,7 +15,7 @@ def getcallargs(original_method, *args, **kwargs):
             inspect.signature(original_method).bind_partial(*args, **kwargs).arguments
         )
     except Exception as ex:
-        logger().info(f"getcallargs - exception {str(ex)}")
+        logger().debug(f"getcallargs - exception {str(ex)}")
         # TypeError('too many positional arguments') may occur when using pytest (seems related to teardown_method)
         callargs = {}
         i = 0