httpdbg 0.28.3__tar.gz → 0.29.0__tar.gz

{httpdbg-0.28.3 → httpdbg-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: httpdbg
-Version: 0.28.3
+Version: 0.29.0
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -24,7 +24,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: pytest
-Requires-Dist: pytest-httpdbg>=0.3.1; extra == "pytest"
+Requires-Dist: pytest-httpdbg>=0.6.0; extra == "pytest"
 
 # httpdbg
 

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/__init__.py

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

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/env.py

@@ -1,3 +1,4 @@
+HTTPDBG_CURRENT_GROUP = "HTTPDBG_CURRENT_GROUP"
 HTTPDBG_CURRENT_INITIATOR = "HTTPDBG_CURRENT_INITIATOR"
 HTTPDBG_CURRENT_TAG = "HTTPDBG_CURRENT_TAG"
 HTTPDBG_SUBPROCESS_DIR = "HTTPDBG_SUBPROCESS_DIR"

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/hooks/external.py

@@ -46,8 +46,10 @@ class WatcherSubprocessDirThread(threading.Thread):
     def load_dump(self):
         for dump in glob.glob(f"{os.environ[HTTPDBG_SUBPROCESS_DIR]}/*.httpdbgrecords"):
             with open(dump, "rb") as dumpfile:
-                newrecords = pickle.load(dumpfile)
+                newrecords: HTTPRecords = pickle.load(dumpfile)
                 self.records.requests.update(newrecords.requests)
+                self.records.initiators.update(newrecords.initiators)
+                self.records.groups.update(newrecords.groups)
 
     def run(self):
         while not self.stop:

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/hooks/pytest.py

@@ -1,16 +1,20 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Callable
 from contextlib import contextmanager
 from typing import Generator
 
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import undecorate
+from httpdbg.initiator import httpdbg_group
 from httpdbg.initiator import httpdbg_tag
+from httpdbg.log import logger
 from httpdbg.records import HTTPRecords
 
 
-def set_hook_for_pytest_fixture(_, method):
+def set_hook_for_pytest_fixture(_: HTTPRecords, method: Callable):
     def hook(*args, **kwargs):
+        logger().info("SET_HOOK_FOR_PYTEST_FIXTURE")
         callargs = getcallargs(method, *args, **kwargs)
 
         if "fixturefunc" in callargs:
@@ -22,11 +26,28 @@ def set_hook_for_pytest_fixture(_, method):
     return hook
 
 
+def set_hook_for_pytest_runtest(records: HTTPRecords, method: Callable):
+    def hook(*args, **kwargs):
+        logger().info("SET_HOOK_FOR_PYTEST_RUNTEST")
+        callargs = getcallargs(method, *args, **kwargs)
+
+        if "item" in callargs:
+            full_label = getattr(callargs["item"], "nodeid", "unknown test")
+            label = getattr(callargs["item"], "name", "unknown test")
+            with httpdbg_group(records, label, full_label):
+                return method(*args, **kwargs)
+        else:
+            return method(*args, **kwargs)
+
+    return hook
+
+
 @contextmanager
 def hook_pytest(records: HTTPRecords) -> Generator[None, None, None]:
     hooks = False
     try:
         import _pytest.fixtures
+        import _pytest.runner
 
         _pytest.fixtures.call_fixture_func = decorate(
             records, _pytest.fixtures.call_fixture_func, set_hook_for_pytest_fixture
@@ -36,6 +57,11 @@ def hook_pytest(records: HTTPRecords) -> Generator[None, None, None]:
             _pytest.fixtures._teardown_yield_fixture,
             set_hook_for_pytest_fixture,
         )
+
+        _pytest.runner.runtestprotocol = decorate(
+            records, _pytest.runner.runtestprotocol, set_hook_for_pytest_runtest
+        )
+
         hooks = True
     except ImportError:
         pass
@@ -49,3 +75,5 @@ def hook_pytest(records: HTTPRecords) -> Generator[None, None, None]:
         _pytest.fixtures._teardown_yield_fixture = undecorate(
             _pytest.fixtures._teardown_yield_fixture
         )
+
+        _pytest.runner.runtestprotocol = undecorate(_pytest.runner.runtestprotocol)

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/hooks/socket.py

@@ -206,7 +206,7 @@ def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
                 if http_detected:
                     logger().info("SENDALL - http detected")
                     socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator = records.get_initiator()
+                    socketdata.record.initiator_id = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
                     socketdata.record.request.rawdata = socketdata.rawdata
@@ -251,7 +251,7 @@ def set_hook_for_socket_send(records: HTTPRecords, method: Callable):
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator = records.get_initiator()
+                    socketdata.record.initiator_id = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
                     socketdata.record.request.rawdata = socketdata.rawdata
@@ -315,7 +315,7 @@ def set_hook_for_sslobject_write(records: HTTPRecords, method: Callable):
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator = records.get_initiator()
+                    socketdata.record.initiator_id = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
                     socketdata.record.request.rawdata = socketdata.rawdata
@@ -413,7 +413,7 @@ def hook_socket(records: HTTPRecords) -> Generator[None, None, None]:
     )
 
     # only for async HTTP requests (not HTTPS) on Windows
