nebula-project/NebulaBrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add advanced reload and history clearing features

Browse Source 
Introduces hard reload and fresh reload buttons to the UI, allowing users to reload pages while ignoring cache or with a cache-busting parameter. Refactors session and browser data clearing logic to handle multiple sessions and resets history JSON files. Adds per-section clear buttons for site and search history in settings, improving user control over stored data.
This commit is contained in:
Andrew Zambazos
2025-08-11 10:59:10 +12:00
parent 6596c13d4d
commit 80b9354fce
5 changed files with 141 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.js
+41 -26
View File
@@ -149,9 +149,9 @@ app.whenReady().then(async () => {
});
// Optimize session settings for performance and OAuth compatibility
const ses = session.defaultSession;
const sessionsToConfigure = [session.fromPartition('persist:main'), session.defaultSession];
try {
for (const ses of sessionsToConfigure) {
// Configure session for OAuth compatibility (Google, etc.)
ses.setPermissionRequestHandler((webContents, permission, callback) => {
// Allow necessary permissions for OAuth flows
@@ -168,25 +168,20 @@ app.whenReady().then(async () => {
// Configure cookies for OAuth compatibility
ses.cookies.on('changed', (event, cookie, cause, removed) => {
// Log cookie changes for debugging OAuth issues
if (cookie.domain.includes('google') || cookie.domain.includes('accounts')) {
if (cookie.domain && (cookie.domain.includes('google') || cookie.domain.includes('accounts'))) {
console.log(`Cookie ${removed ? 'removed' : 'added'}: ${cookie.name} for ${cookie.domain}`);
}
});
// Enable request/response caching
// Optional: add headers only for OAuth flows; avoid forcing cache headers globally
ses.webRequest.onBeforeSendHeaders((details, callback) => {
// Add headers for better OAuth compatibility
details.requestHeaders['Cache-Control'] = 'max-age=3600';
// Ensure we accept third-party cookies for OAuth flows
details.requestHeaders['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8';
// Add referrer policy for OAuth compatibility
if (details.url.includes('accounts.google.com') || details.url.includes('oauth')) {
details.requestHeaders['Referrer-Policy'] = 'strict-origin-when-cross-origin';
details.requestHeaders['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8';
}
callback({ requestHeaders: details.requestHeaders });
});
// Skip preload registration as it's handled in window options
}
console.log('Session configured successfully for OAuth compatibility');
} catch (err) {
console.error('Session setup error:', err);
@@ -330,26 +325,35 @@ ipcMain.handle('save-bookmarks', async (event, bookmarks) => {
ipcMain.handle('clear-browser-data', async () => {
try {
const ses = session.defaultSession;
const sessionsToClear = [session.defaultSession, session.fromPartition('persist:main')];
// Clear cookies
await ses.clearStorageData({ storages: ['cookies'] });
// Clear local storage and other storage data
await ses.clearStorageData({ storages: ['localstorage', 'indexdb', 'filesystem', 'websql'] });
// Clear cache
for (const ses of sessionsToClear) {
if (!ses) continue;
// Clear all common site storage types
await ses.clearStorageData({
storages: [
'cookies',
'localstorage',
'indexdb',
'filesystem',
'websql',
'serviceworkers',
'caches',
'shadercache',
'appcache'
],
});
// Clear caches and auth
await ses.clearCache();
// Clear HTTP authentication cache
await ses.clearAuthCache();
// Clear all cookies explicitly to ensure logged-in accounts are logged out
const cookies = await ses.cookies.get({});
for (const cookie of cookies) {
await ses.cookies.remove(cookie.url, cookie.name);
}
// Also reset on-disk history JSON files managed by the app
const siteHistoryPath = path.join(__dirname, 'site-history.json');
const searchHistoryPath = path.join(__dirname, 'search-history.json');
try { await fs.promises.writeFile(siteHistoryPath, JSON.stringify([], null, 2)); } catch {}
try { await fs.promises.writeFile(searchHistoryPath, JSON.stringify([], null, 2)); } catch {}
return true; // Indicate success
} catch (error) {
console.error('Failed to clear browser data:', error);
@@ -357,6 +361,17 @@ ipcMain.handle('clear-browser-data', async () => {
}
});
// Optional: standalone clear for search history JSON
ipcMain.handle('clear-search-history', async () => {
const filePath = path.join(__dirname, 'search-history.json');
try {
await fs.promises.writeFile(filePath, JSON.stringify([], null, 2));
return true;
} catch (err) {
return false;
}
});
ipcMain.handle('get-zoom-factor', event => {
const wc = BrowserWindow.fromWebContents(event.sender).webContents;
return wc.getZoomFactor();
renderer/index.html
+2
View File
@@ -51,6 +51,8 @@
<span id="zoom-percent">100%</span>
<button id="zoom-in-btn">+</button>
</div>
<button id="hard-reload-btn">Hard Reload (Ignore Cache)</button>
<button id="fresh-reload-btn">Reload Fresh (Add Cache-Buster)</button>
</div>
</div>
</div>
renderer/script.js
+28
View File
@@ -674,6 +674,30 @@ function reload() {
}
}
function hardReload() {
const webview = document.getElementById(`tab-${activeTabId}`);
if (webview && typeof webview.reloadIgnoringCache === 'function') {
webview.reloadIgnoringCache();
scheduleUpdateNavButtons();
} else if (webview) {
// Fallback
webview.reload();
}
}
function freshReload() {
const webview = document.getElementById(`tab-${activeTabId}`);
if (!webview) return;
try {
const u = new URL(webview.getURL());
u.searchParams.set('_bust', Date.now().toString());
webview.src = u.toString();
} catch {
// If URL parsing fails (e.g., internal pages), fall back to hard reload
hardReload();
}
}
// Function to open the Settings page
function openSettings() {
createTab('browser://settings');
@@ -776,6 +800,10 @@ window.addEventListener('DOMContentLoaded', () => {
// only now bind the reload button (guaranteed to exist)
const reloadBtn = document.getElementById('reload-btn');
reloadBtn.addEventListener('click', reload);
const hardReloadBtn = document.getElementById('hard-reload-btn');
if (hardReloadBtn) hardReloadBtn.addEventListener('click', hardReload);
const freshReloadBtn = document.getElementById('fresh-reload-btn');
if (freshReloadBtn) freshReloadBtn.addEventListener('click', freshReload);
// bind zoom buttons (single binding)
const zoomInBtn = document.getElementById('zoom-in-btn');
renderer/settings.js
+42 -14
View File
@@ -1,13 +1,7 @@
// Try to get ipcRenderer, but don't fail if it's not available
let ipcRenderer = null;
try {
if (typeof require !== 'undefined') {
const electron = require('electron');
ipcRenderer = electron.ipcRenderer;
}
} catch (e) {
console.log('[SETTINGS] Electron IPC not available, some features may be limited');
}
// Prefer contextBridge-exposed API
const ipc = (window.electronAPI && typeof window.electronAPI.invoke === 'function')
? window.electronAPI
: null;
let clearBtn = document.getElementById('clear-data-btn');
const statusDiv = document.getElementById('status');
@@ -39,14 +33,18 @@ function attachClearHandler(btn) {
btn.onclick = async () => {
if (statusDiv && statusText) {
statusDiv.classList.remove('hidden');
statusText.textContent = 'Clearing all browser data...';
statusText.textContent = 'Clearing cookies, storage, cache, and history...';
}
try {
if (ipcRenderer) {
const ok = await ipcRenderer.invoke('clear-browser-data');
if (ipc) {
const ok = await ipc.invoke('clear-browser-data');
// Also clear localStorage site history in this context
try { localStorage.removeItem('siteHistory'); } catch {}
// Try to refresh lists if present
try { if (typeof loadHistories === 'function') await loadHistories(); } catch {}
showStatus(ok
? 'All browser data and bookmarks cleared!'
? 'All browser data cleared.'
: 'Failed to clear browser data.');
} else {
showStatus('Clear data feature not available in this context.');
@@ -70,6 +68,36 @@ window.addEventListener('DOMContentLoaded', () => {
clearBtn = document.getElementById('clear-data-btn');
attachClearHandler(clearBtn);
}
// Wire per-section clear buttons to main when possible
const clearSiteBtn = document.getElementById('clear-site-history-btn');
if (clearSiteBtn) {
clearSiteBtn.addEventListener('click', async () => {
try {
// Clear localStorage copy
try { localStorage.removeItem('siteHistory'); } catch {}
// Ask main to clear file-based history for consistency
if (ipc) { await ipc.invoke('clear-site-history'); }
showStatus('Site history cleared');
try { if (typeof loadHistories === 'function') await loadHistories(); } catch {}
} catch (e) {
console.error('Clear site history error:', e);
showStatus('Failed clearing site history');
}
});
}
const clearSearchBtn = document.getElementById('clear-search-history-btn');
if (clearSearchBtn) {
clearSearchBtn.addEventListener('click', async () => {
try {
if (ipc) { await ipc.invoke('clear-search-history'); }
showStatus('Search history cleared');
} catch (e) {
console.error('Clear search history error:', e);
showStatus('Failed clearing search history');
}
});
}
});
// Tabs: simple controller
search-history.json
+1 -3
View File
@@ -1,3 +1 @@
[
]
[]