Skip to content

remove localstorage getconfig fallbacks #4432

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

Merged
zanesq merged 1 commit into from
Sep 4, 2025
Merged

remove localstorage getconfig fallbacks #4432

Show file tree
Hide file tree
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
73 changes: 0 additions & 73 deletions ui/desktop/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,56 +657,6 @@ const createChat = async (
menu.popup();
});

// Store config in localStorage for future windows
const windowConfig = {
...appConfig, // Use the potentially updated appConfig here as well
GOOSE_PORT: port, // Ensure this specific window's config gets the correct port
GOOSE_WORKING_DIR: working_dir,
REQUEST_DIR: dir,
GOOSE_BASE_URL_SHARE: sharingUrl,
recipe: recipe,
};

// We need to wait for the window to load before we can access localStorage
mainWindow.webContents.on('did-finish-load', () => {
const configStr = JSON.stringify(windowConfig).replace(/'/g, "\\'");
mainWindow.webContents
.executeJavaScript(
`
(function() {
function setConfig() {
try {
if (document.readyState === 'complete' && window.localStorage) {
localStorage.setItem('gooseConfig', '${configStr}');
return true;
}
} catch (e) {
console.warn('[Renderer] localStorage access failed:', e);
}
return false;
}

// If document is already complete, try immediately
if (document.readyState === 'complete') {
if (!setConfig()) {
console.error('[Renderer] Failed to set localStorage config despite document being ready');
}
} else {
// Wait for document to be fully ready
document.addEventListener('DOMContentLoaded', () => {
if (!setConfig()) {
console.error('[Renderer] Failed to set localStorage config after DOMContentLoaded');
}
});
}
})();
`
)
.catch((error) => {
console.error('Failed to execute localStorage script:', error);
});
});

// Handle new window creation for links
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
// Open all links in external browser
Expand Down Expand Up @@ -811,31 +761,8 @@ const createChat = async (
decodedRecipe.isScheduledExecution = true;
}

// Update the window config with the decoded recipe
const updatedConfig = {
...windowConfig,
recipe: decodedRecipe,
};

// Send the decoded recipe to the renderer process
mainWindow.webContents.send('recipe-decoded', decodedRecipe);

// Update localStorage with the decoded recipe
const configStr = JSON.stringify(updatedConfig).replace(/'/g, "\\'");
mainWindow.webContents
.executeJavaScript(
`
try {
localStorage.setItem('gooseConfig', '${configStr}');
console.log('[Renderer] Recipe decoded and config updated');
} catch (e) {
console.error('[Renderer] Failed to update config with decoded recipe:', e);
}
`
)
.catch((error) => {
console.error('[Main] Failed to update localStorage with decoded recipe:', error);
});
} else {
console.error('[Main] Failed to decode recipe from deeplink');
// Send error to renderer
Expand Down
14 changes: 3 additions & 11 deletions ui/desktop/src/preload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,10 @@ const electronAPI: ElectronAPI = {
platform: process.platform,
reactReady: () => ipcRenderer.send('react-ready'),
getConfig: () => {
// Add fallback to localStorage if config from preload is empty or missing
if (!config || Object.keys(config).length === 0) {
try {
if (window.localStorage) {
const storedConfig = localStorage.getItem('gooseConfig');
if (storedConfig) {
return JSON.parse(storedConfig);
}
}
} catch (e) {
console.warn('Failed to parse stored config from localStorage:', e);
}
console.warn(
'No config provided by main process. This may indicate an initialization issue.'
);
}
return config;
},
Expand Down
Loading