vite-plugin-caddy-multiple-tls 1.2.0 → 1.3.0

package/README.md

@@ -115,7 +115,7 @@ api.app.localhost
 > - `nip.io`: dynamic parsing of the IP in the hostname (e.g. `app.192.168.1.50.nip.io`) so you can target LAN devices.
 > Why use them: subdomains behave like real domains, no `/etc/hosts` edits, and closer parity for cookies/CORS rules.
 >
-> When using loopback domains, ensure your Vite config allows the Host header, e.g. `server: { allowedHosts: true }`.
+> When using loopback domains, ensure your Vite config allows the Host header and binds to all interfaces, e.g. `server: { allowedHosts: true, host: true }`.
 >
 > For a permanent fix that handles all `*.localhost` domains automatically, install dnsmasq:
 > ```bash

package/dist/index.js

@@ -366,206 +366,240 @@ function viteCaddyTlsPlugin({
   serverName,
   internalTls
 } = {}) {
-  return {
-    name: "vite:caddy-tls",
-    configureServer(server) {
-      const { httpServer, config } = server;
-      const fallbackPort = config.server.port || 5173;
-      const resolvedDomain = resolveDomain({
-        domain,
-        baseDomain,
-        loopbackDomain,
-        repo,
-        branch
-      });
-      const domainArray = resolvedDomain ? [resolvedDomain] : [];
-      const routeId = `vite-proxy-${Date.now()}-${Math.floor(Math.random() * 1e3)}`;
-      const shouldUseInternalTls = internalTls ?? (baseDomain !== void 0 || loopbackDomain !== void 0 || domain !== void 0);
-      const tlsPolicyId = shouldUseInternalTls ? `${routeId}-tls` : null;
-      let cleanupStarted = false;
-      let resolvedPort = null;
-      let resolvedHost = null;
-      let setupStarted = false;
-      if (domainArray.length === 0) {
-        console.error(
-          "No domain resolved. Provide domain, or run inside a git repo, or pass repo/branch."
-        );
-        return;
+  function isPreviewServer(server) {
+    return server.config.isProduction;
+  }
+  function getPreviewPort(config) {
+    if (typeof config.preview?.port === "number") {
+      return config.preview.port;
+    }
+    return null;
+  }
+  function getPreviewHost(config) {
+    if (config.preview && "host" in config.preview) {
+      return resolveUpstreamHost(config.preview.host);
+    }
+    return null;
+  }
+  function hasListen(server) {
+    return !!server && typeof server === "object" && "listen" in server && typeof server.listen === "function";
+  }
+  function setupServer(server) {
+    const { httpServer, config } = server;
+    const previewMode = isPreviewServer(server);
+    const fallbackPort = previewMode ? getPreviewPort(config) ?? 4173 : config.server.port || 5173;
+    const resolvedDomain = resolveDomain({
+      domain,
+      baseDomain,
+      loopbackDomain,
+      repo,
+      branch
+    });
+    const domainArray = resolvedDomain ? [resolvedDomain] : [];
+    const routeId = `vite-proxy-${Date.now()}-${Math.floor(Math.random() * 1e3)}`;
+    const shouldUseInternalTls = internalTls ?? (baseDomain !== void 0 || loopbackDomain !== void 0 || domain !== void 0);
+    const tlsPolicyId = shouldUseInternalTls ? `${routeId}-tls` : null;
+    let cleanupStarted = false;
+    let resolvedPort = null;
+    let resolvedHost = null;
+    let setupStarted = false;
+    if (domainArray.length === 0) {
+      console.error(
+        "No domain resolved. Provide domain, or run inside a git repo, or pass repo/branch."
+      );
+      return;
+    }
+    let tlsPolicyAdded = false;
+    function getPortFromAddress(address) {
+      if (address && typeof address === "object" && "port" in address) {
+        const port = address.port;
+        if (typeof port === "number") {
+          return port;
+        }
       }
-      let tlsPolicyAdded = false;
-      function getPortFromAddress(address) {
-        if (address && typeof address === "object" && "port" in address) {
-          const port = address.port;
-          if (typeof port === "number") {
-            return port;
+      return null;
+    }
+    function updateResolvedTarget() {
+      if (resolvedPort !== null && resolvedHost !== null) return;
+      const resolvedUrl = server.resolvedUrls?.local?.[0];
+      if (resolvedUrl) {
+        try {
+          const url = new URL(resolvedUrl);
+          if (resolvedHost === null && url.hostname) {
+            resolvedHost = url.hostname === "localhost" ? "127.0.0.1" : url.hostname;
+          }
+          const port = Number(url.port);
+          if (resolvedPort === null && !Number.isNaN(port)) {
+            resolvedPort = port;
           }
+        } catch (e) {
         }
-        return null;
       }
-      function updateResolvedTarget() {
-        if (resolvedPort !== null && resolvedHost !== null) return;
-        const resolvedUrl = server.resolvedUrls?.local?.[0];
-        if (resolvedUrl) {
-          try {
-            const url = new URL(resolvedUrl);
-            if (resolvedHost === null && url.hostname) {
-              resolvedHost = url.hostname === "localhost" ? "127.0.0.1" : url.hostname;
-            }
-            const port = Number(url.port);
-            if (resolvedPort === null && !Number.isNaN(port)) {
-              resolvedPort = port;
-            }
-          } catch (e) {
+      if (httpServer) {
+        const address = httpServer.address();
+        if (address && typeof address === "object") {
+          const port = getPortFromAddress(address);
+          if (resolvedPort === null && port !== null) {
+            resolvedPort = port;
           }
-        }
-        if (httpServer) {
-          const address = httpServer.address();
-          if (address && typeof address === "object") {
-            const port = getPortFromAddress(address);
-            if (resolvedPort === null && port !== null) {
-              resolvedPort = port;
-            }
-            if (resolvedHost === null && "address" in address) {
-              const host = address.address;
-              if (typeof host === "string" && host !== "0.0.0.0" && host !== "::") {
-                resolvedHost = host;
-              }
+          if (resolvedHost === null && "address" in address) {
+            const host = address.address;
+            if (typeof host === "string" && host !== "0.0.0.0" && host !== "::") {
+              resolvedHost = host;
             }
           }
         }
-        if (resolvedPort === null && typeof config.server.port === "number") {
-          resolvedPort = config.server.port;
+      }
+      if (resolvedPort === null && typeof config.server.port === "number") {
+        resolvedPort = config.server.port;
+      }
+      if (previewMode && resolvedPort === null) {
+        const previewPort = getPreviewPort(config);
+        if (previewPort !== null) {
+          resolvedPort = previewPort;
+        }
+      }
+      if (resolvedHost === null) {
+        if (previewMode) {
+          resolvedHost = getPreviewHost(config);
         }
         if (resolvedHost === null) {
           resolvedHost = resolveUpstreamHost(config.server.host);
         }
       }
-      function getServerPort() {
-        updateResolvedTarget();
-        return resolvedPort ?? fallbackPort;
+    }
+    function getServerPort() {
+      updateResolvedTarget();
+      return resolvedPort ?? fallbackPort;
+    }
+    function getUpstreamHost() {
+      updateResolvedTarget();
+      return resolvedHost ?? "127.0.0.1";
+    }
+    async function cleanupRoute() {
+      if (cleanupStarted) return;
+      cleanupStarted = true;
+      if (tlsPolicyId) {
+        await removeTlsPolicy(tlsPolicyId);
       }
-      function getUpstreamHost() {
-        updateResolvedTarget();
-        return resolvedHost ?? "127.0.0.1";
+      await removeRoute(routeId);
+    }
+    function onServerClose() {
+      void cleanupRoute();
+    }
+    function handleSignal(signal) {
+      process.off("SIGINT", onSigint);
+      process.off("SIGTERM", onSigterm);
+      void cleanupRoute().finally(() => {
+        process.kill(process.pid, signal);
+      });
+    }
+    function onSigint() {
+      handleSignal("SIGINT");
+    }
+    function onSigterm() {
+      handleSignal("SIGTERM");
+    }
+    function registerProcessCleanup() {
+      process.once("SIGINT", onSigint);
+      process.once("SIGTERM", onSigterm);
+    }
+    async function setupRoute() {
+      if (!validateCaddyIsInstalled()) {
+        return;
       }
-      async function cleanupRoute() {
-        if (cleanupStarted) return;
-        cleanupStarted = true;
-        if (tlsPolicyId) {
-          await removeTlsPolicy(tlsPolicyId);
+      let running = await isCaddyRunning();
+      if (!running) {
+        running = await startCaddy();
+        if (!running) {
+          console.error("Failed to start Caddy server.");
+          return;
         }
-        await removeRoute(routeId);
-      }
-      function onServerClose() {
-        void cleanupRoute();
-      }
-      function handleSignal(signal) {
-        process.off("SIGINT", onSigint);
-        process.off("SIGTERM", onSigterm);
-        void cleanupRoute().finally(() => {
-          process.kill(process.pid, signal);
-        });
-      }
-      function onSigint() {
-        handleSignal("SIGINT");
-      }
-      function onSigterm() {
-        handleSignal("SIGTERM");
       }
-      function registerProcessCleanup() {
-        process.once("SIGINT", onSigint);
-        process.once("SIGTERM", onSigterm);
+      try {
+        await ensureBaseConfig(serverName);
+      } catch (e) {
+        console.error("Failed to configure Caddy base settings.", e);
+        return;
       }
-      async function setupRoute() {
-        if (!validateCaddyIsInstalled()) {
-          return;
-        }
-        let running = await isCaddyRunning();
-        if (!running) {
-          running = await startCaddy();
-          if (!running) {
-            console.error("Failed to start Caddy server.");
-            return;
-          }
-        }
+      const port = getServerPort();
+      const upstreamHost = getUpstreamHost();
+      if (tlsPolicyId) {
         try {
-          await ensureBaseConfig(serverName);
+          await addTlsPolicy(tlsPolicyId, domainArray);
+          tlsPolicyAdded = true;
         } catch (e) {
-          console.error("Failed to configure Caddy base settings.", e);
+          console.error("Failed to add TLS policy to Caddy.", e);
           return;
         }
-        const port = getServerPort();
-        const upstreamHost = getUpstreamHost();
-        if (tlsPolicyId) {
-          try {
-            await addTlsPolicy(tlsPolicyId, domainArray);
-            tlsPolicyAdded = true;
-          } catch (e) {
-            console.error("Failed to add TLS policy to Caddy.", e);
-            return;
-          }
-        }
-        try {
-          await addRoute(routeId, domainArray, port, cors, serverName, upstreamHost);
-        } catch (e) {
-          if (tlsPolicyAdded && tlsPolicyId) {
-            await removeTlsPolicy(tlsPolicyId);
-          }
-          console.error("Failed to add route to Caddy.", e);
-          return;
+      }
+      try {
+        await addRoute(routeId, domainArray, port, cors, serverName, upstreamHost);
+      } catch (e) {
+        if (tlsPolicyAdded && tlsPolicyId) {
+          await removeTlsPolicy(tlsPolicyId);
         }
-        console.log();
-        console.log("\u{1F512} Caddy is proxying your traffic on https");
-        console.log();
-        console.log(
-          `\u{1F517} Access your local ${domainArray.length > 1 ? "servers" : "server"}!`
-        );
+        console.error("Failed to add route to Caddy.", e);
+        return;
+      }
+      console.log("\n\u{1F512} Caddy is proxying your traffic on https");
+      console.log(
+        `
+\u{1F517} Access your local ${domainArray.length > 1 ? "servers" : "server"}!`
+      );
+      domainArray.forEach((domain2) => {
+        console.log(`\u{1F30D} https://${domain2}`);
+      });
+      if (process.platform === "linux" && !loopbackDomain) {
+        console.log("\n\u{1F427} Linux users: if the domain doesn't resolve, run:");
         domainArray.forEach((domain2) => {
-          console.log(`\u{1F30D} https://${domain2}`);
+          console.log(`   echo "127.0.0.1 ${domain2}" | sudo tee -a /etc/hosts`);
         });
-        if (process.platform === "linux" && !loopbackDomain) {
-          console.log();
-          console.log("\u{1F427} Linux users: if the domain doesn't resolve, run:");
-          domainArray.forEach((domain2) => {
-            console.log(`   echo "127.0.0.1 ${domain2}" | sudo tee -a /etc/hosts`);
-          });
-        }
-        console.log();
-        registerProcessCleanup();
-        httpServer?.once("close", onServerClose);
       }
