optimize: assets finder

common/assets/assets.go

@@ -7,15 +7,17 @@ package assets
 
 import (
 	"errors"
+	"fmt"
 	"github.com/adrg/xdg"
+	"github.com/sirupsen/logrus"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 )
 
-func GetLocationAsset(filename string) (path string, err error) {
+func GetLocationAsset(log *logrus.Logger, filename string) (path string, err error) {
-	// FIXME:
 	folder := "dae"
 	location := os.Getenv("DAE_LOCATION_ASSET")
 	// check if DAE_LOCATION_ASSET is set
@@ -32,41 +34,45 @@ func GetLocationAsset(filename string) (path string, err error) {
 				filepath.Join("/usr/share", folder, filename),
 			)
 		}
+		searchDirs := make([]string, len(searchPaths))
+		for i := range searchDirs {
+			searchDirs[i] = filepath.Dir(searchPaths[i])
+		}
+		log.Debugf(`Search "%v" in [%v]`, filename, strings.Join(searchDirs, ", "))
 		for _, searchPath := range searchPaths {
 			if _, err = os.Stat(searchPath); err != nil && errors.Is(err, fs.ErrNotExist) {
 				continue
 			}
+			log.Debugf(`Found "%v" at %v`, filename, searchPath)
 			// return the first path that exists
 			return searchPath, nil
 		}
-		// or download asset into DAE_LOCATION_ASSET
+		return "", fmt.Errorf("%v: %w in [%v]", filename, os.ErrNotExist, strings.Join(searchDirs, ", "))
-		return searchPaths[0], nil
 	} else {
 		if runtime.GOOS != "windows" {
 			// search XDG data directories on non windows platform
-			// symlink all assets into XDG_RUNTIME_DIR
+			searchDirs := append([]string{xdg.DataHome}, xdg.DataDirs...)
+			for i := range searchDirs {
+				searchDirs[i] = filepath.Join(searchDirs[i], folder)
+			}
+			log.Debugf(`Search "%v" in [%v]`, filename, strings.Join(searchDirs, ", "))
 			relpath := filepath.Join(folder, filename)
 			fullpath, err := xdg.SearchDataFile(relpath)
 			if err != nil {
-				fullpath, err = xdg.DataFile(relpath)
+				return "", fmt.Errorf("%v: %w in [%v]", filename, os.ErrNotExist, strings.Join(searchDirs, ", "))
-				if err != nil {
-					return "", err
-				}
 			}
-			runtimepath, err := xdg.RuntimeFile(filepath.Join(folder, filename))
+			log.Debugf(`Found "%v" at %v`, filename, fullpath)
-			if err != nil {
+			return fullpath, nil
-				return "", err
-			}
-			os.Remove(runtimepath)
-			err = os.Symlink(fullpath, runtimepath)
-			if err != nil {
-				return "", err
-			}
-			return fullpath, err
 		} else {
-			// fallback to the old behavior of using only config dir on Windows
+			// fallback to the old behavior of using only current dir on Windows
-			// FIXME: conf.GetEnvironmentConfig().Config
+			path := filepath.Join("./", filename)
-			return filepath.Join("./", filename), nil
+			if absPath, e := filepath.Abs(path); e == nil {
+				path = absPath
+			}
+			if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+				return "", fmt.Errorf("%v: %w in %v", filename, os.ErrNotExist, path)
+			}
+			return path, nil
 		}
 	}
 }

component/control/control_plane.go

@@ -222,7 +222,7 @@ retryLoadBpf:
 		&routing.MergeAndSortRulesOptimizer{},
 		&routing.DeduplicateParamsOptimizer{},
 	); err != nil {
-		return nil, fmt.Errorf("ApplyRulesOptimizers error: \n %w", err)
+		return nil, fmt.Errorf("ApplyRulesOptimizers error:\n%w", err)
 	}
 	if log.IsLevelEnabled(logrus.DebugLevel) {
 		var debugBuilder strings.Builder

component/routing/optimizer.go

@@ -154,7 +154,7 @@ func (o *DatReaderOptimizer) loadGeoSite(filename string, code string) (params [
 	if !strings.HasSuffix(filename, ".dat") {
 		filename += ".dat"
 	}
-	filePath, err := assets.GetLocationAsset(filename)
+	filePath, err := assets.GetLocationAsset(o.Logger, filename)
 	if err != nil {
 		o.Logger.Debugf("Failed to read geosite \"%v:%v\": %v", filename, code, err)
 		return nil, err
@@ -199,7 +199,7 @@ func (o *DatReaderOptimizer) loadGeoIp(filename string, code string) (params []*
 	if !strings.HasSuffix(filename, ".dat") {
 		filename += ".dat"
 	}
-	filePath, err := assets.GetLocationAsset(filename)
+	filePath, err := assets.GetLocationAsset(o.Logger, filename)
 	if err != nil {
 		o.Logger.Debugf("Failed to read geoip \"%v:%v\": %v", filename, code, err)
 		return nil, err