Merge dev into main: release 3.2.1

Author: AandStep

.github/workflows/release.yml

@@ -284,6 +284,11 @@ jobs:
           const fs = require('fs');
           const update = JSON.parse(fs.readFileSync('update.json', 'utf8'));
 
+          // Version comes from the git tag, not update.json — the file is kept
+          // with version: "" between releases so clients on main don't see a
+          // version bump before CI has published the artifacts.
+          const version = (process.env.GITHUB_REF_NAME || '').replace(/^v/, '');
+
           const pickLang = (v, lang) => {
             if (v == null) return '';
             if (typeof v === 'string') return v;
@@ -307,17 +312,17 @@ jobs:
 
           const sections = [];
           if (ruNotes) {
-            sections.push(`Что нового в версии ${update.version}?\n\n${ruNotes}\n\n🌐 Официальный сайт: ${host}`);
+            sections.push(`Что нового в версии ${version}?\n\n${ruNotes}\n\n🌐 Официальный сайт: ${host}`);
           }
           if (enNotes && enNotes !== ruNotes) {
-            sections.push(`What's new in version ${update.version}?\n\n${enNotes}\n\n🌐 Official website: ${host}`);
+            sections.push(`What's new in version ${version}?\n\n${enNotes}\n\n🌐 Official website: ${host}`);
           }
           const releaseBody = sections.join('\n\n---\n\n');
           fs.writeFileSync('RELEASE_BODY.txt', releaseBody);
 
           const releaseName = enTitle && enTitle !== ruTitle
-            ? `ResultV v${update.version} - ${ruTitle} / ${enTitle}`
-            : `ResultV v${update.version} - ${ruTitle}`;
+            ? `ResultV v${version} - ${ruTitle} / ${enTitle}`
+            : `ResultV v${version} - ${ruTitle}`;
           fs.appendFileSync(process.env.GITHUB_OUTPUT, `release_name=${releaseName}\n`);
           NODE_EOF
           node prepare_release.cjs

.gitignore

@@ -55,6 +55,7 @@ build/linux/libcronet.so
 tools/encrypt-sub/
 build-release.bat
 build-release.sh
+docs/review
 
 # build
 build/bin/

README.en.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/version-3.2.0-blue.svg" alt="Version">
+  <img src="https://img.shields.io/badge/version-3.2.1-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">
@@ -29,11 +29,15 @@
   <a href="./README.md">Русский</a> | <b>English</b>
 </p>
 
+<p align="center">
+  <b>Website and downloads:</b> <a href="https://result-proxy.ru/">result-proxy.ru</a> • <b>Telegram channel:</b> <a href="https://t.me/resultvpn">@resultvpn</a>
+</p>
+
 ---
 
 ## Overview
 
-ResultV **3.2.0** 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.2.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).
 
 **Prebuilt releases:** GitHub Actions publishes **Windows amd64** artifacts (portable `.exe` and NSIS installer), **macOS** (`.dmg`) and **Linux** (`.AppImage`, `.deb`, `.rpm`) when a `v*` tag is pushed.
 
@@ -207,7 +211,3 @@ The [`.github/workflows/release.yml`](./.github/workflows/release.yml) workflow
 ## License
 
 This project is licensed under the **GNU General Public License v3.0** — see [`LICENSE`](./LICENSE).
-
----
-
-**Website and downloads:** [https://result-proxy.ru/](https://result-proxy.ru/)

README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/version-3.2.0-blue.svg" alt="Version">
+  <img src="https://img.shields.io/badge/version-3.2.1-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">
@@ -29,11 +29,15 @@
   <b>Русский</b> | <a href="./README.en.md">English</a>
 </p>
 
+<p align="center">
+  <b>Сайт и загрузки:</b> <a href="https://result-proxy.ru/">result-proxy.ru</a> • <b>Telegram-канал:</b> <a href="https://t.me/resultvpn">@resultvpn</a>
+</p>
+
 ---
 
 ## О проекте
 
-ResultV **3.2.0** — нативное настольное приложение на **[Wails v2](https://wails.io/)**. Интерфейс: **React 18**, **Vite**, **Tailwind CSS**; трафик обрабатывает бэкенд на **Go** и движок **[sing-box](https://github.com/SagerNet/sing-box)** (теги сборки заданы в `wails.json`). Локализация через **i18next** (русский и английский).
+ResultV **3.2.1** — нативное настольное приложение на **[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), **macOS** (`.dmg`) и **Linux** (`.AppImage`, `.deb`, `.rpm`) при push тега `v`*.
 
@@ -220,7 +224,3 @@ wails build -nsis
 ## Лицензия
 
 Проект распространяется под **GNU General Public License v3.0** — см. `[LICENSE](./LICENSE)`.
-
----
-
-**Сайт и загрузки:** [https://result-proxy.ru/](https://result-proxy.ru/)

THIRD_PARTY_LICENSES.md

@@ -39,3 +39,6 @@ Key dependency licenses:
 | github.com/wailsapp/wails | MIT |
 | golang.org/x/sys | BSD-3-Clause |
 | github.com/getlantern/golog | Apache-2.0 |
+| github.com/AdguardTeam/urlfilter | GPL-3.0 |
+| github.com/AdguardTeam/gomitmproxy | MIT |
+| github.com/AdguardTeam/golibs | Apache-2.0 |