httpdbg 2.1.0__tar.gz → 2.1.2__tar.gz

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

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

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

{httpdbg-2.1.0 → httpdbg-2.1.2}/httpdbg/export.py

@@ -94,6 +94,7 @@ def generate_html(records: HTTPRecords, for_export: bool = True) -> str:
     global.static_requests = JSON.parse(
         document.getElementById('requests-map').textContent
     );
+    global.connected = false;
     </script>
 """
 

httpdbg-2.1.2/httpdbg/webapp/static/api.js

@@ -0,0 +1,187 @@
+"use strict";
+
+const global = {
+    session: null,
+    sessions: {},
+    requests: {},
+    initiators: {},
+    groups: {},
+    connected: false,
+    group_collapse: [],
+    groupby: "default"
+}
+
+function save_request(request_id, request, session_id) {
+    const initiator = global.initiators[request.initiator_id] ?? null;
+    if (initiator !== null) {  // the initiator may be missing if the clean list is executed in parrallel
+        request.loaded = false;
+        request.to_refresh = true;
+        if (request.pin == undefined) {
+            request.pin = "";
+        }
+        if (request.filter == undefined) {
+            request.filter = "---";
+        }
+        request.session_id = session_id;
+        request.initiator = initiator;
+
+        if (request.in_progress) {
+            request.status_code_view = '<svg class="icon" alt="loading"><use href="#wait-sandclock-icon"></use></svg>';
+        } else {
+            switch (request.status_code) {
+                case 0:
+                    request.status_code_view = '<svg class="icon" alt="loading"><use href="#wait-sandclock-icon"></use></svg>';
+                    break;
+                case -1:
+                    request.status_code_view = '<svg class="icon" alt="load failed"><use href="#math-multiplication-icon"></use></svg>';
+                    break;
+                default:
+                    request.status_code_view = request.status_code;
+                    break;
+            }
+        }
+
+        global.requests[request_id] = request;
+
+        if (!request.pin) {
+            get_request(request_id);
+        }
+    }
+}
+
+async function load_all_requests() {
+    // export mode
+    if (typeof global.static_all_requests !== "undefined") {
+        global.connected = false;
+        return global.static_all_requests;
+    }
+
+    // connected mode
+    var requests_already_loaded = 0
+    for (const [request_id, request] of Object.entries(global.requests)) {
+        if (request.loaded && (global.session == request.session_id)) {
+            requests_already_loaded += 1;
+        }
+    }
+    var url = "/requests?" + new URLSearchParams({
+        "id": global.session,
+        "requests_already_loaded": requests_already_loaded,
+    })
+
+    try {
+        const res = await fetch(url);
+        const data = await res.json();
+        global.connected = true;
+        return data;
+    } catch (error) {
+        global.connected = false;
+        return null;
+    }
+}
+
+
+async function get_all_requests() {
+
+    const data = await load_all_requests();
+
+    if (!data) {
+        return;
+    }
+
+    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) 
+                save_request(request_id, request, data.session.id);
+            }
+        };
+    };
+}
+
+async function load_request(request_id) {
+    if (typeof global.static_requests !== "undefined") {
+        global.connected = false;        
+        return global.static_requests[request_id];
+    }
+
+    try {
+        const res = await fetch("/request/" + request_id);
+        const data = await res.json();
+        global.connected = true;
+        return data;
+    } 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
+        );
+    }
+
+    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;
+
+    global.requests[request_id].to_refresh = true;
+
+    global.requests[request_id].loaded = true;
+}
+
+async function pol_new_data() {
+
+    while (true) {
+        await Promise.all([
+            get_all_requests(),
+            wait_for(1000)
+        ]);
+    }
+}
+
+function pin_request(request_id, pin) {
+    if (pin) {
+        global.requests[request_id].pin = "checked";
+    } else {
+        global.requests[request_id].pin = "";
+    }
+}

{httpdbg-2.1.0 → httpdbg-2.1.2}/httpdbg/webapp/static/index.htm

@@ -8,6 +8,22 @@
 
     <link rel="shortcut icon" href="static/favicon.ico">
 
+    <style>
+        .compact-mode {
+            display: none !important;
+        }
+
+        @media (max-width: 900px) {
+            .default-mode {
+                display: none !important;
+            }
+
+            .compact-mode {
+                display: block !important;
+            }
+        }
+    </style>
+
     $**PRELOAD_ICONS**$
 
     <link rel="stylesheet" href="static/style.css">
@@ -28,7 +44,7 @@
 </head>
 
 <body>
-    <header>
+    <header class="default-mode">
         <nav id="navbar">
             <div class="menu-left">
                 <button id="trash" type="button" onclick="clean(true)" title="Delete all unpinned requests.">
@@ -126,7 +142,7 @@
         </nav>
     </header>
 
-    <div id="help">
+    <div id="help" class="default-mode">
         <h4>About</h4>
         httpdbg v$**HTTPDBG_VERSION**$
         <br>
@@ -163,7 +179,7 @@
         <br>
     </div>
 
-    <div class="grid-container">
+    <div class="grid-container default-mode">
 
         <div class="grid-column grid-column-left">
 
@@ -361,7 +377,6 @@
                                         {{#body}}
                                             {{#body.path}}
                                             <a href="{{body.path}}" download="{{body.filename}}" class="need-server"><button title="download"><svg class="icon"><use href="#download-install-line-icon"></use></svg></button></a>
-                                            <svg class="icon need-server-info"><use href="#information-mark-circle-outline-icon"></use></svg>
                                             {{/body.path}}
             
                                             {{#body.text}}
@@ -430,6 +445,25 @@
             </table>
         </div>
     </div>
+
+    <div class="compact-mode">
+        <b><i>You're seeing a simplified view of the HTTP traces report. Make your window larger to see the full
+                interface.</i></b>
+        <br>
+        <ul id="requests-list-compact-mode">
+            <script id="template_request_compact_mode" type="x-tmpl-mustache">
+                    <li id="request-compact-mode-{{id}}">
+                        {{verb}} {{{status_code_view}}} {{netloc}}{{urlext}}
+                    </li>
+            </script>
+        </ul>
+
+        <b><i>You're seeing a simplified view of the HTTP traces report. Make your window larger to see the full
+                interface.</i></b>
+        <br>
+        httpdbg v$**HTTPDBG_VERSION**$
+    </div>
+
     $**EXPORT**$
     <script>
         load_config_from_url(true);

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

@@ -14,6 +14,7 @@ async function refresh_resquests() {
 
     for (const [request_id, request] of Object.entries(global.requests)) {
         if (request.to_refresh) {
+            // refresh the default mode
             var elt = document.getElementById("request-" + request.id);
 
             request.title = request.url;
@@ -24,7 +25,7 @@ async function refresh_resquests() {
 
             let groupby = get_groupby(global.groupby, request);
 
-            if(groupby) { // the group may be missing if the clean list is executed in parrallel
+            if (groupby) { // the group may be missing if the clean list is executed in parrallel
                 request.groupby_id = groupby.id;
 
                 var rendered = Mustache.render(template_request, request);
@@ -39,9 +40,20 @@ async function refresh_resquests() {
                 } else {
                     elt.innerHTML = rendered;
                 };
-    
-                request.to_refresh = false;    
+
+                request.to_refresh = false;
             }
+
+            // refresh the compact mode
+            var elt_compact_mode = document.getElementById("request-compact-mode" + request.id);
+            var template_request_compact_mode = document.getElementById("template_request_compact_mode").innerHTML;
+            var rendered_compact_mode = Mustache.render(template_request_compact_mode, request);
+            if (!elt_compact_mode) {
+                var elt_requests_list_compact_mode = document.getElementById("requests-list-compact-mode");
+                elt_requests_list_compact_mode.insertAdjacentHTML("beforeend", rendered_compact_mode);
+            } else {
+                elt_compact_mode.innerHTML = rendered_compact_mode;
+            };
         }
     };
     filter_requests_count();
@@ -248,7 +260,6 @@ async function disable_link_if_server_disconnected() {
 
     if (global.connected) {
         sheet.insertRule(".need-server {}");
-        sheet.insertRule(".need-server-info {display: none;}");
     } else {
         sheet.insertRule(".need-server {\
             color: var(--link-server-disconnected);\
@@ -256,11 +267,6 @@ async function disable_link_if_server_disconnected() {
             opacity: 0.5;\
             text-decoration: none;\
         }");
-        sheet.insertRule(".need-server-info {\
-             display: inline;\
-             color: var(--link-server-disconnected);\
-             opacity: 0.5;\
-         }");
     }
 }
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.1.0
+Version: 2.1.2
 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.0 → httpdbg-2.1.2}/httpdbg.egg-info/SOURCES.txt

@@ -68,7 +68,6 @@ httpdbg/webapp/static/icons/eye-blind-icon.svg
 httpdbg/webapp/static/icons/eye-icon.svg
 httpdbg/webapp/static/icons/files-papers-outline-icon.svg
 httpdbg/webapp/static/icons/filter-outline-icon.svg
-httpdbg/webapp/static/icons/information-mark-circle-outline-icon.svg
 httpdbg/webapp/static/icons/lock-line-icon.svg
 httpdbg/webapp/static/icons/lock-open-line-icon.svg
 httpdbg/webapp/static/icons/math-multiplication-icon.svg

httpdbg-2.1.0/httpdbg/webapp/static/api.js

@@ -1,175 +0,0 @@
-"use strict";
-
-const global = {
-    session: null,
-    sessions: {},
-    requests: {},
-    initiators: {},
-    groups: {},
-    connected: false,
-    group_collapse: [],
-    groupby: "default"
-}
-
-function save_request(request_id, request, session_id) {
-    const initiator = global.initiators[request.initiator_id] ?? null;
-    if (initiator !== null) {  // the initiator may be missing if the clean list is executed in parrallel
-        request.loaded = false;
-        request.to_refresh = true;
-        if (request.pin == undefined) {
-            request.pin = "";
-        }
-        if (request.filter == undefined) {
-            request.filter = "---";
-        }
-        request.session_id = session_id;
-        request.initiator = initiator;
-
-        if (request.in_progress) {
-            request.status_code_view = '<svg class="icon" alt="loading"><use href="#wait-sandclock-icon"></use></svg>';
-        } else {
-            switch (request.status_code) {
-                case 0:
-                    request.status_code_view = '<svg class="icon" alt="loading"><use href="#wait-sandclock-icon"></use></svg>';
-                    break;
-                case -1:
-                    request.status_code_view = '<svg class="icon" alt="load failed"><use href="#math-multiplication-icon"></use></svg>';
-                    break;
-                default:
-                    request.status_code_view = request.status_code;
-                    break;
-            }
-        }
-
-        global.requests[request_id] = request;
-
-        if (!request.pin) {
-            get_request(request_id);
-        }
-    }
-}
-
-async function load_all_requests() {
-    if (typeof global.static_all_requests !== "undefined") {
-        return global.static_all_requests;
-    }
-
-    var requests_already_loaded = 0
-    for (const [request_id, request] of Object.entries(global.requests)) {
-        if (request.loaded && (global.session == request.session_id)) {
-            requests_already_loaded += 1;
-        }
-    }
-    var url = "/requests?" + new URLSearchParams({
-        "id": global.session,
-        "requests_already_loaded": requests_already_loaded,
-    })
-
-    const res = await fetch(url);
-    const data = await res.json();
-    return data;
-}
-
-
-async function get_all_requests() {
-
-    await load_all_requests()
-        .then(data => {
-            global.connected = true;
-
-            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) 
-                        save_request(request_id, request, data.session.id);
-                    }
-                };
-            };
-        })
-        .catch((error) => {
-            global.connected = false;
-        });
-}
-
-async function load_request(request_id) {
-    if (typeof global.static_requests !== "undefined") {
-        return global.static_requests[request_id];
-    }
-
-    const res = await fetch("/request/" + request_id);
-    const data = await res.json();
-    return data;
-}
-
-async function get_request(request_id) {
-
-    await load_request(request_id)
-        .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].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
-                );
-            }
-
-            // 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].loaded = true;
-        })
-        .catch((error) => {
-            global.connected = false;
-        });
-
-}
-
-async function pol_new_data() {
-
-    while (true) {
-        await Promise.all([
-            get_all_requests(),
-            wait_for(1000)
-        ]);
-    }
-}
-
-function pin_request(request_id, pin) {
-    if (pin) {
-        global.requests[request_id].pin = "checked";
-    } else {
-        global.requests[request_id].pin = "";
-    }
-}

httpdbg-2.1.0/httpdbg/webapp/static/icons/information-mark-circle-outline-icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 512 512"><path fill-rule="nonzero" d="M256 0c70.69 0 134.7 28.66 181.02 74.98C483.34 121.31 512 185.31 512 256c0 70.69-28.66 134.7-74.98 181.02C390.7 483.34 326.69 512 256 512c-70.69 0-134.7-28.66-181.02-74.98C28.66 390.7 0 326.69 0 256c0-70.69 28.66-134.69 74.98-181.02C121.3 28.66 185.31 0 256 0zm17.75 342.25h29.15v29.32h-93.79v-29.32h28.76v-92.34h-28.76v-29.32h64.64v121.66zm-27.94-150.37c-7.08-.05-13.12-2.53-18.2-7.56-5.08-5.01-7.56-11.11-7.56-18.25 0-7.01 2.48-13.06 7.56-18.08 5.08-5.02 11.12-7.55 18.2-7.55 6.95 0 12.99 2.53 18.08 7.55 5.13 5.02 7.67 11.07 7.67 18.08 0 4.72-1.2 9.07-3.56 12.94-2.36 3.93-5.45 7.07-9.31 9.37-3.87 2.3-8.17 3.45-12.88 3.5zm171.9-97.59C376.33 52.92 319.15 27.32 256 27.32c-63.15 0-120.33 25.6-161.71 66.97C52.92 135.68 27.32 192.85 27.32 256c0 63.15 25.6 120.33 66.97 161.71 41.38 41.37 98.56 66.97 161.71 66.97 63.15 0 120.33-25.6 161.71-66.97 41.37-41.38 66.97-98.56 66.97-161.71 0-63.15-25.6-120.32-66.97-161.71z"/></svg>