GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-28 17:41:54 +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
Download Patch File Download Diff File Expand all files Collapse all files

2
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') { // if (dirName === 'domainset' || dirName === 'ip' || dirName === 'non_ip') {
// return false; // return false;
// } // }
// console.error(picocolors.red(`[build-comman] Unknown dir: ${dirPath}`)); // console.error(picocolors.red(`[build-comman] Unknown dir: ${dirPath}`));
// return true; // return true;
// }) // })
.filter((filepath, isDirectory) => { .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) => { export const buildAlwaysRealIPModule = task(import.meta.main, import.meta.path)(async (span) => {
// Intranet, Router Setup, and mant more // 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 surge = dataset.flatMap(data => data.flatMap(([, { domains }]) => domains.flatMap((domain) => [`*.${domain}`, domain])));
const clash = dataset.flatMap(data => data.flatMap(([, { domains }]) => domains.map((domain) => `+.${domain}`))); const clash = dataset.flatMap(data => data.flatMap(([, { domains }]) => domains.map((domain) => `+.${domain}`)));

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

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