mirror of
https://github.com/MetaCubeX/mihomo.git
synced 2024-11-04 11:03:58 +00:00
Merge pull request #767 from PuerNya/fix-delay
chore: handle provider proxies in proxies api
This commit is contained in:
commit
89d9cb0539
2 changed files with 16 additions and 2 deletions
|
@ -46,7 +46,7 @@ func parseProxyName(next http.Handler) http.Handler {
|
|||
func findProxyByName(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
name := r.Context().Value(CtxKeyProxyName).(string)
|
||||
proxies := tunnel.Proxies()
|
||||
proxies := tunnel.ProxiesWithProviders()
|
||||
proxy, exist := proxies[name]
|
||||
if !exist {
|
||||
render.Status(r, http.StatusNotFound)
|
||||
|
@ -60,7 +60,7 @@ func findProxyByName(next http.Handler) http.Handler {
|
|||
}
|
||||
|
||||
func getProxies(w http.ResponseWriter, r *http.Request) {
|
||||
proxies := tunnel.Proxies()
|
||||
proxies := tunnel.ProxiesWithProviders()
|
||||
render.JSON(w, r, render.M{
|
||||
"proxies": proxies,
|
||||
})
|
||||
|
|
|
@ -127,6 +127,20 @@ func Proxies() map[string]C.Proxy {
|
|||
return proxies
|
||||
}
|
||||
|
||||
func ProxiesWithProviders() map[string]C.Proxy {
|
||||
allProxies := make(map[string]C.Proxy)
|
||||
for name, proxy := range proxies {
|
||||
allProxies[name] = proxy
|
||||
}
|
||||
for _, p := range providers {
|
||||
for _, proxy := range p.Proxies() {
|
||||
name := proxy.Name()
|
||||
allProxies[name] = proxy
|
||||
}
|
||||
}
|
||||
return allProxies
|
||||
}
|
||||
|
||||
// Providers return all compatible providers
|
||||
func Providers() map[string]provider.ProxyProvider {
|
||||
return providers
|
||||
|
|
Loading…
Reference in a new issue