prehistoric-systems/FMHY-SafeGuard
1
0
Fork 0
mirror of https://github.com/fmhy/FMHY-SafeGuard.git synced 2026-03-11 08:55:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update background.js

Browse source 
Fixed initial pull for filterlists
This commit is contained in:
Kenneth Hendricks 2024-11-10 15:06:49 -05:00 committed by GitHub
parent 2e12992f34
commit af7b96bb58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/js/background.js
View file

@ -109,9 +109,7 @@ async function fetchFilterLists() {
if (potentiallyUnsafeResponse.ok) {
const potentiallyUnsafeText = await potentiallyUnsafeResponse.text();
potentiallyUnsafeSites = extractUrlsFromFilterList(potentiallyUnsafeText);
potentiallyUnsafeSitesRegex = generateRegexFromList(
potentiallyUnsafeSites
);
potentiallyUnsafeSitesRegex = generateRegexFromList(potentiallyUnsafeSites);
}
if (fmhyResponse.ok) {
@ -172,7 +170,7 @@ async function fetchStarredSites() {
}
}
// Fetch all lists based on frequency
// Fetch all lists if needed based on frequency
async function fetchAllLists() {
console.log("Fetching all lists...");
try {
@ -183,27 +181,20 @@ async function fetchAllLists() {
const now = new Date();
const lastFetchDate = lastFetched ? new Date(lastFetched) : null;
const diffHours = lastFetchDate
? (now - lastFetchDate) / (1000 * 60 * 60)
: Infinity;
const diffHours = lastFetchDate ? (now - lastFetchDate) / (1000 * 60 * 60) : Infinity;
const hoursThreshold =
{
daily: 24,
weekly: 168,
monthly: 720,
}[updateFrequency] || 24;
const hoursThreshold = {
daily: 24,
weekly: 168,
monthly: 720,
}[updateFrequency] || 24;
if (diffHours < hoursThreshold) {
console.log("Update frequency threshold not met. Skipping fetch.");
return;
}
await Promise.all([
fetchFilterLists(),
fetchSafeSites(),
fetchStarredSites(),
]);
await Promise.all([fetchFilterLists(), fetchSafeSites(), fetchStarredSites()]);
await browserAPI.storage.local.set({ lastFetched: now.toISOString() });
console.log("All lists fetched and lastFetched timestamp updated.");
} catch (error) {
@ -336,22 +327,17 @@ async function initializeExtension() {
"safeSites",
]);
if (storedData.unsafeSites) {
// Check if any of the filter lists are missing, if so, fetch them initially
if (!storedData.unsafeSites || !storedData.potentiallyUnsafeSites || !storedData.fmhySites || !storedData.safeSites) {
console.log("Filter lists missing in storage. Performing initial fetch.");
await fetchAllLists();
} else {
// Load lists from storage to memory and initialize regex patterns
unsafeSitesRegex = generateRegexFromList(storedData.unsafeSites);
} else {
await fetchFilterLists();
}
if (storedData.safeSites) {
safeSites = storedData.safeSites;
} else {
await fetchSafeSites();
}
if (storedData.fmhySites) {
potentiallyUnsafeSitesRegex = generateRegexFromList(storedData.potentiallyUnsafeSites);
fmhySitesRegex = generateRegexFromList(storedData.fmhySites);
} else {
await fetchFilterLists();
safeSites = storedData.safeSites;
console.log("Loaded filter lists from storage.");
}
await setupUpdateSchedule();