Housekeeping

2025-12-12 09:10:35 +08:00 · 2025-05-01 00:13:36 +08:00 · 2025-05-01 00:13:36 +08:00 · 331ea5a403
commit 331ea5a403
parent d2acd39ad6
11 changed files with 114 additions and 220 deletions
--- a/Build/build-cdn-download-conf.ts
+++ b/Build/build-cdn-download-conf.ts
@ -3,7 +3,7 @@ import { fetchRemoteTextByLine, readFileIntoProcessedArray } from './lib/fetch-t
 import { HostnameTrie } from './lib/trie';
 import { task } from './trace';
 import { SHARED_DESCRIPTION } from './constants/description';
-import { appendArrayInPlace } from './lib/append-array-in-place';
+import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { SOURCE_DIR } from './constants/dir';
 import { DomainsetOutput } from './lib/rules/domainset';
 import { CRASHLYTICS_WHITELIST } from './constants/reject-data-source';
--- a/Build/build-chn-cidr.ts
+++ b/Build/build-chn-cidr.ts
@ -4,7 +4,7 @@ import { task } from './trace';
 import { contains as containsCidr, exclude as excludeCidr } from 'fast-cidr-tools';
 import { createMemoizedPromise } from './lib/memo-promise';
 import { CN_CIDR_MISSING_IN_CHNROUTE, NON_CN_CIDR_INCLUDED_IN_CHNROUTE } from './constants/cidr';
-import { appendArrayInPlace } from './lib/append-array-in-place';
+import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { IPListOutput } from './lib/rules/ip';
 import { createFileDescription } from './constants/description';

--- a/Build/build-common.ts
+++ b/Build/build-common.ts
@ -7,7 +7,7 @@ import type { Span } from './trace';
 import { task } from './trace';
 import { SHARED_DESCRIPTION } from './constants/description';
 import { fdir as Fdir } from 'fdir';
-import { appendArrayInPlace } from './lib/append-array-in-place';
+import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { SOURCE_DIR } from './constants/dir';
 import { DomainsetOutput } from './lib/rules/domainset';
 import { RulesetOutput } from './lib/rules/ruleset';
--- a/Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts
+++ b/Build/build-domestic-direct-lan-ruleset-dns-mapping-module.ts
@ -9,7 +9,7 @@ import { task } from './trace';
 import { SHARED_DESCRIPTION } from './constants/description';
 import { createMemoizedPromise } from './lib/memo-promise';
 import * as yaml from 'yaml';
-import { appendArrayInPlace } from './lib/append-array-in-place';
+import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { OUTPUT_INTERNAL_DIR, OUTPUT_MODULES_DIR, OUTPUT_MODULES_RULES_DIR, SOURCE_DIR } from './constants/dir';
 import { RulesetOutput } from './lib/rules/ruleset';
 import { SurgeOnlyRulesetOutput } from './lib/rules/ruleset';
