diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts index f9cad52a..90ec340b 100644 --- a/Build/build-reject-domainset.ts +++ b/Build/build-reject-domainset.ts @@ -269,11 +269,11 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as }); await Promise.all([ - rejectDomainsetOutput.write(), - rejectExtraDomainsetOutput.write(), - rejectPhisingDomainsetOutput.write(), - rejectIPOutput.write(), - rejectNonIpRulesetOutput.write() + span.traceChildAsync('write reject domainset', () => rejectDomainsetOutput.write()), + span.traceChildAsync('write reject_extra domainset', () => rejectExtraDomainsetOutput.write()), + span.traceChildAsync('write reject_phishing domainset', () => rejectPhisingDomainsetOutput.write()), + span.traceChildAsync('write reject ip list', () => rejectIPOutput.write()), + span.traceChildAsync('write reject non-ip ruleset', () => rejectNonIpRulesetOutput.write()) ]); // we are going to re-use rejectOutput's domainTrie and mutate it diff --git a/Build/build-speedtest-domainset.ts b/Build/build-speedtest-domainset.ts index 227cae91..1d131641 100644 --- a/Build/build-speedtest-domainset.ts +++ b/Build/build-speedtest-domainset.ts @@ -79,7 +79,7 @@ export const buildSpeedtestDomainSet = task(require.main === module, __filename) ) .addFromDomainset(readFileIntoProcessedArray(path.resolve(SOURCE_DIR, 'domainset/speedtest.conf'))) .addFromDomainset(readFileIntoProcessedArray(path.resolve(OUTPUT_SURGE_DIR, 'domainset/speedtest.conf'))) - .bulkAddDomain(await span.traceChildPromise('get speedtest.test servers', getSpeedtestHostsGroupsPromise)) + .bulkAddDomain(await span.traceChildPromise('get speedtest.net servers', getSpeedtestHostsGroupsPromise)) .bulkAddDomain(await span.traceChildPromise('get librespeed backends', getLibrespeedBackendsPromise)) .write() ); diff --git a/Build/lib/create-file.ts b/Build/lib/create-file.ts index 11aaf06a..0b388efb 100644 --- a/Build/lib/create-file.ts +++ b/Build/lib/create-file.ts @@ -49,7 +49,7 @@ export async function compareAndWriteFile(span: Span, linesA: string[], filePath } await new Promise(resolve => { // Since we previously poped the last empty line for comparison, we need to add it back here to ensure final EOF line - writeStream.end('\n', resolve); + writeStream.end(resolve); }); await promisify(writeStream.close.bind(writeStream))(); });