surfsky 0.0.6 → 0.0.8

package/dist/index.d.ts

@@ -1266,7 +1266,6 @@ declare class Deadline {
   readonly until: number;
   constructor(timeout: number | null | undefined, message: string);
   error(): BrowserTimeoutError;
-  check(): void;
   race<T>(promise: Promise<T>): Promise<T>;
 }
 declare class CapturedResponse {
@@ -1330,6 +1329,7 @@ declare class Page extends Actions {
   /** @internal */
   _send(method: string, params?: Record<string, unknown>): Promise<any>;
   /** @internal */
+  _change(): Promise<void>;
   _waitReady(): Promise<void>;
   /** @internal */
   _setup(waiting: boolean): Promise<void>;
@@ -1428,6 +1428,7 @@ declare class Browser extends Page implements AsyncDisposable {
   /** @internal */ _pages: Map<string, Page>;
   /** @internal aborts on close: background sleeps end early */
   _signal: AbortSignal;
+  _changed: PromiseWithResolvers<void>;
   constructor(session: Session, options?: BrowserOptions);
   get internalUuid(): string;
   get cdp(): CDPClient;
@@ -1466,6 +1467,8 @@ declare class Browser extends Page implements AsyncDisposable {
   /** @internal */
   _onAttached(event: Record<string, any>): void;
   /** @internal */
+  _notify(): void;
+  /** @internal */
   _onDetached(event: Record<string, any>): void;
   /** @internal */
   _drop(page: Page): void;
@@ -1628,6 +1631,7 @@ interface RequestOptions {
 interface SessionStartOptions extends SessionOptions {
   /** A saved profile to start; a one-time session when absent. */
   profileUuid?: string;
+  signal?: AbortSignal;
 }
 interface BrowserStartOptions extends SessionStartOptions {
   /** CDP resource types to drop: `["image", "font", "media"]` saves proxy traffic. */
@@ -1674,7 +1678,7 @@ declare class Surfsky implements AsyncDisposable {
   /** An open `BrowserPool`. `close()` stops every browser in it. */
   browsers(options?: PoolOptions): Promise<BrowserPool>;
   /** `browsers()` and `pool.map()` in 1 call. */
-  map<I, R>(handler: PoolHandler<I, R>, items: Iterable<I>, options?: PoolOptions): Promise<PoolOutcome<I, R>[]>;
+  map<I, R>(handler: PoolHandler<I, R>, items: Iterable<I>, options?: PoolOptions & LeaseOptions): Promise<PoolOutcome<I, R>[]>;
   /** Nothing to release with fetch; here for `await using` symmetry. */
   close(): Promise<void>;
   [Symbol.asyncDispose](): Promise<void>;
@@ -1704,6 +1708,9 @@ type PoolOutcome<I, R> = {
   index: number;
   error: unknown;
 };
+interface LeaseOptions {
+  signal?: AbortSignal;
+}
 declare class BrowserPool implements AsyncDisposable {
   #private;
   readonly sessionOptions: SessionOptions;
@@ -1717,9 +1724,9 @@ declare class BrowserPool implements AsyncDisposable {
   close(): Promise<void>;
   [Symbol.asyncDispose](): Promise<void>;
   /** Run `fn` on a live browser, then hand the browser back. Waits while all are busy. */
-  lease<R>(fn: (browser: Browser) => Promise<R>): Promise<R>;
+  lease<R>(fn: (browser: Browser) => Promise<R>, { signal }?: LeaseOptions): Promise<R>;
   /** Run every item through `handler` on a leased browser, `capacity` at a time. */
-  map<I, R>(handler: PoolHandler<I, R>, items: Iterable<I>): Promise<PoolOutcome<I, R>[]>;
+  map<I, R>(handler: PoolHandler<I, R>, items: Iterable<I>, { signal }?: LeaseOptions): Promise<PoolOutcome<I, R>[]>;
 }
 //#endregion
 //#region src/version.d.ts

package/dist/index.js

@@ -920,9 +920,6 @@ var Deadline = class {
 	error() {
 		return new BrowserTimeoutError(`${this.message} within ${this.timeout}ms`);
 	}
-	check() {
-		if (Date.now() >= this.until) throw this.error();
-	}
 	race(promise) {
 		if (this.timeout === null) return promise;
 		return withTimeout(promise, Math.max(0, this.until - Date.now()), () => this.error());
@@ -1064,6 +1061,9 @@ var Page = class extends Actions {
 		}
 	}
 	/** @internal */
+	_change() {
+		return Promise.race([this._browser._changed.promise, sleep(100)]);
+	}
 	async _waitReady() {
 		await this._ready.wait();
 		if (this._setupError !== void 0) throw this._setupError;
@@ -1113,8 +1113,7 @@ var Page = class extends Actions {
 		const deadline = new Deadline(options.timeout ?? 3e4, `the page did not reach '${state}'`);
 		while (!this._milestones.has(milestone)) {
 			this._requireOpen();
-			deadline.check();
-			await sleep(100);
+			await deadline.race(this._change());
 		}
 	}
 	async goto(url, options = {}) {
@@ -1166,8 +1165,7 @@ var Page = class extends Actions {
 		const deadline = new Deadline(timeout, "history did not move");
 		while (true) {
 			if ((await deadline.race(this.send("Page.getNavigationHistory"))).currentIndex === index) break;
-			deadline.check();
-			await sleep(100);
+			await deadline.race(sleep(100));
 		}
 		return this.url();
 	}
@@ -1192,8 +1190,7 @@ var Page = class extends Actions {
 			const found = this._responses.find((response) => response.url.includes(fragment));
 			if (found !== void 0) return found;
 			this._requireOpen();
-			deadline.check();
-			await sleep(100);
+			await deadline.race(this._change());
 		}
 	}
 	/** @internal */
@@ -1221,6 +1218,7 @@ var Page = class extends Actions {
 			this._browser.logger.debug(`no body for ${String(response.url)}: ${String(err)}`);
 		}
 		into.push(new CapturedResponse(typeof response.url === "string" ? response.url : "", typeof response.status === "number" ? response.status : 0, isRecord(response.headers) ? response.headers : {}, body));
+		this._browser._notify();
 	}
 	localStorage() {
 		return this.#storage(true);
@@ -1338,8 +1336,7 @@ var Page = class extends Actions {
 		while (true) {
 			const value = await deadline.race(this.evaluate(expression, rest));
 			if (value) return value;
-			deadline.check();
-			await sleep(100);
+			await deadline.race(sleep(100));
 		}
 	}
 	async innerText(selector) {
@@ -1413,10 +1410,7 @@ var Page = class extends Actions {
 		const visible = options.visible ?? true;
 		const state = visible ? "visible" : "in the document";
 		const deadline = new Deadline(options.timeout ?? 3e4, `'${selector}' was not ${state}`);
-		while (!await deadline.race(this.#matches(selector, visible))) {
-			deadline.check();
-			await sleep(100);
-		}
+		while (!await deadline.race(this.#matches(selector, visible))) await deadline.race(sleep(100));
 	}
 	async #matches(selector, visible) {
 		let box;
@@ -1472,8 +1466,7 @@ var Page = class extends Actions {
 		while (true) {
 			const url = await deadline.race(this.url());
 			if (url.includes(fragment)) return url;
-			deadline.check();
-			await sleep(100);
+			await deadline.race(sleep(100));
 		}
 	}
 	/** The first match has a bounding box. */
@@ -1551,6 +1544,7 @@ var Page = class extends Actions {
 			this._loaderId = loaderId;
 			this._milestones = /* @__PURE__ */ new Set([name]);
 		}
+		this._browser._notify();
 		this._waiter?.observe(name, loaderId);
 	}
 	/** @internal */
@@ -1663,6 +1657,7 @@ var Browser = class extends Page {
 	#client;
 	#abort = new AbortController();
 	#pending = /* @__PURE__ */ new Set();
+	_changed = Promise.withResolvers();
 	#closing;
 	#retired = false;
 	#useCount = 0;
@@ -1744,8 +1739,7 @@ var Browser = class extends Page {
 			const last = opened[opened.length - 1];
 			if (last !== void 0) return last;
 			this._requireOpen();
-			deadline.check();
-			await sleep(100);
+			await deadline.race(this._change());
 		}
 	}
 	async connect() {
@@ -1817,8 +1811,7 @@ var Browser = class extends Page {
 		let page = this.#pageFor(targetId);
 		while (page === void 0) {
 			this._requireOpen();
-			deadline.check();
-			await sleep(100);
+			await deadline.race(this._change());
 			page = this.#pageFor(targetId);
 		}
 		await deadline.race(page._waitReady());
@@ -1848,8 +1841,14 @@ var Browser = class extends Page {
 		page._frameId = page._targetId;
 		page._ready = new Flag();
 		this._pages.set(sessionId, page);
+		this._notify();
 		this._spawn(page._setup(waiting));
 	}
+	/** @internal */
+	_notify() {
+		this._changed.resolve();
+		this._changed = Promise.withResolvers();
+	}
 	async #letGo(sessionId, waiting) {
 		const timeout = this.commandTimeout;
 		const detach = async () => {
@@ -1867,6 +1866,7 @@ var Browser = class extends Page {
 	_drop(page) {
 		this._pages.delete(page._sessionId);
 		page._closed = true;
+		this._notify();
 		page._waiter?.fail("page closed");
 		if (page === this) {
 			this.logger.warn(`page target gone for ${this.internalUuid}`);
@@ -1885,6 +1885,7 @@ var Browser = class extends Page {
 			page._closed = true;
 			page._waiter?.fail("CDP connection closed");
 		}
+		this._notify();
 	}
 	/** @internal track a background task; its failure is logged at debug level */
 	_spawn(task) {
@@ -2230,7 +2231,6 @@ var BrowserPool = class {
 	#idle = [];
 	#owned = 0;
 	#planFull = false;
-	#planFullError;
 	#waiters = [];
 	#capacity = 0;
 	#slots;
@@ -2263,7 +2263,6 @@ var BrowserPool = class {
 		this.#capacity = Math.max(1, total);
 		this.#slots = new Semaphore(this.#capacity);
 		this.#planFull = false;
-		this.#planFullError = void 0;
 		this.#owned = 0;
 		return this;
 	}
@@ -2279,14 +2278,17 @@ var BrowserPool = class {
 		return this.close();
 	}
 	/** Run `fn` on a live browser, then hand the browser back. Waits while all are busy. */
-	async lease(fn) {
+	async lease(fn, { signal } = {}) {
+		signal?.throwIfAborted();
 		const slots = this.#requireOpen();
 		await slots.acquire();
 		try {
 			if (this.#slots !== slots) throw new Error("the pool was closed while waiting for a slot");
+			signal?.throwIfAborted();
 			const browser = await this.#acquire();
 			browser._lease();
 			try {
+				signal?.throwIfAborted();
 				return await fn(browser);
 			} finally {
 				await this.#release(browser);
@@ -2317,7 +2319,6 @@ var BrowserPool = class {
 			const idle = this.#idle.pop();
 			if (idle !== void 0) return idle;
 			if (this.#planFull) {
-				if (this.#owned === 0) throw this.#planFullError ?? new RateLimitError("parallel browser limit reached", { statusCode: 429 });
 				await this.#wait();
 				continue;
 			}
@@ -2326,15 +2327,10 @@ var BrowserPool = class {
 			try {
 				browser = await this.#startBrowser();
 			} catch (err) {
-				const full = planIsFull(err);
 				this.#owned -= 1;
-				if (full) {
-					this.#planFull = true;
-					this.#planFullError = err;
-				}
-				const nothingLeft = this.#owned === 0;
+				this.#planFull = planIsFull(err) && this.#owned > 0;
 				this.#notifyAll();
-				if (!full || nothingLeft) throw err;
+				if (!this.#planFull) throw err;
 				this.#client.logger.info("plan is full, waiting for a browser of ours");
 				continue;
 			}
@@ -2358,20 +2354,20 @@ var BrowserPool = class {
 		this.#notifyAll();
 	}
 	/** Run every item through `handler` on a leased browser, `capacity` at a time. */
-	async map(handler, items) {
+	async map(handler, items, { signal } = {}) {
 		const work = items[Symbol.iterator]();
 		const outcomes = [];
 		let index = 0;
 		let stopped = false;
 		const worker = async () => {
-			while (!stopped) {
+			while (!stopped && !signal?.aborted) {
 				const next = work.next();
 				if (next.done) return;
 				const item = next.value;
 				const at = index;
 				index += 1;
 				try {
-					const value = await this.lease((browser) => handler(browser, item));
+					const value = await this.lease((browser) => handler(browser, item), { signal });
 					outcomes.push({
 						ok: true,
 						item,
@@ -2678,7 +2674,7 @@ var Proxies = class {
 };
 //#endregion
 //#region src/version.ts
-const VERSION = "0.0.6";
+const VERSION = "0.0.8";
 //#endregion
 //#region src/client.ts
 function userAgent() {
@@ -2777,13 +2773,18 @@ var Surfsky = class Surfsky {
 	}
 	/** Start a session; `stop()` it (or `await using`) so it does not keep billing. */
 	async session(options = {}) {
-		const { profileUuid, ...rest } = options;
+		const { profileUuid, signal, ...rest } = options;
+		signal?.throwIfAborted();
 		const session = profileUuid === void 0 ? await this.profiles.startOneTime(rest) : await this.profiles.start(profileUuid, rest);
 		let stopping;
 		const stop = () => {
 			stopping ??= stopSession(this, session.internal_uuid);
 			return stopping;
 		};
+		if (signal?.aborted) {
+			await stop();
+			throw signal.reason;
+		}
 		return {
 			...session,
 			stop,
@@ -2792,11 +2793,12 @@ var Surfsky = class Surfsky {
 	}
 	/** Start a session and connect a `Browser` to it. `close()` stops the session. */
 	async browser(options = {}) {
-		const { profileUuid, blockResources, blockUrls, connectTimeout, commandTimeout, createWebSocket, ...sessionOptions } = options;
+		const { profileUuid, signal, blockResources, blockUrls, connectTimeout, commandTimeout, createWebSocket, ...sessionOptions } = options;
 		const blocked = normalizeBlocked(blockResources);
 		const urls = normalizeUrls(blockUrls);
 		const session = await this.session({
 			profileUuid,
+			signal,
 			...sessionOptions
 		});
 		const browser = new Browser(session, {
@@ -2808,7 +2810,19 @@ var Surfsky = class Surfsky {
 			logger: this.logger,
 			onClose: () => session.stop()
 		});
-		await browser.connect();
+		const onAbort = () => void browser.close();
+		signal?.addEventListener("abort", onAbort, { once: true });
+		try {
+			await browser.connect();
+		} catch (err) {
+			throw signal?.aborted ? signal.reason : err;
+		} finally {
+			signal?.removeEventListener("abort", onAbort);
+		}
+		if (signal?.aborted) {
+			await browser.close();
+			throw signal.reason;
+		}
 		return browser;
 	}
 	/** An open `BrowserPool`. `close()` stops every browser in it. */
@@ -2817,9 +2831,10 @@ var Surfsky = class Surfsky {
 	}
 	/** `browsers()` and `pool.map()` in 1 call. */
 	async map(handler, items, options = {}) {
-		const pool = await this.browsers(options);
+		const { signal, ...poolOptions } = options;
+		const pool = await this.browsers(poolOptions);
 		try {
-			return await pool.map(handler, items);
+			return await pool.map(handler, items, { signal });
 		} finally {
 			await pool.close();
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "surfsky",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "TypeScript SDK for the Surfsky antidetect browser cloud.",
   "keywords": [
     "surfsky",