Dockerfile, Error handling, comments, docker-compose (#2)

src/util.go

@@ -15,19 +15,20 @@ import (
 
 var (
 	//go:embed icon.png
-	defaultIcon     []byte
-	blockedServers  *MutexArray[string] = nil
-	ipAddressRegExp *regexp.Regexp      = regexp.MustCompile(`^\d{1,3}(\.\d{1,3}){3}$`)
+	defaultIcon    []byte
+	blockedServers *MutexArray = nil
+	ipAddressRegex *regexp.Regexp = regexp.MustCompile(`^\d{1,3}(\.\d{1,3}){3}$`)
 )
 
-type MutexArray[K comparable] struct {
-	List  []K
+// MutexArray is a thread-safe array for storing and checking values.
+type MutexArray struct {
+	List  []interface{}
 	Mutex *sync.Mutex
 }
 
-func (m *MutexArray[K]) Has(value K) bool {
+// Has checks if the given value is present in the array.
+func (m *MutexArray) Has(value interface{}) bool {
 	m.Mutex.Lock()
-
 	defer m.Mutex.Unlock()
 
 	for _, v := range m.List {
@@ -39,9 +40,11 @@ func (m *MutexArray[K]) Has(value K) bool {
 	return false
 }
 
+
+
+// GetBlockedServerList fetches the list of blocked servers from Mojang's session server.
 func GetBlockedServerList() error {
 	resp, err := http.Get("https://sessionserver.mojang.com/blockedservers")
-
 	if err != nil {
 		return err
 	}
@@ -53,42 +56,43 @@ func GetBlockedServerList() error {
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
-
 	if err != nil {
 		return err
 	}
 
-	blockedServers = &MutexArray[string]{
-		List:  strings.Split(string(body), "\n"),
+	// Convert []string to []interface{}
+	strSlice := strings.Split(string(body), "\n")
+	interfaceSlice := make([]interface{}, len(strSlice))
+	for i, v := range strSlice {
+		interfaceSlice[i] = v
+	}
+
+	blockedServers = &MutexArray{
+		List:  interfaceSlice,
 		Mutex: &sync.Mutex{},
 	}
 
 	return nil
 }
 
+
+
+// IsBlockedAddress checks if the given address is in the blocked servers list.
 func IsBlockedAddress(address string) bool {
 	split := strings.Split(strings.ToLower(address), ".")
-	isIPAddress := ipAddressRegExp.MatchString(address)
+	isIPAddress := ipAddressRegex.MatchString(address)
 
 	for k := range split {
-		newAddress := ""
+		var newAddress string
 
 		switch k {
 		case 0:
-			{
-				newAddress = strings.Join(split, ".")
-
-				break
-			}
+			newAddress = strings.Join(split, ".")
 		default:
-			{
-				if isIPAddress {
-					newAddress = fmt.Sprintf("%s.*", strings.Join(split[0:len(split)-k], "."))
-				} else {
-					newAddress = fmt.Sprintf("*.%s", strings.Join(split[k:], "."))
-				}
-
-				break
+			if isIPAddress {
+				newAddress = fmt.Sprintf("%s.*", strings.Join(split[0:len(split)-k], "."))
+			} else {
+				newAddress = fmt.Sprintf("*.%s", strings.Join(split[k:], "."))
 			}
 		}
 
@@ -103,6 +107,7 @@ func IsBlockedAddress(address string) bool {
 	return false
 }
 
+// ParseAddress extracts the hostname and port from the given address string, and returns the default port if none is provided.
 func ParseAddress(address string, defaultPort uint16) (string, uint16, error) {
 	result := strings.SplitN(address, ":", 2)
 
@@ -115,7 +120,6 @@ func ParseAddress(address string, defaultPort uint16) (string, uint16, error) {
 	}
 
 	port, err := strconv.ParseUint(result[1], 10, 16)
-
 	if err != nil {
 		return "", 0, err
 	}