Merge branch 'main' into renovate/github.com-olekukonko-tablewriter-1.x

.envrc

@@ -1 +0,0 @@
-use flake

.github/workflows/golangci-lint.yml

@@ -15,9 +15,11 @@ jobs:
     steps:
       - uses: actions/setup-go@v6
         with:
-          go-version: 1.26
+          go-version: 1.25
       - uses: actions/checkout@v6
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.6.2
       - name: test
         run: make test

.github/workflows/release.yml

@@ -18,11 +18,12 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.26"
+          go-version: "1.25"
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
+          version: '~> v2'
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}

.github/workflows/update-vendor-hash.yml

@@ -1,58 +0,0 @@
-name: Update vendorHash in flake.nix
-
-on:
-  push:
-    paths:
-      - 'go.mod'
-      - 'go.sum'
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-jobs:
-  update-hash:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixpkgs-unstable
-
-      - name: Calculate new vendorHash
-        id: hash
-        run: |
-          # Set vendorHash to empty string to trigger hash mismatch
-          sed -i 's|vendorHash = .*|vendorHash = "";|' flake.nix
-          
-          # Try to build and extract the expected hash from error message
-          BUILD_OUTPUT=$(nix build .#vpngate 2>&1 || true)
-          HASH=$(echo "$BUILD_OUTPUT" | grep -oP 'got:\s*\K(sha256-[a-zA-Z0-9+/]+={0,2})' | head -1)
-          
-          if [ -z "$HASH" ]; then
-            echo "Build output:"
-            echo "$BUILD_OUTPUT"
-            echo "Failed to extract hash from build output"
-            exit 1
-          fi
-          
-          echo "hash=$HASH" >> $GITHUB_OUTPUT
-          echo "Calculated hash: $HASH"
-
-      - name: Update flake.nix with correct hash
-        run: |
-          sed -i "s|vendorHash = \"\";|vendorHash = \"${{ steps.hash.outputs.hash }}\";|" flake.nix
-
-      - name: Commit and push if changed
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          
-          if git diff --quiet flake.nix; then
-            echo "No changes to commit"
-          else
-            git add flake.nix
-            git commit -m "chore: update vendorHash in flake.nix"
-            git push
-          fi

.gitignore

@@ -1,7 +1,3 @@
 dist
 
 .vscode
-
-# direnv
-.direnv
-.envrc.local

.goreleaser.yaml

@@ -21,9 +21,6 @@ builds:
       - arm64
     goarm:
       - "7"
-    ignore:
-      - goos: windows
-        goarch: arm
     ldflags:
       - -s -w
     mod_timestamp: "{{ .CommitTimestamp }}"

cmd/connect.go

@@ -30,7 +30,8 @@ func init() {
 }
 
 var connectCmd = &cobra.Command{
-	Use:   "connect",
+	Use: "connect",
+
 	Short: "Connect to a vpn server (survey selection appears if hostname is not provided)",
 	Long:  `Connect to a vpn from a list of relay servers`,
 	Args:  cobra.RangeArgs(0, 1),
@@ -38,43 +39,49 @@ var connectCmd = &cobra.Command{
 		vpnServers, err := vpn.GetList(flagProxy, flagSocks5Proxy)
 		if err != nil {
 			log.Fatal().Msg(err.Error())
+			os.Exit(1)
 		}
 
-		// Build server selection options and hostname lookup map
-		serverSelection := make([]string, len(*vpnServers))
-		serverMap := make(map[string]vpn.Server, len(*vpnServers))
-		for i, s := range *vpnServers {
-			serverSelection[i] = fmt.Sprintf("%s (%s)", s.HostName, s.CountryLong)
-			serverMap[s.HostName] = s
+		serverSelection := []string{}
+		serverSelected := vpn.Server{}
+
+		for _, s := range *vpnServers {
+			serverSelection = append(serverSelection, fmt.Sprintf("%s (%s)", s.HostName, s.CountryLong))
 		}
 
 		selection := ""
-		var serverSelected vpn.Server
+		prompt := &survey.Select{
+			Message: "Choose a server:",
+			Options: serverSelection,
+		}
 
 		if !flagRandom {
+
 			if len(args) > 0 {
 				selection = args[0]
 			} else {
-				prompt := &survey.Select{
-					Message: "Choose a server:",
-					Options: serverSelection,
-				}
 				err := survey.AskOne(prompt, &selection, survey.WithPageSize(10))
 				if err != nil {
-					log.Fatal().Msg("Unable to obtain hostname from survey")
+					log.Error().Msg("Unable to obtain hostname from survey")
+					os.Exit(1)
 				}
 			}
 
-			// Lookup server from selection using map for O(1) lookup
-			hostname := extractHostname(selection)
-			if server, exists := serverMap[hostname]; exists {
-				serverSelected = server
-			} else {
+			// Server lookup from selection could be more optimized with a hash map
+			for _, s := range *vpnServers {
+				if strings.Contains(selection, s.HostName) {
+					serverSelected = s
+				}
+			}
+
+			if serverSelected.HostName == "" {
 				log.Fatal().Msgf("Server '%s' was not found", selection)
+				os.Exit(1)
 			}
 		}
 
 		for {
+
 			if flagRandom {
 				// Select a random server
 				serverSelected = (*vpnServers)[rand.Intn(len(*vpnServers))]
@@ -83,19 +90,23 @@ var connectCmd = &cobra.Command{
 			decodedConfig, err := base64.StdEncoding.DecodeString(serverSelected.OpenVpnConfigData)
 			if err != nil {
 				log.Fatal().Msg(err.Error())
+				os.Exit(1)
 			}
 
 			tmpfile, err := os.CreateTemp("", "vpngate-openvpn-config-")
 			if err != nil {
 				log.Fatal().Msg(err.Error())
+				os.Exit(1)
 			}
 
 			if _, err := tmpfile.Write(decodedConfig); err != nil {
 				log.Fatal().Msg(err.Error())
+				os.Exit(1)
 			}
 
 			if err := tmpfile.Close(); err != nil {
 				log.Fatal().Msg(err.Error())
+				os.Exit(1)
 			}
 
 			log.Info().Msgf("Connecting to %s (%s) in %s", serverSelected.HostName, serverSelected.IPAddr, serverSelected.CountryLong)
@@ -103,22 +114,16 @@ var connectCmd = &cobra.Command{
 			err = vpn.Connect(tmpfile.Name())
 
 			if err != nil && !flagReconnect {
-				// VPN connection failed and reconnect is disabled
-				_ = os.Remove(tmpfile.Name())
-				log.Fatal().Msg("VPN connection failed")
+				log.Fatal().Msg(err.Error())
+				os.Exit(1)
+			} else {
+				err = os.Remove(tmpfile.Name())
+				if err !=  nil {
+					log.Fatal().Msg(err.Error())
+					os.Exit(1)
+				}
 			}
 
-			// Always try to clean up temporary file
-			_ = os.Remove(tmpfile.Name())
 		}
 	},
 }
-
-// extractHostname extracts the hostname from the selection string (format: "hostname (country)")
-func extractHostname(selection string) string {
-	parts := strings.Split(selection, " (")
-	if len(parts) > 0 {
-		return parts[0]
-	}
-	return selection
-}

cmd/list.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"strconv"
 
-	tw "github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter"
 	"github.com/rs/zerolog/log"
 
 	"github.com/davegallant/vpngate/pkg/vpn"
@@ -27,20 +27,15 @@ var listCmd = &cobra.Command{
 		vpnServers, err := vpn.GetList(flagProxy, flagSocks5Proxy)
 		if err != nil {
 			log.Fatal().Msg(err.Error())
+			os.Exit(1)
 		}
 
-		table := tw.NewWriter(os.Stdout)
-		table.Header([]string{"#", "HostName", "Country", "Ping", "Score"})
+		table := tablewriter.NewWriter(os.Stdout)
+		table.SetHeader([]string{"#", "HostName", "Country", "Ping", "Score"})
 
 		for i, v := range *vpnServers {
-			err := table.Append([]string{strconv.Itoa(i + 1), v.HostName, v.CountryLong, v.Ping, strconv.Itoa(v.Score)})
-			if err != nil {
-				log.Fatal().Msg(err.Error())
-			}
-		}
-		err = table.Render()
-		if err != nil {
-			log.Fatal().Msg(err.Error())
+			table.Append([]string{strconv.Itoa(i + 1), v.HostName, v.CountryLong, v.Ping, strconv.Itoa(v.Score)})
 		}
+		table.Render() // Send output
 	},
-}
+}

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770843696,
-        "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
+        "lastModified": 1763934636,
+        "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
+        "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,6 +1,4 @@
 {
-  description = "vpngate - VPN server connector";
-
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
@@ -18,7 +16,7 @@
         pkgs.buildGo125Module rec {
           name = "vpngate";
           src = ./.;
-          vendorHash = "sha256-FNpeIIIrINm/3neCkuX/kFWWGCCEN8Duz1iSFAki+54=";
+          vendorHash = "sha256-MfdImlAHGHO1rxQN1YjvnCWpiTHRA1p1K9XO8nl/qY8=";
           nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.makeWrapper ];
           env.CGO_ENABLED = 0;
           doCheck = false;
@@ -35,19 +33,12 @@
             default = vg;
             vpngate = vg;
           };
-          devShells.default = pkgs.mkShell {
-            name = "vpngate-dev";
-            description = "Development environment for vpngate";
+          devShell = pkgs.mkShell {
             packages = with pkgs; [
-              go_1_26
               gopls
               gotools
-              golangci-lint
+              go_1_25
             ];
-            shellHook = ''
-              echo "Welcome to the vpngate dev environment"
-              go version
-            '';
           };
         };
     in

go.mod

@@ -2,25 +2,26 @@ module github.com/davegallant/vpngate
 
 go 1.24.0
 
-toolchain go1.26.0
+toolchain go1.25.5
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/jszwec/csvutil v1.10.0
 	github.com/juju/errors v1.0.0
-	github.com/olekukonko/tablewriter v1.1.3
+	github.com/olekukonko/tablewriter v1.1.2
 	github.com/rs/zerolog v1.34.0
+	github.com/spf13/afero v1.14.0
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
-	golang.org/x/net v0.50.0
+	golang.org/x/net v0.48.0
 )
 
 require (
-	github.com/clipperhouse/displaywidth v0.6.2 // indirect
+	github.com/clipperhouse/displaywidth v0.6.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
@@ -30,12 +31,13 @@ require (
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
 	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/olekukonko/ll v0.1.4-0.20260115111900-9e59c2286df0 // indirect
+	github.com/olekukonko/ll v0.1.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
-	golang.org/x/sys v0.41.0 // indirect
-	golang.org/x/term v0.40.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/term v0.38.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -2,8 +2,8 @@ github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkk
 github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
-github.com/clipperhouse/displaywidth v0.6.2 h1:ZDpTkFfpHOKte4RG5O/BOyf3ysnvFswpyYrV7z2uAKo=
-github.com/clipperhouse/displaywidth v0.6.2/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
+github.com/clipperhouse/displaywidth v0.6.0 h1:k32vueaksef9WIKCNcoqRNyKbyvkvkysNYnAWz2fN4s=
+github.com/clipperhouse/displaywidth v0.6.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
 github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
 github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
 github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
@@ -16,8 +16,8 @@ github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
@@ -42,6 +42,9 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
 github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -51,14 +54,19 @@ github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj
 github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
 github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
 github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
-github.com/olekukonko/ll v0.1.4-0.20260115111900-9e59c2286df0 h1:jrYnow5+hy3WRDCBypUFvVKNSPPCdqgSXIE9eJDD8LM=
-github.com/olekukonko/ll v0.1.4-0.20260115111900-9e59c2286df0/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew=
-github.com/olekukonko/tablewriter v1.1.3 h1:VSHhghXxrP0JHl+0NnKid7WoEmd9/urKRJLysb70nnA=
-github.com/olekukonko/tablewriter v1.1.3/go.mod h1:9VU0knjhmMkXjnMKrZ3+L2JhhtsQ/L38BbL3CRNE8tM=
+github.com/olekukonko/ll v0.1.3 h1:sV2jrhQGq5B3W0nENUISCR6azIPf7UBUpVq0x/y70Fg=
+github.com/olekukonko/ll v0.1.3/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/olekukonko/tablewriter v1.1.2 h1:L2kI1Y5tZBct/O/TyZK1zIE9GlBj/TVs+AY5tZDCDSc=
+github.com/olekukonko/tablewriter v1.1.2/go.mod h1:z7SYPugVqGVavWoA2sGsFIoOVNmEHxUAAMrhXONtfkg=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
@@ -66,6 +74,10 @@ github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
+github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
 github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
 github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -83,8 +95,10 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
-golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -96,18 +110,24 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
-golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

pkg/exec/run.go

@@ -2,58 +2,46 @@ package exec
 
 import (
 	"bufio"
-	"io"
+	"os"
 	"os/exec"
+	"strings"
 
 	"github.com/rs/zerolog/log"
 )
 
-// Run executes a command in workDir and logs its output.
-// If the command fails to start or setup fails, an error is logged and returned.
-// If the command exits with a non-zero status, the error is returned without logging
-// (this allows the caller to decide how to handle it).
+// Run executes a command in workDir and returns stdout and error.
+// The spawned process will exit upon termination of this application
+// to ensure a clean exit
 func Run(path string, workDir string, args ...string) error {
 	_, err := exec.LookPath(path)
 	if err != nil {
 		log.Error().Msgf("%s is required, please install it", path)
-		return err
+		os.Exit(1)
 	}
-
 	cmd := exec.Command(path, args...)
 	cmd.Dir = workDir
-
-	log.Debug().Strs("command", cmd.Args).Msg("Executing command")
-
+	log.Debug().Msg("Executing " + strings.Join(cmd.Args, " "))
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
-		log.Error().Msgf("Failed to get stdout pipe: %v", err)
-		return err
+		log.Fatal().Msgf("Failed to get stdout pipe: %v", err)
 	}
-
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		log.Error().Msgf("Failed to get stderr pipe: %v", err)
-		return err
-	}
-
 	if err := cmd.Start(); err != nil {
-		log.Error().Msgf("Failed to start command: %v", err)
-		return err
+		log.Fatal().Msgf("Failed to start command: %v", err)
 	}
 
-	// Combine stdout and stderr into a single reader
-	combined := io.MultiReader(stdout, stderr)
-	scanner := bufio.NewScanner(combined)
+	scanner := bufio.NewScanner(stdout)
+
 	for scanner.Scan() {
 		log.Debug().Msg(scanner.Text())
 	}
 
 	if err := scanner.Err(); err != nil {
-		log.Error().Msgf("Error reading output: %v", err)
-		return err
+		log.Fatal().Msgf("Error reading stdout: %v", err)
 	}
 
-	// cmd.Wait() returns an error if the command exits with non-zero status
-	// We return this without logging since it's expected behavior for some commands
-	return cmd.Wait()
-}
+	if err := cmd.Wait(); err != nil {
+		log.Fatal().Msgf("Command finished with error: %v", err)
+		return err
+	}
+	return nil
+}

pkg/util/retry.go

@@ -2,18 +2,17 @@ package util
 
 import (
 	"time"
-
 	"github.com/rs/zerolog/log"
 )
 
-func Retry(attempts int, delay time.Duration, fn func() error) error {
+func Retry(attempts int, delay time.Duration,fn func() error) error {
 	var err error
 	for i := 0; i < attempts; i++ {
 		if err = fn(); err == nil {
 			return nil
 		}
-		log.Error().Msgf("Retrying after %v. An error occurred: %s", delay, err)
+		log.Error().Msgf("Retrying after %d seconds. An error occured: %s", delay, err)
 		time.Sleep(delay)
 	}
 	return err
-}
+}

pkg/vpn/cache.go

@@ -4,42 +4,37 @@ import (
 	"encoding/json"
 	"io"
 	"os"
-	"path/filepath"
+	"path"
 	"time"
+
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/afero"
 )
 
 const serverCachefile = "servers.json"
 
-func getCacheDir() (string, error) {
+func getCacheDir() string {
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
-		return "", err
+		log.Error().Msgf("Failed to get user's home directory: %s ", err)
+		return ""
 	}
-	cacheDir := filepath.Join(homeDir, ".vpngate", "cache")
-	return cacheDir, nil
+	cacheDir := path.Join(homeDir, ".vpngate", "cache")
+	return cacheDir
 }
 
 func createCacheDir() error {
-	cacheDir, err := getCacheDir()
-	if err != nil {
-		return err
-	}
-	return os.MkdirAll(cacheDir, 0o700)
+	cacheDir := getCacheDir()
+	AppFs := afero.NewOsFs()
+	return AppFs.MkdirAll(cacheDir, 0o700)
 }
 
 func getVpnListCache() (*[]Server, error) {
-	cacheDir, err := getCacheDir()
-	if err != nil {
-		return nil, err
-	}
-	cacheFile := filepath.Join(cacheDir, serverCachefile)
+	cacheFile := path.Join(getCacheDir(), serverCachefile)
 	serversFile, err := os.Open(cacheFile)
 	if err != nil {
 		return nil, err
 	}
-	defer func() {
-		_ = serversFile.Close()
-	}()
 
 	byteValue, err := io.ReadAll(serversFile)
 	if err != nil {
@@ -49,6 +44,7 @@ func getVpnListCache() (*[]Server, error) {
 	var servers []Server
 
 	err = json.Unmarshal(byteValue, &servers)
+
 	if err != nil {
 		return nil, err
 	}
@@ -57,7 +53,8 @@ func getVpnListCache() (*[]Server, error) {
 }
 
 func writeVpnListToCache(servers []Server) error {
-	if err := createCacheDir(); err != nil {
+	err := createCacheDir()
+	if err != nil {
 		return err
 	}
 
@@ -66,26 +63,20 @@ func writeVpnListToCache(servers []Server) error {
 		return err
 	}
 
-	cacheDir, err := getCacheDir()
-	if err != nil {
-		return err
-	}
-	cacheFile := filepath.Join(cacheDir, serverCachefile)
+	cacheFile := path.Join(getCacheDir(), serverCachefile)
 
-	return os.WriteFile(cacheFile, f, 0o644)
+	err = os.WriteFile(cacheFile, f, 0o644)
+
+	return err
 }
 
 func vpnListCacheIsExpired() bool {
-	cacheDir, err := getCacheDir()
-	if err != nil {
-		return true
-	}
-	file, err := os.Stat(filepath.Join(cacheDir, serverCachefile))
+	file, err := os.Stat(path.Join(getCacheDir(), serverCachefile))
 	if err != nil {
 		return true
 	}
 
 	lastModified := file.ModTime()
 
-	return time.Since(lastModified) > 24*time.Hour
-}
+	return (time.Since(lastModified)) > time.Duration(24*time.Hour)
+}

pkg/vpn/client.go

@@ -1,17 +1,28 @@
 package vpn
 
 import (
+	"os"
 	"runtime"
 
 	"github.com/davegallant/vpngate/pkg/exec"
+	"github.com/juju/errors"
 )
 
 // Connect to a specified OpenVPN configuration
 func Connect(configPath string) error {
+	tmpLogFile, err := os.CreateTemp("", "vpngate-openvpn-log-")
+	if err != nil {
+		return errors.Annotate(err, "Unable to create a temporary log file")
+	}
+	defer func() {
+		_ = os.Remove(tmpLogFile.Name())
+	}()
+
 	executable := "openvpn"
 	if runtime.GOOS == "windows" {
 		executable = "C:\\Program Files\\OpenVPN\\bin\\openvpn.exe"
 	}
 
-	return exec.Run(executable, ".", "--verb", "4", "--config", configPath, "--data-ciphers", "AES-128-CBC")
-}
+	err = exec.Run(executable, ".", "--verb", "4", "--config", configPath, "--data-ciphers", "AES-128-CBC")
+	return err
+}

pkg/vpn/list.go

@@ -2,12 +2,10 @@ package vpn
 
 import (
 	"bytes"
-	"context"
 	"io"
-	"net"
 	"net/http"
 	"net/url"
-	"time"
+	"os"
 
 	"github.com/jszwec/csvutil"
 	"github.com/rs/zerolog/log"
@@ -18,12 +16,10 @@ import (
 )
 
 const (
-	vpnList            = "https://www.vpngate.net/api/iphone/"
-	httpClientTimeout  = 30 * time.Second
-	dialTimeout        = 10 * time.Second
+	vpnList = "https://www.vpngate.net/api/iphone/"
 )
 
-// Server holds information about a vpn relay server
+// Server holds in formation about a vpn relay server
 type Server struct {
 	HostName          string `csv:"#HostName"`
 	CountryLong       string `csv:"CountryLong"`
@@ -34,14 +30,20 @@ type Server struct {
 	Ping              string `csv:"Ping"`
 }
 
-// parseVpnList parses the VPN server list from CSV format
+func streamToBytes(stream io.Reader) []byte {
+	buf := new(bytes.Buffer)
+	_, err := buf.ReadFrom(stream)
+	if err != nil {
+		log.Error().Msg("Unable to stream bytes")
+	}
+	return buf.Bytes()
+}
+
+// parse csv
 func parseVpnList(r io.Reader) (*[]Server, error) {
 	var servers []Server
 
-	serverList, err := io.ReadAll(r)
-	if err != nil {
-		return nil, errors.Annotate(err, "Unable to read stream")
-	}
+	serverList := streamToBytes(r)
 
 	// Trim known invalid rows
 	serverList = bytes.TrimPrefix(serverList, []byte("*vpn_servers\r\n"))
@@ -55,119 +57,86 @@ func parseVpnList(r io.Reader) (*[]Server, error) {
 	return &servers, nil
 }
 
-// createHTTPClient creates an HTTP client with optional proxy configuration
-func createHTTPClient(httpProxy string, socks5Proxy string) (*http.Client, error) {
-	if httpProxy != "" {
-		proxyURL, err := url.Parse(httpProxy)
-		if err != nil {
-			return nil, errors.Annotatef(err, "Error parsing HTTP proxy: %s", httpProxy)
-		}
-		transport := &http.Transport{
-			Proxy: http.ProxyURL(proxyURL),
-		}
-		return &http.Client{
-			Transport: transport,
-			Timeout:   httpClientTimeout,
-		}, nil
-	}
-
-	if socks5Proxy != "" {
-		dialer, err := proxy.SOCKS5("tcp", socks5Proxy, nil, proxy.Direct)
-		if err != nil {
-			return nil, errors.Annotatef(err, "Error creating SOCKS5 dialer: %v", err)
-		}
-
-		// Create a DialContext function from the SOCKS5 dialer
-		dialContext := func(ctx context.Context, network, addr string) (net.Conn, error) {
-			// Check if context is already done
-			select {
-			case <-ctx.Done():
-				return nil, ctx.Err()
-			default:
-			}
-
-			// Use the dialer with a timeout
-			conn, err := dialer.Dial(network, addr)
-			if err != nil {
-				return nil, err
-			}
-
-			// Respect context cancellation after connection
-			go func() {
-				<-ctx.Done()
-				_ = conn.Close()
-			}()
-
-			return conn, nil
-		}
-
-		httpTransport := &http.Transport{
-			DialContext: dialContext,
-		}
-		return &http.Client{
-			Transport: httpTransport,
-			Timeout:   httpClientTimeout,
-		}, nil
-	}
-
-	return &http.Client{
-		Timeout: httpClientTimeout,
-		Transport: &http.Transport{
-			DialContext: (&net.Dialer{
-				Timeout: dialTimeout,
-			}).DialContext,
-		},
-	}, nil
-}
-
 // GetList returns a list of vpn servers
 func GetList(httpProxy string, socks5Proxy string) (*[]Server, error) {
 	cacheExpired := vpnListCacheIsExpired()
 
-	// Try to use cached list if not expired
+	var servers *[]Server
+	var client *http.Client
+
 	if !cacheExpired {
 		servers, err := getVpnListCache()
-		if err == nil {
+
+		if err != nil {
+			log.Info().Msg("Unable to retrieve vpn list from cache")
+		} else {
 			return servers, nil
 		}
-		log.Info().Msg("Unable to retrieve vpn list from cache")
+
 	} else {
 		log.Info().Msg("The vpn server list cache has expired")
 	}
 
 	log.Info().Msg("Fetching the latest server list")
 
-	client, err := createHTTPClient(httpProxy, socks5Proxy)
-	if err != nil {
-		return nil, err
+	if httpProxy != "" {
+		proxyURL, err := url.Parse(httpProxy)
+		if err != nil {
+			log.Error().Msgf("Error parsing proxy: %s", err)
+			os.Exit(1)
+		}
+		transport := &http.Transport{
+			Proxy: http.ProxyURL(proxyURL),
+		}
+
+		client = &http.Client{
+			Transport: transport,
+		}
+
+	} else if socks5Proxy != "" {
+		dialer, err := proxy.SOCKS5("tcp", socks5Proxy, nil, proxy.Direct)
+		if err != nil {
+			log.Error().Msgf("Error creating SOCKS5 dialer: %v", err)
+			os.Exit(1)
+		}
+
+		httpTransport := &http.Transport{
+			Dial: dialer.Dial,
+		}
+
+		client = &http.Client{
+			Transport: httpTransport,
+		}
+	} else {
+		client = &http.Client{}
 	}
 
-	var servers *[]Server
+	var r *http.Response
 
-	err = util.Retry(5, 1, func() error {
-		resp, err := client.Get(vpnList)
+	err := util.Retry(5, 1, func() error {
+		var err error
+		r, err = client.Get(vpnList)
 		if err != nil {
 			return err
 		}
 		defer func() {
-			_ = resp.Body.Close()
+			_ = r.Body.Close()
 		}()
 
-		if resp.StatusCode != http.StatusOK {
-			return errors.Annotatef(err, "Unexpected status code when retrieving vpn list: %d", resp.StatusCode)
+		if r.StatusCode != 200 {
+			return errors.Annotatef(err, "Unexpected status code when retrieving vpn list: %d", r.StatusCode)
 		}
 
-		parsedServers, err := parseVpnList(resp.Body)
+		servers, err = parseVpnList(r.Body)
+
 		if err != nil {
 			return err
 		}
 
-		servers = parsedServers
+		err = writeVpnListToCache(*servers)
 
-		// Cache the servers for future use
-		cacheErr := writeVpnListToCache(*servers)
-		if cacheErr != nil {
-			log.Warn().Msgf("Unable to write servers to cache: %s", cacheErr)
+		if err != nil {
+			log.Warn().Msgf("Unable to write servers to cache: %s", err)
 		}
 		return nil
 	})
@@ -177,4 +146,4 @@ func GetList(httpProxy string, socks5Proxy string) (*[]Server, error) {
 	}
 
 	return servers, nil
-}
+}