-      function runSetupOnce() {
-        if (setupStarted) return;
-        setupStarted = true;
-        void setupRoute();
-      }
-      function wrapServerListen() {
-        if (typeof server.listen !== "function") return false;
-        const originalListen = server.listen.bind(server);
-        server.listen = async function(port, isRestart) {
-          const result = await originalListen(port, isRestart);
-          if (typeof port === "number") {
-            resolvedPort = port;
-          } else {
-            updateResolvedTarget();
-          }
-          runSetupOnce();
-          return result;
-        };
-        return true;
-      }
-      function onListening() {
-        updateResolvedTarget();
-        runSetupOnce();
-      }
-      const listenWrapped = wrapServerListen();
-      if (httpServer?.listening) {
-        runSetupOnce();
-      } else if (httpServer) {
-        httpServer.once("listening", onListening);
-      } else if (!listenWrapped) {
+      console.log();
+      registerProcessCleanup();
+      httpServer?.once("close", onServerClose);
+    }
+    function runSetupOnce() {
+      if (setupStarted) return;
+      setupStarted = true;
+      void setupRoute();
+    }
+    function wrapServerListen() {
+      if (!hasListen(server)) return false;
+      const originalListen = server.listen.bind(server);
+      server.listen = async function(port, isRestart) {
+        const result = await originalListen(port, isRestart);
+        if (typeof port === "number") {
+          resolvedPort = port;
+        } else {
+          updateResolvedTarget();
+        }
         runSetupOnce();
-      }
+        return result;
+      };
+      return true;
+    }
+    function onListening() {
+      updateResolvedTarget();
+      runSetupOnce();
+    }
+    const listenWrapped = wrapServerListen();
+    if (httpServer?.listening) {
+      runSetupOnce();
+    } else if (httpServer) {
+      httpServer.once("listening", onListening);
+    } else if (!listenWrapped) {
+      runSetupOnce();
+    }
+  }
+  return {
+    name: "vite:caddy-tls",
+    configureServer(server) {
+      setupServer(server);
+    },
+    configurePreviewServer(server) {
+      setupServer(server);
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-caddy-multiple-tls",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Vite plugin that uses Caddy to provide local HTTPS with derived domains.",
   "keywords": [
     "vite",