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 
Normalizes links and added support for www or no www
This commit is contained in:
Kenneth Hendricks 2024-10-17 16:15:24 -04:00 committed by GitHub
parent efa20945a7
commit 448f429c7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
js/background.js
View file

@ -1,4 +1,3 @@
// Updated URLs for filter lists, safe sites, and starred sites
const filterListURLUnsafe =
"https://raw.githubusercontent.com/fmhy/FMHYFilterlist/refs/heads/main/sitelist.txt";
const filterListURLPotentiallyUnsafe =
@ -29,6 +28,11 @@ function extractUrlsFromBookmarks(html) {
return urls;
}
// Helper function to normalize URLs (removes trailing slashes and "www.")
function normalizeUrl(url) {
return url.replace(/\/+$/, "").replace(/^https?:\/\/www\./, "https://"); // Remove trailing slash if exists and "www." if present
}
// Fetch the unsafe and potentially unsafe filter lists
async function fetchFilterLists() {
console.log("Fetching filter lists...");
@ -69,7 +73,7 @@ async function fetchSafeSites() {
const markdown = await response.text();
const urls = extractUrlsFromMarkdown(markdown);
urls.forEach((siteUrl) => {
let fullUrl = siteUrl.trim();
let fullUrl = normalizeUrl(siteUrl.trim());
if (!safeSites.includes(fullUrl)) {
safeSites.push(fullUrl);
}
@ -90,22 +94,13 @@ async function fetchStarredSites() {
const html = await response.text();
const urls = extractUrlsFromBookmarks(html);
// Ensure we retain previously added starred sites (like fmhy.net)
const predefinedStarredSites = ["https://fmhy.net"]; // Predefined starred sites
// Normalize and add URLs to the starredSites array
starredSites = [...new Set(urls.map(normalizeUrl))];
urls.forEach((siteUrl) => {
let fullUrl = siteUrl.trim();
if (!starredSites.includes(fullUrl)) {
starredSites.push(fullUrl);
}
});
// Ensure fmhy.net stays in the starred list after fetching
predefinedStarredSites.forEach((site) => {
if (!starredSites.includes(site)) {
starredSites.push(site); // Add fmhy.net if not present
}
});
// Ensure fmhy.net, librechat.ai, and other important sites are always in the starred list
if (!starredSites.includes("https://fmhy.net")) {
starredSites.push("https://fmhy.net");
}
console.log("Parsed Starred Sites:", starredSites);
}
@ -138,15 +133,24 @@ function updateIcon(status, tabId) {
function checkSiteAndUpdateIcon(tabId, url) {
if (!url) return;
const currentUrl = url.trim();
console.log("Checking site status for toolbar icon:", currentUrl);
const currentUrl = normalizeUrl(url.trim());
console.log(
"Checking site status for toolbar icon:",
currentUrl,
"TabId:",
tabId
);
// Check if the site is starred, safe, unsafe, or potentially unsafe
let isStarred = starredSites.some((site) => currentUrl.includes(site));
let isSafe = safeSites.some((site) => currentUrl === site);
let isUnsafe = unsafeSites.some((site) => currentUrl.includes(site));
let isStarred = starredSites.some(
(site) => normalizeUrl(site) === currentUrl
);
let isSafe = safeSites.some((site) => normalizeUrl(site) === currentUrl);
let isUnsafe = unsafeSites.some((site) =>
currentUrl.includes(normalizeUrl(site))
);
let isPotentiallyUnsafe = potentiallyUnsafeSites.some((site) =>
currentUrl.includes(site)
currentUrl.includes(normalizeUrl(site))
);
// Prioritize starred sites first, then safe sites
@ -170,15 +174,18 @@ function checkSiteAndUpdateIcon(tabId, url) {
// Listen for messages from the popup
browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
console.log("Received message in background for site:", message.url);
if (message.action === "checkSiteStatus") {
const currentUrl = message.url.trim();
console.log("Checking site status for popup:", currentUrl);
let isStarred = starredSites.some((site) => currentUrl === site);
let isSafe = safeSites.some((site) => currentUrl === site);
let isUnsafe = unsafeSites.some((site) => currentUrl.includes(site));
const currentUrl = normalizeUrl(message.url.trim());
let isStarred = starredSites.some(
(site) => normalizeUrl(site) === currentUrl
);
let isSafe = safeSites.some((site) => normalizeUrl(site) === currentUrl);
let isUnsafe = unsafeSites.some((site) =>
currentUrl.includes(normalizeUrl(site))
);
let isPotentiallyUnsafe = potentiallyUnsafeSites.some((site) =>
currentUrl.includes(site)
currentUrl.includes(normalizeUrl(site))
);
if (isStarred) {
@ -190,7 +197,6 @@ browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
} else if (isPotentiallyUnsafe) {
sendResponse({ status: "potentially_unsafe", url: currentUrl });
} else {
console.log("No data for this site:", currentUrl);
sendResponse({ status: "no_data", url: currentUrl });
}
}