Быстрый клиент · Naive · Hy2 · AWG · Xray
+
-
-
+
+
+
@@ -986,6 +1104,25 @@
const heroHint = $("heroHint");
const SHOP_URL = "https://evilfox.win/";
const AUTO_BEST_KEY = "navis.autoBest";
+ const THEME_KEY = "navis.theme";
+
+ (function initThemeToggle() {
+ const btn = $("themeBtn");
+ if (!btn) return;
+ const apply = (theme) => {
+ document.documentElement.setAttribute("data-theme", theme);
+ try { localStorage.setItem(THEME_KEY, theme); } catch (_) {}
+ btn.title = theme === "dark" ? "Светлая тема" : "Тёмная тема";
+ btn.setAttribute("aria-label", btn.title);
+ };
+ btn.addEventListener("click", () => {
+ const cur = document.documentElement.getAttribute("data-theme") === "dark" ? "dark" : "light";
+ apply(cur === "dark" ? "light" : "dark");
+ });
+ const cur = document.documentElement.getAttribute("data-theme") === "dark" ? "dark" : "light";
+ btn.title = cur === "dark" ? "Светлая тема" : "Тёмная тема";
+ btn.setAttribute("aria-label", btn.title);
+ })();
try {
const saved = localStorage.getItem(AUTO_BEST_KEY);
@@ -1384,6 +1521,8 @@
addBtn.addEventListener("click", () => {
$("newName").value = "";
$("newProxy").value = "";
+ const me = $("modalErr");
+ if (me) { me.style.display = "none"; me.textContent = ""; me.className = "meta"; }
modal.classList.add("open");
$("newName").focus();
});
@@ -1391,17 +1530,32 @@
modal.addEventListener("click", (e) => {
if (e.target === modal) modal.classList.remove("open");
});
+ function sanitizeShare(s) {
+ return String(s || "")
+ .replace(/[\u200B-\u200D\u2060\uFEFF\u2066-\u2069\u200E\u200F\u202A-\u202E]/g, "")
+ .trim();
+ }
$("createNew").addEventListener("click", () => withBusy(async () => {
+ const me = $("modalErr");
+ const showModalErr = (msg) => {
+ if (!me) { setMeta(String(msg), "err"); return; }
+ me.style.display = "block";
+ me.className = "meta err";
+ me.textContent = String(msg);
+ };
try {
const n = $("newName").value.trim();
- const p = $("newProxy").value.trim();
+ const p = sanitizeShare($("newProxy").value);
if (!n) throw "Укажите название профиля";
+ if (!p) throw "Вставьте ссылку или конфиг Amnezia/AWG";
+ $("newProxy").value = p;
await createProfile(n, p, !!sysproxy.checked);
modal.classList.remove("open");
+ if (me) { me.style.display = "none"; me.textContent = ""; }
formHydrated = false;
dirty = false;
setMeta("Профиль создан", "ok");
- } catch (e) { setMeta(String(e), "err"); }
+ } catch (e) { showModalErr(e); }
}));
async function openShop(e) {
diff --git a/internal/config/detect.go b/internal/config/detect.go
index c14a4c7..ea2eda3 100644
--- a/internal/config/detect.go
+++ b/internal/config/detect.go
@@ -4,6 +4,7 @@ import "strings"
// DetectProtocol infers protocol from a share/proxy URI or config body.
func DetectProtocol(raw string) Protocol {
+ raw = stripShareNoise(raw)
lower := strings.ToLower(strings.TrimSpace(raw))
switch {
case strings.HasPrefix(lower, "hysteria2://"), strings.HasPrefix(lower, "hy2://"):
@@ -29,3 +30,22 @@ func DetectProtocol(raw string) Protocol {
return ""
}
}
+
+func stripShareNoise(raw string) string {
+ raw = strings.TrimPrefix(raw, "\ufeff")
+ var b strings.Builder
+ for _, r := range raw {
+ switch r {
+ case '\u200b', '\u200c', '\u200d', '\u2060', '\ufeff',
+ '\u2066', '\u2067', '\u2068', '\u2069',
+ '\u200e', '\u200f',
+ '\u202a', '\u202b', '\u202c', '\u202d', '\u202e':
+ continue
+ }
+ if r < 0x20 && r != '\n' && r != '\r' && r != '\t' {
+ continue
+ }
+ b.WriteRune(r)
+ }
+ return strings.TrimSpace(b.String())
+}
diff --git a/internal/config/profiles.go b/internal/config/profiles.go
index 3eb01e7..30e6e20 100644
--- a/internal/config/profiles.go
+++ b/internal/config/profiles.go
@@ -90,7 +90,17 @@ func (c *Config) UpsertProfile(name, proxy string) error {
}
// UpsertProfileWithProtocol creates/updates a profile and optionally sets protocol.
+// The upserted profile becomes Active.
func (c *Config) UpsertProfileWithProtocol(name, proxy string, proto Protocol) error {
+ return c.upsertProfile(name, proxy, proto, true)
+}
+
+// UpsertProfileKeepActive creates/updates a profile without changing Active.
+func (c *Config) UpsertProfileKeepActive(name, proxy string, proto Protocol) error {
+ return c.upsertProfile(name, proxy, proto, false)
+}
+
+func (c *Config) upsertProfile(name, proxy string, proto Protocol, activate bool) error {
name = strings.TrimSpace(name)
if name == "" {
return fmt.Errorf("имя профиля пустое")
@@ -110,7 +120,9 @@ func (c *Config) UpsertProfileWithProtocol(name, proxy string, proto Protocol) e
if len(c.Profiles[i].Listen) == 0 {
c.Profiles[i].Listen = defaultListen()
}
- c.Active = name
+ if activate {
+ c.Active = name
+ }
return nil
}
}
@@ -121,7 +133,9 @@ func (c *Config) UpsertProfileWithProtocol(name, proxy string, proto Protocol) e
Proxy: proxy,
Listen: defaultListen(),
})
- c.Active = name
+ if activate {
+ c.Active = name
+ }
return nil
}
diff --git a/internal/core/manager.go b/internal/core/manager.go
index 8d89f64..fc79004 100644
--- a/internal/core/manager.go
+++ b/internal/core/manager.go
@@ -283,8 +283,13 @@ func (m *Manager) SetActiveProfile(name string) error {
func (m *Manager) SaveProfile(name, proxy string) error {
m.mu.Lock()
defer m.mu.Unlock()
- if m.engine != nil && m.engine.Running() {
- return fmt.Errorf("сначала отключитесь")
+ name = strings.TrimSpace(name)
+ if name == "" {
+ return fmt.Errorf("имя профиля пустое")
+ }
+ connected := m.engine != nil && m.engine.Running()
+ if connected && name == m.cfg.Active {
+ return fmt.Errorf("сначала отключитесь, чтобы изменить активный профиль")
}
proxy = strings.TrimSpace(proxy)
var proto config.Protocol
@@ -296,7 +301,13 @@ func (m *Manager) SaveProfile(name, proxy string) error {
proxy = normalized
proto = detected
}
- if err := m.cfg.UpsertProfileWithProtocol(name, proxy, proto); err != nil {
+ var err error
+ if connected {
+ err = m.cfg.UpsertProfileKeepActive(name, proxy, proto)
+ } else {
+ err = m.cfg.UpsertProfileWithProtocol(name, proxy, proto)
+ }
+ if err != nil {
return err
}
if p, err := m.cfg.ActiveProfile(); err == nil {
diff --git a/internal/linknorm/normalize.go b/internal/linknorm/normalize.go
index 3966b2d..67e6213 100644
--- a/internal/linknorm/normalize.go
+++ b/internal/linknorm/normalize.go
@@ -2,7 +2,6 @@ package linknorm
import (
"fmt"
- "strings"
"vpnclient/internal/config"
"vpnclient/internal/protocols/awg"
@@ -13,7 +12,7 @@ import (
// Normalize normalizes a share/proxy URI for the given protocol (or auto-detect).
func Normalize(proto config.Protocol, raw string) (normalized string, detected config.Protocol, remark string, err error) {
- raw = strings.TrimSpace(raw)
+ raw = SanitizeShareText(raw)
if raw == "" {
return "", proto, "", fmt.Errorf("пустая ссылка")
}
diff --git a/internal/linknorm/sanitize.go b/internal/linknorm/sanitize.go
new file mode 100644
index 0000000..beec82c
--- /dev/null
+++ b/internal/linknorm/sanitize.go
@@ -0,0 +1,35 @@
+package linknorm
+
+import (
+ "strings"
+ "unicode"
+)
+
+// SanitizeShareText strips BOM, bidi isolates and zero-width chars that break
+// scheme detection (common when pasting from messengers / Amnezia share).
+func SanitizeShareText(raw string) string {
+ raw = strings.TrimPrefix(raw, "\ufeff")
+ raw = strings.TrimSpace(raw)
+ if raw == "" {
+ return ""
+ }
+ var b strings.Builder
+ b.Grow(len(raw))
+ for _, r := range raw {
+ switch r {
+ case '\u200b', '\u200c', '\u200d', '\u2060', '\ufeff', // zero-width / BOM
+ '\u2066', '\u2067', '\u2068', '\u2069', // LRI/RLI/FSI/PDI
+ '\u200e', '\u200f', // LRM/RLM
+ '\u202a', '\u202b', '\u202c', '\u202d', '\u202e': // embedding overrides
+ continue
+ }
+ if r < 0x20 && r != '\n' && r != '\r' && r != '\t' {
+ continue
+ }
+ if unicode.Is(unicode.Cf, r) { // other format controls
+ continue
+ }
+ b.WriteRune(r)
+ }
+ return strings.TrimSpace(b.String())
+}
diff --git a/internal/linknorm/sanitize_test.go b/internal/linknorm/sanitize_test.go
new file mode 100644
index 0000000..2d36999
--- /dev/null
+++ b/internal/linknorm/sanitize_test.go
@@ -0,0 +1,42 @@
+package linknorm
+
+import "testing"
+
+func TestSanitizeShareText_BidiWrappers(t *testing.T) {
+ raw := "\u2068vpn://abc\u2069"
+ got := SanitizeShareText(raw)
+ if got != "vpn://abc" {
+ t.Fatalf("got %q", got)
+ }
+}
+
+func TestNormalize_DirtyVPN(t *testing.T) {
+ raw := "\u2068vpn://W0ludGVyZmFjZV0KQWRkcmVzcyA9IDEwLjguMS4xMy8zMgpETlMgPSAxLjEuMS4xClByaXZhdGVLZXkgPSBhSkpSYUFFY1RidWdJYjB2emFJcW5MQkZJQ0dqNlRkcXo1RC84OU13T0hZPQpKYyA9IDYKCltQZWVyXQpQdWJsaWNLZXkgPSBOUThJMVpPcUtxWmhGUXlxcXBuakRWc1poWXpkUk11Qm9tVXBzNWZPTTNzPQpFbmRwb2ludCA9IHJ1LmRlNGltYS51azo0MTQyMQpBbGxvd2VkSVBzID0gMC4wLjAuMC8w\u2069"
+ // Use full user link instead for reliable parse
+ raw = "\u2068vpn://W0ludGVyZmFjZV0KQWRkcmVzcyA9IDEwLjguMS4xMy8zMgpETlMgPSAxNzIuMjkuMTcyLjI1NCwgMS4wLjAuMQpQcml2YXRlS2V5ID0gYUpKUmFBRWNUYnVnSWIwdnphSXFuTEJGSUNHajZUZHF6NUQvODlNd09IWT0KTVRVID0gMTI4MApKYyA9IDYKSm1pbiA9IDEwCkptYXggPSA1MApTMSA9IDc0ClMyID0gNDcKUzMgPSA1NgpTNCA9IDMKSDEgPSA1OTA2OTcyNzktMTg4ODc3NDc4NApIMiA9IDIxMDk1MTkwNDctMjEyNDM5NTA2OQpIMyA9IDIxMzY3MjM2NDAtMjE0MTI1MTI4MwpINCA9IDIxNDcyNDg5MzYtMjE0NzM5ODY2MQoKW1BlZXJdClB1YmxpY0tleSA9IE5ROEkxWk9xS3FaaEZReXFxcG5qRFZzWmhZemRSTXVCb21VcHM1Zk9NM3M9ClByZXNoYXJlZEtleSA9IGxTVS9vd1hoNHIvU09UVndTaU5FM1BCZGVPbDdBUUpreUZlTGdMc1Q4ekk9CkFsbG93ZWRJUHMgPSAwLjAuMC4wLzAsIDo6LzAKRW5kcG9pbnQgPSBydS5kZTRpbWEudWs6NDE0MjEKUGVyc2lzdGVudEtlZXBhbGl2ZSA9IDI1\u2069"
+ u, proto, _, err := Normalize("", raw)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if proto != "awg" {
+ t.Fatalf("proto %q", proto)
+ }
+ if u == "" || !containsFold(u, "[Interface]") {
+ t.Fatalf("normalized %q", u)
+ }
+}
+
+func containsFold(s, sub string) bool {
+ return len(s) >= len(sub) && (s == sub || len(sub) == 0 ||
+ (len(s) > 0 && (stringIndexFold(s, sub) >= 0)))
+}
+
+func stringIndexFold(s, sub string) int {
+ // simple contains for test
+ for i := 0; i+len(sub) <= len(s); i++ {
+ if s[i:i+len(sub)] == sub {
+ return i
+ }
+ }
+ return -1
+}
diff --git a/internal/protocols/awg/conf.go b/internal/protocols/awg/conf.go
index 3647295..2fda8d8 100644
--- a/internal/protocols/awg/conf.go
+++ b/internal/protocols/awg/conf.go
@@ -35,7 +35,7 @@ type Conf struct {
// Detect reports whether raw looks like an AWG/WireGuard config or share link.
func Detect(raw string) bool {
- raw = strings.TrimSpace(raw)
+ raw = sanitizeShare(raw)
if raw == "" {
return false
}
@@ -58,7 +58,7 @@ func Detect(raw string) bool {
// Parse accepts a WireGuard/AWG .conf body, awg:// URI, vpn:// blob, or Amnezia JSON.
func Parse(raw string) (Conf, error) {
- raw = strings.TrimSpace(raw)
+ raw = sanitizeShare(raw)
if raw == "" {
return Conf{}, fmt.Errorf("пустой AWG конфиг")
}
@@ -83,6 +83,26 @@ func Parse(raw string) (Conf, error) {
}
}
+func sanitizeShare(raw string) string {
+ raw = strings.TrimPrefix(raw, "\ufeff")
+ var b strings.Builder
+ b.Grow(len(raw))
+ for _, r := range raw {
+ switch r {
+ case '\u200b', '\u200c', '\u200d', '\u2060', '\ufeff',
+ '\u2066', '\u2067', '\u2068', '\u2069',
+ '\u200e', '\u200f',
+ '\u202a', '\u202b', '\u202c', '\u202d', '\u202e':
+ continue
+ }
+ if r < 0x20 && r != '\n' && r != '\r' && r != '\t' {
+ continue
+ }
+ b.WriteRune(r)
+ }
+ return strings.TrimSpace(b.String())
+}
+
func parseINI(raw string) (Conf, error) {
var c Conf
section := "interface" // treat leading keys before [Interface] as Interface
diff --git a/internal/protocols/awg/vpn_user_test.go b/internal/protocols/awg/vpn_user_test.go
new file mode 100644
index 0000000..cf11b30
--- /dev/null
+++ b/internal/protocols/awg/vpn_user_test.go
@@ -0,0 +1,35 @@
+package awg
+
+import (
+ "strings"
+ "testing"
+)
+
+func TestParseUserVPNLink(t *testing.T) {
+ raw := `vpn://W0ludGVyZmFjZV0KQWRkcmVzcyA9IDEwLjguMS4xMy8zMgpETlMgPSAxNzIuMjkuMTcyLjI1NCwgMS4wLjAuMQpQcml2YXRlS2V5ID0gYUpKUmFBRWNUYnVnSWIwdnphSXFuTEJGSUNHajZUZHF6NUQvODlNd09IWT0KTVRVID0gMTI4MApKYyA9IDYKSm1pbiA9IDEwCkptYXggPSA1MApTMSA9IDc0ClMyID0gNDcKUzMgPSA1NgpTNCA9IDMKSDEgPSA1OTA2OTcyNzktMTg4ODc3NDc4NApIMiA9IDIxMDk1MTkwNDctMjEyNDM5NTA2OQpIMyA9IDIxMzY3MjM2NDAtMjE0MTI1MTI4MwpINCA9IDIxNDcyNDg5MzYtMjE0NzM5ODY2MQoKW1BlZXJdClB1YmxpY0tleSA9IE5ROEkxWk9xS3FaaEZReXFxcG5qRFZzWmhZemRSTXVCb21VcHM1Zk9NM3M9ClByZXNoYXJlZEtleSA9IGxTVS9vd1hoNHIvU09UVndTaU5FM1BCZGVPbDdBUUpreUZlTGdMc1Q4ekk9CkFsbG93ZWRJUHMgPSAwLjAuMC4wLzAsIDo6LzAKRW5kcG9pbnQgPSBydS5kZTRpbWEudWs6NDE0MjEKUGVyc2lzdGVudEtlZXBhbGl2ZSA9IDI1`
+ c, err := Parse(raw)
+ if err != nil {
+ t.Fatalf("Parse: %v", err)
+ }
+ if c.Endpoint != "ru.de4ima.uk:41421" {
+ t.Fatalf("endpoint %q", c.Endpoint)
+ }
+ if !strings.Contains(c.H1, "-") {
+ t.Fatalf("expected range H1, got %q", c.H1)
+ }
+ u, rem, err := NormalizeShareLink(raw)
+ if err != nil {
+ t.Fatalf("Normalize: %v", err)
+ }
+ t.Logf("remark=%q normalized_len=%d h1=%q", rem, len(u), c.H1)
+
+ // invisible unicode wrappers often come from mobile share / chat paste
+ dirty := "\u2068" + raw + "\u2069\u2005"
+ if !Detect(dirty) {
+ t.Fatal("Detect should accept dirty bidi-wrapped vpn://")
+ }
+ _, _, err = NormalizeShareLink(dirty)
+ if err != nil {
+ t.Fatalf("dirty NormalizeShareLink: %v", err)
+ }
+}
diff --git a/internal/update/update.go b/internal/update/update.go
index ea2e71b..e19bc38 100644
--- a/internal/update/update.go
+++ b/internal/update/update.go
@@ -22,7 +22,7 @@ const CurrentVersion = "2.7.3"
// BuildNumber is the monotonic build within CurrentVersion (Windows FileVersion 4th part,
// macOS CFBundleVersion suffix, Android versionCode low digits). Bump on every release build.
-const BuildNumber = 1
+const BuildNumber = 3
// DefaultManifestURL is the update feed (hosted in the project git repo).
const DefaultManifestURL = "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/update.json"
diff --git a/scripts/build-macos-arm64.sh b/scripts/build-macos-arm64.sh
index 936bd96..ab6f06b 100755
--- a/scripts/build-macos-arm64.sh
+++ b/scripts/build-macos-arm64.sh
@@ -59,7 +59,7 @@ build = "${BUILD}"
full = "${FULL}"
binp = Path('dist/navis-release/darwin-arm64/Navis')
h = hashlib.sha256(binp.read_bytes()).hexdigest()
-notes = f"Navis {ver}+{build}: восстановление system proxy после crash; auth macOS /api; обязательный SHA обновлений; fix UDP ping; HTTPS-only подписки; UI без зависания на connect."
+notes = f"Navis {ver}+{build}: тёмная тема; fix импорта Amnezia vpn:// (sanitize, создание профиля при подключении, ошибка в модалке)."
for p in [Path('dist/update.json'), Path('dist/navis-release/update.json')]:
if not p.exists():
continue
diff --git a/server/update.json b/server/update.json
index 86ac28e..0eb13f5 100644
--- a/server/update.json
+++ b/server/update.json
@@ -1,6 +1,6 @@
{
"version": "2.7.3",
- "notes": "2.7.3+1: восстановление system proxy после crash; auth для macOS /api; обязательный SHA обновлений; fix UDP ping; HTTPS-only подписки; UI без зависания на connect.",
+ "notes": "Navis 2.7.3+3: тёмная тема; fix импорта Amnezia vpn:// (sanitize, создание профиля при подключении, ошибка в модалке).",
"platform": "windows-amd64",
"os": "windows",
"arch": "amd64",
@@ -16,7 +16,7 @@
},
"darwin-arm64": {
"url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-arm64/Navis",
- "sha256": "847fe952e6d1dfb83bb74661accbbe2c6df0f4261a4c0619c0e20e0a7faae3ca",
+ "sha256": "3cba96ea2124863a3f401fdcd05dc7b8bc24588241be239c793d0f34177023eb",
"os": "darwin",
"arch": "arm64",
"dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-arm64/Navis.dmg",
diff --git a/versioninfo.json b/versioninfo.json
index b9acf1a..10d3c24 100644
--- a/versioninfo.json
+++ b/versioninfo.json
@@ -1,7 +1,7 @@
{
"FixedFileInfo": {
- "FileVersion": { "Major": 2, "Minor": 7, "Patch": 3, "Build": 1 },
- "ProductVersion": { "Major": 2, "Minor": 7, "Patch": 3, "Build": 1 },
+ "FileVersion": { "Major": 2, "Minor": 7, "Patch": 3, "Build": 3 },
+ "ProductVersion": { "Major": 2, "Minor": 7, "Patch": 3, "Build": 3 },
"FileFlagsMask": "3f",
"FileFlags": "00",
"FileOS": "40004",
@@ -11,12 +11,12 @@
"StringFileInfo": {
"CompanyName": "EvilFox",
"FileDescription": "Navis 2 — VPN client (Naive / Hy2 / AWG / VLESS / VMess / Trojan)",
- "FileVersion": "2.7.3.1",
+ "FileVersion": "2.7.3.3",
"InternalName": "Navis",
"LegalCopyright": "Copyright (c) EvilFox",
"OriginalFilename": "Navis.exe",
"ProductName": "Navis",
- "ProductVersion": "2.7.3.1",
+ "ProductVersion": "2.7.3.3",
"Comments": "Open-source VPN/proxy client. https://evilfox.win/"
},
"VarFileInfo": {