feat(checker): using ipinfo endpoint to check (fix #191)

mubeng · Mar 9, 2023 · c2ccf56 · c2ccf56
1 parent 6fde97b
commit c2ccf56
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/internal/checker/checker.go b/internal/checker/checker.go
@@ -27,7 +27,7 @@ func Do(opt *common.Options) {
 
 		p.Go(func() {
 			addr, err := check(address, opt.Timeout)
-			if len(opt.Countries) > 0 && !isMatchCC(opt.Countries, addr.CC) {
+			if len(opt.Countries) > 0 && !isMatchCC(opt.Countries, addr.Country) {
 				return
 			}
 
@@ -36,7 +36,7 @@ func Do(opt *common.Options) {
 					fmt.Printf("[%s] %s\n", aurora.Red("DIED"), address)
 				}
 			} else {
-				fmt.Printf("[%s] [%s] [%s] %s\n", aurora.Green("LIVE"), aurora.Magenta(addr.CC), aurora.Cyan(addr.IP), address)
+				fmt.Printf("[%s] [%s] [%s] %s\n", aurora.Green("LIVE"), aurora.Magenta(addr.Country), aurora.Cyan(addr.IP), address)
 
 				if opt.Output != "" {
 					fmt.Fprintf(opt.Result, "%s\n", address)
@@ -62,15 +62,15 @@ func isMatchCC(cc []string, code string) bool {
 	return false
 }
 
-func check(address string, timeout time.Duration) (myIP, error) {
+func check(address string, timeout time.Duration) (IPInfo, error) {
 	req, err := http.NewRequest("GET", endpoint, nil)
 	if err != nil {
-		return myip, err
+		return ipinfo, err
 	}
 
 	tr, err := mubeng.Transport(address)
 	if err != nil {
-		return myip, err
+		return ipinfo, err
 	}
 
 	proxy := &mubeng.Proxy{
@@ -84,21 +84,21 @@ func check(address string, timeout time.Duration) (myIP, error) {
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return myip, err
+		return ipinfo, err
 	}
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return myip, err
+		return ipinfo, err
 	}
 
-	err = json.Unmarshal([]byte(body), &myip)
+	err = json.Unmarshal([]byte(body), &ipinfo)
 	if err != nil {
-		return myip, err
+		return ipinfo, err
 	}
 
 	defer resp.Body.Close()
 	defer tr.CloseIdleConnections()
 
-	return myip, nil
+	return ipinfo, nil
 }
diff --git a/internal/checker/ipinfo.go b/internal/checker/ipinfo.go
@@ -0,0 +1,13 @@
+package checker
+
+type IPInfo struct {
+	City     string `json:"city"`
+	Country  string `json:"country"`
+	Hostname string `json:"hostname"`
+	IP       string `json:"ip"`
+	Loc      string `json:"loc"`
+	Org      string `json:"org"`
+	Readme   string `json:"readme"`
+	Region   string `json:"region"`
+	Timezone string `json:"timezone"`
+}
diff --git a/internal/checker/myip.go b/internal/checker/myip.go
diff --git a/internal/checker/vars.go b/internal/checker/vars.go
@@ -6,7 +6,7 @@ import (
 
 var (
 	client *http.Client
-	myip   myIP
+	ipinfo IPInfo
 
-	endpoint = "https://api.myip.com/"
+	endpoint = "https://ipinfo.io/json"
 )