Merge pull request #947 from sky22333/main

Fix the issue where the default IP lookup URL is inaccessible on some networks
This commit is contained in:
Alireza Ahmadi
2026-01-04 16:46:34 +01:00
committed by GitHub
+53 -8
View File
@@ -5,6 +5,8 @@ import (
"io" "io"
"net/http" "net/http"
"strings" "strings"
"sync"
"time"
"github.com/alireza0/s-ui/config" "github.com/alireza0/s-ui/config"
"github.com/alireza0/s-ui/database" "github.com/alireza0/s-ui/database"
@@ -110,6 +112,54 @@ func showSetting() {
} }
} }
func getPublicIP() string {
apis := []string{
"https://api64.ipify.org",
"https://ip.sb",
"https://icanhazip.com",
"https://ipinfo.io/ip",
"https://checkip.amazonaws.com",
}
type result struct {
ip string
err error
}
ch := make(chan result, len(apis))
var wg sync.WaitGroup
client := &http.Client{Timeout: 3 * time.Second}
for _, api := range apis {
wg.Add(1)
go func(url string) {
defer wg.Done()
resp, err := client.Get(url)
if err != nil {
ch <- result{"", err}
return
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if err != nil {
ch <- result{"", err}
return
}
ch <- result{string(body), nil}
}(api)
}
go func() {
wg.Wait()
close(ch)
}()
for res := range ch {
if res.err == nil && res.ip != "" {
return strings.TrimSpace(res.ip)
}
}
return ""
}
func getPanelURI() { func getPanelURI() {
err := database.InitDB(config.GetDBPath()) err := database.InitDB(config.GetDBPath())
if err != nil { if err != nil {
@@ -146,7 +196,6 @@ func getPanelURI() {
return return
} }
fmt.Println("Local address:") fmt.Println("Local address:")
// get ip address
netInterfaces, _ := net.Interfaces() netInterfaces, _ := net.Interfaces()
for i := 0; i < len(netInterfaces); i++ { for i := 0; i < len(netInterfaces); i++ {
if len(netInterfaces[i].Flags) > 2 && netInterfaces[i].Flags[0] == "up" && netInterfaces[i].Flags[1] != "loopback" { if len(netInterfaces[i].Flags) > 2 && netInterfaces[i].Flags[0] == "up" && netInterfaces[i].Flags[1] != "loopback" {
@@ -161,12 +210,8 @@ func getPanelURI() {
} }
} }
} }
resp, err := http.Get("https://api.ipify.org?format=text") pubIP := getPublicIP()
if err == nil { if pubIP != "" {
defer resp.Body.Close() fmt.Printf("\nGlobal address:\n%s%s%s\n", Proto, pubIP, PortText+BasePath)
ip, err := io.ReadAll(resp.Body)
if err == nil {
fmt.Printf("\nGlobal address:\n%s%s%s%s\n", Proto, ip, PortText, BasePath)
}
} }
} }