TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-01 09:32:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: rename HTTPRoute to ReverseProxyRoute to avoid confusion

Browse source
This commit is contained in:
yusing 2025-02-04 03:35:55 +08:00
parent ec148f036d
commit 503671bd1b
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/entrypoint/entrypoint_test.go
View file

@ -9,7 +9,7 @@ import (
) )
var ( var (
r route.HTTPRoute r route.ReveseProxyRoute
ep = NewEntrypoint() ep = NewEntrypoint()
) )

26
internal/route/http.go → internal/route/reverse_proxy.go
View file

@ -23,7 +23,7 @@ import (
) )
type ( type (
HTTPRoute struct { ReveseProxyRoute struct {
*Route *Route
HealthMon health.HealthMonitor `json:"health,omitempty"` HealthMon health.HealthMonitor `json:"health,omitempty"`
@ -41,7 +41,7 @@ type (
// var globalMux = http.NewServeMux() // TODO: support regex subdomain matching. // var globalMux = http.NewServeMux() // TODO: support regex subdomain matching.
func NewHTTPRoute(base *Route) (*HTTPRoute, E.Error) { func NewReverseProxyRoute(base *Route) (*ReveseProxyRoute, E.Error) {
trans := gphttp.DefaultTransport trans := gphttp.DefaultTransport
httpConfig := base.HTTPConfig httpConfig := base.HTTPConfig
@ -63,7 +63,7 @@ func NewHTTPRoute(base *Route) (*HTTPRoute, E.Error) {
} }
} }
r := &HTTPRoute{ r := &ReveseProxyRoute{
Route: base, Route: base,
rp: rp, rp: rp,
l: logging.With(). l: logging.With().
@ -74,12 +74,12 @@ func NewHTTPRoute(base *Route) (*HTTPRoute, E.Error) {
return r, nil return r, nil
} }
func (r *HTTPRoute) String() string { func (r *ReveseProxyRoute) String() string {
return r.TargetName() return r.TargetName()
} }
// Start implements task.TaskStarter. // Start implements task.TaskStarter.
func (r *HTTPRoute) Start(parent task.Parent) E.Error { func (r *ReveseProxyRoute) Start(parent task.Parent) E.Error {
r.task = parent.Subtask("http."+r.TargetName(), false) r.task = parent.Subtask("http."+r.TargetName(), false)
switch { switch {
@ -166,30 +166,30 @@ func (r *HTTPRoute) Start(parent task.Parent) E.Error {
} }
// Task implements task.TaskStarter. // Task implements task.TaskStarter.
func (r *HTTPRoute) Task() *task.Task { func (r *ReveseProxyRoute) Task() *task.Task {
return r.task return r.task
} }
// Finish implements task.TaskFinisher. // Finish implements task.TaskFinisher.
func (r *HTTPRoute) Finish(reason any) { func (r *ReveseProxyRoute) Finish(reason any) {
r.task.Finish(reason) r.task.Finish(reason)
} }
func (r *HTTPRoute) ServeHTTP(w http.ResponseWriter, req *http.Request) { func (r *ReveseProxyRoute) ServeHTTP(w http.ResponseWriter, req *http.Request) {
r.handler.ServeHTTP(w, req) r.handler.ServeHTTP(w, req)
} }
func (r *HTTPRoute) HealthMonitor() health.HealthMonitor { func (r *ReveseProxyRoute) HealthMonitor() health.HealthMonitor {
return r.HealthMon return r.HealthMon
} }
func (r *HTTPRoute) addToLoadBalancer(parent task.Parent) { func (r *ReveseProxyRoute) addToLoadBalancer(parent task.Parent) {
var lb *loadbalancer.LoadBalancer var lb *loadbalancer.LoadBalancer
cfg := r.LoadBalance cfg := r.LoadBalance
l, ok := routes.GetHTTPRoute(cfg.Link) l, ok := routes.GetHTTPRoute(cfg.Link)
var linked *HTTPRoute var linked *ReveseProxyRoute
if ok { if ok {
linked = l.(*HTTPRoute) linked = l.(*ReveseProxyRoute)
lb = linked.loadBalancer lb = linked.loadBalancer
lb.UpdateConfigIfNeeded(cfg) lb.UpdateConfigIfNeeded(cfg)
if linked.Homepage.IsEmpty() && !r.Homepage.IsEmpty() { if linked.Homepage.IsEmpty() && !r.Homepage.IsEmpty() {
@ -200,7 +200,7 @@ func (r *HTTPRoute) addToLoadBalancer(parent task.Parent) {
if err := lb.Start(parent); err != nil { if err := lb.Start(parent); err != nil {
panic(err) // should always return nil panic(err) // should always return nil
} }
linked = &HTTPRoute{ linked = &ReveseProxyRoute{
Route: &Route{ Route: &Route{
Alias: cfg.Link, Alias: cfg.Link,
Homepage: r.Homepage, Homepage: r.Homepage,

2
internal/route/route.go
View file

@ -102,7 +102,7 @@ func (r *Route) Start(parent task.Parent) (err E.Error) {
case types.SchemeFileServer: case types.SchemeFileServer:
r.impl, err = NewFileServer(r) r.impl, err = NewFileServer(r)
case types.SchemeHTTP, types.SchemeHTTPS: case types.SchemeHTTP, types.SchemeHTTPS:
r.impl, err = NewHTTPRoute(r) r.impl, err = NewReverseProxyRoute(r)
case types.SchemeTCP, types.SchemeUDP: case types.SchemeTCP, types.SchemeUDP:
r.impl, err = NewStreamRoute(r) r.impl, err = NewStreamRoute(r)
default: default: