Compare commits
10 Commits
56e290934d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbc595f568 | ||
|
|
9fbc7066cd | ||
|
|
a0d76586a9 | ||
|
|
1f54670e3e | ||
|
|
49f21a1bfd | ||
|
|
0bc4f92e06 | ||
|
|
2704069be1 | ||
|
|
5b0affda59 | ||
|
|
a58413d778 | ||
|
|
9e0625ef0e |
BIN
bin/sing-box.exe
Normal file
BIN
bin/sing-box.exe
Normal file
Binary file not shown.
31
build.go
Normal file
31
build.go
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
// Build script for HamyVPNClient Linux version
|
||||||
|
// build.go
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
fmt.Println("Building HamyVPNClient for Linux...")
|
||||||
|
|
||||||
|
// Set environment variables for cross-compilation
|
||||||
|
os.Setenv("GOOS", "linux")
|
||||||
|
os.Setenv("GOARCH", "amd64")
|
||||||
|
|
||||||
|
// Run the build command
|
||||||
|
cmd := exec.Command("go", "build", "-o", "hamy-vpn-client-linux", ".")
|
||||||
|
cmd.Dir = "linux-port"
|
||||||
|
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Build failed: %v\n", err)
|
||||||
|
fmt.Printf("Output: %s\n", output)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Build successful! Binary created: linux-port/hamy-vpn-client-linux")
|
||||||
|
}
|
||||||
22
config.json
Normal file
22
config.json
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"log": {
|
||||||
|
"level": "info"
|
||||||
|
},
|
||||||
|
"inbounds": [
|
||||||
|
{
|
||||||
|
"type": "mixed",
|
||||||
|
"listen": "127.0.0.1",
|
||||||
|
"listen_port": 1080,
|
||||||
|
"set_system_proxy": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outbounds": [
|
||||||
|
{
|
||||||
|
"type": "vless",
|
||||||
|
"server": "193.124.93.179",
|
||||||
|
"server_port": 39590,
|
||||||
|
"uuid": "3da694cb-cca3-4849-81c3-9ff60c4dc399",
|
||||||
|
"network": "tcp"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
6
configs.json
Normal file
6
configs.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"Title": "Конфиг 1",
|
||||||
|
"URL": "vless://3da694cb-cca3-4849-81c3-9ff60c4dc399@193.124.93.179:39590?type=tcp\u0026encryption=none\u0026security=none#TCP%20HamyVPN-TEST2"
|
||||||
|
}
|
||||||
|
]
|
||||||
BIN
hamy-vpn-client-final.exe
Normal file
BIN
hamy-vpn-client-final.exe
Normal file
Binary file not shown.
BIN
hamy-vpn-client-fixed.exe
Normal file
BIN
hamy-vpn-client-fixed.exe
Normal file
Binary file not shown.
BIN
hamy-vpn-client-new.exe
Normal file
BIN
hamy-vpn-client-new.exe
Normal file
Binary file not shown.
BIN
hamy-vpn-client-proxy.exe
Normal file
BIN
hamy-vpn-client-proxy.exe
Normal file
Binary file not shown.
BIN
hamy-vpn-client-test.exe
Normal file
BIN
hamy-vpn-client-test.exe
Normal file
Binary file not shown.
BIN
hamy-vpn-client-updated.exe
Normal file
BIN
hamy-vpn-client-updated.exe
Normal file
Binary file not shown.
BIN
hamy-vpn-client.exe
Normal file
BIN
hamy-vpn-client.exe
Normal file
Binary file not shown.
74
linux-port/DEBIAN_PACKAGE_CREATION.md
Normal file
74
linux-port/DEBIAN_PACKAGE_CREATION.md
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
# Debian Package Creation Instructions for HamyVPNClient
|
||||||
|
|
||||||
|
## Files Included:
|
||||||
|
- main.go (the Linux-compatible source code)
|
||||||
|
- go.mod (dependencies)
|
||||||
|
- setup.sh (initial setup script)
|
||||||
|
- README.md (documentation)
|
||||||
|
- build_debian.sh (build script)
|
||||||
|
- debian/ (Debian packaging files)
|
||||||
|
|
||||||
|
## To Build on Debian/Ubuntu:
|
||||||
|
|
||||||
|
1. Copy the linux-port directory to your Debian system
|
||||||
|
2. Install required packages:
|
||||||
|
```bash
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install golang gcc build-essential libgtk-3-dev libcairo2-dev libgl1-mesa-dev
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Navigate to the directory and build:
|
||||||
|
```bash
|
||||||
|
cd linux-port
|
||||||
|
go mod tidy
|
||||||
|
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o hamy-vpn-client .
|
||||||
|
```
|
||||||
|
|
||||||
|
## To Create a .deb Package:
|
||||||
|
|
||||||
|
1. Install packaging tools:
|
||||||
|
```bash
|
||||||
|
sudo apt install dh-golang devscripts
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Create the package structure:
|
||||||
|
```
|
||||||
|
hamy-vpn-client/
|
||||||
|
├── DEBIAN/
|
||||||
|
│ └── control
|
||||||
|
├── usr/
|
||||||
|
│ ├── bin/
|
||||||
|
│ │ └── hamy-vpn-client
|
||||||
|
│ └── share/
|
||||||
|
│ └── applications/
|
||||||
|
│ └── hamy-vpn-client.desktop
|
||||||
|
└── opt/
|
||||||
|
└── hamy-vpn-client/
|
||||||
|
├── main.go
|
||||||
|
├── go.mod
|
||||||
|
└── README.md
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Create the control file in DEBIAN/control:
|
||||||
|
```
|
||||||
|
Package: hamy-vpn-client
|
||||||
|
Version: 1.0.0
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Architecture: amd64
|
||||||
|
Depends: libc6, libgtk-3-0
|
||||||
|
Maintainer: Your Name <your.email@example.com>
|
||||||
|
Description: HamyVPN Client for VLESS connections
|
||||||
|
A GUI application for managing VLESS connections using sing-box.
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Build the package:
|
||||||
|
```bash
|
||||||
|
dpkg-deb --build hamy-vpn-client
|
||||||
|
```
|
||||||
|
|
||||||
|
## Notes:
|
||||||
|
|
||||||
|
- The application will auto-download sing-box on first run if not present
|
||||||
|
- Requires a graphical environment (X11/Wayland) to run
|
||||||
|
- Supports system proxy configuration for GNOME and KDE environments
|
||||||
51
linux-port/README.md
Normal file
51
linux-port/README.md
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
# HamyVPNClient for Linux
|
||||||
|
|
||||||
|
This is the Linux port of the HamyVPNClient, a GUI application for managing VLESS connections using sing-box.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- Cross-platform VLESS client using sing-box
|
||||||
|
- System proxy management for Linux (GNOME/KDE)
|
||||||
|
- Configuration management with import/export capabilities
|
||||||
|
- Auto-downloading of sing-box binaries
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- Go 1.21 or higher
|
||||||
|
- For GUI: X11, Wayland, or other supported display servers
|
||||||
|
- For proxy management: gsettings (GNOME) or kwriteconfig5 (KDE)
|
||||||
|
|
||||||
|
## Building
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Navigate to the project directory
|
||||||
|
cd linux-port
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
go mod tidy
|
||||||
|
|
||||||
|
# Build the application
|
||||||
|
go build -o hamy-vpn-client .
|
||||||
|
|
||||||
|
# Or run directly
|
||||||
|
go run main.go
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
1. Run the application: `./hamy-vpn-client`
|
||||||
|
2. Click "Конфигурации" to add VLESS URLs
|
||||||
|
3. Select a configuration and click "Подключить" to establish a connection
|
||||||
|
|
||||||
|
## Auto-download
|
||||||
|
|
||||||
|
The application will automatically download the appropriate sing-box binary for your system if not already present in the `bin/` directory.
|
||||||
|
|
||||||
|
## Known Issues
|
||||||
|
|
||||||
|
- May require elevated privileges to set system proxy in some environments
|
||||||
|
- Works best with GNOME and KDE desktop environments
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
MIT
|
||||||
77
linux-port/SUMMARY.md
Normal file
77
linux-port/SUMMARY.md
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
# HamyVPNClient - Linux Port Summary
|
||||||
|
|
||||||
|
## Completed Tasks
|
||||||
|
|
||||||
|
✅ Created a separate directory for the Linux port to avoid modifying the Windows version
|
||||||
|
✅ Analyzed the original codebase and identified Windows-specific code
|
||||||
|
✅ Removed Windows-specific dependencies (registry, HideWindow)
|
||||||
|
✅ Updated references from 'sing-box.exe' to 'sing-box'
|
||||||
|
✅ Implemented autoloading of latest sing-box from source
|
||||||
|
✅ Implemented system proxy management for Linux (GNOME/KDE)
|
||||||
|
✅ Prepared folder structure and packaging files
|
||||||
|
✅ Created Debian package structure and documentation
|
||||||
|
✅ Provided build instructions for Linux environment
|
||||||
|
|
||||||
|
## Project Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
linux-port/
|
||||||
|
├── main.go # Linux-compatible source code
|
||||||
|
├── go.mod # Dependencies
|
||||||
|
├── README.md # Usage documentation
|
||||||
|
├── setup.sh # Setup script
|
||||||
|
├── build_debian.sh # Build script for Debian
|
||||||
|
├── DEBIAN_PACKAGE_CREATION.md # Packaging instructions
|
||||||
|
├── configs.json # Configuration file (will be created at runtime)
|
||||||
|
├── config.json # Sing-box configuration (will be created at runtime)
|
||||||
|
└── bin/ # Sing-box binary directory (will be created at runtime)
|
||||||
|
└── debian/ # Debian packaging structure
|
||||||
|
├── DEBIAN/
|
||||||
|
│ └── control # Package metadata
|
||||||
|
├── usr/
|
||||||
|
│ ├── bin/
|
||||||
|
│ └── share/
|
||||||
|
│ └── applications/
|
||||||
|
│ └── hamy-vpn-client.desktop
|
||||||
|
└── opt/
|
||||||
|
└── hamy-vpn-client/
|
||||||
|
```
|
||||||
|
|
||||||
|
## Key Changes Made
|
||||||
|
|
||||||
|
1. **Platform Detection**: Added runtime.GOOS checks to handle platform-specific behavior
|
||||||
|
2. **Binary Naming**: Changed sing-box.exe to sing-box for Linux
|
||||||
|
3. **Process Hiding**: Removed HideWindow flag on non-Windows platforms
|
||||||
|
4. **Registry Removal**: Eliminated Windows registry dependencies
|
||||||
|
5. **Proxy Management**: Implemented Linux-compatible proxy settings (GNOME/KDE)
|
||||||
|
6. **Auto-download**: Added functionality to download appropriate sing-box for the platform
|
||||||
|
7. **Dependencies**: Updated imports to remove Windows-specific imports
|
||||||
|
|
||||||
|
## Deployment Instructions
|
||||||
|
|
||||||
|
### For End Users:
|
||||||
|
1. On Debian/Ubuntu: Use the provided Debian package structure
|
||||||
|
2. Run setup.sh to prepare directories
|
||||||
|
3. The application will auto-download sing-box on first run
|
||||||
|
4. Run with: ./hamy-vpn-client
|
||||||
|
|
||||||
|
### For Developers:
|
||||||
|
1. Install Go 1.21+ on Linux
|
||||||
|
2. Install build dependencies: `sudo apt install build-essential libgtk-3-dev`
|
||||||
|
3. Run: `go mod tidy && go build -o hamy-vpn-client .`
|
||||||
|
|
||||||
|
## Limitations
|
||||||
|
|
||||||
|
- Cross-compilation from Windows to Linux GUI app is not possible due to CGO requirements
|
||||||
|
- The actual binary must be compiled on Linux
|
||||||
|
- Full system proxy integration depends on desktop environment (best with GNOME/KDE)
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
The application can be tested on Linux by:
|
||||||
|
1. Compiling the code
|
||||||
|
2. Running the binary
|
||||||
|
3. Adding a valid VLESS configuration
|
||||||
|
4. Connecting and verifying proxy settings in the system network settings
|
||||||
|
|
||||||
|
This Linux port maintains all functionality of the original Windows version while being compatible with Linux systems and conventions.
|
||||||
29
linux-port/build_debian.sh
Normal file
29
linux-port/build_debian.sh
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
# Build script for creating a Debian package
|
||||||
|
# build_debian.sh
|
||||||
|
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "Setting up environment for Linux build..."
|
||||||
|
|
||||||
|
# Install dependencies if needed
|
||||||
|
if ! command -v gcc &> /dev/null; then
|
||||||
|
echo "GCC is required for building. Please install build-essential."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set environment for Linux build
|
||||||
|
export GOOS=linux
|
||||||
|
export GOARCH=amd64
|
||||||
|
export CGO_ENABLED=1
|
||||||
|
|
||||||
|
echo "Building HamyVPNClient for Linux..."
|
||||||
|
cd linux-port
|
||||||
|
go build -o hamy-vpn-client-linux main.go
|
||||||
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo "Build successful!"
|
||||||
|
echo "Binary created: linux-port/hamy-vpn-client-linux"
|
||||||
|
else
|
||||||
|
echo "Build failed!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
10
linux-port/debian/DEBIAN/control
Normal file
10
linux-port/debian/DEBIAN/control
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
Package: hamy-vpn-client
|
||||||
|
Version: 1.0.0
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Architecture: amd64
|
||||||
|
Depends: libc6, libgtk-3-0, libgl1-mesa-glx, ca-certificates
|
||||||
|
Maintainer: HamyVPN Developer <developer@example.com>
|
||||||
|
Description: HamyVPN Client for VLESS connections
|
||||||
|
A GUI application for managing VLESS connections using sing-box.
|
||||||
|
Supports system proxy configuration for seamless integration.
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=Hamy VPN Client
|
||||||
|
Comment=A VLESS client using sing-box
|
||||||
|
Exec=/usr/bin/hamy-vpn-client
|
||||||
|
Icon=
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Categories=Network;
|
||||||
40
linux-port/go.mod
Normal file
40
linux-port/go.mod
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
module hamy-vpn-client-linux
|
||||||
|
|
||||||
|
go 1.21
|
||||||
|
|
||||||
|
require fyne.io/fyne/v2 v2.7.2
|
||||||
|
|
||||||
|
require (
|
||||||
|
fyne.io/systray v1.12.0 // indirect
|
||||||
|
github.com/BurntSushi/toml v1.5.0 // indirect
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/fredbi/uri v1.1.1 // indirect
|
||||||
|
github.com/fsnotify/fsnotify v1.9.0 // indirect
|
||||||
|
github.com/fyne-io/gl-js v0.2.0 // indirect
|
||||||
|
github.com/fyne-io/glfw-js v0.3.0 // indirect
|
||||||
|
github.com/fyne-io/image v0.1.1 // indirect
|
||||||
|
github.com/fyne-io/oksvg v0.2.0 // indirect
|
||||||
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
|
||||||
|
github.com/go-text/render v0.2.0 // indirect
|
||||||
|
github.com/go-text/typesetting v0.2.1 // indirect
|
||||||
|
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
||||||
|
github.com/hack-pad/go-indexeddb v0.3.2 // indirect
|
||||||
|
github.com/hack-pad/safejs v0.1.0 // indirect
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect
|
||||||
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
|
||||||
|
github.com/kr/text v0.2.0 // indirect
|
||||||
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
||||||
|
github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
github.com/rymdport/portal v0.4.2 // indirect
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
|
||||||
|
github.com/stretchr/testify v1.11.1 // indirect
|
||||||
|
github.com/yuin/goldmark v1.7.8 // indirect
|
||||||
|
golang.org/x/image v0.24.0 // indirect
|
||||||
|
golang.org/x/net v0.35.0 // indirect
|
||||||
|
golang.org/x/sys v0.30.0 // indirect
|
||||||
|
golang.org/x/text v0.22.0 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
)
|
||||||
80
linux-port/go.sum
Normal file
80
linux-port/go.sum
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
fyne.io/fyne/v2 v2.7.2 h1:XiNpWkn0PzX43ZCjbb0QYGg1RCxVbugwfVgikWZBCMw=
|
||||||
|
fyne.io/fyne/v2 v2.7.2/go.mod h1:PXbqY3mQmJV3J1NRUR2VbVgUUx3vgvhuFJxyjRK/4Ug=
|
||||||
|
fyne.io/systray v1.12.0 h1:CA1Kk0e2zwFlxtc02L3QFSiIbxJ/P0n582YrZHT7aTM=
|
||||||
|
fyne.io/systray v1.12.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
|
||||||
|
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
||||||
|
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||||
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
|
||||||
|
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
|
||||||
|
github.com/fredbi/uri v1.1.1 h1:xZHJC08GZNIUhbP5ImTHnt5Ya0T8FI2VAwI/37kh2Ko=
|
||||||
|
github.com/fredbi/uri v1.1.1/go.mod h1:4+DZQ5zBjEwQCDmXW5JdIjz0PUA+yJbvtBv+u+adr5o=
|
||||||
|
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
||||||
|
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
||||||
|
github.com/fyne-io/gl-js v0.2.0 h1:+EXMLVEa18EfkXBVKhifYB6OGs3HwKO3lUElA0LlAjs=
|
||||||
|
github.com/fyne-io/gl-js v0.2.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
|
||||||
|
github.com/fyne-io/glfw-js v0.3.0 h1:d8k2+Y7l+zy2pc7wlGRyPfTgZoqDf3AI4G+2zOWhWUk=
|
||||||
|
github.com/fyne-io/glfw-js v0.3.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
||||||
|
github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
|
||||||
|
github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
|
||||||
|
github.com/fyne-io/oksvg v0.2.0 h1:mxcGU2dx6nwjJsSA9PCYZDuoAcsZ/OuJlvg/Q9Njfo8=
|
||||||
|
github.com/fyne-io/oksvg v0.2.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI=
|
||||||
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
|
||||||
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
|
github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc=
|
||||||
|
github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU=
|
||||||
|
github.com/go-text/typesetting v0.2.1 h1:x0jMOGyO3d1qFAPI0j4GSsh7M0Q3Ypjzr4+CEVg82V8=
|
||||||
|
github.com/go-text/typesetting v0.2.1/go.mod h1:mTOxEwasOFpAMBjEQDhdWRckoLLeI/+qrQeBCTGEt6M=
|
||||||
|
github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0=
|
||||||
|
github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
|
||||||
|
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
||||||
|
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
|
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
|
||||||
|
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
|
||||||
|
github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A=
|
||||||
|
github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0=
|
||||||
|
github.com/hack-pad/safejs v0.1.0 h1:qPS6vjreAqh2amUqj4WNG1zIw7qlRQJ9K10eDKMCnE8=
|
||||||
|
github.com/hack-pad/safejs v0.1.0/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade h1:FmusiCI1wHw+XQbvL9M+1r/C3SPqKrmBaIOYwVfQoDE=
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
||||||
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
|
||||||
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
|
||||||
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
|
||||||
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
|
||||||
|
github.com/nicksnyder/go-i18n/v2 v2.5.1 h1:IxtPxYsR9Gp60cGXjfuR/llTqV8aYMsC472zD0D1vHk=
|
||||||
|
github.com/nicksnyder/go-i18n/v2 v2.5.1/go.mod h1:DrhgsSDZxoAfvVrBVLXoxZn/pN5TXqaDbq7ju94viiQ=
|
||||||
|
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
|
||||||
|
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
|
||||||
|
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
|
||||||
|
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU=
|
||||||
|
github.com/rymdport/portal v0.4.2/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE=
|
||||||
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
|
github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
|
||||||
|
github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
|
||||||
|
golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
|
||||||
|
golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
|
||||||
|
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
|
||||||
|
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
|
||||||
|
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
||||||
|
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
||||||
|
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
1228
linux-port/main.go
Normal file
1228
linux-port/main.go
Normal file
File diff suppressed because it is too large
Load Diff
10
linux-port/setup.sh
Normal file
10
linux-port/setup.sh
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Setup script for HamyVPNClient on Linux
|
||||||
|
|
||||||
|
# Create necessary directories
|
||||||
|
mkdir -p bin
|
||||||
|
mkdir -p ~/.hamy-vpn
|
||||||
|
|
||||||
|
# The application will automatically download sing-box if not present
|
||||||
|
echo "Directories created. Run 'go run main.go' to start the application."
|
||||||
701
main.go
701
main.go
@@ -1,16 +1,21 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"image/color"
|
"image/color"
|
||||||
|
"log"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
"fyne.io/fyne/v2/app"
|
"fyne.io/fyne/v2/app"
|
||||||
"fyne.io/fyne/v2/canvas"
|
"fyne.io/fyne/v2/canvas"
|
||||||
@@ -20,6 +25,8 @@ import (
|
|||||||
"fyne.io/fyne/v2/theme"
|
"fyne.io/fyne/v2/theme"
|
||||||
"fyne.io/fyne/v2/widget"
|
"fyne.io/fyne/v2/widget"
|
||||||
"fyne.io/fyne/v2"
|
"fyne.io/fyne/v2"
|
||||||
|
|
||||||
|
"golang.org/x/sys/windows/registry"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Config represents a VPN configuration
|
// Config represents a VPN configuration
|
||||||
@@ -30,8 +37,10 @@ type Config struct {
|
|||||||
|
|
||||||
var (
|
var (
|
||||||
currentProcess *exec.Cmd
|
currentProcess *exec.Cmd
|
||||||
|
processMutex sync.Mutex // Mutex to protect process operations
|
||||||
configs []Config // Store all configurations
|
configs []Config // Store all configurations
|
||||||
activeConfig int // Index of the active config (-1 if none)
|
activeConfig int // Index of the active config (-1 if none)
|
||||||
|
configFilePath string = "configs.json" // Path to save/load configs
|
||||||
)
|
)
|
||||||
|
|
||||||
// checkSingBox checks if sing-box.exe exists in the bin folder
|
// checkSingBox checks if sing-box.exe exists in the bin folder
|
||||||
@@ -43,6 +52,40 @@ func checkSingBox() bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// loadConfigs loads configurations from file at startup
|
||||||
|
func loadConfigs() error {
|
||||||
|
data, err := os.ReadFile(configFilePath)
|
||||||
|
if err != nil {
|
||||||
|
// If file doesn't exist, it's not an error - just start with empty configs
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = json.Unmarshal(data, &configs)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// saveConfigs saves configurations to file
|
||||||
|
func saveConfigs() error {
|
||||||
|
data, err := json.MarshalIndent(configs, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = os.WriteFile(configFilePath, data, 0644)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// isValidVLESS checks if the given URL is a valid VLESS URL
|
// isValidVLESS checks if the given URL is a valid VLESS URL
|
||||||
func isValidVLESS(vlessURL string) bool {
|
func isValidVLESS(vlessURL string) bool {
|
||||||
// Basic validation for VLESS URL format
|
// Basic validation for VLESS URL format
|
||||||
@@ -68,6 +111,9 @@ func isValidVLESS(vlessURL string) bool {
|
|||||||
// addConfig adds a new configuration to the list
|
// addConfig adds a new configuration to the list
|
||||||
func addConfig(title, url string) {
|
func addConfig(title, url string) {
|
||||||
configs = append(configs, Config{Title: title, URL: url})
|
configs = append(configs, Config{Title: title, URL: url})
|
||||||
|
|
||||||
|
// Save configurations to file
|
||||||
|
saveConfigs()
|
||||||
}
|
}
|
||||||
|
|
||||||
// updateConfig updates an existing configuration
|
// updateConfig updates an existing configuration
|
||||||
@@ -75,6 +121,9 @@ func updateConfig(index int, title, url string) {
|
|||||||
if index >= 0 && index < len(configs) {
|
if index >= 0 && index < len(configs) {
|
||||||
configs[index].Title = title
|
configs[index].Title = title
|
||||||
configs[index].URL = url
|
configs[index].URL = url
|
||||||
|
|
||||||
|
// Save configurations to file
|
||||||
|
saveConfigs()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,17 +137,50 @@ func removeConfig(index int) {
|
|||||||
if activeConfig >= len(configs) {
|
if activeConfig >= len(configs) {
|
||||||
activeConfig = -1
|
activeConfig = -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Save configurations to file
|
||||||
|
saveConfigs()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// generateAndRunSingBox generates a Sing-box config from VLESS URL and runs sing-box
|
||||||
|
func generateAndRunSingBox(vlessURL string) error {
|
||||||
|
// Generate unique config filename based on timestamp or hash
|
||||||
|
configPath := "config.json"
|
||||||
|
|
||||||
|
// Generate the Sing-box configuration from the VLESS URL
|
||||||
|
err := generateConfigFromVLESSURL(vlessURL, configPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to generate config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run sing-box with the generated config
|
||||||
|
return runSingBox(configPath)
|
||||||
|
}
|
||||||
|
|
||||||
// runSingBox starts the sing-box process with the given config path
|
// runSingBox starts the sing-box process with the given config path
|
||||||
func runSingBox(configPath string) error {
|
func runSingBox(configPath string) error {
|
||||||
singBoxPath := filepath.Join("bin", "sing-box.exe")
|
singBoxPath := filepath.Join("bin", "sing-box.exe")
|
||||||
|
|
||||||
if !checkSingBox() {
|
if !checkSingBox() {
|
||||||
return nil
|
return fmt.Errorf("sing-box executable not found at %s", singBoxPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Acquire lock to prevent concurrent process operations
|
||||||
|
processMutex.Lock()
|
||||||
|
|
||||||
|
// Kill any existing process before starting a new one
|
||||||
|
oldProcess := currentProcess
|
||||||
|
currentProcess = nil
|
||||||
|
|
||||||
|
processMutex.Unlock()
|
||||||
|
|
||||||
|
// Kill the old process outside the lock to avoid deadlocks
|
||||||
|
if oldProcess != nil {
|
||||||
|
killProcessAndWait(oldProcess)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create new command
|
||||||
cmd := exec.Command(singBoxPath, "run", "-c", configPath)
|
cmd := exec.Command(singBoxPath, "run", "-c", configPath)
|
||||||
|
|
||||||
// Make the process run as hidden
|
// Make the process run as hidden
|
||||||
@@ -108,31 +190,469 @@ func runSingBox(configPath string) error {
|
|||||||
|
|
||||||
err := cmd.Start()
|
err := cmd.Start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
log.Printf("Failed to start sing-box: %v", err)
|
||||||
|
return fmt.Errorf("failed to start sing-box: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update currentProcess after successful start
|
||||||
|
processMutex.Lock()
|
||||||
currentProcess = cmd
|
currentProcess = cmd
|
||||||
|
processMutex.Unlock()
|
||||||
|
|
||||||
|
// Start a goroutine to wait for the process to finish
|
||||||
|
go func() {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
log.Printf("Recovered from panic in process wait routine: %v", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
err := cmd.Wait()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Sing-box process exited with error: %v", err)
|
||||||
|
} else {
|
||||||
|
log.Printf("Sing-box process exited normally")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear the process reference when it finishes
|
||||||
|
processMutex.Lock()
|
||||||
|
if currentProcess == cmd {
|
||||||
|
currentProcess = nil
|
||||||
|
}
|
||||||
|
processMutex.Unlock()
|
||||||
|
}()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// killProcessAndWait kills a process and waits for it to terminate
|
||||||
|
func killProcessAndWait(process *exec.Cmd) {
|
||||||
|
if process == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if process.Process != nil {
|
||||||
|
log.Printf("Terminating process PID: %d", process.Process.Pid)
|
||||||
|
|
||||||
|
err := process.Process.Kill()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Error killing process: %v", err)
|
||||||
|
// Process might have already terminated, try to wait anyway
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for the process to finish to clean up resources
|
||||||
|
go func(p *exec.Cmd) {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
log.Printf("Recovered from panic in process cleanup: %v", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
_, err := p.Process.Wait() // Wait for the process to finish
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Error waiting for process: %v", err)
|
||||||
|
}
|
||||||
|
}(process)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// isProcessRunning checks if the process is still running
|
||||||
|
func isProcessRunning(cmd *exec.Cmd) bool {
|
||||||
|
if cmd == nil || cmd.Process == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// On Windows, check if the process is still alive by getting its state
|
||||||
|
// Using syscall.Signal(0) just checks if we can send a signal (process exists)
|
||||||
|
err := cmd.Process.Signal(syscall.Signal(0))
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
// killCurrentProcess terminates the current sing-box process if running
|
// killCurrentProcess terminates the current sing-box process if running
|
||||||
func killCurrentProcess() {
|
func killCurrentProcess() {
|
||||||
if currentProcess != nil && currentProcess.Process != nil {
|
processMutex.Lock()
|
||||||
currentProcess.Process.Kill()
|
|
||||||
currentProcess = nil
|
// Create a local copy of the current process to avoid race conditions
|
||||||
|
cmd := currentProcess
|
||||||
|
currentProcess = nil
|
||||||
|
|
||||||
|
processMutex.Unlock()
|
||||||
|
|
||||||
|
if cmd != nil {
|
||||||
|
killProcessAndWait(cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// VLESSConfig represents parsed VLESS URL data
|
||||||
|
type VLESSConfig struct {
|
||||||
|
UUID string
|
||||||
|
ServerAddr string
|
||||||
|
ServerPort int
|
||||||
|
Type string
|
||||||
|
SNI string
|
||||||
|
Network string
|
||||||
|
Path string
|
||||||
|
Host string
|
||||||
|
Fingerprint string
|
||||||
|
Flow string
|
||||||
|
AllowInsecure bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseVLESS parses a VLESS URL and extracts relevant information
|
||||||
|
func parseVLESS(vlessURL string) (*VLESSConfig, error) {
|
||||||
|
u, err := url.Parse(vlessURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract UUID from the user part of the URL
|
||||||
|
uuid := u.User.Username()
|
||||||
|
|
||||||
|
// Extract server address and port
|
||||||
|
serverAddr := u.Hostname()
|
||||||
|
portStr := u.Port()
|
||||||
|
if portStr == "" {
|
||||||
|
return nil, fmt.Errorf("port not specified in VLESS URL")
|
||||||
|
}
|
||||||
|
port, err := strconv.Atoi(portStr)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse query parameters
|
||||||
|
params := u.Query()
|
||||||
|
|
||||||
|
vlessConfig := &VLESSConfig{
|
||||||
|
UUID: uuid,
|
||||||
|
ServerAddr: serverAddr,
|
||||||
|
ServerPort: port,
|
||||||
|
Type: params.Get("type"),
|
||||||
|
SNI: params.Get("sni"),
|
||||||
|
Network: params.Get("network"),
|
||||||
|
Path: params.Get("path"),
|
||||||
|
Host: params.Get("host"),
|
||||||
|
Fingerprint: params.Get("fp"),
|
||||||
|
Flow: params.Get("flow"),
|
||||||
|
AllowInsecure: params.Get("allowInsecure") == "true",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set default network type if not specified
|
||||||
|
if vlessConfig.Network == "" {
|
||||||
|
vlessConfig.Network = "tcp"
|
||||||
|
}
|
||||||
|
|
||||||
|
return vlessConfig, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SingBoxOutbound represents an outbound configuration for Sing-box
|
||||||
|
type SingBoxOutbound struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Tag string `json:"tag,omitempty"`
|
||||||
|
Server string `json:"server"`
|
||||||
|
ServerPort int `json:"server_port"`
|
||||||
|
UUID string `json:"uuid"`
|
||||||
|
Flow string `json:"flow,omitempty"`
|
||||||
|
Network string `json:"network,omitempty"`
|
||||||
|
TLS *SingBoxTLS `json:"tls,omitempty"`
|
||||||
|
Transport map[string]interface{} `json:"transport,omitempty"`
|
||||||
|
V2RayTransport *V2RayTransport `json:"v2ray_transport,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SingBoxTLS represents TLS configuration for Sing-box
|
||||||
|
type SingBoxTLS struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
ServerName string `json:"server_name,omitempty"`
|
||||||
|
Insecure bool `json:"insecure,omitempty"`
|
||||||
|
Fingerprint string `json:"fingerprint,omitempty"`
|
||||||
|
UTLS *UTLS `json:"utls,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// UTLS represents uTLS configuration
|
||||||
|
type UTLS struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
Fingerprint string `json:"fingerprint"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// V2RayTransport represents V2Ray transport configuration
|
||||||
|
type V2RayTransport struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Headers map[string]string `json:"headers,omitempty"`
|
||||||
|
Host string `json:"host,omitempty"`
|
||||||
|
Method string `json:"method,omitempty"`
|
||||||
|
Path string `json:"path,omitempty"`
|
||||||
|
ServiceName string `json:"service_name,omitempty"`
|
||||||
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SingBoxInbound represents an inbound configuration for Sing-box
|
||||||
|
type SingBoxInbound struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Tag string `json:"tag,omitempty"`
|
||||||
|
Listen string `json:"listen"`
|
||||||
|
ListenPort int `json:"listen_port"`
|
||||||
|
SetSystemProxy bool `json:"set_system_proxy,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SingBoxConfig represents the full Sing-box configuration
|
||||||
|
type SingBoxConfig struct {
|
||||||
|
Log map[string]interface{} `json:"log"`
|
||||||
|
Inbounds []SingBoxInbound `json:"inbounds"`
|
||||||
|
Outbounds []SingBoxOutbound `json:"outbounds"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// generateSingBoxConfig generates a Sing-box configuration from VLESSConfig
|
||||||
|
func generateSingBoxConfig(vlessConfig *VLESSConfig, configPath string) error {
|
||||||
|
// Create TLS configuration if SNI is present
|
||||||
|
var tlsConfig *SingBoxTLS
|
||||||
|
if vlessConfig.SNI != "" || vlessConfig.Fingerprint != "" {
|
||||||
|
tlsConfig = &SingBoxTLS{
|
||||||
|
Enabled: true,
|
||||||
|
ServerName: vlessConfig.SNI,
|
||||||
|
Insecure: vlessConfig.AllowInsecure,
|
||||||
|
}
|
||||||
|
|
||||||
|
if vlessConfig.Fingerprint != "" {
|
||||||
|
tlsConfig.Fingerprint = vlessConfig.Fingerprint
|
||||||
|
// Enable uTLS if fingerprint is specified
|
||||||
|
tlsConfig.UTLS = &UTLS{
|
||||||
|
Enabled: true,
|
||||||
|
Fingerprint: vlessConfig.Fingerprint,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create V2Ray transport if specific transport settings are present
|
||||||
|
var v2rayTransport *V2RayTransport
|
||||||
|
if vlessConfig.Path != "" || vlessConfig.Host != "" {
|
||||||
|
v2rayTransport = &V2RayTransport{
|
||||||
|
Type: vlessConfig.Network,
|
||||||
|
}
|
||||||
|
|
||||||
|
if vlessConfig.Path != "" {
|
||||||
|
v2rayTransport.Path = vlessConfig.Path
|
||||||
|
}
|
||||||
|
|
||||||
|
if vlessConfig.Host != "" {
|
||||||
|
v2rayTransport.Host = vlessConfig.Host
|
||||||
|
}
|
||||||
|
|
||||||
|
// For HTTP headers
|
||||||
|
if vlessConfig.Host != "" {
|
||||||
|
v2rayTransport.Headers = map[string]string{
|
||||||
|
"Host": vlessConfig.Host,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the outbound configuration
|
||||||
|
outbound := SingBoxOutbound{
|
||||||
|
Type: "vless",
|
||||||
|
Server: vlessConfig.ServerAddr,
|
||||||
|
ServerPort: vlessConfig.ServerPort,
|
||||||
|
UUID: vlessConfig.UUID,
|
||||||
|
Flow: vlessConfig.Flow,
|
||||||
|
Network: vlessConfig.Network,
|
||||||
|
}
|
||||||
|
|
||||||
|
if tlsConfig != nil {
|
||||||
|
outbound.TLS = tlsConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
if v2rayTransport != nil {
|
||||||
|
outbound.V2RayTransport = v2rayTransport
|
||||||
|
}
|
||||||
|
|
||||||
|
// Special handling for different transport types
|
||||||
|
switch vlessConfig.Network {
|
||||||
|
case "ws":
|
||||||
|
// WebSocket transport
|
||||||
|
transport := map[string]interface{}{
|
||||||
|
"type": vlessConfig.Network,
|
||||||
|
}
|
||||||
|
|
||||||
|
if vlessConfig.Path != "" {
|
||||||
|
transport["path"] = vlessConfig.Path
|
||||||
|
}
|
||||||
|
|
||||||
|
if vlessConfig.Host != "" {
|
||||||
|
headers := map[string]interface{}{
|
||||||
|
"Host": vlessConfig.Host,
|
||||||
|
}
|
||||||
|
transport["headers"] = headers
|
||||||
|
}
|
||||||
|
|
||||||
|
outbound.Transport = transport
|
||||||
|
case "grpc":
|
||||||
|
// gRPC transport
|
||||||
|
transport := map[string]interface{}{
|
||||||
|
"type": vlessConfig.Network,
|
||||||
|
}
|
||||||
|
|
||||||
|
if vlessConfig.Path != "" {
|
||||||
|
transport["service_name"] = vlessConfig.Path
|
||||||
|
}
|
||||||
|
|
||||||
|
outbound.Transport = transport
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create inbounds - mixed (SOCKS5 + HTTP) on port 1080
|
||||||
|
inbounds := []SingBoxInbound{
|
||||||
|
{
|
||||||
|
Type: "mixed",
|
||||||
|
Listen: "127.0.0.1",
|
||||||
|
ListenPort: 1080,
|
||||||
|
SetSystemProxy: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the full configuration
|
||||||
|
config := SingBoxConfig{
|
||||||
|
Log: map[string]interface{}{
|
||||||
|
"level": "info",
|
||||||
|
},
|
||||||
|
Inbounds: inbounds,
|
||||||
|
Outbounds: []SingBoxOutbound{outbound},
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to JSON
|
||||||
|
jsonData, err := json.MarshalIndent(config, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write to file
|
||||||
|
err = os.WriteFile(configPath, jsonData, 0644)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("Sing-box configuration written to %s", configPath)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// generateConfigFromVLESSURL parses a VLESS URL and generates a Sing-box config file
|
||||||
|
func generateConfigFromVLESSURL(vlessURL, outputPath string) error {
|
||||||
|
// Parse the VLESS URL
|
||||||
|
vlessConfig, err := parseVLESS(vlessURL)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate the Sing-box configuration
|
||||||
|
err = generateSingBoxConfig(vlessConfig, outputPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var proxyMutex sync.Mutex // Mutex to protect proxy operations
|
||||||
|
|
||||||
|
// setSystemProxy enables the system proxy with the specified server and port
|
||||||
|
func setSystemProxy(proxyServer string) error {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
log.Printf("Recovered from panic in setSystemProxy: %v", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
proxyMutex.Lock()
|
||||||
|
defer proxyMutex.Unlock()
|
||||||
|
|
||||||
|
key, err := registry.OpenKey(registry.CURRENT_USER, `Software\Microsoft\Windows\CurrentVersion\Internet Settings`, registry.SET_VALUE)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to open registry key: %v", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if key != 0 {
|
||||||
|
err := key.Close()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Error closing registry key: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Set ProxyEnable to 1 to enable proxy
|
||||||
|
err = key.SetDWordValue("ProxyEnable", 1)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to set ProxyEnable: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set ProxyServer to the specified server and port
|
||||||
|
err = key.SetStringValue("ProxyServer", proxyServer)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to set ProxyServer: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optionally, set ProxyOverride to bypass proxy for local addresses
|
||||||
|
err = key.SetStringValue("ProxyOverride", "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*")
|
||||||
|
if err != nil {
|
||||||
|
// This is not critical, just log the error
|
||||||
|
log.Printf("Warning: failed to set ProxyOverride: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify Windows that the proxy settings have changed
|
||||||
|
notifyProxyChange()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// disableSystemProxy disables the system proxy
|
||||||
|
func disableSystemProxy() error {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
log.Printf("Recovered from panic in disableSystemProxy: %v", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
proxyMutex.Lock()
|
||||||
|
defer proxyMutex.Unlock()
|
||||||
|
|
||||||
|
key, err := registry.OpenKey(registry.CURRENT_USER, `Software\Microsoft\Windows\CurrentVersion\Internet Settings`, registry.SET_VALUE)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to open registry key: %v", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if key != 0 {
|
||||||
|
err := key.Close()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Error closing registry key: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Set ProxyEnable to 0 to disable proxy
|
||||||
|
err = key.SetDWordValue("ProxyEnable", 0)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to set ProxyEnable: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify Windows that the proxy settings have changed
|
||||||
|
notifyProxyChange()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// notifyProxyChange notifies Windows that proxy settings have changed
|
||||||
|
func notifyProxyChange() {
|
||||||
|
// Since Windows API calls are causing crashes, we'll skip them for now
|
||||||
|
// This is the safest approach to prevent access violations
|
||||||
|
log.Println("Skipping Windows API calls to prevent crashes")
|
||||||
|
// Note: Registry changes sometimes don't take effect without these calls,
|
||||||
|
// but crashing is worse than some cases where manual browser restart is needed
|
||||||
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
myApp := app.New()
|
myApp := app.New()
|
||||||
myWindow := myApp.NewWindow("Hamy VPN Client")
|
myWindow := myApp.NewWindow("Hamy VPN Client")
|
||||||
|
|
||||||
// Set the window to not resizable and fixed size
|
|
||||||
myWindow.SetFixedSize(true)
|
|
||||||
|
|
||||||
// Set the window size to 200x300 as requested
|
// Set the window size to 200x300 as requested
|
||||||
myWindow.Resize(fyne.NewSize(200, 300))
|
myWindow.Resize(fyne.NewSize(200, 300))
|
||||||
|
|
||||||
|
// Load configurations from file at startup
|
||||||
|
loadConfigs()
|
||||||
|
|
||||||
// Initialize active config to -1 (no config selected)
|
// Initialize active config to -1 (no config selected)
|
||||||
activeConfig = -1
|
activeConfig = -1
|
||||||
|
|
||||||
@@ -189,8 +709,64 @@ func main() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Prevent multiple simultaneous connection attempts
|
||||||
|
connectButton.Disable()
|
||||||
|
defer connectButton.Enable() // Re-enable the button after the operation completes
|
||||||
|
|
||||||
// Toggle connection state
|
// Toggle connection state
|
||||||
isConnected = !isConnected
|
if !isConnected {
|
||||||
|
// Connect - generate config and run sing-box
|
||||||
|
err := generateAndRunSingBox(configs[activeConfig].URL)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Failed to start connection: %v", err)
|
||||||
|
dialog.ShowError(fmt.Errorf("failed to start connection: %v", err), myWindow)
|
||||||
|
|
||||||
|
// Revert connection state on failure
|
||||||
|
isConnected = false
|
||||||
|
updateConnectionButtonText(connectButton)
|
||||||
|
statusLabel.Text = "Отключено"
|
||||||
|
statusLabel.Color = color.RGBA{R: 128, G: 128, B: 128, A: 255}
|
||||||
|
statusLabel.Refresh()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Brief pause to allow sing-box to initialize before setting proxy
|
||||||
|
time.Sleep(500 * time.Millisecond)
|
||||||
|
|
||||||
|
// Set proxy to route traffic through VPN
|
||||||
|
err = setSystemProxy("127.0.0.1:1080")
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Failed to set system proxy: %v", err)
|
||||||
|
dialog.ShowError(fmt.Errorf("failed to set system proxy: %v", err), myWindow)
|
||||||
|
|
||||||
|
// If proxy failed to set, kill the sing-box process and revert connection
|
||||||
|
killCurrentProcess()
|
||||||
|
isConnected = false
|
||||||
|
updateConnectionButtonText(connectButton)
|
||||||
|
statusLabel.Text = "Отключено"
|
||||||
|
statusLabel.Color = color.RGBA{R: 128, G: 128, B: 128, A: 255}
|
||||||
|
statusLabel.Refresh()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update connection state after successful connection
|
||||||
|
isConnected = true
|
||||||
|
} else {
|
||||||
|
// Disconnect - first disable proxy, then kill the process
|
||||||
|
err := disableSystemProxy()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Failed to disable system proxy: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Brief pause to allow proxy settings to be applied
|
||||||
|
time.Sleep(200 * time.Millisecond)
|
||||||
|
|
||||||
|
// Disconnect - kill the current process
|
||||||
|
killCurrentProcess()
|
||||||
|
|
||||||
|
// Update connection state after disconnection
|
||||||
|
isConnected = false
|
||||||
|
}
|
||||||
|
|
||||||
// Update button text
|
// Update button text
|
||||||
updateConnectionButtonText(connectButton)
|
updateConnectionButtonText(connectButton)
|
||||||
@@ -204,15 +780,14 @@ func main() {
|
|||||||
statusLabel.Color = color.RGBA{R: 128, G: 128, B: 128, A: 255} // Gray color for disconnected
|
statusLabel.Color = color.RGBA{R: 128, G: 128, B: 128, A: 255} // Gray color for disconnected
|
||||||
}
|
}
|
||||||
statusLabel.Refresh()
|
statusLabel.Refresh()
|
||||||
|
|
||||||
// This functionality will be implemented later
|
|
||||||
dialog.ShowInformation("Info", fmt.Sprintf("Connect/Disconnect functionality will be implemented later using: %s", configs[activeConfig].Title), myWindow)
|
|
||||||
})
|
})
|
||||||
connectButton.Importance = widget.HighImportance
|
connectButton.Importance = widget.HighImportance
|
||||||
|
|
||||||
|
// Initially disable the button if no configs are available
|
||||||
if len(configs) == 0 {
|
if len(configs) == 0 {
|
||||||
connectButton.Disable() // Disable initially until a config is selected
|
connectButton.Disable()
|
||||||
} else {
|
} else {
|
||||||
connectButton.Enable() // Enable if we have configs
|
connectButton.Enable()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configurations button - opens a separate window
|
// Configurations button - opens a separate window
|
||||||
@@ -222,11 +797,16 @@ func main() {
|
|||||||
configWindow.Resize(fyne.NewSize(400, 300))
|
configWindow.Resize(fyne.NewSize(400, 300))
|
||||||
configWindow.SetFixedSize(true)
|
configWindow.SetFixedSize(true)
|
||||||
|
|
||||||
// Entry for importing new configuration
|
// Declare variables before use
|
||||||
|
var listContainer *widget.List
|
||||||
|
var scrollContainer *container.Scroll
|
||||||
|
var refreshList func()
|
||||||
|
|
||||||
|
// Entry for importing new configuration - fixed to expand properly
|
||||||
importEntry := widget.NewEntry()
|
importEntry := widget.NewEntry()
|
||||||
importEntry.PlaceHolder = "vless://..."
|
importEntry.PlaceHolder = "vless://..."
|
||||||
|
|
||||||
// Import button
|
// Container for import field and button - use HBox to allow proper expansion
|
||||||
importButton := widget.NewButtonWithIcon("", theme.ContentAddIcon(), func() {
|
importButton := widget.NewButtonWithIcon("", theme.ContentAddIcon(), func() {
|
||||||
url := importEntry.Text
|
url := importEntry.Text
|
||||||
if url != "" && isValidVLESS(url) {
|
if url != "" && isValidVLESS(url) {
|
||||||
@@ -235,24 +815,22 @@ func main() {
|
|||||||
dialog.ShowInformation("Успешно", "Конфиг добавлен", configWindow)
|
dialog.ShowInformation("Успешно", "Конфиг добавлен", configWindow)
|
||||||
|
|
||||||
// Refresh the list
|
// Refresh the list
|
||||||
if listContainer != nil {
|
refreshList()
|
||||||
refreshList()
|
|
||||||
}
|
|
||||||
importEntry.SetText("")
|
importEntry.SetText("")
|
||||||
|
|
||||||
|
// Enable connect button if we have configs
|
||||||
|
if len(configs) > 0 {
|
||||||
|
connectButton.Enable()
|
||||||
|
}
|
||||||
} else if url != "" {
|
} else if url != "" {
|
||||||
dialog.ShowError(errors.New("Невалидная ссылка"), configWindow)
|
dialog.ShowError(errors.New("Невалидная ссылка"), configWindow)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// Container for import field and button
|
// Fixed the order of operations to avoid nil reference
|
||||||
importContainer := container.NewBorder(nil, nil, importEntry, importButton)
|
refreshList = func() {
|
||||||
|
// Create the list first
|
||||||
// Create a list of config titles for selection
|
newListContainer := widget.NewList(
|
||||||
var listContainer *widget.List
|
|
||||||
|
|
||||||
refreshList := func() {
|
|
||||||
// Need to recreate the list since we can't refresh it directly
|
|
||||||
listContainer = widget.NewList(
|
|
||||||
func() int {
|
func() int {
|
||||||
return len(configs)
|
return len(configs)
|
||||||
},
|
},
|
||||||
@@ -266,15 +844,17 @@ func main() {
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
func(id widget.ListItemID, obj fyne.CanvasObject) {
|
func(id widget.ListItemID, obj fyne.CanvasObject) {
|
||||||
box := obj.(*fyne.Container)
|
containerObj := obj.(*fyne.Container)
|
||||||
titleLabel := box.Objects[1].(*widget.Label)
|
|
||||||
buttonsContainer := box.Objects[2].(*fyne.Container)
|
// For a container.NewBorder(nil, nil, left, right, nil), the structure is:
|
||||||
|
// Objects[0] is the left element (label)
|
||||||
|
// Objects[1] is the right element (buttons container)
|
||||||
|
titleLabel := containerObj.Objects[0].(*widget.Label)
|
||||||
|
buttonsContainer := containerObj.Objects[1].(*fyne.Container)
|
||||||
|
|
||||||
editButton := buttonsContainer.Objects[0].(*widget.Button)
|
editButton := buttonsContainer.Objects[0].(*widget.Button)
|
||||||
deleteButton := buttonsContainer.Objects[1].(*widget.Button)
|
deleteButton := buttonsContainer.Objects[1].(*widget.Button)
|
||||||
|
|
||||||
titleLabel.SetText(configs[id].Title)
|
|
||||||
|
|
||||||
// Update visual indication for active config
|
// Update visual indication for active config
|
||||||
if id == activeConfig {
|
if id == activeConfig {
|
||||||
titleLabel.SetText(fmt.Sprintf("● %s", configs[id].Title))
|
titleLabel.SetText(fmt.Sprintf("● %s", configs[id].Title))
|
||||||
@@ -298,38 +878,49 @@ func main() {
|
|||||||
|
|
||||||
// Refresh the list
|
// Refresh the list
|
||||||
refreshList()
|
refreshList()
|
||||||
|
|
||||||
|
// Disable connect button if no configs remain or current config was deleted
|
||||||
|
if len(configs) == 0 || activeConfig == -1 {
|
||||||
|
connectButton.Disable()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
configWindow)
|
configWindow)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Allow clicking on the whole row to select the config
|
|
||||||
box.Objects[0] = container.NewStack(
|
|
||||||
widget.NewButton("", func() {
|
|
||||||
activeConfig = id
|
|
||||||
dialog.ShowInformation("Config Selected", fmt.Sprintf("Active config: %s", configs[id].Title), configWindow)
|
|
||||||
configWindow.Close()
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
listContainer.OnSelected = func(id widget.ListItemID) {
|
newListContainer.OnSelected = func(id widget.ListItemID) {
|
||||||
activeConfig = id
|
activeConfig = id
|
||||||
dialog.ShowInformation("Config Selected", fmt.Sprintf("Active config: %s", configs[id].Title), configWindow)
|
dialog.ShowInformation("Config Selected", fmt.Sprintf("Active config: %s", configs[id].Title), configWindow)
|
||||||
|
|
||||||
|
// Enable the connect button since a config is selected
|
||||||
|
connectButton.Enable()
|
||||||
|
|
||||||
configWindow.Close()
|
configWindow.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Assign to the variable before using it in the scroll container
|
||||||
|
listContainer = newListContainer
|
||||||
|
|
||||||
|
// Create scroll container only once
|
||||||
|
if scrollContainer == nil {
|
||||||
|
scrollContainer = container.NewScroll(listContainer)
|
||||||
|
} else {
|
||||||
|
scrollContainer.Content = listContainer
|
||||||
|
scrollContainer.Refresh()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Call refreshList to initialize the list first
|
||||||
refreshList()
|
refreshList()
|
||||||
|
|
||||||
scrollContainer := container.NewScroll(listContainer)
|
// Container for import field and button - use HBox to allow proper expansion
|
||||||
|
// Using container.NewBorder to make the entry expand properly
|
||||||
|
importContainer := container.NewBorder(nil, nil, nil, importButton, importEntry)
|
||||||
|
|
||||||
// Main content for the config window
|
// Main content for the config window using a border container to properly size the scroll area
|
||||||
configContent := container.NewVBox(
|
configContent := container.NewBorder(importContainer, nil, nil, nil, scrollContainer)
|
||||||
importContainer,
|
|
||||||
scrollContainer,
|
|
||||||
)
|
|
||||||
|
|
||||||
configWindow.SetContent(configContent)
|
configWindow.SetContent(configContent)
|
||||||
configWindow.Show()
|
configWindow.Show()
|
||||||
@@ -350,6 +941,18 @@ func main() {
|
|||||||
// Create a top-level container
|
// Create a top-level container
|
||||||
mainContainer := container.NewStack(contentContainer)
|
mainContainer := container.NewStack(contentContainer)
|
||||||
|
|
||||||
|
// Register an app lifecycle listener to handle cleanup when the app exits
|
||||||
|
myApp.Lifecycle().SetOnStopped(func() {
|
||||||
|
// Kill the current process if running
|
||||||
|
killCurrentProcess()
|
||||||
|
|
||||||
|
// Disable proxy when the application exits
|
||||||
|
err := disableSystemProxy()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Failed to disable system proxy on exit: %v", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
// Set the content and show the window
|
// Set the content and show the window
|
||||||
myWindow.SetContent(mainContainer)
|
myWindow.SetContent(mainContainer)
|
||||||
|
|
||||||
|
|||||||
31
test_config.json
Normal file
31
test_config.json
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
{
|
||||||
|
"log": {
|
||||||
|
"level": "info"
|
||||||
|
},
|
||||||
|
"inbounds": [
|
||||||
|
{
|
||||||
|
"type": "mixed",
|
||||||
|
"listen": "127.0.0.1",
|
||||||
|
"listen_port": 1080,
|
||||||
|
"set_system_proxy": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outbounds": [
|
||||||
|
{
|
||||||
|
"type": "vless",
|
||||||
|
"server": "myserver.com",
|
||||||
|
"server_port": 443,
|
||||||
|
"uuid": "de3338a1-1234-5678-abcd-1234567890ab",
|
||||||
|
"network": "tcp",
|
||||||
|
"tls": {
|
||||||
|
"enabled": true,
|
||||||
|
"server_name": "myserver.com",
|
||||||
|
"fingerprint": "chrome",
|
||||||
|
"utls": {
|
||||||
|
"enabled": true,
|
||||||
|
"fingerprint": "chrome"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user