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:
@@ -33,6 +33,11 @@ import {
|
||||
runCliJsonCommand,
|
||||
runCliTextCommand,
|
||||
} from "./runtime-paths.js";
|
||||
import {
|
||||
createDesktopSettingsCommandHandlers,
|
||||
type DesktopCommandHandler,
|
||||
} from "../settings/desktop-settings-commands.js";
|
||||
import { getDesktopSettingsStore } from "../settings/desktop-settings-electron.js";
|
||||
|
||||
const DAEMON_LOG_FILENAME = "daemon.log";
|
||||
const PID_POLL_INTERVAL_MS = 100;
|
||||
@@ -44,7 +49,7 @@ const DETACHED_STARTUP_GRACE_MS = 1200;
|
||||
|
||||
type DesktopDaemonState = "starting" | "running" | "stopped" | "errored";
|
||||
|
||||
interface DesktopDaemonStatus {
|
||||
export interface DesktopDaemonStatus {
|
||||
serverId: string;
|
||||
status: DesktopDaemonState;
|
||||
listen: string | null;
|
||||
@@ -67,10 +72,16 @@ interface DesktopPairingOffer {
|
||||
qr: string | null;
|
||||
}
|
||||
|
||||
type DesktopCommandHandler = (args?: Record<string, unknown>) => Promise<unknown> | unknown;
|
||||
|
||||
function parseReleaseChannel(args: Record<string, unknown> | undefined): AppReleaseChannel {
|
||||
return args?.releaseChannel === "beta" ? "beta" : "stable";
|
||||
function parseReleaseChannel(
|
||||
args: Record<string, unknown> | undefined,
|
||||
): AppReleaseChannel | undefined {
|
||||
if (args?.releaseChannel === "beta") {
|
||||
return "beta";
|
||||
}
|
||||
if (args?.releaseChannel === "stable") {
|
||||
return "stable";
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -195,7 +206,7 @@ function resolveDesktopAppVersion(): string {
|
||||
// Daemon lifecycle
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
async function resolveStatus(): Promise<DesktopDaemonStatus> {
|
||||
export async function resolveDesktopDaemonStatus(): Promise<DesktopDaemonStatus> {
|
||||
const home = getPaseoHome();
|
||||
|
||||
try {
|
||||
@@ -265,8 +276,8 @@ function buildStartupFailureError(
|
||||
|
||||
async function pollForRunningDaemon(): Promise<DesktopDaemonStatus> {
|
||||
async function poll(attempt: number): Promise<DesktopDaemonStatus> {
|
||||
if (attempt >= STARTUP_POLL_MAX_ATTEMPTS) return resolveStatus();
|
||||
const status = await resolveStatus();
|
||||
if (attempt >= STARTUP_POLL_MAX_ATTEMPTS) return resolveDesktopDaemonStatus();
|
||||
const status = await resolveDesktopDaemonStatus();
|
||||
if (attempt === 0 || attempt === STARTUP_POLL_MAX_ATTEMPTS - 1 || attempt % 10 === 9) {
|
||||
logDesktopDaemonLifecycle("polling daemon status after detached start", {
|
||||
attempt: attempt + 1,
|
||||
@@ -284,7 +295,7 @@ async function pollForRunningDaemon(): Promise<DesktopDaemonStatus> {
|
||||
}
|
||||
|
||||
async function startDaemon(): Promise<DesktopDaemonStatus> {
|
||||
const current = await resolveStatus();
|
||||
const current = await resolveDesktopDaemonStatus();
|
||||
logDesktopDaemonLifecycle("initial status check before start", {
|
||||
status: current.status,
|
||||
pid: current.pid,
|
||||
@@ -299,7 +310,7 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
|
||||
appVersion: normalizeVersion(resolveDesktopAppVersion()),
|
||||
daemonVersion: normalizeVersion(current.version),
|
||||
});
|
||||
await stopDaemon();
|
||||
await stopDesktopDaemon();
|
||||
} else {
|
||||
return current;
|
||||
}
|
||||
@@ -389,8 +400,8 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
|
||||
return pollForRunningDaemon();
|
||||
}
|
||||
|
||||
async function stopDaemon(): Promise<DesktopDaemonStatus> {
|
||||
const status = await resolveStatus();
|
||||
export async function stopDesktopDaemon(): Promise<DesktopDaemonStatus> {
|
||||
const status = await resolveDesktopDaemonStatus();
|
||||
if (status.status !== "running" || !status.pid) return status;
|
||||
|
||||
const pid = status.pid;
|
||||
@@ -406,11 +417,11 @@ async function stopDaemon(): Promise<DesktopDaemonStatus> {
|
||||
throw new Error(`Timed out waiting for daemon PID ${pid} to stop`);
|
||||
}
|
||||
|
||||
return await resolveStatus();
|
||||
return await resolveDesktopDaemonStatus();
|
||||
}
|
||||
|
||||
async function restartDaemon(): Promise<DesktopDaemonStatus> {
|
||||
await stopDaemon();
|
||||
await stopDesktopDaemon();
|
||||
return startDaemon();
|
||||
}
|
||||
|
||||
@@ -427,7 +438,7 @@ async function getCliDaemonStatus(): Promise<string> {
|
||||
}
|
||||
|
||||
async function getDaemonPairing(): Promise<DesktopPairingOffer> {
|
||||
const status = await resolveStatus();
|
||||
const status = await resolveDesktopDaemonStatus();
|
||||
if (status.status !== "running") {
|
||||
return {
|
||||
relayEnabled: false,
|
||||
@@ -457,7 +468,7 @@ async function getDaemonPairing(): Promise<DesktopPairingOffer> {
|
||||
}
|
||||
|
||||
async function getLocalDaemonVersion(): Promise<{ version: string | null; error: string | null }> {
|
||||
const status = await resolveStatus();
|
||||
const status = await resolveDesktopDaemonStatus();
|
||||
if (status.status !== "running") {
|
||||
return { version: null, error: "Daemon is not running." };
|
||||
}
|
||||
@@ -467,12 +478,10 @@ async function getLocalDaemonVersion(): Promise<{ version: string | null; error:
|
||||
};
|
||||
}
|
||||
|
||||
function resolveCurrentUpdateVersion(): string {
|
||||
return resolveDesktopAppVersion();
|
||||
}
|
||||
|
||||
function getSystemIdleTimeMs(): number {
|
||||
return powerMonitor.getSystemIdleTime() * 1000;
|
||||
async function resolveRequestedReleaseChannel(
|
||||
args: Record<string, unknown> | undefined,
|
||||
): Promise<AppReleaseChannel> {
|
||||
return parseReleaseChannel(args) ?? (await getDesktopSettingsStore().get()).releaseChannel;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -481,13 +490,14 @@ function getSystemIdleTimeMs(): number {
|
||||
|
||||
export function createDaemonCommandHandlers(): Record<string, DesktopCommandHandler> {
|
||||
return {
|
||||
desktop_daemon_status: () => resolveStatus(),
|
||||
...createDesktopSettingsCommandHandlers({ settingsStore: getDesktopSettingsStore() }),
|
||||
desktop_daemon_status: () => resolveDesktopDaemonStatus(),
|
||||
start_desktop_daemon: () => startDaemon(),
|
||||
stop_desktop_daemon: () => stopDaemon(),
|
||||
stop_desktop_daemon: () => stopDesktopDaemon(),
|
||||
restart_desktop_daemon: () => restartDaemon(),
|
||||
desktop_daemon_logs: () => getDaemonLogs(),
|
||||
desktop_daemon_pairing: () => getDaemonPairing(),
|
||||
desktop_get_system_idle_time: () => getSystemIdleTimeMs(),
|
||||
desktop_get_system_idle_time: () => powerMonitor.getSystemIdleTime() * 1000,
|
||||
cli_daemon_status: () => getCliDaemonStatus(),
|
||||
write_attachment_base64: (args) => writeAttachmentBase64(args ?? {}),
|
||||
copy_attachment_file: (args) => copyAttachmentFileToManagedStorage(args ?? {}),
|
||||
@@ -511,15 +521,18 @@ export function createDaemonCommandHandlers(): Record<string, DesktopCommandHand
|
||||
if (sessionId) closeLocalTransportSession(sessionId);
|
||||
},
|
||||
check_app_update: async (args) => {
|
||||
const currentVersion = await resolveCurrentUpdateVersion();
|
||||
return checkForAppUpdate({ currentVersion, releaseChannel: parseReleaseChannel(args) });
|
||||
const currentVersion = resolveDesktopAppVersion();
|
||||
return checkForAppUpdate({
|
||||
currentVersion,
|
||||
releaseChannel: await resolveRequestedReleaseChannel(args),
|
||||
});
|
||||
},
|
||||
install_app_update: async (args) => {
|
||||
const currentVersion = await resolveCurrentUpdateVersion();
|
||||
const currentVersion = resolveDesktopAppVersion();
|
||||
return downloadAndInstallUpdate(
|
||||
{ currentVersion, releaseChannel: parseReleaseChannel(args) },
|
||||
{ currentVersion, releaseChannel: await resolveRequestedReleaseChannel(args) },
|
||||
async () => {
|
||||
await stopDaemon();
|
||||
await stopDesktopDaemon();
|
||||
},
|
||||
);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user