merge: release 3.0.2 from dev

Merge prepared release changes from dev into main for version 3.0.2 publication.

Author: AandStep

.gitignore

@@ -22,6 +22,8 @@ release
 *.ntvs*
 *.njsproj
 *.sln
+.agent
+.cursor
 
 
 # Claude Superpowers

README.en.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/version-3.0.1-blue.svg" alt="Version">
+  <img src="https://img.shields.io/badge/version-3.0.2-blue.svg" alt="Version">
   <img src="https://img.shields.io/badge/desktop-Wails-27272f.svg" alt="Wails">
   <img src="https://img.shields.io/badge/backend-Go-00ADD8.svg" alt="Go">
   <img src="https://img.shields.io/badge/frontend-React_18-61dafb.svg" alt="React">
@@ -33,7 +33,7 @@
 
 ## Overview
 
-ResultV **3.0.1** is a native desktop application built with **[Wails v2](https://wails.io/)**. The UI is **React 18** with **Vite** and **Tailwind CSS**; traffic is handled by a **Go** backend and **[sing-box](https://github.com/SagerNet/sing-box)** (with project-specific build tags in `wails.json`). The interface is localized with **i18next** (English and Russian).
+ResultV **3.0.2** is a native desktop application built with **[Wails v2](https://wails.io/)**. The UI is **React 18** with **Vite** and **Tailwind CSS**; traffic is handled by a **Go** backend and **[sing-box](https://github.com/SagerNet/sing-box)** (with project-specific build tags in `wails.json`). The interface is localized with **i18next** (English and Russian).
 
 **Prebuilt releases:** GitHub Actions currently publishes **Windows amd64** artifacts (portable `.exe` and NSIS installer) when a `v*` tag is pushed. **macOS and Linux** code paths exist in the repository, but automated CI releases are currently Windows-only; other platforms will be available later due to the full migration of the project to the Go stack.
 
@@ -66,6 +66,7 @@ ResultV **3.0.1** is a native desktop application built with **[Wails v2](https:
 - **WireGuard** and **AmneziaWG** require **Tunnel** mode; they are **not** available in plain Proxy mode (enforced in `internal/proxy/manager.go`).
 - **Tunnel** mode on Windows requires **running the app as Administrator** (privilege check before connect).
 - **Kill Switch** on Windows may require **administrator** privileges for firewall-style rules (`internal/system/killswitch_windows.go`).
+- Some subscription providers enforce **HWID device limits**; the app sends a stable `x-hwid` when fetching subscriptions and shows a clear reason if the provider returns an empty response due to that limit.
 - **VMESS, Trojan, and SS** are **less tested** than VLESS and some other stacks; if you hit failures, contact **@resultpoint_manager** on Telegram.
 
 ---

README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/version-3.0.1-blue.svg" alt="Version">
+  <img src="https://img.shields.io/badge/version-3.0.2-blue.svg" alt="Version">
   <img src="https://img.shields.io/badge/desktop-Wails-27272f.svg" alt="Wails">
   <img src="https://img.shields.io/badge/backend-Go-00ADD8.svg" alt="Go">
   <img src="https://img.shields.io/badge/frontend-React_18-61dafb.svg" alt="React">
@@ -33,7 +33,7 @@
 
 ## О проекте
 
-ResultV **3.0.1** — нативное настольное приложение на **[Wails v2](https://wails.io/)**. Интерфейс: **React 18**, **Vite**, **Tailwind CSS**; трафик обрабатывает бэкенд на **Go** и движок **[sing-box](https://github.com/SagerNet/sing-box)** (теги сборки заданы в `wails.json`). Локализация через **i18next** (русский и английский).
+ResultV **3.0.2** — нативное настольное приложение на **[Wails v2](https://wails.io/)**. Интерфейс: **React 18**, **Vite**, **Tailwind CSS**; трафик обрабатывает бэкенд на **Go** и движок **[sing-box](https://github.com/SagerNet/sing-box)** (теги сборки заданы в `wails.json`). Локализация через **i18next** (русский и английский).
 
 **Готовые сборки:** в GitHub Actions публикуются артефакты **Windows amd64** (portable `.exe` и установщик NSIS) при push тега `v`*. Код содержит ветки под **macOS** и **Linux**, но автоматические релизы в CI сейчас только для Windows; остальные платформы будут доступны позже, в связи с полным переносом проекта на GO стек.
 
@@ -68,6 +68,7 @@ ResultV **3.0.1** — нативное настольное приложение
 - **WireGuard** и **AmneziaWG** работают только в режиме **Tunnel**, в режиме Proxy недоступны (проверка в `internal/proxy/manager.go`).
 - Режим **Tunnel** в Windows требует **запуска от имени администратора**.
 - **Kill Switch** в Windows может требовать **прав администратора** для правил брандмауэра (`internal/system/killswitch_windows.go`).
+- Некоторые провайдеры подписок используют **HWID-ограничение устройств**; приложение передает стабильный `x-hwid` при загрузке подписок и показывает причину, если провайдер вернул пустой ответ по лимиту.
 - **VMESS, Trojan и SS** протестированы **слабее**, чем VLESS и часть других стеков; при сбоях лучше написать в ТГ @resultpoint_manager.
 
 ---

app.go

@@ -45,6 +45,8 @@ import (
 	"resultproxy-wails/internal/system"
 )
 
+var stableHWIDProvider = config.StableHardwareID
+
 
 
 type App struct {
@@ -842,6 +844,71 @@ func parseSubscriptionUserInfoHeader(v string) (upload, download, total, expire
 	return upload, download, total, expire
 }
 
+func parseSubscriptionHeaderText(v string) string {
+	v = strings.TrimSpace(v)
+	if v == "" {
+		return ""
+	}
+	if strings.HasPrefix(strings.ToLower(v), "base64:") {
+		raw := strings.TrimSpace(v[len("base64:"):])
+		for _, enc := range [](*base64.Encoding){base64.StdEncoding, base64.URLEncoding, base64.RawStdEncoding, base64.RawURLEncoding} {
+			if decoded, err := enc.DecodeString(raw); err == nil {
+				return strings.TrimSpace(string(decoded))
+			}
+		}
+	}
+	return v
+}
+
+func headerIsTruthy(h http.Header, key string) bool {
+	v := strings.ToLower(strings.TrimSpace(h.Get(key)))
+	switch v {
+	case "1", "true", "yes", "on":
+		return true
+	default:
+		return false
+	}
+}
+
+func subscriptionEmptyBodyError(h http.Header) error {
+	title := parseSubscriptionHeaderText(h.Get("Profile-Title"))
+	announce := parseSubscriptionHeaderText(h.Get("Announce"))
+	supportURL := strings.TrimSpace(h.Get("Support-Url"))
+	hwidLimit := headerIsTruthy(h, "X-Hwid-Limit") || headerIsTruthy(h, "X-Hwid-Max-Devices-Reached")
+	hwidNotSupported := headerIsTruthy(h, "X-Hwid-Not-Supported")
+
+	reason := "подписка вернула пустой ответ"
+	if hwidLimit {
+		reason = "достигнут лимит устройств для подписки"
+	} else if hwidNotSupported {
+		reason = "провайдер требует передачу HWID"
+	}
+
+	details := make([]string, 0, 3)
+	if title != "" {
+		details = append(details, title)
+	}
+	if announce != "" {
+		details = append(details, announce)
+	}
+	if supportURL != "" {
+		details = append(details, "Поддержка: "+supportURL)
+	}
+	if len(details) == 0 {
+		return errors.New(reason)
+	}
+	return fmt.Errorf("%s. %s", reason, strings.Join(details, " | "))
+}
+
+func (a *App) subscriptionHWID() string {
+	hwid, err := stableHWIDProvider(a.getUserDataPath())
+	if err != nil {
+		a.log.Warning(fmt.Sprintf("Не удалось получить HWID для запроса подписки: %v", err))
+		return ""
+	}
+	return strings.TrimSpace(hwid)
+}
+
 
 func subscriptionIconCandidates(subURL string, h http.Header) []string {
 	parsed, err := url.Parse(subURL)
@@ -1020,7 +1087,16 @@ func discoverIconFromSubscriptionPage(client *http.Client, subURL string) string
 
 func (a *App) fetchSubscriptionFromURL(subURL string) ([]config.ProxyEntry, int64, int64, int64, int64, string, error) {
 	client := &http.Client{Timeout: 15 * time.Second}
-	resp, err := client.Get(subURL)
+	req, err := http.NewRequest(http.MethodGet, subURL, nil)
+	if err != nil {
+		return nil, 0, 0, 0, 0, "", fmt.Errorf("creating subscription request: %w", err)
+	}
+	req.Header.Set("User-Agent", fmt.Sprintf("ResultProxyPC/%s", productVersionFromWailsJSON()))
+	if hwid := a.subscriptionHWID(); hwid != "" {
+		req.Header.Set("x-hwid", hwid)
+	}
+
+	resp, err := client.Do(req)
 	if err != nil {
 		return nil, 0, 0, 0, 0, "", fmt.Errorf("fetching subscription: %w", err)
 	}
@@ -1033,16 +1109,12 @@ func (a *App) fetchSubscriptionFromURL(subURL string) ([]config.ProxyEntry, int6
 	up, down, tot, exp := parseSubscriptionUserInfoHeader(resp.Header.Get("Subscription-Userinfo"))
 	iconURL := resolveSubscriptionIcon(client, subURL, resp.Header)
 
-	bodyBytes := make([]byte, 0, 1024*64)
-	buf := make([]byte, 4096)
-	for {
-		n, readErr := resp.Body.Read(buf)
-		if n > 0 {
-			bodyBytes = append(bodyBytes, buf[:n]...)
-		}
-		if readErr != nil {
-			break
-		}
+	bodyBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, up, down, tot, exp, iconURL, fmt.Errorf("reading subscription body: %w", err)
+	}
+	if strings.TrimSpace(strings.TrimPrefix(string(bodyBytes), "\uFEFF")) == "" {
+		return nil, up, down, tot, exp, iconURL, subscriptionEmptyBodyError(resp.Header)
 	}
 
 	entries, err := proxy.ParseSubscriptionBody(string(bodyBytes))

app_subscription_test.go

@@ -0,0 +1,85 @@
+package main
+
+import (
+	"encoding/base64"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func TestFetchSubscriptionFromURLSendsHWIDAndParsesEntries(t *testing.T) {
+	oldProvider := stableHWIDProvider
+	stableHWIDProvider = func(_ string) (string, error) {
+		return "unit-hwid-123", nil
+	}
+	defer func() {
+		stableHWIDProvider = oldProvider
+	}()
+
+	var seenHWID string
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if seenHWID == "" && strings.TrimSpace(r.Header.Get("x-hwid")) != "" {
+			seenHWID = strings.TrimSpace(r.Header.Get("x-hwid"))
+		}
+		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+		_, _ = w.Write([]byte("vless://af815621-b245-4149-89da-dd184cfc4b3d@example.com:443?type=tcp&security=none#Node"))
+	}))
+	defer ts.Close()
+
+	app := NewApp()
+	entries, _, _, _, _, _, err := app.fetchSubscriptionFromURL(ts.URL)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if seenHWID != "unit-hwid-123" {
+		t.Fatalf("x-hwid header mismatch: %q", seenHWID)
+	}
+	if len(entries) != 1 {
+		t.Fatalf("expected 1 entry, got %d", len(entries))
+	}
+	if entries[0].Type != "VLESS" {
+		t.Fatalf("expected VLESS, got %s", entries[0].Type)
+	}
+}
+
+func TestFetchSubscriptionFromURLEmptyBodyReturnsHWIDDiagnostic(t *testing.T) {
+	oldProvider := stableHWIDProvider
+	stableHWIDProvider = func(_ string) (string, error) {
+		return "unit-hwid-limit", nil
+	}
+	defer func() {
+		stableHWIDProvider = oldProvider
+	}()
+
+	announce := "Лимит устройств для подписки"
+	title := "V2RayTun [test]"
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+		w.Header().Set("X-Hwid-Limit", "true")
+		w.Header().Set("Announce", "base64:"+base64.StdEncoding.EncodeToString([]byte(announce)))
+		w.Header().Set("Profile-Title", "base64:"+base64.StdEncoding.EncodeToString([]byte(title)))
+		w.Header().Set("Support-Url", "https://example.com/support")
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer ts.Close()
+
+	app := NewApp()
+	_, _, _, _, _, _, err := app.fetchSubscriptionFromURL(ts.URL)
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	got := err.Error()
+	if !strings.Contains(got, "достигнут лимит устройств") {
+		t.Fatalf("unexpected error text: %s", got)
+	}
+	if !strings.Contains(got, announce) {
+		t.Fatalf("announce text not found: %s", got)
+	}
+	if !strings.Contains(got, title) {
+		t.Fatalf("profile title not found: %s", got)
+	}
+	if !strings.Contains(got, "https://example.com/support") {
+		t.Fatalf("support url not found: %s", got)
+	}
+}

build/windows/installer/wails_tools.nsh

@@ -14,7 +14,7 @@
     !define INFO_PRODUCTNAME "ResultV"
 !endif
 !ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "3.0.1"
+    !define INFO_PRODUCTVERSION "3.0.2"
 !endif
 !ifndef INFO_COPYRIGHT
     !define INFO_COPYRIGHT "Copyright........."

frontend/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "resultproxy",
   "private": true,
-  "version": "3.0.1",
+  "version": "3.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

frontend/package.json

@@ -1 +1 @@
-c846d03bd33d50f59be0d1d0c926b34f
+9da03058eaa8e3b097fc7a9936a34aa7

frontend/package.json.md5

@@ -39,6 +39,7 @@ export const useAppConfig = (addLog) => {
         theme: "dark",
         localPort: 0,
         listenLan: false,
+        dnsServers: [],
     });
     const [showProtocolModal, setShowProtocolModal] = useState(false);
     const [platform, setPlatform] = useState("windows");
@@ -276,6 +277,27 @@ export const useAppConfig = (addLog) => {
             setSettings(nextSettings);
             persistSettings(nextSettings).catch(console.error);
             wailsAPI.toggleAdBlock(value).catch(err => console.error("Ad block error:", err));
+        } else if (key === "dnsServers") {
+            const normalized = Array.isArray(value)
+                ? value
+                    .map((v) => String(v || "").trim())
+                    .filter(Boolean)
+                    .filter((v, idx, arr) => arr.indexOf(v) === idx)
+                : [];
+            const nextSettings = { ...settings, [key]: normalized };
+            setSettings(nextSettings);
+            try {
+                await persistSettings(nextSettings);
+                const status = await wailsAPI.getStatus();
+                if (status?.currentProxy) {
+                    await wailsAPI.applyMode(nextSettings.mode || "proxy");
+                }
+            } catch (err) {
+                console.error("DNS settings error:", err);
+                const rollbackSettings = { ...settings, [key]: previousValue };
+                setSettings(rollbackSettings);
+                await persistSettings(rollbackSettings).catch(console.error);
+            }
         } else {
             const nextSettings = { ...settings, [key]: value };
             setSettings(nextSettings);