Merge pull request #11 from sleeyax/fix/header-ordering

fix: store headers as ordered pairs to preserve header ordering

Author: snapspecter

src/mitmproxy_mcp/core/recorder.py

@@ -14,6 +14,20 @@
 from .utils import get_safe_text
 
 
+def _parse_headers(raw: str) -> Dict[str, str]:
+    """Parse stored headers into a dict for backward compat.
+
+    Headers are stored as either:
+    - list of [key, value] pairs (new format, preserves order)
+    - dict (legacy format)
+    Returns a dict in both cases. Duplicate keys are collapsed (last wins).
+    """
+    parsed = json.loads(raw)
+    if isinstance(parsed, list):
+        return {k: v for k, v in parsed}
+    return parsed
+
+
 class SimpleRequest:
     def __init__(self, method: str, url: str, headers: Dict[str, str], body: Optional[str]):
         self.method = method
@@ -96,9 +110,21 @@ def save_flow(self, flow: http.HTTPFlow):
                     flow.request.url,
                     flow.request.method,
                     status_code,
-                    json.dumps(dict(flow.request.headers)),
+                    json.dumps(
+                        [
+                            [k.decode("latin-1"), v.decode("latin-1")]
+                            for k, v in flow.request.headers.fields
+                        ],
+                    ),
                     req_body,
-                    json.dumps(dict(flow.response.headers)) if flow.response else None,
+                    json.dumps(
+                        [
+                            [k.decode("latin-1"), v.decode("latin-1")]
+                            for k, v in flow.response.headers.fields
+                        ],
+                    )
+                    if flow.response
+                    else None,
                     resp_body,
                     flow.request.timestamp_start,
                     size,
@@ -128,7 +154,7 @@ def get_summary(
             for row in rows:
                 content_type = "unknown"
                 if row["response_headers"]:
-                    headers = json.loads(row["response_headers"])
+                    headers = _parse_headers(row["response_headers"])
                     content_type = headers.get(
                         "content-type",
                         headers.get("Content-Type", "unknown"),
@@ -156,8 +182,8 @@ def get_detail(self, flow_id: str) -> Optional[Dict[str, Any]]:
             if not row:
                 return None
 
-            req_headers = json.loads(row["request_headers"])
-            resp_headers = json.loads(row["response_headers"]) if row["response_headers"] else None
+            req_headers = _parse_headers(row["request_headers"])
+            resp_headers = _parse_headers(row["response_headers"]) if row["response_headers"] else None
 
             simple_request = SimpleRequest(
                 method=row["method"],
@@ -237,12 +263,12 @@ def get_all_for_analysis(self, limit: int = 1000) -> List[Dict[str, Any]]:
                         "request": {
                             "url": row["url"],
                             "method": row["method"],
-                            "headers": json.loads(row["request_headers"]),
+                            "headers": _parse_headers(row["request_headers"]),
                             "body": row["request_body"],
                         },
                         "response": {
                             "status_code": row["status_code"],
-                            "headers": json.loads(row["response_headers"])
+                            "headers": _parse_headers(row["response_headers"])
                             if row["response_headers"]
                             else {},
                             "body": row["response_body"],
@@ -272,12 +298,12 @@ def get_by_ids(self, flow_ids: List[str]) -> List[Dict[str, Any]]:
                         "request": {
                             "url": row["url"],
                             "method": row["method"],
-                            "headers": json.loads(row["request_headers"]),
+                            "headers": _parse_headers(row["request_headers"]),
                             "body": row["request_body"],
                         },
                         "response": {
                             "status_code": row["status_code"],
-                            "headers": json.loads(row["response_headers"])
+                            "headers": _parse_headers(row["response_headers"])
                             if row["response_headers"]
                             else {},
                             "body": row["response_body"],
@@ -376,7 +402,7 @@ def get_flow_object(self, flow_id: str) -> Optional[SimpleRequest]:
             if not row:
                 return None
 
-            headers = json.loads(row["request_headers"])
+            headers = _parse_headers(row["request_headers"])
             return SimpleRequest(
                 method=row["method"],
                 url=row["url"],