httpdbg 0.18.0__tar.gz → 0.19.0__tar.gz

{httpdbg-0.18.0 → httpdbg-0.19.0}/PKG-INFO

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

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/__init__.py

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

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/__main__.py

@@ -2,7 +2,7 @@
 import sys
 import time
 
-from httpdbg import VERSION
+from httpdbg import __version__
 from httpdbg.args import read_args
 from httpdbg.hooks.all import httprecord
 from httpdbg.server import httpdbg_srv
@@ -54,7 +54,7 @@ def pyhttpdbg(params, subparams, test_mode=False):
 def pyhttpdbg_entry_point(test_mode=False):
     params, subparams = read_args(sys.argv[1:])
     if params.version:
-        print(VERSION)
+        print(__version__)
     else:
         pyhttpdbg(params, subparams, test_mode=test_mode)
 

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/hooks/socket.py

@@ -197,7 +197,7 @@ def set_hook_for_socket_sendall(records, method):
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     logger.info("SENDALL - http detected")
-                    socketdata.record = HTTPRecord()
+                    socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
                     socketdata.record.initiator = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
@@ -238,7 +238,7 @@ def set_hook_for_socket_send(records, method):
                 socketdata.rawdata += bytes[:size]
                 http_detected = socketdata.http_detected()
                 if http_detected:
-                    socketdata.record = HTTPRecord()
+                    socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
                     socketdata.record.initiator = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl
@@ -295,7 +295,7 @@ def set_hook_for_sslobject_write(records, method):
                 socketdata.rawdata += bytes(buf[:size])
                 http_detected = socketdata.http_detected()
                 if http_detected:
-                    socketdata.record = HTTPRecord()
+                    socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
                     socketdata.record.initiator = records.get_initiator()
                     socketdata.record.address = socketdata.address
                     socketdata.record.ssl = socketdata.ssl

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/records.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import asyncio
 import asyncio.proactor_events
+import datetime
 import os
 import socket
 import ssl
-import time
 import traceback
 from urllib.parse import urlparse
 from typing import Dict, List, Tuple, Union
@@ -12,7 +12,6 @@ from typing import Dict, List, Tuple, Union
 from httpdbg.utils import HTTPDBGCookie
 from httpdbg.utils import HTTPDBGHeader
 from httpdbg.initiator import in_lib
-from httpdbg.initiator import compatible_path
 from httpdbg.initiator import Initiator
 from httpdbg.preview import generate_preview
 from httpdbg.utils import get_new_uuid
@@ -23,12 +22,13 @@ from httpdbg.utils import logger
 
 
 class SocketRawData(object):
-    def __init__(self, id: str, address: Tuple[str, int], ssl: bool) -> None:
+    def __init__(self, id: int, address: Tuple[str, int], ssl: bool) -> None:
         self.id = id
         self.address = address
         self.ssl = ssl
         self._rawdata = bytes()
         self.record = None
+        self.tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
 
     @property
     def rawdata(self) -> bytes:
@@ -64,7 +64,9 @@ class HTTPRecordReqResp(object):
         self.rawdata = bytes()
         self._rawheaders = bytes()
         self._headers: List[HTTPDBGHeader] = []
-        self.last_update = 0
+        self.last_update: datetime.datetime = datetime.datetime.now(
+            datetime.timezone.utc
+        )
 
     def get_header(self, name: str, default: str = "") -> str:
         for header in self.headers:
@@ -117,7 +119,7 @@ class HTTPRecordReqResp(object):
 
     def __setattr__(self, name, value):
         self.__dict__[name] = value
-        self.__dict__["last_update"] = int(time.time() * 1000)
+        self.__dict__["last_update"] = datetime.datetime.now(datetime.timezone.utc)
 
     @property
     def preview(self):
@@ -199,15 +201,18 @@ class HTTPRecordResponse(HTTPRecordReqResp):
 
 
 class HTTPRecord:
-    def __init__(self) -> None:
+    def __init__(self, tbegin: datetime.datetime = None) -> None:
         self.id = get_new_uuid()
         self.address: Tuple[str, int] = ("", 0)
         self._url: Union[str, None] = None
         self.initiator: Initiator = Initiator("", "", None, "", [])
-        self.exception = None
-        self.request = HTTPRecordRequest()
-        self.response = HTTPRecordResponse()
-        self.ssl = 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)
+        if tbegin:
+            self.tbegin = tbegin
 
     @property
     def url(self) -> str:
@@ -271,7 +276,7 @@ class HTTPRecord:
         return False
 
     @property
-    def last_update(self) -> int:
+    def last_update(self) -> datetime.datetime:
         return max(self.request.last_update, self.response.last_update)
 
 
