initial SysTray PR

agent/agent.go

@@ -58,6 +58,9 @@ type Agent struct {
 	MeshSystemEXE      string
 	MeshSVC            string
 	PyBin              string
+	PyVer              string
+	PyBaseDir          string
+	PyDir              string
 	NuBin              string
 	DenoBin            string
 	AgentHeader        string
@@ -116,12 +119,24 @@ func New(logger *logrus.Logger, version string) *Agent {
 		hostname = info.Hostname
 	}
 
-	var pybin string
-	switch runtime.GOARCH {
-	case "amd64":
-		pybin = filepath.Join(pd, "py38-x64", "python.exe")
-	case "386":
-		pybin = filepath.Join(pd, "py38-x32", "python.exe")
+	pyver := "n/a"
+	pybin := "n/a"
+	pyBaseDir := "n/a"
+	pydir := "n/a"
+
+	if runtime.GOOS == "windows" {
+		major := info.OS.Major
+		minor := info.OS.Minor
+		if major > 6 || (major == 6 && minor >= 3) {
+			// Windows 8.1 or higher
+			pyver = "3.11.9"
+		} else {
+			pyver = "3.8.7"
+		}
+
+		pydir = "py" + pyver + "_" + runtime.GOARCH
+		pyBaseDir = filepath.Join(pd, "python")
+		pybin = filepath.Join(pyBaseDir, pydir, "python.exe")
 	}
 
 	var nuBin string
@@ -254,6 +269,9 @@ func New(logger *logrus.Logger, version string) *Agent {
 		MeshSystemEXE:      MeshSysExe,
 		MeshSVC:            meshSvcName,
 		PyBin:              pybin,
+		PyVer:              pyver,
+		PyBaseDir:          pyBaseDir,
+		PyDir:              pydir,
 		NuBin:              nuBin,
 		DenoBin:            denoBin,
 		Headers:            headers,

agent/agent_unix.go

@@ -970,3 +970,7 @@ func (a *Agent) Start(_ service.Service) error { return nil }
 func (a *Agent) Stop(_ service.Service) error { return nil }
 
 func (a *Agent) InstallService() error { return nil }
+
+func (a *Agent) GetSystrayConfig() {
+		fmt.Println("System trays are only supported on windows at this time.")
+}

agent/agent_windows.go

@@ -752,6 +752,15 @@ func (a *Agent) AgentUninstall(code string) {
 
 // RunMigrations cleans up unused stuff from older agents
 func (a *Agent) RunMigrations() {
+
+	// changed pybin dirs in v2.8.0
+	for _, i := range []string{"py38-x64", "py38-x32"} {
+		py := filepath.Join(a.ProgramDir, i)
+		if trmm.FileExists(py) {
+			os.RemoveAll(py)
+		}
+	}
+
 	for _, i := range []string{"nssm.exe", "nssm-x86.exe"} {
 		nssm := filepath.Join(a.ProgramDir, i)
 		if trmm.FileExists(nssm) {
@@ -845,30 +854,23 @@ func (a *Agent) GetPython(force bool) {
 		return
 	}
 
+	if force {
+		os.RemoveAll(a.PyBaseDir)
+	}
+
 	sleepDelay := randRange(1, 10)
-	a.Logger.Debugf("GetPython() sleeping for %v seconds", sleepDelay)
+	a.Logger.Debugf("GetPython() sleeping for %v seconds\n", sleepDelay)
 	time.Sleep(time.Duration(sleepDelay) * time.Second)
 
-	var archZip string
-	var folder string
-	switch runtime.GOARCH {
-	case "amd64":
-		archZip = "py38-x64.zip"
-		folder = "py38-x64"
-	case "386":
-		archZip = "py38-x32.zip"
-		folder = "py38-x32"
-	}
-	pyFolder := filepath.Join(a.ProgramDir, folder)
-	pyZip := filepath.Join(a.ProgramDir, archZip)
-	a.Logger.Debugln(pyZip)
-	a.Logger.Debugln(a.PyBin)
-	defer os.Remove(pyZip)
-
-	if force {
-		os.RemoveAll(pyFolder)
+	if !trmm.FileExists(a.PyBaseDir) {
+		os.MkdirAll(a.PyBaseDir, 0775)
 	}
 
+	archZip := a.PyDir + ".zip"
+
+	pyZip := filepath.Join(a.PyBaseDir, archZip)
+	defer os.Remove(pyZip)
+
 	rClient := resty.New()
 	rClient.SetTimeout(20 * time.Minute)
 	rClient.SetRetryCount(10)
@@ -878,7 +880,7 @@ func (a *Agent) GetPython(force bool) {
 		rClient.SetProxy(a.Proxy)
 	}
 
-	url := fmt.Sprintf("https://github.com/amidaware/rmmagent/releases/download/v2.0.0/%s", archZip)
+	url := fmt.Sprintf("https://github.com/amidaware/rmmagent/releases/download/v2.8.0/%s", archZip)
 	a.Logger.Debugln(url)
 	r, err := rClient.R().SetOutput(pyZip).Get(url)
 	if err != nil {
@@ -890,7 +892,7 @@ func (a *Agent) GetPython(force bool) {
 		return
 	}
 
-	err = Unzip(pyZip, a.ProgramDir)
+	err = Unzip(pyZip, a.PyBaseDir)
 	if err != nil {
 		a.Logger.Errorln(err)
 	}

agent/rpc.go

@@ -341,6 +341,16 @@ func (a *Agent) RunRPC() {
 				msg.Respond(resp)
 			}()
 
+		case "systrayconfig":
+			go func() {
+				a.Logger.Debugln("Updating systray")
+				var resp []byte
+				ret := codec.NewEncoderBytes(&resp, new(codec.MsgpackHandle))
+				a.GetSystrayConfig()
+				ret.Encode("ok")
+				msg.Respond(resp)
+			}()
+
 		case "shutdown":
 			go func() {
 				a.Logger.Debugln("Scheduling immediate shutdown")

agent/svc.go

@@ -49,6 +49,8 @@ type AgentCheckInConfig struct {
 }
 
 func (a *Agent) AgentSvc(nc *nats.Conn) {
+	a.RunMigrations()
+
 	if runtime.GOOS == "windows" {
 		go a.GetPython(false)
 
@@ -58,8 +60,6 @@ func (a *Agent) AgentSvc(nc *nats.Conn) {
 		}
 	}
 
-	a.RunMigrations()
-
 	sleepDelay := randRange(7, 25)
 	a.Logger.Debugf("AgentSvc() sleeping for %v seconds", sleepDelay)
 	time.Sleep(time.Duration(sleepDelay) * time.Second)
@@ -70,6 +70,10 @@ func (a *Agent) AgentSvc(nc *nats.Conn) {
 		a.CleanupAgentUpdates()
 	}
 
+	if runtime.GOOS == "windows" {
+		go a.GetSystrayConfig()
+	}
+
 	// Windows has GetAgentCheckInConfig() while unix has a stub GetAgentCheckInConfig()
 	conf := a.GetAgentCheckInConfig(a.GetCheckInConfFromAPI())
 	a.Logger.Debugf("AgentCheckInConf: %+v\n", conf)