effect-browser 0.3.0-beta.14 → 0.3.0-beta.16

package/dist/{page-B92QnRfT.mjs → page-ClEMFnBG.mjs}

@@ -1,10 +1,10 @@
-import { Plan } from "./Motion.mjs";
+import { Plan, Point } 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 { a as make$20, c as Current, i as failWith, l as make$19, n as contextGone, o as reasonOf, r as decodeWith, s as undispatched } from "./context-BAjRj7Xo.mjs";
+import { a as make$20, c as estimate, d as toBrowserSeconds, f as toHostTime, h as make$19, i as failWith, m as Current, n as contextGone, o as reasonOf, p as uncertaintyAt, r as decodeWith, s as undispatched, u as monotonicMillis } from "./context-rYTk-3Cv.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-B5cjaUp5.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-C_VkBVwI.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";
@@ -333,8 +333,7 @@ const targets = (names, walked, placing) => {
 	};
 };
 const ResolvedPointSchema = Schema.Struct({
-	x: Schema.Finite,
-	y: Schema.Finite,
+	...Point.fields,
 	element: Schema.String,
 	tag: Schema.String,
 	role: Schema.NullOr(Schema.String),
@@ -356,8 +355,7 @@ const PointResultSchema = Schema.Union([ResolvedPointSchema, Schema.Struct({
 	detail: Schema.String
 })]);
 const ScrollPlanSchema = Schema.NullOr(Schema.Struct({
-	x: Schema.Finite,
-	y: Schema.Finite,
+	...Point.fields,
 	dx: Schema.Finite,
 	dy: Schema.Finite
 }));
@@ -464,6 +462,11 @@ const context = (names, walked) => {
 };
 //#endregion
 //#region src/internal/reading/controls.inpage.ts
+/**
+* In the page: a control's states and value as the outline shows them, and as a value; the elements a CSS selector scopes a
+* read to; and a condition `Page.waitFor` waits for. See `names.inpage.ts` for what a page-side part
+* may use.
+*/
 const controls = (names, walked, subjects, texts) => {
 	const { clean, isDisabled, isHtml, isInput, isSelect, isTextArea, refFor, textOf } = names;
 	const { visible } = walked;
@@ -553,6 +556,7 @@ const controls = (names, walked, subjects, texts) => {
 		waitUntil
 	};
 };
+const ConditionResultSchema = Schema.Union([Schema.Struct({ met: Schema.Boolean }), Schema.Struct({ invalid: Schema.String })]);
 //#endregion
 //#region src/internal/reading/expect.inpage.ts
 const expectations = (names, subjected) => {
@@ -942,6 +946,10 @@ const outline = (names, walked, subjects, texts, controlling, url) => {
 		viewport
 	};
 };
+const SnapshotResultSchema = Schema.Union([Schema.Struct({
+	snapshot: Snapshot,
+	nextRef: Schema.Finite
+}), Schema.Struct({ invalid: Schema.String })]);
 const ViewportResultSchema = Schema.Struct({
 	width: Schema.Finite,
 	height: Schema.Finite
@@ -2284,68 +2292,6 @@ const make$18 = Effect.fnUntraced(function* (page) {
 	};
 });
 //#endregion
-//#region src/internal/pictures/clock.ts
-/**
-* The browser's clock read on the owner's: estimates of their offset from timed probes, how an
-* estimate ages, and the one mapping a browser's pages share. `pictures.ts` takes the probes.
-*/
-/** The fastest complete probe limits uncertainty without mistaking transit delay for clock offset. */
-const estimate = (probes) => {
-	let best;
-	for (const probe of probes) {
-		const roundTripMillis = probe.hostEnd - probe.hostStart;
-		if (!Number.isFinite(probe.hostStart) || !Number.isFinite(probe.hostEnd) || !Number.isFinite(probe.browserTime) || !Number.isFinite(roundTripMillis) || roundTripMillis < 0) continue;
-		const sampledAt = probe.hostStart + roundTripMillis / 2;
-		const offsetMillis = probe.browserTime - sampledAt;
-		if (!Number.isFinite(offsetMillis) || !Number.isFinite(probe.browserTime - probe.hostStart) || !Number.isFinite(probe.browserTime - probe.hostEnd)) continue;
-		if (best === void 0 || roundTripMillis < best.roundTripMillis) best = {
-			offsetMillis,
-			uncertaintyMillis: roundTripMillis / 2,
-			roundTripMillis,
-			sampledAt
-		};
-	}
-	return Option.fromUndefinedOr(best);
-};
-const driftPerMillis = 1e-4;
-/** An estimate's uncertainty at `hostTime`, wider the further that is from when it was sampled. */
-const uncertaintyAt = (estimate, hostTime) => estimate.uncertaintyMillis + Math.abs(hostTime - estimate.sampledAt) * driftPerMillis;
-const renewAfter = Duration.seconds(10);
-/**
-* Whether a new measurement should replace the current estimate. Each interval contains the true
-* offset, so overlapping intervals agree and the narrower one is kept, the current one widened by
-* its age: a probe delayed behind a busy page cannot widen every tab's stamps. A disjoint
-* measurement means the clocks moved (a wall clock step, or drift between a remote browser and
-* this host), so the newer evidence wins.
-*/
-const supersedes = (next, current) => {
-	const aged = uncertaintyAt(current, next.sampledAt);
-	return next.uncertaintyMillis <= aged || Math.abs(next.offsetMillis - current.offsetMillis) > next.uncertaintyMillis + aged;
-};
-/**
-* Every renderer of a browser reads the same host wall clock, so the offset belongs to the
-* browser rather than a page. A busy page cannot fail work that an earlier estimate can serve.
-*/
-const mapping = (now) => {
-	let latest;
-	let measuredAt = Number.NEGATIVE_INFINITY;
-	const adopt = (measure) => {
-		measuredAt = now();
-		return measure.pipe(Effect.map((estimate) => {
-			if (latest === void 0 || supersedes(estimate, latest)) latest = estimate;
-			return latest;
-		}));
-	};
-	return {
-		latest: () => latest,
-		current: (measure) => Effect.suspend(() => latest === void 0 ? adopt(measure) : Effect.succeed(latest)),
-		renew: (measure) => Effect.suspend(() => latest === void 0 || now() - measuredAt < Duration.toMillis(renewAfter) ? Effect.void : Effect.ignore(adopt(measure)))
-	};
-};
-const toHostTime = (calibration, browserEpochMillis) => browserEpochMillis - calibration.offsetMillis;
-/** CDP input timestamps use seconds, unlike browser frame timestamps and the owner's clock. */
-const toBrowserSeconds = (calibration, hostMillis) => (hostMillis + calibration.offsetMillis) / 1e3;
-//#endregion
 //#region src/internal/input/dispatch.ts
 /**
 * Sending input to the browser. Each mouse event, key and inserted text goes out on the page's
@@ -2453,6 +2399,8 @@ const make$17 = (page) => {
 * policy decides on, binds an approval to the document and targets it saw, and runs the page
 * script's changes in the approved document only.
 */
+/** Recheck an approval, after any pending input it must see; neither runs without a guard. */
+const check = (approval, options = {}, before = Effect.void) => approval === void 0 ? Effect.void : before.pipe(Effect.andThen(approval.check(options)));
 const inputFailure = (operation, targets, failure) => {
 	const target = failure.index === void 0 ? void 0 : targets[failure.index];
 	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 }));
@@ -2511,9 +2459,12 @@ 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.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" }))));
+	/** A read may follow the current document only when no approval binds it to one. */
+	const evaluate = (operation, call, approval) => approval === void 0 ? bridge.evaluate(operation, call) : mutate(operation, call, approval);
 	return {
 		preparePolicy,
-		mutate
+		mutate,
+		evaluate
 	};
 };
 //#endregion