-    if (platform.system().lower() == "windows") and (sys.version_info >= (3, 7)):
+    if platform.system().lower() == "windows":
         asyncio.proactor_events._ProactorReadPipeTransport._data_received = decorate(  # type: ignore
             records,
             asyncio.proactor_events._ProactorReadPipeTransport._data_received,  # type: ignore
@@ -455,7 +455,7 @@ def hook_socket(records: HTTPRecords) -> Generator[None, None, None]:
     )
 
     # only for async HTTP requests (not HTTPS) on Windows
-    if (platform.system().lower() == "windows") and (sys.version_info >= (3, 7)):
+    if platform.system().lower() == "windows":
         asyncio.proactor_events._ProactorReadPipeTransport._data_received = undecorate(  # type: ignore
             asyncio.proactor_events._ProactorReadPipeTransport._data_received  # type: ignore
         )

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/initiator.py

@@ -7,7 +7,12 @@ from typing import Generator
 from typing import List
 from typing import Tuple
 from typing import Union
+from typing import TYPE_CHECKING
 
+if TYPE_CHECKING:
+    from httpdbg.records import HTTPRecords
+
+from httpdbg.env import HTTPDBG_CURRENT_GROUP
 from httpdbg.env import HTTPDBG_CURRENT_INITIATOR
 from httpdbg.env import HTTPDBG_CURRENT_TAG
 from httpdbg.hooks.utils import getcallargs
@@ -15,26 +20,23 @@ from httpdbg.utils import get_new_uuid
 from httpdbg.log import logger
 
 
-class Initiator(object):
+class Initiator:
     def __init__(
         self,
         id: str,
-        short_label: str,
-        long_label: Union[str, None],
+        label: str,
         short_stack: str,
         stack: List[str],
     ):
         self.id = id
-        self.short_label = short_label
-        self.long_label = long_label
+        self.label = label
         self.short_stack = short_stack
         self.stack = stack
 
     def __eq__(self, other) -> bool:
         if type(other) is Initiator:
             return (
-                self.short_label == other.short_label
-                and self.long_label == other.long_label
+                self.label == other.label
                 and self.short_stack == other.short_stack
                 and self.stack == other.stack
             )
@@ -45,21 +47,29 @@ class Initiator(object):
         if full:
             json = {
                 "id": self.id,
-                "short_label": self.short_label,
-                "long_label": self.long_label,
+                "label": self.label,
                 "short_stack": self.short_stack,
                 "stack": "\n".join(self.stack),
             }
         else:
             json = {
                 "id": self.id,
-                "short_label": self.short_label,
-                "long_label": self.long_label,
+                "label": self.label,
                 "short_stack": self.short_stack,
             }
         return json
 
 
+class Group:
+    def __init__(self, id: str, label: str, full_label: str):
+        self.id = id
+        self.label = label
+        self.full_label = full_label
+
+    def to_json(self) -> dict:
+        return {"id": self.id, "label": self.label, "full_label": self.full_label}
+
+
 def compatible_path(path: str) -> str:
     p = path
     if platform.system().lower() == "windows":
