feat: latency test url for wg

M03ED · M03ED · commit e4e19462cb50 · 2026-05-16T01:16:22.000+03:30
diff --git a/.env.example b/.env.example
@@ -22,8 +22,6 @@ API_KEY = xxxxxxxx-yyyy-zzzz-mmmm-aaaaaaaaaaa
 # STARTUP_LOG_TAIL_SIZE = 200
 # STATS_UPDATE_INTERVAL_SECONDS = 10
 # STATS_CLEANUP_INTERVAL_SECONDS = 300
-# LATENCY_TEST_URL = https://www.gstatic.com/generate_204
-# LATENCY_TIMEOUT_SECONDS = 5
 
 ### WireGuard host NAT
 ### Built-in routing enables runtime IPv4 forwarding and manages scoped nft NAT/forwarding rules.
diff --git a/backend/wireguard/config.go b/backend/wireguard/config.go
@@ -13,11 +13,12 @@ import (
 
 // Config represents the WireGuard configuration
 type Config struct {
-	InterfaceName string   `json:"interface_name"`
-	PrivateKey    string   `json:"private_key"`
-	PreSharedKey  string   `json:"pre_shared_key,omitempty"`
-	ListenPort    int      `json:"listen_port"`
-	Address       []string `json:"address"`
+	InterfaceName string         `json:"interface_name"`
+	PrivateKey    string         `json:"private_key"`
+	PreSharedKey  string         `json:"pre_shared_key,omitempty"`
+	ListenPort    int            `json:"listen_port"`
+	Address       []string       `json:"address"`
+	Latency       *LatencyConfig `json:"latency,omitempty"`
 
 	privateKeyValue   wgtypes.Key
 	privateKeySet     bool
@@ -27,6 +28,11 @@ type Config struct {
 	mu sync.RWMutex
 }
 
+type LatencyConfig struct {
+	TestURL        string `json:"test_url,omitempty"`
+	TimeoutSeconds int    `json:"timeout_seconds,omitempty"`
+}
+
 // PeerInfo stores information about a WireGuard peer
 type PeerInfo struct {
 	Email      string      `json:"email"`
@@ -62,6 +68,15 @@ func NewConfig(config string) (*Config, error) {
 	if wgConfig.ListenPort <= 0 {
 		wgConfig.ListenPort = 51820
 	}
+	if wgConfig.Latency == nil {
+		wgConfig.Latency = &LatencyConfig{}
+	}
+	if strings.TrimSpace(wgConfig.Latency.TestURL) == "" {
+		wgConfig.Latency.TestURL = "https://www.gstatic.com/generate_204"
+	}
+	if wgConfig.Latency.TimeoutSeconds <= 0 {
+		wgConfig.Latency.TimeoutSeconds = 5
+	}
 
 	return &wgConfig, nil
 }
diff --git a/backend/wireguard/config_test.go b/backend/wireguard/config_test.go
@@ -66,6 +66,38 @@ func TestNewWireGuardConfigDefaults(t *testing.T) {
 	if config.ListenPort != 51820 {
 		t.Errorf("Expected default listen_port 51820, got: %d", config.ListenPort)
 	}
+	if config.Latency == nil {
+		t.Fatal("expected default latency config")
+	}
+	if config.Latency.TestURL != "https://www.gstatic.com/generate_204" {
+		t.Errorf("expected default latency.test_url, got: %s", config.Latency.TestURL)
+	}
+	if config.Latency.TimeoutSeconds != 5 {
+		t.Errorf("expected default latency.timeout_seconds 5, got: %d", config.Latency.TimeoutSeconds)
+	}
+}
+
+func TestNewWireGuardConfigLatencyNested(t *testing.T) {
+	configJSON := `{
+		"latency": {
+			"test_url": "https://example.com/generate_204",
+			"timeout_seconds": 9
+		}
+	}`
+
+	config, err := NewConfig(configJSON)
+	if err != nil {
+		t.Fatalf("NewConfig failed: %v", err)
+	}
+	if config.Latency == nil {
+		t.Fatal("expected latency config")
+	}
+	if config.Latency.TestURL != "https://example.com/generate_204" {
+		t.Errorf("expected latency.test_url to round-trip, got: %s", config.Latency.TestURL)
+	}
+	if config.Latency.TimeoutSeconds != 9 {
+		t.Errorf("expected latency.timeout_seconds 9, got: %d", config.Latency.TimeoutSeconds)
+	}
 }
 
 func TestNewWireGuardConfigInvalidJSON(t *testing.T) {
diff --git a/backend/wireguard/latency.go b/backend/wireguard/latency.go
@@ -28,8 +28,12 @@ func (wg *WireGuard) latencyProbeInterface() string {
 func (wg *WireGuard) GetOutboundsLatency(ctx context.Context, request *common.LatencyRequest) (*common.LatencyResponse, error) {
 	wg.mu.RLock()
 	state := wg.state
-	testURL := wg.cfg.LatencyTestURL
-	timeoutSeconds := wg.cfg.LatencyTimeoutSeconds
+	testURL := ""
+	timeoutSeconds := 0
+	if wg.config != nil && wg.config.Latency != nil {
+		testURL = wg.config.Latency.TestURL
+		timeoutSeconds = wg.config.Latency.TimeoutSeconds
+	}
 	wg.mu.RUnlock()
 
 	if state != lifecycleRunning {
diff --git a/config/config.go b/config/config.go
@@ -25,8 +25,6 @@ type Config struct {
 	StartupLogTailSize          int
 	StatsUpdateIntervalSeconds  int
 	StatsCleanupIntervalSeconds int
-	LatencyTestURL              string
-	LatencyTimeoutSeconds       int
 }
 
 func Load() (*Config, error) {
@@ -48,18 +46,12 @@ func Load() (*Config, error) {
 		StartupLogTailSize:          GetEnvAsInt("STARTUP_LOG_TAIL_SIZE", 200),
 		StatsUpdateIntervalSeconds:  GetEnvAsInt("STATS_UPDATE_INTERVAL_SECONDS", 10),
 		StatsCleanupIntervalSeconds: GetEnvAsInt("STATS_CLEANUP_INTERVAL_SECONDS", 300),
-		LatencyTestURL:              GetEnv("LATENCY_TEST_URL", "https://www.gstatic.com/generate_204"),
-		LatencyTimeoutSeconds:       GetEnvAsInt("LATENCY_TIMEOUT_SECONDS", 5),
 	}
 
 	if cfg.LogBufferSize <= 0 {
 		log.Printf("[Warning] LOG_BUFFER_SIZE must be greater than 0, got %d. Falling back to 1.", cfg.LogBufferSize)
 		cfg.LogBufferSize = 1
 	}
-	if cfg.LatencyTimeoutSeconds <= 0 {
-		log.Printf("[Warning] LATENCY_TIMEOUT_SECONDS must be greater than 0, got %d. Falling back to 5.", cfg.LatencyTimeoutSeconds)
-		cfg.LatencyTimeoutSeconds = 5
-	}
 
 	cfg.ApiKey, err = GetEnvAsUUID("API_KEY")
 	if err != nil {
