httpclient Response object references original Request; refs #16685

lib/pure/httpclient.nim

@@ -210,19 +210,27 @@ import nativesockets
 export httpcore except parseHeader # TODO: The ``except`` doesn't work
 
 type
+  PreparedRequest* = object
+    reqMethod*: HttpMethod
+    headers*: HttpHeaders
+    url*: Uri
+    body*: string
+
   Response* = ref object
     version*: string
     status*: string
     headers*: HttpHeaders
     body: string
     bodyStream*: Stream
+    request*: PreparedRequest
 
   AsyncResponse* = ref object
     version*: string
     status*: string
     headers*: HttpHeaders
     body: string
     bodyStream*: FutureStream[string]
+    request*: PreparedRequest
 
 proc code*(response: Response | AsyncResponse): HttpCode
            {.raises: [ValueError, OverflowDefect].} =
@@ -896,10 +904,16 @@ proc newConnection(client: HttpClient | AsyncHttpClient,
         connectUrl.hostname = url.hostname
         connectUrl.port = if url.port != "": url.port else: "443"
 
+        let newHeaders = newHttpHeaders()
         let proxyHeaderString = generateHeaders(connectUrl, HttpConnect,
-            newHttpHeaders(), client.proxy)
+            newHeaders, client.proxy)
         await client.socket.send(proxyHeaderString)
         let proxyResp = await parseResponse(client, false)
+        proxyResp.request = PreparedRequest(
+          reqMethod: HttpConnect,
+          headers: newHeaders,
+          url: connectUrl,
+        )
 
         if not proxyResp.status.startsWith("200"):
           raise newException(HttpRequestError,
@@ -1019,6 +1033,12 @@ proc requestAux(client: HttpClient | AsyncHttpClient, url: Uri,
   let getBody = httpMethod notin {HttpHead, HttpConnect} and
                 client.getBody
   result = await parseResponse(client, getBody)
+  result.request = PreparedRequest(
+    reqMethod: httpMethod,
+    headers: newHeaders,
+    url: url,
+    body: body,
+  )
 
 proc request*(client: HttpClient | AsyncHttpClient, url: Uri | string,
               httpMethod: HttpMethod | string = HttpGet, body = "",

tests/stdlib/thttpclient.nim

@@ -8,7 +8,7 @@ discard """
 import strutils
 from net import TimeoutError
 
-import nativesockets, os, httpclient, asyncdispatch
+import nativesockets, os, httpclient, asyncdispatch, uri
 
 const manualTests = false
 
@@ -41,6 +41,10 @@ proc asyncTest() {.async.} =
   var client = newAsyncHttpClient()
   var resp = await client.request("http://example.com/", HttpGet)
   doAssert(resp.code.is2xx)
+  doAssert(resp.request.reqMethod == HttpGet)
+  doAssert($(resp.request.url) == "http://example.com/")
+  var clientAgent = $(resp.request.headers["user-agent"])
+  doAssert(clientAgent.contains("Nim httpclient"))
   var body = await resp.body
   body = await resp.body # Test caching
   doAssert("<title>Example Domain</title>" in body)
@@ -104,6 +108,10 @@ proc syncTest() =
   var client = newHttpClient()
   var resp = client.request("http://example.com/", HttpGet)
   doAssert(resp.code.is2xx)
+  doAssert(resp.request.reqMethod == HttpGet)
+  doAssert($(resp.request.url) == "http://example.com/")
+  var clientAgent = $(resp.request.headers["user-agent"])
+  doAssert(clientAgent.contains("Nim httpclient"))
   doAssert("<title>Example Domain</title>" in resp.body)
 
   resp = client.request("http://example.com/404")