httpdbg 0.25.0__tar.gz → 0.27.0__tar.gz

{httpdbg-0.25.0 → httpdbg-0.27.0}/PKG-INFO

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

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/__init__.py

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

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/initiator.py

@@ -88,10 +88,13 @@ def get_current_instruction(
     try:
         n_stack = -1
         framesummary = extracted_stack[-2]
-        if "asyncio" in framesummary.filename:
-            while "asyncio" in framesummary.filename:
-                n_stack -= 1
-                framesummary = extracted_stack[n_stack - 1]
+        while "asyncio" in framesummary.filename:
+            n_stack -= 1
+            framesummary = extracted_stack[n_stack - 1]
+
+        while "httpdbg/hooks" in framesummary.filename:
+            n_stack -= 1
+            framesummary = extracted_stack[n_stack - 1]
 
         short_stack = f'File "{framesummary.filename}", line {framesummary.lineno}, in {framesummary.name}\n'
         if os.path.exists(framesummary.filename) and framesummary.lineno is not None:

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/webapp/static/api.js

@@ -13,7 +13,11 @@ function save_request(request_id, request) {
     if (request.pin == undefined) {
         request.pin = "";
     }
+    if (request.filter == undefined) {
+        request.filter = "---";
+    }
     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**$" alt="loading"/>';
     } else {
@@ -29,12 +33,6 @@ function save_request(request_id, request) {
                 break;
         }
     }
-    global.requests[request_id].request = global.requests[request_id].request || {
-        "for_filter": ""
-    }
-    global.requests[request_id].response = global.requests[request_id].response || {
-        "for_filter": ""
-    }
 
     if (!request.pin) {
         get_request(request_id);
@@ -88,29 +86,26 @@ async function get_request(request_id) {
         .then(res => res.json())
         .then(data => {
             global.connected = true;
+            global.requests[request_id].filter = prepare_for_filter(global.requests[request_id].url);
 
             global.requests[request_id].request = data.request;
             if (data.request.body && data.request.body.text) {
-                global.requests[request_id].request.for_filter = prepare_for_filter(
+                global.requests[request_id].filter += " " + prepare_for_filter(
                     parse_raw_text(
                         data.request.body.text,
                         data.request.body.content_type
                     ) || data.request.body.text
                 );
-            } else {
-                global.requests[request_id].request.for_filter = "";
             }
 
             global.requests[request_id].response = data.response;
             if (data.response.body && data.response.body.text) {
-                global.requests[request_id].response.for_filter = prepare_for_filter(
+                global.requests[request_id].filter += " " + prepare_for_filter(
                     parse_raw_text(
                         data.response.body.text,
                         data.response.body.content_type
                     ) || data.response.body.text
                 );
-            } else {
-                global.requests[request_id].response.for_filter = "";
             }
 
             // the full stack is not present in request summary

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/webapp/static/filter.js

@@ -11,36 +11,30 @@ function update_filter_url() {
 
     if (value == "") {
         // if there is no filter, all rows are visible
-        sheet.insertRule("[data-filter-url] {display: table-row;}");
-        sheet.insertRule("[data-filter-request] {display: table-row;}");
-        sheet.insertRule("[data-filter-response] {display: table-row;}");
+        sheet.insertRule("[data-filter] {display: table-row;}");
         sheet.insertRule(".initiator-header {display: table-row-group;}");
     } else {
         // if there is a filter, only the requests that match the filter are visible
-        sheet.insertRule('[data-filter-url*="' + value + '"] {display: table-row;}');
-        sheet.insertRule('[data-filter-request*="' + value + '"] {display: table-row;}');
-        sheet.insertRule('[data-filter-response*="' + value + '"] {display: table-row;}');
+        sheet.insertRule('[data-filter*="' + value + '"] {display: table-row;}');
         if (CSS.supports("selector(:has(*))")) {
             // an initiator row is visible only if it contains at least one visible request
-            sheet.insertRule('.initiator-header:has([data-filter-url*="' + value + '"]) {display: table-row-group;}');
-            sheet.insertRule('.initiator-header:has([data-filter-request*="' + value + '"]) {display: table-row-group;}');
-            sheet.insertRule('.initiator-header:has([data-filter-response*="' + value + '"]) {display: table-row-group;}');
+            sheet.insertRule('.initiator-header:has([data-filter*="' + value + '"]) {display: table-row-group;}');
             // if there is a filter and no request visible, the filter icon is red
-            sheet.insertRule('.requests-table:not(:has([data-filter-url*="' + value + '"])):has(tbody) .icon-filter {filter: grayscale(0%) !important;}');
-            sheet.insertRule('.requests-table:not(:has([data-filter-request*="' + value + '"])):has(tbody) .icon-filter {filter: grayscale(0%) !important;}');
-            sheet.insertRule('.requests-table:not(:has([data-filter-response*="' + value + '"])):has(tbody) .icon-filter {filter: grayscale(0%) !important;}');
+            sheet.insertRule('.requests-table:not(:has([data-filter*="' + value + '"])):has(tbody) .icon-filter {filter: grayscale(0%) !important;}');
         } else {
             // in case :has is not supported, the initiator rows are always visible
             sheet.insertRule(".initiator-header {display: table-row-group;}");
         }
     }
+
+    filter_requests_count();
 }
 
 function collapse_initiator(initiator_id, collapse) {
     if (collapse) {
         global.initiator_collapse.push(initiator_id);
     } else {
-        let index = global.initiator_collapse.indexOf(initiator_id); 
+        let index = global.initiator_collapse.indexOf(initiator_id);
         if (index !== -1) {
             global.initiator_collapse.splice(index, 1);
         }
@@ -60,3 +54,19 @@ function update_collapse_initiator() {
         sheet.insertRule('[data-initiator="' + initiator_id + '"] {display: none;}');
     }
 }
+
+function filter_requests_count() {
+    var filter = document.getElementById("filter-url").value;
+    var counter = document.getElementById("filter-requests-count");
+
+    const nb_total = Object.keys(global.requests).length || 0;
+    var nb_found = nb_total;    
+
+    if (filter) {
+        filter = prepare_for_filter(filter);
+        var table = document.getElementById("requests-list");        
+        nb_found = table.querySelectorAll('[data-filter*="' + filter + '"]').length;
+    }
+
+    counter.innerText = nb_found + "/" + nb_total + " requests";
+}

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/webapp/static/index.htm

@@ -141,15 +141,19 @@
                         <th class="method" title="method"></th>
                         <th class="url">
                             url
+                            &nbsp;
                             <img class="icon icon-filter"
                                 src="static/icons/filter-outline-icon.svg-+-$**HTTPDBG_VERSION**$"
                                 alt="filter for url" />
+                            &nbsp;                                
                             <label for="filter-url" class="visuallyhidden">
                                 filter for url
                             </label>
-                            <input type="text" value="" id="filter-url" title="filter for url"
+                            <input type="text" value="" id="filter-url" title="match the url or the request payload"
                                 onkeyup="update_filter_url()" oncut="update_filter_url()" onpaste="update_filter_url()"
                                 onchange="update_filter_url()">
+                            &nbsp;                                
+                            <span id="filter-requests-count">0/0 requests</span>
                         </th>
                     </tr>
                 </thead>
@@ -170,9 +174,7 @@
 
                 <script id="template_request" type="x-tmpl-mustache">
                     <tr id="request-{{id}}"
-                        data-filter-url="{{url}}"
-                        data-filter-request="{{request.for_filter}}"
-                        data-filter-response="{{response.for_filter}}"
+                        data-filter="{{filter}}"
                         data-initiator="{{initiator.id}}"
                         onclick="select_request(arguments[0], '{{id}}')"
                         onkeypress="shortcut_request(event, '{{id}}')"

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/webapp/static/render.js

@@ -39,6 +39,7 @@ async function refresh_resquests() {
             request.to_refresh = false;
         }
     };
+    filter_requests_count();
 }
 
 

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg/webapp/static/table.css

@@ -22,6 +22,7 @@
     text-align: left;
     overflow: hidden;
     width: auto;
+    font-weight: normal;
 }
 
 .url-content {

{httpdbg-0.25.0 → httpdbg-0.27.0}/httpdbg.egg-info/PKG-INFO

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