fix: validate hostname after applying defaults

unjs · Sep 6, 2023 · e6c1b89 · e6c1b89
1 parent 652ada1
commit e6c1b89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/_utils.ts b/src/_utils.ts
@@ -133,14 +133,11 @@ function detectStackblitzURL(entry?: string) {
 
 const HOSTNAME_RE = /^(?!-)[\d.A-Za-z-]{1,63}(?<!-)$/;
 
-export function validateHostname(
-  hostname: string | undefined,
-  _public: boolean,
-) {
+export function validateHostname(hostname: string, _public: boolean) {
   if (hostname && !HOSTNAME_RE.test(hostname)) {
     const fallbackHost = _public ? "0.0.0.0" : "127.0.0.1";
     consola.warn(
-      `[listhen] Invalid hostname: \`${hostname}\`. Using \`${fallbackHost}\` as fallback.`,
+      `[listhen] Invalid hostname \`${hostname}\`. Using \`${fallbackHost}\` as fallback.`,
     );
     return fallbackHost;
   }

diff --git a/src/listen.ts b/src/listen.ts
@@ -39,17 +39,13 @@ export async function listen(
   // --- Resolve Options ---
   const _isProd = _options.isProd ?? process.env.NODE_ENV === "production";
   const _isTest = _options.isTest ?? process.env.NODE_ENV === "test";
-  const __public =
-    (process.argv.includes("--host") ? true : undefined) ?? _isProd;
-  const _hostname = validateHostname(
-    process.env.HOST ?? _options.hostname,
-    __public,
-  );
+  const _hostname = process.env.HOST ?? _options.hostname;
   const _public =
     _options.public ??
     (isLocalhost(_hostname) ? false : undefined) ??
     (isAnyhost(_hostname) ? true : undefined) ??
-    __public;
+    (process.argv.includes("--host") ? true : undefined) ??
+    _isProd;
 
   const listhenOptions = defu<ListenOptions, ListenOptions[]>(_options, {
     name: "",
@@ -67,6 +63,10 @@ export async function listen(
   });
 
   // --- Validate Options ---
+  listhenOptions.hostname = validateHostname(
+    listhenOptions.hostname,
+    listhenOptions.public,
+  );
   const _localhost = isLocalhost(listhenOptions.hostname);
   const _anyhost = isAnyhost(listhenOptions.hostname);
   if (listhenOptions.public && _localhost) {