Feature: Add remove api for offline proxy

add api to remove a single proxy with name and type
example:
  curl -X DELETE -u admin:admin -v http://127.0.0.1:7500/api/proxy/tcp/test-tcp
output:
  proxy "test-tcp" deleted
This commit is contained in:
Peter Wang 2024-09-06 13:36:33 +08:00
parent ae73ec2fed
commit a7f4ba9b5d
4 changed files with 51 additions and 0 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@
# Folders
_obj
_test
.DS_Store
# Architecture specific extensions/prefixes
*.[568vq]

View File

@ -260,6 +260,17 @@ func (m *serverMetrics) GetProxiesByTypeAndName(proxyType string, proxyName stri
return
}
func (m *serverMetrics) RemoveProxyByTypeAndName(proxyType string, proxyName string) bool {
m.mu.Lock()
defer m.mu.Unlock()
sType, ok := m.info.ProxyStatistics[proxyName]
if ok && sType.ProxyType == proxyType {
delete(m.info.ProxyStatistics, proxyName)
return true
}
return false
}
func (m *serverMetrics) GetProxyTraffic(name string) (res *ProxyTrafficInfo) {
m.mu.Lock()
defer m.mu.Unlock()

View File

@ -78,6 +78,7 @@ type Collector interface {
GetServer() *ServerStats
GetProxiesByType(proxyType string) []*ProxyStats
GetProxiesByTypeAndName(proxyType string, proxyName string) *ProxyStats
RemoveProxyByTypeAndName(proxyType string, proxyName string) bool
GetProxyTraffic(name string) *ProxyTrafficInfo
ClearOfflineProxies() (int, int)
}

View File

@ -17,6 +17,7 @@ package server
import (
"cmp"
"encoding/json"
"fmt"
"net/http"
"slices"
@ -52,6 +53,7 @@ func (svr *Service) registerRouteHandlers(helper *httppkg.RouterRegisterHelper)
subRouter.HandleFunc("/api/serverinfo", svr.apiServerInfo).Methods("GET")
subRouter.HandleFunc("/api/proxy/{type}", svr.apiProxyByType).Methods("GET")
subRouter.HandleFunc("/api/proxy/{type}/{name}", svr.apiProxyByTypeAndName).Methods("GET")
subRouter.HandleFunc("/api/proxy/{type}/{name}", svr.apiProxyDeleteByTypeAndName).Methods("DELETE")
subRouter.HandleFunc("/api/traffic/{name}", svr.apiProxyTraffic).Methods("GET")
subRouter.HandleFunc("/api/proxies", svr.deleteProxies).Methods("DELETE")
@ -308,6 +310,42 @@ func (svr *Service) apiProxyByTypeAndName(w http.ResponseWriter, r *http.Request
res.Msg = string(buf)
}
// /api/proxy/:type/:name DELETE
func (svr *Service) apiProxyDeleteByTypeAndName(w http.ResponseWriter, r *http.Request) {
res := GeneralResponse{Code: 200}
params := mux.Vars(r)
proxyType := params["type"]
name := params["name"]
defer func() {
log.Infof("Http response [%s]: code [%d]", r.URL.Path, res.Code)
w.WriteHeader(res.Code)
if len(res.Msg) > 0 {
_, _ = w.Write([]byte(res.Msg))
}
}()
log.Infof("Http request: [%s]", r.URL.Path)
var proxyStatsResp GetProxyStatsResp
proxyStatsResp, res.Code, res.Msg = svr.getProxyStatsByTypeAndName(proxyType, name)
if res.Code != 200 {
return
}
log.Debugf("proxy to be deleted: %v", proxyStatsResp)
if proxyStatsResp.Status != "offline" {
res.Code = 400
res.Msg = "proxy is online, can not be deleted"
return
}
ok := mem.StatsCollector.RemoveProxyByTypeAndName(proxyType, name)
if !ok {
res.Code = 400
res.Msg = "proxy cannot not be deleted,name mismatch with type "
return
}
res.Msg = fmt.Sprintf("proxy %q is deleted successfully", name)
}
func (svr *Service) getProxyStatsByTypeAndName(proxyType string, proxyName string) (proxyInfo GetProxyStatsResp, code int, msg string) {
proxyInfo.Name = proxyName
ps := mem.StatsCollector.GetProxiesByTypeAndName(proxyType, proxyName)