torrent-tui 0.0.2 → 0.0.4

package/src/controllers/app-controller.ts

@@ -1,43 +1,60 @@
-import type { CliRenderer, KeyEvent } from "@opentui/core";
+import type { CliRenderer, KeyEvent, PasteEvent } from "@opentui/core";
 import { SIDEBAR_ITEMS } from "../constants";
 import type { ConfirmDialog } from "../layout/confirm-dialog";
-import type { ContentWindow } from "../layout/content-window";
+import type { ContentWindow, FocusArea } from "../layout/content-window";
+import {
+	type DetailTab,
+	getDetailMaxScrollOffset,
+} from "../layout/detail-panel";
 import type { Sidebar } from "../layout/sidebar";
+import type { StatusBar } from "../layout/status-bar";
 import type { ToastManager } from "../layout/toast-manager";
 import type { Store } from "../store";
 import { filterTorrents } from "../utils/filter";
 
 type FocusMode = "global" | "dialog";
-type FocusArea = "sidebar" | "table";
+const DETAIL_TABS: DetailTab[] = ["Pieces", "Peers", "Files"];
 
 export class AppController {
 	private renderer: CliRenderer;
 	private store: Store;
 	private sidebar: Sidebar;
 	private contentWindow: ContentWindow;
+	private statusBar: StatusBar;
 	private toastManager: ToastManager;
 	focusMode: FocusMode = "global";
 	focusArea: FocusArea = "sidebar";
 	private tableSelectedIndex = 0;
+	private detailTabIndex = 0;
+	private detailScrollOffsets: Record<DetailTab, number> = {
+		Pieces: 0,
+		Peers: 0,
+		Files: 0,
+	};
+	private lastDetailTorrentId: string | null = null;
 	private pendingDeleteId: string | null = null;
 
 	// Injected by App after bridge/dialog are created
 	onAddTorrent?: () => void;
 	onQuit?: () => void;
 	onDialogClose?: () => void;
-	onDialogInput?: (key: string) => boolean;
-	onPauseTorrent?: (id: string) => void;
-	onResumeTorrent?: (id: string) => void;
-	onStartTorrent?: (id: string) => void;
-	onRemoveTorrent?: (id: string, deleteFiles: boolean) => void;
+	onDialogInput?: (key: KeyEvent) => boolean;
+	onDialogPaste?: (event: PasteEvent) => boolean;
+	onPauseTorrent?: (id: string) => Promise<void> | void;
+	onResumeTorrent?: (id: string) => Promise<void> | void;
+	onStartTorrent?: (id: string) => Promise<void> | void;
+	onRemoveTorrent?: (id: string, deleteFiles: boolean) => Promise<void> | void;
 
 	private _confirmDialog: ConfirmDialog | null = null;
 	set confirmDialog(dialog: ConfirmDialog) {
 		this._confirmDialog = dialog;
 		dialog.onConfirm = () => {
 			this.focusMode = "global";
-			if (this.pendingDeleteId) {
-				this.onRemoveTorrent?.(this.pendingDeleteId, true);
+			const pendingDeleteId = this.pendingDeleteId;
+			if (pendingDeleteId) {
+				this.runTorrentAction("remove torrent", () =>
+					this.onRemoveTorrent?.(pendingDeleteId, true),
+				);
 				this.pendingDeleteId = null;
 			}
 		};
@@ -52,12 +69,14 @@ export class AppController {
 		store: Store,
 		sidebar: Sidebar,
 		contentWindow: ContentWindow,
+		statusBar: StatusBar,
 		toastManager: ToastManager,
 	) {
 		this.renderer = renderer;
 		this.store = store;
 		this.sidebar = sidebar;
 		this.contentWindow = contentWindow;
+		this.statusBar = statusBar;
 		this.toastManager = toastManager;
 	}
 
@@ -69,13 +88,23 @@ export class AppController {
 			} else if (len === 0) {
 				this.tableSelectedIndex = 0;
 			}
+			this.syncDetailState();
 			this.sidebar.update(state, this.focusArea);
-			this.contentWindow.update(this.focusArea, this.tableSelectedIndex);
+			this.contentWindow.update(
+				this.focusArea,
+				this.tableSelectedIndex,
+				this.getDetailTab(),
+				this.getDetailScrollOffset(),
+			);
+			this.statusBar.update(state, this.focusArea);
 		});
 
 		this.renderer.keyInput.on("keypress", (key) => {
 			this.handleKeyPress(key);
 		});
+		this.renderer.keyInput.on("paste", (event: PasteEvent) => {
+			this.handlePaste(event);
+		});
 
 		this.refreshView();
 	}
