tokwatchr 0.6.3 → 0.6.5

package/dist/index.mjs

@@ -721,17 +721,9 @@ var TikTokLiveDownloader = class {
 		this.setState("stopping");
 		this.abortController.abort();
 		await new Promise((resolve) => {
-			let settled = false;
-			const timer = setTimeout(() => {
-				settled = true;
-				resolve();
-			}, 5e3);
 			const check = () => {
-				if (settled) return;
-				if (this._state === "done") {
-					clearTimeout(timer);
-					resolve();
-				} else setTimeout(check, 100);
+				if (this._state === "done") resolve();
+				else setTimeout(check, 100);
 			};
 			check();
 		});
@@ -766,6 +758,8 @@ var TikTokLiveDownloader = class {
 		return resolved;
 	}
 	async _run(waitForLive) {
+		this.abortController = new AbortController();
+		if (this.options.signal) this.options.signal.addEventListener("abort", () => this.abortController.abort(), { once: true });
 		const pendingRemuxes = [];
 		try {
 			this.setState("waiting");

package/package.json

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

package/src/TikTokLiveDownloader.ts

@@ -178,17 +178,10 @@ export class TikTokLiveDownloader {
 		}
 		this.setState("stopping");
 		this.abortController.abort();
-		// Wait for state to transition to done, with timeout
+		// Wait for _run()'s catch block to finish remux and set "done"
 		await new Promise<void>((resolve) => {
-			let settled = false;
-			const timer = setTimeout(() => {
-				settled = true;
-				resolve();
-			}, 5_000);
 			const check = () => {
-				if (settled) return;
 				if (this._state === "done") {
-					clearTimeout(timer);
 					resolve();
 				} else {
 					setTimeout(check, 100);
@@ -244,6 +237,16 @@ export class TikTokLiveDownloader {
 	}
 
 	private async _run(waitForLive: boolean): Promise<DownloadResult> {
+		// Reset abortController so start() can be called multiple times
+		this.abortController = new AbortController();
+		if (this.options.signal) {
+			this.options.signal.addEventListener(
+				"abort",
+				() => this.abortController.abort(),
+				{ once: true },
+			);
+		}
+
 		// Track background remuxes so we can await them on error/abort
 		const pendingRemuxes: Promise<DownloadResult>[] = [];