Update Reject Infra & Data Source

2026-01-28 17:41:54 +08:00 · 2024-09-30 08:05:47 +08:00
parent c158217dda
commit 0d1fddcb81
5 changed files with 98 additions and 69 deletions
--- a/Build/constants/reject-data-source.ts
+++ b/Build/constants/reject-data-source.ts
@@ -3,14 +3,12 @@ import { TTL } from '../lib/cache-filesystem';
 type HostsSource = [main: string, mirrors: string[] | null, includeAllSubDomain: boolean, ttl: number];

 export const HOSTS: HostsSource[] = [
-  // no coin list is not actively maintained, but it updates daily when being maintained, so we set a 3 days cache ttl
-  ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt', null, true, TTL.THREE_DAYS()],
  // have not been updated for more than a year, so we set a 14 days cache ttl
  ['https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt', null, true, TTL.TWO_WEEKS()],
  ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Xiaomi-Extension.txt', null, false, TTL.ONE_WEEK()],
  ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Huawei-AdBlock.txt', null, false, TTL.ONE_WEEK()],
  ['https://raw.githubusercontent.com/durablenapkin/block/master/luminati.txt', null, true, TTL.THREE_HOURS()],
-  ['https://raw.githubusercontent.com/durablenapkin/block/refs/heads/master/tvstream.txt', null, true, TTL.THREE_HOURS()]
+  ['https://raw.githubusercontent.com/durablenapkin/block/master/tvstream.txt', null, true, TTL.THREE_HOURS()]
 ];

 export const HOSTS_EXTRA: HostsSource[] = [
@@ -24,7 +22,7 @@ export const HOSTS_EXTRA: HostsSource[] = [
  // Dan Pollock's hosts file, 0.0.0.0 version is 30 KiB smaller
  ['https://someonewhocares.org/hosts/zero/hosts', null, true, TTL.THREE_HOURS()],
  // ad-wars is not actively maintained, so we set a 7 days cache ttl
-  ['https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts', null, false, TTL.ONE_WEEK()]
+  ['https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts', null, false, TTL.TWO_WEEKS()]
 ];

 export const DOMAIN_LISTS: HostsSource[] = [
@@ -86,9 +84,12 @@ export const PHISHING_DOMAIN_LISTS_EXTRA: HostsSource[] = [
    'https://phishing.army/download/phishing_army_blocklist.txt',
    [],
    true, TTL.THREE_HOURS()
-  ],
+  ]
+];
+
+export const PHISHING_HOSTS_EXTRA: HostsSource[] = [
  [
-    'https://raw.githubusercontent.com/durablenapkin/scamblocklist/refs/heads/master/hosts.txt',
+    'https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/hosts.txt',
    [],
    true, TTL.TWLVE_HOURS()
  ]
@@ -97,14 +98,16 @@ export const PHISHING_DOMAIN_LISTS_EXTRA: HostsSource[] = [
 type AdGuardFilterSource = [main: string, mirrors: string[] | null, ttl: number, allowThirdParty?: boolean];

 export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
+  // no coin list adguard list is more maintained than its hosts
+  ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt', [], TTL.TWO_WEEKS()],
  // EasyList
  [
    'https://easylist.to/easylist/easylist.txt',
    [
-      'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist.txt',
-      'https://ublockorigin.pages.dev/thirdparties/easylist.txt',
      'https://easylist-downloads.adblockplus.org/easylist.txt',
      'https://secure.fanboy.co.nz/easylist.txt',
+      'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist.txt',
+      'https://ublockorigin.pages.dev/thirdparties/easylist.txt',
      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easylist.txt'
    ],
    TTL.TWLVE_HOURS()
@@ -113,11 +116,11 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
  [
    'https://easylist.to/easylist/easyprivacy.txt',
    [
-      'https://secure.fanboy.co.nz/easyprivacy.txt',
-      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt',
      'https://easylist-downloads.adblockplus.org/easyprivacy.txt',
+      'https://secure.fanboy.co.nz/easyprivacy.txt',
      'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easyprivacy.txt',
-      'https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt'
+      'https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt',
+      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt'
    ],
    TTL.TWLVE_HOURS()
  ],
@@ -150,23 +153,46 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
    ],
    TTL.TEN_DAYS()
  ],
-  // Brave First Party & First Party CNAME
-  ['https://raw.githubusercontent.com/brave/adblock-lists/master/brave-lists/brave-firstparty.txt', null, TTL.ONE_DAY()]
+  // uBlock Origin Unbreak
+  [
+    'https://ublockorigin.github.io/uAssetsCDN/filters/unbreak.min.txt',
+    [
+      'https://ublockorigin.pages.dev/filters/unbreak.min.txt'
+    ],
+    TTL.THREE_HOURS()
+  ]
+];
+
+export const ADGUARD_FILTERS_WHITELIST: AdGuardFilterSource[] = [
+  [
+    'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/exceptions.txt',
+    [
+      'https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exceptions.txt'
+    ],
+    TTL.THREE_HOURS()
+  ],
+  [
+    'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/exclusions.txt',
+    [
+      'https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/master/Filters/exclusions.txt'
+    ],
+    TTL.THREE_HOURS()
+  ]
 ];

 export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
  // AdGuard Annoyances filter
