Merge pull request #1543 from mohamedsolaiman/feature/verbose-output

maurosoria · web-flow · commit 4bfdaf1a741d · 2026-04-28T14:54:10.000-03:00
Add --verbose/-v flag with response time and content type output
diff --git a/config.ini b/config.ini
@@ -74,6 +74,7 @@ quiet-mode = False
 color = True
 show-redirects-history = False
 disable-cli = False
+verbose = False
 
 [output]
 # Available: simple, plain, json, xml, md, csv, html, sqlite
diff --git a/lib/connection/requester.py b/lib/connection/requester.py
@@ -208,6 +208,7 @@ def request(self, path: str, proxy: str | None = None) -> Response:
                 prep = self.session.prepare_request(request)
                 prep.url = url
 
+                start_time = time.perf_counter()
                 origin_response = self.session.send(
                     prep,
                     allow_redirects=options["follow_redirects"],
@@ -216,6 +217,7 @@ def request(self, path: str, proxy: str | None = None) -> Response:
                     stream=True,
                 )
                 response = Response(url, origin_response)
+                response.elapsed = time.perf_counter() - start_time
 
                 log_msg = f'"{options["http_method"]} {response.url}" {response.status} - {response.length}B'
 
@@ -382,13 +384,17 @@ async def request(
                     extensions={"target": (url if replay else f"/{safequote(path)}").encode()},
                 )
 
+                start_time = time.perf_counter()
                 xresponse = await session.send(
                     request,
                     stream=True,
                     follow_redirects=options["follow_redirects"],
                 )
                 response = await AsyncResponse.create(url, xresponse)
                 await xresponse.aclose()
+                # Measure the whole streamed request lifecycle so sync and async
+                # modes report the same thing.
+                response.elapsed = time.perf_counter() - start_time
 
                 log_msg = f'"{options["http_method"]} {response.url}" {response.status} - {response.length}B'
 
diff --git a/lib/connection/response.py b/lib/connection/response.py
@@ -35,7 +35,7 @@
 
 
 class BaseResponse:
-    def __init__(self, url, response: requests.Response | httpx.Response) -> None:
+    def __init__(self, url, response: requests.Response | httpx.Response, elapsed: float = 0.0) -> None:
         self.datetime = time.strftime("%Y-%m-%d %H:%M:%S")
         self.url = url
         self.full_path = parse_path(self.url)
@@ -44,6 +44,7 @@ def __init__(self, url, response: requests.Response | httpx.Response) -> None:
         self.headers = response.headers
         self.redirect = self.headers.get("location", "")
         self.history = [str(res.url) for res in response.history]
+        self.elapsed = elapsed
         self.content = ""
         self.body = b""
 
@@ -80,8 +81,8 @@ def __eq__(self, other: Any) -> bool:
 
 
 class Response(BaseResponse):
-    def __init__(self, url, response: requests.Response) -> None:
-        super().__init__(url, response)
+    def __init__(self, url, response: requests.Response, elapsed: float = 0.0) -> None:
+        super().__init__(url, response, elapsed)
 
         for chunk in response.iter_content(chunk_size=ITER_CHUNK_SIZE):
             self.body += chunk
@@ -102,8 +103,8 @@ def __init__(self, url, response: requests.Response) -> None:
 
 class AsyncResponse(BaseResponse):
     @classmethod
-    async def create(cls, url, response: httpx.Response) -> AsyncResponse:
-        self = cls(url, response)
+    async def create(cls, url, response: httpx.Response, elapsed: float = 0.0) -> AsyncResponse:
+        self = cls(url, response, elapsed)
         async for chunk in response.aiter_bytes(chunk_size=ITER_CHUNK_SIZE):
             self.body += chunk
 
diff --git a/lib/core/data.py b/lib/core/data.py
@@ -98,6 +98,7 @@
     "color": True,
     "quiet": False,
     "disable_cli": False,
+    "verbose": False,
     "output_file": None,
     "output_table": None,
     "output_formats": None,
diff --git a/lib/core/options.py b/lib/core/options.py
@@ -545,6 +545,7 @@ def merge_config(opt: Values) -> Values:
     opt.color = opt.color if opt.color is False else config.safe_getboolean("view", "color", True)
     opt.quiet = opt.quiet or config.safe_getboolean("view", "quiet-mode")
     opt.disable_cli = opt.disable_cli or config.safe_getboolean("view", "disable-cli")
