Merge pull request #5 from zeropsio/fix_messages_and_ctx_into_ping

#xxx - ctx ping + messages

src/cmd/di.go

@@ -85,8 +85,9 @@ func createDaemonStorage() (*daemonStorage.Handler, error) {
 func createVpn(storage *daemonStorage.Handler, dnsServer *dnsServer.Handler, logger *logger.Handler) *vpn.Handler {
 	return vpn.New(
 		vpn.Config{
-			VpnCheckInterval:   time.Second * 1,
+			VpnCheckInterval:   time.Second * 3,
 			VpnCheckRetryCount: 3,
+			VpnCheckTimeout:    time.Second * 3,
 		},
 		logger,
 		grpcApiClientFactory.New(),

src/dnsServer/handler_linux.go

@@ -0,0 +1,25 @@
+package dnsServer
+
+import (
+	"context"
+	"net"
+)
+
+type Handler struct {
+}
+
+func New() *Handler {
+	return &Handler{}
+}
+
+// listen and serve
+func (h *Handler) Run(_ context.Context) error {
+	return nil
+}
+
+func (h *Handler) StopForward() {
+
+}
+
+func (h *Handler) SetAddresses(_ net.IP, _ []net.IP, _ net.IP, _ net.IPNet) {
+}

src/i18n/en.go

@@ -45,18 +45,20 @@ const (
 	DeployUploadingStart          = "uploading start"
 	DeployUploadingDone           = "uploading done"
 	DeployDeployingStart          = "deploying start"
-	DeployUploadArchiveFailed          = "upload archive failed"
+	DeployUploadArchiveFailed     = "upload archive failed"
 	DeploySuccess                 = "project deployed"
 
 	// vpn start
-	VpnStartProjectNameIsEmpty      = "project name must be filled"
-	VpnStartProjectNotFound         = "project not found"
-	VpnStartProjectsWithSameName    = "there are multiple projects with same name"
-	VpnStartDaemonIsUnavailable     = "daemon is currently unavailable, did you install it?"
-	VpnStartInstallDaemonPrompt     = "is it ok if we are going to install daemon for you?"
-	VpnStartTerminatedByUser        = "when you will be ready, try `zcli daemon install`"
-	VpnStartUserIsUnableToWriteYorN = "type 'y' or 'n' please"
-	VpnStartSuccess                 = "vpn connection was established"
+	VpnStartProjectNameIsEmpty         = "project name must be filled"
+	VpnStartProjectNotFound            = "project not found"
+	VpnStartInterfaceAssignFailed      = "interface name assign failed"
+	VpnStartWireguardInterfaceNotfound = "wireguard interface not found"
+	VpnStartProjectsWithSameName       = "there are multiple projects with same name"
+	VpnStartDaemonIsUnavailable        = "daemon is currently unavailable, did you install it?"
+	VpnStartInstallDaemonPrompt        = "is it ok if we are going to install daemon for you?"
+	VpnStartTerminatedByUser           = "when you will be ready, try `zcli daemon install`"
+	VpnStartUserIsUnableToWriteYorN    = "type 'y' or 'n' please"
+	VpnStartSuccess                    = "vpn connection was established"
 
 	// vpn status
 	VpnStatusActive   = "vpn is active"

src/vpn/handler.go

@@ -29,6 +29,7 @@ const (
 type Config struct {
 	VpnCheckInterval   time.Duration
 	VpnCheckRetryCount int
+	VpnCheckTimeout    time.Duration
 }
 
 type Handler struct {

src/vpn/handler_isVpnAlive.go

@@ -1,6 +1,7 @@
 package vpn
 
 import (
+	"context"
 	"os/exec"
 )
 
@@ -10,13 +11,18 @@ func (h *Handler) isVpnAlive(serverIp string) bool {
 		return false
 	}
 
-	for i := 0; i < 3; i++ {
-		_, err := exec.Command("ping6", "-c", "1", serverIp).Output()
-		if err != nil {
-			continue
+	for i := 0; i < h.config.VpnCheckRetryCount; i++ {
+		if func() bool {
+			ctx, cancel := context.WithTimeout(context.Background(), h.config.VpnCheckTimeout)
+			defer cancel()
+			_, err := exec.CommandContext(ctx, "ping6", "-c", "1", serverIp).Output()
+			if err != nil {
+				return false
+			}
+			return true
+		}() {
+			return true
 		}
-
-		return true
 	}
 	return false
 }

src/vpn/handler_setVpn_darwin.go

@@ -12,6 +12,7 @@ import (
 	"strconv"
 
 	"github.com/google/uuid"
+	"github.com/zerops-io/zcli/src/i18n"
 	"github.com/zerops-io/zcli/src/utils/cmdRunner"
 	"github.com/zerops-io/zcli/src/zeropsVpnProtocol"
 )
@@ -29,7 +30,7 @@ func (h *Handler) setVpn(selectedVpnAddress, privateKey string, mtu uint32, resp
 	re := regexp.MustCompile(`INFO: \((.*)\)`)
 	submatches := re.FindSubmatch(output)
 	if len(submatches) != 2 {
-		return errors.New("vpn interface not found")
+		return errors.New(i18n.VpnStartWireguardInterfaceNotfound)
 	}
 
 	interfaceName := string(submatches[1])

src/vpn/handler_setVpn_linux.go

@@ -13,6 +13,7 @@ import (
 	"strconv"
 
 	"github.com/google/uuid"
+	"github.com/zerops-io/zcli/src/i18n"
 	"github.com/zerops-io/zcli/src/utils/cmdRunner"
 	"github.com/zerops-io/zcli/src/zeropsVpnProtocol"
 )
@@ -24,11 +25,11 @@ func getNewVpnInterfaceName() (string, error) {
 		if err == nil {
 			continue
 		}
-		if err.Error() == "no such network interface" {
+		if err.Error() == "route ip+net: no such network interface" {
 			return interfaceName, nil
 		}
 	}
-	return "", errors.New("next  interface name not available")
+	return "", errors.New(i18n.VpnStartInterfaceAssignFailed)
 }
 
 func (h *Handler) setVpn(selectedVpnAddress, privateKey string, mtu uint32, response *zeropsVpnProtocol.StartVpnResponse) error {

src/vpn/handler_startVpn.go

@@ -10,6 +10,7 @@ import (
 	"github.com/zerops-io/zcli/src/utils/certReader"
 	"github.com/zerops-io/zcli/src/zeropsApiProtocol"
 	"github.com/zerops-io/zcli/src/zeropsVpnProtocol"
+	"google.golang.org/grpc/status"
 )
 
 func (h *Handler) startVpn(
@@ -58,7 +59,11 @@ func (h *Handler) startVpn(
 		ClientPublicKey: publicKey,
 	})
 	if err := utils.HandleGrpcApiError(apiVpnRequestResponse, err); err != nil {
-		return err
+		if errStatus, ok := status.FromError(err); ok {
+			return errors.New(errStatus.Err().Error())
+		} else {
+			return err
+		}
 	}
 	h.logger.Debug("vpn request end")
 
@@ -96,7 +101,11 @@ func (h *Handler) startVpn(
 		Expiry:          zeropsVpnProtocol.ToProtoTimestamp(expiry),
 	})
 	if err := utils.HandleVpnApiError(startVpnResponse, err); err != nil {
-		return err
+		if errStatus, ok := status.FromError(err); ok {
+			return errors.New(errStatus.Err().Error())
+		} else {
+			return err
+		}
 	}
 
 	h.logger.Debug("call start vpn - end")