tokwatchr 0.7.0 → 0.7.1

package/dist/cli/index.mjs

@@ -1,13 +1,13 @@
 #! /usr/bin/env node
 import { cac } from "cac";
+import { basename, dirname, join } from "node:path";
 import pc from "picocolors";
 import { Impit } from "impit";
 import { spawn, spawnSync } from "node:child_process";
 import { EventEmitter } from "node:events";
 import { createWriteStream, existsSync, mkdirSync } from "node:fs";
-import { join } from "node:path";
 //#region package.json
-var version = "0.7.0";
+var version = "0.7.1";
 //#endregion
 //#region src/api/client.ts
 /**
@@ -1250,9 +1250,7 @@ function formatSpeed(bytesPerSec) {
 async function executeDownload(username, options) {
 	let downloader;
 	const onSignal = async () => {
-		console.log(`\n\n  ${pc.red("Stopping...")}`);
 		await downloader.stop();
-		process.exit(0);
 	};
 	process.on("SIGINT", onSignal);
 	process.on("SIGTERM", onSignal);
@@ -1279,7 +1277,7 @@ async function executeDownload(username, options) {
 				process.stderr.write(`\n  ${pc.dim("Remuxing...")}`);
 				break;
 			case "completed":
-				process.stderr.write(`\r  ${pc.green("Remuxed:")} ${info.outputPath}\n`);
+				process.stderr.write(`\r  ${pc.green("Remuxed:")} ${basename(info.outputPath ?? "")}\n`);
 				break;
 			case "failed":
 				process.stderr.write(`\n  ${pc.yellow("Remux failed, keeping .ts as fallback")}\n`);
@@ -1288,9 +1286,10 @@ async function executeDownload(username, options) {
 	});
 	downloader.on("complete", (results) => {
 		process.stderr.write("\n");
-		for (const r of results) console.log(`  ${pc.green("Saved:")} ${r.filePath}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`);
+		for (const r of results) console.log(`  ${pc.green("Saved:")} ${basename(r.filePath)}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`);
 		const totalMB = results.reduce((sum, r) => sum + r.sizeMB, 0);
 		console.log(`  Done — ${results.length} segment(s), ${totalMB.toFixed(1)}MB total`);
+		if (results.length > 0) console.log(`  ${pc.dim(`Output: ${dirname(results[0]?.filePath ?? "")}/`)}`);
 	});
 	try {
 		await downloader.startRecording();
@@ -1317,10 +1316,10 @@ async function executeDownload(username, options) {
 */
 async function executeWatch(username, options) {
 	let downloader;
+	let stopped = false;
 	const onSignal = async () => {
-		console.log(`\n\n  ${pc.red("Stopping...")}`);
+		stopped = true;
 		await downloader.stop();
-		process.exit(0);
 	};
 	process.on("SIGINT", onSignal);
 	process.on("SIGTERM", onSignal);
@@ -1352,7 +1351,7 @@ async function executeWatch(username, options) {
 				process.stderr.write(`\n  ${pc.dim("Remuxing...")}`);
 				break;
 			case "completed":
-				process.stderr.write(`\r  ${pc.green("Remuxed:")} ${info.outputPath}\n`);
+				process.stderr.write(`\r  ${pc.green("Remuxed:")} ${basename(info.outputPath ?? "")}\n`);
 				break;
 			case "failed":
 				process.stderr.write(`\n  ${pc.yellow("Remux failed, keeping .ts as fallback")}\n`);
@@ -1361,26 +1360,32 @@ async function executeWatch(username, options) {
 	});
 	downloader.on("segment", (result, partNum) => {
 		process.stderr.write("\n");
-		console.log(`  ${pc.green("Segment")} ${partNum}: ${result.filePath}  ${pc.dim(`(${formatBytes(result.sizeBytes)}, ${formatDuration(result.duration)})`)}`);
+		console.log(`  ${pc.green("Segment")} ${partNum}: ${basename(result.filePath)}  ${pc.dim(`(${formatBytes(result.sizeBytes)}, ${formatDuration(result.duration)})`)}`);
 	});
 	downloader.on("complete", (results) => {
 		process.stderr.write("\n");
-		for (const r of results) console.log(`  ${pc.green("Saved:")} ${r.filePath}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`);
+		for (const r of results) console.log(`  ${pc.green("Saved:")} ${basename(r.filePath)}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`);
 		const totalMB = results.reduce((sum, r) => sum + r.sizeMB, 0);
 		console.log(`  Done — ${results.length} segment(s), ${totalMB.toFixed(1)}MB total`);
+		if (results.length > 0) console.log(`  ${pc.dim(`Output: ${dirname(results[0]?.filePath ?? "")}/`)}`);
 	});
 	console.log(`${pc.dim("Waiting for ")}${pc.blue(username)}${pc.dim(" to go live...")}`);
-	while (true) try {
-		await downloader.start();
-		console.log(`\n  ${pc.dim("Stream ended, watching for next...")}`);
-	} catch (error) {
-		if (error instanceof UserNotFoundError) {
-			console.error(pc.red("[error]"), "User not found. Check the username and try again.");
-			process.exit(1);
+	while (true) {
+		if (stopped) break;
+		try {
+			await downloader.start();
+			if (stopped) break;
+			console.log(`\n  ${pc.dim("Stream ended, watching for next...")}`);
+		} catch (error) {
+			if (stopped) break;
+			if (error instanceof UserNotFoundError) {
+				console.error(pc.red("[error]"), "User not found. Check the username and try again.");
+				process.exit(1);
+			}
+			console.error(`\n  ${pc.yellow(`[warning] ${error}`)}`);
+			await new Promise((r) => setTimeout(r, 1e4));
+			console.log(`  ${pc.dim("Retrying...")}`);
 		}
-		console.error(`\n  ${pc.yellow(`[warning] ${error}`)}`);
-		await new Promise((r) => setTimeout(r, 1e4));
-		console.log(`  ${pc.dim("Retrying...")}`);
 	}
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tokwatchr",
-	"version": "0.7.0",
+	"version": "0.7.1",
 	"description": "Download TikTok livestreams. Given a username, download the livestream.",
 	"type": "module",
 	"bin": {

package/src/cli/commands/download.ts

@@ -1,3 +1,4 @@
+import { basename, dirname } from "node:path";
 import pc from "picocolors";
 import type {
 	DownloadResult,
@@ -28,9 +29,8 @@ export async function executeDownload(
 	// ─── SIGINT / SIGTERM (registered BEFORE any async work) ─────
 
 	const onSignal = async () => {
-		console.log(`\n\n  ${pc.red("Stopping...")}`);
 		await downloader.stop();
-		process.exit(0);
+		// No process.exit — let event loop drain naturally
 	};
 	process.on("SIGINT", onSignal);
 	process.on("SIGTERM", onSignal);
@@ -68,7 +68,7 @@ export async function executeDownload(
 				break;
 			case "completed":
 				process.stderr.write(
-					`\r  ${pc.green("Remuxed:")} ${info.outputPath}\n`,
+					`\r  ${pc.green("Remuxed:")} ${basename(info.outputPath ?? "")}\n`,
 				);
 				break;
 			case "failed":
@@ -83,13 +83,18 @@ export async function executeDownload(
 		process.stderr.write("\n");
 		for (const r of results) {
 			console.log(
-				`  ${pc.green("Saved:")} ${r.filePath}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`,
+				`  ${pc.green("Saved:")} ${basename(r.filePath)}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`,
 			);
 		}
 		const totalMB = results.reduce((sum, r) => sum + r.sizeMB, 0);
 		console.log(
 			`  Done — ${results.length} segment(s), ${totalMB.toFixed(1)}MB total`,
 		);
+		if (results.length > 0) {
+			console.log(
+				`  ${pc.dim(`Output: ${dirname(results[0]?.filePath ?? "")}/`)}`,
+			);
+		}
 	});
 
 	// ─── Start ──────────────────────────────────────────────

package/src/cli/commands/watch.ts

@@ -1,3 +1,4 @@
+import { basename, dirname } from "node:path";
 import pc from "picocolors";
 import type {
 	DownloadResult,
@@ -21,13 +22,14 @@ export async function executeWatch(
 	options: WatchCliOptions,
 ): Promise<void> {
 	let downloader: TikTokLiveDownloader;
+	let stopped = false;
 
 	// ─── SIGINT / SIGTERM (registered BEFORE any async work) ─────
 
 	const onSignal = async () => {
-		console.log(`\n\n  ${pc.red("Stopping...")}`);
+		stopped = true;
 		await downloader.stop();
-		process.exit(0);
+		// No process.exit — let event loop drain naturally
 	};
 	process.on("SIGINT", onSignal);
 	process.on("SIGTERM", onSignal);
@@ -73,7 +75,7 @@ export async function executeWatch(
 				break;
 			case "completed":
 				process.stderr.write(
-					`\r  ${pc.green("Remuxed:")} ${info.outputPath}\n`,
+					`\r  ${pc.green("Remuxed:")} ${basename(info.outputPath ?? "")}\n`,
 				);
 				break;
 			case "failed":
@@ -87,7 +89,7 @@ export async function executeWatch(
 	downloader.on("segment", (result: DownloadResult, partNum: number) => {
 		process.stderr.write("\n");
 		console.log(
-			`  ${pc.green("Segment")} ${partNum}: ${result.filePath}  ${pc.dim(`(${formatBytes(result.sizeBytes)}, ${formatDuration(result.duration)})`)}`,
+			`  ${pc.green("Segment")} ${partNum}: ${basename(result.filePath)}  ${pc.dim(`(${formatBytes(result.sizeBytes)}, ${formatDuration(result.duration)})`)}`,
 		);
 	});
 
@@ -95,13 +97,18 @@ export async function executeWatch(
 		process.stderr.write("\n");
 		for (const r of results) {
 			console.log(
-				`  ${pc.green("Saved:")} ${r.filePath}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`,
+				`  ${pc.green("Saved:")} ${basename(r.filePath)}  ${pc.dim(`(${formatBytes(r.sizeBytes)}, ${formatDuration(r.duration)})`)}`,
 			);
 		}
 		const totalMB = results.reduce((sum, r) => sum + r.sizeMB, 0);
 		console.log(
 			`  Done — ${results.length} segment(s), ${totalMB.toFixed(1)}MB total`,
 		);
+		if (results.length > 0) {
+			console.log(
+				`  ${pc.dim(`Output: ${dirname(results[0]?.filePath ?? "")}/`)}`,
+			);
+		}
 	});
 
 	// ─── Start (persistent loop) ────────────────────────────
@@ -111,12 +118,15 @@ export async function executeWatch(
 	);
 
 	while (true) {
+		if (stopped) break;
 		try {
 			await downloader.start();
+			if (stopped) break;
 			// Stream ended — complete event already printed results.
 			// Continue watching for the next one.
 			console.log(`\n  ${pc.dim("Stream ended, watching for next...")}`);
 		} catch (error) {
+			if (stopped) break;
 			if (error instanceof UserNotFoundError) {
 				console.error(
 					pc.red("[error]"),