dowwntime 1.3.0 → 1.3.2

package/dist/cli.mjs

@@ -14888,14 +14888,16 @@ const measureRequest = async (url$2, options) => {
 	const startAt = Date.now();
 	return await new Promise((resolve$1) => {
 		let tlsHandshakeAt;
+		let firstByteAt;
 		const req = ((typeof url$2 === "string" ? new URL(url$2) : url$2).protocol === "https:" ? https : http).request(url$2, options, (res) => {
-			res.on("data", () => {});
+			res.on("data", () => {
+				if (!firstByteAt) firstByteAt = Date.now();
+			});
 			res.on("end", () => {
-				const totalMs = Date.now() - startAt;
-				const tlsMs = tlsHandshakeAt ? tlsHandshakeAt - startAt : 0;
+				const durationMs = (firstByteAt ? firstByteAt - startAt : 0) - (tlsHandshakeAt ? tlsHandshakeAt - startAt : 0);
 				resolve$1({
 					statusCode: res.statusCode || 0,
-					durationMs: totalMs - tlsMs
+					durationMs: Math.max(0, durationMs)
 				});
 			});
 		});
@@ -28346,29 +28348,26 @@ const run = async (options) => {
 	const measure = async (path$4) => {
 		const url$2 = fetchConfigurations.get(path$4);
 		if (!url$2) return;
-		let status = "down";
-		let durationMs;
 		const start = Date.now();
 		try {
 			const metrics = await measureRequest(url$2, {
 				method: "GET",
 				timeout: options.timeoutMs ?? 5e3
 			});
-			durationMs = metrics.durationMs;
-			if (options.getStatus) status = options.getStatus(metrics.statusCode, path$4, durationMs);
-			else status = metrics.statusCode >= 200 && durationMs < 300 ? "up" : "down";
+			debug$1(`Measured ${path$4}:`, metrics);
+			return {
+				...metrics,
+				url: url$2.toString(),
+				timestamp: start
+			};
 		} catch (_error) {
-			durationMs = Date.now() - start;
-			status = "down";
+			return {
+				statusCode: 0,
+				durationMs: Date.now() - start,
+				url: url$2.toString(),
+				timestamp: start
+			};
 		}
-		const measurement = {
-			status,
-			durationMs,
-			timestamp: start,
-			url: url$2.toString()
-		};
-		debug$1(`Measured ${path$4}:`, measurement);
-		return measurement;
 	};
 	const throttledMeasure = pThrottle({
 		limit: options.concurrency ?? 5,
@@ -28382,13 +28381,18 @@ const run = async (options) => {
 		const iqr = q3 - q1;
 		const lowerBound = q1 - 1.5 * iqr;
 		const upperBound = q3 + 1.5 * iqr;
-		const measurement = results.filter((r) => r && r.durationMs >= lowerBound && r.durationMs <= upperBound).reduce((acc, curr) => {
-			if (!acc) return curr;
-			if (!curr) return acc;
-			acc.status = curr.status;
-			acc.durationMs = Math.round((acc.durationMs + curr.durationMs) / 2);
-			return acc;
-		}, void 0);
+		const filteredResults = results.filter((r) => r && r.durationMs >= lowerBound && r.durationMs <= upperBound);
+		const durationMs = Math.round(filteredResults.reduce((acc, curr) => acc + (curr?.durationMs ?? 0), 0) / filteredResults.length);
+		let status = "down";
+		const statusCode = Math.max(...filteredResults.map((r) => r?.statusCode ?? 0));
+		if (options.getStatus) status = options.getStatus(statusCode, path$4, durationMs);
+		else status = statusCode >= 200 ? "up" : "down";
+		const measurement = {
+			status,
+			durationMs,
+			timestamp: Date.now(),
+			url: fetchConfigurations.get(path$4)?.toString() ?? ""
+		};
 		debug$1(`Measured ${path$4} (avg):`, measurement);
 		if (!measurement) return;
 		await measurements.add(path$4, measurement);