Update CDN & Global & Reject Hosts

Build/constants/reject-data-source.ts

@@ -141,9 +141,7 @@ export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
   // Not actively maintained, let's consider it is dead
   // [
   //   'https://cdn.jsdelivr.net/gh/Spam404/lists@master/main-blacklist.txt',
-  //   [
+  //   ['https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt'],
-  //     'https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt'
-  //   ],
   //   true
   // ]
 ];
@@ -198,8 +196,8 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
       'https://secure.fanboy.co.nz/easyprivacy.txt',
       'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easyprivacy.txt',
       'https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt',
-      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt',
+      'https://filters.adtidy.org/extension/ublock/filters/118_optimized.txt',
-      'https://filters.adtidy.org/extension/ublock/filters/118_optimized.txt'
+      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt'
     ]
   ],
   // AdGuard Base Filter: Use AdGuard Base Filter w/ EasyList
@@ -229,13 +227,14 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
     ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/GameConsoleAdblockList.txt']
   ],
   // PiHoleBlocklist
-  // Update almost once per 3 months, let's set a 10 days cache ttl
+  // Hasn't been updated for two years. Merged to reject.conf
-  [
+  // [
-    'https://perflyst.github.io/PiHoleBlocklist/SmartTV-AGH.txt',
+  //   'https://cdn.jsdelivr.net/gh/Perflyst/PiHoleBlocklist@master/SmartTV-AGH.txt',
-    [
+  //   [
-      'https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt'
+  //     'https://perflyst.github.io/PiHoleBlocklist/SmartTV-AGH.txt',
-    ]
+  //     'https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt'
-  ],
+  //   ]
+  // ],
   // uBlock Origin Unbreak
   [
     'https://ublockorigin.github.io/uAssetsCDN/filters/unbreak.min.txt',
@@ -548,5 +547,16 @@ export const PREDEFINED_WHITELIST = [
   // Expired domains
   '.expobarrio.com',
   '.hamdandates.com',
-  '.amzone.co.jp'
+  '.amzone.co.jp',
+
+  // Migrate from SmartTV-AGH List
+  'mhc-ajax-eu.myhomescreen.tv',
+  'mhc-ajax-eu-s2.myhomescreen.tv',
+  'mhc-xpana-eu.myhomescreen.tv',
+  'mhc-xpana-eu-s2.myhomescreen.tv',
+  'infolink.pavv.co.kr',
+  'hbbtv.zdf.de',
+  'hbbtv.prosieben.de',
+  'hbbtv.redbutton.de',
+  'hbbtv.kika.de'
 ];

Build/tools-migrate-domains.ts

@@ -1,3 +1,4 @@
+/* eslint-disable unused-imports/no-unused-vars -- some unused methods */
 import path from 'node:path';
 import { processFilterRulesWithPreload } from './lib/parse-filter/filters';
 import { processHosts } from './lib/parse-filter/hosts';
@@ -10,7 +11,8 @@ import runAgainstSourceFile from './lib/run-against-source-file';
 (async () => {
   const trie = new HostnameSmolTrie();
 
-  await writeHostsToTrie(trie, 'https://cdn.jsdelivr.net/gh/jerryn70/GoodbyeAds@master/Extension/GoodbyeAds-Xiaomi-Extension.txt', true);
+  // await writeHostsToTrie(trie, 'https://cdn.jsdelivr.net/gh/jerryn70/GoodbyeAds@master/Extension/GoodbyeAds-Xiaomi-Extension.txt', true);
+  const { whiteDomainSuffixes, whiteDomains } = await writeFiltersToTrie(trie, 'https://cdn.jsdelivr.net/gh/Perflyst/PiHoleBlocklist@master/SmartTV-AGH.txt', true);
 
   const callback = (domain: string, includeAllSubDomain: boolean) => {
     trie.whitelist(domain, includeAllSubDomain);
@@ -26,6 +28,11 @@ import runAgainstSourceFile from './lib/run-against-source-file';
   console.log('---------------------------');
   console.log(trie.dump().join('\n'));
   console.log('---------------------------');
+  console.log('whitelist domain suffixes:');
+  console.log(whiteDomainSuffixes.join('\n'));
+  console.log('---------------------------');
+  console.log('whitelist domains:');
+  console.log(whiteDomains.join('\n'));
 })();
 
 async function writeHostsToTrie(trie: HostnameSmolTrie, hostsUrl: string, includeAllSubDomain = false) {
@@ -36,7 +43,6 @@ async function writeHostsToTrie(trie: HostnameSmolTrie, hostsUrl: string, includ
   }
 }
 
-// eslint-disable-next-line unused-imports/no-unused-vars -- ready to use function
 async function writeFiltersToTrie(trie: HostnameSmolTrie, filterUrl: string, includeThirdParty = false) {
   const { whiteDomainSuffixes, whiteDomains, blackDomainSuffixes, blackDomains } = await processFilterRulesWithPreload(filterUrl, [], includeThirdParty)(dummySpan);
   for (let i = 0, len = blackDomainSuffixes.length; i < len; i++) {
@@ -51,4 +57,6 @@ async function writeFiltersToTrie(trie: HostnameSmolTrie, filterUrl: string, inc
   for (let i = 0, len = whiteDomains.length; i < len; i++) {
     trie.whitelist(whiteDomains[i], false);
   }
+
+  return { whiteDomainSuffixes, whiteDomains };
 }

Source/domainset/cdn.conf

@@ -4505,3 +4505,7 @@ static.planetminecraft.com
 cdn.staticswin.com
 imgfile.shop
 static.gl-inet.com
+assets.redbullshop.com
+img.redbull.com
+rbds-static.redbull.com
+styleguide-assets.shannons.com.au

Source/domainset/reject.conf

@@ -2981,3 +2981,132 @@ ppvabs.pplive.com
 gw.365you.com
 
 .adups.cn
+
+# Migrated from SmartTV-AGH List
+.a1.resources.foxtel.com.au
+.e2.resources.foxtel.com.au
+.managed.xmpp.foxtel.com.au
+.tv-static.scdn.co
+.tracksrv.zdf.de
+.start.digitaltext.rtl.de
+.script.ioam.de
+.ad.71i.de
+.p-hbbtv.superrtl.de
+.redbutton-lb-prod.redbutton.de
+.redbutton-adproxy-lb-prod.redbutton.de
+.hbbtv-track.redbutton.de
+.redbutton.sim-technik.de
+.hbbtv-extern-fe01.sim-technik.de
+.pavv.co.kr
+.i-stream.pl
+.ads.spotx.tv
+.alphonso.tv
+.tvmeta-dynamic.tvinteractive.tv
+.control.tvinteractive.tv
+.control2.tvinteractive.tv
+.mcp.tvinteractive.tv
+.control-zoo-dai-default.tvinteractive.tv
+.hbbtvapp.sonnenklar.tv
+.ravm.tv
+.cloud.arqiva.tv
+.data.arqiva.tv
+.log.internetat.tv
+.game.internetat.tv
+.platform.cid.samba.tv
+.events.cid.samba.tv
+.preferences.cid.samba.tv
+.api.cid.samba.tv
+.flingo.tv
+.myhomescreen.tv
+.foxtel-prod-events.digitalsmiths.net
+.adv.ettoday.net
+.database01p.anixe.net
+.hbbtv01p.anixe.net
+.rwww.samsungotn.net
+.d37ju0xanoz6gh.cloudfront.net
+.d3mjsomixevyw7.cloudfront.net
+.d2tnx644ijgq6i.cloudfront.net
+.d1jwpcr0q4pcq0.cloudfront.net
+.d179kwmlpc4o47.cloudfront.net
+samsungcloudsolution.net
+.cdn.samsungcloudsolution.net
+.az43064.vo.msecnd.net
+.lgad.cjpowercast.com.edgesuite.net
+.facemap.foldlife.net
+.sonybivstatic-a.akamaihd.net
+.bravia.dl.playstation.net
+.smartclip.net
+.androidtvwatsonfe-pa.googleapis.com
+.androidtvchannels-pa.googleapis.com
+.7345023508.fxm9485766783.com
+.7345023508.fxmconnect.com
+.unified-ter-na.hismarttv.com
+.auth-launcher-na.hismarttv.com
+.api-launcher-na.hismarttv.com
+.msg-na.hismarttv.com
+.auth-na.hismarttv.com
+.api-gps-na.hismarttv.com
+.auth-launcher-em.hismarttv.com
+.api-launcher-em.hismarttv.com
+.msg-em.hismarttv.com
+.auth-em.hismarttv.com
+.api-gps-em.hismarttv.com
+.api.distribution.hulu.com
+.customerevents.netflix.com
+.ichnaea.netflix.com
+.trvdp.com
+.nbc-jite.nbcuni.com
+.cert-test.sandbox.google.com
+.hbbtv-1.eurosport.com
+.adgrx.com
+.connecttv.pelmorex.com
+samsungqbe.com
+.osb-apps-v2.samsungqbe.com
+.samsungelectronics.com
+.samsungadhub.com
+.samsungacr.com
+.premium-videos.telly.com
+.pipeaota.com
+.sca.samsung.com
+.openapi.samsung.com
+.gld.samsungosp.com
+.mads-eu.amazon.com
+.devicemessaging.us-east-1.amazon.com
+.mobileanalytics.us-east-1.amazonaws.com
+.vd.contents.prod.eu.s3.amazonaws.com
+.vd.emp.prd.s3.amazonaws.com
+.syncplusconfig.s3.amazonaws.com
+.coordinator-production-28516768.us-east-1.elb.amazonaws.com
+.us-api.samsungyosemite.com
+.api-hub.samsungyosemite.com
+.samsungads.com
+samsungcloudsolution.com
+.gamespromotion.samsungcloudsolution.com
+.vdterms.samsungcloudsolution.com
+.sas.samsungcloudsolution.com
+.prov.samsungcloudsolution.com
+.prderrordumphsm.samsungcloudsolution.com
+.noticefile.samsungcloudsolution.com
+.noticecdn.samsungcloudsolution.com
+.notice.samsungcloudsolution.com
+.musicid.samsungcloudsolution.com
+.amauthprd.samsungcloudsolution.com
+.abtauthprd.samsungcloudsolution.com
+.nettv.corio.com
+.ad.nettvservices.com
+.legacyportal.nettvservices.com
+.aic-ngfts.lge.com
+.lgtvcommon.com
+lgtvsdp.com
+.yumenetworks.com
+.ibs.lgappstv.com
+.ibis.lgappstv.com
+.ad.lgappstv.com
+.call.me.sel.sony.com
+.bravia-cfgdst-ore-pro.bda.ndmdhs.com
+.tvsideviewandroidv2-cfgdst-ore-pro.bda.ndmdhs.com
+.bdcore-apr-lb.bda.ndmdhs.com
+.b02.black.ndmdhs.com
+.api-mf1.meta.ndmdhs.com
+.vindicosuite.com
+.smartclip.com

Source/non_ip/global.conf

@@ -1088,6 +1088,8 @@ DOMAIN-SUFFIX,rawgit.com
 DOMAIN-SUFFIX,readme.com
 DOMAIN-SUFFIX,readthedocs.io
 DOMAIN-SUFFIX,recombee.com
+DOMAIN-SUFFIX,redbull.com
+DOMAIN-SUFFIX,redbullracing.com
 DOMAIN-SUFFIX,redhat.org
 DOMAIN-SUFFIX,redtube.com
 DOMAIN-SUFFIX,redtubepremium.com