Refactor: eliminate duplicated stale-eviction logic and storage error handling

[Copilot]

Two instances of duplicated logic identified in review: stale-entry eviction in trackInitialHost reinvented what cleanupStaleTrackedRequests already does, and the quota/storage error message selection was copy-pasted between addCurrentDomain and clearDomains.

background.js — delegate eviction to cleanupStaleTrackedRequests

Moved cleanupStaleTrackedRequests before trackInitialHost and replaced the inline TTL-check loop with a direct call. Oldest-inserted fallback only runs if the map remains at capacity after cleanup.

// Before: duplicated TTL loop inside trackInitialHost
const staleKeys = [];
for (const [key, entry] of initialHostByRequest) {
  if (now - entry.trackedAt > REQUEST_TRACK_TTL_MS) staleKeys.push(key);
}
if (staleKeys.length > 0) { /* delete each */ } else { /* evict oldest */ }

// After: single delegation
cleanupStaleTrackedRequests(now);
if (initialHostByRequest.size >= MAX_TRACKED_REQUESTS) {
  const evictKey = initialHostByRequest.keys().next().value;
  initialHostByRequest.delete(evictKey);
  redirectedRequestIds.delete(evictKey);
}

popup.js — extract getStorageErrorMessage helper

Encapsulates the quota-vs-generic error message selection. Both addCurrentDomain and clearDomains now call setStatus(getStorageErrorMessage(error), true).

const getStorageErrorMessage = (error) => {
  const errorMessage = typeof error?.message === "string" ? error.message : "";
  return /quota/i.test(errorMessage)
    ? browser.i18n.getMessage("statusQuotaError")
    : browser.i18n.getMessage("statusStorageError");
};

---

⚡ Quickly spin up Copilot coding agent tasks from anywhere on your macOS or Windows machine with Raycast.

[Copilot]

Pull request overview

Refactors the extension to remove duplicated logic in two places: request-tracking eviction in the background script and storage/quota error message selection in the popup UI.

Changes:

• background.js: Centralize TTL stale-entry eviction by delegating trackInitialHost capacity handling to cleanupStaleTrackedRequests.
• popup.js: Extract a getStorageErrorMessage(error) helper and reuse it in both domain-add and clear-list storage write paths.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
background.js	Refactors request tracking to reuse cleanupStaleTrackedRequests for TTL-based eviction before applying oldest-inserted fallback.
popup.js	Introduces getStorageErrorMessage to dedupe quota-vs-generic storage error messaging across UI actions.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.