feat(desktop): split daemon and release settings to main process
Move daemon management and release channel settings out of the renderer's AsyncStorage and into a desktop-owned settings store persisted by the main process. Adds a "Keep daemon running after quit" option, a daemon lifecycle section in settings, and a one-time migration of legacy renderer-owned desktop settings.
This commit is contained in:
@@ -0,0 +1,67 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { DEFAULT_DESKTOP_SETTINGS, type DesktopSettingsStore } from "./desktop-settings";
|
||||
import { createDesktopSettingsCommandHandlers } from "./desktop-settings-commands";
|
||||
|
||||
function createStoreMock(): DesktopSettingsStore {
|
||||
return {
|
||||
get: vi.fn(async () => DEFAULT_DESKTOP_SETTINGS),
|
||||
patch: vi.fn(async () => ({
|
||||
...DEFAULT_DESKTOP_SETTINGS,
|
||||
releaseChannel: "beta",
|
||||
})),
|
||||
migrateLegacyRendererSettings: vi.fn(async () => ({
|
||||
...DEFAULT_DESKTOP_SETTINGS,
|
||||
releaseChannel: "beta",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: false,
|
||||
keepRunningAfterQuit: true,
|
||||
},
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
describe("desktop-settings-commands", () => {
|
||||
it("exposes get and patch handlers through the desktop command bus shape", async () => {
|
||||
const store = createStoreMock();
|
||||
const handlers = createDesktopSettingsCommandHandlers({ settingsStore: store });
|
||||
|
||||
await expect(handlers.get_desktop_settings()).resolves.toEqual(DEFAULT_DESKTOP_SETTINGS);
|
||||
await expect(
|
||||
handlers.patch_desktop_settings({
|
||||
daemon: { keepRunningAfterQuit: false },
|
||||
}),
|
||||
).resolves.toEqual({
|
||||
...DEFAULT_DESKTOP_SETTINGS,
|
||||
releaseChannel: "beta",
|
||||
});
|
||||
|
||||
expect(store.get).toHaveBeenCalledTimes(1);
|
||||
expect(store.patch).toHaveBeenCalledWith({
|
||||
daemon: { keepRunningAfterQuit: false },
|
||||
});
|
||||
});
|
||||
|
||||
it("accepts legacy renderer settings migration payloads", async () => {
|
||||
const store = createStoreMock();
|
||||
const handlers = createDesktopSettingsCommandHandlers({ settingsStore: store });
|
||||
|
||||
const result = await handlers.migrate_legacy_desktop_settings({
|
||||
releaseChannel: "beta",
|
||||
manageBuiltInDaemon: false,
|
||||
});
|
||||
|
||||
expect(result).toEqual({
|
||||
...DEFAULT_DESKTOP_SETTINGS,
|
||||
releaseChannel: "beta",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: false,
|
||||
keepRunningAfterQuit: true,
|
||||
},
|
||||
});
|
||||
expect(store.migrateLegacyRendererSettings).toHaveBeenCalledWith({
|
||||
releaseChannel: "beta",
|
||||
manageBuiltInDaemon: false,
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,15 @@
|
||||
import type { DesktopSettingsStore } from "./desktop-settings.js";
|
||||
|
||||
export type DesktopCommandHandler = (args?: Record<string, unknown>) => Promise<unknown> | unknown;
|
||||
|
||||
export function createDesktopSettingsCommandHandlers({
|
||||
settingsStore,
|
||||
}: {
|
||||
settingsStore: DesktopSettingsStore;
|
||||
}): Record<string, DesktopCommandHandler> {
|
||||
return {
|
||||
get_desktop_settings: () => settingsStore.get(),
|
||||
patch_desktop_settings: (args) => settingsStore.patch(args),
|
||||
migrate_legacy_desktop_settings: (args) => settingsStore.migrateLegacyRendererSettings(args),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { app } from "electron";
|
||||
|
||||
import { createDesktopSettingsStore, type DesktopSettingsStore } from "./desktop-settings.js";
|
||||
|
||||
let desktopSettingsStore: DesktopSettingsStore | null = null;
|
||||
|
||||
export function getDesktopSettingsStore(): DesktopSettingsStore {
|
||||
desktopSettingsStore ??= createDesktopSettingsStore({
|
||||
userDataPath: app.getPath("userData"),
|
||||
});
|
||||
return desktopSettingsStore;
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
import { mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import { afterEach, describe, expect, it } from "vitest";
|
||||
|
||||
import {
|
||||
DEFAULT_DESKTOP_SETTINGS,
|
||||
type DesktopSettings,
|
||||
createDesktopSettingsStore,
|
||||
} from "./desktop-settings";
|
||||
|
||||
async function createTempUserDataDir(): Promise<string> {
|
||||
return await mkdtemp(path.join(os.tmpdir(), "paseo-desktop-settings-"));
|
||||
}
|
||||
|
||||
function settingsFilePath(userDataPath: string): string {
|
||||
return path.join(userDataPath, "desktop-settings.json");
|
||||
}
|
||||
|
||||
describe("desktop-settings", () => {
|
||||
const directories = new Set<string>();
|
||||
|
||||
afterEach(async () => {
|
||||
await Promise.all(
|
||||
[...directories].map(async (directory) => {
|
||||
await rm(directory, { recursive: true, force: true });
|
||||
}),
|
||||
);
|
||||
directories.clear();
|
||||
});
|
||||
|
||||
it("persists default settings for new users", async () => {
|
||||
const userDataPath = await createTempUserDataDir();
|
||||
directories.add(userDataPath);
|
||||
const store = createDesktopSettingsStore({ userDataPath });
|
||||
|
||||
const settings = await store.get();
|
||||
const persisted = JSON.parse(await readFile(settingsFilePath(userDataPath), "utf8")) as {
|
||||
settings: DesktopSettings;
|
||||
};
|
||||
|
||||
expect(settings).toEqual(DEFAULT_DESKTOP_SETTINGS);
|
||||
expect(persisted.settings).toEqual(DEFAULT_DESKTOP_SETTINGS);
|
||||
});
|
||||
|
||||
it("coerces invalid persisted values back to safe defaults", async () => {
|
||||
const userDataPath = await createTempUserDataDir();
|
||||
directories.add(userDataPath);
|
||||
await writeFile(
|
||||
settingsFilePath(userDataPath),
|
||||
JSON.stringify({
|
||||
version: 1,
|
||||
settings: {
|
||||
releaseChannel: "nightly",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: "sometimes",
|
||||
keepRunningAfterQuit: false,
|
||||
},
|
||||
},
|
||||
}),
|
||||
);
|
||||
const store = createDesktopSettingsStore({ userDataPath });
|
||||
|
||||
const settings = await store.get();
|
||||
|
||||
expect(settings).toEqual({
|
||||
releaseChannel: "stable",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: true,
|
||||
keepRunningAfterQuit: false,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it("patches nested settings and leaves no temp files behind", async () => {
|
||||
const userDataPath = await createTempUserDataDir();
|
||||
directories.add(userDataPath);
|
||||
const store = createDesktopSettingsStore({ userDataPath });
|
||||
|
||||
await store.get();
|
||||
const next = await store.patch({
|
||||
releaseChannel: "beta",
|
||||
daemon: { keepRunningAfterQuit: false },
|
||||
});
|
||||
const files = await readdir(userDataPath);
|
||||
|
||||
expect(next).toEqual({
|
||||
releaseChannel: "beta",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: true,
|
||||
keepRunningAfterQuit: false,
|
||||
},
|
||||
});
|
||||
expect(files).toEqual(["desktop-settings.json"]);
|
||||
});
|
||||
|
||||
it("migrates desktop-owned values from legacy renderer settings once", async () => {
|
||||
const userDataPath = await createTempUserDataDir();
|
||||
directories.add(userDataPath);
|
||||
const store = createDesktopSettingsStore({ userDataPath });
|
||||
|
||||
await store.patch({
|
||||
daemon: {
|
||||
keepRunningAfterQuit: false,
|
||||
},
|
||||
});
|
||||
|
||||
const migrated = await store.migrateLegacyRendererSettings({
|
||||
releaseChannel: "beta",
|
||||
manageBuiltInDaemon: false,
|
||||
theme: "dark",
|
||||
});
|
||||
const ignoredSecondMigration = await store.migrateLegacyRendererSettings({
|
||||
releaseChannel: "stable",
|
||||
manageBuiltInDaemon: true,
|
||||
});
|
||||
|
||||
expect(migrated).toEqual({
|
||||
releaseChannel: "beta",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: false,
|
||||
keepRunningAfterQuit: false,
|
||||
},
|
||||
});
|
||||
expect(ignoredSecondMigration).toEqual(migrated);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,261 @@
|
||||
import { access, mkdir, readFile, rename, writeFile } from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
|
||||
import type { AppReleaseChannel } from "../features/auto-updater.js";
|
||||
|
||||
export interface DesktopSettings {
|
||||
releaseChannel: AppReleaseChannel;
|
||||
daemon: {
|
||||
manageBuiltInDaemon: boolean;
|
||||
keepRunningAfterQuit: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
interface DesktopSettingsPatch {
|
||||
releaseChannel?: AppReleaseChannel;
|
||||
daemon?: Partial<DesktopSettings["daemon"]>;
|
||||
}
|
||||
|
||||
interface PersistedDesktopSettingsDocument {
|
||||
version: 1;
|
||||
settings: DesktopSettings;
|
||||
migrations: {
|
||||
legacyRendererSettingsImported: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
export interface DesktopSettingsStore {
|
||||
get(): Promise<DesktopSettings>;
|
||||
patch(patch: unknown): Promise<DesktopSettings>;
|
||||
migrateLegacyRendererSettings(legacySettings: unknown): Promise<DesktopSettings>;
|
||||
}
|
||||
|
||||
export const DEFAULT_DESKTOP_SETTINGS: DesktopSettings = {
|
||||
releaseChannel: "stable",
|
||||
daemon: {
|
||||
manageBuiltInDaemon: true,
|
||||
keepRunningAfterQuit: true,
|
||||
},
|
||||
};
|
||||
|
||||
const DESKTOP_SETTINGS_FILENAME = "desktop-settings.json";
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === "object" && value !== null && !Array.isArray(value);
|
||||
}
|
||||
|
||||
function coerceReleaseChannel(value: unknown): AppReleaseChannel | null {
|
||||
if (value === "beta") {
|
||||
return "beta";
|
||||
}
|
||||
if (value === "stable") {
|
||||
return "stable";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function coerceBoolean(value: unknown): boolean | null {
|
||||
return typeof value === "boolean" ? value : null;
|
||||
}
|
||||
|
||||
function buildDefaultDocument(): PersistedDesktopSettingsDocument {
|
||||
return {
|
||||
version: 1,
|
||||
settings: DEFAULT_DESKTOP_SETTINGS,
|
||||
migrations: {
|
||||
legacyRendererSettingsImported: false,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function coerceDesktopSettings(input: unknown): DesktopSettings {
|
||||
const result: DesktopSettings = {
|
||||
releaseChannel: DEFAULT_DESKTOP_SETTINGS.releaseChannel,
|
||||
daemon: { ...DEFAULT_DESKTOP_SETTINGS.daemon },
|
||||
};
|
||||
|
||||
if (!isRecord(input)) {
|
||||
return result;
|
||||
}
|
||||
|
||||
const releaseChannel = coerceReleaseChannel(input.releaseChannel);
|
||||
if (releaseChannel) {
|
||||
result.releaseChannel = releaseChannel;
|
||||
}
|
||||
|
||||
if (isRecord(input.daemon)) {
|
||||
const manageBuiltInDaemon = coerceBoolean(input.daemon.manageBuiltInDaemon);
|
||||
if (manageBuiltInDaemon !== null) {
|
||||
result.daemon.manageBuiltInDaemon = manageBuiltInDaemon;
|
||||
}
|
||||
|
||||
const keepRunningAfterQuit = coerceBoolean(input.daemon.keepRunningAfterQuit);
|
||||
if (keepRunningAfterQuit !== null) {
|
||||
result.daemon.keepRunningAfterQuit = keepRunningAfterQuit;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function coerceDesktopSettingsPatch(input: unknown): DesktopSettingsPatch {
|
||||
if (!isRecord(input)) {
|
||||
return {};
|
||||
}
|
||||
|
||||
const patch: DesktopSettingsPatch = {};
|
||||
|
||||
const releaseChannel = coerceReleaseChannel(input.releaseChannel);
|
||||
if (releaseChannel) {
|
||||
patch.releaseChannel = releaseChannel;
|
||||
}
|
||||
|
||||
if (isRecord(input.daemon)) {
|
||||
const daemonPatch: Partial<DesktopSettings["daemon"]> = {};
|
||||
const manageBuiltInDaemon = coerceBoolean(input.daemon.manageBuiltInDaemon);
|
||||
if (manageBuiltInDaemon !== null) {
|
||||
daemonPatch.manageBuiltInDaemon = manageBuiltInDaemon;
|
||||
}
|
||||
const keepRunningAfterQuit = coerceBoolean(input.daemon.keepRunningAfterQuit);
|
||||
if (keepRunningAfterQuit !== null) {
|
||||
daemonPatch.keepRunningAfterQuit = keepRunningAfterQuit;
|
||||
}
|
||||
if (Object.keys(daemonPatch).length > 0) {
|
||||
patch.daemon = daemonPatch;
|
||||
}
|
||||
}
|
||||
|
||||
return patch;
|
||||
}
|
||||
|
||||
function pickDesktopSettingsFromLegacyRendererSettings(
|
||||
legacySettings: unknown,
|
||||
): DesktopSettingsPatch {
|
||||
if (!isRecord(legacySettings)) {
|
||||
return {};
|
||||
}
|
||||
|
||||
const patch: DesktopSettingsPatch = {};
|
||||
const releaseChannel = coerceReleaseChannel(legacySettings.releaseChannel);
|
||||
if (releaseChannel) {
|
||||
patch.releaseChannel = releaseChannel;
|
||||
}
|
||||
|
||||
const manageBuiltInDaemon = coerceBoolean(legacySettings.manageBuiltInDaemon);
|
||||
if (manageBuiltInDaemon !== null) {
|
||||
patch.daemon = { manageBuiltInDaemon };
|
||||
}
|
||||
|
||||
return patch;
|
||||
}
|
||||
|
||||
function mergeDesktopSettings(
|
||||
current: DesktopSettings,
|
||||
patch: DesktopSettingsPatch,
|
||||
): DesktopSettings {
|
||||
return {
|
||||
releaseChannel: patch.releaseChannel ?? current.releaseChannel,
|
||||
daemon: { ...current.daemon, ...patch.daemon },
|
||||
};
|
||||
}
|
||||
|
||||
function coerceDocument(input: unknown): PersistedDesktopSettingsDocument {
|
||||
if (!isRecord(input)) {
|
||||
return buildDefaultDocument();
|
||||
}
|
||||
|
||||
const settings = coerceDesktopSettings(input.settings);
|
||||
const migrations = isRecord(input.migrations)
|
||||
? {
|
||||
legacyRendererSettingsImported: input.migrations.legacyRendererSettingsImported === true,
|
||||
}
|
||||
: {
|
||||
legacyRendererSettingsImported: false,
|
||||
};
|
||||
|
||||
return {
|
||||
version: 1,
|
||||
settings,
|
||||
migrations,
|
||||
};
|
||||
}
|
||||
|
||||
export function createDesktopSettingsStore({
|
||||
userDataPath,
|
||||
}: {
|
||||
userDataPath: string;
|
||||
}): DesktopSettingsStore {
|
||||
const filePath = path.join(userDataPath, DESKTOP_SETTINGS_FILENAME);
|
||||
let cachedDocument: PersistedDesktopSettingsDocument | null = null;
|
||||
|
||||
async function persistDocument(document: PersistedDesktopSettingsDocument): Promise<void> {
|
||||
await mkdir(userDataPath, { recursive: true });
|
||||
const tempFilePath = `${filePath}.tmp`;
|
||||
await writeFile(tempFilePath, `${JSON.stringify(document, null, 2)}\n`, "utf8");
|
||||
await rename(tempFilePath, filePath);
|
||||
cachedDocument = document;
|
||||
}
|
||||
|
||||
async function loadDocument(): Promise<PersistedDesktopSettingsDocument> {
|
||||
if (cachedDocument) {
|
||||
return cachedDocument;
|
||||
}
|
||||
|
||||
try {
|
||||
await access(filePath);
|
||||
} catch {
|
||||
const document = buildDefaultDocument();
|
||||
await persistDocument(document);
|
||||
return document;
|
||||
}
|
||||
|
||||
try {
|
||||
const raw = await readFile(filePath, "utf8");
|
||||
const document = coerceDocument(JSON.parse(raw));
|
||||
await persistDocument(document);
|
||||
return document;
|
||||
} catch {
|
||||
const document = buildDefaultDocument();
|
||||
await persistDocument(document);
|
||||
return document;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
async get(): Promise<DesktopSettings> {
|
||||
const document = await loadDocument();
|
||||
return document.settings;
|
||||
},
|
||||
|
||||
async patch(patch: unknown): Promise<DesktopSettings> {
|
||||
const current = await loadDocument();
|
||||
const next = mergeDesktopSettings(current.settings, coerceDesktopSettingsPatch(patch));
|
||||
await persistDocument({
|
||||
...current,
|
||||
settings: next,
|
||||
});
|
||||
return next;
|
||||
},
|
||||
|
||||
async migrateLegacyRendererSettings(legacySettings: unknown): Promise<DesktopSettings> {
|
||||
const current = await loadDocument();
|
||||
if (current.migrations.legacyRendererSettingsImported) {
|
||||
return current.settings;
|
||||
}
|
||||
|
||||
const next = mergeDesktopSettings(
|
||||
current.settings,
|
||||
pickDesktopSettingsFromLegacyRendererSettings(legacySettings),
|
||||
);
|
||||
await persistDocument({
|
||||
...current,
|
||||
settings: next,
|
||||
migrations: {
|
||||
...current.migrations,
|
||||
legacyRendererSettingsImported: true,
|
||||
},
|
||||
});
|
||||
return next;
|
||||
},
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user