qualty 0.1.33 → 0.1.34

package/bin/local-runner.js

@@ -109,17 +109,38 @@ function startCloudflaredForPort(token, port) {
   return cmd;
 }
 
+function preferIpv4Addresses(addresses) {
+  const ipv4 = addresses.filter((entry) => entry.family === 4);
+  return ipv4.length > 0 ? ipv4 : addresses;
+}
+
 async function resolvePublicHostname(hostname) {
   const [ipv4, ipv6] = await Promise.allSettled([resolve4(hostname), resolve6(hostname)]);
-  const addresses = [
+  let addresses = [
     ...(ipv4.status === "fulfilled" ? ipv4.value.map((address) => ({ address, family: 4 })) : []),
     ...(ipv6.status === "fulfilled" ? ipv6.value.map((address) => ({ address, family: 6 })) : []),
   ].sort((a, b) => a.family - b.family);
-  if (addresses.length > 0) return addresses;
+
+  // System resolvers sometimes return only AAAA before A records propagate; prefer DoH A records.
+  if (!addresses.some((entry) => entry.family === 4)) {
+    try {
+      const dohAddresses = await resolvePublicHostnameViaDoh(hostname);
+      const dohIpv4 = dohAddresses.filter((entry) => entry.family === 4);
+      if (dohIpv4.length > 0) {
+        addresses = [...dohIpv4, ...addresses.filter((entry) => entry.family === 6)];
+      } else if (addresses.length === 0 && dohAddresses.length > 0) {
+        addresses = dohAddresses;
+      }
+    } catch {
+      /* Fall through to errors below when nothing resolved. */
+    }
+  }
+
+  if (addresses.length > 0) return preferIpv4Addresses(addresses);
 
   try {
     const dohAddresses = await resolvePublicHostnameViaDoh(hostname);
-    if (dohAddresses.length > 0) return dohAddresses;
+    if (dohAddresses.length > 0) return preferIpv4Addresses(dohAddresses);
   } catch {
     /* Surface the original resolver error below; it is usually more familiar. */
   }
@@ -154,11 +175,21 @@ async function resolvePublicHostnameViaDoh(hostname) {
 }
 
 function probeWebSocketUpgrade(connectUrl, addresses, timeoutMs = 10000) {
+  const routable = preferIpv4Addresses(addresses);
   return new Promise((resolve, reject) => {
+    let settled = false;
+    const finish = (err) => {
+      if (settled) return;
+      settled = true;
+      if (err) reject(err);
+      else resolve();
+    };
+
     const url = new URL(connectUrl);
     const req = httpsRequest({
       protocol: url.protocol === "wss:" ? "https:" : url.protocol,
       hostname: url.hostname,
+      servername: url.hostname,
       port: url.port || 443,
       path: `${url.pathname || "/"}${url.search || ""}`,
       method: "GET",
@@ -167,18 +198,22 @@ function probeWebSocketUpgrade(connectUrl, addresses, timeoutMs = 10000) {
         Upgrade: "websocket",
         "Sec-WebSocket-Key": randomBytes(16).toString("base64"),
         "Sec-WebSocket-Version": "13",
+        Host: url.host,
       },
       timeout: timeoutMs,
       lookup: (_hostname, options, callback) => {
         const cb = typeof options === "function" ? options : callback;
         const lookupOptions = typeof options === "object" && options ? options : {};
-        const picked = addresses[0];
+        const picked = routable[0];
         if (!picked?.address || !picked?.family) {
           cb(new Error("No resolved tunnel addresses available"));
           return;
         }
         if (lookupOptions.all) {
-          cb(null, addresses);
+          cb(
+            null,
+            routable.map((entry) => ({ address: entry.address, family: entry.family }))
+          );
           return;
         }
         cb(null, picked.address, picked.family);
@@ -187,14 +222,17 @@ function probeWebSocketUpgrade(connectUrl, addresses, timeoutMs = 10000) {
 
     req.on("upgrade", (_res, socket) => {
       socket.destroy();
-      resolve();
+      finish();
     });
     req.on("response", (res) => {
       res.resume();
-      reject(new Error(`WebSocket upgrade returned HTTP ${res.statusCode}`));
+      finish(new Error(`WebSocket upgrade returned HTTP ${res.statusCode}`));
     });
     req.on("timeout", () => req.destroy(new Error(`WebSocket upgrade timed out after ${timeoutMs}ms`)));
-    req.on("error", reject);
+    req.on("error", finish);
+    req.on("socket", (socket) => {
+      socket.on("error", finish);
+    });
     req.end();
   });
 }
@@ -207,7 +245,7 @@ async function waitForPublicBrowserTunnel({ connectUrl, hostname, timeoutMs = 60
   while (Date.now() < deadline) {
     attempts += 1;
     try {
-      const addresses = await resolvePublicHostname(hostname);
+      const addresses = preferIpv4Addresses(await resolvePublicHostname(hostname));
       // eslint-disable-next-line no-console
       console.log(
         `[qualty][tunnel] DNS ready for ${hostname}: ${addresses.map((a) => a.address).join(", ")}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qualty",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "Qualty CLI for localhost and CI test runs",
   "bin": {
     "qualty": "bin/qualty.js"