From 65a19df4beec9ef614a337a7577a76adc9fbec6d Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 12 Dec 2025 08:03:39 +0800 Subject: [PATCH] fix(backend): correct generic type parameter in withHeaderCarrier helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: The withHeaderCarrier generic function had a type mismatch that caused compilation errors in CI. The function used `T proto.Message` constraint, but Connect's Response type expects the non-pointer message type while protobuf methods return pointers. Error from CI: type T of resp does not match *T (cannot infer T) This occurred because: - Connect methods expect: *connect.Response[v1pb.CreateSessionResponse] - Service methods return: (*v1pb.CreateSessionResponse, error) - Old signature: fn func(context.Context) (T, error) with T proto.Message - This caused T to be inferred as *v1pb.CreateSessionResponse - Leading to return type: *connect.Response[*v1pb.CreateSessionResponse] (wrong!) Solution: Changed generic signature to explicitly handle the pointer/non-pointer distinction: - New signature: fn func(context.Context) (*T, error) with T any - T is now the non-pointer type (e.g., v1pb.CreateSessionResponse) - fn returns *T (e.g., *v1pb.CreateSessionResponse) - Return type is correctly: *connect.Response[T] (e.g., *connect.Response[v1pb.CreateSessionResponse]) Also removed unused "google.golang.org/protobuf/proto" import and improved documentation to clarify the T vs *T distinction. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 --- server/router/api/v1/connect_services.go | 8 ++++---- server/router/api/v1/header_carrier.go | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/server/router/api/v1/connect_services.go b/server/router/api/v1/connect_services.go index ea89603f2..92cebd93d 100644 --- a/server/router/api/v1/connect_services.go +++ b/server/router/api/v1/connect_services.go @@ -42,23 +42,23 @@ func (s *ConnectServiceHandler) UpdateInstanceSetting(ctx context.Context, req * // AuthService // // Auth service methods need special handling for response headers (cookies). -// We use withHeaderCarrier helper to inject a header carrier into the context, +// We use connectWithHeaderCarrier helper to inject a header carrier into the context, // which allows the service to set headers in a protocol-agnostic way. func (s *ConnectServiceHandler) GetCurrentSession(ctx context.Context, req *connect.Request[v1pb.GetCurrentSessionRequest]) (*connect.Response[v1pb.GetCurrentSessionResponse], error) { - return withHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.GetCurrentSessionResponse, error) { + return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.GetCurrentSessionResponse, error) { return s.APIV1Service.GetCurrentSession(ctx, req.Msg) }) } func (s *ConnectServiceHandler) CreateSession(ctx context.Context, req *connect.Request[v1pb.CreateSessionRequest]) (*connect.Response[v1pb.CreateSessionResponse], error) { - return withHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) { + return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) { return s.APIV1Service.CreateSession(ctx, req.Msg) }) } func (s *ConnectServiceHandler) DeleteSession(ctx context.Context, req *connect.Request[v1pb.DeleteSessionRequest]) (*connect.Response[emptypb.Empty], error) { - return withHeaderCarrier(ctx, func(ctx context.Context) (*emptypb.Empty, error) { + return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*emptypb.Empty, error) { return s.APIV1Service.DeleteSession(ctx, req.Msg) }) } diff --git a/server/router/api/v1/header_carrier.go b/server/router/api/v1/header_carrier.go index 2cc5b1b9e..7aa806948 100644 --- a/server/router/api/v1/header_carrier.go +++ b/server/router/api/v1/header_carrier.go @@ -6,7 +6,6 @@ import ( "connectrpc.com/connect" "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "google.golang.org/protobuf/proto" ) // headerCarrierKey is the context key for storing headers to be set in the response. @@ -86,19 +85,22 @@ func SetResponseHeader(ctx context.Context, key, value string) error { })) } -// withHeaderCarrier is a helper for Connect service wrappers that need to set response headers. +// connectWithHeaderCarrier is a helper for Connect service wrappers that need to set response headers. // // It injects a HeaderCarrier into the context, calls the service method, // and applies any headers from the carrier to the Connect response. // +// The generic parameter T is the non-pointer protobuf message type (e.g., v1pb.CreateSessionResponse), +// while fn returns *T (the pointer type) as is standard for protobuf messages. +// // Usage in Connect wrappers: // -// func (s *ConnectServiceHandler) CreateSession(ctx context.Context, req *connect.Request[...]) (*connect.Response[...], error) { -// return withHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) { +// func (s *ConnectServiceHandler) CreateSession(ctx context.Context, req *connect.Request[v1pb.CreateSessionRequest]) (*connect.Response[v1pb.CreateSessionResponse], error) { +// return connectWithHeaderCarrier(ctx, func(ctx context.Context) (*v1pb.CreateSessionResponse, error) { // return s.APIV1Service.CreateSession(ctx, req.Msg) // }) // } -func withHeaderCarrier[T proto.Message](ctx context.Context, fn func(context.Context) (T, error)) (*connect.Response[T], error) { +func connectWithHeaderCarrier[T any](ctx context.Context, fn func(context.Context) (*T, error)) (*connect.Response[T], error) { // Inject header carrier for Connect protocol ctx = WithHeaderCarrier(ctx)