-  ['https://filters.adtidy.org/android/filters/14_optimized.txt', null, TTL.THREE_HOURS(), true],
-  // AdGuard Cookie Notices
-  ['https://filters.adtidy.org/extension/ublock/filters/18_optimized.txt', null, TTL.THREE_HOURS(), true],
-  // EasyList Germany filter
-  [
-    'https://easylist.to/easylistgermany/easylistgermany.txt',
-    [
-      'https://easylist-downloads.adblockplus.org/easylistgermany.txt'
-    ],
-    TTL.TWLVE_HOURS()
-  ],
+  ['https://filters.adtidy.org/extension/ublock/filters/14_optimized.txt', null, TTL.THREE_HOURS(), true],
+  // AdGuard Cookie Notices, included in Annoyances filter
+  // ['https://filters.adtidy.org/extension/ublock/filters/18_optimized.txt', null, TTL.THREE_HOURS(), true],
+  // EasyList Germany filter, not even included in extra for now
+  // [
+  //   'https://easylist.to/easylistgermany/easylistgermany.txt',
+  //   [
+  //     'https://easylist-downloads.adblockplus.org/easylistgermany.txt'
+  //   ],
+  //   TTL.TWLVE_HOURS()
+  // ],
  // AdGuard Japanese filter
  ['https://filters.adtidy.org/extension/ublock/filters/7_optimized.txt', null, TTL.THREE_HOURS()],
  // uBlock Origin Filter List
@@ -177,8 +203,8 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
    ],
    TTL.THREE_HOURS()
  ],
-  // AdGuard Popup Overlay
-  ['https://filters.adtidy.org/extension/ublock/filters/19_optimized.txt', null, TTL.THREE_HOURS(), true],
+  // AdGuard Popup Overlay - included in Annoyances filter
+  // ['https://filters.adtidy.org/extension/ublock/filters/19_optimized.txt', null, TTL.THREE_HOURS(), true],
  // AdGuard Mobile Banner
  // almost all generic rule
  // ['https://filters.adtidy.org/extension/ublock/filters/20_optimized.txt', null, TTL.THREE_HOURS()],
@@ -205,14 +231,6 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
  //     'https://ublockorigin.pages.dev/filters/resource-abuse.txt'
  //   ]
  // ],
-  // uBlock Origin Unbreak
-  [
-    'https://ublockorigin.github.io/uAssetsCDN/filters/unbreak.min.txt',
-    [
-      'https://ublockorigin.pages.dev/filters/unbreak.min.txt'
-    ],
-    TTL.THREE_HOURS()
-  ],
  // uBlock Origin Annoyances
  [
    'https://ublockorigin.github.io/uAssetsCDN/filters/annoyances.min.txt',
@@ -229,6 +247,8 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
    ],
    TTL.THREE_HOURS()
  ],
+  // Dandelion Sprout's Annoyances
+  ['https://filters.adtidy.org/extension/ublock/filters/250_optimized.txt', null, TTL.THREE_HOURS(), true],
  // EasyList - Newsletters
  [
    'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-newsletters.txt',
@@ -253,6 +273,12 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
      'https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt'
    ],
    TTL.TWLVE_HOURS()
+  ],
+  // Bypass Paywall Cleaner
+  [
+    'https://gitflic.ru/project/magnolia1234/bypass-paywalls-clean-filters/blob/raw?file=bpc-paywall-filter.txt',
+    [],
+    TTL.ONE_DAY()
  ]
 ];

@@ -269,6 +295,7 @@ export const PREDEFINED_WHITELIST = [
  '.ip6-allhosts',
  '.mcastprefix',
  '.skk.moe',
+  '.cdn.cloudflare.net', // Surge/Clash doesn't support CNAME
  'analytics.google.com',
  '.cloud.answerhub.com',
  'ae01.alicdn.com',