windows fixes and changes

internal/app/components/extendable_executor_test.go

@@ -3,6 +3,7 @@ package components_test
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"runtime"
 	"syscall"
 	"testing"
@@ -37,7 +38,7 @@ func TestExtendableExecutor_ExecGetTool_ExpectToolDownloaded(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 0, code)
 	require.NotEmpty(t, result)
-	path := tmpDir + "/fastdl.sh"
+	path := filepath.Join(tmpDir, "/fastdl.sh")
 	assert.FileExists(t, path)
 	assertFileIsExecutableByOwner(t, path)
 }

internal/app/config/config.go

@@ -2,7 +2,10 @@ package config
 
 import (
 	"os"
+	"path/filepath"
 	"time"
+
+	"github.com/gameap/daemon/internal/processmanager"
 )
 
 type Scripts struct {
@@ -73,6 +76,11 @@ type Config struct {
 		RunTaskPeriod time.Duration `yaml:"run_task_period"`
 		WorkersCount  int           `yaml:"workers_count"`
 	} `yaml:"task_manager"`
+
+	ProcessManager struct {
+		Name   string            `yaml:"name"`
+		Config map[string]string `yaml:"config"`
+	} `yaml:"process_manager"`
 }
 
 func NewConfig() *Config {
@@ -86,7 +94,7 @@ func NewConfig() *Config {
 
 func (cfg *Config) Init() error {
 	if cfg.ToolsPath == "" {
-		cfg.ToolsPath = cfg.WorkPath + "/tools"
+		cfg.ToolsPath = filepath.Join(cfg.WorkPath, "tools")
 	}
 
 	if cfg.TaskManager.UpdatePeriod == 0 {
@@ -97,6 +105,8 @@ func (cfg *Config) Init() error {
 		cfg.TaskManager.RunTaskPeriod = 10 * time.Millisecond
 	}
 
+	cfg.ProcessManager.Name = processmanager.Default
+
 	return cfg.validate()
 }
 

internal/app/config/loader.go

@@ -97,6 +97,8 @@ func loadIni(path string) (*Config, error) {
 	cfg.PrivateKeyPassword = c.Section("").Key("private_key_password").String()
 	cfg.DHFile = c.Section("").Key("dh_file").String()
 
+	cfg.ProcessManager.Name = c.Section("").Key("process_manager").String()
+
 	cfg.LogLevel = c.Section("").Key("log_level").MustString("debug")
 	cfg.OutputLog = c.Section("").Key("output_log").MustString("")
 

internal/app/di/internal/definitions/services.go

@@ -76,10 +76,17 @@ func CreateServiceExtendableExecutor(ctx context.Context, c Container) contracts
 }
 
 func CreateServicesProcessManager(ctx context.Context, c Container) contracts.ProcessManager {
-	return processmanager.NewSystemD(
+	pm, err := processmanager.Load(
+		c.Cfg(ctx).ProcessManager.Name,
 		c.Cfg(ctx),
 		c.Services().Executor(ctx),
 	)
+	if err != nil {
+		c.SetError(err)
+		return nil
+	}
+
+	return pm
 }
 
 func CreateServicesGdTaskManager(ctx context.Context, c Container) *gdaemonscheduler.TaskManager {

internal/app/game_server_commands/delete_server_test.go

@@ -98,8 +98,8 @@ func (suite *deleteSuite) TestDeleteServerByScriptSuccess() {
 	suite.Require().Nil(err)
 	suite.Assert().Equal(SuccessResult, deleteServerCommand.Result())
 	suite.Assert().NoFileExists(server.WorkDir(cfg))
-	suite.Assert().NoFileExists(server.WorkDir(cfg) + "/" + "run.sh")
-	suite.Assert().NoFileExists(server.WorkDir(cfg) + "/" + "run2.sh")
+	suite.Assert().NoFileExists(filepath.Join(server.WorkDir(cfg), "run.sh"))
+	suite.Assert().NoFileExists(filepath.Join(server.WorkDir(cfg), "run2.sh"))
 }
 
 func (suite *deleteSuite) TestDeleteServerByScript_CommandFail() {

internal/processmanager/loader_darwin.go

@@ -8,6 +8,10 @@ import (
 	"github.com/gameap/daemon/internal/app/contracts"
 )
 
+const (
+	Default = "tmux"
+)
+
 func Load(name string, cfg *config.Config, executor contracts.Executor) (contracts.ProcessManager, error) {
 	switch name {
 	case "tmux":

internal/processmanager/loader_linux.go

@@ -8,6 +8,10 @@ import (
 	"github.com/gameap/daemon/internal/app/contracts"
 )
 
+const (
+	Default = "tmux"
+)
+
 func Load(name string, cfg *config.Config, executor contracts.Executor) (contracts.ProcessManager, error) {
 	switch name {
 	case "tmux":

internal/processmanager/loader_windows.go

@@ -8,10 +8,14 @@ import (
 	"github.com/gameap/daemon/internal/app/contracts"
 )
 
+const (
+	Default = "winsw"
+)
+
 func Load(name string, cfg *config.Config, executor contracts.Executor) (contracts.ProcessManager, error) {
 	switch name {
 	case "winsw":
-		return NewWindowsService(cfg, executor), nil
+		return NewWinSW(cfg, executor), nil
 	case "simple":
 		return NewSimple(cfg, executor), nil
 	default:

internal/processmanager/systemd.go

@@ -22,6 +22,7 @@ import (
 const (
 	systemdFilesDir    = ".systemd-services"
 	systemdServicesDir = "/etc/systemd/system"
+	servicePrefix      = "gameap-server-"
 
 	// https://www.freedesktop.org/software/systemd/man/latest/systemctl.html#Exit%20status
 	statusIsDeadPidExists  = 1
@@ -388,7 +389,7 @@ func (pm *SystemD) buildSocketConfig(server *domain.Server) string {
 	builder.WriteString("\n")
 
 	builder.WriteString("Service=")
-	builder.WriteString("gameap-")
+	builder.WriteString(servicePrefix)
 	builder.WriteString(server.UUID())
 	builder.WriteString(".service\n")
 
@@ -427,7 +428,7 @@ func (pm *SystemD) serviceName(server *domain.Server) string {
 	builder := strings.Builder{}
 	builder.Grow(50)
 
-	builder.WriteString("gameap-")
+	builder.WriteString(servicePrefix)
 	builder.WriteString(server.UUID())
 	builder.WriteString(".service")
 
@@ -442,7 +443,7 @@ func (pm *SystemD) socketName(server *domain.Server) string {
 	builder := strings.Builder{}
 	builder.Grow(50)
 
-	builder.WriteString("gameap-")
+	builder.WriteString(servicePrefix)
 	builder.WriteString(server.UUID())
 	builder.WriteString(".socket")