From 573b4101c0850012c44930d3ebd0810d6c9df3d0 Mon Sep 17 00:00:00 2001 From: Ada Vale <104856138+AdaInTheLab@users.noreply.github.com> Date: Tue, 16 Jun 2026 15:35:10 -0400 Subject: [PATCH] =?UTF-8?q?feat(config):=207D2D=203.0=20support=20?= =?UTF-8?q?=E2=80=94=20version-aware=20editor=20+=20serverconfig=20migrati?= =?UTF-8?q?on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3.0 ("Dead Hot Summer") moved the world/gameplay sandbox settings out of serverconfig.xml into the in-game Sandbox, governed by a single SandboxCode. - Detect 3.0 via GameSupportsSandboxCode() (reflects EnumGamePrefs for the 3.0-only SandboxCode member — compiles against 2.x refs, true at runtime on 3.0). - Editor: a SandboxCode field, and it hides the 26 sandbox-governed fields on a 3.0 server (SandboxGovernedKeys, derived from the game's own EnumGamePrefs ∩ SandboxOptions — not from patch notes). - New: one-click "Migrate to 3.0" (banner when needed). MigrateConfigTo30() comments out the sandbox-governed props in serverconfig.xml (preserved, not deleted), ensures SandboxCode exists, keeps survivors + unmodeled props, takes a timestamped backup first, is idempotent, and refreshes the sticky .bak. Gated on a real 3.0 install; pure file work so it stays unit-testable. API: GET /api/config now returns needsMigration; POST /api/config/migrate-3.0 runs the migration (refuses on a non-3.0 server). Verified: C# builds clean; 13 ServerConfigService tests pass (3 new — neutralize + SandboxCode, idempotency, needs-migration detection); frontend (vue-tsc + vite) builds clean. Co-Authored-By: Claude Opus 4.8 (1M context) --- frontend/src/api/config.ts | 20 +++ frontend/src/views/ConfigEditorView.vue | 95 +++++++++++++- .../Services/ServerConfigServiceTests.cs | 72 +++++++++- .../Services/ServerConfigFieldDefinitions.cs | 79 ++++++++++- .../Services/ServerConfigService.cs | 123 +++++++++++++++++- .../Web/Controllers/ConfigController.cs | 40 +++++- 6 files changed, 418 insertions(+), 11 deletions(-) diff --git a/frontend/src/api/config.ts b/frontend/src/api/config.ts index 723f266..eb661bd 100644 --- a/frontend/src/api/config.ts +++ b/frontend/src/api/config.ts @@ -9,6 +9,8 @@ export interface ConfigFieldDef { options?: string[] labels?: string[] description?: string + /** True when 7D2D 3.0 governs this setting via the SandboxCode; hidden in the editor on 3.0. */ + sandboxGoverned?: boolean } export interface ConfigFieldGroup { @@ -20,6 +22,18 @@ export interface ConfigResponse { properties: Record groups: ConfigFieldGroup[] configPath: string + /** True when the running game is 7D2D 3.0+ (supports the SandboxCode system). */ + is30?: boolean + /** True when serverconfig.xml still has 3.0-deprecated sandbox-governed props to clean up. */ + needsMigration?: boolean +} + +export interface MigrateResult { + changed: boolean + addedSandboxCode: boolean + neutralized: string[] + backupPath: string + message: string } export async function getConfig(): Promise { @@ -46,3 +60,9 @@ export async function getWorlds(): Promise { const res = await apiClient.get('/api/config/worlds') return res.data.data } + +/** Migrate serverconfig.xml to the 7D2D 3.0 layout (server backs up first; idempotent). */ +export async function migrateConfigTo30(): Promise { + const res = await apiClient.post('/api/config/migrate-3.0') + return res.data.data +} diff --git a/frontend/src/views/ConfigEditorView.vue b/frontend/src/views/ConfigEditorView.vue index 9760a0b..51ceaf6 100644 --- a/frontend/src/views/ConfigEditorView.vue +++ b/frontend/src/views/ConfigEditorView.vue @@ -2,7 +2,7 @@ import { ref, computed, onMounted } from 'vue' import { useI18n } from 'vue-i18n' import { useToast } from 'primevue/usetoast' -import { getConfig, getRawXml, saveConfig, saveRawXml, getWorlds, type ConfigFieldGroup } from '@/api/config' +import { getConfig, getRawXml, saveConfig, saveRawXml, getWorlds, migrateConfigTo30, type ConfigFieldGroup } from '@/api/config' import Button from 'primevue/button' import InputText from 'primevue/inputtext' import InputNumber from 'primevue/inputnumber' @@ -31,6 +31,9 @@ function formatFieldLabel(key: string): string { /** Keys handled by the DayNightCycleWidget — skip rendering them individually. */ const DAY_NIGHT_KEYS = ['DayNightLength', 'DayLightLength'] +/** The 7D2D 3.0 Sandbox code field — shown only on 3.0, hidden on 2.x. */ +const SANDBOX_CODE_KEY = 'SandboxCode' + const { t } = useI18n() const toast = useToast() @@ -54,8 +57,35 @@ const isDirty = computed(() => { return JSON.stringify(properties.value) !== JSON.stringify(originalProperties.value) }) +/** + * True when the running game is 7D2D 3.0+ (supports the SandboxCode system) — set from the + * backend's GameSupportsSandboxCode(). Controls whether the SandboxCode field is shown: it + * must appear on ANY 3.0 server, even before a code has been pasted in (otherwise you could + * never add one — chicken-and-egg). + */ +const is30 = ref(false) + +/** True when a 3.0 server's serverconfig.xml still carries the old sandbox-governed + * properties — i.e. a one-click "Migrate to 3.0" would do something. */ +const needsMigration = ref(false) +const migrating = ref(false) + +/** + * True when a non-empty SandboxCode is actually set. Only then does it override the + * individual sandbox-governed settings, so only then are those hidden. With an empty/absent + * code, 3.0 still reads the individual serverconfig properties (backward-compat), so they + * stay visible and editable. + */ +const hasSandboxCode = computed(() => { + const k = Object.keys(properties.value).find(k => k.toLowerCase() === SANDBOX_CODE_KEY.toLowerCase()) + return !!(k && properties.value[k] && properties.value[k].trim()) +}) + const coreGroup = computed(() => groups.value.find(g => g.key === 'core')) -const otherGroups = computed(() => groups.value.filter(g => g.key !== 'core')) +// Hide groups that have no visible fields (e.g. Blood Moon is entirely sandbox-governed on 3.0). +const otherGroups = computed(() => + groups.value.filter(g => g.key !== 'core' && visibleFieldsFor(g).length > 0) +) const groupLabels: Record = { core: 'config.group.core', @@ -96,6 +126,8 @@ async function loadConfig() { groups.value = configData.groups configPath.value = configData.configPath worlds.value = worldList + is30.value = configData.is30 ?? false + needsMigration.value = configData.needsMigration ?? false } catch (err) { toast.add({ severity: 'error', summary: t('common.error'), detail: t('config.failedToLoad'), life: 4000 }) } finally { @@ -103,6 +135,21 @@ async function loadConfig() { } } +/** One-click 3.0 migration: the server comments out the sandbox-governed props, + * adds SandboxCode, and backs up first. Reloads so the editor reflects the result. */ +async function runMigration() { + migrating.value = true + try { + const result = await migrateConfigTo30() + toast.add({ severity: 'success', summary: t('common.success', 'Done'), detail: result.message, life: 6000 }) + await loadConfig() + } catch (err) { + toast.add({ severity: 'error', summary: t('common.error'), detail: t('config.migrate30Failed', 'Migration failed'), life: 4000 }) + } finally { + migrating.value = false + } +} + async function loadRawXml() { try { rawXml.value = await getRawXml() @@ -190,10 +237,21 @@ function getSelectOptions(field: { key: string; options?: string[]; labels?: str * DayNightLength + DayLightLength because the DayNightCycleWidget covers them. */ function visibleFieldsFor(group: ConfigFieldGroup) { + let fields = group.fields + // DayNight pair is rendered by the DayNightCycleWidget, not as individual fields. if (group.key === 'gameplay') { - return group.fields.filter((f) => !DAY_NIGHT_KEYS.includes(f.key)) + fields = fields.filter((f) => !DAY_NIGHT_KEYS.includes(f.key)) + } + // The SandboxCode field only makes sense on a 3.0 server (show it even before one is set). + if (!is30.value) { + fields = fields.filter((f) => f.key !== SANDBOX_CODE_KEY) } - return group.fields + // Hide the sandbox-governed settings only when a SandboxCode actually overrides them. + // With no code set, 3.0 still reads these individual properties, so keep them editable. + if (hasSandboxCode.value) { + fields = fields.filter((f) => !f.sandboxGoverned) + } + return fields } function onDayNightUpdate(cfg: { DayNightLength: number; DayLightLength: number }) { @@ -241,6 +299,21 @@ onMounted(loadConfig) {{ t('config.unsavedChanges') }} + +
+ {{ t('config.migrate30Notice', 'This server is on 7 Days to Die 3.0, but serverconfig.xml still has the old per-setting properties that 3.0 moved into the Sandbox. Migrating comments them out (preserved, not deleted), adds a Sandbox Code field, and leaves everything else alone. A backup is saved first.') }} +
+ + + + {{ t('config.sandboxUpgradeNotice', 'This is a 7 Days to Die 3.0 server. Your individual settings below are still active — 3.0 reads them when no Sandbox code is set. To switch to the new Sandbox system and unlock 3.0-only options, generate a code in-game (New Game → Sandbox Options → copy code) and paste it into the Sandbox Code field. Saving writes it to both serverconfig.xml and the sticky .bak, so it survives restarts.') }} + + + + {{ t('config.sandboxActiveNotice', 'A Sandbox code is set — it governs difficulty, XP, blood moon, loot, zombie behavior and other world settings, so those individual settings are hidden (the server reads them from the code, not serverconfig.xml). Clear the Sandbox Code field to return to individual settings.') }} + +