Fastwind/ArmA-3-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add Wine Z: path prefix for Windows platform on Linux host
CI / build (push) Successful in 1m44s
Details

Browse Source 
- Add winePath helper that prepends Z: when platform is windows on Linux
- Thread platform through buildModPath, buildAutoArgs, and Start()
- Apply Z: prefix to -config=, -mod=, -profiles=, and %command% binary paths
- Add tests for winePath, buildAutoArgs, and buildModPath with platform param
- Fix formatting across services package with gofmt
- Include all prior bug fixes from this branch
This commit is contained in:
MrFastwind
2026-07-24 03:57:51 +02:00
parent 41c1390972
commit 6f3175ac9a
18 changed files with 219 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/services/config_manager.go
+2 -2
View File
@@ -16,8 +16,8 @@ func NewConfigManager(cfgDir string) *ConfigManager {
}
type ConfigInfo struct {
Name string `json:"name"`
Size int64 `json:"size"`
Name string `json:"name"`
Size int64 `json:"size"`
}
func (cm *ConfigManager) List() ([]ConfigInfo, error) {
backend/internal/services/log_streamer.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
)
type LogStreamer struct {
mu sync.RWMutex
subs map[string]map[string]chan string
mu sync.RWMutex
subs map[string]map[string]chan string
}
func NewLogStreamer() *LogStreamer {
backend/internal/services/mod_manager.go
+2 -2
View File
@@ -60,8 +60,8 @@ func ListLocalMods(modsDir string) []ModInfo {
displayName = name[1:]
}
mods = append(mods, ModInfo{
ID: displayName,
Name: name,
ID: displayName,
Name: name,
Source: "local",
Path: p,
Size: size,
backend/internal/services/scheduler.go
+1 -1
View File
@@ -63,7 +63,7 @@ func (s *Scheduler) runScheduledUpdate() {
return
}
if sett.SteamUser != "" && sett.SteamUser != "anonymous" {
if sett.SteamUser != "" {
log.Print("scheduler: running gameserver update")
if err := s.steamcmd.UpdateGame(sett.SteamBranch, sett.SteamUser); err != nil {
log.Printf("scheduler: game update failed: %v", err)
backend/internal/services/server_process.go
+14 -6
View File
@@ -7,6 +7,7 @@ import (
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"sync"
"sync/atomic"
@@ -14,6 +15,13 @@ import (
"arma3-web-server/internal/models"
)
func winePath(path, platform string) string {
if platform == "windows" && runtime.GOOS != "windows" {
return "Z:" + path
}
return path
}
type procState int32
const (
@@ -101,7 +109,7 @@ func (pm *ProcessManager) Start() error {
ctx, cancel := context.WithCancel(context.Background())
var cmd *exec.Cmd
if strings.Contains(s.ServerParameters, "%command%") {
full := strings.ReplaceAll(s.ServerParameters, "%command%", binPath)
full := strings.ReplaceAll(s.ServerParameters, "%command%", winePath(binPath, s.Platform))
parts := splitArgs(full)
if len(parts) == 0 {
cancel()
@@ -205,18 +213,18 @@ func (pm *ProcessManager) buildAutoArgs(s *models.ServerSettings) []string {
if s.ActiveConfig != "" {
cfgPath := filepath.Join(pm.cfgDir, s.ActiveConfig+".cfg")
args = append(args, "-config="+cfgPath)
args = append(args, "-config="+winePath(cfgPath, s.Platform))
}
if s.ActiveModlist != "" {
modPath := pm.buildModPath(s.ActiveModlist)
modPath := pm.buildModPath(s.ActiveModlist, s.Platform)
if modPath != "" {
args = append(args, modPath)
}
}
if pm.profilesDir != "" && !hasArgPrefix(args, "-profiles=") {
args = append(args, "-profiles="+pm.profilesDir)
args = append(args, "-profiles="+winePath(pm.profilesDir, s.Platform))
}
if s.IPPort != "" && !hasArgPrefix(args, "-port=") {
@@ -245,7 +253,7 @@ func hasArgPrefix(args []string, prefix string) bool {
const workshopAppID = "107410"
func (pm *ProcessManager) buildModPath(modlistID string) string {
func (pm *ProcessManager) buildModPath(modlistID string, platform string) string {
ml, err := pm.modlists.Get(modlistID)
if err != nil {
return ""
@@ -256,7 +264,7 @@ func (pm *ProcessManager) buildModPath(modlistID string) string {
if !mod.Enabled {
continue
}
parts = append(parts, pm.resolveModPath(mod))
parts = append(parts, winePath(pm.resolveModPath(mod), platform))
}
if len(parts) == 0 {
backend/internal/services/server_process_test.go
+140 -4
View File
@@ -294,7 +294,7 @@ func TestBuildModPath_MultipleMods(t *testing.T) {
{Name: "DisabledMod", Enabled: false},
})
got := pm.buildModPath(ml.ID)
got := pm.buildModPath(ml.ID, "")
if !strings.HasPrefix(got, "-mod=") {
t.Errorf("expected -mod= prefix, got %q", got)
}
@@ -321,7 +321,7 @@ func TestBuildModPath_EmptyModlist(t *testing.T) {
pm := NewProcessManager(dir, modsDir, filepath.Join(dir, "cfg"), filepath.Join(dir, "profiles"), sm, mm, cm, streamer)
got := pm.buildModPath("nonexistent-id")
got := pm.buildModPath("nonexistent-id", "")
if got != "" {
t.Errorf("buildModPath(nonexistent) = %q, want empty", got)
}
@@ -338,8 +338,8 @@ func TestWriteUserconfigFiles(t *testing.T) {
pm := NewProcessManager(dir, modsDir, filepath.Join(dir, "cfg"), filepath.Join(dir, "profiles"), sm, mm, cm, streamer)
s := &models.ServerSettings{
CBASettings: "force = 1",
AILevelPresets: "preset1",
CBASettings: "force = 1",
AILevelPresets: "preset1",
DifficultyPresets: "difficulty_normal",
}
@@ -396,6 +396,142 @@ func TestWriteUserconfigFiles_EmptyContent(t *testing.T) {
}
}
func TestWinePath(t *testing.T) {
tests := []struct {
name string
path string
platform string
want string
}{
{"linux platform returns as-is", "/server/cfg/test.cfg", "linux", "/server/cfg/test.cfg"},
{"empty platform returns as-is", "/server/cfg/test.cfg", "", "/server/cfg/test.cfg"},
{"windows platform on linux adds prefix", "/server/cfg/test.cfg", "windows", "Z:/server/cfg/test.cfg"},
{"empty path linux", "", "linux", ""},
{"empty path windows", "", "windows", "Z:"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := winePath(tt.path, tt.platform)
if got != tt.want {
t.Errorf("winePath(%q, %q) = %q, want %q", tt.path, tt.platform, got, tt.want)
}
})
}
}
func TestBuildAutoArgs_WindowsPlatform(t *testing.T) {
dir := t.TempDir()
cfgDir := filepath.Join(dir, "cfg")
profilesDir := filepath.Join(dir, "profiles")
modsDir := filepath.Join(dir, "mods")
sm := NewSettingsManager(dir)
mm := NewModlistManager(filepath.Join(dir, "modlists"))
cm := NewConfigManager(cfgDir)
streamer := NewLogStreamer()
pm := NewProcessManager(dir, modsDir, cfgDir, profilesDir, sm, mm, cm, streamer)
s := &models.ServerSettings{
Platform: "windows",
ActiveConfig: "server_config",
IPPort: "0.0.0.0:2302",
}
args := pm.buildAutoArgs(s)
foundConfig := false
foundProfiles := false
for _, a := range args {
if strings.HasPrefix(a, "-config=Z:") && strings.HasSuffix(a, "server_config.cfg") {
foundConfig = true
}
if strings.HasPrefix(a, "-profiles=Z:") {
foundProfiles = true
}
}
if !foundConfig {
t.Errorf("expected -config=Z:...server_config.cfg in args, got %v", args)
}
if !foundProfiles {
t.Errorf("expected -profiles=Z:... in args, got %v", args)
}
}
func TestBuildAutoArgs_LinuxPlatform(t *testing.T) {
dir := t.TempDir()
cfgDir := filepath.Join(dir, "cfg")
profilesDir := filepath.Join(dir, "profiles")
modsDir := filepath.Join(dir, "mods")
sm := NewSettingsManager(dir)
mm := NewModlistManager(filepath.Join(dir, "modlists"))
cm := NewConfigManager(cfgDir)
streamer := NewLogStreamer()
pm := NewProcessManager(dir, modsDir, cfgDir, profilesDir, sm, mm, cm, streamer)
s := &models.ServerSettings{
Platform: "linux",
ActiveConfig: "server_config",
IPPort: "0.0.0.0:2302",
}
args := pm.buildAutoArgs(s)
for _, a := range args {
if strings.HasPrefix(a, "-config=Z:") {
t.Errorf("unexpected Z: prefix in args: %v", a)
}
}
}
func TestBuildModPath_WindowsPlatform(t *testing.T) {
dir := t.TempDir()
modsDir := filepath.Join(dir, "mods")
os.MkdirAll(filepath.Join(modsDir, "@CBA_A3"), 0755)
sm := NewSettingsManager(dir)
mm := NewModlistManager(filepath.Join(dir, "modlists"))
cm := NewConfigManager(filepath.Join(dir, "cfg"))
streamer := NewLogStreamer()
pm := NewProcessManager(dir, modsDir, filepath.Join(dir, "cfg"), filepath.Join(dir, "profiles"), sm, mm, cm, streamer)
ml, _ := mm.Create("Test List")
mm.Update(ml.ID, "Test List", []models.ModEntry{
{Name: "CBA_A3", Enabled: true},
})
got := pm.buildModPath(ml.ID, "windows")
if !strings.HasPrefix(got, "-mod=Z:") {
t.Errorf("expected -mod=Z: prefix, got %q", got)
}
}
func TestBuildModPath_LinuxPlatform(t *testing.T) {
dir := t.TempDir()
modsDir := filepath.Join(dir, "mods")
os.MkdirAll(filepath.Join(modsDir, "@CBA_A3"), 0755)
sm := NewSettingsManager(dir)
mm := NewModlistManager(filepath.Join(dir, "modlists"))
cm := NewConfigManager(filepath.Join(dir, "cfg"))
streamer := NewLogStreamer()
pm := NewProcessManager(dir, modsDir, filepath.Join(dir, "cfg"), filepath.Join(dir, "profiles"), sm, mm, cm, streamer)
ml, _ := mm.Create("Test List")
mm.Update(ml.ID, "Test List", []models.ModEntry{
{Name: "CBA_A3", Enabled: true},
})
got := pm.buildModPath(ml.ID, "linux")
if strings.Contains(got, "Z:") {
t.Errorf("unexpected Z: prefix in args: %q", got)
}
}
func TestStartAndStopWithStub(t *testing.T) {
dir := t.TempDir()
serverfileDir := filepath.Join(dir, "server")
backend/internal/services/settings.go
+12 -12
View File
@@ -54,18 +54,18 @@ func (sm *SettingsManager) Save(s *models.ServerSettings) error {
func (sm *SettingsManager) defaults() *models.ServerSettings {
return &models.ServerSettings{
IPPort: "0.0.0.0:2302",
ServerParameters: "-server -world=empty -loadMissionToMemory -noPause",
SteamBranch: "stable",
SteamUser: "anonymous",
Platform: "linux",
ActiveConfig: "",
ActiveModlist: "",
AutoUpdateOnStartup: false,
AutoStartOnStartup: false,
IPPort: "0.0.0.0:2302",
ServerParameters: "-server -world=empty -loadMissionToMemory -noPause",
SteamBranch: "stable",
SteamUser: "anonymous",
Platform: "linux",
ActiveConfig: "",
ActiveModlist: "",
AutoUpdateOnStartup: false,
AutoStartOnStartup: false,
AutoUpdateModsOnStartup: false,
WasRunning: false,
ScheduledUpdate: "",
UpdatedAt: time.Now().UTC(),
WasRunning: false,
ScheduledUpdate: "",
UpdatedAt: time.Now().UTC(),
}
}