effect-browser 0.3.0-beta.8 → 0.3.0-beta.9

package/dist/{page-DHeYWEs-.mjs → page-D-OedyBw.mjs}

@@ -1,15 +1,15 @@
-import { Plan, maximumSamples } from "./Motion.mjs";
+import { Plan } from "./Motion.mjs";
 import { Action, Box, CursorChanged, KeyChanged, Navigated, PageLoaded, PointerPressed, PointerReleased, Subject, SubjectContext, TextInserted, TrackEvent, TrackPerformed, TrackPlanned, WheelScrolled } from "./BrowserEvent.mjs";
 import { BrowserError, Failed, InvalidRequest, NavigationFailed, NotActionable, NotFound, PolicyTimeout, StaleRef, Timeout } from "./BrowserError.mjs";
-import { i as redact, n as parse, s as Correlation, t as addresses } from "./url-CcL0K7S0.mjs";
-import { a as make$19, i as failWith, n as contextGone, o as reasonOf, r as decodeWith, s as undispatched } from "./context-DAYjATgC.mjs";
+import { a as make$19, c as Current, i as failWith, l as make$18, n as contextGone, o as reasonOf, r as decodeWith, s as undispatched } from "./context-B6xr8nVi.mjs";
+import { i as redact, n as parse, s as Correlation, t as addresses } from "./url-Cd04Okid.mjs";
 import { BrowserPaint, CaptureStats, Frame, Image, Screenshot } from "./Frame.mjs";
-import { _ as evidence, c as State, g as guard, h as ValidatedInputResultSchema, i as InputRequest, l as Text, m as PreparedInputResultSchema, o as Region, p as redacted, r as Found, s as ResolvedTarget, u as Zoom } from "./Page-D4281dIi.mjs";
+import { _ as evidence, c as State, g as guard, h as ValidatedInputResultSchema, i as InputRequest, l as Text, m as PreparedInputResultSchema, o as Region, p as redacted, r as Found, s as ResolvedTarget, u as Zoom } from "./Page-B5cjaUp5.mjs";
 import { Snapshot } from "./Snapshot.mjs";
 import { t as match } from "./match.inpage-xOe9LNO0.mjs";
 import { r as Changes, t as Change } from "./Change-DNvztNLu.mjs";
 import { Window } from "./Moment.mjs";
-import { Clock, Data, Deferred, Duration, Effect, Exit, MutableRef, Option, Queue, Random, Ref, Result, Schedule, Schema, Scope, Semaphore, Stream, SynchronizedRef } from "effect";
+import { Clock, Deferred, Duration, Effect, Exit, MutableRef, Option, Queue, Random, Ref, Result, Schedule, Schema, Scope, Semaphore, Stream, SynchronizedRef } from "effect";
 //#region src/internal/input/edit.inpage.ts
 /**
 * In the page: editing a field. It refuses text that a focused control could act on, focuses a
@@ -2166,7 +2166,7 @@ const mainFrame = (page, event) => "frame" in event ? event.frame.parentId === v
 } : void 0;
 /** A call to the page script, its arguments quoted as JavaScript literals. */
 const scriptCall = (name, ...args) => `${name}(${args.map((arg) => JSON.stringify(arg)).join(", ")})`;
