@effect-agent/platform-cloudflare 0.1.0-beta.121 → 0.1.0-beta.122

package/dist/{InteractiveBrowser-DhOkdUx9.mjs → InteractiveBrowser-DXwmvWdA.mjs}

@@ -49,9 +49,41 @@ const reportBrowserCause = (operation, cause) => ErrorReporter.report(Cause.from
 //#endregion
 //#region src/internal/browser-binding.ts
 const Acquired = Schema.Struct({ sessionId: Schema.String.check(Schema.isUUID()) });
+const VersionReply = Schema.fromJsonString(Schema.Struct({
+	id: Schema.optionalKey(Schema.Int),
+	result: Schema.optionalKey(Schema.Unknown),
+	error: Schema.optionalKey(Schema.Unknown)
+}));
+const Version = Schema.Struct({
+	product: Schema.NonEmptyString,
+	protocolVersion: Schema.NonEmptyString
+});
 /** Native transport port shared by both scoped adapters; the Layer owns the foreign binding. */
 var BrowserRunBinding = class extends Context.Service()("@effect-agent/platform-cloudflare/internal/BrowserRunBinding") {
 	static layer(browser) {
+		const upgrade = async (sessionId, operation, signal) => {
+			const response = await browser.fetch(`https://browser-rendering.cloudflare.com/v1/devtools/browser/${sessionId}`, {
+				headers: { Upgrade: "websocket" },
+				...signal === void 0 ? {} : { signal }
+			});
+			if (response.status !== 101) {
+				const failure = new BrowserRunFailure({
+					operation,
+					reason: "provider",
+					status: response.status
+				});
+				try {
+					await response.body?.cancel();
+				} catch {}
+				throw failure;
+			}
+			const socket = response.webSocket;
+			if (socket === null) throw new BrowserRunFailure({
+				operation,
+				reason: "malformed"
+			});
+			return socket;
+		};
 		return Layer.succeed(this)({
 			acquire: async (keepAliveMillis, operation) => {
 				const response = await browser.fetch(`https://browser-rendering.cloudflare.com/v1/devtools/browser?keep_alive=${keepAliveMillis}&recording=false`, { method: "POST" });
@@ -68,62 +100,171 @@ var BrowserRunBinding = class extends Context.Service()("@effect-agent/platform-
 				}
 				return Schema.decodeUnknownSync(Acquired)(await response.json()).sessionId;
 			},
-			connect: async (sessionId, operation, signal) => {
+			connect: (sessionId, operation, signal) => {
 				let socket;
+				let retired = false;
 				let closedByAbort = false;
-				try {
-					const response = await browser.fetch(`https://browser-rendering.cloudflare.com/v1/devtools/browser/${sessionId}`, {
-						headers: { Upgrade: "websocket" },
-						...signal === void 0 ? {} : { signal }
-					});
-					if (response.status !== 101) {
-						const failure = new BrowserRunFailure({
+				let retirementFailure;
+				const disconnectOperation = operation === "protected.connect" ? "protected.disconnect" : "interactive.disconnect";
+				const transport = {
+					send: (message) => {
+						if (retired || socket === void 0) throw new BrowserRunFailure({
 							operation,
-							reason: "provider",
-							status: response.status
+							reason: "provider"
 						});
-						try {
-							await response.body?.cancel();
-						} catch {}
-						throw failure;
+						socket.send(message);
+					},
+					close: () => retireNow()
+				};
+				const onMessage = (event) => {
+					if (!retired) transport.onmessage?.(event.data);
+				};
+				const fence = () => {
+					if (retired) return;
+					retired = true;
+					const notify = transport.onclose;
+					transport.onmessage = void 0;
+					transport.onclose = void 0;
+					try {
+						notify?.();
+					} finally {
+						socket?.removeEventListener("message", onMessage);
 					}
-					const connected = response.webSocket;
-					if (connected === null) throw new BrowserRunFailure({
-						operation,
-						reason: "malformed"
-					});
-					socket = connected;
-					const transport = {
-						send: (message) => connected.send(message),
-						close: () => connected.close()
+				};
+				const retireNow = () => {
+					try {
+						fence();
+					} catch (cause) {
+						retirementFailure ??= browserFailure(disconnectOperation, cause);
+					}
+					try {
+						if (socket !== void 0 && socket.readyState < WebSocket.CLOSING) socket.close();
+					} catch (cause) {
+						retirementFailure ??= browserFailure(disconnectOperation, cause);
+					}
+					if (retirementFailure !== void 0) throw retirementFailure;
+				};
+				const abort = () => {
+					closedByAbort = socket?.readyState === WebSocket.OPEN;
+					try {
+						retireNow();
+					} catch {}
+				};
+				signal?.addEventListener("abort", abort, { once: true });
+				return {
+					browser: (async () => {
+						try {
+							signal?.throwIfAborted();
+							socket = await upgrade(sessionId, operation, signal);
+							socket.accept();
+							if (retired || signal?.aborted) {
+								retireNow();
+								signal?.throwIfAborted();
+								throw new BrowserRunFailure({
+									operation,
+									reason: "provider"
+								});
+							}
+							socket.addEventListener("message", onMessage);
+							socket.addEventListener("close", () => {
+								try {
+									fence();
+								} catch (cause) {
+									retirementFailure ??= browserFailure(disconnectOperation, cause);
+								}
+							}, { once: true });
+							return await puppeteer.connect({ transport });
+						} catch (cause) {
+							try {
+								retireNow();
+							} catch {}
+							const failure = browserFailure(operation, cause);
+							throw cause instanceof Error && signal?.aborted === true && (cause === signal.reason || closedByAbort && cause.name === "TargetCloseError") ? reportedBrowserError(failure) : failure;
+						} finally {
+							signal?.removeEventListener("abort", abort);
+						}
+					})(),
+					retire: Effect.callback((resume) => {
+						const connected = socket;
+						const onClose = () => resume(Effect.void);
+						try {
+							retireNow();
+							if (connected === void 0 || connected.readyState === WebSocket.CLOSED) resume(Effect.void);
+							else connected.addEventListener("close", onClose, { once: true });
+						} catch (cause) {
+							resume(Effect.fail(browserFailure(disconnectOperation, cause)));
+						}
+						return Effect.sync(() => connected?.removeEventListener("close", onClose));
+					})
+				};
+			},
+			keepAlive: Effect.fnUntraced(function* (sessionId) {
+				const operation = "protected.keepAlive";
+				const runReport = Effect.runPromiseWith(yield* Effect.context());
+				const release = (socket) => Effect.sync(() => socket.close()).pipe(Effect.catchCause((cause) => reportBrowserCause(operation, cause)));
+				const socket = yield* Effect.acquireRelease(Effect.tryPromise({
+					try: async (signal) => {
+						let acquired;
+						try {
+							acquired = await upgrade(sessionId, operation, signal);
+							acquired.accept();
+							signal.throwIfAborted();
+							return acquired;
+						} catch (cause) {
+							if (acquired !== void 0) await runReport(release(acquired));
+							if (signal.aborted && cause !== signal.reason) await runReport(reportBrowserCause(operation, Cause.fail(cause)));
+							throw cause;
+						}
+					},
+					catch: (cause) => browserFailure(operation, cause)
+				}), release, { interruptible: true });
+				yield* Effect.callback((resume) => {
+					const finish = (result) => {
+						removeListeners();
+						resume(result);
 					};
-					connected.addEventListener("message", (event) => {
-						transport.onmessage?.(event.data);
-					});
-					connected.addEventListener("close", () => transport.onclose?.());
-					connected.accept();
-					const abort = () => {
+					const fail = (reason) => finish(Effect.fail(new BrowserRunFailure({
+						operation,
+						reason
+					})));
+					const onMessage = (event) => {
 						try {
-							const wasOpen = connected.readyState === WebSocket.OPEN;
-							connected.close();
-							closedByAbort = wasOpen;
-						} catch {}
+							if (typeof event.data !== "string" || event.data.length > 16384) {
+								fail("malformed");
+								return;
+							}
+							const reply = Schema.decodeSync(VersionReply)(event.data);
+							if (reply.id !== 1) return;
+							if (reply.error !== void 0) {
+								fail("provider");
+								return;
+							}
+							Schema.decodeUnknownSync(Version)(reply.result);
+							finish(Effect.void);
+						} catch {
+							fail("malformed");
+						}
 					};
-					signal?.addEventListener("abort", abort, { once: true });
+					const onClose = () => fail("provider");
+					const removeListeners = () => {
+						socket.removeEventListener("message", onMessage);
+						socket.removeEventListener("close", onClose);
+						socket.removeEventListener("error", onClose);
+					};
+					socket.addEventListener("message", onMessage);
+					socket.addEventListener("close", onClose);
+					socket.addEventListener("error", onClose);
 					try {
-						signal?.throwIfAborted();
-						return await puppeteer.connect({ transport });
-					} finally {
-						signal?.removeEventListener("abort", abort);
+						socket.send(JSON.stringify({
+							id: 1,
+							method: "Browser.getVersion"
+						}));
+					} catch (cause) {
+						finish(Effect.fail(browserFailure(operation, cause)));
 					}
-				} catch (cause) {
-					try {
-						socket?.close();
-					} catch {}
-					const failure = browserFailure(operation, cause);
-					throw cause instanceof Error && signal?.aborted === true && (cause === signal.reason || closedByAbort && cause.name === "TargetCloseError") ? reportedBrowserError(failure) : failure;
-				}
-			}
+					return Effect.sync(removeListeners);
+				});
+			}, Effect.scoped)
 		});
 	}
 };
@@ -443,7 +584,7 @@ var BrowserRunInteractiveBinding = class BrowserRunInteractiveBinding extends Co
 			const viewport = options.viewport === void 0 ? void 0 : yield* decodeViewport(options.viewport);
 			return {
 				acquire: async (keepAliveMillis) => binding.acquire(keepAliveMillis, "interactive.acquire"),
-				connect: async (sessionId, signal) => makeProductionBrowser(await binding.connect(sessionId, "interactive.connect", signal), sessionId, viewport),
+				connect: async (sessionId, signal) => makeProductionBrowser(await binding.connect(sessionId, "interactive.connect", signal).browser, sessionId, viewport),
 				closeSession: (sessionId) => lifecycle.close(sessionId).pipe(Effect.mapError((cause) => actionError("close", cause)))
 			};
 		})).pipe(Layer.provide(BrowserRunBinding.layer(options.browser)));
@@ -1777,4 +1918,4 @@ const CloudflareInteractiveBrowser = {
 //#endregion
 export { reportBrowserCause as C, inheritBrowserReport as S, BrowserRunCleanupError as _, BrowserRunInteractiveCheckpoint as a, BrowserRunFailure as b, BrowserRunLiveViewResult as c, BrowserRunViewport as d, CloudflareInteractiveBrowser as f, isBrowserRunUndispatchedActionError as g, browserRunInteractiveLayer as h, BrowserRunInteractiveBinding as i, BrowserRunPageIdentity as l, browserRunInteractiveImplementation as m, BrowserRunHandoffResult as n, BrowserRunInteractiveHost as o, browserRunInteractiveHostLayer as p, BrowserRunHandoffState as r, BrowserRunLiveViewRequest as s, BrowserRunHandoffRequest as t, BrowserRunPageObservation as u, BrowserRunSessionLifecycle as v, reportedBrowserError as w, browserFailure as x, BrowserRunBinding as y };
 
-//# sourceMappingURL=InteractiveBrowser-DhOkdUx9.mjs.map
+//# sourceMappingURL=InteractiveBrowser-DXwmvWdA.mjs.map