@absolutejs/absolute 0.20.0-beta.32 → 0.20.0-beta.33

package/dist/index.js

@@ -34041,26 +34041,40 @@ import {
   readFileSync as readFileSync36,
   rmSync as rmSync4
 } from "fs";
+import { X509Certificate } from "crypto";
+import { isIP } from "net";
 import { join as join55 } from "path";
 var CERT_DIR = join55(process.cwd(), ".absolutejs");
 var CERT_PATH = join55(CERT_DIR, "cert.pem");
 var KEY_PATH = join55(CERT_DIR, "key.pem");
 var CERT_VALIDITY_DAYS = 365;
+var DEFAULT_CERTIFICATE_HOSTS = ["localhost", "127.0.0.1", "::1"];
+var CERTIFICATE_HOSTNAME_PATTERN = /^(?=.{1,253}$)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)(?:\.(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?))*$/u;
 var devLog = (msg) => console.log(`\x1B[2m${new Date().toLocaleTimeString()}\x1B[0m \x1B[36m[dev]\x1B[0m ${msg}`);
 var devWarn = (msg) => console.log(`\x1B[2m${new Date().toLocaleTimeString()}\x1B[0m \x1B[33m[dev]\x1B[0m \x1B[33m${msg}\x1B[0m`);
 var certFilesExist = () => existsSync40(CERT_PATH) && existsSync40(KEY_PATH);
-var isCertExpired = () => {
+var normalizeDevCertificateHosts = (hosts = []) => {
+  const normalized = new Set(DEFAULT_CERTIFICATE_HOSTS);
+  for (const host2 of hosts) {
+    const value = host2.trim().toLowerCase();
+    if (!value || value === "0.0.0.0" || value === "::")
+      continue;
+    if (isIP(value) === 0 && !CERTIFICATE_HOSTNAME_PATTERN.test(value)) {
+      throw new TypeError(`Invalid development certificate host: ${host2}`);
+    }
+    normalized.add(value);
+  }
+  return [...normalized];
+};
+var certificateIsUsable = (hosts) => {
   try {
     const certPem = readFileSync36(CERT_PATH, "utf-8");
-    const proc = Bun.spawnSync(["openssl", "x509", "-enddate", "-noout"], {
-      stdin: new TextEncoder().encode(certPem)
-    });
-    const output = new TextDecoder().decode(proc.stdout).trim();
-    const dateStr = output.replace("notAfter=", "");
-    const expiryDate = new Date(dateStr);
-    return expiryDate.getTime() < Date.now();
+    const certificate = new X509Certificate(certPem);
+    if (new Date(certificate.validTo).getTime() <= Date.now())
+      return false;
+    return normalizeDevCertificateHosts(hosts).every((host2) => isIP(host2) ? certificate.checkIP(host2) !== undefined : certificate.checkHost(host2) !== undefined);
   } catch {
-    return true;
+    return false;
   }
 };
 var hasMkcert = () => {
@@ -34074,23 +34088,22 @@ var hasMkcert = () => {
     return false;
   }
 };
-var generateWithMkcert = () => {
+var generateWithMkcert = (hosts = []) => {
   const result = Bun.spawnSync([
     "mkcert",
     "-cert-file",
     CERT_PATH,
     "-key-file",
     KEY_PATH,
-    "localhost",
-    "127.0.0.1",
-    "::1"
+    ...normalizeDevCertificateHosts(hosts)
   ], { stderr: "pipe", stdout: "pipe" });
   if (result.exitCode !== 0) {
     const err = new TextDecoder().decode(result.stderr);
     throw new Error(`mkcert failed: ${err}`);
   }
 };
-var generateSelfSigned = () => {
+var generateSelfSigned = (hosts = []) => {
+  const subjectAlternativeNames = normalizeDevCertificateHosts(hosts).map((host2) => `${isIP(host2) ? "IP" : "DNS"}:${host2}`).join(",");
   const proc = Bun.spawnSync([
     "openssl",
     "req",
@@ -34109,7 +34122,7 @@ var generateSelfSigned = () => {
     "-subj",
     "/CN=localhost",
     "-addext",
-    "subjectAltName=DNS:localhost,IP:127.0.0.1,IP:::1"
+    `subjectAltName=${subjectAlternativeNames}`
   ], { stderr: "pipe", stdout: "pipe" });
   if (proc.exitCode !== 0) {
     const err = new TextDecoder().decode(proc.stderr);
@@ -34117,32 +34130,32 @@ var generateSelfSigned = () => {
   }
   devLog("Using self-signed certificate \u2014 browser will show a one-time warning");
 };
-var generateCert = () => {
+var generateCert = (hosts = []) => {
   if (hasMkcert()) {
-    generateWithMkcert();
+    generateWithMkcert(hosts);
   } else {
-    generateSelfSigned();
+    generateSelfSigned(hosts);
   }
 };
-var ensureDevCert = () => {
+var ensureDevCert = (hosts = []) => {
   mkdirSync17(CERT_DIR, { recursive: true });
-  if (hasCert()) {
+  if (hasCert(hosts)) {
     return { cert: CERT_PATH, key: KEY_PATH };
   }
   if (certFilesExist()) {
-    devLog("Certificate expired, regenerating...");
+    devLog("Certificate is expired or missing a required host, regenerating...");
   }
   try {
-    generateCert();
+    generateCert(hosts);
   } catch (err) {
     devWarn(`Failed to generate certificate: ${err instanceof Error ? err.message : err}`);
     return null;
   }
   return { cert: CERT_PATH, key: KEY_PATH };
 };
-var hasCert = () => certFilesExist() && !isCertExpired();
-var loadDevCert = () => {
-  const paths = ensureDevCert();
+var hasCert = (hosts = []) => certFilesExist() && certificateIsUsable(hosts);
+var loadDevCert = (hosts = []) => {
+  const paths = ensureDevCert(hosts);
   if (!paths)
     return null;
   try {
@@ -34239,9 +34252,10 @@ var localIP;
 var args = argv;
 var hostFlag = args.includes("--host");
 if (hostFlag) {
-  localIP = getLocalIPAddress();
   host2 = "0.0.0.0";
 }
+if (host2 === "0.0.0.0" || host2 === "::")
+  localIP = getLocalIPAddress();
 var loadTls = () => {
   if (env4.NODE_ENV !== "development")
     return;
@@ -40863,5 +40877,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=C7F91C3EB54CEFC064756E2164756E21
+//# debugId=D2060DE03921305264756E2164756E21
 //# sourceMappingURL=index.js.map