httpdbg 1.2.2__tar.gz → 1.2.4__tar.gz

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

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

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

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

{httpdbg-1.2.2 → httpdbg-1.2.4}/httpdbg/initiator.py

@@ -205,11 +205,14 @@ def extract_short_stack_from_file(
 
 def construct_call_str(original_method, *args, **kwargs):
 
-    def print_v(v):
-        if isinstance(v, str):
-            return f'"{v}"'
-        else:
-            return v
+    def print_v(v) -> str:
+        try:
+            if isinstance(v, str):
+                return f'"{v}"'
+            else:
+                return str(v)
+        except Exception:
+            return "-?-"  # in case __retr__ or __str__ is broken
 
     callargs = getcallargs(original_method, *args, **kwargs)
 

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

@@ -307,6 +307,13 @@ class HTTPRecord:
         else:
             self.response.rawdata += data
 
+    @property
+    def protocol(self) -> str:
+        if self.response.protocol == self.request.protocol:
+            return self.request.protocol
+        else:
+            return f"{self.request.protocol} -> {self.response.protocol}"
+
 
 class HTTPRecordsSessionInfo:
 

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

@@ -90,6 +90,7 @@ class RequestListPayload(JSONEncoder):
                 "netloc": req.netloc,
                 "urlext": req.urlext,
                 "status_code": req.status_code,
+                "protocol": req.protocol,
                 "reason": req.reason,
                 "verb": req.method,
                 "tag": req.tag,

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

@@ -201,7 +201,7 @@
                         data-group="{{group_id}}"
                         data-groupby="{{groupby_id}}"
                         data-orderby="{{tbegin}}"
-                        onclick="select_request(arguments[0], '{{id}}')"
+                        onclick="select_request(event, '{{id}}')"
                         onkeypress="shortcut_request(event, '{{id}}')"
                         class="request"
                         data-qa-request="{{id}}">
@@ -273,19 +273,24 @@
                                 <script id="template_headers" type="x-tmpl-mustache">
                                        <b>{{ method }}</b> <a href="{{ url }}">{{ url }}</a>
                                        <hr>
-                                            <span class="header-cookie-key">status</span>:
+                                            <span class="header-cookie-key">status:</span>
                                             <span class="header-cookie-value">{{ status_code }} {{ reason }}</span>
+                                            <br>
+                                            {{#protocol}}
+                                            <span class="header-cookie-key">protocol:</span>
+                                            <span class="header-cookie-value">{{ protocol }}</span>
+                                            {{/protocol}}
                                             <br><br>
-                                            <span class="header-cookie-key">start</span>:
-                                            <span class="header-cookie-value">{{tbegin}}</span>   
+                                            <span class="header-cookie-key">start:</span>
+                                            <span class="header-cookie-value">{{tbegin}}</span>
                                             <br>
-                                            <span class="header-cookie-key">end</span>:&nbsp;&nbsp;&nbsp;
-                                            <span class="header-cookie-value">{{last_update}}</span>   
+                                            <span class="header-cookie-key">end:&nbsp;&nbsp;</span>
+                                            <span class="header-cookie-value">{{last_update}}</span>
                                        <hr>
                                        <h4>response headers</h4>
                                        {{#response}}
                                            {{#response.headers}}
-                                           <span class="header-cookie-key">{{name}}</span>:
+                                           <span class="header-cookie-key">{{name}}:</span>
                                            <span class="header-cookie-value">{{value}}</span>
                                            <br>
                                            {{/response.headers}}
@@ -293,7 +298,7 @@
                                        <hr>
                                        <h4>request headers</h4>
                                        {{#request.headers}}
-                                       <span class="header-cookie-key">{{name}}</span>:
+                                       <span class="header-cookie-key">{{name}}:</span>
                                        <span class="header-cookie-value">{{value}}</span>
                                        <br>
                                        {{/request.headers}}
@@ -309,12 +314,12 @@
                                        <h4>response cookies</h4>
                                        {{#response}}
                                            {{#response.cookies}}
-                                           <span class="header-cookie-key">{{name}}</span>: 
+                                           <span class="header-cookie-key">{{name}}:</span>
                                            <span class="header-cookie-value">{{value}}</span> 
                                              <ul>
                                                {{#attributes}}
                                                <li>
-                                                <span class="header-cookie-key">{{name}}</span>{{#attr}}: <span class="header-cookie-value">{{attr}}</span>{{/attr}}
+                                                <span class="header-cookie-key">{{name}}:</span>{{#attr}} <span class="header-cookie-value">{{attr}}</span>{{/attr}}
                                                </li>
                                                {{/attributes}}
                                              </ul>
@@ -323,7 +328,7 @@
                                        <hr>
                                        <h4>request cookies</h4>
                                        {{#request.cookies}}
-                                       <span class="header-cookie-key">{{name}}</span>: 
+                                       <span class="header-cookie-key">{{name}}:</span>
                                        <span class="header-cookie-value">{{value}}</span>
                                        <br> 
                                        <br>

{httpdbg-1.2.2 → httpdbg-1.2.4}/httpdbg/webapp/static/table.css

@@ -124,6 +124,7 @@
 .requests-table tbody tr.active-row-compare {
     background-color: var(--compare-url-bgcolor);
     color: var(--selected-url-text);
+    user-select: none;  /* to remove the undesired border in firefox */
 }
 
 #filter-url {

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

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

{httpdbg-1.2.2 → httpdbg-1.2.4}/tests/test_api.py

@@ -55,6 +55,19 @@ def test_api_requests_netloc(httpbin, httpdbg_host, httpdbg_port):
     assert reqs[list(reqs.keys())[0]]["urlext"] == "/get?abc"
 
 
+@pytest.mark.api
+def test_api_requests_protocol(httpbin, httpdbg_host, httpdbg_port):
+    with httpdbg_srv(httpdbg_host, httpdbg_port) as records:
+        with httprecord(records):
+            requests.get(httpbin.url + "/get?abc")
+        ret = requests.get(f"http://{httpdbg_host}:{httpdbg_port}/requests")
+
+    reqs = ret.json()["requests"]
+
+    assert len(reqs) == 1
+    assert reqs[list(reqs.keys())[0]]["protocol"] == "HTTP/1.1"
+
+
 @pytest.mark.api
 def test_api_request_by_id(httpbin, httpdbg_host, httpdbg_port):
     with httpdbg_srv(httpdbg_host, httpdbg_port) as records:

{httpdbg-1.2.2 → httpdbg-1.2.4}/tests/test_initiator.py

@@ -165,3 +165,15 @@ def test_initiator_add_package_fnc(httpbin):
         == "requests.get(url)  # method"
     )
     assert records.initiators[records[4].initiator_id].label == "await client.get(url)"
+
+
+def test_exception_in_initiator(httpbin):
+
+    with httprecord(initiators=["tests.initiator_pck"]) as records:
+        from tests.initiator_pck.repr_exception import BrokenREPR, get
+
+        br = BrokenREPR(f"{httpbin.url}/get")
+        get(br)
+
+    assert records.initiators[records[0].initiator_id].label == "get(br)"
+    assert "br=-?-" in records.initiators[records[0].initiator_id].short_stack