@@ -205,15 +215,16 @@ def httpdbg_initiator(
             short_stack += f"    {k}={v}\n"
         short_stack += ")"
 
-        current_initiator = Initiator(
-            get_new_uuid(), instruction, None, short_stack, stack
-        )
-        records._initiators[current_initiator.id] = current_initiator
+        current_initiator = Initiator(get_new_uuid(), instruction, short_stack, stack)
+        records.initiators[current_initiator.id] = current_initiator
 
         os.environ[envname] = current_initiator.id
 
         try:
-            yield current_initiator
+            with httpdbg_group(
+                records, instruction, short_stack
+            ):  # by default we group the requests by initiator
+                yield current_initiator
         except Exception:
             del os.environ[envname]
             raise
@@ -233,6 +244,7 @@ def httpdbg_tag(tag: str) -> Generator[None, None, None]:
         os.environ[HTTPDBG_CURRENT_TAG] = tag
 
     try:
+        logger().info(f"httpdbg_tag {tag}")
         yield
     except Exception:
         if (not tag_already_set) and (HTTPDBG_CURRENT_TAG in os.environ):
@@ -241,3 +253,30 @@ def httpdbg_tag(tag: str) -> Generator[None, None, None]:
 
     if (not tag_already_set) and (HTTPDBG_CURRENT_TAG in os.environ):
         del os.environ[HTTPDBG_CURRENT_TAG]
+
+
+@contextmanager
+def httpdbg_group(
+    records: "HTTPRecords", label: str, full_label: str
+) -> Generator[None, None, None]:
+
+    group_already_set = HTTPDBG_CURRENT_GROUP in os.environ
+
+    if not group_already_set:
+        logger().info("httpdbg_group (new)")
+        group_id = get_new_uuid()
+        records.groups[group_id] = Group(group_id, label, full_label)
+        os.environ[HTTPDBG_CURRENT_GROUP] = group_id
+
+    try:
+        logger().info(
+            f"httpdbg_group {records.groups} group_id={os.environ[HTTPDBG_CURRENT_GROUP]} label={label} full_label={full_label}"
+        )
+        yield
+    except Exception:
+        if (not group_already_set) and (HTTPDBG_CURRENT_GROUP in os.environ):
+            del os.environ[HTTPDBG_CURRENT_GROUP]
+        raise
+
+    if (not group_already_set) and (HTTPDBG_CURRENT_GROUP in os.environ):
+        del os.environ[HTTPDBG_CURRENT_GROUP]

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/records.py

@@ -9,11 +9,13 @@ import traceback
 from urllib.parse import urlparse
 from typing import Dict, List, Tuple, Union
 
+from httpdbg.env import HTTPDBG_CURRENT_GROUP
 from httpdbg.env import HTTPDBG_CURRENT_INITIATOR
 from httpdbg.env import HTTPDBG_CURRENT_TAG
 from httpdbg.utils import HTTPDBGCookie
 from httpdbg.utils import HTTPDBGHeader
 from httpdbg.initiator import in_lib
+from httpdbg.initiator import Group
 from httpdbg.initiator import Initiator
 from httpdbg.preview import generate_preview
 from httpdbg.utils import get_new_uuid
@@ -214,13 +216,14 @@ class HTTPRecord:
         self.id = get_new_uuid()
         self.address: Tuple[str, int] = ("", 0)
         self._url: Union[str, None] = None
-        self.initiator: Initiator = Initiator("", "", None, "", [])
+        self.initiator_id: Union[str, None] = None
         self.exception: Union[Exception, None] = None
         self.request: HTTPRecordRequest = HTTPRecordRequest()
         self.response: HTTPRecordResponse = HTTPRecordResponse()
         self.ssl: Union[bool, None] = None
         self.tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
-        self.tag = os.environ.get(HTTPDBG_CURRENT_TAG)
+        self.tag: Union[str, None] = os.environ.get(HTTPDBG_CURRENT_TAG)
+        self.group_id: Union[str, None] = os.environ.get(HTTPDBG_CURRENT_GROUP)
         if tbegin:
             self.tbegin = tbegin
 
@@ -295,10 +298,12 @@ class HTTPRecords:
         self.reset()
 
     def reset(self) -> None:
+        logger().info("HTTPRecords.reset")
         self.id = get_new_uuid()
         self.requests: Dict[str, HTTPRecord] = {}
         self.requests_already_loaded = 0
-        self._initiators: Dict[str, Initiator] = {}
+        self.initiators: Dict[str, Initiator] = {}
+        self.groups: Dict[str, Group] = {}
         self._sockets: Dict[int, SocketRawData] = {}
 
     @property
@@ -311,11 +316,11 @@ class HTTPRecords:
     def __len__(self) -> int:
         return len(self.requests)
 
-    def get_initiator(self) -> Initiator:
+    def get_initiator(self) -> str:
         envname = f"{HTTPDBG_CURRENT_INITIATOR}_{self.id}"
 
         if envname in os.environ:
-            initiator = self._initiators[os.environ[envname]]
+            initiator = self.initiators[os.environ[envname]]
         else:
             fullstack = traceback.format_stack()
             stack: List[str] = []
@@ -324,23 +329,13 @@ class HTTPRecords:
                     break
                 stack.append(line)
             long_label = stack[-1]
-            short_label = long_label.split("\n")[1]
-            initiator = Initiator(get_new_uuid(), short_label, None, long_label, stack)
-
-        if ("PYTEST_CURRENT_TEST" in os.environ) and (
-            "HTTPDBG_PYTEST_PLUGIN" not in os.environ
-        ):
-            long_label = " ".join(os.environ["PYTEST_CURRENT_TEST"].split(" ")[:-1])
-            short_label = long_label.split("::")[-1]
-            initiator = Initiator(
-                f"{long_label}{self.id}",
-                short_label,
-                long_label,
-                initiator.short_stack,
-                initiator.stack,
-            )
-
-        return initiator
+            label = long_label.split("\n")[1]
+            initiator = Initiator(get_new_uuid(), label, long_label, stack)
+
+        if initiator.id not in self.initiators:
+            self.initiators[initiator.id] = initiator
+
+        return initiator.id
 
     def get_socket_data(
         self, obj, extra_sock=None, force_new=False, request=None
@@ -417,9 +412,11 @@ class HTTPRecords:
     def add_new_record_exception(
         self, initiator: Initiator, url: str, exception: Exception
     ) -> HTTPRecord:
+        if initiator.id not in self.initiators:
+            self.initiators[initiator.id] = initiator
         new_record = HTTPRecord()
         new_record.url = url
-        new_record.initiator = initiator
+        new_record.initiator_id = initiator.id
         new_record.exception = exception
         self.requests[new_record.id] = new_record
         return new_record

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/webapp/api.py

@@ -21,7 +21,8 @@ class RequestPayload(JSONEncoder):
             "response": None,
             "exception": None,
             "tag": req.tag,
-            "initiator": req.initiator.to_json(),
+            "initiator_id": req.initiator_id,
+            "group_id": req.group_id,
             "in_progress": req.in_progress,
         }
 
@@ -64,7 +65,12 @@ class RequestListPayload(JSONEncoder):
             records, HTTPRecords
         ), "This encoder works only for HTTPRecords object."
 
