diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts index 6cf17db7..63e8c939 100644 --- a/Build/build-reject-domainset.ts +++ b/Build/build-reject-domainset.ts @@ -20,6 +20,7 @@ import { DomainsetOutput } from './lib/rules/domainset'; import { foundDebugDomain } from './lib/parse-filter/shared'; import { AdGuardHomeOutput } from './lib/rules/domainset'; import { getPhishingDomains } from './lib/get-phishing-domains'; +import type { MaybePromise } from './lib/misc'; const readLocalRejectDomainsetPromise = readFileIntoProcessedArray(path.join(SOURCE_DIR, 'domainset/reject.conf')); const readLocalRejectExtraDomainsetPromise = readFileIntoProcessedArray(path.join(SOURCE_DIR, 'domainset/reject_extra.conf')); @@ -77,8 +78,8 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as ...PHISHING_DOMAIN_LISTS_EXTRA.map(domainList => ` - ${domainList[0]}`) ]); - const appendArrayToRejectOutput = rejectOutput.addFromDomainset.bind(rejectOutput); - const appendArrayToRejectExtraOutput = rejectExtraOutput.addFromDomainset.bind(rejectExtraOutput); + const appendArrayToRejectOutput = (source: MaybePromise | Iterable | string[]>) => rejectOutput.addFromDomainset(source); + const appendArrayToRejectExtraOutput = (source: MaybePromise | Iterable | string[]>) => rejectExtraOutput.addFromDomainset(source); /** Whitelists */ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST); @@ -156,8 +157,8 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as rejectPhisingOutput.whitelistDomain(domain); } - rejectOutput.domainTrie.dump(rejectExtraOutput.whitelistDomain.bind(rejectExtraOutput)); - rejectOutput.domainTrie.dump(rejectPhisingOutput.whitelistDomain.bind(rejectPhisingOutput)); + rejectOutput.domainTrie.dump(arg => rejectExtraOutput.whitelistDomain(arg)); + rejectOutput.domainTrie.dump(arg => rejectPhisingOutput.whitelistDomain(arg)); }); await Promise.all([ diff --git a/Build/lib/rules/base.ts b/Build/lib/rules/base.ts index a6aaaa8b..08bd0add 100644 --- a/Build/lib/rules/base.ts +++ b/Build/lib/rules/base.ts @@ -416,7 +416,7 @@ export class FileOutput { write(): Promise { return this.span.traceChildAsync('write all', async (childSpan) => { await this.done(); - childSpan.traceChildSync('write to strategies', this.writeToStrategies.bind(this)); + childSpan.traceChildSync('write to strategies', () => this.writeToStrategies()); return childSpan.traceChildAsync('output to disk', (childSpan) => { const promises: Array | void> = [];