refactor and typo fixes

internal/net/http/middleware/cloudflare_real_ip.go

@@ -109,9 +109,9 @@ func fetchUpdateCFIPRange(endpoint string, cfCIDRs []*types.CIDR) error {
 		_, cidr, err := net.ParseCIDR(line)
 		if err != nil {
 			return fmt.Errorf("cloudflare responeded an invalid CIDR: %s", line)
-		} else {
-			cfCIDRs = append(cfCIDRs, (*types.CIDR)(cidr))
 		}
+
+		cfCIDRs = append(cfCIDRs, (*types.CIDR)(cidr))
 	}
 
 	return nil

internal/net/http/middleware/errorpage/error_page.go

@@ -19,24 +19,33 @@ import (
 const errPagesBasePath = common.ErrorPagesBasePath
 
 var (
+	setupMu        sync.Mutex
 	dirWatcher     W.Watcher
 	fileContentMap = F.NewMapOf[string, []byte]()
 )
 
-var setup = sync.OnceFunc(func() {
+func setup() {
+	setupMu.Lock()
+	defer setupMu.Unlock()
+
+	if dirWatcher != nil {
+		return
+	}
+
 	task := task.GlobalTask("error page")
 	dirWatcher = W.NewDirectoryWatcher(task.Subtask("dir watcher"), errPagesBasePath)
 	loadContent()
 	go watchDir(task)
-})
+}
 
 func GetStaticFile(filename string) ([]byte, bool) {
+	setup()
 	return fileContentMap.Load(filename)
 }
 
 // try <statusCode>.html -> 404.html -> not ok.
 func GetErrorPageByStatus(statusCode int) (content []byte, ok bool) {
-	content, ok = fileContentMap.Load(fmt.Sprintf("%d.html", statusCode))
+	content, ok = GetStaticFile(fmt.Sprintf("%d.html", statusCode))
 	if !ok && statusCode != 404 {
 		return fileContentMap.Load("404.html")
 	}

internal/net/http/middleware/middlewares.go

@@ -9,7 +9,6 @@ import (
 	"github.com/yusing/go-proxy/internal/common"
 	E "github.com/yusing/go-proxy/internal/error"
 	"github.com/yusing/go-proxy/internal/utils"
-	U "github.com/yusing/go-proxy/internal/utils"
 	"github.com/yusing/go-proxy/internal/utils/strutils"
 )
 
@@ -21,7 +20,7 @@ var (
 )
 
 func Get(name string) (*Middleware, Error) {
-	middleware, ok := allMiddlewares[U.ToLowerNoSnake(name)]
+	middleware, ok := allMiddlewares[strutils.ToLowerNoSnake(name)]
 	if !ok {
 		return nil, ErrUnknownMiddleware.
 			Subject(name).
@@ -34,7 +33,7 @@ func All() map[string]*Middleware {
 	return allMiddlewares
 }
 
-// initialize middleware names and label parsers
+// initialize middleware names and label parsers.
 func init() {
 	allMiddlewares = map[string]*Middleware{
 		"setxforwarded":    SetXForwarded,
@@ -67,7 +66,7 @@ func init() {
 
 func LoadComposeFiles() {
 	errs := E.NewBuilder("middleware compile errors")
-	middlewareDefs, err := U.ListFiles(common.MiddlewareComposeBasePath, 0)
+	middlewareDefs, err := utils.ListFiles(common.MiddlewareComposeBasePath, 0)
 	if err != nil {
 		logger.Err(err).Msg("failed to list middleware definitions")
 		return
@@ -82,7 +81,7 @@ func LoadComposeFiles() {
 				errs.Add(ErrDuplicatedMiddleware.Subject(name))
 				continue
 			}
-			allMiddlewares[U.ToLowerNoSnake(name)] = m
+			allMiddlewares[strutils.ToLowerNoSnake(name)] = m
 			logger.Info().
 				Str("name", name).
 				Str("src", path.Base(defFile)).

internal/net/http/middleware/trace.go

@@ -22,8 +22,10 @@ type Trace struct {
 
 type Traces []*Trace
 
-var traces = Traces{}
-var tracesMu sync.Mutex
+var (
+	traces   = make(Traces, 0)
+	tracesMu sync.Mutex
+)
 
 const MaxTraceNum = 100