diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts index 857fd59e..f3e3adbd 100644 --- a/Build/build-reject-domainset.ts +++ b/Build/build-reject-domainset.ts @@ -68,10 +68,10 @@ export const buildRejectDomainSet = task(import.meta.path, async () => { purePhishingDomains.forEach(suffix => domainSets.add(`.${suffix}`)); }), (async () => { - for await (const line of readFileByLine(path.resolve(import.meta.dir, '../Source/domainset/reject_sukka.conf'))) { - const l = processLine(line); - if (l) { - domainSets.add(l); + for await (const l of readFileByLine(path.resolve(import.meta.dir, '../Source/domainset/reject_sukka.conf'))) { + const line = processLine(l); + if (line) { + domainSets.add(line); } } })() diff --git a/Build/lib/parse-filter.ts b/Build/lib/parse-filter.ts index 68e9c621..a7e04778 100644 --- a/Build/lib/parse-filter.ts +++ b/Build/lib/parse-filter.ts @@ -25,7 +25,7 @@ export function processDomainLists(domainListsUrl: string, includeAllSubDomain = if (!domainToAdd) continue; if (DEBUG_DOMAIN_TO_FIND && domainToAdd.includes(DEBUG_DOMAIN_TO_FIND)) { - console.warn(picocolors.red(domainListsUrl), '(black)', picocolors.bold(DEBUG_DOMAIN_TO_FIND)); + console.warn(picocolors.red(domainListsUrl), '(black)', domainToAdd.replaceAll(DEBUG_DOMAIN_TO_FIND, picocolors.bold(DEBUG_DOMAIN_TO_FIND))); foundDebugDomain = true; } @@ -61,7 +61,7 @@ export function processHosts(hostsUrl: string, includeAllSubDomain = false, skip const _domain = domain.trim(); if (DEBUG_DOMAIN_TO_FIND && _domain.includes(DEBUG_DOMAIN_TO_FIND)) { - console.warn(picocolors.red(hostsUrl), '(black)', picocolors.bold(DEBUG_DOMAIN_TO_FIND)); + console.warn(picocolors.red(hostsUrl), '(black)', _domain.replaceAll(DEBUG_DOMAIN_TO_FIND, picocolors.bold(DEBUG_DOMAIN_TO_FIND))); foundDebugDomain = true; } @@ -131,7 +131,7 @@ export async function processFilterRules( flag === ParseType.WhiteIncludeSubdomain || flag === ParseType.WhiteAbsolute ? '(white)' : '(black)', - picocolors.bold(DEBUG_DOMAIN_TO_FIND) + hostname.replaceAll(DEBUG_DOMAIN_TO_FIND, picocolors.bold(DEBUG_DOMAIN_TO_FIND)) ); foundDebugDomain = true; } diff --git a/Source/domainset/download.conf b/Source/domainset/download.conf index 0617113f..c78b1a64 100644 --- a/Source/domainset/download.conf +++ b/Source/domainset/download.conf @@ -198,3 +198,5 @@ DOMAIN-SUFFIX,steamcontent.com DOMAIN-SUFFIX,download.epicgames.com # MikroTik DOMAIN,download.mikrotik.com +# ToDesktop +download.todesktop.com diff --git a/Source/domainset/reject_sukka.conf b/Source/domainset/reject_sukka.conf index 6fa13e31..49e3d41c 100644 --- a/Source/domainset/reject_sukka.conf +++ b/Source/domainset/reject_sukka.conf @@ -785,6 +785,13 @@ mobile.events.data.microsoft.com .vortex.data.msn.com watson.telemetry.microsoft.com +events.data.microsoft.com +v10.events.data.microsoft.com +v20.events.data.microsoft.com +self.events.data.microsoft.com +functional.events.data.microsoft.com +mobile.events.data.microsoft.com + umwatsonc.telemetry.microsoft.com umwatsonc.events.data.microsoft.com vortex-win-sandbox.data.microsoft.com