effect-browser 0.3.0-beta.10 → 0.3.0-beta.13

package/dist/{page-B8tUQELg.mjs → page-ZxMhw16l.mjs}

@@ -1,7 +1,7 @@
 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 { 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 { 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-BAjRj7Xo.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";
@@ -2219,6 +2219,7 @@ const make$17 = Effect.fnUntraced(function* (page) {
 	/** What a frame that arrives now shows: its session, the page's current document and address. */
 	const frameTag = () => ({
 		session: page.session,
+		connection: page.connection,
 		document: documents,
 		url
 	});
@@ -3162,7 +3163,7 @@ const make$11 = (page, bridge) => {
 	});
 	/** Wait for the page to settle after input sent since `before`. */
 	const settle = (operation, before) => Effect.gen(function* () {
-		yield* bridge.evaluate(operation, scriptCall("settle")).pipe(Effect.catchIf(contextGone, () => Effect.void));
+		yield* bridge.evaluate(operation, scriptCall("settle")).pipe(Effect.provideService(Current, void 0), Effect.catchIf(contextGone, () => Effect.void), Effect.onError(() => page.stopLoading));
 		while (document() > before.document && parsed < document()) yield* Deferred.await(changed);
 	}).pipe(Effect.timeoutOrElse({
 		duration: settling$1,
@@ -4234,6 +4235,7 @@ const apart = (page, bridge, source, error, pageScope) => {
 			},
 			frameTag: () => ({
 				session: page.session,
+				connection: page.connection,
 				...tracked.tag()
 			})
 		};
@@ -4440,7 +4442,7 @@ const millisOf = (input) => Option.match(Duration.fromInput(input), {
 	onNone: () => NaN,
 	onSome: Duration.toMillis
 });
-const reuse = (page, viewport, capture) => (operation, options) => Effect.gen(function* () {
+const reuse = (page, bridge, viewport, capture) => (operation, options) => Effect.gen(function* () {
 	const maxAge = millisOf(options.maxAge ?? defaultMaxAge);
 	if (!(maxAge >= 0)) return yield* failWith(operation, new InvalidRequest({ detail: "maxAge must be a duration of zero or more" }));
 	const latest = yield* capture.latest;
@@ -4448,7 +4450,7 @@ const reuse = (page, viewport, capture) => (operation, options) => Effect.gen(fu
 	const { activity } = page;
 	return Option.filter(latest, (frame) => {
 		const earliest = frame.hostTime - frame.timing.uncertaintyMillis;
-		return page.now() - earliest <= maxAge && earliest > activity.documentAt && (options.after !== "input" || earliest > activity.inputAt) && frame.width === known?.width && frame.height === known.height;
+		return frame.document === bridge.frameTag().document && page.now() - earliest <= maxAge && earliest > activity.documentAt && (options.after !== "input" || earliest > activity.inputAt) && frame.width === known?.width && frame.height === known.height;
 	});
 });
 /** Where a picture came from: a frame the screencast had delivered, or a new screenshot. */
@@ -4471,7 +4473,7 @@ const make$7 = Effect.fnUntraced(function* (page, bridge, viewport) {
 		error
 	});
 	const picture = camera(page, bridge, viewport, capture);
-	const reusable = reuse(page, viewport, capture);
+	const reusable = reuse(page, bridge, viewport, capture);
 	const screenshots = lane.shared("screenshot", false);
 	const frames = lane.shared("frame", false);
 	const screenshot = (options = {}) => screenshots(JSON.stringify([
@@ -4858,7 +4860,7 @@ const make$2 = (page, perform, preparePolicy) => {
 		return perform(name, {
 			target: url,
 			input: false
-		}, settings.navigationTimeout, preparePolicy(name, { target: url }, [], { destination: url }), (marks) => marks.sent.pipe(Effect.andThen(native(name, run)), Effect.mapError((error) => error.reason._tag === "Failed" && /net::|NS_ERROR|Cannot navigate/i.test(error.reason.detail) ? new BrowserError({
+		}, settings.navigationTimeout, preparePolicy(name, { target: url }, [], { destination: url }), (marks) => marks.sent.pipe(Effect.andThen(native(name, run).pipe(Effect.onError(() => page.stopLoading))), Effect.mapError((error) => error.reason._tag === "Failed" && /net::|NS_ERROR|Cannot navigate/i.test(error.reason.detail) ? new BrowserError({
 			operation: name,
 			reason: new NavigationFailed({
 				url,
@@ -4899,16 +4901,15 @@ const make$2 = (page, perform, preparePolicy) => {
 		const onNavigation = () => {
 			Deferred.doneUnsafe(navigated, Effect.void);
 		};
-		yield* Effect.acquireUseRelease(Effect.sync(() => playwright.on("framenavigated", onNavigation)), () => Effect.gen(function* () {
-			yield* marks.sent;
+		yield* Effect.acquireUseRelease(Effect.sync(() => playwright.on("framenavigated", onNavigation)), () => marks.sent.pipe(Effect.andThen(Effect.gen(function* () {
 			yield* native("back", () => send("Page.navigateToHistoryEntry", { entryId: previous.id }));
 			yield* traversingHistory.pipe(Effect.repeat({
 				schedule: Schedule.spaced(Duration.millis(50)),
 				until: (latest) => latest.entries[latest.currentIndex]?.id !== current.id
 			}));
 			yield* Deferred.await(navigated);
-		}), () => Effect.sync(() => playwright.off("framenavigated", onNavigation)));
-		yield* native("back", () => playwright.waitForLoadState("domcontentloaded", { timeout: 0 }));
+			yield* native("back", () => playwright.waitForLoadState("domcontentloaded", { timeout: 0 })).pipe(Effect.provideService(Current, void 0));
+		}).pipe(Effect.onError(() => page.stopLoading)))), () => Effect.sync(() => playwright.off("framenavigated", onNavigation)));
 	});
 	const goto = (url) => {
 		const parsed = parse(url);
@@ -5070,4 +5071,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-B8tUQELg.mjs.map
+//# sourceMappingURL=page-ZxMhw16l.mjs.map