-        payload = {"id": records.id, "requests": {}}
+        payload = {
+            "id": records.id,
+            "requests": {},
+            "initiators": {},
+            "groups": {},
+        }
 
         for id, req in records.requests.items():
             payload["requests"][id] = {
@@ -76,10 +82,17 @@ class RequestListPayload(JSONEncoder):
                 "reason": req.reason,
                 "verb": req.method,
                 "tag": req.tag,
-                "initiator": req.initiator.to_json(full=False),
+                "initiator_id": req.initiator_id,
+                "group_id": req.group_id,
                 "in_progress": req.in_progress,
                 "tbegin": req.tbegin.isoformat(),
                 "last_update": req.last_update.isoformat(),
             }
 
+        for id, initiator in records.initiators.items():
+            payload["initiators"][id] = initiator.to_json()
+
+        for id, group in records.groups.items():
+            payload["groups"][id] = group.to_json()
+
         return payload

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/webapp/static/api.js

@@ -3,8 +3,10 @@
 const global = {
     "k7": null,
     "requests": {},
+    "initiators": {},
+    "groups": {},    
     "connected": false,
-    "initiator_collapse": []
+    "group_collapse": []
 }
 
 function save_request(request_id, request) {
@@ -18,6 +20,8 @@ function save_request(request_id, request) {
     }
     global.requests[request_id] = request;
 
+    global.requests[request_id].initiator = global.initiators[request.initiator_id];
+
     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 {
@@ -62,6 +66,11 @@ async function get_all_requests() {
                 clean();
             };
 
+            // 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
@@ -109,7 +118,7 @@ async function get_request(request_id) {
             }
 
             // the full stack is not present in request summary
-            global.requests[request_id].initiator = data.initiator;
+            global.requests[request_id].initiator_id = data.initiator_id;
 
             global.requests[request_id].to_refresh = true;
 

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/webapp/static/configuration.js

@@ -33,7 +33,7 @@ function apply_config() {
     }
 
     apply_config_rule_css(httpdbgApp.config.hide_netloc, sheet);
-    apply_config_rule_css(httpdbgApp.config.hide_initiator, sheet);
+    apply_config_rule_css(httpdbgApp.config.hide_group, sheet);
     apply_config_rule_css(httpdbgApp.config.hide_tag, sheet);
 
     apply_config_rule_click(httpdbgApp.config.details_wrap_default);
@@ -48,7 +48,7 @@ function load_config_from_url(apply) {
     const params = new URLSearchParams(window.location.search);
 
     load_config_rule_from_url(httpdbgApp.config.hide_netloc, params);
-    load_config_rule_from_url(httpdbgApp.config.hide_initiator, params);
+    load_config_rule_from_url(httpdbgApp.config.hide_group, params);
     load_config_rule_from_url(httpdbgApp.config.hide_tag, params);
     load_config_rule_from_url(httpdbgApp.config.details_wrap_default, params);
     load_config_rule_from_url(httpdbgApp.config.details_raw_default, params);
@@ -66,7 +66,7 @@ function load_config_from_form(apply) {
     const params = new URLSearchParams(window.location.search);
 
     load_config_rule_from_form(httpdbgApp.config.hide_netloc);
-    load_config_rule_from_form(httpdbgApp.config.hide_initiator);
+    load_config_rule_from_form(httpdbgApp.config.hide_group);
     load_config_rule_from_form(httpdbgApp.config.hide_tag);
     load_config_rule_from_form(httpdbgApp.config.details_wrap_default);
     load_config_rule_from_form(httpdbgApp.config.details_raw_default);

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/webapp/static/filter.js

@@ -12,46 +12,46 @@ function update_filter_url() {
     if (value == "") {
         // if there is no filter, all rows are visible
         sheet.insertRule("[data-filter] {display: table-row;}");
-        sheet.insertRule(".initiator-header {display: table-row-group;}");
+        sheet.insertRule(".group-header {display: table-row-group;}");
     } else {
         // if there is a filter, only the requests that match the filter are visible
         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*="' + value + '"]) {display: table-row-group;}');
+            // a group row is visible only if it contains at least one visible request
+            sheet.insertRule('.group-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*="' + 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;}");
+            // in case :has is not supported, the group rows are always visible
+            sheet.insertRule(".group-header {display: table-row-group;}");
         }
     }
 
     filter_requests_count();
 }
 
-function collapse_initiator(initiator_id, collapse) {
+function collapse_group(group_id, collapse) {
     if (collapse) {
-        global.initiator_collapse.push(initiator_id);
+        global.group_collapse.push(group_id);
     } else {
-        let index = global.initiator_collapse.indexOf(initiator_id);
+        let index = global.group_collapse.indexOf(group_id);
         if (index !== -1) {
-            global.initiator_collapse.splice(index, 1);
+            global.group_collapse.splice(index, 1);
         }
     }
 
-    update_collapse_initiator();
+    update_collapse_group();
 }
 
-function update_collapse_initiator() {
-    var sheet = document.getElementById("collapseinitiatorcss").sheet;
+function update_collapse_group() {
+    var sheet = document.getElementById("collapsegroupcss").sheet;
 
     while (sheet.cssRules.length > 0) {
         sheet.deleteRule(0);
     }
 
-    for (let initiator_id of global.initiator_collapse) {
-        sheet.insertRule('[data-initiator="' + initiator_id + '"] {display: none;}');
+    for (let group_id of global.group_collapse) {
+        sheet.insertRule('[data-group="' + group_id + '"] {display: none;}');
     }
 }
 

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/webapp/static/index.htm

@@ -17,7 +17,7 @@
     <style type="text/css" id="filter"></style>
     <style type="text/css" id="configurationcss"></style>
     <style type="text/css" id="serverstatuscss"></style>
-    <style type="text/css" id="collapseinitiatorcss"></style>
+    <style type="text/css" id="collapsegroupcss"></style>
     <script src="static/mustache.min.js-+-$**HTTPDBG_VERSION**$"></script>
     <script src="static/main.js-+-$**HTTPDBG_VERSION**$"></script>
     <script src="static/api.js-+-$**HTTPDBG_VERSION**$"></script>
@@ -67,7 +67,7 @@
                         <br>
 
                         <input type="checkbox" id="cinitiator" name="hi" onchange="load_config_from_form(true)">
-                        <label for="cinitiator">Hide the initiator rows</label>
+                        <label for="cinitiator">Hide the group rows</label>
 
                         <br>
 
@@ -158,15 +158,15 @@
                     </tr>
                 </thead>
 
-                <script id="template_initiator" type="x-tmpl-mustache">
-                    <tbody id="initiator-{{initiator.id}}" name="initiator" class="initiator-header">
-                        <tr class="initiator">
+                <script id="template_group" type="x-tmpl-mustache">
+                    <tbody id="group-{{id}}" name="group" class="group-header">
+                        <tr class="group">
                             <td class="collapse" onclick="event.stopPropagation();">
-                                <input class="collapse-checkbox" type="checkbox" id="collapse{{initiator.id}}" onclick="collapse_initiator('{{initiator.id}}',this.checked)">
-                                <label class="collapse-icon" for="collapse{{initiator.id}}"><img class="icon" src="static/icons/chevron-direction-top-outline-icon.svg-+-$**HTTPDBG_VERSION**$" alt="click to collapse/expand"/></label>
+                                <input class="collapse-checkbox" type="checkbox" id="collapse{{id}}" onclick="collapse_group('{{id}}',this.checked)">
+                                <label class="collapse-icon" for="collapse{{id}}"><img class="icon" src="static/icons/chevron-direction-top-outline-icon.svg-+-$**HTTPDBG_VERSION**$" alt="click to collapse/expand"/></label>
                             </td>
-                            <td colspan="3" class="initiator-label" title="{{initiator.long_label}}">
-                                {{initiator.short_label}}
+                            <td colspan="3" class="group-label" title="{{full_label}}">
+                                {{label}}
                             </td>
                         </tr>
                     </tbody>
@@ -175,7 +175,7 @@
                 <script id="template_request" type="x-tmpl-mustache">
                     <tr id="request-{{id}}"
                         data-filter="{{filter}}"
-                        data-initiator="{{initiator.id}}"
+                        data-group="{{group_id}}"
                         onclick="select_request(arguments[0], '{{id}}')"
                         onkeypress="shortcut_request(event, '{{id}}')"
                         class="request"

{httpdbg-0.28.3 → httpdbg-0.29.0}/httpdbg/webapp/static/main.js

@@ -2,7 +2,7 @@
 
 let httpdbgApp = {
     "config": {
-        "hide_initiator": {
+        "hide_group": {
             "checkbox": "cinitiator",
             "param": "hi",
             "css": ".initiator {display: none;}",