--- a/Build/build-internal-reverse-chn-cidr.ts
+++ b/Build/build-internal-reverse-chn-cidr.ts
@ -22,7 +22,7 @@ const pool = new Worktank({
      const { OUTPUT_INTERNAL_DIR } = __require('./constants/dir') as typeof import('./constants/dir');
      const { exclude, merge } = __require('fast-cidr-tools') as typeof import('fast-cidr-tools');
      const { RESERVED_IPV4_CIDR, NON_CN_CIDR_INCLUDED_IN_CHNROUTE } = __require('./constants/cidr') as typeof import('./constants/cidr');
-      const { appendArrayInPlace } = __require('./lib/append-array-in-place') as typeof import('./lib/append-array-in-place');
+      const { appendArrayInPlace } = __require('foxts/append-array-in-place') as typeof import('foxts/append-array-in-place');
      const { fastStringArrayJoin } = __require('foxts/fast-string-array-join') as typeof import('foxts/fast-string-array-join');

      const outputFile = path.join(OUTPUT_INTERNAL_DIR, 'reversed-chn-cidr.txt');
--- a/Build/build-microsoft-cdn.ts
+++ b/Build/build-microsoft-cdn.ts
@ -21,7 +21,7 @@ const pool = new Worktank({
      const { HostnameSmolTrie } = __require('./lib/trie');
      const { PROBE_DOMAINS, DOMAINS, DOMAIN_SUFFIXES, BLACKLIST } = __require('./constants/microsoft-cdn') as typeof import('./constants/microsoft-cdn');
      const { fetchRemoteTextByLine } = __require('./lib/fetch-text-by-line') as typeof import('./lib/fetch-text-by-line');
-      const { appendArrayInPlace } = __require('./lib/append-array-in-place') as typeof import('./lib/append-array-in-place');
+      const { appendArrayInPlace } = __require('foxts/append-array-in-place') as typeof import('foxts/append-array-in-place');
      const { extractDomainsFromFelixDnsmasq } = __require('./lib/parse-dnsmasq') as typeof import('./lib/parse-dnsmasq');

      const trie = new HostnameSmolTrie();
--- a/Build/build-sgmodule-always-realip.ts
+++ b/Build/build-sgmodule-always-realip.ts
@ -6,7 +6,7 @@ import type { DNSMapping } from '../Source/non_ip/direct';
 import { DOMESTICS, DOH_BOOTSTRAP } from '../Source/non_ip/domestic';
 import * as yaml from 'yaml';
 import { OUTPUT_INTERNAL_DIR, OUTPUT_MODULES_DIR } from './constants/dir';
-import { appendArrayInPlace } from './lib/append-array-in-place';
+import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { SHARED_DESCRIPTION } from './constants/description';
 import { createGetDnsMappingRule } from './build-domestic-direct-lan-ruleset-dns-mapping-module';
 import { ClashDomainSet } from './lib/writing-strategy/clash';
--- a/Build/build-sspanel-appprofile.ts
+++ b/Build/build-sspanel-appprofile.ts
@ -10,7 +10,7 @@ import { getTelegramCIDRPromise } from './build-telegram-cidr';
 import { compareAndWriteFile } from './lib/create-file';
 import { getMicrosoftCdnRulesetPromise } from './build-microsoft-cdn';
 import { isTruthy, nullthrow } from 'foxts/guard';
-import { appendArrayInPlace } from './lib/append-array-in-place';
+import { appendArrayInPlace } from 'foxts/append-array-in-place';
 import { OUTPUT_INTERNAL_DIR, OUTPUT_SURGE_DIR, SOURCE_DIR } from './constants/dir';
 import { ClashOnlyRulesetOutput } from './lib/rules/ruleset';

--- a/Build/lib/append-array-in-place.ts
+++ b/Build/lib/append-array-in-place.ts
@ -1,23 +0,0 @@
-const MAX_BLOCK_SIZE = 65535; // max parameter array size for use in Webkit
-
-export function appendArrayInPlace<T>(dest: T[], source: T[]) {
-  let offset = 0;
-  let itemsLeft = source.length;
-
-  if (itemsLeft <= MAX_BLOCK_SIZE) {
-    // eslint-disable-next-line prefer-spread -- performance
-    dest.push.apply(dest, source);
-  } else {
-    while (itemsLeft > 0) {
-      const pushCount = itemsLeft > MAX_BLOCK_SIZE ? MAX_BLOCK_SIZE : itemsLeft;
-      const subSource = source.slice(offset, offset + pushCount);
-      // eslint-disable-next-line prefer-spread -- performance
-      dest.push.apply(dest, subSource);
-      itemsLeft -= pushCount;
-      offset += pushCount;
-    }
-  }
-  return dest;
-}
-
-export const appendArrayInPlaceCurried = <T>(dest: T[]) => (source: T[]) => appendArrayInPlace(dest, source);
--- a/package.json
+++ b/package.json
@ -20,7 +20,7 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "@ghostery/adblocker": "^2.5.1",
+    "@ghostery/adblocker": "^2.5.2",
    "@henrygd/queue": "^1.0.7",
    "@mitata/counters": "^0.0.8",
    "async-retry": "^1.3.3",
@ -31,7 +31,7 @@
    "fast-cidr-tools": "^0.3.2",
    "fast-fifo": "^1.3.2",
    "fdir": "^6.4.4",
-    "foxts": "^3.0.1",
+    "foxts": "^3.1.1",
    "hash-wasm": "^4.12.0",
    "json-stringify-pretty-compact": "3.0.0",
    "picocolors": "^1.1.1",
@ -51,13 +51,13 @@
  "devDependencies": {
    "@eslint-sukka/node": "^6.18.2",
    "@swc-node/register": "^1.10.10",
-    "@swc/core": "^1.11.22",
+    "@swc/core": "^1.11.24",
    "@types/async-retry": "^1.4.9",
    "@types/better-sqlite3": "^7.6.13",
    "@types/dns2": "^2.0.9",
    "@types/fast-fifo": "^1.3.0",
    "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.2",
+    "@types/node": "^22.15.3",
    "@types/punycode": "^2.1.4",
    "@types/tar-fs": "^2.0.4",
    "@types/yauzl-promise": "^4.0.1",
@ -70,7 +70,7 @@
    "tinyexec": "^1.0.1",
    "typescript": "^5.8.3"
  },
-  "packageManager": "pnpm@10.9.0",
+  "packageManager": "pnpm@10.10.0",
  "pnpm": {
    "patchedDependencies": {
      "whoiser": "patches/whoiser.patch"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -17,8 +17,8 @@ importers:
  .:
    dependencies:
      '@ghostery/adblocker':
-        specifier: ^2.5.1
-        version: 2.5.1
+        specifier: ^2.5.2
+        version: 2.5.2
      '@henrygd/queue':
        specifier: ^1.0.7
        version: 1.0.7
@ -50,8 +50,8 @@ importers:
        specifier: ^6.4.4
        version: 6.4.4(picomatch@4.0.2)
      foxts:
-        specifier: ^3.0.1
-        version: 3.0.1
+        specifier: ^3.1.1
+        version: 3.1.1
      hash-wasm:
        specifier: ^4.12.0
        version: 4.12.0
@ -103,10 +103,10 @@ importers:
        version: 6.18.2(eslint@9.25.1)(typescript@5.8.3)
      '@swc-node/register':
        specifier: ^1.10.10
-        version: 1.10.10(@swc/core@1.11.22)(@swc/types@0.1.21)(typescript@5.8.3)
+        version: 1.10.10(@swc/core@1.11.24)(@swc/types@0.1.21)(typescript@5.8.3)
      '@swc/core':
-        specifier: ^1.11.22
-        version: 1.11.22
+        specifier: ^1.11.24
+        version: 1.11.24
      '@types/async-retry':
        specifier: ^1.4.9
        version: 1.4.9
@ -123,8 +123,8 @@ importers:
        specifier: ^10.0.10
        version: 10.0.10
      '@types/node':
-        specifier: ^22.15.2
-        version: 22.15.2
+        specifier: ^22.15.3
+        version: 22.15.3
      '@types/punycode':
        specifier: ^2.1.4
        version: 2.1.4
@ -176,15 +176,9 @@ packages:
  '@dual-bundle/import-meta-resolve@4.1.0':
    resolution: {integrity: sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==}

-  '@emnapi/core@1.3.1':
-    resolution: {integrity: sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==}
-
  '@emnapi/core@1.4.0':
    resolution: {integrity: sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==}

-  '@emnapi/runtime@1.3.1':
-    resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==}
-
  '@emnapi/runtime@1.4.0':
    resolution: {integrity: sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==}

@ -229,10 +223,6 @@ packages:
    resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@eslint/js@9.24.0':
-    resolution: {integrity: sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
  '@eslint/js@9.25.1':
    resolution: {integrity: sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@ -245,14 +235,14 @@ packages:
    resolution: {integrity: sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@ghostery/adblocker-content@2.5.1':
-    resolution: {integrity: sha512-Im0GiRxKdyWWWiIQBBOzA4nHecvPjOvMvT+GqsTHjcVqz+xFC22Jw1BPoniOjVYnOhS/XxtQZOdjm6A2Cbffew==}
+  '@ghostery/adblocker-content@2.5.2':
+    resolution: {integrity: sha512-H3e4QZsom7HqVgIBLaoHriqRh27MyXgwC43ClidOXXbCtKn6h7c3wc9TnQssQpXpcyV7HRPmWjMtADzUc+yYKg==}

-  '@ghostery/adblocker-extended-selectors@2.5.1':
-    resolution: {integrity: sha512-UR9p/uEUmTXyQKkfCKwYesLkqJAGIyeFS2jDzIGgYDRyHGVlxu7Gcl/cdZehikTzBtrGtzc3X69amaUjvUyUJw==}
+  '@ghostery/adblocker-extended-selectors@2.5.2':
+    resolution: {integrity: sha512-Z2MQ4BiPTPG3cI1CFF1cE0IywL1EM2KGnOVkKEx62fnkO0aRyvAeja0jhQvjENtY/hixWLrsSg3MU95Clvq23g==}

-  '@ghostery/adblocker@2.5.1':
-    resolution: {integrity: sha512-/sSSVLwb3ojIFw0owwffsGdCDOeMI02L/nXFIJD2exRAwG8hOETYwCGO7KwSyH2bnVTHtnIQYD1+hfeqQN+I5A==}
+  '@ghostery/adblocker@2.5.2':
+    resolution: {integrity: sha512-/SLxUGPd1JISNGOPsxKfbso+uylDEvEp3umF5gQ3x8YgsEZzD6zYx7H4ZQxAvG1pZIr4p6N9PiAf2N88T1Wo1Q==}

  '@henrygd/queue@1.0.7':
    resolution: {integrity: sha512-Jmt/iO6yDlz9UYGILkm/Qzi/ckkEiTNZcqDvt3QFLE4OThPeiCj6tKsynHFm/ppl8RumWXAx1dZPBPiRPaaGig==}
@ -296,9 +286,6 @@ packages:
  '@mitata/counters@0.0.8':
    resolution: {integrity: sha512-f11w0Y1ETFlarDP7CePj8Z+y8Gv5Ax4gMxWsEwrqh0kH/YIY030Ezx5SUJeQg0YPTZ2OHKGcLG1oGJbIqHzaJA==}

-  '@napi-rs/wasm-runtime@0.2.7':
-    resolution: {integrity: sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==}
-
  '@napi-rs/wasm-runtime@0.2.8':
    resolution: {integrity: sha512-OBlgKdX7gin7OIq4fadsjpg+cp2ZphvAIKucHsNfTdJiqdOmOEwQd/bHi0VwNrcw5xpBJyUw6cK/QilCqy1BSg==}

@ -504,68 +491,68 @@ packages:
  '@swc-node/sourcemap-support@0.5.1':
    resolution: {integrity: sha512-JxIvIo/Hrpv0JCHSyRpetAdQ6lB27oFYhv0PKCNf1g2gUXOjpeR1exrXccRxLMuAV5WAmGFBwRnNOJqN38+qtg==}

-  '@swc/core-darwin-arm64@1.11.22':
-    resolution: {integrity: sha512-upSiFQfo1TE2QM3+KpBcp5SrOdKKjoc+oUoD1mmBDU2Wv4Bjjv16Z2I5ADvIqMV+b87AhYW+4Qu6iVrQD7j96Q==}
+  '@swc/core-darwin-arm64@1.11.24':
+    resolution: {integrity: sha512-dhtVj0PC1APOF4fl5qT2neGjRLgHAAYfiVP8poJelhzhB/318bO+QCFWAiimcDoyMgpCXOhTp757gnoJJrheWA==}
    engines: {node: '>=10'}
    cpu: [arm64]
    os: [darwin]

-  '@swc/core-darwin-x64@1.11.22':
-    resolution: {integrity: sha512-8PEuF/gxIMJVK21DjuCOtzdqstn2DqnxVhpAYfXEtm3WmMqLIOIZBypF/xafAozyaHws4aB/5xmz8/7rPsjavw==}
+  '@swc/core-darwin-x64@1.11.24':
+    resolution: {integrity: sha512-H/3cPs8uxcj2Fe3SoLlofN5JG6Ny5bl8DuZ6Yc2wr7gQFBmyBkbZEz+sPVgsID7IXuz7vTP95kMm1VL74SO5AQ==}
    engines: {node: '>=10'}
    cpu: [x64]
    os: [darwin]

-  '@swc/core-linux-arm-gnueabihf@1.11.22':
-    resolution: {integrity: sha512-NIPTXvqtn9e7oQHgdaxM9Z/anHoXC3Fg4ZAgw5rSGa1OlnKKupt5sdfJamNggSi+eAtyoFcyfkgqHnfe2u63HA==}
+  '@swc/core-linux-arm-gnueabihf@1.11.24':
+    resolution: {integrity: sha512-PHJgWEpCsLo/NGj+A2lXZ2mgGjsr96ULNW3+T3Bj2KTc8XtMUkE8tmY2Da20ItZOvPNC/69KroU7edyo1Flfbw==}
    engines: {node: '>=10'}
    cpu: [arm]
    os: [linux]

-  '@swc/core-linux-arm64-gnu@1.11.22':
-    resolution: {integrity: sha512-xZ+bgS60c5r8kAeYsLNjJJhhQNkXdidQ277pUabSlu5GjR0CkQUPQ+L9hFeHf8DITEqpPBPRiAiiJsWq5eqMBg==}
+  '@swc/core-linux-arm64-gnu@1.11.24':
+    resolution: {integrity: sha512-C2FJb08+n5SD4CYWCTZx1uR88BN41ZieoHvI8A55hfVf2woT8+6ZiBzt74qW2g+ntZ535Jts5VwXAKdu41HpBg==}
    engines: {node: '>=10'}
    cpu: [arm64]
    os: [linux]

-  '@swc/core-linux-arm64-musl@1.11.22':
-    resolution: {integrity: sha512-JhrP/q5VqQl2eJR0xKYIkKTPjgf8CRsAmRnjJA2PtZhfQ543YbYvUqxyXSRyBOxdyX8JwzuAxIPEAlKlT7PPuQ==}
+  '@swc/core-linux-arm64-musl@1.11.24':
+    resolution: {integrity: sha512-ypXLIdszRo0re7PNNaXN0+2lD454G8l9LPK/rbfRXnhLWDBPURxzKlLlU/YGd2zP98wPcVooMmegRSNOKfvErw==}
    engines: {node: '>=10'}
    cpu: [arm64]
    os: [linux]

-  '@swc/core-linux-x64-gnu@1.11.22':
-    resolution: {integrity: sha512-htmAVL+U01gk9GyziVUP0UWYaUQBgrsiP7Ytf6uDffrySyn/FclUS3MDPocNydqYsOpj3OpNKPxkaHK+F+X5fg==}
+  '@swc/core-linux-x64-gnu@1.11.24':
+    resolution: {integrity: sha512-IM7d+STVZD48zxcgo69L0yYptfhaaE9cMZ+9OoMxirNafhKKXwoZuufol1+alEFKc+Wbwp+aUPe/DeWC/Lh3dg==}
    engines: {node: '>=10'}
    cpu: [x64]
    os: [linux]

-  '@swc/core-linux-x64-musl@1.11.22':
-    resolution: {integrity: sha512-PL0VHbduWPX+ANoyOzr58jBiL2VnD0xGSFwPy7NRZ1Pr6SNWm4jw3x2u6RjLArGhS5EcWp64BSk9ZxqmTV3FEg==}
+  '@swc/core-linux-x64-musl@1.11.24':
+    resolution: {integrity: sha512-DZByJaMVzSfjQKKQn3cqSeqwy6lpMaQDQQ4HPlch9FWtDx/dLcpdIhxssqZXcR2rhaQVIaRQsCqwV6orSDGAGw==}
    engines: {node: '>=10'}
    cpu: [x64]
    os: [linux]

-  '@swc/core-win32-arm64-msvc@1.11.22':
-    resolution: {integrity: sha512-moJvFhhTVGoMeEThtdF7hQog80Q00CS06v5uB+32VRuv+I31+4WPRyGlTWHO+oY4rReNcXut/mlDHPH7p0LdFg==}
+  '@swc/core-win32-arm64-msvc@1.11.24':
+    resolution: {integrity: sha512-Q64Ytn23y9aVDKN5iryFi8mRgyHw3/kyjTjT4qFCa8AEb5sGUuSj//AUZ6c0J7hQKMHlg9do5Etvoe61V98/JQ==}
    engines: {node: '>=10'}
    cpu: [arm64]
    os: [win32]

-  '@swc/core-win32-ia32-msvc@1.11.22':
-    resolution: {integrity: sha512-/jnsPJJz89F1aKHIb5ScHkwyzBciz2AjEq2m9tDvQdIdVufdJ4SpEDEN9FqsRNRLcBHjtbLs6bnboA+B+pRFXw==}
+  '@swc/core-win32-ia32-msvc@1.11.24':
+    resolution: {integrity: sha512-9pKLIisE/Hh2vJhGIPvSoTK4uBSPxNVyXHmOrtdDot4E1FUUI74Vi8tFdlwNbaj8/vusVnb8xPXsxF1uB0VgiQ==}
    engines: {node: '>=10'}
    cpu: [ia32]
    os: [win32]

-  '@swc/core-win32-x64-msvc@1.11.22':
-    resolution: {integrity: sha512-lc93Y8Mku7LCFGqIxJ91coXZp2HeoDcFZSHCL90Wttg5xhk5xVM9uUCP+OdQsSsEixLF34h5DbT9ObzP8rAdRw==}
+  '@swc/core-win32-x64-msvc@1.11.24':
+    resolution: {integrity: sha512-sybnXtOsdB+XvzVFlBVGgRHLqp3yRpHK7CrmpuDKszhj/QhmsaZzY/GHSeALlMtLup13M0gqbcQvsTNlAHTg3w==}
    engines: {node: '>=10'}
    cpu: [x64]
    os: [win32]

-  '@swc/core@1.11.22':
-    resolution: {integrity: sha512-mjPYbqq8XjwqSE0hEPT9CzaJDyxql97LgK4iyvYlwVSQhdN1uK0DBG4eP9PxYzCS2MUGAXB34WFLegdUj5HGpg==}
+  '@swc/core@1.11.24':
+    resolution: {integrity: sha512-MaQEIpfcEMzx3VWWopbofKJvaraqmL6HbLlw2bFZ7qYqYw3rkhM0cQVEgyzbHtTWwCwPMFZSC2DUbhlZgrMfLg==}
    engines: {node: '>=10'}
    peerDependencies:
      '@swc/helpers': '>=0.5.17'
@ -615,8 +602,8 @@ packages:
  '@types/mocha@10.0.10':
    resolution: {integrity: sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==}

-  '@types/node@22.15.2':
-    resolution: {integrity: sha512-uKXqKN9beGoMdBfcaTY1ecwz6ctxuJAcUlwE55938g0ZJ8lRxwAZqRz2AJ4pzpt5dHdTPMB863UZ0ESiFUcP7A==}
+  '@types/node@22.15.3':
+    resolution: {integrity: sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==}

  '@types/punycode@2.1.4':
    resolution: {integrity: sha512-trzh6NzBnq8yw5e35f8xe8VTYjqM3NE7bohBtvDVf/dtUer3zYTLK1Ka3DG3p7bdtoaOHZucma6FfVKlQ134pQ==}
@ -657,10 +644,6 @@ packages:
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <5.9.0'

-  '@typescript-eslint/scope-manager@8.29.0':
-    resolution: {integrity: sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
  '@typescript-eslint/scope-manager@8.29.1':
    resolution: {integrity: sha512-2nggXGX5F3YrsGN08pw4XpMLO1Rgtnn4AzTegC2MDesv6q3QaTU5yU7IbS1tf1IwCR0Hv/1EFygLn9ms6LIpDA==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@ -672,33 +655,16 @@ packages:
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <5.9.0'

-  '@typescript-eslint/types@8.29.0':
-    resolution: {integrity: sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
  '@typescript-eslint/types@8.29.1':
    resolution: {integrity: sha512-VT7T1PuJF1hpYC3AGm2rCgJBjHL3nc+A/bhOp9sGMKfi5v0WufsX/sHCFBfNTx2F+zA6qBc/PD0/kLRLjdt8mQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

-  '@typescript-eslint/typescript-estree@8.29.0':
-    resolution: {integrity: sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <5.9.0'
-
  '@typescript-eslint/typescript-estree@8.29.1':
    resolution: {integrity: sha512-l1enRoSaUkQxOQnbi0KPUtqeZkSiFlqrx9/3ns2rEDhGKfTa+88RmXqedC1zmVTOWrLc2e6DEJrTA51C9iLH5g==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      typescript: '>=4.8.4 <5.9.0'

-  '@typescript-eslint/utils@8.29.0':
-    resolution: {integrity: sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <5.9.0'
-
  '@typescript-eslint/utils@8.29.1':
    resolution: {integrity: sha512-QAkFEbytSaB8wnmB+DflhUPz6CLbFWE2SnSCrRMEa+KnXIzDYbpsn++1HGvnfAsUY44doDXmvRkO5shlM/3UfA==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@ -706,10 +672,6 @@ packages:
      eslint: ^8.57.0 || ^9.0.0
      typescript: '>=4.8.4 <5.9.0'

-  '@typescript-eslint/visitor-keys@8.29.0':
-    resolution: {integrity: sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
  '@typescript-eslint/visitor-keys@8.29.1':
    resolution: {integrity: sha512-RGLh5CRaUEf02viP5c1Vh1cMGffQscyHe7HPAzGpfmfflFg1wUz2rYxd+OZqwpeypYvZ8UxSxuIpF++fmOzEcg==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@ -1302,8 +1264,8 @@ packages:
    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
    engines: {node: '>=14'}

-  foxts@3.0.1:
-    resolution: {integrity: sha512-c8t5vWw0VrUZ3QnBarcj542zLqEmbnXswMv5NzmKDy1MXPr8wMS+9BJT3iDZKfrmF3ZF3P30Mi8iDsdHCiEWuA==}
+  foxts@3.1.1:
+    resolution: {integrity: sha512-ZPKa4ZA/daMu+V441qGUSaC3WH3lkumQeHGvMVtxFC1iIehNbwZKFNlk3KXIO/4PnOz0xZpTohKP0Y5cBnULMQ==}

  fs-constants@1.0.0:
    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
@ -1854,9 +1816,15 @@ packages:
  tldts-core@6.1.86:
    resolution: {integrity: sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==}

+  tldts-core@7.0.5:
+    resolution: {integrity: sha512-o+2zicH2+bzj5PHV5M4U8OsRBJDOO0zADiTKZQTGdHSymGQYS21+V/YNrMxAxH9SopzMEXt5JuiRoOIZT5ZU9g==}
+
  tldts-experimental@6.1.86:
    resolution: {integrity: sha512-X3N3+SrwSajvANDyIBFa6tf/nO0VoqaXvvINSnQkZMGbzNlD+9G7Xb24Mtk3ZBVZJRGY7UynAJJL8kRVt6Z46Q==}

+  tldts-experimental@7.0.5:
+    resolution: {integrity: sha512-Ab2t64xKlD2TrYwBeVLDCXCQlTeDZcvbQz8higr/wVS0SJosYmURHErgD2UMqST/5uzEV8VDxMYJnjww+RFvhw==}
+
  tldts@6.1.86:
    resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==}
    hasBin: true
@ -2000,23 +1968,12 @@ snapshots:

  '@dual-bundle/import-meta-resolve@4.1.0': {}

-  '@emnapi/core@1.3.1':
-    dependencies:
-      '@emnapi/wasi-threads': 1.0.1
-      tslib: 2.8.1
-    optional: true
-
  '@emnapi/core@1.4.0':
    dependencies:
      '@emnapi/wasi-threads': 1.0.1
      tslib: 2.8.1
    optional: true

-  '@emnapi/runtime@1.3.1':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
  '@emnapi/runtime@1.4.0':
    dependencies:
      tslib: 2.8.1
@ -2088,8 +2045,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@eslint/js@9.24.0': {}
-
  '@eslint/js@9.25.1': {}

  '@eslint/object-schema@2.1.6': {}
@ -2099,20 +2054,20 @@ snapshots:
      '@eslint/core': 0.13.0
      levn: 0.4.1

-  '@ghostery/adblocker-content@2.5.1':
+  '@ghostery/adblocker-content@2.5.2':
    dependencies:
-      '@ghostery/adblocker-extended-selectors': 2.5.1
+      '@ghostery/adblocker-extended-selectors': 2.5.2

-  '@ghostery/adblocker-extended-selectors@2.5.1': {}
+  '@ghostery/adblocker-extended-selectors@2.5.2': {}

-  '@ghostery/adblocker@2.5.1':
+  '@ghostery/adblocker@2.5.2':
    dependencies:
-      '@ghostery/adblocker-content': 2.5.1
-      '@ghostery/adblocker-extended-selectors': 2.5.1
+      '@ghostery/adblocker-content': 2.5.2
+      '@ghostery/adblocker-extended-selectors': 2.5.2
      '@remusao/guess-url-type': 2.0.0
      '@remusao/small': 2.0.0
      '@remusao/smaz': 2.1.0
-      tldts-experimental: 6.1.86
+      tldts-experimental: 7.0.5

  '@henrygd/queue@1.0.7': {}

@ -2151,19 +2106,12 @@ snapshots:
      '@jest/schemas': 29.6.3
      '@types/istanbul-lib-coverage': 2.0.6
      '@types/istanbul-reports': 3.0.4
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3
      '@types/yargs': 17.0.33
      chalk: 4.1.2

  '@mitata/counters@0.0.8': {}

-  '@napi-rs/wasm-runtime@0.2.7':
-    dependencies:
-      '@emnapi/core': 1.3.1
-      '@emnapi/runtime': 1.3.1
-      '@tybys/wasm-util': 0.9.0
-    optional: true
-
  '@napi-rs/wasm-runtime@0.2.8':
    dependencies:
      '@emnapi/core': 1.4.0
@ -2270,7 +2218,7 @@ snapshots:

  '@oxc-resolver/binding-wasm32-wasi@5.0.0':
    dependencies:
-      '@napi-rs/wasm-runtime': 0.2.7
+      '@napi-rs/wasm-runtime': 0.2.8
    optional: true

  '@oxc-resolver/binding-win32-arm64-msvc@5.0.0':
@ -2305,16 +2253,16 @@ snapshots:

  '@sinclair/typebox@0.27.8': {}

-  '@swc-node/core@1.13.3(@swc/core@1.11.22)(@swc/types@0.1.21)':
+  '@swc-node/core@1.13.3(@swc/core@1.11.24)(@swc/types@0.1.21)':
    dependencies:
-      '@swc/core': 1.11.22
+      '@swc/core': 1.11.24
      '@swc/types': 0.1.21

-  '@swc-node/register@1.10.10(@swc/core@1.11.22)(@swc/types@0.1.21)(typescript@5.8.3)':
+  '@swc-node/register@1.10.10(@swc/core@1.11.24)(@swc/types@0.1.21)(typescript@5.8.3)':
    dependencies:
-      '@swc-node/core': 1.13.3(@swc/core@1.11.22)(@swc/types@0.1.21)
+      '@swc-node/core': 1.13.3(@swc/core@1.11.24)(@swc/types@0.1.21)
      '@swc-node/sourcemap-support': 0.5.1
-      '@swc/core': 1.11.22
+      '@swc/core': 1.11.24
      colorette: 2.0.20
      debug: 4.4.0(supports-color@8.1.1)
      oxc-resolver: 5.0.0
@ -2330,51 +2278,51 @@ snapshots:
      source-map-support: 0.5.21
      tslib: 2.8.1

-  '@swc/core-darwin-arm64@1.11.22':
+  '@swc/core-darwin-arm64@1.11.24':
    optional: true

-  '@swc/core-darwin-x64@1.11.22':
+  '@swc/core-darwin-x64@1.11.24':
    optional: true

-  '@swc/core-linux-arm-gnueabihf@1.11.22':
+  '@swc/core-linux-arm-gnueabihf@1.11.24':
    optional: true

-  '@swc/core-linux-arm64-gnu@1.11.22':
+  '@swc/core-linux-arm64-gnu@1.11.24':
    optional: true

-  '@swc/core-linux-arm64-musl@1.11.22':
+  '@swc/core-linux-arm64-musl@1.11.24':
    optional: true

-  '@swc/core-linux-x64-gnu@1.11.22':
+  '@swc/core-linux-x64-gnu@1.11.24':
    optional: true

-  '@swc/core-linux-x64-musl@1.11.22':
+  '@swc/core-linux-x64-musl@1.11.24':
    optional: true

-  '@swc/core-win32-arm64-msvc@1.11.22':
+  '@swc/core-win32-arm64-msvc@1.11.24':
    optional: true

-  '@swc/core-win32-ia32-msvc@1.11.22':
+  '@swc/core-win32-ia32-msvc@1.11.24':
    optional: true

-  '@swc/core-win32-x64-msvc@1.11.22':
+  '@swc/core-win32-x64-msvc@1.11.24':
    optional: true

-  '@swc/core@1.11.22':
+  '@swc/core@1.11.24':
    dependencies:
      '@swc/counter': 0.1.3
      '@swc/types': 0.1.21
    optionalDependencies:
-      '@swc/core-darwin-arm64': 1.11.22
-      '@swc/core-darwin-x64': 1.11.22
-      '@swc/core-linux-arm-gnueabihf': 1.11.22
-      '@swc/core-linux-arm64-gnu': 1.11.22
-      '@swc/core-linux-arm64-musl': 1.11.22
-      '@swc/core-linux-x64-gnu': 1.11.22
-      '@swc/core-linux-x64-musl': 1.11.22
-      '@swc/core-win32-arm64-msvc': 1.11.22
-      '@swc/core-win32-ia32-msvc': 1.11.22
-      '@swc/core-win32-x64-msvc': 1.11.22
+      '@swc/core-darwin-arm64': 1.11.24
+      '@swc/core-darwin-x64': 1.11.24
+      '@swc/core-linux-arm-gnueabihf': 1.11.24
+      '@swc/core-linux-arm64-gnu': 1.11.24
+      '@swc/core-linux-arm64-musl': 1.11.24
+      '@swc/core-linux-x64-gnu': 1.11.24
+      '@swc/core-linux-x64-musl': 1.11.24
+      '@swc/core-win32-arm64-msvc': 1.11.24
+      '@swc/core-win32-ia32-msvc': 1.11.24
+      '@swc/core-win32-x64-msvc': 1.11.24

  '@swc/counter@0.1.3': {}

@ -2393,11 +2341,11 @@ snapshots:

  '@types/better-sqlite3@7.6.13':
    dependencies:
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3

  '@types/dns2@2.0.9':
    dependencies:
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3

  '@types/doctrine@0.0.9': {}

@ -2419,7 +2367,7 @@ snapshots:

  '@types/mocha@10.0.10': {}

-  '@types/node@22.15.2':
+  '@types/node@22.15.3':
    dependencies:
      undici-types: 6.21.0

@ -2431,12 +2379,12 @@ snapshots:

  '@types/tar-fs@2.0.4':
    dependencies:
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3
      '@types/tar-stream': 3.1.3

  '@types/tar-stream@3.1.3':
    dependencies:
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3

  '@types/yargs-parser@21.0.3': {}

@ -2446,7 +2394,7 @@ snapshots:

  '@types/yauzl-promise@4.0.1':
    dependencies:
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3

  '@typescript-eslint/eslint-plugin@8.29.1(@typescript-eslint/parser@8.29.1(eslint@9.25.1)(typescript@5.8.3))(eslint@9.25.1)(typescript@5.8.3)':
    dependencies:
@ -2477,11 +2425,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/scope-manager@8.29.0':
-    dependencies:
-      '@typescript-eslint/types': 8.29.0
-      '@typescript-eslint/visitor-keys': 8.29.0
-
  '@typescript-eslint/scope-manager@8.29.1':
    dependencies:
      '@typescript-eslint/types': 8.29.1
@ -2498,24 +2441,8 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/types@8.29.0': {}
-
  '@typescript-eslint/types@8.29.1': {}

-  '@typescript-eslint/typescript-estree@8.29.0(typescript@5.8.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.29.0
-      '@typescript-eslint/visitor-keys': 8.29.0
-      debug: 4.4.0(supports-color@8.1.1)
-      fast-glob: 3.3.3
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.7.1
-      ts-api-utils: 2.0.1(typescript@5.8.3)
-      typescript: 5.8.3
-    transitivePeerDependencies:
-      - supports-color
-
  '@typescript-eslint/typescript-estree@8.29.1(typescript@5.8.3)':
    dependencies:
      '@typescript-eslint/types': 8.29.1
@ -2530,17 +2457,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/utils@8.29.0(eslint@9.25.1)(typescript@5.8.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.5.1(eslint@9.25.1)
-      '@typescript-eslint/scope-manager': 8.29.0
-      '@typescript-eslint/types': 8.29.0
-      '@typescript-eslint/typescript-estree': 8.29.0(typescript@5.8.3)
-      eslint: 9.25.1
-      typescript: 5.8.3
-    transitivePeerDependencies:
-      - supports-color
-
  '@typescript-eslint/utils@8.29.1(eslint@9.25.1)(typescript@5.8.3)':
    dependencies:
      '@eslint-community/eslint-utils': 4.5.1(eslint@9.25.1)
@ -2552,11 +2468,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@typescript-eslint/visitor-keys@8.29.0':
-    dependencies:
-      '@typescript-eslint/types': 8.29.0
-      eslint-visitor-keys: 4.2.0
-
  '@typescript-eslint/visitor-keys@8.29.1':
    dependencies:
      '@typescript-eslint/types': 8.29.1
@ -2869,7 +2780,7 @@ snapshots:
    dependencies:
      '@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.25.1)
      '@eslint-sukka/shared': 6.18.2(eslint@9.25.1)(typescript@5.8.3)
-      '@eslint/js': 9.24.0
+      '@eslint/js': 9.25.1
      '@typescript-eslint/parser': 8.29.1(eslint@9.25.1)(typescript@5.8.3)
      ci-info: 4.2.0
      defu: 6.1.4
@ -2883,7 +2794,7 @@ snapshots:
      eslint-plugin-regexp: 2.7.0(eslint@9.25.1)
      eslint-plugin-sukka: 6.18.2(eslint@9.25.1)(typescript@5.8.3)
      eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.29.1(@typescript-eslint/parser@8.29.1(eslint@9.25.1)(typescript@5.8.3))(eslint@9.25.1)(typescript@5.8.3))(eslint@9.25.1)
-      foxts: 3.0.1
+      foxts: 3.1.1
      jsonc-eslint-parser: 2.4.0
      picocolors: 1.1.1
      typescript-eslint: 8.29.1(eslint@9.25.1)(typescript@5.8.3)
@ -2951,7 +2862,7 @@ snapshots:
    dependencies:
      '@pkgr/core': 0.2.1
      '@types/doctrine': 0.0.9
-      '@typescript-eslint/utils': 8.29.0(eslint@9.25.1)(typescript@5.8.3)
+      '@typescript-eslint/utils': 8.29.1(eslint@9.25.1)(typescript@5.8.3)
      debug: 4.4.0(supports-color@8.1.1)
      doctrine: 3.0.0
      eslint: 9.25.1
@ -3019,7 +2930,7 @@ snapshots:
      '@eslint-sukka/shared': 6.18.2(eslint@9.25.1)(typescript@5.8.3)
      '@typescript-eslint/type-utils': 8.29.1(eslint@9.25.1)(typescript@5.8.3)
      '@typescript-eslint/utils': 8.29.1(eslint@9.25.1)(typescript@5.8.3)
-      foxts: 3.0.1
+      foxts: 3.1.1
    optionalDependencies:
      typescript: 5.8.3
    transitivePeerDependencies:
@ -3174,7 +3085,7 @@ snapshots:
      cross-spawn: 7.0.6
      signal-exit: 4.1.0

-  foxts@3.0.1: {}
+  foxts@3.1.1: {}

  fs-constants@1.0.0: {}

@ -3324,7 +3235,7 @@ snapshots:
  jest-util@29.7.0:
    dependencies:
      '@jest/types': 29.6.3
-      '@types/node': 22.15.2
+      '@types/node': 22.15.3
      chalk: 4.1.2
      ci-info: 3.9.0
      graceful-fs: 4.2.11
@ -3735,10 +3646,16 @@ snapshots:

  tldts-core@6.1.86: {}

+  tldts-core@7.0.5: {}
+
  tldts-experimental@6.1.86:
    dependencies:
      tldts-core: 6.1.86

+  tldts-experimental@7.0.5:
+    dependencies:
+      tldts-core: 7.0.5
+
  tldts@6.1.86:
    dependencies:
      tldts-core: 6.1.86
@ -3776,7 +3693,7 @@ snapshots:
  undici-cache-store-better-sqlite3@1.0.0(undici@7.8.0):
    dependencies:
      better-sqlite3: 11.9.1
-      foxts: 3.0.1
+      foxts: 3.1.1
      undici: 7.8.0

  undici-types@6.21.0: {}