tldts 7.4.27 → 7.4.28

package/dist/cjs/index.js

@@ -229,7 +229,7 @@ function extractHostname(url, urlIsValidHostname, validate = false) {
             start += 2;
         }
         else {
-            const indexOfProtocol = url.indexOf(':/', start);
+            let indexOfProtocol = url.indexOf(':/', start);
             if (indexOfProtocol !== -1) {
                 // "scheme://…". Classify the scheme, then position `start` at the host.
                 const special = getSpecialScheme(url, start, indexOfProtocol);
@@ -272,25 +272,40 @@ function extractHostname(url, urlIsValidHostname, validate = false) {
                                 code === 13 /* CR */) {
                                 return extractHostname(url.replace(CONTROL_CHARS, ''), urlIsValidHostname, validate);
                             }
-                            return null;
+                            // A '/', '\', '?' or '#' first puts this ':/' in a path, query or
+                            // fragment ("a.com/r?u=https://x"): re-read the input without it.
+                            for (let j = i; j < indexOfProtocol; j += 1) {
+                                const c = url.charCodeAt(j);
+                                if (c === 47 || c === 92 || c === 63 || c === 35) {
+                                    indexOfProtocol = -1;
+                                    break;
+                                }
+                            }
+                            if (indexOfProtocol !== -1) {
+                                return null;
+                            }
+                            break;
                         }
                     }
-                    // A non-special scheme has an authority only after "//" (else it is an
-                    // opaque path with no host). `indexOf(':/')` already gave the first '/'.
-                    if (url.charCodeAt(indexOfProtocol + 2) === 47 /* '/' */) {
-                        isSpecial = false;
-                        start = indexOfProtocol + 3;
-                    }
-                    else {
-                        return null;
+                    if (indexOfProtocol !== -1) {
+                        // A non-special scheme has an authority only after "//" (else it is
+                        // an opaque path with no host). `indexOf(':/')` already gave the
+                        // first '/'.
+                        if (url.charCodeAt(indexOfProtocol + 2) === 47 /* '/' */) {
+                            isSpecial = false;
+                            start = indexOfProtocol + 3;
+                        }
+                        else {
+                            return null;
+                        }
                     }
                 }
             }
-            else if (url.charCodeAt(start) !== 91 /* '[' */) {
-                // Cold path: no scheme "://", and not a bare IPv6 literal (whose first
-                // ':' would otherwise look like a scheme separator; "[…]" falls through
-                // to the ipv6 handling below). May be a bare host, a host:port, a
-                // user@host, a slash-less special scheme ("https:host"), or an opaque
+            if (indexOfProtocol === -1 && url.charCodeAt(start) !== 91 /* '[' */) {
+                // Cold path: no "scheme://" prefix, and not a bare IPv6 literal (whose
+                // first ':' would otherwise look like a scheme separator; "[…]" falls
+                // through to the ipv6 handling below). May be a bare host, a host:port,
+                // a user@host, a slash-less special scheme ("https:host"), or an opaque
                 // URI ("mailto:", "tel:", "urn:…").
                 let indexOfColon = -1;
                 for (let i = start; i < end; i += 1) {
@@ -341,7 +356,7 @@ function extractHostname(url, urlIsValidHostname, validate = false) {
                         if (!allDigits) {
                             const special = getSpecialScheme(url, start, indexOfColon);
                             if (special === 0) {
-                                // No "://" anywhere on the cold path and not a special scheme.
+                                // No "scheme://" on the cold path and not a special scheme.
                                 // A second ':' before the host's end marks a bare, unbracketed
                                 // IPv6 literal ("2a01:e35::1"): fall through and let the host
                                 // loop + isIp classify it. Without one this is an opaque path