mirror of
https://github.com/SukkaW/Surge.git
synced 2026-04-29 17:36:56 +08:00
Chore: minor changes
Some checks failed
Build / Build (push) Has been cancelled
Build / Diff output (push) Has been cancelled
Build / Deploy to Cloudflare Pages (3.114.12) (push) Has been cancelled
Build / Deploy to GitHub and GitLab (push) Has been cancelled
Build / Remove Artifacts after Deployment (push) Has been cancelled
Some checks failed
Build / Build (push) Has been cancelled
Build / Diff output (push) Has been cancelled
Build / Deploy to Cloudflare Pages (3.114.12) (push) Has been cancelled
Build / Deploy to GitHub and GitLab (push) Has been cancelled
Build / Remove Artifacts after Deployment (push) Has been cancelled
This commit is contained in:
@@ -269,11 +269,11 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
|
|||||||
});
|
});
|
||||||
|
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
rejectDomainsetOutput.write(),
|
span.traceChildAsync('write reject domainset', () => rejectDomainsetOutput.write()),
|
||||||
rejectExtraDomainsetOutput.write(),
|
span.traceChildAsync('write reject_extra domainset', () => rejectExtraDomainsetOutput.write()),
|
||||||
rejectPhisingDomainsetOutput.write(),
|
span.traceChildAsync('write reject_phishing domainset', () => rejectPhisingDomainsetOutput.write()),
|
||||||
rejectIPOutput.write(),
|
span.traceChildAsync('write reject ip list', () => rejectIPOutput.write()),
|
||||||
rejectNonIpRulesetOutput.write()
|
span.traceChildAsync('write reject non-ip ruleset', () => rejectNonIpRulesetOutput.write())
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// we are going to re-use rejectOutput's domainTrie and mutate it
|
// we are going to re-use rejectOutput's domainTrie and mutate it
|
||||||
|
|||||||
@@ -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(SOURCE_DIR, 'domainset/speedtest.conf')))
|
||||||
.addFromDomainset(readFileIntoProcessedArray(path.resolve(OUTPUT_SURGE_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))
|
.bulkAddDomain(await span.traceChildPromise('get librespeed backends', getLibrespeedBackendsPromise))
|
||||||
.write()
|
.write()
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export async function compareAndWriteFile(span: Span, linesA: string[], filePath
|
|||||||
}
|
}
|
||||||
await new Promise<void>(resolve => {
|
await new Promise<void>(resolve => {
|
||||||
// Since we previously poped the last empty line for comparison, we need to add it back here to ensure final EOF line
|
// 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))();
|
await promisify(writeStream.close.bind(writeStream))();
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user