Merge pull request #75 from mysteriumnetwork/fix/multiarch-2

Support native runner on MacOS

.github/workflows/release.yml

@@ -24,7 +24,6 @@ jobs:
       run: |
         go run cmd/resource/resource.go
         go build -v -trimpath -ldflags "-s -w -H windowsgui" -o  bin/myst-launcher-amd64.exe github.com/mysteriumnetwork/myst-launcher/cmd/app
-        go build -v -trimpath -ldflags "-s -w -X 'main.debugMode=1'" -o  bin/myst-launcher-dbg-amd64.exe github.com/mysteriumnetwork/myst-launcher/cmd/app
       env:
         GOARCH: amd64
         GOOS: windows
@@ -46,7 +45,6 @@ jobs:
         prerelease: true
         files: |
           bin/myst-launcher-amd64.exe
-          bin/myst-launcher-dbg-amd64.exe
 
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/state.go

@@ -32,9 +32,7 @@ func NewApp() *AppState {
 }
 
 func (s *AppState) StopAppController() {
-	if !s.ctrApp.GetFinished() {
-		s.TriggerAction(model.ActionStop)
-	}
+	s.ctrApp.Shutdown()
 }
 
 func (s *AppState) StartAppController() {

cmd/app/app.go

@@ -25,14 +25,24 @@ import (
 	"github.com/mysteriumnetwork/myst-launcher/utils"
 )
 
-var debugMode = ""
-
 func main() {
 	ap := app.NewApp()
 	ipc := ipc_.NewHandler()
 
-	if len(os.Args) > 1 {
-		switch os.Args[1] {
+	cmd := ""
+	debugMode := false
+	for _, v := range os.Args {
+		switch v {
+		case _const.FlagInstall,
+			_const.FlagUninstall,
+			_const.FlagInstallFirewall:
+			cmd = v
+		case _const.FlagDebug:
+			debugMode = true
+		}
+	}
+	if cmd != "" {
+		switch cmd {
 		case _const.FlagInstall:
 			utils.InstallExe()
 			return
@@ -47,6 +57,9 @@ func main() {
 			return
 		}
 	}
+	if debugMode {
+		utils.AllocConsole(false)
+	}
 
 	mod := model.NewUIModel()
 	mod.SetApp(ap)
@@ -59,12 +72,12 @@ func main() {
 			return
 		}
 	}
-	utils.EnableAutorun(mod.Config.AutoStart)
-
+	err := utils.EnableAutorun(mod.Config.AutoStart)
+	fmt.Println("utils.EnableAutorun", err)
 
 	prodVersion, _ := utils.GetProductVersion()
 	mod.SetProductVersion(prodVersion)
-	if debugMode != "" {
+	if debugMode {
 		log.Println("Product version:", prodVersion)
 	}
 
@@ -90,7 +103,7 @@ func main() {
 	gui_win32.ShutdownGDIPlus()
 	ap.StopAppController()
 
-	if debugMode != "" {
+	if debugMode {
 		fmt.Println("Press 'Enter' to continue...")
 		bufio.NewReader(os.Stdin).ReadBytes('\n')
 	}

const/flags.go

@@ -11,4 +11,5 @@ const (
 	FlagInstall         = "-install-binary"
 	FlagUninstall       = "-uninstall"
 	FlagInstallFirewall = "-install-fw"
+	FlagDebug           = "-debug"
 )

controller/docker/docker.go

@@ -9,6 +9,7 @@ package docker
 
 import (
 	"log"
+	"sync"
 	"time"
 
 	model_ "github.com/mysteriumnetwork/myst-launcher/model"
@@ -20,7 +21,9 @@ import (
 type Controller struct {
 	a model_.AppState
 
-	finished    bool
+	finished bool
+	wg       sync.WaitGroup
+
 	mgr         model_.PlatformManager
 	mystManager *myst.Manager
 	lg          *log.Logger
@@ -39,12 +42,16 @@ func (c *Controller) SetApp(a model_.AppState) {
 	c.a = a
 }
 
-func (c *Controller) GetFinished() bool {
-	return c.finished
+func (c *Controller) setFinished() {
+	c.finished = true
+	c.wg.Done()
 }
 
-func (c *Controller) SetFinished() {
-	c.finished = true
+func (c *Controller) Shutdown() {
+	if !c.finished {
+		c.a.GetAction() <- model_.ActionStop
+		c.wg.Wait()
+	}
 }
 
 func (c *Controller) Start() {
@@ -70,12 +77,13 @@ func (c *Controller) Start() {
 	c.mystManager = mystManager
 	docker := NewDockerRunner(mystManager.GetDockerClient())
 
-	defer c.SetFinished()
+	c.wg.Add(1)
+	defer c.setFinished()
 
 	t1 := time.NewTicker(15 * time.Second)
 	for {
 		if wantExit := c.tryStartOrInstallDocker(docker); wantExit {
-			c.SetFinished()
+			c.setFinished()
 			ui.CloseUI()
 			return
 		}
@@ -87,7 +95,6 @@ func (c *Controller) Start() {
 			c.upgradeContainer(false)
 		}
 
-		// c.lg.Println("wait action >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
 		select {
 		case act := <-action:
 			c.lg.Println("action:", act)
@@ -121,6 +128,8 @@ func (c *Controller) Start() {
 
 			case model_.ActionStop:
 				c.lg.Println("[docker] stop")
+				mdl.SetStateContainer(model_.RunnableStateUnknown)
+				mystManager.Stop()
 				return
 			}
 
@@ -241,14 +250,12 @@ func (c *Controller) startContainer() {
 	if !mdl.Config.Enabled {
 		return
 	}
-
 	containerAlreadyRunning, err := c.mystManager.Start()
 	if err != nil {
 		mdl.SetStateContainer(model_.RunnableStateUnknown)
 		c.lg.Println("startContainer", err)
 		return
 	}
-
 	mdl.SetStateContainer(model_.RunnableStateRunning)
 
 	if !containerAlreadyRunning && mdl.Config.InitialState == model_.InitialStateFirstRunAfterInstall {

controller/native/install.go

@@ -8,12 +8,12 @@ import (
 	"sync"
 
 	"github.com/codingsince1985/checksum"
-	wapi "github.com/iamacarpet/go-win64api"
 
-	_const "github.com/mysteriumnetwork/myst-launcher/const"
 	"github.com/mysteriumnetwork/myst-launcher/model"
 	"github.com/mysteriumnetwork/myst-launcher/updates"
 	"github.com/mysteriumnetwork/myst-launcher/utils"
+	_const "github.com/mysteriumnetwork/myst-launcher/const"
+
 )
 
 const (
@@ -63,6 +63,7 @@ func (c *Controller) CheckAndUpgradeNodeExe(forceUpgrade bool) bool {
 		mdl.ImageInfo.VersionLatest = tagLatest
 		mdl.ImageInfo.VersionCurrent = cfg.NodeExeVersion
 		mdl.ImageInfo.HasUpdate = tagLatest != cfg.NodeExeVersion
+
 		defer func() {
 			cfg.NodeLatestTag = tagLatest
 			cfg.NodeExeVersion = tagLatest
@@ -82,7 +83,7 @@ func (c *Controller) CheckAndUpgradeNodeExe(forceUpgrade bool) bool {
 				utils.TerminateProcess(p, 0)
 			}
 
-			if c.a.GetModel().Config.AutoUpgrade || sha256 == "" {
+			if cfg.AutoUpgrade || sha256 == "" {
 				c.tryInstall()
 
 				sha256, _ := checksum.SHA256sum(fullpath)
@@ -136,17 +137,10 @@ var once sync.Once
 
 func tryInstallFirewallRules(ui model.Gui_) {
 	once.Do(func() {
-		// check firewall rules
-		needFirewallSetup := false
-		rule, err := wapi.FirewallRuleGet(fwRuleNameUDP)
-		if err != nil || rule.Name == "" {
-			needFirewallSetup = true
-		}
 
-		rule, err = wapi.FirewallRuleGet(fwRuleNameTCP)
-		if err != nil || rule.Name == "" {
-			needFirewallSetup = true
-		}
+		// check firewall rules
+		needFirewallSetup := checkFirewallRules()
+
 		if needFirewallSetup {
 			ret := ui.YesNoModal("Installation", "Firewall rule missing, addition is required. Press Yes to approve.")
 			if ret == model.IDYES {

controller/native/node.go

@@ -9,6 +9,7 @@ package native
 
 import (
 	"log"
+	"sync"
 	"time"
 
 	model_ "github.com/mysteriumnetwork/myst-launcher/model"
@@ -19,16 +20,15 @@ type Controller struct {
 	a model_.AppState
 
 	finished bool
-	runner   *NodeRunner
-	lg       *log.Logger
-}
+	wg       sync.WaitGroup
 
-func (c *Controller) GetFinished() bool {
-	return c.finished
+	runner *NodeRunner
+	lg     *log.Logger
 }
 
-func (c *Controller) SetFinished() {
+func (c *Controller) setFinished() {
 	c.finished = true
+	c.wg.Done()
 }
 
 func NewController() *Controller {
@@ -45,7 +45,12 @@ func (c *Controller) SetApp(a model_.AppState) {
 	c.runner = NewRunner(a.GetModel())
 }
 
-func (c *Controller) Shutdown() {}
+func (c *Controller) Shutdown() {
+	if !c.finished {
+		c.a.GetAction() <- model_.ActionStop
+		c.wg.Wait()
+	}
+}
 
 // Supervise the node
 func (c *Controller) Start() {
@@ -61,7 +66,8 @@ func (c *Controller) Start() {
 	model.ImageInfo.VersionLatest = cfg.NodeLatestTag
 	model.Update()
 
-	defer c.SetFinished()
+	c.wg.Add(1)
+	defer c.setFinished()
 
 	t1 := time.NewTicker(15 * time.Second)
 	for {
@@ -73,7 +79,6 @@ func (c *Controller) Start() {
 		// c.upgradeContainer(false)
 		// }
 
-		// c.lg.Println("wait action >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
 		select {
 		case act := <-action:
 			c.lg.Println("action:", act)
@@ -107,6 +112,8 @@ func (c *Controller) Start() {
 
 			case model_.ActionStop:
 				c.lg.Println("[native] stop")
+				model.SetStateContainer(model_.RunnableStateUnknown)
+				c.stop()
 				return
 			}
 
@@ -151,10 +158,18 @@ func (c *Controller) startContainer() {
 
 		ui := c.a.GetUI()
 		tryInstallFirewallRules(ui)
-		
+
 		running := c.runner.IsRunningOrTryStart()
 		if running {
 			model.SetStateContainer(model_.RunnableStateRunning)
+
+			cfg := &model.Config
+			switch cfg.InitialState {
+			case model_.InitialStateFirstRunAfterInstall, model_.InitialStateUndefined:
+				cfg.InitialState = model_.InitialStateNormalRun
+				cfg.Save()
+				ui.ShowNotificationInstalled()
+			}
 		}
 	}
 }

controller/native/runner.go

@@ -80,8 +80,7 @@ func (r *NodeRunner) isRunning() uint32 {
 // return values: isRunning
 func (r *NodeRunner) IsRunningOrTryStart() bool {
 
-	p := r.isRunning()
-	if p == 0 {
+	if r.isRunning() == 0 {
 		return r.startNode() == nil
 	}
 
@@ -110,21 +109,16 @@ func (r *NodeRunner) startNode() error {
 	dataDirArg := fmt.Sprintf("--data-dir=%s", r.configpath)
 	userspaceArg := "--userspace"
 
-	switch runtime.GOOS {
-	case "windows":
-		args := []string{userspaceArg, versionArg, configDirArg, dataDirArg, "service", "--agreed-terms-and-conditions"}
-		if err := utils.CmdStart(fullExePath, args...); err != nil {
-			log.Println("run node failed:", err)
-			return err
-		}
+	args := []string{userspaceArg, versionArg, configDirArg, dataDirArg, "service", "--agreed-terms-and-conditions"}
 
-	case "darwin":
-		// cmd = exec.Command("open", "/Applications/Docker.app/")
-		r.cmd = exec.Command(fullExePath, versionArg, configDirArg, dataDirArg, "service", "--agreed-terms-and-conditions")
-		if err := r.cmd.Start(); err != nil {
+	switch runtime.GOOS {
+	case "windows", "darwin":
+		cmd, err := utils.CmdStart(fullExePath, args...)
+		if err != nil {
 			log.Println("run node failed:", err)
 			return err
 		}
+		r.cmd = cmd
 
 	default:
 		return errors.New("unsupported OS: " + runtime.GOOS)

controller/native/utils_unix.go

@@ -11,5 +11,8 @@ func extractNodeBinary(src, dest string) error {
 	return extractor.NewTgz().Extract(src, dest)
 }
 
-func CheckAndInstallFirewall() {
+func CheckAndInstallFirewall() {}
+
+func checkFirewallRules() bool {
+	return false
 }

controller/native/utils_win32.go

@@ -34,3 +34,17 @@ func CheckAndInstallFirewallRules() {
 		log.Println(err)
 	}
 }
+
+// returns true if some firewall rules to be setup
+func checkFirewallRules() bool {
+	rule, err := wapi.FirewallRuleGet(fwRuleNameUDP)
+	if err != nil || rule.Name == "" {
+		return true
+	}
+
+	rule, err = wapi.FirewallRuleGet(fwRuleNameTCP)
+	if err != nil || rule.Name == "" {
+		return true
+	}
+	return false
+}