-const make$18 = Effect.fnUntraced(function* (page) {
+const make$17 = Effect.fnUntraced(function* (page) {
 	const { id, cdp, native, span, publish, now } = page;
 	const { send } = page.protocol;
 	const registration = yield* SynchronizedRef.make("none");
@@ -2351,7 +2351,7 @@ const toBrowserSeconds = (calibration, hostMillis) => (hostMillis + calibration.
 * protocol session, stamped with the browser's clock when its run has a mapping, and is published
 * as it is submitted.
 */
-const make$17 = (page) => {
+const make$16 = (page) => {
 	const { id, pointer, publish, now, noteInput, closedBy } = page;
 	const { send } = page.protocol;
 	const inputClocks = /* @__PURE__ */ new WeakMap();
@@ -2457,7 +2457,7 @@ const inputFailure = (operation, targets, failure) => {
 	return failWith(operation, failure.error === "outside" ? new InvalidRequest({ detail: failure.detail }) : failure.error === "stale" && typeof target === "string" ? new StaleRef({ ref: target }) : new NotActionable({ detail: failure.detail }));
 };
 const editFailure = (operation, ref, failure) => failWith(operation, failure.stale === true ? new StaleRef({ ref }) : new NotActionable({ detail: failure.error }));
-const make$16 = (page, bridge) => {
+const make$15 = (page, bridge) => {
 	const { id } = page;
 	const { current, evaluateIn, evaluateWithContext } = bridge;
 	const preparePolicy = (action, info, targets, flags = {}) => Effect.gen(function* () {
@@ -2509,7 +2509,7 @@ const make$16 = (page, bridge) => {
 			}))
 		};
 	});
-	const mutate = (operation, call, approval, mayHaveRun = Effect.void) => (approval === void 0 ? current(operation) : Effect.succeed(approval.contextId)).pipe(Effect.flatMap((contextId) => evaluateIn(operation, call, contextId).pipe(Effect.tapError((error) => error.reason._tag === "Failed" && /Cannot find context|__effectBrowser/i.test(error.reason.detail) ? Effect.void : mayHaveRun))), Effect.catchIf(contextGone, () => failWith(operation, new NotActionable({ detail: "the page changed before the approved input could run" }))));
+	const mutate = (operation, call, approval, mayHaveRun = Effect.void) => (approval === void 0 ? current(operation) : Effect.succeed(approval.contextId)).pipe(Effect.flatMap((contextId) => evaluateIn(operation, call, contextId).pipe(Effect.onInterrupt(() => mayHaveRun), Effect.tapError((error) => error.reason._tag === "Failed" && /Cannot find context|__effectBrowser/i.test(error.reason.detail) ? Effect.void : mayHaveRun))), Effect.catchIf(contextGone, () => failWith(operation, new NotActionable({ detail: "the page changed before the approved input could run" }))));
 	return {
 		preparePolicy,
 		mutate
@@ -2685,7 +2685,7 @@ const description = (character) => {
 * Keys and typing: a key chord held and released, each typed event, and the document a run of
 * keys must stay in.
 */
-const make$15 = (page, bridge, dispatch) => {
+const make$14 = (page, bridge, dispatch) => {
 	const { playwright } = page;
 	const { send } = page.protocol;
 	const { currentDocument } = bridge;
@@ -2734,103 +2734,6 @@ const make$15 = (page, bridge, dispatch) => {
 		typeEvent
 	};
 };
-var InputFailure = class extends Data.TaggedError("InputFailure") {};
-const make$14 = () => {
-	const outstanding = /* @__PURE__ */ new Set();
-	const idle = Effect.gen(function* () {
-		while (outstanding.size > 0) yield* Effect.promise(() => Promise.all(outstanding));
-	});
-	/** `idle` lets an action wait, in its page's turn, for the page's earlier replies. */
-	return {
-		idle,
-		begin: Effect.gen(function* () {
-			yield* idle;
-			const pending = /* @__PURE__ */ new Set();
-			const held = [];
-			let failure;
-			let reserved = 0;
-			let closed = false;
-			const requireOpen = Effect.suspend(() => closed ? Effect.fail(new InputFailure({ cause: /* @__PURE__ */ new Error("the input run has stopped") })) : Effect.void);
-			const requireSuccess = Effect.suspend(() => failure === void 0 ? Effect.void : Effect.fail(failure));
-			const submit = (command) => {
-				if (reserved < 1) throw new Error("input must reserve capacity before dispatch");
-				reserved--;
-				let response;
-				try {
-					response = command();
-				} catch (cause) {
-					failure ??= new InputFailure({ cause });
-					return;
-				}
-				const reply = response.then(() => {
-					pending.delete(reply);
-					outstanding.delete(reply);
-				}, (cause) => {
-					failure ??= new InputFailure({ cause });
-					pending.delete(reply);
-					outstanding.delete(reply);
-				});
-				pending.add(reply);
-				outstanding.add(reply);
-			};
-			const reserve = (commands, maximum, limit) => Effect.gen(function* () {
-				yield* requireOpen;
-				yield* requireSuccess;
-				if (!Number.isInteger(commands) || commands < 1 || commands > maximum) return yield* Effect.die(/* @__PURE__ */ new Error("invalid input reservation"));
-				while (outstanding.size + reserved + commands > limit) {
-					yield* Effect.promise(() => Promise.race(outstanding));
-					yield* requireOpen;
-					yield* requireSuccess;
-				}
-				reserved += commands;
-			});
-			return {
-				reserve: (commands) => reserve(commands, 64, 64),
-				reserveMotion: (commands) => reserve(commands, maximumSamples, 64 + maximumSamples),
-				send: (command) => Effect.gen(function* () {
-					yield* requireOpen;
-					yield* requireSuccess;
-					yield* Effect.sync(() => submit(command));
-					yield* requireSuccess;
-				}),
-				down: (key, press, release) => Effect.gen(function* () {
-					yield* requireOpen;
-					yield* requireSuccess;
-					yield* Effect.sync(() => {
-						held.push({
-							key,
-							release
-						});
-						submit(press);
-					});
-					yield* requireSuccess;
-				}),
-				up: (key) => Effect.gen(function* () {
-					yield* requireOpen;
-					yield* Effect.sync(() => {
-						const index = held.findLastIndex((entry) => entry.key === key);
-						const entry = held[index];
-						if (entry === void 0) return;
-						held.splice(index, 1);
-						submit(entry.release);
-					});
-					yield* requireSuccess;
-				}),
-				drain: Effect.gen(function* () {
-					while (pending.size > 0) yield* Effect.promise(() => Promise.all(pending));
-					yield* requireSuccess;
-				}),
-				close: Effect.sync(() => {
-					if (closed) return;
-					closed = true;
-					for (const entry of held.toReversed()) submit(entry.release);
-					held.length = 0;
-					reserved = 0;
-				})
-			};
-		})
-	};
-};
 //#endregion
 //#region src/internal/input/style.ts
 /**
@@ -2997,10 +2900,41 @@ const deadline$1 = (operation, timeout, now, presented) => (effect) => Effect.su
 	});
 	return Effect.raceFirst(effect, expiry);
 });
+/** An admitted operation stays owned through its Action and any unanswered native replies. */
+const admission = (page, pending, name) => {
+	let run;
+	let end;
+	return {
+		enter: Effect.uninterruptible(Effect.gen(function* () {
+			const released = page.inputGate === void 0 ? void 0 : yield* page.inputGate.enter(name);
+			const done = Deferred.makeUnsafe();
+			pending.add(done);
+			end = () => {
+				const finish = () => {
+					released?.();
+					pending.delete(done);
+					Deferred.doneUnsafe(done, Exit.void);
+				};
+				if (run === void 0) finish();
+				else run.afterIdle(finish);
+			};
+		})),
+		using: (current) => {
+			run = current;
+		},
+		end: Effect.sync(() => end?.())
+	};
+};
+/** Close a run on every exit while preserving its native replies for the page's next input. */
+const useRun = (page, sender, name, run, action) => action.pipe(Effect.matchEffect({
+	onFailure: (error) => run.close.pipe(Effect.andThen(sender.flush(name, run).pipe(Effect.ignore)), Effect.andThen(Effect.fail(error))),
+	onSuccess: (value) => run.close.pipe(Effect.andThen(sender.flush(name, run)), Effect.as(value))
+}), Effect.ensuring(run.close.pipe(Effect.andThen(page.openings.clear))), Effect.provideService(Current, run));
 const make$13 = (page, sender) => {
 	const { id, settings, mapping, lane, publish, now, noteInput, span, owned } = page;
-	const { inputClocks, flush } = sender;
-	const input = make$14();
+	const { inputClocks } = sender;
+	const input = make$18();
+	const admitted = /* @__PURE__ */ new Set();
 	const perform = (name, info, timeout, prepare, body, style = plain) => Effect.gen(function* () {
 		const startedAt = now();
 		const sent = yield* Ref.make(false);
@@ -3009,6 +2943,7 @@ const make$13 = (page, sender) => {
 		const touch = Effect.sync(noteInput);
 		let revealed = info.secret !== true;
 		let presented = 0;
+		const ticket = admission(page, admitted, name);
 		const marks = {
 			style,
 			present: (millis) => Effect.sync(() => {
@@ -3026,24 +2961,22 @@ const make$13 = (page, sender) => {
 		const admit = input.idle.pipe(Effect.tap(() => Effect.sync(() => {
 			estimate = info.input ?? true ? mapping.latest() : void 0;
 		})));
-		const useInput = (action) => input.begin.pipe(Effect.tap((run) => Effect.sync(() => {
-			if (estimate !== void 0) inputClocks.set(run, estimate);
-		})), Effect.flatMap((run) => action(run).pipe(Effect.matchEffect({
-			onFailure: (error) => run.close.pipe(Effect.andThen(flush(name, run).pipe(Effect.ignore)), Effect.andThen(Effect.fail(error))),
-			onSuccess: (value) => run.close.pipe(Effect.andThen(flush(name, run)), Effect.as(value))
-		}), Effect.ensuring(run.close.pipe(Effect.andThen(page.openings.clear))))));
+		const useInput = (action) => input.begin.pipe(Effect.tap((current) => Effect.sync(() => {
+			ticket.using(current);
+			if (estimate !== void 0) inputClocks.set(current, estimate);
+		})), Effect.flatMap((run) => useRun(page, sender, name, run, action(run))));
 		let queuedMillis;
 		const dispatch = (action) => Effect.suspend(() => {
 			const asked = now();
-			return lane.write(name, timeout)(Effect.suspend(() => admit.pipe(Effect.timeoutOrElse({
+			return lane.write(name, timeout)(ticket.enter.pipe(Effect.andThen(Effect.suspend(() => admit.pipe(Effect.timeoutOrElse({
 				duration: Duration.millis(Math.max(0, Duration.toMillis(timeout) - (now() - asked))),
 				orElse: () => timedOut(name, timeout)
-			}))).pipe(Effect.tap(() => Effect.sync(() => {
+			})))), Effect.tap(() => Effect.sync(() => {
 				queuedMillis = Math.round(now() - asked);
 			})), Effect.andThen(deadline$1(name, timeout, now, () => presented)(action))));
 		});
 		const guard = settings.guard;
-		const run = guard === void 0 ? dispatch(useInput((run) => body({
+		const action = guard === void 0 ? dispatch(useInput((run) => body({
 			...marks,
 			input: run
 		}, void 0))) : Effect.gen(function* () {
@@ -3059,7 +2992,7 @@ const make$13 = (page, sender) => {
 		});
 		const record = info.recorded === false ? () => 0 : publish;
 		return yield* Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
-			const exit = yield* Effect.exit(restore(run));
+			const exit = yield* Effect.exit(restore((page.inputGate?.check(name) ?? Effect.void).pipe(Effect.andThen(action))));
 			const dispatched = yield* Ref.get(sent);
 			const point = yield* Ref.get(at);
 			const { subject, to, box } = yield* Ref.get(acted);
@@ -3104,9 +3037,9 @@ const make$13 = (page, sender) => {
 				dispatched: true
 			}));
 			return yield* exit;
-		}));
+		})).pipe(Effect.ensuring(ticket.end));
 	}).pipe(span(`Page.${name}`, info.target === void 0 ? {} : { target: info.target }), owned);
-	return perform;
+	return Object.assign(perform, { idle: Effect.suspend(() => Effect.forEach(admitted, Deferred.await, { discard: true })) });
 };
 //#endregion
 //#region src/internal/input/pointer.ts
@@ -3320,9 +3253,9 @@ const buttonMask = {
 	middle: 4
 };
 const partsOf = (page, bridge, viewport) => {
-	const dispatch = make$17(page);
+	const dispatch = make$16(page);
 	const pointer = make$12(page, dispatch, viewport);
-	const guard = make$16(page, bridge);
+	const guard = make$15(page, bridge);
 	const settling = make$11(page, bridge);
 	return {
 		page,
@@ -3333,7 +3266,7 @@ const partsOf = (page, bridge, viewport) => {
 		...guard,
 		...make$10(bridge, viewport, guard, pointer, dispatch, settling),
 		...pointer,
-		...make$15(page, bridge, dispatch),
+		...make$14(page, bridge, dispatch),
 		sendMouse: dispatch.sendMouse,
 		flush: dispatch.flush
 	};
@@ -5038,7 +4971,7 @@ const viewOf = (page, view) => {
 const make = Effect.fnUntraced(function* (options) {
 	const page = make$19(options, yield* Effect.scope);
 	const { id, playwright, native, owned, within, lane, span } = page;
-	const bridge = yield* make$18(page);
+	const bridge = yield* make$17(page);
 	const viewport = make$1(page, bridge);
 	const input = make$9(page, bridge, viewport);
 	const pictures = yield* make$7(page, bridge, viewport);
@@ -5107,4 +5040,4 @@ const make = Effect.fnUntraced(function* (options) {
 //#endregion
 export { performed as a, pause as i, make as n, mapping as o, viewOf as r, internalsOf as t };
 
-//# sourceMappingURL=page-DHeYWEs-.mjs.map
+//# sourceMappingURL=page-D-OedyBw.mjs.map