GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: also fetch EasyList & EasyPrivacy from fallback server

Browse Source
This commit is contained in:
SukkaW
2022-09-22 22:42:10 +08:00
parent cd785a7ab8
commit d5f0f2428f
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Build/lib/parse-filter.js
View File

@@ -92,9 +92,12 @@ async function processHosts (hostsUrl, includeAllSubDomain = false) {
/**
* @param {string | URL} filterRulesUrl
* @param {(string | URL)[] | undefined} fallbackUrls
* @returns {Promise<{ white: Set<string>, black: Set<string> }>}
*/
async function processFilterRules (filterRulesUrl) {
async function processFilterRules (filterRulesUrl, fallbackUrls) {
console.time(`processFilterRules: ${filterRulesUrl}`);
if (typeof filterRulesUrl === 'string') {
filterRulesUrl = new URL(filterRulesUrl);
}
@@ -105,7 +108,13 @@ async function processFilterRules (filterRulesUrl) {
const blacklistDomainSets = new Set();
/** @type string[] */
const filterRules = (await (await fetchWithRetry(filterRulesUrl)).text()).split('\n').map(line => line.trim());
const filterRules = (
await Promise.any(
[filterRulesUrl, ...(fallbackUrls || [])].map(
async url => (await fetchWithRetry(url)).text()
)
)
).split('\n').map(line => line.trim());
filterRules.forEach(line => {
const lineStartsWithDoubleVerticalBar = line.startsWith('||');
@@ -197,6 +206,8 @@ async function processFilterRules (filterRulesUrl) {
}
});
console.timeEnd(`processFilterRules: ${filterRulesUrl}`);
return {
white: whitelistDomainSets,
black: blacklistDomainSets