From 61f577934623aaeb2f5702cb038cf57a1203612a Mon Sep 17 00:00:00 2001 From: DG Date: Mon, 9 Aug 2021 22:23:21 -0400 Subject: [PATCH] Remove speedtest (#42) * Remove speedtest * Go mod tidy --- README.md | 2 +- go.mod | 1 - go.sum | 6 ----- pkg/exec/run.go | 4 ---- pkg/network/speedtest.go | 52 ---------------------------------------- pkg/vpn/client.go | 13 ---------- 6 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 pkg/network/speedtest.go diff --git a/README.md b/README.md index 681a2db..e051b71 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a client for [vpngate.net](https://www.vpngate.net/). ![vpngate](https://user-images.githubusercontent.com/4519234/104145615-b6f9f880-5395-11eb-812c-c6597a7aed0f.gif) -This client fetches the list of available relay servers provided by vpngate.net. Once connected to a server, speed tests kick off to determine latency, upload speed and download speed. +This client fetches the list of available relay servers provided by vpngate.net. You can check out your current IP address and region at https://nordvpn.com/what-is-my-ip/, or simply run the following command in a terminal: diff --git a/go.mod b/go.mod index a57d954..cec566d 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/nxadm/tail v1.4.8 github.com/olekukonko/tablewriter v0.0.5 github.com/rs/zerolog v1.23.0 - github.com/showwin/speedtest-go v1.1.4 github.com/spf13/afero v1.6.0 github.com/spf13/cobra v1.2.1 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 6fe57eb..50967ed 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -271,8 +269,6 @@ github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI91 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/showwin/speedtest-go v1.1.4 h1:pcY1W5LYZu44lH6Fuu80nu/Pj67n//VArlZudbAgR6E= -github.com/showwin/speedtest-go v1.1.4/go.mod h1:dJugxvC/AQDt4HQQKZ9lKNa2+b1c8nzj9IL0a/F8l1U= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -419,7 +415,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -636,7 +631,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/exec/run.go b/pkg/exec/run.go index adadb1e..fbc1112 100644 --- a/pkg/exec/run.go +++ b/pkg/exec/run.go @@ -5,7 +5,6 @@ import ( "os" "os/exec" "strings" - "syscall" "github.com/juju/errors" "github.com/rs/zerolog/log" @@ -26,9 +25,6 @@ func Run(path string, workDir string, args ...string) (string, error) { stderr := &bytes.Buffer{} cmd.Stdout = stdout cmd.Stderr = stderr - cmd.SysProcAttr = &syscall.SysProcAttr{ - Pdeathsig: syscall.SIGTERM, - } log.Debug().Msgf("Executing " + strings.Join(cmd.Args, " ")) err = cmd.Run() output := strings.TrimSpace(stdout.String()) diff --git a/pkg/network/speedtest.go b/pkg/network/speedtest.go deleted file mode 100644 index 00bc176..0000000 --- a/pkg/network/speedtest.go +++ /dev/null @@ -1,52 +0,0 @@ -package network - -import ( - "github.com/juju/errors" - "github.com/rs/zerolog/log" - "github.com/showwin/speedtest-go/speedtest" -) - -// TestSpeed tests the speed of an active network connection -func TestSpeed() error { - user, err := speedtest.FetchUserInfo() - - if err != nil { - return errors.Annotate(err, "Unable to fetch user info") - } - - serverList, err := speedtest.FetchServerList(user) - - if err != nil { - return errors.Annotate(err, "Unable to fetch server list") - } - - targets, _ := serverList.FindServer([]int{}) - - if err != nil { - return errors.Annotate(err, "Unable to find server") - } - - for _, s := range targets { - err := s.PingTest() - - if err != nil { - log.Error().Msg("Failed to obtain ping") - } - - err = s.DownloadTest(true) - - if err != nil { - log.Error().Msg("Failed download test") - } - - err = s.UploadTest(true) - - if err != nil { - log.Error().Msg("Failed upload test") - } - - log.Info().Msgf("Latency: %s, Download: %f, Upload: %f", s.Latency, s.DLSpeed, s.ULSpeed) - } - - return nil -} diff --git a/pkg/vpn/client.go b/pkg/vpn/client.go index b780ef9..dcc8e1b 100644 --- a/pkg/vpn/client.go +++ b/pkg/vpn/client.go @@ -3,10 +3,8 @@ package vpn import ( "io/ioutil" "os" - "time" "github.com/davegallant/vpngate/pkg/exec" - "github.com/davegallant/vpngate/pkg/network" "github.com/juju/errors" "github.com/nxadm/tail" "github.com/rs/zerolog/log" @@ -21,17 +19,6 @@ func Connect(configPath string) error { } defer os.Remove(tmpLogFile.Name()) - go func() { - for { - err = network.TestSpeed() - if err != nil { - log.Error().Msg("Failed to test network speed") - } - time.Sleep(time.Minute) - } - - }() - go func() { // Tail the temporary openvpn log file t, err := tail.TailFile(tmpLogFile.Name(), tail.Config{Follow: true})