feat: move game-specific fields from servers table to game settings tables

Move admin_password, verify_signatures, allowed_file_patching, battle_eye,
persistent, von_enabled, and additional_server_options off the shared Server
model into their respective game settings tables (arma3_settings,
reforger_settings, project_zomboid_settings).

Introduce HasQueryPort marker interface (implemented by Arma3, Reforger, PZ,
Factorio) so query_port stays on Server but is nullable for games that don't
use it. Add auto_restart validation in form requests conditioned on
DetectsServerState.

The frontend is entirely schema-driven via the source property, so no
frontend changes are needed.

Author: tatupesonen

app/Contracts/HasQueryPort.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Contracts;
+
+/**
+ * Marker interface for game handlers that use a configurable Steam query port.
+ *
+ * Handlers implementing this will have `query_port` validated and persisted
+ * on the Server model. Non-implementing handlers will have a null query_port.
+ */
+interface HasQueryPort {}

app/GameHandlers/Arma3Handler.php

@@ -4,6 +4,7 @@
 
 use App\Contracts\DetectsServerState;
 use App\Contracts\GameHandler;
+use App\Contracts\HasQueryPort;
 use App\Contracts\ManagesModAssets;
 use App\Contracts\SteamGameHandler;
 use App\Contracts\SupportsBackups;
@@ -16,7 +17,7 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rule;
 
-final class Arma3Handler implements DetectsServerState, GameHandler, ManagesModAssets, SteamGameHandler, SupportsBackups, SupportsHeadlessClients, SupportsMissions
+final class Arma3Handler implements DetectsServerState, GameHandler, HasQueryPort, ManagesModAssets, SteamGameHandler, SupportsBackups, SupportsHeadlessClients, SupportsMissions
 {
     public function __construct(
         protected TwigConfigRenderer $configRenderer,
@@ -310,18 +311,17 @@ public function settingsSchema(): array
                 'title' => 'Server Rules',
                 'showOnCreate' => true,
                 'createLabel' => 'Arma 3 Options',
-                'source' => 'server',
+                'source' => 'arma3_settings',
                 'fields' => [
-                    ['key' => 'query_port', 'label' => 'Steam Query Port', 'type' => 'number', 'default' => $this->defaultQueryPort(), 'min' => 1, 'max' => 65535, 'description' => 'Steam server browser query port. Typically game port + 1.'],
-                    ['key' => 'password', 'label' => 'Server Password', 'type' => 'text', 'default' => '', 'placeholder' => 'Leave empty for no password'],
+                    ['key' => 'query_port', 'label' => 'Steam Query Port', 'type' => 'number', 'default' => $this->defaultQueryPort(), 'min' => 1, 'max' => 65535, 'description' => 'Steam server browser query port. Typically game port + 1.', 'source' => 'server'],
+                    ['key' => 'password', 'label' => 'Server Password', 'type' => 'text', 'default' => '', 'placeholder' => 'Leave empty for no password', 'source' => 'server'],
                     ['key' => 'admin_password', 'label' => 'Admin Password', 'type' => 'text', 'default' => '', 'placeholder' => 'In-game admin password'],
                     ['type' => 'separator'],
                     ['key' => 'verify_signatures', 'label' => 'Verify Signatures', 'type' => 'toggle', 'default' => true],
                     ['key' => 'allowed_file_patching', 'label' => 'Allow File Patching', 'type' => 'toggle', 'default' => false],
                     ['key' => 'battle_eye', 'label' => 'BattlEye Anti-Cheat', 'type' => 'toggle', 'default' => true],
                     ['key' => 'von_enabled', 'label' => 'Voice Over Network', 'type' => 'toggle', 'default' => true],
                     ['key' => 'persistent', 'label' => 'Persistent Server', 'type' => 'toggle', 'default' => false],
-                    ['key' => 'auto_restart', 'label' => 'Auto-Restart on Crash', 'type' => 'toggle', 'default' => false],
                 ],
             ],
 
@@ -478,7 +478,7 @@ public function settingsSchema(): array
                 'advanced' => true,
                 'fields' => [
                     ['key' => 'additional_params', 'label' => 'Additional Launch Parameters', 'type' => 'textarea', 'default' => '', 'rows' => 2, 'placeholder' => '-loadMissionToMemory -enableHT', 'source' => 'server'],
-                    ['key' => 'additional_server_options', 'label' => 'Additional server.cfg Options', 'type' => 'textarea', 'default' => '', 'rows' => 3, 'placeholder' => 'Raw config directives appended to server.cfg'],
+                    ['key' => 'additional_server_options', 'label' => 'Additional server.cfg Options', 'type' => 'textarea', 'default' => '', 'rows' => 3, 'placeholder' => 'Raw config directives appended to server.cfg', 'source' => 'arma3_settings'],
                 ],
             ],
         ];
