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: minor changes

Browse Source
This commit is contained in:
SukkaW
2025-01-20 17:11:58 +08:00
parent 4417f0a4a1
commit f57a7dde94
3 changed files with 18 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Build/lib/misc.ts
View File

@@ -47,27 +47,6 @@ export const writeFile: Write = async (destination: string, input, dir = dirname
export const removeFiles = async (files: string[]) => Promise.all(files.map((file) => fsp.rm(file, { force: true })));
export function domainWildCardToRegex(domain: string) {
let result = '^';
for (let i = 0, len = domain.length; i < len; i++) {
switch (domain[i]) {
case '.':
result += String.raw`\.`;
break;
case '*':
result += '[a-zA-Z0-9-_.]*?';
break;
case '?':
result += '[a-zA-Z0-9-_.]';
break;
default:
result += domain[i];
}
}
result += '$';
return result;
}
export function withBannerArray(title: string, description: string[] | readonly string[], date: Date, content: string[]) {
return [
'#########################################',

14
Build/lib/parse-filter/filters.ts
View File

@@ -23,7 +23,7 @@ export { type ParseType };
export function processFilterRulesWithPreload(
filterRulesUrl: string,
fallbackUrls?: string[] | null,
allowThirdParty = false
includeThirdParty = false
) {
const downloadPromise = fetchAssets(filterRulesUrl, fallbackUrls);
@@ -40,7 +40,7 @@ export function processFilterRulesWithPreload(
* @param {string} line
*/
const lineCb = (line: string) => {
const result = parse(line, MUTABLE_PARSE_LINE_RESULT, allowThirdParty);
const result = parse(line, MUTABLE_PARSE_LINE_RESULT, includeThirdParty);
const flag = result[1];
if (flag === ParseType.NotParsed) {
@@ -120,7 +120,7 @@ export async function processFilterRules(
parentSpan: Span,
filterRulesUrl: string,
fallbackUrls?: string[] | null,
allowThirdParty = false
includeThirdParty = false
): Promise<{ white: string[], black: string[] }> {
const [white, black, warningMessages] = await parentSpan.traceChild(`process filter rules: ${filterRulesUrl}`).traceAsyncFn(async (span) => {
const text = await span.traceChildAsync('download', () => fetchAssets(filterRulesUrl, fallbackUrls));
@@ -135,7 +135,7 @@ export async function processFilterRules(
* @param {string} line
*/
const lineCb = (line: string) => {
const result = parse(line, MUTABLE_PARSE_LINE_RESULT, allowThirdParty);
const result = parse(line, MUTABLE_PARSE_LINE_RESULT, includeThirdParty);
const flag = result[1];
if (flag === ParseType.NotParsed) {
@@ -246,7 +246,7 @@ const kwfilter = createKeywordFilter([
'^popup'
]);
export function parse($line: string, result: [string, ParseType], allowThirdParty: boolean): [hostname: string, flag: ParseType] {
export function parse($line: string, result: [string, ParseType], includeThirdParty: boolean): [hostname: string, flag: ParseType] {
if (
// doesn't include
!$line.includes('.') // rule with out dot can not be a domain
@@ -354,7 +354,7 @@ export function parse($line: string, result: [string, ParseType], allowThirdPart
return result;
}
if (_3p) {
if (allowThirdParty) {
if (includeThirdParty) {
result[0] = hostname;
result[1] = isIncludeAllSubDomain ? ParseType.BlackIncludeSubdomain : ParseType.BlackAbsolute;
return result;
@@ -474,7 +474,7 @@ export function parse($line: string, result: [string, ParseType], allowThirdPart
* `.1.1.1.l80.js^$third-party`
*/
if (
!allowThirdParty
!includeThirdParty
&& (
line.includes('third-party', indexOfDollar + 1)
|| line.includes('3p', indexOfDollar + 1)