+    opt.verbose = opt.verbose or config.safe_getboolean("view", "verbose")
     opt.redirects_history = opt.redirects_history or config.safe_getboolean(
         "view", "show-redirects-history"
     )
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -539,6 +539,13 @@ def parse_arguments() -> Values:
     view.add_option(
         "--disable-cli", action="store_true", dest="disable_cli", help="Turn off command-line output"
     )
+    view.add_option(
+        "-v",
+        "--verbose",
+        action="store_true",
+        dest="verbose",
+        help="Show verbose output with response time and content type",
+    )
 
     # Output Settings
     output = OptionGroup(parser, "Output Settings")
diff --git a/lib/report/csv_report.py b/lib/report/csv_report.py
@@ -27,7 +27,7 @@ class CSVReport(FileReportMixin, BaseReport):
     __extension__ = "csv"
 
     def new(self):
-        return [["URL", "Status", "Size", "Content Type", "Redirection"]]
+        return [["URL", "Status", "Size", "Content Type", "Redirection", "Elapsed (s)"]]
 
     def parse(self, file):
         with open(file) as fh:
@@ -41,7 +41,8 @@ def parse(self, file):
     @locked
     def save(self, file, result):
         rows = self.parse(file)
-        rows.append([result.url, result.status, result.length, result.type, result.redirect])
+        elapsed = round(result.elapsed, 3) if result.elapsed else ""
+        rows.append([result.url, result.status, result.length, result.type, result.redirect, elapsed])
         self.write(file, rows)
 
     def write(self, file, rows):
diff --git a/lib/report/html_report.py b/lib/report/html_report.py
@@ -44,13 +44,16 @@ def parse(self, file):
     @locked
     def save(self, file, result):
         results = self.parse(file)
-        results.append({
+        entry = {
             "url": result.url,
             "status": result.status,
             "contentLength": result.length,
             "contentType": result.type,
             "redirect": result.redirect,
-        })
+        }
+        if result.elapsed:
+            entry["elapsed"] = round(result.elapsed, 3)
+        results.append(entry)
         self.write(file, self.generate(results))
 
     def generate(self, results):
diff --git a/lib/report/json_report.py b/lib/report/json_report.py
@@ -40,13 +40,16 @@ def parse(self, file):
     @locked
     def save(self, file, result):
         data = self.parse(file)
-        data["results"].append({
+        entry = {
             "url": result.url,
             "status": result.status,
             "contentLength": result.length,
             "contentType": result.type,
             "redirect": result.redirect,
-        })
+        }
+        if result.elapsed:
+            entry["elapsed"] = round(result.elapsed, 3)
+        data["results"].append(entry)
         self.write(file, data)
 
     def write(self, file, data):
diff --git a/lib/report/markdown_report.py b/lib/report/markdown_report.py
@@ -35,12 +35,13 @@ def new(self):
         header += NEW_LINE
         header += f"Time: {START_TIME}"
         header += NEW_LINE * 2
-        header += "URL | Status | Size | Content Type | Redirection" + NEW_LINE
-        header += "----|--------|------|--------------|------------" + NEW_LINE
+        header += "URL | Status | Size | Content Type | Redirection | Elapsed (ms)" + NEW_LINE
+        header += "----|--------|------|--------------|-------------|-------------" + NEW_LINE
         return header
 
     @locked
     def save(self, file, result):
         md = self.parse(file)
-        md += f"{result.url} | {result.status} | {result.length} | {result.type} | {result.redirect}" + NEW_LINE
+        elapsed_ms = int(result.elapsed * 1000) if result.elapsed else "-"
+        md += f"{result.url} | {result.status} | {result.length} | {result.type} | {result.redirect} | {elapsed_ms}" + NEW_LINE
         self.write(file, md)
diff --git a/lib/report/plain_text_report.py b/lib/report/plain_text_report.py
@@ -39,6 +39,10 @@ def save(self, file, result):
         data = self.parse(file)
         data += f"{result.status} {readable_size.rjust(6, chr(32))} {result.url}"
 
+        if result.elapsed:
+            elapsed_ms = int(result.elapsed * 1000)
+            data += f"  ({elapsed_ms}ms)"
+
         if result.redirect:
             data += f"  ->  {result.redirect}"
 
diff --git a/lib/report/xml_report.py b/lib/report/xml_report.py
@@ -45,6 +45,8 @@ def save(self, file, result):
         ET.SubElement(target, "contentLength").text = str(result.length)
         ET.SubElement(target, "contentType").text = result.type
         ET.SubElement(target, "redirect").text = result.redirect
+        if result.elapsed:
+            ET.SubElement(target, "elapsed").text = str(round(result.elapsed, 3))
         self.write(file, root)
 
     def write(self, file, root):