@@ -3196,12 +3147,11 @@ const resolvedTarget = (result) => new ResolvedTarget({
 	cursor: result.cursor,
 	...result.href === void 0 ? {} : { href: result.href }
 });
-const make$11 = (bridge, viewport, guard, pointer, dispatch, settling) => {
-	const { evaluate } = bridge;
-	const { mutate } = guard;
+const make$11 = (viewport, guard, pointer, dispatch, settling) => {
+	const { evaluate, mutate } = guard;
 	const { moveTo, wheel } = pointer;
 	const { flush } = dispatch;
-	const readPoint = (operation, target, approval, scroll) => (approval === void 0 ? evaluate(operation, scriptCall("point", target, scroll)) : mutate(operation, scriptCall("point", target, scroll), approval)).pipe(Effect.flatMap(decodeWith(operation, PointResultSchema)));
+	const readPoint = (operation, target, approval, scroll) => evaluate(operation, scriptCall("point", target, scroll), approval).pipe(Effect.flatMap(decodeWith(operation, PointResultSchema)));
 	const resolve = (operation, target, approval, scroll = true) => {
 		if (typeof target === "string" && !/^e\d+$/.test(target)) return failWith(operation, new InvalidRequest({ detail: target + " is not a ref; refs look like e12" }));
 		if (typeof target !== "string" && (!Number.isFinite(target.x) || !Number.isFinite(target.y))) return failWith(operation, new InvalidRequest({ detail: "point coordinates must be finite" }));
@@ -3228,13 +3178,13 @@ const make$11 = (bridge, viewport, guard, pointer, dispatch, settling) => {
 				yield* wheel(operation, marks, point, Math.max(-size.width * .9, Math.min(size.width * .9, plan.dx)), Math.max(-size.height * .9, Math.min(size.height * .9, plan.dy)));
 				yield* flush(operation, marks.input);
 				yield* settling.settle(operation, before);
-				if (approval !== void 0) yield* approval.check();
+				yield* check(approval);
 			}
 			yield* marks.touched;
 			const before = settling.mark();
 			yield* resolve(operation, target, approval);
 			yield* settling.settle(operation, before);
-			if (approval !== void 0) yield* approval.check();
+			yield* check(approval);
 			return yield* resolve(operation, target, approval, false);
 		})
 	};
