From 8d512d55e59b4e24383d449325b77661b89741c3 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 21 Apr 2026 12:55:16 +0200
Subject: revert Fix geosite:ru rule (ram leak)

#4050 #4055
---
 web/service/server.go | 56 ---------------------------------------------------
 web/web.go            | 18 -----------------
 2 files changed, 74 deletions(-)

(limited to 'web')

diff --git a/web/service/server.go b/web/service/server.go
index 6869cdf3..3292bbab 100644
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -34,8 +34,6 @@ import (
 	"github.com/shirou/gopsutil/v4/load"
 	"github.com/shirou/gopsutil/v4/mem"
 	"github.com/shirou/gopsutil/v4/net"
-	"github.com/xtls/xray-core/app/router"
-	"google.golang.org/protobuf/proto"
 )
 
 // ProcessState represents the current state of a system process.
@@ -1057,48 +1055,6 @@ func (s *ServerService) IsValidGeofileName(filename string) bool {
 	return matched
 }
 
-// NormalizeGeositeCountryCodes reads a geosite .dat file, uppercases all
-// country_code fields, and writes it back. This works around a case-sensitivity
-// mismatch in Xray-core: the router normalizes codes to uppercase before lookup,
-// but the find() function compares bytes case-sensitively. Some geosite.dat
-// providers (e.g. Loyalsoldier) store codes in lowercase, causing lookup failures.
-func NormalizeGeositeCountryCodes(path string) error {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return fmt.Errorf("failed to read geosite file %s: %w", path, err)
-	}
-
-	var list router.GeoSiteList
-	if err := proto.Unmarshal(data, &list); err != nil {
-		return fmt.Errorf("failed to parse geosite file %s: %w", path, err)
-	}
-
-	changed := false
-	for _, entry := range list.Entry {
-		upper := strings.ToUpper(entry.CountryCode)
-		if entry.CountryCode != upper {
-			entry.CountryCode = upper
-			changed = true
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	normalized, err := proto.Marshal(&list)
-	if err != nil {
-		return fmt.Errorf("failed to serialize normalized geosite file %s: %w", path, err)
-	}
-
-	if err := os.WriteFile(path, normalized, 0o644); err != nil {
-		return fmt.Errorf("failed to write normalized geosite file %s: %w", path, err)
-	}
-
-	logger.Infof("Normalized country codes to uppercase in %s (%d entries)", path, len(list.Entry))
-	return nil
-}
-
 func (s *ServerService) UpdateGeofile(fileName string) error {
 	type geofileEntry struct {
 		URL      string
@@ -1190,22 +1146,12 @@ func (s *ServerService) UpdateGeofile(fileName string) error {
 
 	var errorMessages []string
 
-	normalizeIfGeosite := func(destPath, name string) {
-		if strings.Contains(name, "geosite") {
-			if err := NormalizeGeositeCountryCodes(destPath); err != nil {
-				logger.Warningf("Failed to normalize geosite country codes in %s: %v", name, err)
-			}
-		}
-	}
-
 	if fileName == "" {
 		// Download all geofiles
 		for _, entry := range geofileAllowlist {
 			destPath := filepath.Join(config.GetBinFolderPath(), entry.FileName)
 			if err := downloadFile(entry.URL, destPath); err != nil {
 				errorMessages = append(errorMessages, fmt.Sprintf("Error downloading Geofile '%s': %v", entry.FileName, err))
-			} else {
-				normalizeIfGeosite(destPath, entry.FileName)
 			}
 		}
 	} else {
@@ -1213,8 +1159,6 @@ func (s *ServerService) UpdateGeofile(fileName string) error {
 		destPath := filepath.Join(config.GetBinFolderPath(), entry.FileName)
 		if err := downloadFile(entry.URL, destPath); err != nil {
 			errorMessages = append(errorMessages, fmt.Sprintf("Error downloading Geofile '%s': %v", entry.FileName, err))
-		} else {
-			normalizeIfGeosite(destPath, entry.FileName)
 		}
 	}
 
diff --git a/web/web.go b/web/web.go
index 81868d36..835e82e1 100644
--- a/web/web.go
+++ b/web/web.go
@@ -12,7 +12,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -295,26 +294,9 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 	return engine, nil
 }
 
-// normalizeExistingGeositeFiles normalizes country codes in all geosite .dat
-// files found in the bin directory so Xray-core can locate entries correctly.
-func normalizeExistingGeositeFiles() {
-	binDir := config.GetBinFolderPath()
-	matches, err := filepath.Glob(filepath.Join(binDir, "geosite*.dat"))
-	if err != nil {
-		logger.Warningf("Failed to glob geosite files: %v", err)
-		return
-	}
-	for _, path := range matches {
-		if err := service.NormalizeGeositeCountryCodes(path); err != nil {
-			logger.Warningf("Failed to normalize geosite country codes in %s: %v", path, err)
-		}
-	}
-}
-
 // startTask schedules background jobs (Xray checks, traffic jobs, cron
 // jobs) which the panel relies on for periodic maintenance and monitoring.
 func (s *Server) startTask() {
-	normalizeExistingGeositeFiles()
 	s.customGeoService.EnsureOnStartup()
 	err := s.xrayService.RestartXray(true)
 	if err != nil {
-- 
cgit v1.2.3