@@ -502,21 +502,22 @@ public function serverValidationRules(?Server $server = null): array
                 Rule::unique('servers', 'port')->when($server, fn ($rule) => $rule->ignore($server->id)),
             ],
             'password' => ['nullable', 'string', 'max:255'],
+            'additional_params' => ['nullable', 'string', 'max:1000'],
+        ];
+    }
+
+    public function settingsValidationRules(): array
+    {
+        return [
+            // Server options (on arma3_settings)
             'admin_password' => ['nullable', 'string', 'max:255'],
-            'auto_restart' => ['boolean'],
             'verify_signatures' => ['boolean'],
             'allowed_file_patching' => ['boolean'],
             'battle_eye' => ['boolean'],
             'persistent' => ['boolean'],
             'von_enabled' => ['boolean'],
-            'additional_params' => ['nullable', 'string', 'max:1000'],
             'additional_server_options' => ['nullable', 'string'],
-        ];
-    }
 
-    public function settingsValidationRules(): array
-    {
-        return [
             // Difficulty settings
             'reduced_damage' => ['boolean'],
             'group_indicators' => ['integer', 'between:0,2'],
@@ -636,21 +637,22 @@ protected function getModNames(Server $server): array
     protected function generateServerConfig(Server $server): void
     {
         $renderer = $this->configRenderer;
+        $settings = $server->arma3Settings ?? $this->getDefaultSettings();
 
         $content = $renderer->render('arma3/server.cfg.twig', [
             'hostname' => addslashes($server->name),
             'password' => addslashes((string) $server->password),
-            'admin_password' => addslashes((string) $server->admin_password),
+            'admin_password' => addslashes((string) $settings->admin_password),
             'max_players' => (int) $server->max_players,
-            'verify_signatures' => $server->verify_signatures ? 2 : 0,
-            'allowed_file_patching' => $server->allowed_file_patching ? 2 : 0,
-            'disable_von' => $server->von_enabled ? 0 : 1,
-            'persistent' => $server->persistent ? 1 : 0,
-            'battle_eye' => $server->battle_eye ? 1 : 0,
+            'verify_signatures' => $settings->verify_signatures ? 2 : 0,
+            'allowed_file_patching' => $settings->allowed_file_patching ? 2 : 0,
+            'disable_von' => $settings->von_enabled ? 0 : 1,
+            'persistent' => $settings->persistent ? 1 : 0,
+            'battle_eye' => $settings->battle_eye ? 1 : 0,
             'motd_lines' => $server->description
                 ? array_map(fn (string $line) => addslashes(trim($line)), explode("\n", $server->description))
                 : null,
-            'additional_server_options' => $server->additional_server_options ?: null,
+            'additional_server_options' => $settings->additional_server_options ?: null,
         ]);
 
         file_put_contents(
@@ -739,6 +741,14 @@ protected function generateProfileConfig(Server $server): void
     protected function getDefaultSettings(): Arma3Settings
     {
         $settings = new Arma3Settings;
+        // Server option defaults
+        $settings->admin_password = null;
+        $settings->verify_signatures = true;
+        $settings->allowed_file_patching = false;
+        $settings->battle_eye = true;
+        $settings->persistent = false;
+        $settings->von_enabled = true;
+        $settings->additional_server_options = null;
         // Difficulty defaults
         $settings->reduced_damage = false;
         $settings->group_indicators = 2;

app/GameHandlers/FactorioHandler.php

@@ -5,14 +5,15 @@
 use App\Contracts\DetectsServerState;
 use App\Contracts\DownloadsDirectly;
 use App\Contracts\GameHandler;
+use App\Contracts\HasQueryPort;
 use App\Models\FactorioSettings;
 use App\Models\ModPreset;
 use App\Models\Server;
 use App\Services\Renderer\JsonConfigRenderer;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Process;
 
-final class FactorioHandler implements DetectsServerState, DownloadsDirectly, GameHandler
+final class FactorioHandler implements DetectsServerState, DownloadsDirectly, GameHandler, HasQueryPort
 {
     public function __construct(
         protected JsonConfigRenderer $configRenderer,

app/GameHandlers/ProjectZomboidHandler.php

@@ -4,13 +4,14 @@
 
 use App\Contracts\DetectsServerState;
 use App\Contracts\GameHandler;
+use App\Contracts\HasQueryPort;
 use App\Contracts\SteamGameHandler;
 use App\Models\ModPreset;
 use App\Models\ProjectZomboidSettings;
 use App\Models\Server;
 use App\Services\Renderer\TwigConfigRenderer;
 
-final class ProjectZomboidHandler implements DetectsServerState, GameHandler, SteamGameHandler
+final class ProjectZomboidHandler implements DetectsServerState, GameHandler, HasQueryPort, SteamGameHandler
 {
     public function __construct(
         protected TwigConfigRenderer $configRenderer,
@@ -78,11 +79,13 @@ public function buildLaunchCommand(Server $server): array
         $profileName = $this->getProfileName($server);
         $cachedir = $server->getProfilesPath();
 
+        $settings = $server->projectzomboidSettings;
+
         $params = [
             $binary,
             '-servername', $profileName,
             '-cachedir='.$cachedir,
-            '-adminpassword', $server->admin_password,
+            '-adminpassword', $settings?->admin_password ?? '',
         ];
 
         if ($server->additional_params) {
@@ -152,7 +155,7 @@ public function settingsSchema(): array
                 'createLabel' => 'Project Zomboid Options',
                 'fields' => [
                     ['key' => 'password', 'label' => 'Server Password', 'type' => 'text', 'default' => '', 'placeholder' => 'Leave empty for no password', 'source' => 'server'],
-                    ['key' => 'admin_password', 'label' => 'Admin Password', 'type' => 'text', 'default' => '', 'placeholder' => 'Required for server startup', 'required' => true, 'source' => 'server'],
+                    ['key' => 'admin_password', 'label' => 'Admin Password', 'type' => 'text', 'default' => '', 'placeholder' => 'Required for server startup', 'required' => true, 'source' => 'projectzomboid_settings'],
                     ['type' => 'separator'],
                     ['key' => 'open', 'label' => 'Public Server', 'type' => 'toggle', 'default' => true, 'source' => 'projectzomboid_settings', 'description' => 'Show in the public server browser.'],
                     ['key' => 'pvp', 'label' => 'PVP', 'type' => 'toggle', 'default' => true, 'source' => 'projectzomboid_settings'],
@@ -197,14 +200,14 @@ public function serverValidationRules(?Server $server = null): array
     {
         return [
             'password' => ['nullable', 'string', 'max:255'],
-            'admin_password' => ['required', 'string', 'max:255'],
             'additional_params' => ['nullable', 'string', 'max:1000'],
         ];
     }
 
     public function settingsValidationRules(): array
     {
         return [
+            'admin_password' => ['required', 'string', 'max:255'],
             'pvp' => ['boolean'],
             'pause_empty' => ['boolean'],
             'global_chat' => ['boolean'],

app/GameHandlers/ReforgerHandler.php

@@ -4,6 +4,7 @@
 
 use App\Contracts\DetectsServerState;
 use App\Contracts\GameHandler;
+use App\Contracts\HasQueryPort;
 use App\Contracts\SteamGameHandler;
 use App\Contracts\SupportsRegisteredMods;
 use App\Contracts\SupportsScenarios;
@@ -16,7 +17,7 @@
 use App\Services\Renderer\JsonConfigRenderer;
 use Illuminate\Database\Eloquent\Model;
 
-final class ReforgerHandler implements DetectsServerState, GameHandler, SteamGameHandler, SupportsRegisteredMods, SupportsScenarios, WritesNativeLogs
+final class ReforgerHandler implements DetectsServerState, GameHandler, HasQueryPort, SteamGameHandler, SupportsRegisteredMods, SupportsScenarios, WritesNativeLogs
 {
     public function __construct(
         protected JsonConfigRenderer $configRenderer,
@@ -121,7 +122,7 @@ public function generateConfigFiles(Server $server): void
             'game' => [
                 'name' => $server->name,
                 'password' => (string) $server->password,
-                'passwordAdmin' => (string) $server->admin_password,
+                'passwordAdmin' => (string) ($settings?->admin_password ?? ''),
                 'scenarioId' => $settings?->scenario_id ?? '',
                 'maxPlayers' => (int) $server->max_players,
                 'visible' => true,
@@ -132,7 +133,7 @@ public function generateConfigFiles(Server $server): void
                     'networkViewDistance' => 1000,
                     'disableThirdPerson' => ! $thirdPersonEnabled,
                     'fastValidation' => true,
-                    'battlEye' => $server->battle_eye,
+                    'battlEye' => $settings?->battle_eye ?? true,
                     'VONDisableUI' => true,
                     'VONDisableDirectSpeechUI' => true,
                 ],
@@ -216,8 +217,9 @@ public function settingsSchema(): array
                 'source' => 'reforger_settings',
                 'fields' => [
                     ['key' => 'scenario_id', 'label' => 'Scenario ID', 'type' => 'custom', 'component' => 'scenario-picker', 'default' => ''],
+                    ['key' => 'admin_password', 'label' => 'Admin Password', 'type' => 'text', 'default' => '', 'placeholder' => 'In-game admin password'],
                     ['key' => 'third_person_view_enabled', 'label' => 'Third Person View', 'type' => 'toggle', 'default' => true],
-                    ['key' => 'battle_eye', 'label' => 'BattlEye Anti-Cheat', 'type' => 'toggle', 'default' => true, 'source' => 'server'],
+                    ['key' => 'battle_eye', 'label' => 'BattlEye Anti-Cheat', 'type' => 'toggle', 'default' => true],
                     ['key' => 'cross_platform', 'label' => 'Cross-Platform', 'type' => 'toggle', 'default' => false],
                     ['key' => 'max_fps', 'label' => 'Max FPS', 'type' => 'number', 'default' => 60, 'min' => 10, 'max' => 240, 'description' => 'Recommended: 60-120. Limits server tick rate to prevent excessive CPU usage.'],
                 ],
@@ -229,14 +231,14 @@ public function settingsSchema(): array
 
     public function serverValidationRules(?Server $server = null): array
     {
-        return [
-            'battle_eye' => ['boolean'],
-        ];
+        return [];
     }
 
     public function settingsValidationRules(): array
     {
         return [
+            'admin_password' => ['nullable', 'string', 'max:255'],
+            'battle_eye' => ['boolean'],
             'scenario_id' => ['nullable', 'string', 'regex:/^\{[0-9A-F]{16}\}[a-zA-Z0-9_.\/ -]+$/'],
             'third_person_view_enabled' => ['boolean'],
             'max_fps' => ['integer', 'min:10', 'max:240'],

app/Http/Controllers/ServerController.php

@@ -48,7 +48,7 @@ public function index(): Response
             ->orderBy('name')
             ->get()
             ->each(function (Server $server): void {
-                $server->makeVisible(['password', 'admin_password']);
+                $server->makeVisible(['password']);
                 $server->setAttribute('supports_backups', $this->gameManager->for($server) instanceof SupportsBackups);
                 $server->setAttribute('profiles_path', $server->getProfilesPath());
             });

app/Http/Requests/Server/StoreServerRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Server;
 
+use App\Contracts\DetectsServerState;
 use App\GameManager;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
@@ -23,6 +24,7 @@ public function rules(): array
             $handlerRules = $handler->serverValidationRules();
             $settingsRules = $handler->settingsValidationRules();
         } catch (\InvalidArgumentException) {
+            $handler = null;
             $handlerRules = [];
             $settingsRules = [];
         }
@@ -35,6 +37,7 @@ public function rules(): array
             'description' => ['nullable', 'string', 'max:1000'],
             'active_preset_id' => ['nullable', 'exists:mod_presets,id'],
             'game_install_id' => ['required', 'exists:game_installs,id'],
+            ...($handler instanceof DetectsServerState ? ['auto_restart' => ['boolean']] : []),
             ...$handlerRules,
             ...$settingsRules,
         ];

app/Http/Requests/Server/UpdateServerRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Server;
 
+use App\Contracts\DetectsServerState;
 use App\GameManager;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
@@ -26,6 +27,7 @@ public function rules(): array
             'description' => ['nullable', 'string', 'max:1000'],
             'active_preset_id' => ['nullable', 'exists:mod_presets,id'],
             'game_install_id' => ['required', 'exists:game_installs,id'],
+            ...($handler instanceof DetectsServerState ? ['auto_restart' => ['boolean']] : []),
             ...$handler->serverValidationRules($server),
             ...$handler->settingsValidationRules(),
         ];

app/Models/Arma3Settings.php

@@ -15,6 +15,14 @@ class Arma3Settings extends Model
 
     protected $fillable = [
         'server_id',
+        // Server options (moved from servers table)
+        'admin_password',
+        'verify_signatures',
+        'allowed_file_patching',
+        'battle_eye',
+        'persistent',
+        'von_enabled',
+        'additional_server_options',
         // Difficulty settings
         'reduced_damage',
         'group_indicators',
@@ -59,6 +67,12 @@ class Arma3Settings extends Model
     protected function casts(): array
     {
         return [
+            // Server options
+            'verify_signatures' => 'boolean',
+            'allowed_file_patching' => 'boolean',
+            'battle_eye' => 'boolean',
+            'persistent' => 'boolean',
+            'von_enabled' => 'boolean',
             // Difficulty
             'reduced_damage' => 'boolean',
             'group_indicators' => 'integer',

app/Models/ProjectZomboidSettings.php

@@ -18,6 +18,7 @@ class ProjectZomboidSettings extends Model
      */
     protected $fillable = [
         'server_id',
+        'admin_password',
         'pvp',
         'pause_empty',
         'global_chat',