fix: increase phishing list update interval and remove fuzzy matching

fix: unisat blacklist update

fix: remove unisatblacklist etag

fix

Author: Odyssey98

src/background/service/phishing.ts

@@ -272,51 +272,20 @@ class PhishingService {
       }
 
       // Check permanent whitelist - enhanced check including subdomains
-      // First check the full domain
       if (this.whitelistSet.has(cleanHostname)) {
         return false;
       }
 
       // Then check if it's a subdomain of a whitelisted domain
       const domainParts = cleanHostname.split('.');
       if (domainParts.length > 2) {
-        // Try to match main domain (e.g., mail.google.com -> google.com)
         const mainDomain = domainParts.slice(domainParts.length - 2).join('.');
         if (this.whitelistSet.has(mainDomain)) {
           return false;
         }
       }
 
-      // Check blacklist
-      if (this.blacklistSet.has(cleanHostname)) {
-        // Check domain length - unusually long domains are more likely to be phishing sites
-        if (cleanHostname.length > 30) {
-          return true;
-        }
-
-        // If it's a common short domain, double-check
-        if (cleanHostname.split('.').length <= 2 && cleanHostname.length < 15) {
-          const tld = cleanHostname.split('.').pop();
-          if (['com', 'org', 'net', 'io', 'app', 'dev'].includes(tld || '')) {
-            // Add to temporary whitelist to avoid checking again
-            this.temporaryWhitelist.add(cleanHostname);
-            return false;
-          }
-        }
-
-        return true;
-      }
-
-      // Check fuzzy match patterns (most expensive check last)
-      if (this.config.fuzzylist && this.config.fuzzylist.length > 0) {
-        for (const pattern of this.config.fuzzylist) {
-          if (cleanHostname.includes(pattern)) {
-            return true;
-          }
-        }
-      }
-
-      return false;
+      return this.blacklistSet.has(cleanHostname);
     } catch (error) {
       console.error('[PhishingService] Check error:', error);
       // Default to safe on error

src/background/utils/fetch.ts

@@ -62,24 +62,47 @@ async function fetchWithTimeout(url: string, options: RequestInit = {}, timeoutM
  * @returns Phishing configuration object
  */
 export const fetchPhishingList = async (forceRefresh = false): Promise<any> => {
+  let cachedData: any = null;
+  let useCache = false;
+
   // If not forcing refresh, try to use cache first
   if (!forceRefresh) {
     try {
-      const cachedData = await getFromLocalCache();
+      cachedData = await getFromLocalCache();
       if (cachedData && cachedData.lastFetchTime) {
         const cacheAge = Date.now() - cachedData.lastFetchTime;
 
-        // If cache is fresh enough, use it directly
+        // If cache is fresh enough, use it directly (but still fetch UNISAT)
         if (cacheAge < MIN_CACHE_AGE) {
           console.log('[Phishing] Using recent cache, age:', Math.round(cacheAge / 60000), 'minutes');
-          return cachedData;
+          useCache = true;
         }
       }
     } catch (error) {
       console.error('[Phishing] Cache check failed:', error);
     }
   }
 
+  // If using cache and not forcing refresh, return early for most sources
+  // But always fetch UNISAT source
+  if (useCache && !forceRefresh) {
+    // Create a working copy of cached data for UNISAT updates
+    const mergedData = JSON.parse(JSON.stringify(cachedData));
+
+    // Always fetch UNISAT source
+    try {
+      await fetchAndMergeUnisat(mergedData);
+
+      // Update the cache with the UNISAT updates
+      await saveToLocalCache(mergedData);
+      return mergedData;
+    } catch (error) {
+      console.error('[Phishing] UNISAT source fetch failed, using cache only:', error);
+      return cachedData;
+    }
+  }
+
+  // If not using cache, fetch from all sources
   const fetchOptions: RequestInit = {
     cache: 'no-cache',
     headers: {
@@ -128,16 +151,10 @@ export const fetchPhishingList = async (forceRefresh = false): Promise<any> => {
     console.error('[Phishing] Backup source fetch failed:', error);
   }
 
+  // Always try to fetch UNISAT source
   try {
-    const response = await fetchWithTimeout(PHISHING_SOURCES.UNISAT, fetchOptions);
-
-    if (response.ok) {
-      const data = await response.json();
-      mergePhishingData(mergedData, data);
-      mergedData.sources.push('UNISAT');
-      hasAnySourceSucceeded = true;
-      console.log('[Phishing] Successfully fetched from UNISAT source');
-    }
+    await fetchAndMergeUnisat(mergedData);
+    hasAnySourceSucceeded = true;
   } catch (error) {
     console.error('[Phishing] Unisat source fetch failed:', error);
   }
@@ -150,7 +167,7 @@ export const fetchPhishingList = async (forceRefresh = false): Promise<any> => {
 
   // All remote sources failed, try using cache (regardless of age)
   try {
-    const cachedData = await getFromLocalCache();
+    cachedData = await getFromLocalCache();
     if (cachedData) {
       console.warn('[Phishing] Using cached data as all remote sources failed');
       return cachedData;
@@ -163,6 +180,38 @@ export const fetchPhishingList = async (forceRefresh = false): Promise<any> => {
   throw new Error('Failed to fetch phishing list from all available sources');
 };
 
+/**
+ * Fetches UNISAT phishing list and merges it into target data
+ * This function is separated to allow always fetching UNISAT data
+ * @param targetData The data object to merge UNISAT data into
+ * @returns Promise<boolean> indicating success
+ */
+async function fetchAndMergeUnisat(targetData: any): Promise<boolean> {
+  const fetchOptions: RequestInit = {
+    cache: 'no-cache',
+    headers: {
+      Accept: 'application/json'
+    }
+  };
+
+  const response = await fetchWithTimeout(PHISHING_SOURCES.UNISAT, fetchOptions);
+
+  if (response.ok) {
+    const data = await response.json();
+    mergePhishingData(targetData, data);
+
+    // Only add to sources if not already there
+    if (!targetData.sources.includes('UNISAT')) {
+      targetData.sources.push('UNISAT');
+    }
+
+    console.log('[Phishing] Successfully fetched from UNISAT source');
+    return true;
+  }
+
+  throw new Error('Failed to fetch from UNISAT source');
+}
+
 function mergePhishingData(target: any, source: any): void {
   if (Array.isArray(source.blacklist)) {
     target.blacklist = [...new Set([...target.blacklist, ...source.blacklist])];