diff --git a/src/modules/processing/url.js b/src/modules/processing/url.js index b0c60798..51883b1b 100644 --- a/src/modules/processing/url.js +++ b/src/modules/processing/url.js @@ -2,7 +2,7 @@ import { services } from "../config.js"; import { strict as assert } from "node:assert"; import psl from "psl"; -export function aliasURL(url) { +function aliasURL(url) { assert(url instanceof URL); const host = psl.parse(url.hostname); @@ -75,7 +75,7 @@ export function aliasURL(url) { return url } -export function cleanURL(url) { +function cleanURL(url) { assert(url instanceof URL); const host = psl.parse(url.hostname).sld; let stripQuery = true; @@ -103,15 +103,7 @@ export function cleanURL(url) { return url } -export function normalizeURL(url) { - return cleanURL( - aliasURL( - new URL(url.replace(/^https\/\//, 'https://')) - ) - ); -} - -export function getHostIfValid(url) { +function getHostIfValid(url) { const host = psl.parse(url.hostname); if (host.error) return; @@ -126,6 +118,13 @@ export function getHostIfValid(url) { return host.sld; } +export function normalizeURL(url) { + return cleanURL( + aliasURL( + new URL(url.replace(/^https\/\//, 'https://')) + ) + ); +} export function extract(url) { const host = getHostIfValid(url);