@@ -83,12 +112,104 @@ export class AppController {
 	private refreshView(): void {
 		const state = this.store.getState();
 		this.sidebar.update(state, this.focusArea);
-		this.contentWindow.update(this.focusArea, this.tableSelectedIndex);
+		this.contentWindow.update(
+			this.focusArea,
+			this.tableSelectedIndex,
+			this.getDetailTab(),
+			this.getDetailScrollOffset(),
+		);
+		this.statusBar.update(state, this.focusArea);
+	}
+
+	private runTorrentAction(
+		label: string,
+		action: () => Promise<void> | void,
+	): void {
+		Promise.resolve()
+			.then(action)
+			.catch((err: unknown) => {
+				this.toastManager.show({
+					id: `action-${Date.now()}`,
+					type: "error",
+					title: `Failed to ${label}`,
+					message: err instanceof Error ? err.message : String(err),
+				});
+			});
 	}
 
 	private getSelectedId(): string | null {
 		const state = this.store.getState();
-		return filterTorrents(state.torrents, state.selectedView)[this.tableSelectedIndex]?.id ?? null;
+		return (
+			filterTorrents(state.torrents, state.selectedView)[
+				this.tableSelectedIndex
+			]?.id ?? null
+		);
+	}
+
+	private getDetailTab(): DetailTab {
+		return DETAIL_TABS[this.detailTabIndex] ?? "Pieces";
+	}
+
+	private moveDetailTab(delta: number): void {
+		this.detailTabIndex =
+			(this.detailTabIndex + delta + DETAIL_TABS.length) % DETAIL_TABS.length;
+		this.refreshView();
+	}
+
+	private getDetailScrollOffset(): number {
+		return this.detailScrollOffsets[this.getDetailTab()] ?? 0;
+	}
+
+	private setDetailScrollOffset(offset: number): void {
+		this.detailScrollOffsets[this.getDetailTab()] = offset;
+	}
+
+	private resetDetailScrollOffsets(): void {
+		this.detailScrollOffsets = {
+			Pieces: 0,
+			Peers: 0,
+			Files: 0,
+		};
+	}
+
+	private getSelectedTorrent() {
+		const state = this.store.getState();
+		return (
+			filterTorrents(state.torrents, state.selectedView)[
+				this.tableSelectedIndex
+			] ?? null
+		);
+	}
+
+	private syncDetailState(): void {
+		const torrentId = this.getSelectedTorrent()?.id ?? null;
+		if (torrentId !== this.lastDetailTorrentId) {
+			this.lastDetailTorrentId = torrentId;
+			this.resetDetailScrollOffsets();
+		}
+		const maxOffset = getDetailMaxScrollOffset(
+			this.getSelectedTorrent(),
+			this.getDetailTab(),
+			this.contentWindow.getDetailBodyRowCount(),
+		);
+		this.setDetailScrollOffset(
+			Math.max(0, Math.min(this.getDetailScrollOffset(), maxOffset)),
+		);
+	}
+
+	private moveDetailScroll(delta: number): void {
+		const maxOffset = getDetailMaxScrollOffset(
+			this.getSelectedTorrent(),
+			this.getDetailTab(),
+			this.contentWindow.getDetailBodyRowCount(),
+		);
+		const nextOffset = Math.max(
+			0,
+			Math.min(this.getDetailScrollOffset() + delta, maxOffset),
+		);
+		if (nextOffset === this.getDetailScrollOffset()) return;
+		this.setDetailScrollOffset(nextOffset);
+		this.refreshView();
 	}
 
 	private handleKeyPress(key: KeyEvent): void {
@@ -99,8 +220,13 @@ export class AppController {
 				if (key.name === "escape") {
 					this.focusMode = "global";
 					this.onDialogClose?.();
+					key.preventDefault();
+					key.stopPropagation();
 				} else {
-					this.onDialogInput?.(key.name);
+					if (this.onDialogInput?.(key)) {
+						key.preventDefault();
+						key.stopPropagation();
+					}
 				}
 			}
 			return;
@@ -110,57 +236,113 @@ export class AppController {
 			return;
 		}
 
+		if (key.shift && key.name === "tab") {
+			this.focusArea = this.previousFocusArea();
+			this.refreshView();
+			return;
+		}
+
 		if (key.name === "tab") {
-			this.focusArea = this.focusArea === "sidebar" ? "table" : "sidebar";
+			this.focusArea = this.nextFocusArea();
 			this.refreshView();
 			return;
 		}
 
+		if (this.focusArea === "details") {
+			if (
+				key.name === "h" ||
+				key.name === "[" ||
+				key.name === "leftbracket" ||
+				key.name === "left"
+			) {
+				this.moveDetailTab(-1);
+				return;
+			}
+			if (
+				key.name === "l" ||
+				key.name === "]" ||
+				key.name === "rightbracket" ||
+				key.name === "right"
+			) {
+				this.moveDetailTab(1);
+				return;
+			}
+		}
+
 		if (key.name === "j" || key.name === "down") {
 			if (this.focusArea === "sidebar") {
 				const total = SIDEBAR_ITEMS.status.length;
 				const state = this.store.getState();
 				const next = (state.selectedIndex + 1) % total;
-				this.store.setState({ selectedIndex: next, selectedView: SIDEBAR_ITEMS.status[next] ?? "All" });
-			} else {
+				this.store.setState({
+					selectedIndex: next,
+					selectedView: SIDEBAR_ITEMS.status[next] ?? "All",
+				});
+			} else if (this.focusArea === "table") {
 				const state = this.store.getState();
 				const len = filterTorrents(state.torrents, state.selectedView).length;
 				if (len > 0) {
-					this.tableSelectedIndex = Math.min(this.tableSelectedIndex + 1, len - 1);
+					this.tableSelectedIndex = Math.min(
+						this.tableSelectedIndex + 1,
+						len - 1,
+					);
 					this.refreshView();
 				}
+			} else if (this.focusArea === "details") {
+				this.moveDetailScroll(1);
 			}
 		} else if (key.name === "k" || key.name === "up") {
 			if (this.focusArea === "sidebar") {
 				const total = SIDEBAR_ITEMS.status.length;
 				const state = this.store.getState();
 				const prev = (state.selectedIndex - 1 + total) % total;
-				this.store.setState({ selectedIndex: prev, selectedView: SIDEBAR_ITEMS.status[prev] ?? "All" });
-			} else {
+				this.store.setState({
+					selectedIndex: prev,
+					selectedView: SIDEBAR_ITEMS.status[prev] ?? "All",
+				});
+			} else if (this.focusArea === "table") {
 				if (this.tableSelectedIndex > 0) {
 					this.tableSelectedIndex--;
 					this.refreshView();
 				}
+			} else if (this.focusArea === "details") {
+				this.moveDetailScroll(-1);
 			}
 		} else if (key.name === "space") {
 			if (this.focusArea === "table") {
 				const id = this.getSelectedId();
 				if (!id) return;
 				const state = this.store.getState();
-				const torrent = filterTorrents(state.torrents, state.selectedView)[this.tableSelectedIndex];
+				const torrent = filterTorrents(state.torrents, state.selectedView)[
+					this.tableSelectedIndex
+				];
 				if (!torrent) return;
 				if (torrent.status === "downloading") {
-					this.onPauseTorrent?.(id);
+					this.runTorrentAction("pause torrent", () =>
+						this.onPauseTorrent?.(id),
+					);
 				} else if (torrent.status === "paused") {
-					this.onResumeTorrent?.(id);
-				} else if (torrent.status === "stopped") {
-					this.onStartTorrent?.(id);
+					this.runTorrentAction("resume torrent", () =>
+						this.onResumeTorrent?.(id),
+					);
+				} else if (
+					torrent.status === "stopped" ||
+					torrent.status === "stalled" ||
+					torrent.status === "error" ||
+					torrent.status === "missing"
+				) {
+					this.runTorrentAction("start torrent", () =>
+						this.onStartTorrent?.(id),
+					);
 				}
 			}
 		} else if (key.name === "d" && !key.shift) {
 			if (this.focusArea === "table") {
 				const id = this.getSelectedId();
-				if (id) this.onRemoveTorrent?.(id, false);
+				if (id)
+					this.runTorrentAction("remove torrent", () =>
+						this.onRemoveTorrent?.(id, false),
+					);
 			}
 		} else if (key.name === "d" && key.shift) {
 			if (this.focusArea === "table") {
@@ -173,8 +355,39 @@ export class AppController {
 		} else if (key.name === "a") {
 			this.focusMode = "dialog";
 			this.onAddTorrent?.();
+			key.preventDefault();
+			key.stopPropagation();
 		} else if (key.name === "q") {
 			this.onQuit?.();
 		}
 	}
+
+	private handlePaste(event: PasteEvent): void {
+		if (this.focusMode !== "dialog" || this._confirmDialog?.getIsOpen()) return;
+		if (this.onDialogPaste?.(event)) {
+			event.preventDefault();
+		}
+	}
+
+	private nextFocusArea(): FocusArea {
+		switch (this.focusArea) {
+			case "sidebar":
+				return "table";
+			case "table":
+				return "details";
+			case "details":
+				return "sidebar";
+		}
+	}
+
+	private previousFocusArea(): FocusArea {
+		switch (this.focusArea) {
+			case "sidebar":
+				return "details";
+			case "table":
+				return "sidebar";
+			case "details":
+				return "table";
+		}
+	}
 }

package/src/index.ts

@@ -1,6 +1,5 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { getPeers } from "./torrent/get_peers";
 
 class CliExit extends Error {}
 
@@ -21,13 +20,18 @@ async function printHelp(): Promise<void> {
 
 Usage:
   torrent-tui                         Start the terminal UI
-  torrent-tui <file.torrent>          Announce and print peers
+  torrent-tui <file.torrent>          Start the TUI and add the torrent
+  torrent-tui <magnet-uri>            Start the TUI and fetch magnet metadata
   torrent-tui <file.torrent> --verify Verify local pieces and trackers
   torrent-tui <file.torrent> --handshake
                                       Connect to peers and print handshake summary
-  torrent-tui <file.torrent> --download
+  torrent-tui <file.torrent|magnet> --download
                                       Download from the command line
 
+Magnet links:
+  Supported for BitTorrent v1 btih magnets with trackers, x.pe peers, or DHT peers.
+  --verify and --handshake can use a magnet after its metadata is cached.
+
 Options:
   --help, -h                          Show this help
   --version, -v                       Print the version`);
@@ -43,6 +47,27 @@ function validateTorrentArg(arg: string): string {
 	return arg;
 }
 
+async function resolveTorrentArg(arg: string): Promise<string> {
+	const { isMagnetUri } = await import("./torrent/magnet");
+	if (!isMagnetUri(arg)) return validateTorrentArg(arg);
+	const { resolveMagnetToTorrent } = await import("./torrent/magnet-resolver");
+	const result = await resolveMagnetToTorrent(arg);
+	return result.torrentPath;
+}
+
+async function cachedTorrentArg(arg: string): Promise<string> {
+	const { isMagnetUri, parseMagnetUri } = await import("./torrent/magnet");
+	if (!isMagnetUri(arg)) return validateTorrentArg(arg);
+	const { metadataCachePath, readCachedMetadata } = await import(
+		"./torrent/metadata-cache"
+	);
+	const magnet = parseMagnetUri(arg);
+	if (!readCachedMetadata(magnet.infoHashHex)) {
+		fail("Error: cached metadata not found; add or download the magnet first");
+	}
+	return metadataCachePath(magnet.infoHashHex);
+}
+
 function sep(): void {
 	console.log("-".repeat(44));
 }
@@ -185,9 +210,16 @@ async function runHandshake(torrentPath: string): Promise<void> {
 }
 
 async function runDownload(torrentPath: string): Promise<void> {
-	const { announce } = await import("./torrent/tracker/announce");
 	const { PeerManager } = await import("./torrent/peer/manager");
 	const { getPeerId, peerIdToString } = await import("./torrent/peer/peer-id");
+	const { DiscoveryCoordinator } = await import(
+		"./torrent/discovery/coordinator"
+	);
+	const {
+		createUploadedAccumulator,
+		recordRemovedPeerUpload,
+		uploadedSnapshot,
+	} = await import("./torrent/upload-accounting");
 	const { metadata, session } = await loadTorrent(torrentPath);
 	const { log } = await import("./torrent/metadata");
 
@@ -196,30 +228,42 @@ async function runDownload(torrentPath: string): Promise<void> {
 
 	await session.start();
 
-	const trackerResult = await announce(metadata).catch(() => null);
-	const peers = trackerResult?.peers ?? [];
-
 	console.log("");
 	const manager = new PeerManager(metadata);
 	await manager.start();
-
-	// connect() now resolves only after each handshake completes —
-	// so all handshake logs finish before the progress bar starts
-	await manager.connect(peers);
-
-	if (manager.connections.size === 0) {
-		log("error", "no peers connected — cannot download");
-		manager.close();
-		return;
-	}
-
-	const unchoked = manager.getUnchoked().length;
-	log("peers", `${manager.connections.size} connected   ${unchoked} unchoked`);
+	const uploadedAccumulator = createUploadedAccumulator();
+	const trackerCoordinator = new DiscoveryCoordinator(metadata, manager, {
+		getSnapshot: () => {
+			const downloaded = session.storage.downloadedBytes;
+			const uploaded = uploadedSnapshot(
+				uploadedAccumulator,
+				manager.connections.values(),
+			);
+			return {
+				downloaded,
+				uploaded,
+				left: Math.max(0, metadata.totalSize - downloaded),
+			};
+		},
+		onPeers: (peers) => {
+			void manager.connect(peers).then(() => {
+				const unchokedNow = manager.getUnchoked().length;
+				log(
+					"peers",
+					`${manager.connections.size} connected   ${unchokedNow} unchoked`,
+				);
+			});
+		},
+	});
+	manager.on("peerRemoved", (conn: { uploadedTotal: number } & object) => {
+		recordRemovedPeerUpload(uploadedAccumulator, conn);
+		if (manager.connections.size === 0) trackerCoordinator.refreshNow();
+	});
+	await trackerCoordinator.start();
 
 	manager.startChoking();
 	const downloader = session.download(manager);
-	log("log file", downloader.getLogFilePath());
-	console.log("");
+	session.on("complete", () => trackerCoordinator.markCompleted());
 
 	await new Promise<void>((resolve) => {
 		session.on("complete", () => resolve());
@@ -259,6 +303,7 @@ async function runDownload(torrentPath: string): Promise<void> {
 	}
 	console.log(line);
 
+	await trackerCoordinator.stop();
 	manager.close();
 }
 
@@ -281,41 +326,47 @@ async function main() {
 	const isDownload = args.includes("--download");
 
 	if (torrentArg) {
-		const torrentPath = validateTorrentArg(torrentArg);
+		const { isMagnetUri } = await import("./torrent/magnet");
+		const torrentPath = isMagnetUri(torrentArg)
+			? torrentArg
+			: validateTorrentArg(torrentArg);
 
 		if (isVerify) {
-			await runVerify(torrentPath).catch((e) =>
-				fail(`Error: ${e instanceof Error ? e.message : e}`),
+			const resolvedPath = await cachedTorrentArg(torrentPath);
+			await runVerify(resolvedPath).catch((e: unknown) =>
+				fail(`Error: ${e instanceof Error ? e.message : String(e)}`),
 			);
 			return;
 		}
 
 		if (isHandshake) {
-			await runHandshake(torrentPath).catch((e) =>
-				fail(`Error: ${e instanceof Error ? e.message : e}`),
+			const resolvedPath = await cachedTorrentArg(torrentPath);
+			await runHandshake(resolvedPath).catch((e: unknown) =>
+				fail(`Error: ${e instanceof Error ? e.message : String(e)}`),
 			);
 			return;
 		}
 
 		if (isDownload) {
-			await runDownload(torrentPath).catch((e) =>
-				fail(`Error: ${e instanceof Error ? e.message : e}`),
+			const resolvedPath = await resolveTorrentArg(torrentPath).catch(
+				(e: unknown) =>
+					fail(`Error: ${e instanceof Error ? e.message : String(e)}`),
+			);
+			await runDownload(resolvedPath).catch((e: unknown) =>
+				fail(`Error: ${e instanceof Error ? e.message : String(e)}`),
 			);
 			return;
 		}
 
-		try {
-			await getPeers(torrentPath, 6881, 50);
-		} catch (e) {
-			fail(`Error: ${e instanceof Error ? e.message : e}`);
-		}
-
+		const { App } = await import("./app");
+		const app = new App();
+		await app.start(torrentPath);
 		return;
 	}
 
 	const { App } = await import("./app");
 	const app = new App();
-	app.start();
+	await app.start();
 }
 
 main().catch((err: unknown) => {