@j0hanz/superfetch 2.5.2 → 2.6.0

package/dist/host-normalization.js

@@ -1,21 +1,30 @@
-import { isIP } from 'node:net';
+import { isIP, SocketAddress } from 'node:net';
+import { domainToASCII } from 'node:url';
 export function normalizeHost(value) {
-    const trimmed = value.trim().toLowerCase();
-    if (!trimmed)
+    const trimmedLower = value.trim().toLowerCase();
+    if (!trimmedLower)
         return null;
-    const first = takeFirstHostValue(trimmed);
+    const first = takeFirstHostValue(trimmedLower);
     if (!first)
         return null;
+    const socketAddress = SocketAddress.parse(first);
+    if (socketAddress)
+        return normalizeHostname(socketAddress.address);
+    const parsed = parseHostWithUrl(first);
+    if (parsed)
+        return parsed;
     const ipv6 = stripIpv6Brackets(first);
     if (ipv6)
-        return stripTrailingDots(ipv6);
+        return normalizeHostname(ipv6);
     if (isIpV6Literal(first)) {
-        return stripTrailingDots(first);
+        return normalizeHostname(first);
     }
-    return stripTrailingDots(stripPortIfPresent(first));
+    return normalizeHostname(stripPortIfPresent(first));
 }
 function takeFirstHostValue(value) {
-    const first = value.split(',')[0];
+    // Faster than split(',') for large forwarded headers; preserves behavior.
+    const commaIndex = value.indexOf(',');
+    const first = commaIndex === -1 ? value : value.slice(0, commaIndex);
     if (!first)
         return null;
     const trimmed = first.trim();
@@ -38,10 +47,31 @@ function stripPortIfPresent(value) {
 function isIpV6Literal(value) {
     return isIP(value) === 6;
 }
+function normalizeHostname(value) {
+    const trimmed = value.trim().toLowerCase();
+    if (!trimmed)
+        return null;
+    if (isIP(trimmed))
+        return stripTrailingDots(trimmed);
+    const ascii = domainToASCII(trimmed);
+    return ascii ? stripTrailingDots(ascii) : null;
+}
+function parseHostWithUrl(value) {
+    const candidateUrl = `http://${value}`;
+    if (!URL.canParse(candidateUrl))
+        return null;
+    try {
+        const parsed = new URL(candidateUrl);
+        return normalizeHostname(parsed.hostname);
+    }
+    catch {
+        return null;
+    }
+}
 function stripTrailingDots(value) {
+    // Keep loop (rather than regex) to preserve exact behavior and avoid hidden allocations.
     let result = value;
-    while (result.endsWith('.')) {
+    while (result.endsWith('.'))
         result = result.slice(0, -1);
-    }
     return result;
 }