Add --verbose flag

api.js

@@ -10,10 +10,10 @@ async function init(browser, page, observer, options) {
 
 	/* eslint-disable no-constant-condition, no-await-in-loop */
 	while (true) {
-		const result = await page.evaluate(() => {
+		const result = await page.evaluate(options => {
 			const $ = document.querySelector.bind(document);
 
-			return {
+			let stats = {
 				downloadSpeed: Number($('#speed-value').textContent),
 				uploadSpeed: Number($('#upload-value').textContent),
 				downloadUnit: $('#speed-units').textContent.trim(),
@@ -22,7 +22,28 @@ async function init(browser, page, observer, options) {
 					$('#speed-value.succeeded') && $('#upload-value.succeeded')
 				)
 			};
-		});
+
+			if (options.verbose) {
+				stats = {
+					...stats,
+					latency: Number($('#latency-value').textContent),
+					bufferbloat: Number($('#bufferbloat-value').textContent),
+					latencyUnit: $('#latency-units').textContent.trim(),
+					bufferbloatUnit: $('#bufferbloat-units').textContent.trim(),
+					client: {
+						location: $('#user-location').textContent.trim(),
+						ip: $('#user-ip').textContent.trim(),
+						isp: $('#user-isp').textContent.trim()
+					},
+					serverLocations: $('#server-locations').textContent.trim(),
+					isDone: stats.isDone && Boolean(
+						$('#latency-value.succeeded') && $('#bufferbloat-value.succeeded')
+					)
+				};
+			}
+
+			return stats;
+		}, options);
 
 		if (result.downloadSpeed > 0 && !equals(result, prevResult)) {
 			observer.next(result);

cli.js

@@ -14,6 +14,7 @@ const cli = meow(`
 
 	Options
 	  --upload, -u  Measure upload speed in addition to download speed
+	  --verbose     Get verbose logging on latency and request metadata
 
 	Examples
 	  $ fast --upload > file && cat file
@@ -24,10 +25,15 @@ const cli = meow(`
 		upload: {
 			type: 'boolean',
 			alias: 'u'
+		},
+		verbose: {
+			type: 'boolean'
 		}
 	}
 });
 
+cli.flags.upload = cli.flags.upload || cli.flags.verbose;
+
 // Check connections
 dns.lookup('fast.com', error => {
 	if (error && error.code === 'ENOTFOUND') {
@@ -57,17 +63,22 @@ const speedText = () =>
 		downloadColor(downloadSpeed());
 
 const speed = () => speedText() + '\n\n';
+const getVerboseLog = () => `   Latency:  ${data.latency}${data.latencyUnit} ${chalk.dim('(unloaded)')}  ${data.bufferbloat}${data.bufferbloatUnit} ${chalk.dim('(loaded)')}\n    Client:  ${data.client.location} ${data.client.ip} ${data.client.isp}\n Server(s):  ${data.serverLocations}`;
 
 function exit() {
 	if (process.stdout.isTTY) {
-		logUpdate(`\n\n    ${speed()}`);
+		logUpdate(`\n\n    ${speed()}${cli.flags.verbose ? `\n${getVerboseLog()}` : ''}`);
 	} else {
 		let output = `${data.downloadSpeed} ${data.downloadUnit}`;
 
 		if (cli.flags.upload) {
 			output += `\n${data.uploadSpeed} ${data.uploadUnit}`;
 		}
 
+		if (cli.flags.verbose) {
+			output += `\n${getVerboseLog()}`;
+		}
+
 		console.log(output);
 	}
 
@@ -89,7 +100,7 @@ if (process.stdout.isTTY) {
 
 (async () => {
 	try {
-		await api({measureUpload: cli.flags.upload}).forEach(result => {
+		await api({measureUpload: cli.flags.upload, verbose: cli.flags.verbose}).forEach(result => {
 			data = result;
 		});
 

readme.md

@@ -27,6 +27,7 @@ $ fast --help
 
   Options
     --upload, -u  Measure upload speed in addition to download speed
+    --verbose     Get verbose logging on latency and request metadata
 
   Examples
     $ fast --upload > file && cat file