httpdbg 2.1.8__tar.gz → 2.2.1__tar.gz

{httpdbg-2.1.8 → httpdbg-2.2.1}/PKG-INFO

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

{httpdbg-2.1.8 → httpdbg-2.2.1}/httpdbg/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.1.8"
+__version__ = "2.2.1"
 
 __all__ = ["export_html", "httprecord", "HTTPRecords"]
 

{httpdbg-2.1.8 → httpdbg-2.2.1}/httpdbg/args.py

@@ -5,12 +5,25 @@ from httpdbg.log import LogLevel
 
 
 def read_args(args: list[str]) -> tuple[argparse.Namespace, list[str]]:
+    """
+    Parse the raw command-line arguments to separate the arguments intended
+    for httpdbg from those intended for the script or module being executed.
+
+    The httpdbg arguments are everything up to and including the selected
+    execution option (e.g. ``--script``, ``--module``, or ``-m``), while the
+    remaining arguments are passed to the target script or module.
+    """
     httpdbg_args = args
     client_args = []
-    for action in ["--console", "--module", "-m", "--script"]:
-        if action in args:
-            httpdbg_args = args[: args.index(action) + 2]
-            client_args = args[args.index(action) + 1 :]
+    for arg in args:
+        tostop = False
+        for action in ["--console", "--module", "-m", "--script"]:
+            if action == arg:
+                httpdbg_args = args[: args.index(action) + 2]
+                client_args = args[args.index(action) + 1 :]
+                tostop = True
+                break
+        if tostop:
             break
 
     parser = argparse.ArgumentParser(

{httpdbg-2.1.8 → httpdbg-2.2.1}/httpdbg/webapp/static/index.htm

@@ -299,7 +299,14 @@
                                 </div>
 
                                 <script id="template_headers" type="x-tmpl-mustache">
-                                       <b>{{ method }}</b> <a href="{{ url }}">{{ url }}</a>
+                                       <button title="copy to clipboard" onclick="navigator.clipboard.writeText({{url_to_clipboard}});"><svg class="icon"><use href="#files-papers-outline-icon"></use></svg></button>
+                                       <span class="header-cookie-key">{{verb}}</span>
+                                       {{#is_http}}
+                                       <a class="header-cookie-value" target="_blank" href="{{url}}">{{url}}</a>
+                                       {{/is_http}}
+                                       {{^is_http}}
+                                       <span class="header-cookie-value" title="Warning: This URL uses a non-HTTP/HTTPS scheme and has been disabled for security reasons.">{{url}}</span>
+                                       {{/is_http}}
                                        <hr>
                                             <span class="header-cookie-key">status:</span>
                                             <span class="header-cookie-value">{{ status_code }} {{ reason }} {{#http100}}(after 100 Continue){{/http100}}</span>

{httpdbg-2.1.8 → httpdbg-2.2.1}/httpdbg/webapp/static/render.js

@@ -156,6 +156,14 @@ function fill_content(request_id, name) {
 
     var req = global.requests[request_id];
 
+    try {
+        const parsed_url = new URL(req.url);
+        req.is_http = ["http:", "https:"].includes(parsed_url.protocol);
+    } catch {
+        req.is_http = false;
+    }
+    req.url_to_clipboard = "global.requests['" + request_id + "'].url";
+
     update_with_template("template_title", document.querySelector("#title > div[name='" + name + "']"), req);
 
     update_with_template("template_headers", document.querySelector("#headers > div[name='" + name + "']"), req);

{httpdbg-2.1.8 → httpdbg-2.2.1}/httpdbg.egg-info/PKG-INFO

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

httpdbg-2.2.1/tests/test_cli.py

@@ -0,0 +1,32 @@
+import pytest
+
+from httpdbg import __version__
+from httpdbg.__main__ import pyhttpdbg_entry_point
+from httpdbg.args import read_args
+
+
+@pytest.mark.cli
+def test_cli_version(monkeypatch, capsys):
+    monkeypatch.setattr("sys.argv", ["pyhttpdb", "--version"])
+
+    pyhttpdbg_entry_point(test_mode=True)
+
+    assert __version__ in capsys.readouterr().out.strip()
+
+
+@pytest.mark.cli
+def test_read_args_split_httpdbg_and_script_args():
+    """Split httpdbg arguments from the arguments passed to the script/module."""
+    httpdbg_args_parsed, client_args = read_args(
+        ["--port", "345", "--script", "demo.py", "--script", "xyz"]
+    )
+    assert httpdbg_args_parsed.port == 345
+    assert httpdbg_args_parsed.script == "demo.py"
+    assert client_args == ["demo.py", "--script", "xyz"]
+
+
+@pytest.mark.cli
+def test_read_args_split_httpdbg_and_script_args_same_args():
+    """Allow script/module arguments to reuse httpdbg command-line same options."""
+    read_args(["--script", "demo.py", "--script", "xyz"])
+    read_args(["--script", "demo.py", "-m", "xyz"])

httpdbg-2.1.8/tests/test_cli.py

@@ -1,13 +0,0 @@
-import pytest
-
-from httpdbg import __version__
-from httpdbg.__main__ import pyhttpdbg_entry_point
-
-
-@pytest.mark.cli
-def test_cli_version(monkeypatch, capsys):
-    monkeypatch.setattr("sys.argv", ["pyhttpdb", "--version"])
-
-    pyhttpdbg_entry_point(test_mode=True)
-
-    assert __version__ in capsys.readouterr().out.strip()