Release 3.8.2.4: unify Windows/macOS GUI on glaze HTTP host.

Auto-bump build number on each compile; ship versioned Windows artifacts.

Co-authored-by: Cursor <cursoragent@cursor.com>

cmd/vpnapp/gui_desktop.go

@@ -1,16 +1,13 @@
-//go:build darwin
+//go:build windows || darwin
 
 package main
 
 import (
-	"fmt"
 	"log"
 	"net/http"
 	"os"
-	"os/exec"
 	"os/signal"
 	"runtime"
-	"syscall"
 	"time"
 
 	"github.com/crgimenes/glaze"
@@ -28,6 +25,7 @@ func main() {
 		return
 	}
 	update.CleanupStaleDownloads()
+
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	log.Printf("Navis %s · GOMAXPROCS=%d NumCPU=%d", update.DisplayVersion(), runtime.GOMAXPROCS(0), runtime.NumCPU())
 
@@ -44,6 +42,7 @@ func main() {
 	if err != nil {
 		fatalf("Ошибка конфига %s: %v", cfgPath, err)
 	}
+
 	logBuf := logbuf.New(0)
 	mgr, err := core.NewManager(cfgPath, cfg, logBuf)
 	if err != nil {
@@ -51,10 +50,9 @@ func main() {
 	}
 
 	a := apphost.New(mgr, cfgPath, logBuf)
-	a.OpenURL = func(u string) error {
-		return exec.Command("open", u).Start()
-	}
+	a.OpenURL = openExternal
 	a.OnAfterUpdate = func() {
+		// Hard-exit so the OS unlocks the binary for replacement.
 		go func() {
 			time.Sleep(300 * time.Millisecond)
 			_ = a.Disconnect()
@@ -71,6 +69,7 @@ func main() {
 	go func() {
 		_ = srv.Serve(ln)
 	}()
+
 	a.StartBackground()
 	trayhost.Start("Navis", trayhost.Hooks{
 		Connect:    func() { _ = a.Connect() },
@@ -86,12 +85,13 @@ func main() {
 	w, err := glaze.New(false)
 	if err != nil || w == nil {
 		log.Printf("webview unavailable (%v); opening default browser", err)
-		if err2 := exec.Command("open", uiURL).Run(); err2 != nil {
+		if err2 := openExternal(uiURL); err2 != nil {
+			_ = srv.Close()
 			fatalf("Не удалось открыть интерфейс:\n%v\n%v\n%s", err, err2, uiURL)
 		}
 		log.Printf("Navis UI: %s", uiURL)
 		sig := make(chan os.Signal, 1)
-		signal.Notify(sig, os.Interrupt, syscall.SIGTERM)
+		signal.Notify(sig, shutdownSignals()...)
 		<-sig
 		_ = mgr.Disconnect()
 		_ = srv.Close()
@@ -105,14 +105,8 @@ func main() {
 
 	w.SetTitle("Navis")
 	w.SetSize(500, 900, glaze.HintNone)
+	decorateWindow(w)
 	w.Navigate(uiURL)
 	log.Printf("Navis UI: %s", uiURL)
 	w.Run()
 }
-
-func fatalf(format string, args ...any) {
-	msg := fmt.Sprintf(format, args...)
-	log.Println(msg)
-	_ = exec.Command("osascript", "-e", fmt.Sprintf(`display alert "Navis" message %q`, msg)).Run()
-	os.Exit(1)
-}

cmd/vpnapp/main_other.go

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	fmt.Fprintln(os.Stderr, "Navis GUI supports Windows (WebView2) and macOS.")
+	fmt.Fprintln(os.Stderr, "Navis GUI supports Windows and macOS (glaze + local HTTP UI).")
 	fmt.Fprintln(os.Stderr, "On this OS use the CLI: ./Navis connect | install-core | check-update")
 	os.Exit(1)
 }

cmd/vpnapp/main_windows.go

@@ -1,202 +0,0 @@
-//go:build windows
-
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"runtime"
-	"time"
-	"unsafe"
-
-	"github.com/jchv/go-webview2"
-	"golang.org/x/sys/windows"
-
-	"vpnclient/internal/apphost"
-	"vpnclient/internal/appui"
-	"vpnclient/internal/config"
-	"vpnclient/internal/core"
-	"vpnclient/internal/logbuf"
-	"vpnclient/internal/trayhost"
-	"vpnclient/internal/update"
-)
-
-func main() {
-	if update.MaybeFinishUpdate(os.Args[1:]) {
-		return
-	}
-	update.CleanupStaleDownloads()
-
-	log.SetFlags(log.LstdFlags | log.Lshortfile)
-	log.Printf("Navis %s · GOMAXPROCS=%d NumCPU=%d", update.DisplayVersion(), runtime.GOMAXPROCS(0), runtime.NumCPU())
-
-	cfgPath, err := config.LocateConfig()
-	if err != nil {
-		fatalDialog("Не удалось найти путь конфига: %v", err)
-	}
-	if _, err := os.Stat(cfgPath); os.IsNotExist(err) {
-		if err := config.WriteExample(cfgPath); err != nil {
-			fatalDialog("Не удалось создать конфиг: %v", err)
-		}
-	}
-
-	cfg, err := config.Load(cfgPath)
-	if err != nil {
-		fatalDialog("Ошибка конфига %s: %v", cfgPath, err)
-	}
-
-	logBuf := logbuf.New(0)
-	mgr, err := core.NewManager(cfgPath, cfg, logBuf)
-	if err != nil {
-		fatalDialog("%v", err)
-	}
-
-	a := apphost.New(mgr, cfgPath, logBuf)
-	a.OpenURL = shellOpen
-	a.OnAfterUpdate = func() {
-		// Hard-exit so Windows unlocks Navis.exe; do not wait on webview.Terminate.
-		go func() {
-			time.Sleep(300 * time.Millisecond)
-			_ = a.Disconnect()
-			os.Exit(0)
-		}()
-	}
-
-	dataPath := filepath.Join(filepath.Dir(cfgPath), ".navis-webview")
-	_ = os.MkdirAll(dataPath, 0o755)
-
-	w := webview2.NewWithOptions(webview2.WebViewOptions{
-		Debug:     false,
-		AutoFocus: true,
-		DataPath:  dataPath,
-		WindowOptions: webview2.WindowOptions{
-			Title:  "Navis",
-			Width:  500,
-			Height: 900,
-			Center: true,
-			IconId: 1,
-		},
-	})
-	if w == nil {
-		fatalDialog("Не удалось создать окно WebView2.\nУстановите Microsoft Edge WebView2 Runtime.")
-	}
-	defer func() {
-		_ = mgr.Disconnect()
-		w.Destroy()
-	}()
-
-	applyWindowIcon(w.Window())
-	w.SetSize(500, 900, webview2.HintNone)
-
-	mustBind(w, "getState", a.GetState)
-	mustBind(w, "getEditState", a.GetEditState)
-	mustBind(w, "connect", a.Connect)
-	mustBind(w, "disconnect", a.Disconnect)
-	mustBind(w, "connectProfile", a.ConnectProfile)
-	mustBind(w, "saveProfile", a.SaveProfile)
-	mustBind(w, "createProfile", a.CreateProfile)
-	mustBind(w, "selectProfile", a.SelectProfile)
-	mustBind(w, "deleteProfile", a.DeleteProfile)
-	mustBind(w, "installCore", a.InstallCore)
-	mustBind(w, "openURL", a.OpenShopURL)
-	mustBind(w, "pingServers", a.PingServers)
-	mustBind(w, "pingBest", a.PingBest)
-	mustBind(w, "checkUpdate", a.CheckUpdate)
-	mustBind(w, "applyUpdate", a.ApplyUpdate)
-	mustBind(w, "saveHy2", a.SaveHy2)
-	mustBind(w, "importSubscription", a.ImportSubscription)
-	mustBind(w, "getLogs", a.GetLogs)
-	mustBind(w, "probeTunnel", a.ProbeTunnel)
-	mustBind(w, "savePrefs", a.SavePrefs)
-
-	a.StartBackground()
-	trayhost.Start("Navis", trayhost.Hooks{
-		Connect:    func() { _ = a.Connect() },
-		Disconnect: func() { _ = a.Disconnect() },
-		Quit: func() {
-			_ = a.Disconnect()
-			os.Exit(0)
-		},
-		IsUp: func() bool { return a.Mgr.Status().Connected },
-	})
-
-	go a.AutoCheckUpdate()
-
-	w.SetHtml(appui.IndexHTML)
-	w.Run()
-}
-
-func mustBind(w webview2.WebView, name string, fn interface{}) {
-	if err := w.Bind(name, fn); err != nil {
-		fatalDialog("bind %s: %v", name, err)
-	}
-}
-
-func shellOpen(raw string) error {
-	verb, err := windows.UTF16PtrFromString("open")
-	if err != nil {
-		return err
-	}
-	file, err := windows.UTF16PtrFromString(raw)
-	if err != nil {
-		return err
-	}
-	return windows.ShellExecute(0, verb, file, nil, nil, windows.SW_SHOWNORMAL)
-}
-
-func applyWindowIcon(hwnd unsafe.Pointer) {
-	ico := findIconPath()
-	if ico == "" || hwnd == nil {
-		return
-	}
-	pathPtr, err := windows.UTF16PtrFromString(ico)
-	if err != nil {
-		return
-	}
-	user32 := windows.NewLazySystemDLL("user32.dll")
-	loadImage := user32.NewProc("LoadImageW")
-	sendMessage := user32.NewProc("SendMessageW")
-	const (
-		imageIcon      = 1
-		lrLoadFromFile = 0x0010
-		lrDefaultSize  = 0x0040
-		wmSetIcon      = 0x0080
-		iconSmall      = 0
-		iconBig        = 1
-	)
-	h, _, _ := loadImage.Call(0, uintptr(unsafe.Pointer(pathPtr)), imageIcon, 0, 0, lrLoadFromFile|lrDefaultSize)
-	if h == 0 {
-		return
-	}
-	sendMessage.Call(uintptr(hwnd), wmSetIcon, iconSmall, h)
-	sendMessage.Call(uintptr(hwnd), wmSetIcon, iconBig, h)
-}
-
-func findIconPath() string {
-	candidates := []string{}
-	if exe, err := os.Executable(); err == nil {
-		dir := filepath.Dir(exe)
-		candidates = append(candidates,
-			filepath.Join(dir, "assets", "navis.ico"),
-			filepath.Join(dir, "navis.ico"),
-		)
-	}
-	if cwd, err := os.Getwd(); err == nil {
-		candidates = append(candidates, filepath.Join(cwd, "assets", "navis.ico"))
-	}
-	for _, c := range candidates {
-		if st, err := os.Stat(c); err == nil && !st.IsDir() {
-			return c
-		}
-	}
-	return ""
-}
-
-func fatalDialog(format string, args ...interface{}) {
-	msg := fmt.Sprintf(format, args...)
-	log.Println(msg)
-	messageBox(msg)
-	os.Exit(1)
-}

cmd/vpnapp/platform_darwin.go

@@ -0,0 +1,33 @@
+//go:build darwin
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"syscall"
+
+	"github.com/crgimenes/glaze"
+)
+
+func openExternal(raw string) error {
+	return exec.Command("open", raw).Start()
+}
+
+func fatalf(format string, args ...any) {
+	msg := fmt.Sprintf(format, args...)
+	log.Println(msg)
+	_ = exec.Command("osascript", "-e", fmt.Sprintf(`display alert "Navis" message %q`, msg)).Run()
+	os.Exit(1)
+}
+
+func shutdownSignals() []os.Signal {
+	return []os.Signal{os.Interrupt, syscall.SIGTERM}
+}
+
+func decorateWindow(w glaze.WebView) {
+	// macOS Dock/app icon comes from the .app bundle; nothing to apply here.
+	_ = w
+}

cmd/vpnapp/platform_windows.go

@@ -0,0 +1,92 @@
+//go:build windows
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"unsafe"
+
+	"github.com/crgimenes/glaze"
+	"golang.org/x/sys/windows"
+)
+
+func openExternal(raw string) error {
+	verb, err := windows.UTF16PtrFromString("open")
+	if err != nil {
+		return err
+	}
+	file, err := windows.UTF16PtrFromString(raw)
+	if err != nil {
+		return err
+	}
+	return windows.ShellExecute(0, verb, file, nil, nil, windows.SW_SHOWNORMAL)
+}
+
+func fatalf(format string, args ...any) {
+	msg := fmt.Sprintf(format, args...)
+	log.Println(msg)
+	messageBox(msg)
+	os.Exit(1)
+}
+
+func shutdownSignals() []os.Signal {
+	return []os.Signal{os.Interrupt}
+}
+
+func decorateWindow(w glaze.WebView) {
+	if w == nil {
+		return
+	}
+	applyWindowIcon(w.Window())
+}
+
+func applyWindowIcon(hwnd unsafe.Pointer) {
+	ico := findIconPath()
+	if ico == "" || hwnd == nil {
+		return
+	}
+	pathPtr, err := windows.UTF16PtrFromString(ico)
+	if err != nil {
+		return
+	}
+	user32 := windows.NewLazySystemDLL("user32.dll")
+	loadImage := user32.NewProc("LoadImageW")
+	sendMessage := user32.NewProc("SendMessageW")
+	const (
+		imageIcon      = 1
+		lrLoadFromFile = 0x0010
+		lrDefaultSize  = 0x0040
+		wmSetIcon      = 0x0080
+		iconSmall      = 0
+		iconBig        = 1
+	)
+	h, _, _ := loadImage.Call(0, uintptr(unsafe.Pointer(pathPtr)), imageIcon, 0, 0, lrLoadFromFile|lrDefaultSize)
+	if h == 0 {
+		return
+	}
+	sendMessage.Call(uintptr(hwnd), wmSetIcon, iconSmall, h)
+	sendMessage.Call(uintptr(hwnd), wmSetIcon, iconBig, h)
+}
+
+func findIconPath() string {
+	candidates := []string{}
+	if exe, err := os.Executable(); err == nil {
+		dir := filepath.Dir(exe)
+		candidates = append(candidates,
+			filepath.Join(dir, "assets", "navis.ico"),
+			filepath.Join(dir, "navis.ico"),
+		)
+	}
+	if cwd, err := os.Getwd(); err == nil {
+		candidates = append(candidates, filepath.Join(cwd, "assets", "navis.ico"))
+	}
+	for _, c := range candidates {
+		if st, err := os.Stat(c); err == nil && !st.IsDir() {
+			return c
+		}
+	}
+	return ""
+}