Skip to content

refactor: replace concrete client with doer interface #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DMwangnima merged 1 commit into from
Dec 17, 2025
Merged

refactor: replace concrete client with doer interface #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions reverse_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ import (
"unsafe"

"github.com/cloudwego/hertz/pkg/app"
"github.com/cloudwego/hertz/pkg/app/client"
hzclient "github.com/cloudwego/hertz/pkg/app/client"
"github.com/cloudwego/hertz/pkg/common/config"
"github.com/cloudwego/hertz/pkg/common/hlog"
"github.com/cloudwego/hertz/pkg/protocol"
"github.com/cloudwego/hertz/pkg/protocol/client"
"github.com/cloudwego/hertz/pkg/protocol/consts"
)

type ReverseProxy struct {
client *client.Client
client client.Doer

clientBehavior clientBehavior

Expand Down Expand Up @@ -118,7 +119,7 @@ func NewSingleHostReverseProxy(target string, options ...config.ClientOption) (*
req.Header.SetHostBytes(req.URI().Host())
},
}
c, err := client.NewClient(options...)
c, err := hzclient.NewClient(options...)
if err != nil {
return nil, err
}
Expand All @@ -129,8 +130,11 @@ func NewSingleHostReverseProxy(target string, options ...config.ClientOption) (*
func JoinURLPath(req *protocol.Request, target string) (path []byte) {
aslash := req.URI().Path()[0] == '/'
var bslash bool
if strings.HasPrefix(target, "http") {
// absolute path

isAbsolute := strings.Contains(target, "://")

if isAbsolute {
// absolute path (http, https, sd, etc.)
bslash = strings.HasSuffix(target, "/")
} else {
// default redirect to local
Expand Down Expand Up @@ -320,7 +324,7 @@ func (r *ReverseProxy) SetDirector(director func(req *protocol.Request)) {
}

// SetClient use to customize client
func (r *ReverseProxy) SetClient(client *client.Client) {
func (r *ReverseProxy) SetClient(client client.Doer) {
r.client = client
}

Expand Down Expand Up @@ -358,13 +362,13 @@ func (r *ReverseProxy) doClientBehavior(ctx context.Context, req *protocol.Reque
switch r.clientBehavior.clientBehaviorType {
case doDeadline:
deadline := r.clientBehavior.param.(time.Time)
err = r.client.DoDeadline(ctx, req, resp, deadline)
err = client.DoDeadline(ctx, req, resp, deadline, r.client)
case doRedirects:
maxRedirectsCount := r.clientBehavior.param.(int)
err = r.client.DoRedirects(ctx, req, resp, maxRedirectsCount)
_, _, err = client.DoRequestFollowRedirects(ctx, req, resp, req.URI().String(), maxRedirectsCount, r.client)
case doTimeout:
timeout := r.clientBehavior.param.(time.Duration)
err = r.client.DoTimeout(ctx, req, resp, timeout)
err = client.DoTimeout(ctx, req, resp, timeout, r.client)
default:
err = r.client.Do(ctx, req, resp)
}
Expand Down
Loading