kahunas-cli 1.3.0 → 1.4.0

package/README.md

@@ -29,7 +29,7 @@ pnpm kahunas serve
 
 Open `http://127.0.0.1:3000`.
 
-If `auth.json` is missing, `sync` will prompt for credentials and save them.
+If `auth.json` is missing, `sync` will prompt for credentials and save them after a successful login.
 
 ## Advanced usage
 

package/dist/cli.js

@@ -439,6 +439,24 @@ function askQuestion(prompt, output = process.stdout) {
 function waitForEnter(prompt, output = process.stdout) {
 	return askQuestion(prompt, output).then(() => void 0);
 }
+function askHiddenQuestion(prompt, output = process.stderr) {
+	return new Promise((resolve) => {
+		const rl = node_readline.createInterface({
+			input: process.stdin,
+			output,
+			terminal: true
+		});
+		const writable = rl;
+		const originalWrite = writable._writeToOutput.bind(rl);
+		writable._writeToOutput = (value) => {
+			if (value.includes("\n") || value.includes("\r")) originalWrite(value);
+		};
+		rl.question(prompt, (answer) => {
+			rl.close();
+			resolve(answer.trim());
+		});
+	});
+}
 function debugLog(enabled, message) {
 	logDebug(enabled, message);
 }
@@ -597,8 +615,8 @@ function normalizePath(pathname) {
 function normalizeToken(token) {
 	return token.trim().replace(/^"(.*)"$/, "$1").replace(/^'(.*)'$/, "$1").replace(/^bearer\s+/i, "");
 }
-function resolveStoredAuth() {
-	const auth = readAuthConfig();
+function resolveStoredAuth(override) {
+	const auth = override ?? readAuthConfig();
 	if (!auth) return;
 	const login = auth.username ?? auth.email;
 	if (!login || !auth.password) throw new Error(`Invalid auth.json at ${AUTH_PATH}. Expected \"username\" or \"email\" and \"password\".`);
@@ -719,11 +737,11 @@ async function triggerWorkoutCapture(page, webOrigin, plans, debug) {
 	debugLog(debug, `Workout capture plans=${plans.length}`);
 	return plans.length > 0;
 }
-async function captureWorkoutsFromBrowser(options, config) {
+async function captureWorkoutsFromBrowser(options, config, authOverride) {
 	const webBaseUrl = resolveWebBaseUrl(options, config);
 	const headless = config.headless ?? true;
 	const debug = config.debug === true;
-	const storedAuth = resolveStoredAuth();
+	const storedAuth = resolveStoredAuth(authOverride);
 	const browser = await (await import("playwright")).chromium.launch({ headless });
 	const context = await browser.newContext();
 	const plans = [];
@@ -2243,6 +2261,104 @@ async function handleWorkout(positionals, options) {
 		}
 		return programDetails;
 	};
+	const startWorkoutServer = async () => {
+		const host = "127.0.0.1";
+		const port = 3e3;
+		const limit = 1;
+		const cacheTtlMs = 3e4;
+		const loadSummary = async () => {
+			const { text, payload, timezone } = await fetchWorkoutEventsPayload();
+			if (!Array.isArray(payload)) throw new Error(`Unexpected calendar response: ${text.slice(0, 200)}`);
+			const sorted = sortWorkoutEvents(filterWorkoutEvents(payload));
+			const bounded = limit > 0 ? sorted.slice(-limit) : sorted;
+			const programDetails = await buildProgramDetails(sorted);
+			const formatted = formatWorkoutEventsOutput(bounded, programDetails, {
+				timezone,
+				program: void 0,
+				workout: void 0
+			});
+			const summary = formatted.events[0];
+			const programUuid = summary?.program?.uuid ?? (bounded[0] && typeof bounded[0] === "object" ? bounded[0].program : void 0);
+			return {
+				formatted,
+				days: summarizeWorkoutProgramDays(programUuid ? programDetails[programUuid] : void 0),
+				summary,
+				timezone
+			};
+		};
+		let cached;
+		let summaryInFlight = null;
+		const getSummary = async (forceRefresh) => {
+			if (!forceRefresh && cached && Date.now() - cached.fetchedAt < cacheTtlMs) return cached.data;
+			if (!forceRefresh && summaryInFlight) return summaryInFlight;
+			const pending = loadSummary().finally(() => {
+				summaryInFlight = null;
+			});
+			summaryInFlight = pending;
+			const data = await pending;
+			cached = {
+				data,
+				fetchedAt: Date.now()
+			};
+			return data;
+		};
+		(0, node_http.createServer)(async (req, res) => {
+			try {
+				const url = new URL(req.url ?? "/", `http://${host}:${port}`);
+				const wantsRefresh = url.searchParams.get("refresh") === "1";
+				if (url.pathname === "/api/workout") {
+					const data$1 = await getSummary(wantsRefresh);
+					res.statusCode = 200;
+					res.setHeader("content-type", "application/json; charset=utf-8");
+					res.setHeader("cache-control", "no-store");
+					res.end(JSON.stringify(data$1.formatted, null, 2));
+					return;
+				}
+				if (url.pathname === "/favicon.ico") {
+					res.statusCode = 204;
+					res.end();
+					return;
+				}
+				if (url.pathname !== "/") {
+					res.statusCode = 404;
+					res.end("Not found");
+					return;
+				}
+				const data = await getSummary(wantsRefresh);
+				const dayParam = url.searchParams.get("day");
+				const selectedDayIndex = resolveSelectedDayIndex(data.days, data.summary?.workout_day?.day_index, data.summary?.workout_day?.day_label, dayParam);
+				const html = renderWorkoutPage({
+					summary: data.summary,
+					days: data.days,
+					selectedDayIndex,
+					timezone: data.timezone,
+					apiPath: "/api/workout",
+					refreshPath: "/?refresh=1",
+					isLatest: limit === 1
+				});
+				res.statusCode = 200;
+				res.setHeader("content-type", "text/html; charset=utf-8");
+				res.setHeader("cache-control", "no-store");
+				res.end(html);
+			} catch (error) {
+				res.statusCode = 500;
+				res.setHeader("content-type", "text/plain; charset=utf-8");
+				res.end(error instanceof Error ? error.message : "Server error");
+			}
+		}).listen(port, host, () => {
+			const cache = readWorkoutCache();
+			const freshConfig = readConfig();
+			const lastSync = cache?.updatedAt ?? "none";
+			const tokenExpiry = freshConfig.tokenExpiresAt ?? "unknown";
+			const tokenUpdatedAt = freshConfig.tokenUpdatedAt ?? "unknown";
+			logInfo(`Local workout server running at http://${host}:${port}`);
+			logInfo(`JSON endpoint at http://${host}:${port}/api/workout`);
+			logInfo(`Config: ${CONFIG_PATH}`);
+			logInfo(`Last workout sync: ${lastSync}`);
+			logInfo(`Token expiry: ${tokenExpiry}`);
+			if (tokenExpiry === "unknown" && tokenUpdatedAt !== "unknown") logInfo(`Token updated at: ${tokenUpdatedAt}`);
+		});
+	};
 	const resolveSelectedDayIndex = (days, eventDayIndex, eventDayLabel, dayParam) => {
 		const parseOptionalInt = (value) => {
 			if (!value) return;
@@ -2368,102 +2484,7 @@ async function handleWorkout(positionals, options) {
 		return;
 	}
 	if (action === "serve") {
-		const host = "127.0.0.1";
-		const port = 3e3;
-		const limit = 1;
-		const cacheTtlMs = 3e4;
-		const loadSummary = async () => {
-			const { text, payload, timezone } = await fetchWorkoutEventsPayload();
-			if (!Array.isArray(payload)) throw new Error(`Unexpected calendar response: ${text.slice(0, 200)}`);
-			const sorted = sortWorkoutEvents(filterWorkoutEvents(payload));
-			const bounded = limit > 0 ? sorted.slice(-limit) : sorted;
-			const programDetails = await buildProgramDetails(sorted);
-			const formatted = formatWorkoutEventsOutput(bounded, programDetails, {
-				timezone,
-				program: void 0,
-				workout: void 0
-			});
-			const summary = formatted.events[0];
-			const programUuid = summary?.program?.uuid ?? (bounded[0] && typeof bounded[0] === "object" ? bounded[0].program : void 0);
-			return {
-				formatted,
-				days: summarizeWorkoutProgramDays(programUuid ? programDetails[programUuid] : void 0),
-				summary,
-				timezone
-			};
-		};
-		let cached;
-		let summaryInFlight = null;
-		const getSummary = async (forceRefresh) => {
-			if (!forceRefresh && cached && Date.now() - cached.fetchedAt < cacheTtlMs) return cached.data;
-			if (!forceRefresh && summaryInFlight) return summaryInFlight;
-			const pending = loadSummary().finally(() => {
-				summaryInFlight = null;
-			});
-			summaryInFlight = pending;
-			const data = await pending;
-			cached = {
-				data,
-				fetchedAt: Date.now()
-			};
-			return data;
-		};
-		(0, node_http.createServer)(async (req, res) => {
-			try {
-				const url = new URL(req.url ?? "/", `http://${host}:${port}`);
-				const wantsRefresh = url.searchParams.get("refresh") === "1";
-				if (url.pathname === "/api/workout") {
-					const data$1 = await getSummary(wantsRefresh);
-					res.statusCode = 200;
-					res.setHeader("content-type", "application/json; charset=utf-8");
-					res.setHeader("cache-control", "no-store");
-					res.end(JSON.stringify(data$1.formatted, null, 2));
-					return;
-				}
-				if (url.pathname === "/favicon.ico") {
-					res.statusCode = 204;
-					res.end();
-					return;
-				}
-				if (url.pathname !== "/") {
-					res.statusCode = 404;
-					res.end("Not found");
-					return;
-				}
-				const data = await getSummary(wantsRefresh);
-				const dayParam = url.searchParams.get("day");
-				const selectedDayIndex = resolveSelectedDayIndex(data.days, data.summary?.workout_day?.day_index, data.summary?.workout_day?.day_label, dayParam);
-				const html = renderWorkoutPage({
-					summary: data.summary,
-					days: data.days,
-					selectedDayIndex,
-					timezone: data.timezone,
-					apiPath: "/api/workout",
-					refreshPath: "/?refresh=1",
-					isLatest: limit === 1
-				});
-				res.statusCode = 200;
-				res.setHeader("content-type", "text/html; charset=utf-8");
-				res.setHeader("cache-control", "no-store");
-				res.end(html);
-			} catch (error) {
-				res.statusCode = 500;
-				res.setHeader("content-type", "text/plain; charset=utf-8");
-				res.end(error instanceof Error ? error.message : "Server error");
-			}
-		}).listen(port, host, () => {
-			const cache = readWorkoutCache();
-			const freshConfig = readConfig();
-			const lastSync = cache?.updatedAt ?? "none";
-			const tokenExpiry = freshConfig.tokenExpiresAt ?? "unknown";
-			const tokenUpdatedAt = freshConfig.tokenUpdatedAt ?? "unknown";
-			logInfo(`Local workout server running at http://${host}:${port}`);
-			logInfo(`JSON endpoint at http://${host}:${port}/api/workout`);
-			logInfo(`Config: ${CONFIG_PATH}`);
-			logInfo(`Last workout sync: ${lastSync}`);
-			logInfo(`Token expiry: ${tokenExpiry}`);
-			if (tokenExpiry === "unknown" && tokenUpdatedAt !== "unknown") logInfo(`Token updated at: ${tokenUpdatedAt}`);
-		});
+		await startWorkoutServer();
 		return;
 	}
 	if (action === "sync") {
@@ -2471,21 +2492,22 @@ async function handleWorkout(positionals, options) {
 		const hasAuthConfig = !!authConfig && !!authConfig.password && (!!authConfig.email || !!authConfig.username);
 		const tokenUpdatedAt = config.tokenUpdatedAt ?? void 0;
 		const tokenExpiry = token && tokenUpdatedAt ? resolveTokenExpiry(token, tokenUpdatedAt) : null;
-		if (!(!!tokenExpiry && Date.now() < Date.parse(tokenExpiry)) && !hasAuthConfig) {
+		const hasValidToken = !!tokenExpiry && Date.now() < Date.parse(tokenExpiry);
+		let pendingAuth;
+		if (!hasValidToken && !hasAuthConfig) {
 			if (!process.stdin.isTTY) throw new Error("Missing auth credentials. Create ~/.config/kahunas/auth.json or run 'kahunas sync' in a terminal.");
 			const login = await askQuestion("Email or username: ", process.stderr);
 			if (!login) throw new Error("Missing email/username for login.");
-			const password = await askQuestion("Password: ", process.stderr);
+			const password = await askHiddenQuestion("Password: ", process.stderr);
 			if (!password) throw new Error("Missing password for login.");
 			const isEmail = login.includes("@");
-			writeAuthConfig({
+			pendingAuth = {
 				email: isEmail ? login : void 0,
 				username: isEmail ? void 0 : login,
 				password
-			});
-			console.error(`Saved credentials to ${AUTH_PATH}`);
+			};
 		}
-		const captured = await captureWorkoutsFromBrowser(options, config);
+		const captured = await captureWorkoutsFromBrowser(options, config, pendingAuth);
 		const nextConfig = { ...config };
 		if (captured.token) {
 			nextConfig.token = captured.token;
@@ -2507,8 +2529,12 @@ async function handleWorkout(positionals, options) {
 				path: WORKOUT_CACHE_PATH
 			}
 		}, null, 2));
+		if (pendingAuth && captured.token) {
+			writeAuthConfig(pendingAuth);
+			console.error(`Saved credentials to ${AUTH_PATH}`);
+		} else if (pendingAuth) console.error("Login was not detected; credentials were not saved.");
 		if (process.stdin.isTTY) {
-			if ((await askQuestion("Start the preview server now? (y/N): ", process.stderr)).toLowerCase().startsWith("y")) await handleWorkout(["serve"], options);
+			if ((await askQuestion("Start the preview server now? (y/N): ", process.stderr)).toLowerCase().startsWith("y")) await startWorkoutServer();
 		}
 		return;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kahunas-cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "",
   "main": "dist/cli.js",
   "bin": {