fix: ignore corrupt unified settings backups

Author: ndycode

lib/unified-settings.ts

@@ -71,6 +71,22 @@ async function readSettingsRecordAsyncFromPath(
 	return parseSettingsRecord(await fs.readFile(filePath, "utf8"));
 }
 
+function readSettingsBackupSync(): JsonRecord | null {
+	try {
+		return readSettingsRecordSyncFromPath(UNIFIED_SETTINGS_BACKUP_PATH);
+	} catch {
+		return null;
+	}
+}
+
+async function readSettingsBackupAsync(): Promise<JsonRecord | null> {
+	try {
+		return await readSettingsRecordAsyncFromPath(UNIFIED_SETTINGS_BACKUP_PATH);
+	} catch {
+		return null;
+	}
+}
+
 function trySnapshotUnifiedSettingsBackupSync(): void {
 	if (!existsSync(UNIFIED_SETTINGS_PATH)) {
 		return;
@@ -122,16 +138,14 @@ function readSettingsRecordSync(): JsonRecord | null {
 			return primaryRecord;
 		}
 	} catch (error) {
-		const backupRecord = readSettingsRecordSyncFromPath(
-			UNIFIED_SETTINGS_BACKUP_PATH,
-		);
+		const backupRecord = readSettingsBackupSync();
 		if (backupRecord) {
 			return backupRecord;
 		}
 		throw error;
 	}
 
-	return readSettingsRecordSyncFromPath(UNIFIED_SETTINGS_BACKUP_PATH);
+	return readSettingsBackupSync();
 }
 
 /**
@@ -150,16 +164,14 @@ async function readSettingsRecordAsync(): Promise<JsonRecord | null> {
 			return primaryRecord;
 		}
 	} catch (error) {
-		const backupRecord = await readSettingsRecordAsyncFromPath(
-			UNIFIED_SETTINGS_BACKUP_PATH,
-		);
+		const backupRecord = await readSettingsBackupAsync();
 		if (backupRecord) {
 			return backupRecord;
 		}
 		throw error;
 	}
 
-	return readSettingsRecordAsyncFromPath(UNIFIED_SETTINGS_BACKUP_PATH);
+	return readSettingsBackupAsync();
 }
 
 /**

test/unified-settings.test.ts

@@ -71,6 +71,20 @@ describe("unified settings", () => {
 		expect(await loadUnifiedDashboardSettings()).toBeNull();
 	});
 
+	it("returns null sections when both primary and backup settings files are invalid", async () => {
+		const {
+			getUnifiedSettingsPath,
+			loadUnifiedPluginConfigSync,
+			loadUnifiedDashboardSettings,
+		} = await import("../lib/unified-settings.js");
+
+		await fs.writeFile(getUnifiedSettingsPath(), "{ invalid json", "utf8");
+		await fs.writeFile(`${getUnifiedSettingsPath()}.bak`, "{ invalid backup", "utf8");
+
+		expect(loadUnifiedPluginConfigSync()).toBeNull();
+		expect(await loadUnifiedDashboardSettings()).toBeNull();
+	});
+
 	it("recovers plugin config from backup when primary settings file is invalid", async () => {
 		const {
 			getUnifiedSettingsPath,