bug: fix error handing adn typo

Author: onionj

.gitignore

@@ -13,7 +13,7 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
-
+.idea
 # Dependency directories (remove the comment below to include it)
 # vendor/
 

Makefile

@@ -1,6 +1,6 @@
 # Define the output directory for the builds
 OUTPUT_DIR := ./build
-version := 1.8.0
+version := 1.8.1
 
 # Define the name of your binary
 BINARY_NAME := yourip

geolocation/geolocation.go

@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"log"
 	"net"
 	"net/http"
 	"os"
@@ -273,11 +275,17 @@ func New(RefreshPeroidH time.Duration) *IPGeolocation {
 	}
 
 	go func() {
-		ipGeolocation.Load(filename)
+		err := ipGeolocation.Load(filename)
+		if err != nil {
+			log.Fatal(err)
+		}
 
 		for {
 			if !ipGeolocation.Ready || ipGeolocation.RefreshTime.Add(time.Hour*RefreshPeroidH).Before(time.Now()) {
-				ipGeolocation.RefreshData()
+				err := ipGeolocation.RefreshData()
+				if err != nil {
+					fmt.Println("err in ipGeolocation.RefreshData", err)
+				}
 				fmt.Println("\nCIDR is READY.")
 				time.Sleep(time.Hour * RefreshPeroidH)
 			} else {
@@ -313,30 +321,39 @@ func (geo *IPGeolocation) IsDataFresh() bool {
 	return time.Since(geo.RefreshTime).Minutes() < 60
 }
 
-func (ig *IPGeolocation) RefreshData() error {
+func (geo *IPGeolocation) RefreshData() error {
 	newCIDRListV4 := make(map[string][]*net.IPNet)
 	newCIDRListV6 := make(map[string][]*net.IPNet)
 
 	lenCountriesCodes := len(CountriesCodes)
 
-	for indx, code := range CountriesCodes {
-		ig.downloadCIDRContent("https://raw.githubusercontent.com/onionj/country-ip-blocks-alternative/master/ipv4/"+code+".netset", code, newCIDRListV4)
-		ig.downloadCIDRContent("https://raw.githubusercontent.com/onionj/country-ip-blocks-alternative/master/ipv6/"+code+".netset", code, newCIDRListV6)
-		fmt.Println("Down", code, "CIDR", int32((float32(indx+1))/float32(lenCountriesCodes)*100), "% ")
+	for index, code := range CountriesCodes {
+		err := geo.downloadCIDRContent("https://raw.githubusercontent.com/onionj/country-ip-blocks-alternative/master/ipv4/"+code+".netset", code, newCIDRListV4)
+		if err != nil {
+			return err
+		}
+		err = geo.downloadCIDRContent("https://raw.githubusercontent.com/onionj/country-ip-blocks-alternative/master/ipv6/"+code+".netset", code, newCIDRListV6)
+		if err != nil {
+			return err
+		}
+		fmt.Println("Down", code, "CIDR", int32((float32(index+1))/float32(lenCountriesCodes)*100), "% ")
 		fmt.Print("\x0D\u001b[1A")
 	}
 
-	ig.Ready = true
-	ig.RefreshTime = time.Now()
-	ig.CIDRListV4 = newCIDRListV4
-	ig.CIDRListV6 = newCIDRListV6
+	geo.Ready = true
+	geo.RefreshTime = time.Now()
+	geo.CIDRListV4 = newCIDRListV4
+	geo.CIDRListV6 = newCIDRListV6
 
-	ig.Save(filename)
+	err := geo.Save(filename)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
 
-func (ig *IPGeolocation) downloadCIDRContent(url string, code string, newCIDRList map[string][]*net.IPNet) error {
+func (geo *IPGeolocation) downloadCIDRContent(url string, code string, newCIDRList map[string][]*net.IPNet) error {
 	response, err := http.Get(url)
 
 	if response.StatusCode != 200 {
@@ -345,7 +362,9 @@ func (ig *IPGeolocation) downloadCIDRContent(url string, code string, newCIDRLis
 	if err != nil {
 		return fmt.Errorf("failed to download CIDR for country code %s: %w", code, err)
 	}
-	defer response.Body.Close()
+	defer func(Body io.ReadCloser) {
+		_ = Body.Close()
+	}(response.Body)
 
 	scanner := bufio.NewScanner(response.Body)
 	for scanner.Scan() {
@@ -357,31 +376,31 @@ func (ig *IPGeolocation) downloadCIDRContent(url string, code string, newCIDRLis
 		return fmt.Errorf("failed to read CIDR for country code %s: %w", code, err)
 	}
 
-	ig.Ready = true
-	ig.RefreshTime = time.Now()
+	geo.Ready = true
+	geo.RefreshTime = time.Now()
 	return nil
 }
 
-func (ig IPGeolocation) Query(ip net.IP) (string, error) {
+func (geo *IPGeolocation) Query(ip net.IP) (string, error) {
 	if ip.IsPrivate() || ip.IsLoopback() {
 		return "", errors.New("IP is private")
 	}
 
-	if !ig.Ready {
+	if !geo.Ready {
 		return "", errors.New("IPGeolocation is not ready")
 	}
 
 	if ip.To4() != nil {
-		for country := range ig.CIDRListV4 {
-			for _, cidr := range ig.CIDRListV4[country] {
+		for country := range geo.CIDRListV4 {
+			for _, cidr := range geo.CIDRListV4[country] {
 				if cidr.Contains(ip) {
 					return country, nil
 				}
 			}
 		}
 	} else {
-		for country := range ig.CIDRListV6 {
-			for _, cidr := range ig.CIDRListV6[country] {
+		for country := range geo.CIDRListV6 {
+			for _, cidr := range geo.CIDRListV6[country] {
 				if cidr.Contains(ip) {
 					return country, nil
 				}

geolocation/geolocation_test.go

@@ -14,14 +14,14 @@ func TestQueryIPV4(t *testing.T) {
 
 	ipRangeMap[want] = append(ipRangeMap[want], ipNet)
 
-	ipGeoloaction := IPGeolocation{
+	ipGeolocation := IPGeolocation{
 		CIDRListV4: ipRangeMap,
 		Ready:      true,
 	}
 
 	testCase := net.IPv4(byte(1), byte(1), byte(1), byte(1))
 
-	got, err := ipGeoloaction.Query(testCase)
+	got, err := ipGeolocation.Query(testCase)
 	if got != want {
 		t.Errorf("got %q, wanted %q, error: %q", got, want, err.Error())
 	}

main.go

@@ -18,7 +18,7 @@ import (
 	"yourip/geolocation"
 )
 
-var version string = "" // set it just in Makefile
+var version = "" // set it just in Makefile
 
 const RESPONSE string = `HTTP/1.1 200 OK
 Content-Length: %d
@@ -27,15 +27,6 @@ Content-Type: %s; charset=utf-8
 
 %s`
 
-type ResponseMode int8
-
-const (
-	ResponseModeText ResponseMode = iota
-	ResponseModeHTTPText
-	ResponseModeHTTPJson
-	ResponseModeTextAnimation
-)
-
 const (
 	AnimationModeBanner = "1\n"
 	AnimationModeFlight = "2\n"
@@ -80,11 +71,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	defer listener.Close()
+	defer func(listener *net.TCPListener) {
+		_ = listener.Close()
+	}(listener)
 	fmt.Printf("Start a new listener on %s\nversion:%s\n", tcpAddr.String(), version)
 
 	for ; workers != 0; workers-- {
-		fmt.Println("Runing Worker", workers)
+		fmt.Println("Running Worker", workers)
 		go Worker(listener)
 	}
 
@@ -123,7 +116,7 @@ func handleConnection(conn net.Conn) {
 		}
 	}()
 
-	requestBuffer := make([]byte, 1024)
+	requestBuffer := make([]byte, 2048)
 	bytesRead, err := conn.Read(requestBuffer)
 	if err != nil {
 		if err == io.EOF {
@@ -144,19 +137,22 @@ func handleConnection(conn net.Conn) {
 
 	// for netcat client:
 	if bytesRead <= 1 {
-		conn.Write([]byte(fmt.Sprintf("%s %s", remoteAddrStr, country)))
+		fmt.Printf("(%s) return tcp text response to %s (%s)\n", time.Now().String()[:23], remoteAddrStr, country)
+		_, _ = conn.Write([]byte(fmt.Sprintf("%s %s", remoteAddrStr, country)))
 		return
 	}
 
 	request := string(requestBuffer[:bytesRead])
 
 	if strings.Contains(request, " /json") {
+		fmt.Printf("(%s) return json response to %s (%s)\n", time.Now().String()[:23], remoteAddrStr, country)
+
 		jsonResponseByte, err := json.Marshal(JsonResponse{IP: remoteAddrStr, Country: country})
 		if err != nil {
 			fmt.Println("create json response err:", err)
 			return
 		}
-		conn.Write([]byte(fmt.Sprintf(RESPONSE, len(jsonResponseByte), "application/json", jsonResponseByte)))
+		_, _ = conn.Write([]byte(fmt.Sprintf(RESPONSE, len(jsonResponseByte), "application/json", jsonResponseByte)))
 		return
 
 	} else {
@@ -167,15 +163,16 @@ func handleConnection(conn net.Conn) {
 			return
 		}
 
-		conn.Write([]byte(fmt.Sprintf(RESPONSE, len(ipWithCountry), "text/plain", ipWithCountry)))
+		fmt.Printf("(%s) return http text/plain response to %s (%s)\n", time.Now().String()[:23], remoteAddrStr, country)
+		_, _ = conn.Write([]byte(fmt.Sprintf(RESPONSE, len(ipWithCountry), "text/plain", ipWithCountry)))
 	}
 }
 
-// Stream Client IP Like an Animation (for example client open a tcp connection with netcat and send `1`)
+// StreamAnimation : Stream Client IP Like an Animation (for example client open a tcp connection with netcat and send `1`)
 func StreamAnimation(conn net.Conn, response string, animationMode string) {
 	switch animationMode {
 	case AnimationModeBanner:
-		fmt.Printf("(%s) Stream animation to %s (Banner)\n", time.Now().String()[:23], conn.RemoteAddr().String())
+		fmt.Printf("(%s) Stream animation to %s (Banner)\n", time.Now().String()[:23], response)
 
 		faces := []string{"(^_^)", "[o_o]", "(^.^)", "(\".\")", "($.$)"}
 		randomIndex := rand.Intn(len(faces))
@@ -221,8 +218,8 @@ func StreamAnimation(conn net.Conn, response string, animationMode string) {
 			time.Sleep(time.Second / 5)
 
 			// shift string
-			for indx, lineFlight := range arrayFlight {
-				arrayFlight[indx] = lineFlight[len(lineFlight)-1:] + lineFlight[:len(lineFlight)-1]
+			for index, lineFlight := range arrayFlight {
+				arrayFlight[index] = lineFlight[len(lineFlight)-1:] + lineFlight[:len(lineFlight)-1]
 			}
 
 		}