@@ -3260,12 +3210,11 @@ const partsOf = (page, bridge, viewport) => {
 	const settling = make$12(page, bridge);
 	return {
 		page,
-		bridge,
 		...settling,
 		viewportFor: viewport.viewportFor,
 		perform: make$14(page, dispatch),
 		...guard,
-		...make$11(bridge, viewport, guard, pointer, dispatch, settling),
+		...make$11(viewport, guard, pointer, dispatch, settling),
 		...pointer,
 		...make$15(page, bridge, dispatch),
 		sendMouse: dispatch.sendMouse,
@@ -3303,20 +3252,17 @@ const click = (input) => {
 		yield* marks.at(point);
 		yield* marks.on(resolved);
 		yield* moveTo("click", marks, point, resolved.cursor);
-		if (approval !== void 0) yield* approval.check({ presses: [{
+		yield* check(approval, { presses: [{
 			index: 0,
 			...point
 		}] });
 		const before = mark();
 		yield* marks.sent;
 		for (let index = 1; index <= count; index++) {
-			if (approval !== void 0 && index > 1) {
-				yield* flush("click", marks.input);
-				yield* approval.check({ presses: [{
-					index: 0,
-					...point
-				}] }).pipe(Effect.catchIf((error) => error.reason._tag === "StaleRef", () => failWith("click", new NotActionable({ detail: "an earlier click removed the approved target, so no further press was sent" }))));
-			}
+			if (index > 1) yield* check(approval, { presses: [{
+				index: 0,
+				...point
+			}] }, flush("click", marks.input)).pipe(Effect.catchIf((error) => error.reason._tag === "StaleRef", () => failWith("click", new NotActionable({ detail: "an earlier click removed the approved target, so no further press was sent" }))));
 			yield* sendMouse("click", marks.input, {
 				type: "mousePressed",
 				...point,
@@ -3375,7 +3321,7 @@ const drag = (input) => {
 		yield* marks.at(end.point);
 		yield* marks.on(start, end);
 		yield* moveTo("drag", marks, start.point, start.cursor);
-		if (approval !== void 0) yield* approval.check({ presses: [{
+		yield* check(approval, { presses: [{
 			index: 0,
 			...start.point
 		}, {
@@ -3403,7 +3349,7 @@ const drag = (input) => {
 };
 const typeText = (input) => {
 	const { settings, now } = input.page;
-	const { perform, preparePolicy, mutate, targetFor, moveTo, sendMouse, flush, bridge } = input;
+	const { perform, preparePolicy, mutate, targetFor, moveTo, sendMouse, flush, evaluate } = input;
 	const { currentDocument, sameDocument, keyStroke, typeEvent, mark, settle } = input;
 	return (text, typeOptions = {}, style = plain) => perform("type", {
 		target: typeOptions.into,
@@ -3421,7 +3367,7 @@ const typeText = (input) => {
 		const into = typeOptions.into;
 		if (into !== void 0 && !/^e\d+$/.test(into)) return yield* failWith("type", new InvalidRequest({ detail: `"${into}" is not a ref; refs look like e12` }));
 		const asked = scriptCall("typeable", into ?? null, typeOptions.secret === true);
-		const typeable = yield* (approval === void 0 ? bridge.evaluate("type", asked) : mutate("type", asked, approval)).pipe(Effect.flatMap(decodeWith("type", TypeableResultSchema)));
+		const typeable = yield* evaluate("type", asked, approval).pipe(Effect.flatMap(decodeWith("type", TypeableResultSchema)));
 		if ("error" in typeable) return yield* failWith("type", typeable.error === "stale" && into !== void 0 ? new StaleRef({ ref: into }) : new NotActionable({ detail: typeable.detail }));
 		if (typeable.subject !== void 0) yield* marks.on(typeable.subject);
 		const since = yield* currentDocument("type");
@@ -3432,7 +3378,7 @@ const typeText = (input) => {
 			yield* marks.on(target);
 			if (marks.style.shown) {
 				yield* moveTo("type", marks, target.point, target.cursor);
-				if (approval !== void 0) yield* approval.check({ presses: [{
+				yield* check(approval, { presses: [{
 					index: 0,
 					...target.point
 				}] });
@@ -3452,9 +3398,9 @@ const typeText = (input) => {
 			secret ||= focused.secret;
 		}
 		if (!secret) yield* marks.reveal;
-		if (approval !== void 0) yield* approval.check({ focused: true });
+		yield* check(approval, { focused: true });
 		yield* marks.sent;
-		const focusHeld = approval === void 0 ? Effect.void : flush("type", marks.input).pipe(Effect.andThen(approval.check({ focused: true })));
+		const focusHeld = check(approval, { focused: true }, flush("type", marks.input));
 		if (text === "" && replace && into !== void 0) {
 			yield* sameDocument("type", since);
 			yield* keyStroke("type", marks.input, ["Delete"]);
@@ -3475,7 +3421,7 @@ const typeText = (input) => {
 		}
 		yield* flush("type", marks.input);
 		if (typeOptions.submit === true) {
-			if (approval !== void 0) yield* approval.check({ focused: true });
+			yield* check(approval, { focused: true });
 			yield* sameDocument("type", since);
 			const before = mark();
 			yield* keyStroke("type", marks.input, ["Enter"]);
@@ -3508,16 +3454,13 @@ const press = (input) => {
 			yield* marks.on(yield* targetFor("press", on, approval, marks));
 			const focused = yield* mutate("press", scriptCall("focusOn", on), approval).pipe(Effect.flatMap(decodeWith("press", EditResultSchema)));
 			if ("error" in focused) return yield* editFailure("press", on, focused);
-			if (approval !== void 0) yield* approval.check({ focused: true });
+			yield* check(approval, { focused: true });
 		}
 		const before = mark();
 		let due = now();
 		yield* marks.sent;
 		for (let index = 0; index < times; index++) {
-			if (index > 0 && approval !== void 0 && activates) {
-				yield* flush("press", marks.input);
-				yield* approval.check({ focused: true });
-			}
+			if (index > 0 && activates) yield* check(approval, { focused: true }, flush("press", marks.input));
 			yield* sameDocument("press", since);
 			yield* keyStroke("press", marks.input, parts, hold);
 			if (index + 1 < times) {
@@ -3765,7 +3708,7 @@ const timed = (options, native, timestamp, generation) => {
 				hostTime,
 				uncertaintyMillis: uncertaintyAt(estimate, hostTime)
 			}),
-			receivedAt: Number(options.clock.monotonicTimeNanosUnsafe()) / 1e6,
+			receivedAt: monotonicMillis(options.clock),
 			width: size.width,
 			height: size.height,
 			...generation.transport.frameTag()
@@ -3811,7 +3754,7 @@ const sizeFilter = (options, deliver, drop) => Effect.gen(function* () {
 		run = void 0;
 		Queue.offerUnsafe(wake, void 0);
 	};
-	const now = () => Number(options.clock.monotonicTimeNanosUnsafe()) / 1e6;
+	const now = () => monotonicMillis(options.clock);
 	const adopt = (adopted) => {
 		run = void 0;
 		expected = adopted.device;
@@ -3954,7 +3897,7 @@ const make$8 = (options) => Effect.gen(function* () {
 	let latest = Option.none();
 	let history = [];
 	const keepMillis = Duration.toMillis(options.frameHistory);
-	const now = () => Number(options.clock.monotonicTimeNanosUnsafe()) / 1e6;
+	const now = () => monotonicMillis(options.clock);
 	const counts = tally(now);
 	let delivered = 0;
 	const current = (frame) => isCurrent(frame, generation, latest);
@@ -4578,10 +4521,6 @@ const make$7 = Effect.fnUntraced(function* (page, bridge, viewport) {
 * read takes its turn on the page and shares its work with identical reads, as `lane.ts`
 * describes. The viewport's text as it was last read is kept, for `Page.state`.
 */
-const SnapshotResult = Schema.Union([Schema.Struct({
-	snapshot: Snapshot,
-	nextRef: Schema.Finite
-}), Schema.Struct({ invalid: Schema.String })]);
 const FindResults = Schema.Struct({
 	found: Schema.Array(Found),
 	nextRef: Schema.Finite
@@ -4590,7 +4529,6 @@ const UntilResult = Schema.Struct({
 	met: Schema.Boolean,
 	mark: Schema.String
 });
-const ConditionResult = Schema.Union([Schema.Struct({ met: Schema.Boolean }), Schema.Struct({ invalid: Schema.String })]);
 const wanted = (value) => value === void 0 ? null : typeof value === "string" ? value : {
 	source: value.source,
 	flags: value.flags
@@ -4625,7 +4563,7 @@ const make$6 = Effect.fnUntraced(function* (page, bridge) {
 				...asked,
 				firstRef: yield* Ref.get(nextRef)
 			};
-			const result = yield* evaluate("snapshot", scriptCall("snapshot", request)).pipe(Effect.flatMap(decodeWith("snapshot", SnapshotResult)));
+			const result = yield* evaluate("snapshot", scriptCall("snapshot", request)).pipe(Effect.flatMap(decodeWith("snapshot", SnapshotResultSchema)));
 			if ("invalid" in result) return yield* failWith("snapshot", new InvalidRequest({ detail: result.invalid }));
 			const { text, truncated, url } = result.snapshot;
 			yield* counted(result.nextRef);
@@ -4686,7 +4624,7 @@ const make$6 = Effect.fnUntraced(function* (page, bridge) {
 		};
 		const millis = Math.min(Duration.toMillis(timeout), Number.MAX_SAFE_INTEGER);
 		const unmet = () => failWith("waitFor", new Timeout({ millis }));
-		const look = evaluate("waitFor", scriptCall("waitUntil", request, millis)).pipe(Effect.flatMap(decodeWith("waitFor", ConditionResult)), Effect.flatMap((result) => "invalid" in result ? failWith("waitFor", new InvalidRequest({ detail: result.invalid })) : result.met ? Effect.void : unmet()));
+		const look = evaluate("waitFor", scriptCall("waitUntil", request, millis)).pipe(Effect.flatMap(decodeWith("waitFor", ConditionResultSchema)), Effect.flatMap((result) => "invalid" in result ? failWith("waitFor", new InvalidRequest({ detail: result.invalid })) : result.met ? Effect.void : unmet()));
 		return lane.read("waitFor")(Effect.void).pipe(Effect.andThen(Effect.retry(look, { while: contextGone })), Effect.timeoutOrElse({
 			duration: timeout,
 			orElse: unmet
@@ -5099,6 +5037,6 @@ const make = Effect.fnUntraced(function* (options) {
 	return Object.assign(new Built(internals), assembled);
 });
 //#endregion
-export { performed as a, pause as i, make as n, mapping as o, viewOf as r, internalsOf as t };
+export { performed as a, pause as i, make as n, viewOf as r, internalsOf as t };
 
-//# sourceMappingURL=page-B92QnRfT.mjs.map
+//# sourceMappingURL=page-ClEMFnBG.mjs.map