From 7d17a01de195eca0e09375e734443b616739a549 Mon Sep 17 00:00:00 2001 From: yusing Date: Sat, 14 Jun 2025 20:04:39 +0800 Subject: [PATCH] refactor(agent): move agent pool to agent package, rename route.Agent() to route.GetAgent() --- internal/api/v1/agents.go | 8 ++--- internal/api/v1/dockerapi/utils.go | 5 +-- internal/api/v1/new_agent.go | 2 +- internal/api/v1/system_info.go | 5 ++- internal/config/{agent_pool.go => agents.go} | 35 ++------------------ internal/config/config.go | 5 +-- internal/config/types/config.go | 2 -- internal/docker/client.go | 3 +- internal/docker/container.go | 3 +- internal/route/reverse_proxy.go | 2 +- internal/route/route.go | 4 +-- internal/route/routes/route.go | 2 +- internal/watcher/health/monitor/monitor.go | 2 +- 13 files changed, 23 insertions(+), 55 deletions(-) rename internal/config/{agent_pool.go => agents.go} (51%) diff --git a/internal/api/v1/agents.go b/internal/api/v1/agents.go index 0579247..b90d9aa 100644 --- a/internal/api/v1/agents.go +++ b/internal/api/v1/agents.go @@ -5,18 +5,18 @@ import ( "time" "github.com/gorilla/websocket" - config "github.com/yusing/go-proxy/internal/config/types" + "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal/net/gphttp" "github.com/yusing/go-proxy/internal/net/gphttp/gpwebsocket" "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" ) -func ListAgents(cfg config.ConfigInstance, w http.ResponseWriter, r *http.Request) { +func ListAgents(w http.ResponseWriter, r *http.Request) { if httpheaders.IsWebsocket(r.Header) { gpwebsocket.Periodic(w, r, 10*time.Second, func(conn *websocket.Conn) error { - return conn.WriteJSON(cfg.ListAgents()) + return conn.WriteJSON(agent.ListAgents()) }) } else { - gphttp.RespondJSON(w, r, cfg.ListAgents()) + gphttp.RespondJSON(w, r, agent.ListAgents()) } } diff --git a/internal/api/v1/dockerapi/utils.go b/internal/api/v1/dockerapi/utils.go index 6cfd326..8567bf6 100644 --- a/internal/api/v1/dockerapi/utils.go +++ b/internal/api/v1/dockerapi/utils.go @@ -7,6 +7,7 @@ import ( "time" "github.com/gorilla/websocket" + "github.com/yusing/go-proxy/agent/pkg/agent" config "github.com/yusing/go-proxy/internal/config/types" "github.com/yusing/go-proxy/internal/docker" "github.com/yusing/go-proxy/internal/gperr" @@ -43,7 +44,7 @@ func getDockerClients() (DockerClients, gperr.Error) { dockerClients[name] = dockerClient } - for _, agent := range cfg.ListAgents() { + for _, agent := range agent.ListAgents() { dockerClient, err := docker.NewClient(agent.FakeDockerHost()) if err != nil { connErrs.Add(err) @@ -65,7 +66,7 @@ func getDockerClient(server string) (*docker.SharedClient, bool, error) { } } if host == "" { - for _, agent := range cfg.ListAgents() { + for _, agent := range agent.ListAgents() { if agent.Name() == server { host = agent.FakeDockerHost() break diff --git a/internal/api/v1/new_agent.go b/internal/api/v1/new_agent.go index 46a1f7b..6d99d22 100644 --- a/internal/api/v1/new_agent.go +++ b/internal/api/v1/new_agent.go @@ -39,7 +39,7 @@ func NewAgent(w http.ResponseWriter, r *http.Request) { return } hostport := fmt.Sprintf("%s:%d", host, port) - if _, ok := config.GetInstance().GetAgent(hostport); ok { + if _, ok := agent.GetAgent(hostport); ok { gphttp.KeyAlreadyExists(w, "agent", hostport) return } diff --git a/internal/api/v1/system_info.go b/internal/api/v1/system_info.go index fd60dfc..2056c4d 100644 --- a/internal/api/v1/system_info.go +++ b/internal/api/v1/system_info.go @@ -4,7 +4,6 @@ import ( "net/http" agentPkg "github.com/yusing/go-proxy/agent/pkg/agent" - config "github.com/yusing/go-proxy/internal/config/types" "github.com/yusing/go-proxy/internal/gperr" "github.com/yusing/go-proxy/internal/metrics/systeminfo" "github.com/yusing/go-proxy/internal/net/gphttp" @@ -13,7 +12,7 @@ import ( nettypes "github.com/yusing/go-proxy/internal/net/types" ) -func SystemInfo(cfg config.ConfigInstance, w http.ResponseWriter, r *http.Request) { +func SystemInfo(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() agentAddr := query.Get("agent_addr") query.Del("agent_addr") @@ -22,7 +21,7 @@ func SystemInfo(cfg config.ConfigInstance, w http.ResponseWriter, r *http.Reques return } - agent, ok := cfg.GetAgent(agentAddr) + agent, ok := agentPkg.GetAgent(agentAddr) if !ok { gphttp.NotFound(w, "agent_addr") return diff --git a/internal/config/agent_pool.go b/internal/config/agents.go similarity index 51% rename from internal/config/agent_pool.go rename to internal/config/agents.go index 33e34b2..26703d4 100644 --- a/internal/config/agent_pool.go +++ b/internal/config/agents.go @@ -6,31 +6,8 @@ import ( "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal/gperr" "github.com/yusing/go-proxy/internal/route/provider" - "github.com/yusing/go-proxy/internal/utils/functional" ) -var agentPool = functional.NewMapOf[string, *agent.AgentConfig]() - -func addAgent(agent *agent.AgentConfig) { - agentPool.Store(agent.Addr, agent) -} - -func removeAllAgents() { - agentPool.Clear() -} - -func GetAgent(addr string) (agent *agent.AgentConfig, ok bool) { - agent, ok = agentPool.Load(addr) - return -} - -func (cfg *Config) GetAgent(agentAddrOrDockerHost string) (*agent.AgentConfig, bool) { - if !agent.IsDockerHostAgent(agentAddrOrDockerHost) { - return GetAgent(agentAddrOrDockerHost) - } - return GetAgent(agent.GetAgentAddrFromDockerHost(agentAddrOrDockerHost)) -} - func (cfg *Config) VerifyNewAgent(host string, ca agent.PEMPair, client agent.PEMPair) (int, gperr.Error) { if slices.ContainsFunc(cfg.value.Providers.Agents, func(a *agent.AgentConfig) bool { return a.Addr == host @@ -44,23 +21,17 @@ func (cfg *Config) VerifyNewAgent(host string, ca agent.PEMPair, client agent.PE if err != nil { return 0, gperr.Wrap(err, "failed to start agent") } - addAgent(&agentCfg) + agent.AddAgent(&agentCfg) provider := provider.NewAgentProvider(&agentCfg) if err := cfg.errIfExists(provider); err != nil { + agent.RemoveAgent(&agentCfg) return 0, err } err = provider.LoadRoutes() if err != nil { + agent.RemoveAgent(&agentCfg) return 0, gperr.Wrap(err, "failed to load routes") } return provider.NumRoutes(), nil } - -func (cfg *Config) ListAgents() []*agent.AgentConfig { - agents := make([]*agent.AgentConfig, 0, agentPool.Size()) - agentPool.RangeAll(func(key string, value *agent.AgentConfig) { - agents = append(agents, value) - }) - return agents -} diff --git a/internal/config/config.go b/internal/config/config.go index 75d771f..55b2e04 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -11,6 +11,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + agentPkg "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal/api" autocert "github.com/yusing/go-proxy/internal/autocert" "github.com/yusing/go-proxy/internal/common" @@ -323,14 +324,14 @@ func (cfg *Config) loadRouteProviders(providers *config.Providers) gperr.Error { errs := gperr.NewBuilder("route provider errors") results := gperr.NewBuilder("loaded route providers") - removeAllAgents() + agentPkg.RemoveAllAgents() for _, agent := range providers.Agents { if err := agent.Start(cfg.task.Context()); err != nil { errs.Add(gperr.PrependSubject(agent.String(), err)) continue } - addAgent(agent) + agentPkg.AddAgent(agent) p := proxy.NewAgentProvider(agent) if err := cfg.errIfExists(p); err != nil { errs.Add(err.Subject(p.String())) diff --git a/internal/config/types/config.go b/internal/config/types/config.go index 80fa48e..de414b8 100644 --- a/internal/config/types/config.go +++ b/internal/config/types/config.go @@ -52,9 +52,7 @@ type ( Statistics() map[string]any RouteProviderList() []RouteProviderListResponse Context() context.Context - GetAgent(agentAddrOrDockerHost string) (*agent.AgentConfig, bool) VerifyNewAgent(host string, ca agent.PEMPair, client agent.PEMPair) (int, gperr.Error) - ListAgents() []*agent.AgentConfig AutoCertProvider() *autocert.Provider } ) diff --git a/internal/docker/client.go b/internal/docker/client.go index d2a44cc..cc70be9 100644 --- a/internal/docker/client.go +++ b/internal/docker/client.go @@ -16,7 +16,6 @@ import ( "github.com/rs/zerolog/log" "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal/common" - config "github.com/yusing/go-proxy/internal/config/types" "github.com/yusing/go-proxy/internal/task" ) @@ -122,7 +121,7 @@ func NewClient(host string) (*SharedClient, error) { var dial func(ctx context.Context) (net.Conn, error) if agent.IsDockerHostAgent(host) { - cfg, ok := config.GetInstance().GetAgent(host) + cfg, ok := agent.GetAgent(host) if !ok { panic(fmt.Errorf("agent %q not found", host)) } diff --git a/internal/docker/container.go b/internal/docker/container.go index 4b13154..d568f3b 100644 --- a/internal/docker/container.go +++ b/internal/docker/container.go @@ -12,7 +12,6 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" "github.com/yusing/go-proxy/agent/pkg/agent" - config "github.com/yusing/go-proxy/internal/config/types" "github.com/yusing/go-proxy/internal/gperr" idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" "github.com/yusing/go-proxy/internal/serialization" @@ -102,7 +101,7 @@ func FromDocker(c *container.SummaryTrimmed, dockerHost string) (res *Container) if agent.IsDockerHostAgent(dockerHost) { var ok bool - res.Agent, ok = config.GetInstance().GetAgent(dockerHost) + res.Agent, ok = agent.GetAgent(dockerHost) if !ok { res.addError(fmt.Errorf("agent %q not found", dockerHost)) } diff --git a/internal/route/reverse_proxy.go b/internal/route/reverse_proxy.go index b3ad7cf..5a82b62 100755 --- a/internal/route/reverse_proxy.go +++ b/internal/route/reverse_proxy.go @@ -39,7 +39,7 @@ func NewReverseProxyRoute(base *Route) (*ReveseProxyRoute, gperr.Error) { proxyURL := base.ProxyURL var trans *http.Transport - a := base.Agent() + a := base.GetAgent() if a != nil { trans = a.Transport() proxyURL = nettypes.NewURL(agent.HTTPProxyURL) diff --git a/internal/route/route.go b/internal/route/route.go index 8f6c89a..e154255 100644 --- a/internal/route/route.go +++ b/internal/route/route.go @@ -351,7 +351,7 @@ func (r *Route) Type() route.RouteType { panic(fmt.Errorf("unexpected scheme %s for alias %s", r.Scheme, r.Alias)) } -func (r *Route) Agent() *agent.AgentConfig { +func (r *Route) GetAgent() *agent.AgentConfig { if r.Container == nil { return nil } @@ -359,7 +359,7 @@ func (r *Route) Agent() *agent.AgentConfig { } func (r *Route) IsAgent() bool { - return r.Container != nil && r.Container.Agent != nil + return r.GetAgent() != nil } func (r *Route) HealthMonitor() health.HealthMonitor { diff --git a/internal/route/routes/route.go b/internal/route/routes/route.go index babd8fa..a004148 100644 --- a/internal/route/routes/route.go +++ b/internal/route/routes/route.go @@ -38,7 +38,7 @@ type ( HomepageItem() *homepage.Item ContainerInfo() *docker.Container - Agent() *agent.AgentConfig + GetAgent() *agent.AgentConfig IsDocker() bool IsAgent() bool diff --git a/internal/watcher/health/monitor/monitor.go b/internal/watcher/health/monitor/monitor.go index 14ad054..2671637 100644 --- a/internal/watcher/health/monitor/monitor.go +++ b/internal/watcher/health/monitor/monitor.go @@ -42,7 +42,7 @@ var ErrNegativeInterval = gperr.New("negative interval") func NewMonitor(r routes.Route) health.HealthMonCheck { var mon health.HealthMonCheck if r.IsAgent() { - mon = NewAgentProxiedMonitor(r.Agent(), r.HealthCheckConfig(), AgentTargetFromURL(&r.TargetURL().URL)) + mon = NewAgentProxiedMonitor(r.GetAgent(), r.HealthCheckConfig(), AgentTargetFromURL(&r.TargetURL().URL)) } else { switch r := r.(type) { case routes.HTTPRoute: