Chore: dedupe URL redirect sgmodule mitm hostnames

This commit is contained in:
SukkaW
2025-12-20 23:53:52 +08:00
parent cd71305d2d
commit d78ea45241

View File

@@ -4,6 +4,7 @@ import { compareAndWriteFile } from './lib/create-file';
import { getHostname } from 'tldts-experimental'; import { getHostname } from 'tldts-experimental';
import { OUTPUT_INTERNAL_DIR, OUTPUT_MODULES_DIR } from './constants/dir'; import { OUTPUT_INTERNAL_DIR, OUTPUT_MODULES_DIR } from './constants/dir';
import { escapeRegexp } from 'fast-escape-regexp'; import { escapeRegexp } from 'fast-escape-regexp';
import { fastStringArrayJoin } from 'foxts/fast-string-array-join';
const REDIRECT_MIRROR_HEADER: Array<[from: string, to: string, canUboUriTransform?: boolean]> = [ const REDIRECT_MIRROR_HEADER: Array<[from: string, to: string, canUboUriTransform?: boolean]> = [
// Gravatar // Gravatar
@@ -143,16 +144,16 @@ const REDIRECT_FAKEWEBSITES: Array<[from: string, to: string]> = [ // all REDIRE
]; ];
export const buildRedirectModule = task(require.main === module, __filename)(async (span) => { export const buildRedirectModule = task(require.main === module, __filename)(async (span) => {
const fullDomains: string[] = []; const fullDomains = new Set<string>();
const minimumDomains: string[] = []; const minimumDomains = new Set<string>();
for (let i = 0, len = REDIRECT_MIRROR_HEADER.length; i < len; i++) { for (let i = 0, len = REDIRECT_MIRROR_HEADER.length; i < len; i++) {
const [from, , canUboUriTransform] = REDIRECT_MIRROR_HEADER[i]; const [from, , canUboUriTransform] = REDIRECT_MIRROR_HEADER[i];
const hostname = getHostname(from, { detectIp: false }); const hostname = getHostname(from, { detectIp: false });
if (hostname) { if (hostname) {
fullDomains.push(hostname); fullDomains.add(hostname);
if (!canUboUriTransform) { if (!canUboUriTransform) {
minimumDomains.push(hostname); minimumDomains.add(hostname);
} }
} }
} }
@@ -160,9 +161,9 @@ export const buildRedirectModule = task(require.main === module, __filename)(asy
const [from, , canUboUriTransform] = REDIRECT_MIRROR_307[i]; const [from, , canUboUriTransform] = REDIRECT_MIRROR_307[i];
const hostname = getHostname(from, { detectIp: false }); const hostname = getHostname(from, { detectIp: false });
if (hostname) { if (hostname) {
fullDomains.push(hostname); fullDomains.add(hostname);
if (!canUboUriTransform) { if (!canUboUriTransform) {
minimumDomains.push(hostname); minimumDomains.add(hostname);
} }
} }
} }
@@ -170,11 +171,8 @@ export const buildRedirectModule = task(require.main === module, __filename)(asy
const [from] = REDIRECT_FAKEWEBSITES[i]; const [from] = REDIRECT_FAKEWEBSITES[i];
const hostname = getHostname(from, { detectIp: false }); const hostname = getHostname(from, { detectIp: false });
if (hostname) { if (hostname) {
fullDomains.push(hostname); fullDomains.add(hostname);
// REDIRECT_FAKEWEBSITES all can be transformed by uBO uritransform // REDIRECT_FAKEWEBSITES all can be transformed by uBO uritransform
// if (!canUboUriTransform) {
// minimumDomains.push(hostname);
// }
} }
} }
@@ -183,10 +181,10 @@ export const buildRedirectModule = task(require.main === module, __filename)(asy
span, span,
[ [
'#!name=[Sukka] URL Redirect', '#!name=[Sukka] URL Redirect',
`#!desc=Last Updated: ${new Date().toISOString()} Size: ${fullDomains.length}`, `#!desc=Last Updated: ${new Date().toISOString()} Size: ${fullDomains.size}`,
'', '',
'[MITM]', '[MITM]',
`hostname = %APPEND% ${fullDomains.join(', ')}`, `hostname = %APPEND% ${fastStringArrayJoin(Array.from(fullDomains), ', ')}`,
'', '',
'[URL Rewrite]', '[URL Rewrite]',
...REDIRECT_MIRROR_HEADER.map(([from, to]) => `^https?://${escapeRegexp(from)}(.*) ${to}$1 header`), ...REDIRECT_MIRROR_HEADER.map(([from, to]) => `^https?://${escapeRegexp(from)}(.*) ${to}$1 header`),
@@ -199,13 +197,13 @@ export const buildRedirectModule = task(require.main === module, __filename)(asy
span, span,
[ [
'#!name=[Sukka] URL Redirect (Minimum)', '#!name=[Sukka] URL Redirect (Minimum)',
`#!desc=Last Updated: ${new Date().toISOString()} Size: ${minimumDomains.length}`, `#!desc=Last Updated: ${new Date().toISOString()} Size: ${minimumDomains.size}`,
'# This module only contains rules that doesn\'t work with/hasn\'t migrated to uBlock Origin\'s "uritransform" filter syntax', '# This module only contains rules that doesn\'t work with/hasn\'t migrated to uBlock Origin\'s "uritransform" filter syntax',
'# uBO/AdGuard filter can be found at https://ruleset.skk.moe/Internal/sukka_ubo_url_redirect_filters.txt', '# uBO/AdGuard filter can be found at https://ruleset.skk.moe/Internal/sukka_ubo_url_redirect_filters.txt',
'# This reduces mitm-hostnames and improves performance, with the tradeoff of uBO/AdGuard filter only cover mostly in browser.', '# This reduces mitm-hostnames and improves performance, with the tradeoff of uBO/AdGuard filter only cover mostly in browser.',
'', '',
'[MITM]', '[MITM]',
`hostname = %APPEND% ${minimumDomains.join(', ')}`, `hostname = %APPEND% ${fastStringArrayJoin(Array.from(minimumDomains), ', ')}`,
'', '',
'[URL Rewrite]', '[URL Rewrite]',
...REDIRECT_MIRROR_HEADER.reduce<string[]>((acc, [from, to, canUboUriTransform]) => { ...REDIRECT_MIRROR_HEADER.reduce<string[]>((acc, [from, to, canUboUriTransform]) => {