Skip to content

fix(main): requestSingleInstanceLock to prevent PTY loss on replace #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JeanBaptisteRenard wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(main): requestSingleInstanceLock to prevent PTY loss on replace #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 66 additions & 47 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,60 +1378,79 @@ ipcMain.handle('updater-install', () => {
});

// --- App lifecycle ---
app.whenReady().then(() => {
buildMenu();
createWindow();
startProjectsWatcher();
scheduleIpc.ensureScheduleCreatorCommand();

// Shared runCommand for both cron scheduler and manual "run now"
const { spawn: cpSpawn } = require('child_process');
function runScheduleCommand(cmd, cwd, name, onDone) {
const globalSettings = getSetting('global') || {};
const profileId = globalSettings.shellProfile || SETTING_DEFAULTS.shellProfile;
const profile = resolveShell(profileId);
const shell = profile.path;
const args = shellArgs(shell, cmd, profile.args || []);

log.info(`[schedule] Running: ${shell} ${args.join(' ')}`);
const child = cpSpawn(shell, args, {
cwd,
stdio: ['ignore', 'ignore', 'pipe'],
env: { ...cleanPtyEnv, FORCE_COLOR: '0' },
});
// Prevent a second Electron instance from killing active PTY sessions.
// This happens when the user replaces the AppImage while Switchboard is running:
// the OS spawns the new binary, which would otherwise initialise a second process
// and leave the first one's node-pty sessions orphaned or killed.
// requestSingleInstanceLock ensures only one instance runs at a time. The second
// launch quits immediately; the first brings its window to the front.
const gotSingleInstanceLock = app.requestSingleInstanceLock();
if (!gotSingleInstanceLock) {
app.quit();
} else {
// Focus the existing window when a second launch is attempted.
app.on('second-instance', () => {
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
}
});

let stderr = '';
child.stderr.on('data', (data) => { stderr += data.toString(); });
app.whenReady().then(() => {
buildMenu();
createWindow();
startProjectsWatcher();
scheduleIpc.ensureScheduleCreatorCommand();

// Shared runCommand for both cron scheduler and manual "run now"
const { spawn: cpSpawn } = require('child_process');
function runScheduleCommand(cmd, cwd, name, onDone) {
const globalSettings = getSetting('global') || {};
const profileId = globalSettings.shellProfile || SETTING_DEFAULTS.shellProfile;
const profile = resolveShell(profileId);
const shell = profile.path;
const args = shellArgs(shell, cmd, profile.args || []);

log.info(`[schedule] Running: ${shell} ${args.join(' ')}`);
const child = cpSpawn(shell, args, {
cwd,
stdio: ['ignore', 'ignore', 'pipe'],
env: { ...cleanPtyEnv, FORCE_COLOR: '0' },
});

child.on('exit', (code) => {
if (stderr.trim()) log.error(`[schedule] ${name} stderr:\n${stderr.trim()}`);
log.info(`[schedule] ${name} finished (exit ${code})`);
if (onDone) onDone();
});
let stderr = '';
child.stderr.on('data', (data) => { stderr += data.toString(); });

child.on('error', (err) => {
log.error(`[schedule] ${name} error:`, err.message);
if (onDone) onDone();
});
}
child.on('exit', (code) => {
if (stderr.trim()) log.error(`[schedule] ${name} stderr:\n${stderr.trim()}`);
log.info(`[schedule] ${name} finished (exit ${code})`);
if (onDone) onDone();
});

scheduleIpc.init(log, runScheduleCommand);
startScheduler(log, runScheduleCommand);
child.on('error', (err) => {
log.error(`[schedule] ${name} error:`, err.message);
if (onDone) onDone();
});
}

// Re-index search if FTS table was recreated (e.g. tokenizer config change)
if (searchFtsRecreated) populateCacheViaWorker();
scheduleIpc.init(log, runScheduleCommand);
startScheduler(log, runScheduleCommand);

// Check for updates after launch
if (autoUpdater) {
setTimeout(() => autoUpdater.checkForUpdates().catch(e => log.error('[updater] check failed:', e?.message || String(e))), 5000);
// Re-check every 4 hours for long-running sessions
setInterval(() => autoUpdater.checkForUpdates().catch(e => log.error('[updater] check failed:', e?.message || String(e))), 4 * 60 * 60 * 1000);
}
// Re-index search if FTS table was recreated (e.g. tokenizer config change)
if (searchFtsRecreated) populateCacheViaWorker();

app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) createWindow();
});
});
// Check for updates after launch
if (autoUpdater) {
setTimeout(() => autoUpdater.checkForUpdates().catch(e => log.error('[updater] check failed:', e?.message || String(e))), 5000);
// Re-check every 4 hours for long-running sessions
setInterval(() => autoUpdater.checkForUpdates().catch(e => log.error('[updater] check failed:', e?.message || String(e))), 4 * 60 * 60 * 1000);
}

app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) createWindow();
});
}); // end app.whenReady
} // end gotSingleInstanceLock else-branch

app.on('window-all-closed', () => {
if (process.platform !== 'darwin') app.quit();
Expand Down