diff --git a/lib/view/terminal.py b/lib/view/terminal.py
@@ -91,6 +91,11 @@ def status_report(self, response, full_url):
         time = response.datetime.split()[1]
         message = f"[{time}] {response.status} - {response.size.rjust(6, ' ')} - {target}"
 
+        if options["verbose"]:
+            elapsed_ms = int(response.elapsed * 1000) if response.elapsed else 0
+            content_type = response.type
+            message += f"  ({elapsed_ms}ms, {content_type})"
+
         if response.status in (200, 201, 204):
             message = set_color(message, fore="green")
         elif response.status == 401:
diff --git a/tests/connection/test_requester.py b/tests/connection/test_requester.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+#  MA 02110-1301, USA.
+#
+#  Author: Mauro Soria
+
+from types import SimpleNamespace
+from unittest import IsolatedAsyncioTestCase, TestCase
+from unittest.mock import patch
+
+from lib.connection import requester as requester_module
+from lib.connection.requester import AsyncRequester, Requester
+
+
+class DummySyncResponse:
+    status_code = 200
+    headers = {"content-type": "text/plain"}
+    history = []
+    encoding = "utf-8"
+
+    @staticmethod
+    def iter_content(chunk_size):
+        del chunk_size
+        yield b"body"
+
+
+class DummySyncSession:
+    @staticmethod
+    def prepare_request(request):
+        return SimpleNamespace(url=request.url)
+
+    def __init__(self, response):
+        self.response = response
+
+    def send(self, prep, **kwargs):
+        del prep, kwargs
+        return self.response
+
+
+class DummyAsyncResponse:
+    status_code = 200
+    headers = {"content-type": "text/plain"}
+    history = []
+    encoding = "utf-8"
+
+    def __init__(self):
+        self.closed = False
+
+    @staticmethod
+    async def aiter_bytes(chunk_size):
+        del chunk_size
+        yield b"body"
+
+    async def aclose(self):
+        self.closed = True
+
+
+class DummyAsyncSession:
+    @staticmethod
+    def build_request(*args, **kwargs):
+        del args, kwargs
+        return object()
+
+    def __init__(self, response):
+        self.response = response
+
+    async def send(self, request, **kwargs):
+        del request, kwargs
+        return self.response
+
+
+class TestRequesterElapsed(TestCase):
+    def test_request_elapsed_includes_stream_read(self):
+        requester = object.__new__(Requester)
+        requester._rate = 0
+        requester._url = "https://example.com/"
+        requester.proxy_cred = None
+        requester.headers = {}
+        requester.agents = []
+        requester.session = DummySyncSession(DummySyncResponse())
+
+        with patch.object(requester_module.time, "perf_counter", side_effect=[10.0, 10.25]):
+            with patch.object(requester_module.logger, "info"):
+                response = requester.request("admin")
+
+        self.assertEqual(response.elapsed, 0.25, "Sync elapsed should measure the full streamed request lifecycle")
+
+
+class TestAsyncRequesterElapsed(IsolatedAsyncioTestCase):
+    async def test_request_elapsed_waits_for_stream_close(self):
+        requester = object.__new__(AsyncRequester)
+        requester._rate = 0
+        requester._url = "https://example.com/"
+        requester.proxy_cred = None
+        requester.headers = {}
+        requester.agents = []
+        requester.session = DummyAsyncSession(DummyAsyncResponse())
+
+        with patch.object(requester_module.time, "perf_counter", side_effect=[20.0, 20.5]):
+            with patch.object(requester_module.logger, "info"):
+                response = await requester.request("admin")
+
+        self.assertEqual(response.elapsed, 0.5, "Async elapsed should measure the full streamed request lifecycle")
+        self.assertTrue(requester.session.response.closed, "Streamed async responses should be closed before elapsed is used")

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,7 @@ def merge_config(opt: Values) -> Values:`
`545`	`545`	`opt.color = opt.color if opt.color is False else config.safe_getboolean("view", "color", True)`
`546`	`546`	`opt.quiet = opt.quiet or config.safe_getboolean("view", "quiet-mode")`
`547`	`547`	`opt.disable_cli = opt.disable_cli or config.safe_getboolean("view", "disable-cli")`
	`548`	`+ opt.verbose = opt.verbose or config.safe_getboolean("view", "verbose")`
`548`	`549`	`opt.redirects_history = opt.redirects_history or config.safe_getboolean(`
`549`	`550`	`"view", "show-redirects-history"`
`550`	`551`	`)`