improvement: determine vpn activity by checking existence of 'zerops'…

… network interface, no more pinging

src/cmd/logout.go

@@ -27,7 +27,7 @@ func logoutCmd() *cmdBuilder.Cmd {
 			}
 
 			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.LogoutVpnDisconnecting)))
-			if isVpnUp(ctx, uxBlocks, 1) {
+			if isVpnUp(uxBlocks) {
 				_ = disconnectVpn(ctx, uxBlocks)
 			}
 			uxBlocks.PrintInfo(styles.SuccessLine(i18n.T(i18n.LogoutSuccess)))

src/cmd/root.go

@@ -77,7 +77,7 @@ func rootCmd() *cmdBuilder.Cmd {
 			}
 
 			var vpnStatusText string
-			if isVpnUp(ctx, cmdData.UxBlocks, 1) {
+			if isVpnUp(cmdData.UxBlocks) {
 				vpnStatusText = i18n.T(i18n.VpnCheckingConnectionIsActive)
 			} else {
 				vpnStatusText = i18n.T(i18n.VpnCheckingConnectionIsNotActive)

src/cmd/vpnDown.go

@@ -17,6 +17,7 @@ import (
 func vpnDownCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("down").
+		Alias("d", "stop").
 		Short(i18n.T(i18n.CmdDescVpnDown)).
 		HelpFlag(i18n.T(i18n.CmdHelpVpnDown)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {

src/cmd/vpnUp.go

@@ -2,12 +2,11 @@ package cmd
 
 import (
 	"context"
+	"net"
 	"os"
 	"time"
 
 	"github.com/pkg/errors"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-
 	"github.com/zeropsio/zcli/src/cliStorage"
 	"github.com/zeropsio/zcli/src/cmd/scope"
 	"github.com/zeropsio/zcli/src/cmdBuilder"
@@ -16,7 +15,6 @@ import (
 	"github.com/zeropsio/zcli/src/entity"
 	"github.com/zeropsio/zcli/src/file"
 	"github.com/zeropsio/zcli/src/i18n"
-	"github.com/zeropsio/zcli/src/nettools"
 	"github.com/zeropsio/zcli/src/uxBlock"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
 	"github.com/zeropsio/zcli/src/uxHelpers"
@@ -25,13 +23,13 @@ import (
 	"github.com/zeropsio/zerops-go/dto/input/path"
 	"github.com/zeropsio/zerops-go/types"
 	"github.com/zeropsio/zerops-go/types/uuid"
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
-const vpnCheckAddress = "logger.core.zerops"
-
 func vpnUpCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("up").
+		Alias("u", "start").
 		Short(i18n.T(i18n.CmdDescVpnUp)).
 		ScopeLevel(scope.Project).
 		Arg(scope.ProjectArgName, cmdBuilder.OptionalArg()).
@@ -40,7 +38,7 @@ func vpnUpCmd() *cmdBuilder.Cmd {
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			uxBlocks := cmdData.UxBlocks
 
-			if isVpnUp(ctx, uxBlocks, 1) {
+			if isVpnUp(uxBlocks) {
 				if cmdData.Params.GetBool("auto-disconnect") {
 					err := disconnectVpn(ctx, uxBlocks)
 					if err != nil {
@@ -133,7 +131,7 @@ func vpnUpCmd() *cmdBuilder.Cmd {
 			}
 
 			// wait for the vpn to be up
-			if isVpnUp(ctx, uxBlocks, 6) {
+			if isVpnUp(uxBlocks) {
 				uxBlocks.PrintInfo(styles.SuccessLine(i18n.T(i18n.VpnUp)))
 			} else {
 				uxBlocks.PrintWarning(styles.WarningLine(i18n.T(i18n.VpnPingFailed)))
@@ -143,28 +141,16 @@ func vpnUpCmd() *cmdBuilder.Cmd {
 		})
 }
 
-func isVpnUp(ctx context.Context, uxBlocks uxBlock.UxBlocks, attempts int) bool {
-	p := []uxHelpers.Process{
-		{
-			F: func(ctx context.Context) error {
-				for i := 0; i < attempts; i++ {
-					err := nettools.Ping(ctx, vpnCheckAddress)
-					if err == nil {
-						return nil
-					}
+// errNoSuchInterface copied from 'net' package, because it's private :)
+var errNoSuchInterface = errors.New("no such network interface")
 
-					time.Sleep(time.Millisecond * 500)
-				}
-				return errors.New(i18n.T(i18n.VpnPingFailed))
-			},
-			RunningMessage:      i18n.T(i18n.VpnCheckingConnection),
-			ErrorMessageMessage: "",
-			SuccessMessage:      "",
-		},
+func isVpnUp(uxBlocks uxBlock.UxBlocks) bool {
+	_, err := net.InterfaceByName(constants.WgInterfaceName)
+	opError := &net.OpError{}
+	// cannot use errors.Is(), because std error package does not implement Is() interface, so we have this abomination
+	if errors.As(err, &opError) && opError.Err.Error() != errNoSuchInterface.Error() {
+		uxBlocks.PrintWarning(styles.WarningLine(i18n.T(i18n.WarnVpnInterface, opError.Err.Error())))
 	}
-
-	err := uxHelpers.ProcessCheckWithSpinner(ctx, uxBlocks, p)
-
 	return err == nil
 }
 

src/cmdBuilder/buildCobraCmd.go

@@ -38,6 +38,7 @@ func buildCobraCmd(
 		argNames[i] = argName
 	}
 	cobraCmd.Use = strings.Join(append([]string{cmd.use}, argNames...), " ")
+	cobraCmd.Aliases = cmd.aliases
 
 	if cmd.scopeLevel != nil {
 		cmd.scopeLevel.AddCommandFlags(cmd)

src/cmdBuilder/cmd.go

@@ -14,6 +14,7 @@ type ScopeLevel interface {
 
 type Cmd struct {
 	use               string
+	aliases           []string
 	short             string
 	long              string
 	helpTemplate      string
@@ -60,6 +61,11 @@ func (cmd *Cmd) Use(use string) *Cmd {
 	return cmd
 }
 
+func (cmd *Cmd) Alias(aliases ...string) *Cmd {
+	cmd.aliases = append(cmd.aliases, aliases...)
+	return cmd
+}
+
 func (cmd *Cmd) SetHelpTemplate(template string) *Cmd {
 	cmd.helpTemplate = template
 	return cmd

src/i18n/en.go

@@ -199,8 +199,9 @@ at https://docs.zerops.io/references/cli for further details.`,
 	CmdDescEnv: "Displays global environment variables, their paths and additional options",
 
 	// vpn
-	CmdHelpVpn: "the vpn command.",
-	CmdDescVpn: "VPN commands group",
+	CmdHelpVpn:       "the vpn command.",
+	CmdDescVpn:       "VPN commands group",
+	WarnVpnInterface: "Error getting vpn network interface: %s",
 
 	// vpn up
 	CmdHelpVpnUp: "the vpn up command.",

src/i18n/i18n.go

@@ -2,10 +2,11 @@ package i18n
 
 import "fmt"
 
-func T(textConst string, args ...interface{}) string {
+func T(textConst string, args ...any) string {
 	translation, exists := en[textConst]
 	if !exists {
-		return "[missing translation] " + textConst
+		format := textConst
+		return "[missing translation] " + fmt.Sprintf(format, args...)
 	}
 	if len(args) > 0 {
 		return fmt.Sprintf(translation, args...)
@@ -181,8 +182,9 @@ const (
 	Documentation = "Documentation"
 
 	// vpn
-	CmdHelpVpn = "CmdHelpVpn"
-	CmdDescVpn = "CmdDescVpn"
+	CmdHelpVpn       = "CmdHelpVpn"
+	CmdDescVpn       = "CmdDescVpn"
+	WarnVpnInterface = "WarnVpnInterface"
 
 	// vpn up
 	CmdHelpVpnUp             = "CmdHelpVpnUp"

src/uxBlock/spinner.go

@@ -58,7 +58,7 @@ type spinnerModel struct {
 
 type MergeMessage []tea.Cmd
 
-func XXX(cmdList ...tea.Cmd) func() tea.Msg {
+func sequence(cmdList ...tea.Cmd) func() tea.Msg {
 	return func() tea.Msg {
 		return MergeMessage(cmdList)
 	}
@@ -69,7 +69,7 @@ func (m *spinnerModel) Init() tea.Cmd {
 		ticks[i] = m.spinners[i].init()
 	}
 
-	return XXX(ticks...)
+	return sequence(ticks...)
 }
 
 func (m *spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -109,7 +109,7 @@ func (m *spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}(i)
 		}
 		wg.Wait()
-		return m, XXX(cmdList...)
+		return m, sequence(cmdList...)
 	}
 	return m, nil
 }