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

Update CDN Hosts + Reject Hosts + Reject Rule Parsing

Browse Source
This commit is contained in:
SukkaW 2023-08-27 21:57:27 +08:00
parent c148185318
commit 4ce5cb4794
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ async function processDomainLists(domainListsUrl) {
const domainSets = new Set();
for await (const line of await fetchRemoteTextAndCreateReadlineInterface(domainListsUrl)) {
if (line.startsWith('!')) {
if (line[0] === '!') {
continue;
}
@ -114,7 +114,7 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
foundDebugDomain = true;
}
if (isSubDomain && !domainToBeAddedToBlack.startsWith('.')) {
if (isSubDomain && domainToBeAddedToBlack[0] !== '.') {
blacklistDomainSets.add(`.${domainToBeAddedToBlack}`);
} else {
blacklistDomainSets.add(domainToBeAddedToBlack);
@ -158,7 +158,7 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
if (
line === ''
|| line.startsWith('/')
|| line[0] === '/'
|| R_KNOWN_NOT_NETWORK_FILTER_PATTERN.test(line)
// doesn't include
|| !line.includes('.') // rule with out dot can not be a domain
@ -176,13 +176,13 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
// || line.includes('~')
// || line.includes('&')
// || line.includes('%')
|| ((line.includes('/') || line.includes(':')) && !line.includes('://'))
// ends with
|| line.endsWith('.')
|| line.endsWith('-')
|| line.endsWith('_')
// special modifier
|| R_KNOWN_NOT_NETWORK_FILTER_PATTERN_2.test(line)
|| ((line.includes('/') || line.includes(':')) && !line.includes('://'))
// || line.includes('$popup')
// || line.includes('$removeparam')
// || line.includes('$popunder')
@ -244,13 +244,17 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
const lineEndsWithCaret = line.endsWith('^');
const lineEndsWithCaretVerticalBar = line.endsWith('^|');
if (line.startsWith('@@')) {
if (line[0] === '@' && line[1] === '@') {
if (line.endsWith('$cname')) {
continue;
}
if (
(line.startsWith('@@|') || line.startsWith('@@.'))
// (line.startsWith('@@|') || line.startsWith('@@.'))
(
line[2] === '|'
|| line[2] === '.'
)
&& (
lineEndsWithCaret
|| lineEndsWithCaretVerticalBar
@ -358,7 +362,7 @@ async function processFilterRules(filterRulesUrl, fallbackUrls, includeThirdPart
}
continue;
}
if (!line.startsWith('|') && lineEndsWithCaret) {
if (line[0] !== '|' && lineEndsWithCaret) {
const _domain = line.slice(0, -1);
const domain = normalizeDomain(_domain);
if (domain) {

1
Source/domainset/cdn.conf
View File

@ -96,6 +96,7 @@ vscode-sync-insiders.trafficmanager.net
# NPM
registry.npmjs.org
replicate.npmjs.com
static.npmjs.com
static-production.npmjs.com
registry.npmjs.com

6
Source/domainset/reject_sukka.conf
View File

@ -626,6 +626,12 @@ analytics.infomaniak.com
.prtrackings.com
p.cloudcraft.co
upload.qiniup.com
upload-z1.qiniup.com
upload-z2.qiniup.com
upload-na0.qiniup.com
upload-as0.qiniup.com
.adjust.io
.airbrake.io
.apsalar.com