tokwatchr 0.4.2 → 0.4.4

package/dist/index.d.mts

@@ -237,6 +237,12 @@ declare class TikTokLiveDownloader {
   private resolveRoomIdOnce;
   private resolveRoomIdWithRetry;
   private fetchStreamInfo;
+  /**
+   * Poll for stream info until the stream becomes active.
+   * Used in waitForLive mode when the room exists but the stream
+   * has not yet started broadcasting.
+   */
+  private pollStreamInfo;
   /**
    * Download a single segment. Always downloads to .ts (crash-safe).
    * Does NOT remux — that is handled by remuxSegment() running in the background.

package/dist/index.mjs

@@ -391,21 +391,8 @@ async function downloadWithFfmpeg(options) {
 		let stderrBuffer = "";
 		let sizeBytes = 0;
 		let duration = 0;
-		const abortHandler = () => {
-			proc.kill("SIGTERM");
-			setTimeout(() => {
-				if (proc.exitCode === null) proc.kill("SIGKILL");
-			}, 15e3);
-		};
-		let aborted = false;
-		const onAbort = () => {
-			aborted = true;
-			abortHandler();
-		};
-		signal?.addEventListener("abort", onAbort, { once: true });
 		let firstDataTimer = setTimeout(() => {
 			firstDataTimer = null;
-			signal?.removeEventListener("abort", onAbort);
 			proc.kill("SIGTERM");
 			reject(new FfmpegError(`ffmpeg produced no output within ${timeout}ms — check the stream URL`));
 		}, timeout);
@@ -439,9 +426,7 @@ async function downloadWithFfmpeg(options) {
 				clearTimeout(firstDataTimer);
 				firstDataTimer = null;
 			}
-			signal?.removeEventListener("abort", onAbort);
 			if (err.name === "AbortError") {
-				aborted = true;
 				resolve({
 					sizeBytes,
 					duration,
@@ -456,8 +441,7 @@ async function downloadWithFfmpeg(options) {
 				clearTimeout(firstDataTimer);
 				firstDataTimer = null;
 			}
-			signal?.removeEventListener("abort", onAbort);
-			if (aborted) {
+			if (signal?.aborted) {
 				resolve({
 					sizeBytes,
 					duration,
@@ -636,7 +620,7 @@ const DEFAULT_OPTIONS = {
 	bitrate: null,
 	maxDuration: Infinity,
 	maxSegmentDuration: Infinity,
-	checkInterval: 3e4,
+	checkInterval: 18e4,
 	proxyUrl: null,
 	cookieJar: null,
 	browser: "chrome",
@@ -789,7 +773,7 @@ var TikTokLiveDownloader = class {
 			if (!roomId && waitForLive) roomId = await this.resolveRoomIdWithRetry();
 			if (!roomId) throw new UserOfflineError(this.username);
 			this.setState("waiting");
-			const firstInfo = await this.fetchStreamInfo(roomId);
+			const firstInfo = waitForLive ? await this.pollStreamInfo(roomId) : await this.fetchStreamInfo(roomId);
 			if (!(this.options.maxSegmentDuration > 0 && this.options.maxSegmentDuration < Infinity)) {
 				const tsResult = await this.downloadSegment(firstInfo, 1);
 				const finalResult = await this.remuxSegment(tsResult);
@@ -850,7 +834,7 @@ var TikTokLiveDownloader = class {
 	}
 	async resolveRoomIdWithRetry() {
 		const interval = this.options.checkInterval;
-		const maxInterval = Math.max(interval, 3e4);
+		const maxInterval = Math.max(interval, 18e4);
 		while (true) {
 			this.abortController.signal?.throwIfAborted();
 			const roomId = await this.resolveRoomIdOnce();
@@ -868,6 +852,27 @@ var TikTokLiveDownloader = class {
 		return info;
 	}
 	/**
+	* Poll for stream info until the stream becomes active.
+	* Used in waitForLive mode when the room exists but the stream
+	* has not yet started broadcasting.
+	*/
+	async pollStreamInfo(roomId) {
+		const interval = this.options.checkInterval;
+		const maxInterval = Math.max(interval, 18e4);
+		while (true) {
+			this.abortController.signal?.throwIfAborted();
+			try {
+				return await this.fetchStreamInfo(roomId);
+			} catch (err) {
+				if (err instanceof StreamFetchError) {
+					await sleep(maxInterval);
+					continue;
+				}
+				throw err;
+			}
+		}
+	}
+	/**
 	* Download a single segment. Always downloads to .ts (crash-safe).
 	* Does NOT remux — that is handled by remuxSegment() running in the background.
 	*/

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tokwatchr",
-	"version": "0.4.2",
+	"version": "0.4.4",
 	"description": "Download TikTok livestreams. Given a username, download the livestream.",
 	"type": "module",
 	"main": "./dist/index.mjs",

package/src/TikTokLiveDownloader.ts

@@ -9,7 +9,11 @@ import { resolveRoomId } from "./api/room.js";
 import { fetchStreamInfo } from "./api/stream.js";
 import { downloadWithFfmpeg } from "./download/ffmpeg.js";
 import { downloadRawHttp } from "./download/raw-http.js";
-import { UserNotFoundError, UserOfflineError } from "./errors.js";
+import {
+	StreamFetchError,
+	UserNotFoundError,
+	UserOfflineError,
+} from "./errors.js";
 import type {
 	DownloaderState,
 	DownloadResult,
@@ -32,7 +36,7 @@ const DEFAULT_OPTIONS: ResolvedOptions = {
 	bitrate: null,
 	maxDuration: Infinity,
 	maxSegmentDuration: Infinity,
-	checkInterval: 30_000,
+	checkInterval: 180_000,
 	proxyUrl: null,
 	cookieJar: null,
 	browser: "chrome",
@@ -259,7 +263,9 @@ export class TikTokLiveDownloader {
 
 			// Phase 2: Get stream info (refreshed per segment to avoid stale URLs)
 			this.setState("waiting");
-			const firstInfo = await this.fetchStreamInfo(roomId);
+			const firstInfo = waitForLive
+				? await this.pollStreamInfo(roomId)
+				: await this.fetchStreamInfo(roomId);
 
 			const segmentEnabled =
 				this.options.maxSegmentDuration > 0 &&
@@ -361,7 +367,7 @@ export class TikTokLiveDownloader {
 
 	private async resolveRoomIdWithRetry(): Promise<string> {
 		const interval = this.options.checkInterval;
-		const maxInterval = Math.max(interval, 30_000);
+		const maxInterval = Math.max(interval, 180_000);
 
 		while (true) {
 			this.abortController.signal?.throwIfAborted();
@@ -387,6 +393,30 @@ export class TikTokLiveDownloader {
 		return info;
 	}
 
+	/**
+	 * Poll for stream info until the stream becomes active.
+	 * Used in waitForLive mode when the room exists but the stream
+	 * has not yet started broadcasting.
+	 */
+	private async pollStreamInfo(roomId: string): Promise<StreamInfo> {
+		const interval = this.options.checkInterval;
+		const maxInterval = Math.max(interval, 180_000);
+
+		while (true) {
+			this.abortController.signal?.throwIfAborted();
+
+			try {
+				return await this.fetchStreamInfo(roomId);
+			} catch (err) {
+				if (err instanceof StreamFetchError) {
+					await sleep(maxInterval);
+					continue;
+				}
+				throw err;
+			}
+		}
+	}
+
 	/**
 	 * Download a single segment. Always downloads to .ts (crash-safe).
 	 * Does NOT remux — that is handled by remuxSegment() running in the background.

package/src/download/ffmpeg.ts

@@ -122,35 +122,12 @@ export async function downloadWithFfmpeg(
 		let sizeBytes = 0;
 		let duration = 0;
 
-		const abortHandler = () => {
-			// SIGTERM tells ffmpeg to flush its output (moov atom, etc.)
-			// and exit cleanly. This produces a playable file even when
-			// stopped mid-recording.
-			proc.kill("SIGTERM");
-			// Safety net: if ffmpeg doesn't respond, force-kill after 15s.
-			// The close handler will still fire and resolve with partial data.
-			setTimeout(() => {
-				if (proc.exitCode === null) {
-					proc.kill("SIGKILL");
-				}
-			}, 15_000);
-		};
-
-		let aborted = false;
-		const onAbort = () => {
-			aborted = true;
-			abortHandler();
-		};
-
-		signal?.addEventListener("abort", onAbort, { once: true });
-
 		// Startup timeout — if ffmpeg produces no stderr output within
 		// `timeout` ms, it likely stalled on a bad URL. Kill it so the
 		// caller doesn't hang indefinitely.
 		let firstDataTimer: ReturnType<typeof setTimeout> | null = setTimeout(
 			() => {
 				firstDataTimer = null;
-				signal?.removeEventListener("abort", onAbort);
 				proc.kill("SIGTERM");
 				reject(
 					new FfmpegError(
@@ -200,13 +177,11 @@ export async function downloadWithFfmpeg(
 				clearTimeout(firstDataTimer);
 				firstDataTimer = null;
 			}
-			signal?.removeEventListener("abort", onAbort);
 			// spawn's signal option emits AbortError when the signal
 			// is already aborted at spawn time or fires mid-flight.
-			// Don't reject — resolve with partial data instead, same
-			// as the close handler does for aborted downloads.
+			// Resolve with partial data instead of rejecting — the
+			// close handler will also fire and see signal?.aborted.
 			if (err.name === "AbortError") {
-				aborted = true;
 				resolve({
 					sizeBytes,
 					duration,
@@ -222,12 +197,14 @@ export async function downloadWithFfmpeg(
 				clearTimeout(firstDataTimer);
 				firstDataTimer = null;
 			}
-			signal?.removeEventListener("abort", onAbort);
 
 			// When the user aborted, resolve with whatever we got.
-			// ffmpeg receives SIGTERM first, which tells it to flush
-			// its output and exit cleanly, producing a playable file.
-			if (aborted) {
+			// spawn's signal option sends SIGTERM, which tells ffmpeg
+			// to flush its output and exit cleanly.
+			// Use signal?.aborted directly instead of a listener flag
+			// to avoid a race between listener registration order and
+			// the async close event.
+			if (signal?.aborted) {
 				resolve({
 					sizeBytes,
 					duration,