Merge branch 'main' into service-handler-timeout

Author: R4R3D1FF

.github/workflows/ci.yaml

@@ -23,7 +23,7 @@ jobs:
           version: 1.24.x
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
       - name: Install Go
@@ -51,7 +51,7 @@ jobs:
           version: 1.24.x
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
       - name: Install Go
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
       - name: Install Go

.github/workflows/windows.yaml

@@ -23,7 +23,7 @@ jobs:
             version: 1.24.x
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
       - name: Install Go

.gitignore

@@ -1,5 +1,6 @@
 /.tmp/
 *.pprof
 *.svg
+.idea
 cover.out
 connect.test

client.go

@@ -82,6 +82,7 @@ func NewClient[Req, Res any](httpClient HTTPClient, url string, options ...Clien
 			callInfo, ok := clientCallInfoForContext(ctx)
 			if ok {
 				callInfo.method = r.Method
+				callInfo.responseSource = conn
 			}
 		})
 		// Send always returns an io.EOF unless the error is from the client-side.
@@ -139,12 +140,6 @@ func NewClient[Req, Res any](httpClient HTTPClient, url string, options ...Clien
 		if !ok {
 			return nil, errorf(CodeInternal, "unexpected client response type %T", response)
 		}
-		if callInfoOk {
-			// Wrap the response and set it into the context callinfo
-			callInfo.responseSource = &responseWrapper[Res]{
-				response: typed,
-			}
-		}
 		return typed, nil
 	}
 	return client
@@ -298,8 +293,8 @@ func (c *Client[Req, Res]) newConn(ctx context.Context, streamType StreamType, o
 		callInfo.spec = conn.Spec()
 		callInfo.responseSource = conn
 
-		// Merge any callInfo request headers first, then do the request.
-		// so that context headers show first in the list of headers
+		// Merge any callInfo request headers first, then do the request,
+		// so that context headers show first in the list of headers.
 		mergeHeaders(conn.RequestHeader(), callInfo.RequestHeader())
 	}