Add verbose output with tiered logging levels (-v and -vv)

build.mjs

@@ -86,6 +86,8 @@ esbuild
 			"keytar",
 			// TypeScript is a peer dependency and should not be bundled
 			"typescript",
+			// pino-pretty uses worker threads and must be external
+			"pino-pretty",
 		],
 	})
 	.catch((e) => {

require-shim.js

@@ -8,4 +8,9 @@
  * CommonJS module loader.
  */
 import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
+import { dirname } from "node:path";
+
 globalThis.require = createRequire(import.meta.url);
+globalThis.__filename = fileURLToPath(import.meta.url);
+globalThis.__dirname = dirname(globalThis.__filename);

src/cli-entry.ts

@@ -7,7 +7,7 @@ import { createActionsCommand } from "./cli/commands/actions";
 import { createApplicationCommand } from "./cli/commands/application";
 import { createWebhookCommand } from "./cli/commands/webhook";
 import { validateEnvironment } from "./core/environment";
-import { setDebugMode } from "./services/logger";
+import { setVerbosityLevel } from "./services/logger";
 
 /**
  * Traditional CLI entry point using commander.js
@@ -26,7 +26,9 @@ export function createCliProgram(): Command {
 			"-e, --env <environment>",
 			"Set the target environment for commands (ote, prod)",
 		)
-		.option("--debug", "Enable debug logging for HTTP requests and responses")
+		.option("-v, --verbose", "Enable verbose output (use -vv for full details)", (_, prev) => prev + 1, 0)
+		.option("--info", "Enable basic verbose output (same as -v)")
+		.option("--debug", "Enable full verbose output (same as -vv)")
 		.addHelpText(
 			"after",
 			`
@@ -40,13 +42,25 @@ Example Usage:
   $ godaddy webhook events`,
 		);
 
-	// Global pre-action hook to validate environment option and set debug mode
+	// Global pre-action hook to validate environment option and set verbosity level
 	program.hook("preAction", async (thisCommand, actionCommand) => {
 		const options = thisCommand.opts();
 
-		// Enable debug logging if --debug flag is set
+		let verbosity = options.verbose || 0;
+		if (options.info) {
+			verbosity = Math.max(verbosity, 1);
+		}
 		if (options.debug) {
-			setDebugMode(true);
+			verbosity = Math.max(verbosity, 2);
+		}
+
+		if (verbosity > 0) {
+			setVerbosityLevel(verbosity);
+			if (verbosity === 1) {
+				console.error("    (verbose output enabled)");
+			} else {
+				console.error("    (verbose output enabled: full details)");
+			}
 		}
 
 		if (options.env) {

src/core/auth.ts

@@ -15,6 +15,7 @@ import {
 	getApiUrl,
 	getClientId,
 } from "./environment";
+import { loggedFetch } from "../services/logger";
 
 const KEYCHAIN_SERVICE = "godaddy-cli";
 const PORT = 7443;
@@ -90,7 +91,7 @@ export async function authLogin(): Promise<CmdResult<AuthResult>> {
 							);
 						}
 
-						const tokenResponse = await fetch(oauthTokenUrl, {
+						const tokenResponse = await loggedFetch(oauthTokenUrl, {
 							method: "POST",
 							headers: {
 								"Content-Type": "application/x-www-form-urlencoded",

src/services/logger.ts

@@ -1,12 +1,13 @@
 import pino from "pino";
+import pinoPretty from "pino-pretty";
 
-// Global debug state
-let isDebugEnabled = false;
+// Global verbosity level: 0 = none, 1 = basic, 2 = full
+let verbosityLevel = 0;
 
-// Configure logger based on environment and debug flag
+// Configure logger based on environment and verbosity level
 const createLogger = () => {
 	const isDev = process.env.NODE_ENV === "development";
-	const level = isDebugEnabled ? "debug" : "info";
+	const level = verbosityLevel > 0 ? "debug" : "info";
 
 	const redact = {
 		paths: [
@@ -18,19 +19,19 @@
 		censor: "[REDACTED]",
 	};
 
-	if (isDev || isDebugEnabled) {
-		return pino({
-			level,
-			redact,
-			transport: {
-				target: "pino-pretty",
-				options: {
-					colorize: true,
-					translateTime: "HH:MM:ss",
-					ignore: "pid,hostname",
-				},
-			},
+	if (isDev || verbosityLevel > 0) {
+		const prettyStream = pinoPretty({
+			colorize: true,
+			translateTime: "HH:MM:ss",
+			ignore: "pid,hostname",
 		});
+		return pino(
+			{
+				level,
+				redact,
+			},
+			prettyStream,
+		);
 	}
 
 	return pino({
@@ -41,8 +42,8 @@
 
 let logger = createLogger();
 
-export const setDebugMode = (enabled: boolean) => {
-	isDebugEnabled = enabled;
+export const setVerbosityLevel = (level: number) => {
+	verbosityLevel = level;
 	logger = createLogger();
 };
 
@@ -55,17 +56,19 @@
 	headers?: Record<string, string>;
 	body?: unknown;
 }) => {
-	if (isDebugEnabled) {
+	if (verbosityLevel >= 2) {
 		logger.debug(
 			{
 				type: "http_request",
 				method: options.method,
 				url: options.url,
 				headers: options.headers,
 				body: options.body,
 			},
 			`→ ${options.method} ${options.url}`,
 		);
+	} else if (verbosityLevel === 1) {
+		logger.debug(`→ ${options.method} ${options.url}`);
 	}
 };
 
@@ -78,21 +81,97 @@
 	body?: unknown;
 	duration?: number;
 }) => {
-	if (isDebugEnabled) {
+	if (verbosityLevel >= 2) {
 		logger.debug(
 			{
 				type: "http_response",
 				method: options.method,
 				url: options.url,
 				status: options.status,
 				statusText: options.statusText,
 				headers: options.headers,
 				body: options.body,
 				duration: options.duration,
 			},
 			`← ${options.status} ${options.method} ${options.url} ${
 				options.duration ? `(${options.duration}ms)` : ""
 			}`,
 		);
+	} else if (verbosityLevel === 1) {
+		logger.debug(
+			`← ${options.status} ${options.method} ${options.url} ${
+				options.duration ? `(${options.duration}ms)` : ""
+			}`,
+		);
+	}
+};
+
+const redactSensitiveFields = (obj: unknown): unknown => {
+	if (typeof obj !== "object" || obj === null) {
+		return obj;
+	}
+
+	if (Array.isArray(obj)) {
+		return obj.map(redactSensitiveFields);
+	}
+
+	const result: Record<string, unknown> = {};
+	for (const [key, value] of Object.entries(obj)) {
+		if (key === "access_token" || key === "accessToken") {
+			result[key] = "[REDACTED]";
+		} else if (typeof value === "object" && value !== null) {
+			result[key] = redactSensitiveFields(value);
+		} else {
+			result[key] = value;
+		}
 	}
+	return result;
+};
+
+export const loggedFetch = async (
+	url: string,
+	init?: RequestInit,
+): Promise<Response> => {
+	const method = init?.method ?? "(unknown)";
+	const headers = init?.headers;
+	const body = init?.body;
+
+	logHttpRequest({
+		method,
+		url,
+		headers: headers as Record<string, string>,
+		body:
+			body instanceof URLSearchParams
+				? Object.fromEntries(body.entries())
+				: body,
+	});
+
+	const startTime = Date.now();
+	const response = await fetch(url, init);
+	const duration = Date.now() - startTime;
+
+	let responseBody: unknown;
+	if (verbosityLevel >= 2 && response.ok) {
+		const contentType = response.headers.get("content-type");
+		if (contentType?.includes("application/json")) {
+			const clonedResponse = response.clone();
+			try {
+				const jsonBody = await clonedResponse.json();
+				responseBody = redactSensitiveFields(jsonBody);
+			} catch {
+				responseBody = undefined;
+			}
+		}
+	}
+
+	logHttpResponse({
+		method,
+		url,
+		status: response.status,
+		statusText: response.statusText,
+		body: responseBody,
+		duration,
+	});
+
+	return response;
 };