Skip to content

fix(cli): exit watch and files once their shutdown flush returns #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baairon merged 1 commit into from
Nov 4, 2026
Merged

fix(cli): exit watch and files once their shutdown flush returns #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ if (cmd.kind === "attach") {
// seedboxes and servers). Kept above the alt-screen setup below — these paths
// never touch the TUI. Each is dynamically imported so a plain `torlnk` launch
// pays nothing for them.
//
// Every long-running mode resolves from its SIGINT/SIGTERM handler once the
// synchronous state flush (queue.suspend) is done, and the CLI exits right
// there. It must never wait for the event loop to drain: that would mean
// waiting on webtorrent's teardown, which a single peer connection it has lost
// track of keeps from ever finishing, and the process then outlives its
// supervisor's stop forever (#207). State is already on disk, and the OS
// reclaims the sockets, the same bargain engine.destroy() and the TUI's
// forceExit make.
function failHeadless(err: unknown): never {
console.error(err instanceof Error ? err.message : String(err));
process.exit(1);
Expand All @@ -57,9 +66,10 @@ if (cmd.kind === "update") {
} else if (cmd.kind === "watch") {
if (cmd.daemon) daemonize("watch"); // parent exits here; the detached child continues
const { dir, downloadDir, seedTimeMs, deleteFiles, playlist } = cmd;
void import("./daemon/watch").then(({ runWatch }) =>
runWatch(dir, downloadDir, { seedTimeMs, deleteFiles, playlist }).catch(failHeadless),
);
void import("./daemon/watch")
.then(({ runWatch }) => runWatch(dir, downloadDir, { seedTimeMs, deleteFiles, playlist }))
.then(() => process.exit(0))
.catch(failHeadless);
} else if (cmd.kind === "seed") {
if (cmd.daemon) daemonize("seed");
const { path: target, seedTimeMs, deleteFiles } = cmd;
Expand Down Expand Up @@ -90,7 +100,10 @@ if (cmd.kind === "update") {
token: cmd.token ?? process.env.TORLINK_FILES_TOKEN,
dir: cmd.dir,
};
void import("./daemon/files").then(({ runFiles }) => runFiles(options).catch(failHeadless));
void import("./daemon/files")
.then(({ runFiles }) => runFiles(options))
.then(() => process.exit(0))
.catch(failHeadless);
} else if (cmd.kind === "search") {
// One JSON document on stdout, then exit: the shape a script can pipe into
// jq. Exit 1 only when every source failed, so an empty-but-healthy search
Expand Down
Loading