Browse Source

Update CDN Hosts + Reject Hosts + Reject Rule Parsing

SukkaW 2 years ago
parent
commit
4ce5cb4794
3 changed files with 18 additions and 7 deletions
  1. 11 7
      Build/lib/parse-filter.js
  2. 1 0
      Source/domainset/cdn.conf
  3. 6 0
      Source/domainset/reject_sukka.conf

+ 11 - 7
Build/lib/parse-filter.js

@@ -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 - 0
Source/domainset/cdn.conf

@@ -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 - 0
Source/domainset/reject_sukka.conf

@@ -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