httpdbg 0.12.0__tar.gz → 0.13.0__tar.gz

{httpdbg-0.12.0 → httpdbg-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: httpdbg
-Version: 0.12.0
+Version: 0.13.0
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -22,6 +22,8 @@ License-File: LICENSE
 
 A very simple tool to debug HTTP(S) client requests.
 
+![](ui.png)
+
 ## installation 
 
 ```

{httpdbg-0.12.0 → httpdbg-0.13.0}/README.md

@@ -2,6 +2,8 @@
 
 A very simple tool to debug HTTP(S) client requests.
 
+![](ui.png)
+
 ## installation 
 
 ```

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/__init__.py

@@ -3,6 +3,6 @@ from httpdbg.hooks.all import httpdbg
 from httpdbg.records import HTTPRecords
 
 
-VERSION = "0.12.0"
+VERSION = "0.13.0"
 
 __all__ = ["httpdbg", "HTTPRecords"]

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/hooks/urllib3.py

@@ -43,12 +43,18 @@ def hook_urllib3(records: HTTPRecords) -> Generator[None, None, None]:
     try:
         import urllib3
 
-        urllib3.PoolManager.request = decorate(
-            records, urllib3.PoolManager.request, set_hook_for_urllib3
-        )
-        urllib3.HTTPConnectionPool.request = decorate(
-            records, urllib3.HTTPConnectionPool.request, set_hook_for_urllib3
-        )
+        # v1
+        if hasattr(urllib3, "PoolManager"):
+            urllib3.PoolManager.request = decorate(
+                records, urllib3.PoolManager.request, set_hook_for_urllib3
+            )
+        if hasattr(urllib3, "HTTPConnectionPool"):
+            urllib3.HTTPConnectionPool.request = decorate(
+                records, urllib3.HTTPConnectionPool.request, set_hook_for_urllib3
+            )
+        # v2
+        if hasattr(urllib3, "request"):
+            urllib3.request = decorate(records, urllib3.request, set_hook_for_urllib3)
 
         hooks = True
     except ImportError:
@@ -57,7 +63,13 @@ def hook_urllib3(records: HTTPRecords) -> Generator[None, None, None]:
     yield
 
     if hooks:
-        urllib3.PoolManager.request = undecorate(urllib3.PoolManager.request)
-        urllib3.HTTPConnectionPool.request = undecorate(
-            urllib3.HTTPConnectionPool.request
-        )
+        # v1
+        if hasattr(urllib3, "PoolManager"):
+            urllib3.PoolManager.request = undecorate(urllib3.PoolManager.request)
+        if hasattr(urllib3, "HTTPConnectionPool"):
+            urllib3.HTTPConnectionPool.request = undecorate(
+                urllib3.HTTPConnectionPool.request
+            )
+        # v2
+        if hasattr(urllib3, "request"):
+            urllib3.request = undecorate(urllib3.request)

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/initiator.py

@@ -29,7 +29,7 @@ class Initiator(object):
         self.stack = stack
 
     def __eq__(self, other) -> bool:
-        if type(other) == Initiator:
+        if type(other) is Initiator:
             return (
                 self.short_label == other.short_label
                 and self.long_label == other.long_label

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/utils.py

@@ -50,7 +50,7 @@ class HTTPDBGCookie(object):
         return {"name": self.name, "value": self.value, "attributes": self.attributes}
 
     def __eq__(self, other) -> bool:
-        if type(other) == HTTPDBGCookie:
+        if type(other) is HTTPDBGCookie:
             return (
                 (self.name == other.name)
                 and (self.value == other.value)
@@ -78,7 +78,7 @@ class HTTPDBGHeader(object):
         return {"name": self.name, "value": self.value}
 
     def __eq__(self, other) -> bool:
-        if type(other) == HTTPDBGHeader:
+        if type(other) is HTTPDBGHeader:
             return (self.name == other.name) and (self.value == other.value)
         else:
             return False

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/webapp/app.py

@@ -85,7 +85,7 @@ class HttpbgHTTPRequestHandler(BaseHTTPRequestHandler):
                         os.path.realpath(base_path) + "/static/icons/*.svg"
                     ):
                         icon_path = icon.replace(os.path.realpath(base_path) + "/", "")
-                        icons += f"<link rel='preload' href='{icon_path}-+-$**HTTPDBG_VERSION**$' as='image' type='image/svg+xml' />\n"
+                        icons += f"    <link rel='preload' href='{icon_path}-+-$**HTTPDBG_VERSION**$' as='image' type='image/svg+xml' />\n"
 
                     filecontent = filecontent.replace(
                         b"$**PRELOAD_ICONS**$", icons.encode("utf-8")

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/webapp/static/api.js

@@ -3,7 +3,8 @@
 const global = {
     "k7": null,
     "requests": {},
-    "connected": false
+    "connected": false,
+    "tabindex": 100
 }
 
 function save_request(request_id, request) {
@@ -12,16 +13,20 @@ function save_request(request_id, request) {
     if (request.pin == undefined) {
         request.pin = "";
     }
+    if (request.tabindex == undefined) {
+        global.tabindex += 1;
+        request.tabindex = global.tabindex;
+    }
     global.requests[request_id] = request;
     if (global.requests[request_id].in_progress) {
-        global.requests[request_id].status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$" />';
+        global.requests[request_id].status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$" alt="loading"/>';
     } else {
         switch (global.requests[request_id].status_code) {
             case 0:
-                global.requests[request_id].status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$/" />';
+                global.requests[request_id].status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$/" alt="loading"/>';
                 break;
             case -1:
-                global.requests[request_id].status_code_view = '<img class="icon" src="static/icons/math-multiplication-icon.svg-+-$**HTTPDBG_VERSION**$/" />';
+                global.requests[request_id].status_code_view = '<img class="icon" src="static/icons/math-multiplication-icon.svg-+-$**HTTPDBG_VERSION**$/" alt="load failed"/>';
                 break;
             default:
                 global.requests[request_id].status_code_view = global.requests[request_id].status_code;

httpdbg-0.13.0/httpdbg/webapp/static/icons/question-mark-round-line-icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 122.88 122.88" style="enable-background:new 0 0 122.88 122.88" xml:space="preserve"><g><path d="M109.72,61.44v-0.01h0.02c0-13.31-5.42-25.38-14.17-34.13c-8.75-8.74-20.81-14.16-34.1-14.16v0.02h-0.03h-0.01v-0.02 c-13.3,0-25.38,5.42-34.13,14.17c-8.74,8.75-14.16,20.81-14.16,34.11h0.02v0.03v0.01h-0.02c0,8.88,2.41,17.22,6.59,24.36 c8.38,14.31,23.92,23.92,41.68,23.93v-0.02h0.03h0.01v0.02c13.31,0,25.38-5.42,34.13-14.17c1.44-1.44,2.78-2.95,4-4.52 C105.93,82.88,109.72,72.6,109.72,61.44L109.72,61.44z M68.38,73.86H51.86v-1.65c0-2.8,0.3-5.09,0.94-6.85 c0.64-1.77,1.59-3.35,2.85-4.81c1.27-1.45,4.11-4,8.51-7.66c2.34-1.92,3.52-3.67,3.52-5.25c0-1.61-0.48-2.84-1.41-3.73 c-0.94-0.88-2.37-1.33-4.3-1.33c-2.07,0-3.76,0.69-5.1,2.04c-1.35,1.36-2.21,3.75-2.58,7.14l-16.89-2.1 c0.58-6.2,2.84-11.2,6.76-14.98C48.1,30.89,54.12,29,62.24,29c6.32,0,11.43,1.33,15.32,3.95c5.29,3.57,7.92,8.33,7.92,14.26 c0,2.48-0.69,4.86-2.04,7.15c-1.36,2.3-4.15,5.09-8.36,8.39c-2.92,2.34-4.77,4.19-5.54,5.6C68.77,69.76,68.38,71.6,68.38,73.86 L68.38,73.86z M51.27,78.26h17.72v15.61H51.27V78.26L51.27,78.26z M122.85,61.43h0.03v0.01c0,14.19-4.82,27.27-12.92,37.68 c-1.59,2.04-3.29,3.97-5.08,5.76c-11.1,11.1-26.45,17.97-43.43,17.98v0.03h-0.01h-0.03v-0.03c-22.59-0.01-42.34-12.22-52.99-30.4 c-5.33-9.1-8.39-19.7-8.39-31H0v-0.01v-0.03h0.03C0.03,44.44,6.9,29.09,18,18C29.09,6.9,44.45,0.03,61.43,0.03V0h0.01h0.03v0.03 c16.97,0.01,32.32,6.87,43.41,17.97C115.98,29.09,122.85,44.45,122.85,61.43L122.85,61.43z"/></g></svg>

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/webapp/static/index.htm

@@ -29,16 +29,22 @@
     <header>
         <nav id="navbar">
             <div class="menu-left">
-                <button id="trash" onclick="clean(true)">
-                    <img class="icon" src="static/icons/recycle-bin-line-icon.svg-+-$**HTTPDBG_VERSION**$" />
+                <button id="trash" type="button" onclick="clean(true)">
+                    <img class="icon" src="static/icons/recycle-bin-line-icon.svg-+-$**HTTPDBG_VERSION**$"
+                        alt="clean the requests list" />
                 </button>
                 <input type="checkbox" id="onlynew" name="cleannew" checked>
-                <label for="clean">force clean for new session</label>
+                <label for="onlynew">force clean for new session</label>
             </div>
             <div class="menu-right">
                 httpdbg
-                <button id="config" onclick="config()">
-                    <img class="icon" src="static/icons/engine-gears-icon.svg-+-$**HTTPDBG_VERSION**$" />
+                <button onclick="config()" title="open configuration">
+                    <img class="icon" src="static/icons/engine-gears-icon.svg-+-$**HTTPDBG_VERSION**$"
+                        alt="open configuration" />
+                </button>
+                <button onclick="help()" title="open help">
+                    <img class="icon" src="static/icons/question-mark-round-line-icon.svg-+-$**HTTPDBG_VERSION**$"
+                        alt="open help" />
                 </button>
             </div>
         </nav>
@@ -65,6 +71,37 @@
         <br>
     </div>
 
+    <div id="help">
+        <h4>Help</h4>
+
+        <h5>Shorcuts</h5>
+        <ul>
+            <li>Press <kbd>O</kbd> <kbd>C</kbd> to open the configuration panel.</li>
+            <li>Press <kbd>O</kbd> <kbd>H</kbd> to open this help.</li>
+        </ul>
+
+        <h5>List of requests</h5>
+        Use <kbd>Tab</kbd> to browser the list of requests.
+        <ul>
+            <li>Press <kbd>Enter</kbd> or <kbd>S</kbd> to select a request.</li>
+            <li>Press <kbd>C</kbd> to compare this request to the select one.</li>
+        </ul>
+
+        <h5>Request panel</h5>
+        <ul>
+            <li>Press <kbd>R</kbd> <kbd>H</kbd> to open the headers tab.</li>
+            <li>Press <kbd>R</kbd> <kbd>C</kbd> to open the cookies tab.</li>
+            <li>Press <kbd>R</kbd> <kbd>P</kbd> to open the request tab.</li>
+            <li>Press <kbd>R</kbd> <kbd>T</kbd> to open the response tab.</li>
+            <li>Press <kbd>R</kbd> <kbd>E</kbd> to open the exception tab.</li>
+            <li>Press <kbd>R</kbd> <kbd>S</kbd> to open the stack tab.</li>
+        </ul>
+
+        <h4>About</h4>
+        httpdbg v$**HTTPDBG_VERSION**$ - <a href="https://pypi.org/project/httpdbg/">PyPI</a> <a
+            href="https://github.com/cle-b/httpdbg">Source code</a>
+    </div>
+
     <div class="grid-container">
 
         <div class="grid-column grid-column-left">
@@ -78,9 +115,13 @@
                         <th class="method" title="method"></th>
                         <th class="url">
                             url
-                            <img class="icon" src="static/icons/filter-outline-icon.svg-+-$**HTTPDBG_VERSION**$" />
-                            <input type="text" value="" id="filter-url" onkeyup="update_filter_url()"
-                                oncut="update_filter_url()" onpaste="update_filter_url()"
+                            <img class="icon" src="static/icons/filter-outline-icon.svg-+-$**HTTPDBG_VERSION**$"
+                                alt="filter for url" />
+                            <label for="filter-url" class="visuallyhidden">
+                                filter for url
+                            </label>
+                            <input type="text" value="" id="filter-url" title="filter for url"
+                                onkeyup="update_filter_url()" oncut="update_filter_url()" onpaste="update_filter_url()"
                                 onchange="update_filter_url()">
                         </th>
                     </tr>
@@ -100,11 +141,14 @@
                     <tr id="request-{{id}}"
                         data-filter-url="{{url}}"
                         onclick="select_request(arguments[0], '{{id}}')"
+                        onkeypress="shortcut_request(event, '{{id}}')"
                         class="request"
-                        data-qa-request="{{id}}">
+                        data-qa-request="{{id}}"
+                        tabindex="{{tabindex}}">
                         <td class="pin" onclick="event.stopPropagation();">
+                            <label for="pin{{id}}" class="visuallyhidden"pin request</label>
                             <input class="pin-checkbox" type="checkbox" id="pin{{id}}" onclick="pin_request('{{id}}',this.checked)" {{pin}}>
-                            <label class="pin-icon" for="pin{{id}}"><img class="icon" src="static/icons/push-pin-green-icon.svg-+-$**HTTPDBG_VERSION**$"/></label>
+                            <label class="pin-icon" for="pin{{id}}"><img class="icon" src="static/icons/push-pin-green-icon.svg-+-$**HTTPDBG_VERSION**$" alt="click to pin"/></label>
                         </td>
                         <td class="status"><span title="{{reason}}" data-qa-request-status>{{{status_code_view}}}</span></td>
                         <td class="method"><span title="{{verb}}" data-qa-request-method>{{verb}}</span></td>
@@ -125,17 +169,16 @@
                         <th>
                             <div class="tab">
                                 <button id="btn-tab-headers" class="tablinks"
-                                    onclick="opentab(event.currentTarget, 'tabHeaders')">headers</button>
+                                    onclick="opentab_headers()">headers</button>
                                 <button id="btn-tab-cookies" class="tablinks"
-                                    onclick="opentab(event.currentTarget, 'tabCookies')">cookies</button>
+                                    onclick="opentab_cookies()">cookies</button>
                                 <button id="btn-tab-request" class="tablinks"
-                                    onclick="opentab(event.currentTarget, 'tabRequest')">request</button>
+                                    onclick="opentab_request()">request</button>
                                 <button id="btn-tab-response" class="tablinks"
-                                    onclick="opentab(event.currentTarget, 'tabResponse')">response</button>
+                                    onclick="opentab_response()">response</button>
                                 <button id="btn-tab-exception" class="tablinks"
-                                    onclick="opentab(event.currentTarget, 'tabException')">exception</button>
-                                <button id="btn-tab-stack" class="tablinks"
-                                    onclick="opentab(event.currentTarget, 'tabStack')">stack</button>
+                                    onclick="opentab_exception()">exception</button>
+                                <button id="btn-tab-stack" class="tablinks" onclick="opentab_stack()">stack</button>
                             </div>
                         </th>
                     </tr>
@@ -225,9 +268,6 @@
                                 <script id="template_body" type="x-tmpl-mustache">
                                         {{^body}}
                                         -- no content --
-                                        {{#stream}}
-                                        (because stream mode on)
-                                        {{/stream}}
                                         {{/body}}
             
                                         {{#body}}
@@ -307,7 +347,7 @@
         update_filter_url();
         pol_new_data();
         enable_refresh();
-        opentab(document.getElementById("btn-tab-headers"), "tabHeaders");
+        opentab_headers();
     </script>
 </body>
 

httpdbg-0.13.0/httpdbg/webapp/static/main.js

@@ -0,0 +1,79 @@
+"use strict";
+
+let httpdbgApp = {
+    "config": {
+        "hide_initiator": {
+            "checkbox": "cinitiator",
+            "param": "hi",
+            "css": ".initiator {display: none;}",
+            "value": false
+        },
+        "hide_netloc": {
+            "checkbox": "curl",
+            "param": "hn",
+            "css": ".netloc {display: none;}",
+            "value": false
+        }
+    }
+}
+
+function wait_for(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+// use keys sequences as shortcut
+var keys_history= "";
+window.addEventListener('keydown', (event) => {
+
+    if (document.activeElement) {
+        if (document.activeElement.tagName.toLowerCase() === "input") {
+            if (document.activeElement.getAttribute("type").toLowerCase() === "text") {
+                return;
+            }
+        }
+    }
+
+    keys_history += event.key.toLowerCase();
+
+    if (keys_history.endsWith("rh")) {
+        opentab_headers();
+    }
+
+    if (keys_history.endsWith("rc")) {
+        opentab_cookies();
+    }
+
+    if (keys_history.endsWith("rp")) {
+        opentab_request();
+    }
+
+    if (keys_history.endsWith("rt")) {
+        opentab_response();
+    }
+
+    if (keys_history.endsWith("re")) {
+        opentab_exception();
+    }
+
+    if (keys_history.endsWith("rs")) {
+        opentab_stack();
+    }
+
+    if (keys_history.endsWith("oc")) {
+        config();
+    }
+
+    if (keys_history.endsWith("oh")) {
+        help();
+    }
+
+    keys_history = keys_history.substr(-8, 8)
+});
+
+function help() {
+    if (document.getElementById("help").style.display == "block") {
+        document.getElementById("help").style.display = "none";
+    } else {
+        document.getElementById("help").style.display = "block";
+    }
+}

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/webapp/static/render.js

@@ -64,6 +64,23 @@ function unselect_request(request_id) {
     }
 }
 
+function shortcut_request(event, request_id) {
+    var key_pressed = event.key.toLowerCase()
+    // select the request
+    if ((key_pressed === "s") || (key_pressed === "enter")) {
+        show_request(request_id);
+    }
+    // compare the request to the one already selected
+    if (key_pressed === "c") {
+        if ((document.getElementsByClassName("active-row").length > 0)) {
+            compare_to_request(request_id);
+        } else {
+            // if no request is already selected, just select the new one
+            show_request(request_id);
+        }
+    }
+}
+
 function remove_class(classname) {
     var elts = document.getElementsByClassName(classname);
     [].forEach.call(elts, function (el) {
@@ -154,6 +171,31 @@ function opentab(btn, tabname) {
     btn.className += " active";
 }
 
+function opentab_headers() {
+    opentab(document.getElementById("btn-tab-headers"), "tabHeaders");
+}
+
+function opentab_cookies() {
+    opentab(document.getElementById("btn-tab-cookies"), "tabCookies");
+}
+
+function opentab_request() {
+    opentab(document.getElementById("btn-tab-request"), "tabRequest");
+}
+
+function opentab_response() {
+    opentab(document.getElementById("btn-tab-response"), "tabResponse");
+}
+
+function opentab_exception() {
+    opentab(document.getElementById("btn-tab-exception"), "tabException");
+}
+
+function opentab_stack() {
+    opentab(document.getElementById("btn-tab-stack"), "tabStack");
+}
+
+
 async function disable_link_if_server_disconnected() {
     var sheet = document.getElementById("serverstatuscss").sheet;
 

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg/webapp/static/style.css

@@ -19,6 +19,7 @@
   --link-server-disconnected: #444444;
   --preview-code-border: #777777;
   --column-border: #dadada;
+  --kdb-border: #000000;
 }
 
 body {
@@ -58,6 +59,10 @@ a:link {
   display: none;
 }
 
+#help {
+  display: none;
+}
+
 .previewcode {
   display: block;
   overflow-x: scroll;
@@ -78,4 +83,22 @@ a:link {
   width: 16px;
   height: 16px;
   vertical-align: middle;
+}
+
+.visuallyhidden {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+
+kbd {
+  padding: 1px 2px 0;
+  border-radius: 3px;
+  border: 1px solid black;
+  font-family: monospace;
 }

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: httpdbg
-Version: 0.12.0
+Version: 0.13.0
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -22,6 +22,8 @@ License-File: LICENSE
 
 A very simple tool to debug HTTP(S) client requests.
 
+![](ui.png)
+
 ## installation 
 
 ```

{httpdbg-0.12.0 → httpdbg-0.13.0}/httpdbg.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ httpdbg/webapp/static/icons/filter-outline-icon.svg
 httpdbg/webapp/static/icons/information-mark-circle-outline-icon.svg
 httpdbg/webapp/static/icons/math-multiplication-icon.svg
 httpdbg/webapp/static/icons/push-pin-green-icon.svg
+httpdbg/webapp/static/icons/question-mark-round-line-icon.svg
 httpdbg/webapp/static/icons/recycle-bin-line-icon.svg
 httpdbg/webapp/static/icons/wait-sandclock-icon.svg
 tests/test_api.py

{httpdbg-0.12.0 → httpdbg-0.13.0}/tests/test_hook_httpx.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import platform
 import sys
 import urllib.parse
 
@@ -125,28 +124,6 @@ def test_httpx_cookies_secure(httpbin_secure):
     )
 
 
-@pytest.mark.httpx
-@pytest.mark.xfail(
-    platform.system().lower() == "windows",
-    reason="An established connection was aborted by the software in your host machine",
-)
-def test_httpx_stream(httpbin):
-    request_content = b"key=value"
-    response_content = bytes()
-    with httpdbg() as records:
-        with httpx.stream("POST", f"{httpbin.url}", data={"key": "value"}) as r:
-            for data in r.iter_bytes():
-                response_content += data
-
-    assert response_content != bytes()
-
-    assert len(records) == 1
-
-    http_record = records[0]
-    assert http_record.request.content == request_content
-    assert http_record.response.content == response_content
-
-
 @pytest.mark.httpx
 def test_httpx_redirect(httpbin_both):
     redirect_url = f"{httpbin_both.url}/redirect-to?{urllib.parse.urlencode({'url': httpbin_both.url})}/get"

{httpdbg-0.12.0 → httpdbg-0.13.0}/tests/test_hook_requests.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import platform
 import pytest
 import requests
 
@@ -125,30 +124,6 @@ def test_requests_cookies_secure(httpbin_secure):
     )
 
 
-@pytest.mark.requests
-@pytest.mark.xfail(
-    platform.system().lower() == "windows",
-    reason="An established connection was aborted by the software in your host machine",
-)
-def test_requests_stream(httpbin_both):
-    request_content = b"key=value"
-    response_content = bytes()
-    with httpdbg() as records:
-        with requests.post(
-            f"{httpbin_both.url}", data={"key": "value"}, verify=False
-        ) as r:
-            for data in r.iter_content():
-                response_content += data
-
-    assert response_content != bytes()
-
-    assert len(records) == 1
-
-    http_record = records[0]
-    assert http_record.request.content == request_content
-    assert http_record.response.content == response_content
-
-
 @pytest.mark.requests
 def test_requests_redirect(httpbin_both):
     with httpdbg() as records:

{httpdbg-0.12.0 → httpdbg-0.13.0}/tests/test_hook_urllib3.py

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from packaging import version
+import pkg_resources
+
 import pytest
 import urllib3
 
@@ -28,7 +31,7 @@ def test_urllib3_initiator(httpbin, monkeypatch):
     with monkeypatch.context() as m:
         m.delenv("PYTEST_CURRENT_TEST")
         with httpdbg() as records:
-            with urllib3.PoolManager(cert_reqs="CERT_NONE") as http:
+            with urllib3.PoolManager() as http:
                 http.request("GET", f"{httpbin.url}/get")
             with urllib3.HTTPConnectionPool(f"{httpbin.url[7:]}") as http:
                 http.request("GET", "/get")
@@ -48,6 +51,35 @@ def test_urllib3_initiator(httpbin, monkeypatch):
     assert 'http.request("GET", "/get") <===' in "".join(records[1].initiator.stack)
 
 
+@pytest.mark.initiator
+@pytest.mark.urllib3
+def test_urllib3_initiator_secure(httpbin_secure, monkeypatch):
+    with monkeypatch.context() as m:
+        m.delenv("PYTEST_CURRENT_TEST")
+        with httpdbg() as records:
+            with urllib3.PoolManager(cert_reqs="CERT_NONE") as http:
+                http.request("GET", f"{httpbin_secure.url}/get")
+            with urllib3.HTTPSConnectionPool(
+                f"{httpbin_secure.url[8:]}", cert_reqs="CERT_NONE"
+            ) as http:
+                http.request("GET", "/get")
+
+    assert len(records) == 2
+
+    assert (
+        records[0].initiator.short_label
+        == 'http.request("GET", f"{httpbin_secure.url}/get")'
+    )
+    assert records[0].initiator.long_label is None
+    assert 'http.request("GET", f"{httpbin_secure.url}/get") <===' in "".join(
+        records[0].initiator.stack
+    )
+
+    assert records[1].initiator.short_label == 'http.request("GET", "/get")'
+    assert records[1].initiator.long_label is None
+    assert 'http.request("GET", "/get") <===' in "".join(records[1].initiator.stack)
+
+
 @pytest.mark.urllib3
 def test_urllib3_request(httpbin_both):
     with httpdbg() as records:
@@ -201,3 +233,28 @@ def test_urllib3_get_empty_request_content(httpbin_both):
 
     assert http_record.url == f"{httpbin_both.url}/get"
     assert http_record.request.content == b""
+
+
+@pytest.mark.initiator
+@pytest.mark.urllib3
+@pytest.mark.skipif(
+    version.parse(pkg_resources.get_distribution("urllib3").version)
+    < version.parse("2.0.0"),
+    reason="only urllib3 v2",
+)
+def test_urllib3_v2_request(httpbin, monkeypatch):
+    with monkeypatch.context() as m:
+        m.delenv("PYTEST_CURRENT_TEST")
+        with httpdbg() as records:
+            urllib3.request("GET", f"{httpbin.url}/get")
+
+    assert len(records) == 1
+
+    assert (
+        records[0].initiator.short_label
+        == 'urllib3.request("GET", f"{httpbin.url}/get")'
+    )
+    assert records[0].initiator.long_label is None
+    assert 'urllib3.request("GET", f"{httpbin.url}/get") <===' in "".join(
+        records[0].initiator.stack
+    )

httpdbg-0.12.0/httpdbg/webapp/static/main.js

@@ -1,22 +0,0 @@
-"use strict";
-
-let httpdbgApp = {
-    "config": {
-        "hide_initiator": {
-            "checkbox": "cinitiator",
-            "param": "hi",
-            "css": ".initiator {display: none;}",
-            "value": false
-        },
-        "hide_netloc": {
-            "checkbox": "curl",
-            "param": "hn",
-            "css": ".netloc {display: none;}",
-            "value": false
-        }
-    }
-}
-
-function wait_for(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}