diff --git a/src/background/deduplication.ts b/src/background/deduplication.ts index b683867..bd0a969 100644 --- a/src/background/deduplication.ts +++ b/src/background/deduplication.ts @@ -10,6 +10,7 @@ import { settingsStorage } from '@/shared/storage' import { PROTECTED_URL_PATTERNS } from '@/shared/constants' import { normalizeUrlForDedup } from '@/shared/utils' +import { browser } from '@/shared/browser' export interface DuplicateResult { /** Total duplicate tabs found (including the one kept) */ @@ -23,7 +24,7 @@ export interface DuplicateResult { /** * Check if a tab is protected from closure during dedup. */ -async function isProtected(tab: chrome.tabs.Tab): Promise { +async function isProtected(tab: browser.tabs.Tab): Promise { // Protected URL patterns (chrome://, etc.) if (tab.url && PROTECTED_URL_PATTERNS.some((pattern) => tab.url!.startsWith(pattern))) { return true @@ -47,7 +48,7 @@ async function isProtected(tab: chrome.tabs.Tab): Promise { /** * Score a tab for keep priority (higher = more likely to keep). */ -function tabKeepScore(tab: chrome.tabs.Tab): number { +function tabKeepScore(tab: browser.tabs.Tab): number { let score = 0 if (tab.active) score += 1000 if (!tab.discarded) score += 100 @@ -60,9 +61,9 @@ function tabKeepScore(tab: chrome.tabs.Tab): number { * Returns a map of normalized URL → array of tabs with that URL. * Only includes groups with 2+ tabs. */ -async function findDuplicateGroups(): Promise> { - const allTabs = await chrome.tabs.query({}) - const groups = new Map() +async function findDuplicateGroups(): Promise> { + const allTabs = await browser.tabs.query({}) + const groups = new Map() for (const tab of allTabs) { if (!tab.url || !tab.id) continue @@ -82,7 +83,7 @@ async function findDuplicateGroups(): Promise> { } // Filter to only groups with duplicates - const duplicates = new Map() + const duplicates = new Map() for (const [url, tabs] of groups) { if (tabs.length >= 2) { duplicates.set(url, tabs) @@ -143,13 +144,13 @@ export async function closeDuplicates(): Promise { // Close tabs in batch, falling back to individual on error if (tabIdsToClose.length > 0) { try { - await chrome.tabs.remove(tabIdsToClose) + await browser.tabs.remove(tabIdsToClose) tabsClosed = tabIdsToClose.length } catch { // Batch failed, try individually for (const tabId of tabIdsToClose) { try { - await chrome.tabs.remove(tabId) + await browser.tabs.remove(tabId) tabsClosed++ } catch { // Tab may have already been closed diff --git a/src/background/index.ts b/src/background/index.ts index 15b6fc6..43c9ea5 100644 --- a/src/background/index.ts +++ b/src/background/index.ts @@ -4,10 +4,11 @@ * MV3 service workers are terminated after ~30 seconds of inactivity. * This means: * - No persistent in-memory state - * - Everything must be stored in chrome.storage + * - Everything must be stored in browser.storage * - Re-register alarms and listeners on every wake */ +import { browser } from '@/shared/browser' import { settingsStorage, tabActivityStorage, sessionsStorage, storage } from '@/shared/storage' import { ALARM_NAMES, @@ -97,7 +98,7 @@ import { getDuplicateCount, closeDuplicates } from './deduplication' // Track previously active tab per window (for activity-on-leave tracking) // When user switches away from a tab, we touch it to record the departure time -// NOTE: This is persisted to chrome.storage to survive service worker restarts +// NOTE: This is persisted to browser.storage to survive service worker restarts let previousActiveTab: Map = new Map() // windowId → tabId // Initialization promise - listeners wait on this before accessing state @@ -149,7 +150,7 @@ async function savePreviousActiveTabs(): Promise { * PWA, onStartup runs before any normal browser window exists. The regular * window gets restored later — AFTER onStartup has already finished. That * window's tabs never saw the initial discard pass, so `hibernateWindow()` - * (called from chrome.windows.onCreated during the guard window) sweeps + * (called from browser.windows.onCreated during the guard window) sweeps * them up too. * * The 30s HIBERNATION_GUARD_DURATION_MS was tuned empirically against @@ -157,26 +158,26 @@ async function savePreviousActiveTabs(): Promise { * the PWA path — shorter windows regress #6. */ async function maybeHibernateTab(tabId: number): Promise { - const result = await chrome.storage.session.get(SESSION_KEYS.HIBERNATION_GUARD) + const result = await browser.storage.session.get(SESSION_KEYS.HIBERNATION_GUARD) const guard = result[SESSION_KEYS.HIBERNATION_GUARD] as | { expiresAt: number; tabIds: number[] } | undefined if (!guard) return if (Date.now() > guard.expiresAt) { - await chrome.storage.session.remove(SESSION_KEYS.HIBERNATION_GUARD) + await browser.storage.session.remove(SESSION_KEYS.HIBERNATION_GUARD) return } if (!guard.tabIds.includes(tabId)) return - const tab = await chrome.tabs.get(tabId) + const tab = await browser.tabs.get(tabId) if (tab.active) return if (tab.discarded) return console.log(`[Raft] Hibernation guard: discarding tab ${tabId} (${tab.url})`) try { - await chrome.tabs.discard(tabId) + await browser.tabs.discard(tabId) } catch (e) { console.warn(`[Raft] Hibernation guard: failed to discard tab ${tabId}:`, e) } @@ -191,16 +192,16 @@ async function hibernateWindow(windowId: number): Promise { const settings = await settingsStorage.get() if (!settings.suspension.hibernateOnStartup) return - const extensionOrigin = chrome.runtime.getURL('') - const winTabs = await chrome.tabs.query({ windowId }) + const extensionOrigin = browser.runtime.getURL('') + const winTabs = await browser.tabs.query({ windowId }) // Open a Raft page as the active tab so we can discard the user's active tab const raftTab = winTabs.find((t) => t.url?.startsWith(extensionOrigin)) if (raftTab?.id) { - await chrome.tabs.update(raftTab.id, { active: true }) + await browser.tabs.update(raftTab.id, { active: true }) } else { - await chrome.tabs.create({ - url: chrome.runtime.getURL('src/options/index.html#sessions'), + await browser.tabs.create({ + url: browser.runtime.getURL('src/options/index.html#sessions'), active: true, windowId, }) @@ -298,7 +299,7 @@ export type { MessageResponse } * Only touches tabs that aren't already being tracked */ async function initializeTabActivity(): Promise { - const tabs = await chrome.tabs.query({}) + const tabs = await browser.tabs.query({}) const activity = await tabActivityStorage.getAll() let initialized = 0 @@ -330,7 +331,7 @@ async function initialize(): Promise { // Populate initial active tabs per window (for activity-on-leave tracking) // This handles service worker restart after termination - const windows = await chrome.windows.getAll({ populate: true }) + const windows = await browser.windows.getAll({ populate: true }) let needsSave = false for (const window of windows) { if (window.id !== undefined && window.tabs) { @@ -382,8 +383,8 @@ async function initialize(): Promise { * Set up the suspension check alarm */ async function setupSuspensionAlarm(): Promise { - await chrome.alarms.clear(ALARM_NAMES.SUSPENSION_CHECK) - await chrome.alarms.create(ALARM_NAMES.SUSPENSION_CHECK, { + await browser.alarms.clear(ALARM_NAMES.SUSPENSION_CHECK) + await browser.alarms.create(ALARM_NAMES.SUSPENSION_CHECK, { periodInMinutes: SUSPENSION_CHECK_INTERVAL_MINUTES, }) } @@ -392,8 +393,8 @@ async function setupSuspensionAlarm(): Promise { * Set up the auto-save alarm */ async function setupAutoSaveAlarm(intervalMinutes: number): Promise { - await chrome.alarms.clear(ALARM_NAMES.AUTO_SAVE) - await chrome.alarms.create(ALARM_NAMES.AUTO_SAVE, { + await browser.alarms.clear(ALARM_NAMES.AUTO_SAVE) + await browser.alarms.create(ALARM_NAMES.AUTO_SAVE, { periodInMinutes: intervalMinutes, }) } @@ -402,8 +403,8 @@ async function setupAutoSaveAlarm(intervalMinutes: number): Promise { * Set up the cloud sync alarm */ async function setupCloudSyncAlarm(intervalMinutes: number): Promise { - await chrome.alarms.clear(ALARM_NAMES.CLOUD_SYNC) - await chrome.alarms.create(ALARM_NAMES.CLOUD_SYNC, { + await browser.alarms.clear(ALARM_NAMES.CLOUD_SYNC) + await browser.alarms.create(ALARM_NAMES.CLOUD_SYNC, { periodInMinutes: intervalMinutes, }) } @@ -412,8 +413,8 @@ async function setupCloudSyncAlarm(intervalMinutes: number): Promise { * Set up the recovery snapshot alarm */ async function setupRecoverySnapshotAlarm(): Promise { - await chrome.alarms.clear(ALARM_NAMES.RECOVERY_SNAPSHOT) - await chrome.alarms.create(ALARM_NAMES.RECOVERY_SNAPSHOT, { + await browser.alarms.clear(ALARM_NAMES.RECOVERY_SNAPSHOT) + await browser.alarms.create(ALARM_NAMES.RECOVERY_SNAPSHOT, { periodInMinutes: RECOVERY_CONFIG.INTERVAL_MINUTES, }) } @@ -422,8 +423,8 @@ async function setupRecoverySnapshotAlarm(): Promise { * Set up the export reminder alarm (runs daily to check if reminder is due) */ async function setupExportReminderAlarm(): Promise { - await chrome.alarms.clear(ALARM_NAMES.EXPORT_REMINDER) - await chrome.alarms.create(ALARM_NAMES.EXPORT_REMINDER, { + await browser.alarms.clear(ALARM_NAMES.EXPORT_REMINDER) + await browser.alarms.create(ALARM_NAMES.EXPORT_REMINDER, { periodInMinutes: 60 * 24, // Check once per day delayInMinutes: 60, // First check after 1 hour }) @@ -513,19 +514,19 @@ async function checkExportReminder(): Promise { */ async function setupContextMenus(): Promise { // Remove existing menus first - await chrome.contextMenus.removeAll() + await browser.contextMenus.removeAll() // Add "Suspend this tab" menu item try { - chrome.contextMenus.create( + browser.contextMenus.create( { id: 'suspend-tab', title: 'Suspend this tab', contexts: ['page'], }, () => { - if (chrome.runtime.lastError) { - console.warn('[Raft] Failed to create suspend-tab menu:', chrome.runtime.lastError) + if (browser.runtime.lastError) { + console.warn('[Raft] Failed to create suspend-tab menu:', browser.runtime.lastError) } } ) @@ -535,15 +536,18 @@ async function setupContextMenus(): Promise { // Add "Suspend other tabs" menu item try { - chrome.contextMenus.create( + browser.contextMenus.create( { id: 'suspend-other-tabs', title: 'Suspend other tabs in window', contexts: ['page'], }, () => { - if (chrome.runtime.lastError) { - console.warn('[Raft] Failed to create suspend-other-tabs menu:', chrome.runtime.lastError) + if (browser.runtime.lastError) { + console.warn( + '[Raft] Failed to create suspend-other-tabs menu:', + browser.runtime.lastError + ) } } ) @@ -559,15 +563,15 @@ async function updateBadge(): Promise { const settings = await settingsStorage.get() if (!settings.ui.showBadge) { - await chrome.action.setBadgeText({ text: '' }) + await browser.action.setBadgeText({ text: '' }) return } const counts = await getTabCounts() const text = counts.suspended > 0 ? counts.suspended.toString() : '' - await chrome.action.setBadgeText({ text }) - await chrome.action.setBadgeBackgroundColor({ color: '#c07a42' }) // raft-500 + await browser.action.setBadgeText({ text }) + await browser.action.setBadgeBackgroundColor({ color: '#c07a42' }) // raft-500 } // ============================================================================ @@ -577,14 +581,14 @@ async function updateBadge(): Promise { /** * Handle alarm events */ -chrome.alarms.onAlarm.addListener(async (alarm) => { +browser.alarms.onAlarm.addListener(async (alarm) => { switch (alarm.name) { case ALARM_NAMES.SUSPENSION_CHECK: { await checkForInactiveTabs() await updateBadge() // Periodically clean up orphaned tab activity records - const tabs = await chrome.tabs.query({}) + const tabs = await browser.tabs.query({}) const tabIds = new Set(tabs.map((t) => t.id).filter((id): id is number => id !== undefined)) await tabActivityStorage.cleanup(tabIds) break @@ -619,7 +623,7 @@ chrome.alarms.onAlarm.addListener(async (alarm) => { * Key insight: We track when the user LEAVES a tab, not when they arrive. * This ensures tabs aren't suspended until X minutes after departure. */ -chrome.tabs.onActivated.addListener(async (activeInfo) => { +browser.tabs.onActivated.addListener(async (activeInfo) => { await initReady // Touch the PREVIOUS active tab (the one user just left) @@ -638,7 +642,7 @@ chrome.tabs.onActivated.addListener(async (activeInfo) => { /** * Track tab updates (URL changes, discard state changes, etc.) */ -chrome.tabs.onUpdated.addListener(async (tabId, changeInfo) => { +browser.tabs.onUpdated.addListener(async (tabId, changeInfo) => { // Hibernation guard: discard tabs that loaded during startup window if (changeInfo.status === 'complete' || changeInfo.discarded === false) { await maybeHibernateTab(tabId) @@ -665,7 +669,7 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo) => { /** * Clean up activity tracking when tabs are closed */ -chrome.tabs.onRemoved.addListener(async (tabId) => { +browser.tabs.onRemoved.addListener(async (tabId) => { await tabActivityStorage.remove(tabId) await updateBadge() }) @@ -675,7 +679,7 @@ chrome.tabs.onRemoved.addListener(async (tabId) => { * window, hibernate its tabs. This handles the case where a PWA starts Chrome * first (triggering onStartup before the regular window exists). */ -chrome.windows.onCreated.addListener(async (win) => { +browser.windows.onCreated.addListener(async (win) => { if (win.type !== 'normal' || !win.id) return await initReady @@ -685,7 +689,7 @@ chrome.windows.onCreated.addListener(async (win) => { // Only hibernate the first normal window — this is effectively a "startup" // for the browser UI (e.g., PWA kept Chrome alive, user opens a browser window). // If other normal windows already exist, this is just a new window (Ctrl+N). - const normalWindows = await chrome.windows.getAll() + const normalWindows = await browser.windows.getAll() const normalCount = normalWindows.filter((w) => w.type === 'normal').length if (normalCount > 1) return @@ -698,7 +702,7 @@ chrome.windows.onCreated.addListener(async (win) => { /** * Clean up previousActiveTab tracking when windows are closed */ -chrome.windows.onRemoved.addListener(async (windowId) => { +browser.windows.onRemoved.addListener(async (windowId) => { await initReady previousActiveTab.delete(windowId) await savePreviousActiveTabs() @@ -707,7 +711,7 @@ chrome.windows.onRemoved.addListener(async (windowId) => { /** * Handle context menu clicks */ -chrome.contextMenus.onClicked.addListener(async (info, tab) => { +browser.contextMenus.onClicked.addListener(async (info, tab) => { if (!tab?.id) return switch (info.menuItemId) { @@ -726,9 +730,9 @@ chrome.contextMenus.onClicked.addListener(async (info, tab) => { /** * Handle messages from popup and other extension pages */ -chrome.runtime.onMessage.addListener((message: MessageType, sender, sendResponse) => { +browser.runtime.onMessage.addListener((message: MessageType, sender, sendResponse) => { // Only accept messages from our own extension - if (sender.id !== chrome.runtime.id) { + if (sender.id !== browser.runtime.id) { sendResponse({ success: false, error: 'Unauthorized sender' }) return true } @@ -752,7 +756,7 @@ chrome.runtime.onMessage.addListener((message: MessageType, sender, sendResponse async function getTestWindowIds(): Promise { const windowIds = await storage.get(DEV_TEST_WINDOWS_KEY, []) // Filter out any windows that no longer exist - const existingWindows = await chrome.windows.getAll() + const existingWindows = await browser.windows.getAll() const existingIds = new Set(existingWindows.map((w) => w.id)) const validIds = windowIds.filter((id) => existingIds.has(id)) // Update storage if some windows were closed @@ -783,7 +787,7 @@ async function createDevScenario( for (const windowSpec of scenario.windows) { // Create window with about:blank - const createdWindow = await chrome.windows.create({ + const createdWindow = await browser.windows.create({ url: 'about:blank', focused: windowSpec.focused ?? false, }) @@ -793,13 +797,13 @@ async function createDevScenario( await addTestWindowId(windowId) // Get the initial blank tab to remove later - const initialTabs = await chrome.tabs.query({ windowId }) + const initialTabs = await browser.tabs.query({ windowId }) const blankTabId = initialTabs[0]?.id // Create ungrouped tabs if (windowSpec.tabs) { for (const tabSpec of windowSpec.tabs) { - await chrome.tabs.create({ + await browser.tabs.create({ windowId, url: tabSpec.url, pinned: tabSpec.pinned ?? false, @@ -816,7 +820,7 @@ async function createDevScenario( // Create tabs for this group for (const tabSpec of groupSpec.tabs) { - const tab = await chrome.tabs.create({ + const tab = await browser.tabs.create({ windowId, url: tabSpec.url, pinned: tabSpec.pinned ?? false, @@ -832,15 +836,15 @@ async function createDevScenario( if (tabIds.length > 0) { // Cast to the required tuple type const tabIdsForGroup = tabIds as [number, ...number[]] - const groupId = await chrome.tabs.group({ + const groupId = await browser.tabs.group({ tabIds: tabIdsForGroup, createProperties: { windowId }, }) // Update group properties - await chrome.tabGroups.update(groupId, { + await browser.tabGroups.update(groupId, { title: groupSpec.title, - color: groupSpec.color as chrome.tabGroups.Color, + color: groupSpec.color as browser.tabGroups.Color, collapsed: groupSpec.collapsed ?? false, }) } @@ -850,7 +854,7 @@ async function createDevScenario( // Remove the initial blank tab if (blankTabId) { try { - await chrome.tabs.remove(blankTabId) + await browser.tabs.remove(blankTabId) } catch { // Tab may already be closed } @@ -869,7 +873,7 @@ async function cleanupTestWindows(): Promise<{ closedCount: number }> { for (const windowId of windowIds) { try { - await chrome.windows.remove(windowId) + await browser.windows.remove(windowId) closedCount++ } catch { // Window may already be closed @@ -921,7 +925,7 @@ async function handleMessage(message: MessageType): Promise { } case 'GET_CURRENT_TAB_STATUS': { - const [tab] = await chrome.tabs.query({ active: true, currentWindow: true }) + const [tab] = await browser.tabs.query({ active: true, currentWindow: true }) if (!tab) { return { success: false, error: 'No active tab' } } @@ -956,19 +960,19 @@ async function handleMessage(message: MessageType): Promise { if (settings.suspension.enabled) { await setupSuspensionAlarm() } else { - await chrome.alarms.clear(ALARM_NAMES.SUSPENSION_CHECK) + await browser.alarms.clear(ALARM_NAMES.SUSPENSION_CHECK) } if (settings.autoSave.enabled) { await setupAutoSaveAlarm(settings.autoSave.intervalMinutes) } else { - await chrome.alarms.clear(ALARM_NAMES.AUTO_SAVE) + await browser.alarms.clear(ALARM_NAMES.AUTO_SAVE) } if (settings.exportReminder.enabled) { await setupExportReminderAlarm() } else { - await chrome.alarms.clear(ALARM_NAMES.EXPORT_REMINDER) + await browser.alarms.clear(ALARM_NAMES.EXPORT_REMINDER) } await updateBadge() @@ -1301,7 +1305,7 @@ async function handleMessage(message: MessageType): Promise { await clearAllCloudSyncData() // Cancel sync alarm - await chrome.alarms.clear(ALARM_NAMES.CLOUD_SYNC) + await browser.alarms.clear(ALARM_NAMES.CLOUD_SYNC) return { success: true } } @@ -1376,14 +1380,14 @@ async function handleMessage(message: MessageType): Promise { if (settings.enabled) { await setupCloudSyncAlarm(settings.intervalMinutes) } else { - await chrome.alarms.clear(ALARM_NAMES.CLOUD_SYNC) + await browser.alarms.clear(ALARM_NAMES.CLOUD_SYNC) } return { success: true, data: settings } } case 'CLOUD_GET_SYNCED_IDS': { - const result = await chrome.storage.local.get(CLOUD_SYNC_KEYS.SYNCED_IDS) + const result = await browser.storage.local.get(CLOUD_SYNC_KEYS.SYNCED_IDS) const ids = (result[CLOUD_SYNC_KEYS.SYNCED_IDS] as string[] | undefined) ?? [] return { success: true, data: ids } } @@ -1596,7 +1600,7 @@ async function handleMessage(message: MessageType): Promise { /** * Handle extension install/update */ -chrome.runtime.onInstalled.addListener(async (details) => { +browser.runtime.onInstalled.addListener(async (details) => { console.log('[Raft] Extension installed/updated:', details.reason) if (details.reason === 'install') { @@ -1629,8 +1633,8 @@ chrome.runtime.onInstalled.addListener(async (details) => { } // Open onboarding page for new users - const onboardingUrl = chrome.runtime.getURL('src/onboarding/index.html') - chrome.tabs.create({ url: onboardingUrl }) + const onboardingUrl = browser.runtime.getURL('src/onboarding/index.html') + browser.tabs.create({ url: onboardingUrl }) } else if (details.reason === 'update') { console.log('[Raft] Updated from version:', details.previousVersion) @@ -1660,27 +1664,27 @@ chrome.runtime.onInstalled.addListener(async (details) => { /** * Handle service worker startup (wake from termination) */ -chrome.runtime.onStartup.addListener(async () => { +browser.runtime.onStartup.addListener(async () => { // Don't call initialize() here - it runs at the bottom of the script await initReady const settings = await settingsStorage.get() if (settings.suspension.hibernateOnStartup) { console.log('[Raft] Hibernate on startup enabled, suspending all tabs') - const allWindows = await chrome.windows.getAll() + const allWindows = await browser.windows.getAll() const windows = allWindows.filter((w) => w.type === 'normal') - const extensionOrigin = chrome.runtime.getURL('') + const extensionOrigin = browser.runtime.getURL('') const hibernateTabIds: number[] = [] for (const win of windows) { if (!win.id) continue - // We need a Raft extension page as the active tab so chrome.tabs.discard() + // We need a Raft extension page as the active tab so browser.tabs.discard() // can suspend the user's previously-active tab. Reuse one if already open. - const winTabs = await chrome.tabs.query({ windowId: win.id }) + const winTabs = await browser.tabs.query({ windowId: win.id }) const raftTab = winTabs.find((t) => t.url?.startsWith(extensionOrigin)) if (raftTab?.id) { - await chrome.tabs.update(raftTab.id, { active: true }) + await browser.tabs.update(raftTab.id, { active: true }) } else { - await chrome.tabs.create({ - url: chrome.runtime.getURL('src/options/index.html#sessions'), + await browser.tabs.create({ + url: browser.runtime.getURL('src/options/index.html#sessions'), active: true, windowId: win.id, }) @@ -1703,7 +1707,7 @@ chrome.runtime.onStartup.addListener(async () => { // Guard catches tabs that couldn't be discarded yet (no main frame), // tabs Chrome's startup loader undiscards, and normal windows that // appear after onStartup (e.g., PWA started Chrome first) - await chrome.storage.session.set({ + await browser.storage.session.set({ [SESSION_KEYS.HIBERNATION_GUARD]: { expiresAt: Date.now() + HIBERNATION_GUARD_DURATION_MS, tabIds: hibernateTabIds, @@ -1716,10 +1720,10 @@ chrome.runtime.onStartup.addListener(async () => { }) // Handle keyboard commands -chrome.commands.onCommand.addListener(async (command) => { +browser.commands.onCommand.addListener(async (command) => { switch (command) { case 'suspend-current-tab': { - const [tab] = await chrome.tabs.query({ active: true, currentWindow: true }) + const [tab] = await browser.tabs.query({ active: true, currentWindow: true }) if (tab?.id) { await suspendTab(tab.id) await updateBadge() @@ -1728,7 +1732,7 @@ chrome.commands.onCommand.addListener(async (command) => { } case 'suspend-other-tabs': { - const window = await chrome.windows.getCurrent() + const window = await browser.windows.getCurrent() await suspendOtherTabs(window.id) await updateBadge() break diff --git a/src/background/recovery.ts b/src/background/recovery.ts index 67cca57..a982bb3 100644 --- a/src/background/recovery.ts +++ b/src/background/recovery.ts @@ -29,6 +29,7 @@ import { import type { RecoverySnapshot, Window, Tab, TabGroup } from '@/shared/types' import { nanoid } from 'nanoid' import { compressToUTF16, decompressFromUTF16 } from 'lz-string' +import { browser } from '@/shared/browser' /** * Check if a URL is protected (should not be included in snapshots) @@ -259,7 +260,7 @@ export const recoverySnapshotSync = { tabCount: snapshot.stats.tabCount, } - await chrome.storage.sync.set(updates) + await browser.storage.sync.set(updates) return true } catch (error) { console.error('[Raft] Failed to sync recovery snapshot:', error) @@ -273,7 +274,7 @@ export const recoverySnapshotSync = { async get(): Promise { try { // First check for chunked format - const metaResult = await chrome.storage.sync.get(SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY) + const metaResult = await browser.storage.sync.get(SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY) const meta = metaResult[SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY] as | { chunkCount: number } | undefined @@ -284,7 +285,7 @@ export const recoverySnapshotSync = { { length: meta.chunkCount }, (_, i) => `${SYNC_CHUNK_CONFIG.CHUNK_PREFIX}${i}` ) - const chunksResult = await chrome.storage.sync.get(chunkKeys) + const chunksResult = await browser.storage.sync.get(chunkKeys) // Reassemble the compressed string let lzCompressed = '' @@ -309,7 +310,7 @@ export const recoverySnapshotSync = { } // Fall back to legacy single-item format for backwards compatibility - const result = await chrome.storage.sync.get(SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT) + const result = await browser.storage.sync.get(SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT) const stored = result[SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT] if (!stored) { @@ -346,7 +347,7 @@ export const recoverySnapshotSync = { async getSize(): Promise { try { // Check for chunked format first - const metaResult = await chrome.storage.sync.get(SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY) + const metaResult = await browser.storage.sync.get(SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY) const meta = metaResult[SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY] as | { chunkCount: number } | undefined @@ -356,7 +357,7 @@ export const recoverySnapshotSync = { { length: meta.chunkCount }, (_, i) => `${SYNC_CHUNK_CONFIG.CHUNK_PREFIX}${i}` ) - const chunksResult = await chrome.storage.sync.get(chunkKeys) + const chunksResult = await browser.storage.sync.get(chunkKeys) const encoder = new TextEncoder() let totalSize = 0 @@ -372,7 +373,7 @@ export const recoverySnapshotSync = { } // Fall back to legacy single-item format - const result = await chrome.storage.sync.get(SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT) + const result = await browser.storage.sync.get(SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT) const stored = result[SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT] if (!stored) return 0 if (typeof stored === 'string') { @@ -389,7 +390,7 @@ export const recoverySnapshotSync = { */ async getMetadata(): Promise<{ timestamp: number; tabCount: number; chunkCount: number } | null> { try { - const metaResult = await chrome.storage.sync.get(SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY) + const metaResult = await browser.storage.sync.get(SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY) const meta = metaResult[SYNC_CHUNK_CONFIG.CHUNK_COUNT_KEY] as | { chunkCount: number; timestamp: number; tabCount: number } | undefined @@ -399,7 +400,7 @@ export const recoverySnapshotSync = { } // Fall back to legacy format - need to load and parse - const result = await chrome.storage.sync.get(SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT) + const result = await browser.storage.sync.get(SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT) const stored = result[SYNC_STORAGE_KEYS.RECOVERY_SNAPSHOT] if (!stored) return null @@ -444,7 +445,7 @@ export const recoverySnapshotSync = { keysToRemove.push(`${SYNC_CHUNK_CONFIG.CHUNK_PREFIX}${i}`) } - await chrome.storage.sync.remove(keysToRemove) + await browser.storage.sync.remove(keysToRemove) } catch (error) { console.error('[Raft] Failed to clear recovery snapshot from sync:', error) } @@ -457,7 +458,7 @@ export const recoverySnapshotSync = { */ export async function captureRecoverySnapshot(): Promise { try { - const chromeWindows = await chrome.windows.getAll({ populate: true }) + const chromeWindows = await browser.windows.getAll({ populate: true }) const now = Date.now() const windows: Window[] = [] @@ -468,7 +469,7 @@ export async function captureRecoverySnapshot(): Promise() const tabGroups: TabGroup[] = chromeGroups.map((group) => { @@ -477,7 +478,7 @@ export async function captureRecoverySnapshot(): Promise 0) { try { - const chromeGroupId = await chrome.tabs.group({ + const chromeGroupId = await browser.tabs.group({ tabIds: groupTabIds as [number, ...number[]], createProperties: { windowId: createdWindow.id }, }) groupIdMap.set(group.id, chromeGroupId) // Update group properties - await chrome.tabGroups.update(chromeGroupId, { + await browser.tabGroups.update(chromeGroupId, { title: group.title, color: group.color, collapsed: group.collapsed, @@ -674,7 +675,7 @@ export async function restoreFromSnapshot( const createdTab = createdTabs.find((ct) => ct.index === tab.index) if (createdTab?.id) { try { - await chrome.tabs.update(createdTab.id, { pinned: true }) + await browser.tabs.update(createdTab.id, { pinned: true }) } catch (err) { console.warn('[Raft] Failed to pin tab:', err) } diff --git a/src/background/sessions.ts b/src/background/sessions.ts index 7ecca48..277b16c 100644 --- a/src/background/sessions.ts +++ b/src/background/sessions.ts @@ -21,6 +21,7 @@ import type { } from '@/shared/types' import { backupSession, removeSessionFromSync } from '@/shared/syncBackup' import { syncEngine, cloudSyncSettingsStorage } from '@/shared/cloudSync' +import { browser } from '@/shared/browser' /** Cached search index: session ID → pre-lowercased searchable string */ let searchIndex: Map | null = null @@ -64,7 +65,7 @@ export async function captureCurrentSession( name?: string, source: SessionSource = 'manual' ): Promise { - const windows = await chrome.windows.getAll({ populate: true }) + const windows = await browser.windows.getAll({ populate: true }) const now = Date.now() const sessionWindows: Window[] = [] @@ -73,7 +74,7 @@ export async function captureCurrentSession( if (!win.id || win.type !== 'normal') continue // Get tab groups for this window - const chromeGroups = await chrome.tabGroups.query({ windowId: win.id }) + const chromeGroups = await browser.tabGroups.query({ windowId: win.id }) const groupIdMap = new Map() const tabGroups: TabGroup[] = chromeGroups.map((group) => { @@ -115,7 +116,7 @@ export async function captureCurrentSession( tabs, tabGroups, focused: win.focused, - state: win.state as chrome.windows.WindowState, + state: win.state as browser.windows.WindowState, }) } @@ -135,11 +136,11 @@ export async function captureCurrentSession( * Capture a single window */ export async function captureWindow(windowId: number, name?: string): Promise { - const win = await chrome.windows.get(windowId, { populate: true }) + const win = await browser.windows.get(windowId, { populate: true }) const now = Date.now() // Get tab groups for this window - const chromeGroups = await chrome.tabGroups.query({ windowId }) + const chromeGroups = await browser.tabGroups.query({ windowId }) const groupIdMap = new Map() const tabGroups: TabGroup[] = chromeGroups.map((group) => { @@ -184,7 +185,7 @@ export async function captureWindow(windowId: number, name?: string): Promise g.id === tab.groupId) if (sessionGroup) { - const newGroupId = await chrome.tabs.group({ + const newGroupId = await browser.tabs.group({ tabIds: newTab.id, createProperties: { windowId: newWindowId }, }) groupIdMap.set(tab.groupId, newGroupId) - await chrome.tabGroups.update(newGroupId, { + await browser.tabGroups.update(newGroupId, { title: sessionGroup.title, color: sessionGroup.color, collapsed: sessionGroup.collapsed, @@ -347,20 +348,20 @@ async function restoreWindows( try { const existingGroupId = groupIdMap.get(firstTab.groupId) if (existingGroupId !== undefined) { - await chrome.tabs.group({ + await browser.tabs.group({ tabIds: firstTabId, groupId: existingGroupId, }) } else { const sessionGroup = sessionWindow.tabGroups.find((g) => g.id === firstTab.groupId) if (sessionGroup) { - const newGroupId = await chrome.tabs.group({ + const newGroupId = await browser.tabs.group({ tabIds: firstTabId, createProperties: { windowId: newWindowId }, }) groupIdMap.set(firstTab.groupId, newGroupId) - await chrome.tabGroups.update(newGroupId, { + await browser.tabGroups.update(newGroupId, { title: sessionGroup.title, color: sessionGroup.color, collapsed: sessionGroup.collapsed, @@ -375,7 +376,7 @@ async function restoreWindows( // Pin the first tab if needed (must be done after grouping) if (firstTabId && firstTab.pinned) { try { - await chrome.tabs.update(firstTabId, { pinned: true }) + await browser.tabs.update(firstTabId, { pinned: true }) } catch (err) { console.warn(`[Raft] Failed to pin first tab "${firstTab.title}":`, err) } @@ -398,7 +399,7 @@ async function restoreWindows( console.warn(`[Raft] Tab ${tabId} navigation did not commit, skipping discard`) return } - await chrome.tabs.discard(tabId) + await browser.tabs.discard(tabId) }) ) for (const r of results) { diff --git a/src/background/suspension.ts b/src/background/suspension.ts index 0ff07da..cd3117b 100644 --- a/src/background/suspension.ts +++ b/src/background/suspension.ts @@ -12,6 +12,7 @@ import { settingsStorage, tabActivityStorage } from '@/shared/storage' import { PROTECTED_URL_PATTERNS } from '@/shared/constants' import type { Settings } from '@/shared/types' +import { browser } from '@/shared/browser' /** * Result of checking if a tab can be suspended @@ -64,7 +65,7 @@ function matchesWhitelist(url: string, whitelist: string[]): boolean { * Check if a tab can be suspended based on protection rules */ export async function canSuspendTab( - tab: chrome.tabs.Tab, + tab: browser.tabs.Tab, settings?: Settings ): Promise { const s = settings ?? (await settingsStorage.get()) @@ -108,7 +109,7 @@ export async function canSuspendTab( */ export async function suspendTab(tabId: number): Promise { try { - const tab = await chrome.tabs.get(tabId) + const tab = await browser.tabs.get(tabId) const check = await canSuspendTab(tab) if (!check.canSuspend) { @@ -116,7 +117,7 @@ export async function suspendTab(tabId: number): Promise { } // Use native discard API - const discardedTab = await chrome.tabs.discard(tabId) + const discardedTab = await browser.tabs.discard(tabId) if (discardedTab?.discarded) { return true @@ -132,8 +133,8 @@ export async function suspendTab(tabId: number): Promise { * Suspend all other tabs in the current window */ export async function suspendOtherTabs(windowId?: number): Promise { - const targetWindowId = windowId ?? (await chrome.windows.getCurrent()).id - const tabs = await chrome.tabs.query({ windowId: targetWindowId }) + const targetWindowId = windowId ?? (await browser.windows.getCurrent()).id + const tabs = await browser.tabs.query({ windowId: targetWindowId }) const settings = await settingsStorage.get() let suspended = 0 @@ -152,12 +153,12 @@ export async function suspendOtherTabs(windowId?: number): Promise { /** * Suspend all non-active tabs across all windows. - * Active tabs are skipped because chrome.tabs.discard() cannot discard the active tab. + * Active tabs are skipped because browser.tabs.discard() cannot discard the active tab. * For startup hibernation (which needs to suspend active tabs too), the onStartup * handler opens a Raft page as the active tab first, then uses suspendOtherTabs(). */ export async function suspendAllTabs(): Promise { - const windows = await chrome.windows.getAll({ populate: true }) + const windows = await browser.windows.getAll({ populate: true }) const settings = await settingsStorage.get() let suspended = 0 @@ -193,7 +194,7 @@ export async function checkForInactiveTabs(): Promise { const cutoff = now - inactivityMs const activity = await tabActivityStorage.getAll() - const tabs = await chrome.tabs.query({}) + const tabs = await browser.tabs.query({}) let suspended = 0 for (const tab of tabs) { @@ -226,9 +227,9 @@ export async function checkForInactiveTabs(): Promise { */ export async function getWindowTabsStatus( windowId?: number -): Promise> { - const targetWindowId = windowId ?? (await chrome.windows.getCurrent()).id - const tabs = await chrome.tabs.query({ windowId: targetWindowId }) +): Promise> { + const targetWindowId = windowId ?? (await browser.windows.getCurrent()).id + const tabs = await browser.tabs.query({ windowId: targetWindowId }) const settings = await settingsStorage.get() const results = [] @@ -252,7 +253,7 @@ export async function getTabCounts(): Promise<{ suspended: number suspendable: number }> { - const tabs = await chrome.tabs.query({}) + const tabs = await browser.tabs.query({}) const settings = await settingsStorage.get() let suspended = 0 @@ -280,14 +281,14 @@ export async function getTabCounts(): Promise<{ * Restore all suspended tabs in a window by reloading them */ export async function restoreAllTabs(windowId?: number): Promise { - const targetWindowId = windowId ?? (await chrome.windows.getCurrent()).id - const tabs = await chrome.tabs.query({ windowId: targetWindowId, discarded: true }) + const targetWindowId = windowId ?? (await browser.windows.getCurrent()).id + const tabs = await browser.tabs.query({ windowId: targetWindowId, discarded: true }) let restored = 0 for (const tab of tabs) { if (tab.id) { try { - await chrome.tabs.reload(tab.id) + await browser.tabs.reload(tab.id) restored++ } catch (error) { console.warn(`[Raft] Failed to reload tab ${tab.id}:`, error) diff --git a/src/onboarding/index.tsx b/src/onboarding/index.tsx index 4f26dc2..78d732f 100644 --- a/src/onboarding/index.tsx +++ b/src/onboarding/index.tsx @@ -9,6 +9,7 @@ import { render } from 'preact' import { Otter } from '@/shared/components/Otter' import { SkipLink } from '@/shared/a11y' import './styles.css' +import { browser } from '@/shared/browser' function FeatureItem({ icon, @@ -38,10 +39,10 @@ function FeatureItem({ function App() { const handleGetStarted = () => { // Mark onboarding as complete - chrome.storage.local.set({ onboardingComplete: true }) + browser.storage.local.set({ onboardingComplete: true }) // Navigate to options page instead of closing immediately // This allows users to reference onboarding info and configure settings - chrome.runtime.openOptionsPage() + browser.runtime.openOptionsPage() } return ( diff --git a/src/options/App.tsx b/src/options/App.tsx index 24cb72b..84ca034 100644 --- a/src/options/App.tsx +++ b/src/options/App.tsx @@ -27,6 +27,7 @@ import { } from '@/shared/utils' import { SkipLink, LiveRegion } from '@/shared/a11y' import { useAnnounce, useFocusTrap, useFocusRestore } from '@/shared/a11y' +import { browser } from '@/shared/browser' type TabType = 'general' | 'sessions' | 'browser-sync' | 'cloud' | 'about' | 'dev' @@ -117,13 +118,13 @@ export function App() { const debouncedSaveSettings = useRef( debounce(async (updated: Settings) => { await settingsStorage.save(updated) - await chrome.runtime.sendMessage({ type: 'UPDATE_SETTINGS', settings: updated }) + await browser.runtime.sendMessage({ type: 'UPDATE_SETTINGS', settings: updated }) success('Settings saved') }, 500) ).current const loadSyncStatus = useCallback(() => { - chrome.runtime + browser.runtime .sendMessage({ type: 'GET_SYNC_STATUS' }) .then((response) => { if (response.success) { @@ -138,8 +139,8 @@ export function App() { const loadCloudSyncedIds = useCallback(() => { Promise.all([ - chrome.runtime.sendMessage({ type: 'CLOUD_GET_SYNCED_IDS' }), - chrome.runtime.sendMessage({ type: 'CLOUD_GET_STATUS' }), + browser.runtime.sendMessage({ type: 'CLOUD_GET_SYNCED_IDS' }), + browser.runtime.sendMessage({ type: 'CLOUD_GET_STATUS' }), ]) .then(([idsResponse, statusResponse]) => { if (idsResponse.success) { @@ -155,7 +156,7 @@ export function App() { }, []) const loadRecoverySnapshots = useCallback(() => { - chrome.runtime + browser.runtime .sendMessage({ type: 'GET_RECOVERY_SNAPSHOTS' }) .then((response) => { if (response.success) { @@ -168,7 +169,7 @@ export function App() { }, []) const loadExportReminderState = useCallback(() => { - chrome.runtime + browser.runtime .sendMessage({ type: 'GET_EXPORT_REMINDER_STATE' }) .then((response) => { if (response.success) { @@ -181,7 +182,7 @@ export function App() { }, []) const dismissExportReminder = useCallback(() => { - chrome.runtime + browser.runtime .sendMessage({ type: 'DISMISS_EXPORT_REMINDER' }) .then(() => { setExportReminderState(null) @@ -193,7 +194,7 @@ export function App() { }, [success, showError]) const markExportComplete = useCallback(() => { - chrome.runtime + browser.runtime .sendMessage({ type: 'MARK_EXPORT_COMPLETE' }) .then(() => { setExportReminderState(null) @@ -220,7 +221,9 @@ export function App() { checkProStatus() // Listen for storage changes to refresh data in real-time - const handleLocalStorageChange = (changes: { [key: string]: chrome.storage.StorageChange }) => { + const handleLocalStorageChange = (changes: { + [key: string]: browser.storage.StorageChange + }) => { if (changes[STORAGE_KEYS.SESSIONS]) { loadSessions() } @@ -243,11 +246,11 @@ export function App() { loadSyncStatus() } - chrome.storage.local.onChanged.addListener(handleLocalStorageChange) - chrome.storage.sync.onChanged.addListener(handleSyncStorageChange) + browser.storage.local.onChanged.addListener(handleLocalStorageChange) + browser.storage.sync.onChanged.addListener(handleSyncStorageChange) return () => { - chrome.storage.local.onChanged.removeListener(handleLocalStorageChange) - chrome.storage.sync.onChanged.removeListener(handleSyncStorageChange) + browser.storage.local.onChanged.removeListener(handleLocalStorageChange) + browser.storage.sync.onChanged.removeListener(handleSyncStorageChange) } }, [ loadSessions, @@ -258,7 +261,7 @@ export function App() { ]) const checkProStatus = () => { - chrome.runtime + browser.runtime .sendMessage({ type: 'PRO_CHECK_STATUS' }) .then((response) => { if (response.success) { @@ -390,7 +393,7 @@ export function App() { const handleRestoreRecoverySnapshot = async (snapshotId: string) => { setRecoveryLoading(true) try { - const response = await chrome.runtime.sendMessage({ + const response = await browser.runtime.sendMessage({ type: 'RESTORE_RECOVERY_SNAPSHOT', snapshotId, }) @@ -410,7 +413,7 @@ export function App() { const handleDeleteRecoverySnapshot = async (snapshotId: string) => { try { - const response = await chrome.runtime.sendMessage({ + const response = await browser.runtime.sendMessage({ type: 'DELETE_RECOVERY_SNAPSHOT', snapshotId, }) @@ -1227,7 +1230,7 @@ export function App() {