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

Refactor: track download stats and enable HTTP/2

Browse Source
This commit is contained in:
SukkaW 2025-01-11 23:40:04 +08:00
parent 29410eb1c3
commit b0a7a0b682
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/build-reject-ip-list.ts
View File

@ -49,6 +49,8 @@ const getBotNetFilterIPsPromise: Promise<[ipv4: string[], ipv6: string[]]> = fet
return acc; return acc;
}, [[], []])); }, [[], []]));
const readLocalRejectIpListPromise = readFileIntoProcessedArray(path.resolve(SOURCE_DIR, 'ip/reject.conf'));
export const buildRejectIPList = task(require.main === module, __filename)(async (span) => { export const buildRejectIPList = task(require.main === module, __filename)(async (span) => {
const [bogusNxDomainIPs, botNetIPs] = await Promise.all([ const [bogusNxDomainIPs, botNetIPs] = await Promise.all([
span.traceChildPromise('get bogus nxdomain ips', getBogusNxDomainIPsPromise), span.traceChildPromise('get bogus nxdomain ips', getBogusNxDomainIPsPromise),
@ -66,7 +68,7 @@ export const buildRejectIPList = task(require.main === module, __filename)(async
' - https://github.com/felixonmars/dnsmasq-china-list', ' - https://github.com/felixonmars/dnsmasq-china-list',
' - https://github.com/curbengh/botnet-filter' ' - https://github.com/curbengh/botnet-filter'
]) ])
.addFromRuleset(await readFileIntoProcessedArray(path.resolve(SOURCE_DIR, 'ip/reject.conf'))) .addFromRuleset(readLocalRejectIpListPromise)
.bulkAddCIDR4NoResolve(bogusNxDomainIPs[0]) .bulkAddCIDR4NoResolve(bogusNxDomainIPs[0])
.bulkAddCIDR6NoResolve(bogusNxDomainIPs[1]) .bulkAddCIDR6NoResolve(bogusNxDomainIPs[1])
.bulkAddCIDR4NoResolve(botNetIPs[0]) .bulkAddCIDR4NoResolve(botNetIPs[0])

2
Build/lib/fetch-retry.ts
View File

@ -23,7 +23,7 @@ if (!fs.existsSync(CACHE_DIR)) {
fs.mkdirSync(CACHE_DIR, { recursive: true }); fs.mkdirSync(CACHE_DIR, { recursive: true });
} }
const agent = new Agent({}); const agent = new Agent({ allowH2: true });
setGlobalDispatcher(agent.compose( setGlobalDispatcher(agent.compose(
interceptors.retry({ interceptors.retry({

5
Build/lib/parse-filter/domainlists.ts
View File

@ -6,9 +6,8 @@ import { fetchAssetsWithout304 } from '../fetch-assets';
import type { Span } from '../../trace'; import type { Span } from '../../trace';
function domainListLineCb(l: string, set: string[], includeAllSubDomain: boolean, meta: string) { function domainListLineCb(l: string, set: string[], includeAllSubDomain: boolean, meta: string) {
let line = processLine(l); const line = processLine(l);
if (!line) return; if (!line) return;
line = line.toLowerCase();
const domain = normalizeDomain(line); const domain = normalizeDomain(line);
if (!domain) return; if (!domain) return;
@ -33,7 +32,7 @@ export function processDomainLists(
domainListsUrl: string, mirrors: string[] | null, includeAllSubDomain = false domainListsUrl: string, mirrors: string[] | null, includeAllSubDomain = false
) { ) {
return span.traceChildAsync(`process domainlist: ${domainListsUrl}`, async (span) => { return span.traceChildAsync(`process domainlist: ${domainListsUrl}`, async (span) => {
const text = await span.traceChildAsync(`process domainlist: ${domainListsUrl}`, () => fetchAssetsWithout304( const text = await span.traceChildAsync('download', () => fetchAssetsWithout304(
domainListsUrl, domainListsUrl,
mirrors mirrors
)); ));

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

@ -27,7 +27,7 @@ export async function processFilterRules(
allowThirdParty = false allowThirdParty = false
): Promise<{ white: string[], black: string[] }> { ): Promise<{ white: string[], black: string[] }> {
const [white, black, warningMessages] = await parentSpan.traceChild(`process filter rules: ${filterRulesUrl}`).traceAsyncFn(async (span) => { const [white, black, warningMessages] = await parentSpan.traceChild(`process filter rules: ${filterRulesUrl}`).traceAsyncFn(async (span) => {
const text = await fetchAssetsWithout304(filterRulesUrl, fallbackUrls); const text = await span.traceChildAsync('download', () => fetchAssetsWithout304(filterRulesUrl, fallbackUrls));
const whitelistDomainSets = new Set<string>(); const whitelistDomainSets = new Set<string>();
const blacklistDomainSets = new Set<string>(); const blacklistDomainSets = new Set<string>();

13
Build/lib/rules/base.ts
View File

@ -404,15 +404,16 @@ export async function fileEqual(linesA: string[], source: AsyncIterable<string>)
} }
export async function compareAndWriteFile(span: Span, linesA: string[], filePath: string) { export async function compareAndWriteFile(span: Span, linesA: string[], filePath: string) {
let isEqual = true;
const linesALen = linesA.length; const linesALen = linesA.length;
if (fs.existsSync(filePath)) { const isEqual = await span.traceChildAsync(`compare ${filePath}`, async () => {
isEqual = await fileEqual(linesA, readFileByLine(filePath)); if (fs.existsSync(filePath)) {
} else { return fileEqual(linesA, readFileByLine(filePath));
}
console.log(`${filePath} does not exists, writing...`); console.log(`${filePath} does not exists, writing...`);
isEqual = false; return false;
} });
if (isEqual) { if (isEqual) {
console.log(picocolors.gray(picocolors.dim(`same content, bail out writing: ${filePath}`))); console.log(picocolors.gray(picocolors.dim(`same content, bail out writing: ${filePath}`)));