httpdbg 2.1.2__tar.gz → 2.1.4__tar.gz

{httpdbg-2.1.2 → httpdbg-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.1.2
+Version: 2.1.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-2.1.2 → httpdbg-2.1.4}/httpdbg/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.1.2"
+__version__ = "2.1.4"
 
 __all__ = ["export_html", "httprecord", "HTTPRecords"]
 

{httpdbg-2.1.2 → httpdbg-2.1.4}/httpdbg/__main__.py

@@ -28,11 +28,6 @@ def pyhttpdbg(
 
     set_env_for_logging(params.log_level, params.log)
 
-    url = f"http://{params.host}:{params.port}/{'?hi=on' if params.console else ''}"
-
-    if not params.no_banner:
-        print_msg(f"  httpdbg - HTTP(S) requests available at {url}")
-
     sys.path.insert(0, "")  # to mimic the default python command behavior
 
     def run_recorder(
@@ -58,6 +53,11 @@ def pyhttpdbg(
         export_html(records, Path(params.export_html))
 
     else:
+        url = f"http://{params.host}:{params.port}/{'?hi=on' if params.console else ''}"
+
+        if not params.no_banner:
+            print_msg(f"  httpdbg - HTTP(S) requests available at {url}")
+
         with httpdbg_srv(params.host, params.port) as records:
 
             run_recorder(records, params.initiator, not params.only_client, test_mode)

{httpdbg-2.1.2 → httpdbg-2.1.4}/httpdbg/webapp/static/api.js

@@ -84,37 +84,35 @@ async function get_all_requests() {
 
     const data = await load_all_requests();
 
-    if (!data) {
-        return;
-    }
+    if (data) {
+        if (data.session.id != global.session) {
+            clean();
+            global.session = data.session.id;
+            global.sessions[data.session.id] = data.session;
+        };
 
-    if (data.session.id != global.session) {
-        clean();
-        global.session = data.session.id;
-        global.sessions[data.session.id] = data.session;
-    };
-
-    // for the initiators and the groups, we can just save them without any verification
-    Object.assign(global.initiators, data.initiators);
-    Object.assign(global.groups, data.groups);
-
-    // for the requests, we may have to update them 
-    for (const [request_id, request] of Object.entries(data.requests)) {
-        if (!(request_id in global.requests)) {
-            // this is a new request
-            save_request(request_id, request, data.session.id);
-        } else {
-            if (global.requests[request_id].last_update < request.last_update) {
-                // this request has been updated (probably a "big" file) 
+        // for the initiators and the groups, we can just save them without any verification
+        Object.assign(global.initiators, data.initiators);
+        Object.assign(global.groups, data.groups);
+
+        // for the requests, we may have to update them 
+        for (const [request_id, request] of Object.entries(data.requests)) {
+            if (!(request_id in global.requests)) {
+                // this is a new request
                 save_request(request_id, request, data.session.id);
-            }
+            } else {
+                if (global.requests[request_id].last_update < request.last_update) {
+                    // this request has been updated (probably a "big" file) 
+                    save_request(request_id, request, data.session.id);
+                }
+            };
         };
-    };
+    }
 }
 
 async function load_request(request_id) {
     if (typeof global.static_requests !== "undefined") {
-        global.connected = false;        
+        global.connected = false;
         return global.static_requests[request_id];
     }
 
@@ -126,46 +124,43 @@ async function load_request(request_id) {
     } catch (error) {
         global.connected = false;
         return null;
-    }    
+    }
 }
 
 async function get_request(request_id) {
-
     const data = await load_request(request_id);
 
-    if (!data) {
-        return;
-    }
-
-    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].filter += " " + prepare_for_filter(
-            parse_raw_text(
-                data.request.body.text,
-                data.request.body.content_type
-            ) || data.request.body.text
-        );
-    }
+    if (data) {
+        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].filter += " " + prepare_for_filter(
+                parse_raw_text(
+                    data.request.body.text,
+                    data.request.body.content_type
+                ) || data.request.body.text
+            );
+        }
 
-    global.requests[request_id].response = data.response;
-    if (data.response.body && data.response.body.text) {
-        global.requests[request_id].filter += " " + prepare_for_filter(
-            parse_raw_text(
-                data.response.body.text,
-                data.response.body.content_type
-            ) || data.response.body.text
-        );
-    }
+        global.requests[request_id].response = data.response;
+        if (data.response.body && data.response.body.text) {
+            global.requests[request_id].filter += " " + prepare_for_filter(
+                parse_raw_text(
+                    data.response.body.text,
+                    data.response.body.content_type
+                ) || data.response.body.text
+            );
+        }
 
-    // the full stack is not present in request summary
-    global.requests[request_id].initiator_id = data.initiator_id;
-    global.requests[request_id].exception = data.exception;
+        // the full stack is not present in request summary
+        global.requests[request_id].initiator_id = data.initiator_id;
+        global.requests[request_id].exception = data.exception;
 
-    global.requests[request_id].to_refresh = true;
+        global.requests[request_id].to_refresh = true;
 
-    global.requests[request_id].loaded = true;
+        global.requests[request_id].loaded = true;
+    }
 }
 
 async function pol_new_data() {

{httpdbg-2.1.2 → httpdbg-2.1.4}/httpdbg/webapp/static/render.js

@@ -7,7 +7,7 @@ async function refresh_resquests() {
     var template_request = document.getElementById("template_request").innerHTML;
     var template_group = document.getElementById("template_group").innerHTML;
 
-    if (global.session != session_id) {
+    if (session_id != null && global.session !== session_id) {
         clean();
     };
     session_id = global.session;

{httpdbg-2.1.2 → httpdbg-2.1.4}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.1.2
+Version: 2.1.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