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

Refactor: minor changes

Browse Source
This commit is contained in:
SukkaW 2024-06-26 18:39:10 +08:00
parent 098e8815ae
commit b4df4bab00
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/build-common.ts
View File

@ -28,9 +28,7 @@ export const buildCommon = task(import.meta.main, import.meta.path)(async (span)
// if (dirName === 'domainset' || dirName === 'ip' || dirName === 'non_ip') {
// return false;
// }
// console.error(picocolors.red(`[build-comman] Unknown dir: ${dirPath}`));
// console.error(picocolors.red(`[build-comman] Unknown dir: ${dirPath}`));
// return true;
// })
.filter((filepath, isDirectory) => {

2
Build/build-sgmodule-always-realip.ts
View File

@ -44,7 +44,7 @@ const HOSTNAMES = [
export const buildAlwaysRealIPModule = task(import.meta.main, import.meta.path)(async (span) => {
// Intranet, Router Setup, and mant more
const dataset = ([Object.entries(DIRECTS), Object.entries(LANS)]);
const dataset = [Object.entries(DIRECTS), Object.entries(LANS)];
const surge = dataset.flatMap(data => data.flatMap(([, { domains }]) => domains.flatMap((domain) => [`*.${domain}`, domain])));
const clash = dataset.flatMap(data => data.flatMap(([, { domains }]) => domains.map((domain) => `+.${domain}`)));

51
Build/lib/parse-filter.ts
View File

@ -434,28 +434,41 @@ function parse($line: string, gorhill: PublicSuffixList, result: [string, ParseT
let sliceStart = 0;
let sliceEnd: number | undefined;
if (line[2] === '|') { // line.startsWith('@@|')
sliceStart = 3;
whiteIncludeAllSubDomain = false;
switch (line[2]) {
case '|':
// line.startsWith('@@|')
sliceStart = 3;
whiteIncludeAllSubDomain = false;
if (line[3] === '|') { // line.startsWith('@@||')
sliceStart = 4;
if (line[3] === '|') { // line.startsWith('@@||')
sliceStart = 4;
whiteIncludeAllSubDomain = true;
}
break;
case '.': { // line.startsWith('@@.')
sliceStart = 3;
whiteIncludeAllSubDomain = true;
break;
}
} else if (line[2] === '.') { // line.startsWith('@@.')
sliceStart = 3;
whiteIncludeAllSubDomain = true;
} else if (
/**
* line.startsWith('@@://')
*
* `@@://googleadservices.com^|`
* `@@://www.googleadservices.com^|`
*/
line[2] === ':' && line[3] === '/' && line[4] === '/'
) {
whiteIncludeAllSubDomain = false;
sliceStart = 5;
case ':': {
/**
* line.startsWith('@@://')
*
* `@@://googleadservices.com^|`
* `@@://www.googleadservices.com^|`
*/
if (line[3] === '/' && line[4] === '/') {
whiteIncludeAllSubDomain = false;
sliceStart = 5;
}
break;
}
default:
break;
}
if (lineEndsWithCaretOrCaretVerticalBar) {