@@ -284,7 +289,7 @@ class HTTPRecords:
         self.requests: Dict[str, HTTPRecord] = {}
         self.requests_already_loaded = 0
         self._initiators: Dict[str, Initiator] = {}
-        self._sockets: Dict[str, SocketRawData] = {}
+        self._sockets: Dict[int, SocketRawData] = {}
 
     @property
     def unread(self) -> int:
@@ -303,21 +308,14 @@ class HTTPRecords:
             initiator = self._initiators[os.environ[envname]]
         else:
             fullstack = traceback.format_stack()
-            if compatible_path("httpdbg/mode_script.py") in "".join(
-                fullstack
-            ):  # TODO: find another way the detect the mode
-                stack: List[str] = []
-                for line in fullstack[6:]:
-                    if in_lib(line):
-                        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
-                )
-            else:
-                initiator = Initiator(f"console{self.id}", "console", None, "", [])
+            stack: List[str] = []
+            for line in fullstack[6:]:
+                if in_lib(line):
+                    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
@@ -334,7 +332,9 @@ class HTTPRecords:
 
         return initiator
 
-    def get_socket_data(self, obj, extra_sock=None, force_new=False, request=None):
+    def get_socket_data(
+        self, obj, extra_sock=None, force_new=False, request=None
+    ) -> Union[SocketRawData, None]:
         socketdata = None
 
         if force_new:

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/webapp/api.py

@@ -76,7 +76,8 @@ class RequestListPayload(JSONEncoder):
                 "verb": req.method,
                 "initiator": req.initiator.to_json(full=False),
                 "in_progress": req.in_progress,
-                "last_update": req.last_update,
+                "tbegin": req.tbegin.isoformat(),
+                "last_update": req.last_update.isoformat(),
             }
 
         return payload

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/webapp/app.py

@@ -8,7 +8,7 @@ import os
 import re
 from urllib.parse import urlparse, parse_qs
 
-from httpdbg import VERSION
+from httpdbg import __version__
 from httpdbg.utils import logger
 from httpdbg.webapp.api import RequestListPayload, RequestPayload
 
@@ -92,7 +92,7 @@ class HttpbgHTTPRequestHandler(BaseHTTPRequestHandler):
                     )
 
                 filecontent = filecontent.replace(
-                    b"$**HTTPDBG_VERSION**$", VERSION.encode("utf-8")
+                    b"$**HTTPDBG_VERSION**$", __version__.encode("utf-8")
                 )
 
                 self.wfile.write(filecontent)

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/webapp/static/detail.css

@@ -28,10 +28,12 @@
 
 .header-cookie-key {
   color: var(--header-cookie-key-text);
+  font-family: monospace;
 }
 
 .header-cookie-value {
   color: var(--header-cookie-value-text);
+  font-family: monospace;
 }
 
 .tab {

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg/webapp/static/index.htm

@@ -229,8 +229,14 @@
                                 <script id="template_headers" type="x-tmpl-mustache">
                                        <b>{{ method }}</b> <a href="{{ url }}">{{ url }}</a>
                                        <hr>
-                                       <h4>status</h4>
-                                          {{ status_code }} {{ reason }}
+                                            <span class="header-cookie-key">status</span>:
+                                            <span class="header-cookie-value">{{ status_code }} {{ reason }}</span>
+                                            <br><br>
+                                            <span class="header-cookie-key">start</span>:
+                                            <span class="header-cookie-value">{{tbegin}}</span>   
+                                            <br>
+                                            <span class="header-cookie-key">end</span>:&nbsp;&nbsp;&nbsp;
+                                            <span class="header-cookie-value">{{last_update}}</span>   
                                        <hr>
                                        <h4>response headers</h4>
                                        {{#response}}

{httpdbg-0.18.0 → httpdbg-0.19.0}/httpdbg.egg-info/PKG-INFO

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

{httpdbg-0.18.0 → httpdbg-0.19.0}/pyproject.toml

@@ -34,7 +34,7 @@ packages = ["httpdbg", "httpdbg.hooks", "httpdbg.webapp"]
 httpdbg = ["webapp/static/*", "webapp/static/icons/*"]
 
 [tool.setuptools.dynamic]
-version = {attr = "httpdbg.VERSION"}
+version = {attr = "httpdbg.__version__"}
 
 [tool.mypy]
 no_implicit_optional = false

{httpdbg-0.18.0 → httpdbg-0.19.0}/tests/test_cli.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import pytest
 
-from httpdbg import VERSION
+from httpdbg import __version__
 from httpdbg.__main__ import pyhttpdbg_entry_point
 
 
@@ -11,4 +11,4 @@ def test_cli_version(monkeypatch, capsys):
 
     pyhttpdbg_entry_point(test_mode=True)
 
-    assert VERSION in capsys.readouterr().out.strip()
+    assert __version__ in capsys.readouterr().out.strip()