dowwntime 1.2.1 → 1.2.3

package/dist/cli.mjs

@@ -2,6 +2,7 @@
 import { createRequire } from "module";
 import { debug } from "util";
 import http from "http";
+import https from "https";
 import fs from "fs";
 import path from "path";
 
@@ -14672,7 +14673,7 @@ var require_dayjs_min = /* @__PURE__ */ __commonJS({ "node_modules/dayjs/dayjs.m
 
 //#endregion
 //#region node_modules/p-throttle/index.js
-var import_dayjs_min = /* @__PURE__ */ __toESM(require_dayjs_min());
+var import_dayjs_min = /* @__PURE__ */ __toESM(require_dayjs_min(), 1);
 const states = /* @__PURE__ */ new WeakMap();
 const signalThrottleds = /* @__PURE__ */ new WeakMap();
 const finalizationRegistry = new FinalizationRegistry(({ signalWeakRef, weakReference }) => {
@@ -14886,40 +14887,24 @@ const debug$1 = debug("dowwntime");
 const measureRequest = async (url$2, options) => {
 	const startAt = Date.now();
 	return await new Promise((resolve$1) => {
-		let firstByteAt;
-		let endAt;
-		let dnsLookupAt;
-		let tcpConnectionAt;
 		let tlsHandshakeAt;
-		let statusCode;
-		http.request(url$2, options, (res) => {
-			statusCode = res.statusCode || 0;
-			res.once("readable", () => {
-				firstByteAt = Date.now();
-			});
+		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("end", () => {
-				endAt = Date.now();
+				const totalMs = Date.now() - startAt;
+				const tlsMs = tlsHandshakeAt ? tlsHandshakeAt - startAt : 0;
 				resolve$1({
-					statusCode,
-					dnsLookupMs: dnsLookupAt - startAt,
-					tcpConnectionMs: tcpConnectionAt - dnsLookupAt,
-					tlsHandshakeMs: tlsHandshakeAt - tcpConnectionAt,
-					timeToFirstByteMs: firstByteAt - tlsHandshakeAt,
-					contentTransferMs: endAt - firstByteAt,
-					totalTimeMs: endAt - startAt
+					statusCode: res.statusCode || 0,
+					durationMs: totalMs - tlsMs
 				});
 			});
-		}).on("socket", (socket) => {
-			socket.on("lookup", () => {
-				dnsLookupAt = Date.now();
-			});
-			socket.on("connect", () => {
-				tcpConnectionAt = Date.now();
-			});
+		});
+		req.on("socket", (socket) => {
 			socket.on("secureConnect", () => {
 				tlsHandshakeAt = Date.now();
 			});
 		});
+		req.end();
 	});
 };
 
@@ -23820,7 +23805,7 @@ var require_form_data = /* @__PURE__ */ __commonJS({ "node_modules/form-data/lib
 	var util$1 = __require("util");
 	var path$2 = __require("path");
 	var http$3 = __require("http");
-	var https$2 = __require("https");
+	var https$3 = __require("https");
 	var parseUrl$2 = __require("url").parse;
 	var fs$2 = __require("fs");
 	var Stream = __require("stream").Stream;
@@ -24012,7 +23997,7 @@ var require_form_data = /* @__PURE__ */ __commonJS({ "node_modules/form-data/lib
 			if (!options.port) options.port = options.protocol === "https:" ? 443 : 80;
 		}
 		options.headers = this.getHeaders(params.headers);
-		if (options.protocol === "https:") request = https$2.request(options);
+		if (options.protocol === "https:") request = https$3.request(options);
 		else request = http$3.request(options);
 		this.getLength(function(err, length) {
 			if (err && err !== "Unknown stream") {
@@ -24140,7 +24125,7 @@ var require_follow_redirects = /* @__PURE__ */ __commonJS({ "node_modules/follow
 	var url$1 = __require("url");
 	var URL$1 = url$1.URL;
 	var http$2 = __require("http");
-	var https$1 = __require("https");
+	var https$2 = __require("https");
 	var Writable = __require("stream").Writable;
 	var assert = __require("assert");
 	var debug$2 = require_debug();
@@ -24562,7 +24547,7 @@ var require_follow_redirects = /* @__PURE__ */ __commonJS({ "node_modules/follow
 	}
 	module.exports = wrap({
 		http: http$2,
-		https: https$1
+		https: https$2
 	});
 	module.exports.wrap = wrap;
 }) });
@@ -24576,7 +24561,7 @@ var require_axios = /* @__PURE__ */ __commonJS({ "node_modules/axios/dist/node/a
 	const url = __require("url");
 	const proxyFromEnv = require_proxy_from_env();
 	const http$1 = __require("http");
-	const https = __require("https");
+	const https$1 = __require("https");
 	const http2 = __require("http2");
 	const util = __require("util");
 	const followRedirects = require_follow_redirects();
@@ -24591,7 +24576,7 @@ var require_axios = /* @__PURE__ */ __commonJS({ "node_modules/axios/dist/node/a
 	const url__default = /* @__PURE__ */ _interopDefaultLegacy(url);
 	const proxyFromEnv__default = /* @__PURE__ */ _interopDefaultLegacy(proxyFromEnv);
 	const http__default = /* @__PURE__ */ _interopDefaultLegacy(http$1);
-	const https__default = /* @__PURE__ */ _interopDefaultLegacy(https);
+	const https__default = /* @__PURE__ */ _interopDefaultLegacy(https$1);
 	const http2__default = /* @__PURE__ */ _interopDefaultLegacy(http2);
 	const util__default = /* @__PURE__ */ _interopDefaultLegacy(util);
 	const followRedirects__default = /* @__PURE__ */ _interopDefaultLegacy(followRedirects);
@@ -28369,9 +28354,9 @@ const run = async (options) => {
 				method: "GET",
 				timeout: options.timeoutMs ?? 5e3
 			});
-			durationMs = metrics.timeToFirstByteMs;
-			if (options.getStatus) status = options.getStatus(metrics.statusCode, path$4, metrics.contentTransferMs);
-			else status = metrics.statusCode >= 200 && metrics.statusCode < 300 ? "up" : "down";
+			durationMs = metrics.durationMs;
+			if (options.getStatus) status = options.getStatus(metrics.statusCode, path$4, durationMs);
+			else status = metrics.statusCode >= 200 && durationMs < 300 ? "up" : "down";
 		} catch (_error) {
 			durationMs = Date.now() - start;
 			status = "down";
@@ -28439,20 +28424,24 @@ const run = async (options) => {
 			if (filtered.length === 0) return null;
 			return filtered.filter((item) => item.status === "degraded").length / filtered.length;
 		};
+		const relDegraded60m = getRelativeDegraded(startOfPast60m);
+		const relDegraded24h = getRelativeDegraded(startOfPast24h);
+		const relDegraded7d = getRelativeDegraded(startOfPast7d);
+		const relDegraded30d = getRelativeDegraded(startOfPast30d);
 		return {
-			path: path$4,
-			relDowntime60m,
-			relDegraded60m: getRelativeDegraded(startOfPast60m),
-			avgDuration60m,
-			relDowntime24h,
-			relDegraded24h: getRelativeDegraded(startOfPast24h),
-			avgDuration24h,
-			relDowntime7d,
-			relDegraded7d: getRelativeDegraded(startOfPast7d),
-			avgDuration7d,
-			relDowntime30d,
-			relDegraded30d: getRelativeDegraded(startOfPast30d),
-			avgDuration30d
+			path: `${path$4} - ${history[history.length - 1]?.status ?? "unknown"} - ${history[history.length - 1]?.durationMs ?? 0}ms`,
+			down60m: relDowntime60m,
+			degr60m: relDegraded60m,
+			dur60m: avgDuration60m,
+			down24h: relDowntime24h,
+			degr24h: relDegraded24h,
+			dur24h: avgDuration24h,
+			down7d: relDowntime7d,
+			degr7d: relDegraded7d,
+			dur7d: avgDuration7d,
+			down30d: relDowntime30d,
+			degr30d: relDegraded30d,
+			dur30d: avgDuration30d
 		};
 	}));
 	console.table(reports);