@effect-agent/platform-cloudflare 0.1.0-beta.121 → 0.1.0-beta.122
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{InteractiveBrowser-DhOkdUx9.mjs → InteractiveBrowser-DXwmvWdA.mjs} +189 -48
- package/dist/InteractiveBrowser-DXwmvWdA.mjs.map +1 -0
- package/dist/InteractiveBrowser.mjs +1 -1
- package/dist/ProtectedBrowser.d.mts +14 -0
- package/dist/ProtectedBrowser.mjs +193 -152
- package/dist/ProtectedBrowser.mjs.map +1 -1
- package/package.json +1 -1
- package/src/InteractiveBrowser.ts +1 -1
- package/src/internal/browser-binding.ts +244 -56
- package/src/protected-browser/binding.ts +129 -50
- package/src/protected-browser/host.ts +16 -0
- package/dist/InteractiveBrowser-DhOkdUx9.mjs.map +0 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@effect-agent/platform-cloudflare","version":"0.1.0-beta.
|
|
1
|
+
{"name":"@effect-agent/platform-cloudflare","version":"0.1.0-beta.122","dependencies":{"@effect-agent/storage-cloudflare":"0.1.0-beta.122","@effect/platform-browser":"4.0.0-rc.116","@effect/sql-sqlite-do":"4.0.0-rc.116","effect-agent":"0.1.0-beta.122","puppeteer-core":"24.29.0"},"devDependencies":{"@cloudflare/vitest-pool-workers":"0.21.3","@cloudflare/workers-types":"5.20260825.1","@effect-agent/testing":"0.1.0-beta.122","@effect/platform-node":"4.0.0-rc.116","@effect/sql-d1":"4.0.0-rc.116","@effect/vitest":"4.0.0-rc.116","effect":"4.0.0-rc.116","effect-cf":"0.44.1","esbuild":"0.28.1","miniflare":"5.20260811.1-alpha","typescript":"7.0.2","vite-plus":"0.3.2","vitest":"4.1.11"},"peerDependencies":{"effect":"^4.0.0-rc.116","effect-cf":"^0.44.1 || ^0.45.0"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./alarm":{"types":"./dist/Alarm.d.mts","default":"./dist/Alarm.mjs"},"./browser-rest-capture":{"types":"./dist/BrowserRestCapture.d.mts","default":"./dist/BrowserRestCapture.mjs"},"./browser-rest-crawl":{"types":"./dist/BrowserRestCrawl.d.mts","default":"./dist/BrowserRestCrawl.mjs"},"./cloudflare-bindings":{"types":"./dist/CloudflareBindings.d.mts","default":"./dist/CloudflareBindings.mjs"},"./cloudflare-browser":{"types":"./dist/CloudflareBrowser.d.mts","default":"./dist/CloudflareBrowser.mjs"},"./cloudflare-code-mode":{"types":"./dist/CloudflareCodeMode.d.mts","default":"./dist/CloudflareCodeMode.mjs"},"./cloudflare-config":{"types":"./dist/CloudflareConfig.d.mts","default":"./dist/CloudflareConfig.mjs"},"./cloudflare-memory":{"types":"./dist/CloudflareMemory.d.mts","default":"./dist/CloudflareMemory.mjs"},"./cloudflare-scheduling":{"types":"./dist/CloudflareScheduling.d.mts","default":"./dist/CloudflareScheduling.mjs"},"./cloudflare-subscriptions":{"types":"./dist/CloudflareSubscriptions.d.mts","default":"./dist/CloudflareSubscriptions.mjs"},"./cloudflare-thread-client":{"types":"./dist/CloudflareThreadClient.d.mts","default":"./dist/CloudflareThreadClient.mjs"},"./interactive-browser":{"types":"./dist/InteractiveBrowser.d.mts","default":"./dist/InteractiveBrowser.mjs"},"./protected-browser":{"types":"./dist/ProtectedBrowser.d.mts","default":"./dist/ProtectedBrowser.mjs"},"./thread-object":{"types":"./dist/ThreadObject.d.mts","default":"./dist/ThreadObject.mjs"},"./wake-scheduler":{"types":"./dist/WakeScheduler.d.mts","default":"./dist/WakeScheduler.mjs"},"./cloudflare-ai-gateway":{"types":"./dist/CloudflareAiGateway.d.mts","default":"./dist/CloudflareAiGateway.mjs"}},"description":"Cloudflare Layer assembly for Effect Agent: Durable Objects and Browser Run adapters.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/danieljvdm/effect-agent.git","directory":"packages/platform-cloudflare"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json"}}
|
|
@@ -411,7 +411,7 @@ export class BrowserRunInteractiveBinding extends Context.Service<
|
|
|
411
411
|
binding.acquire(keepAliveMillis, "interactive.acquire"),
|
|
412
412
|
connect: async (sessionId: string, signal?: AbortSignal) =>
|
|
413
413
|
makeProductionBrowser(
|
|
414
|
-
await binding.connect(sessionId, "interactive.connect", signal),
|
|
414
|
+
await binding.connect(sessionId, "interactive.connect", signal).browser,
|
|
415
415
|
sessionId,
|
|
416
416
|
viewport,
|
|
417
417
|
),
|
|
@@ -1,14 +1,39 @@
|
|
|
1
1
|
/// <reference types="@cloudflare/workers-types" />
|
|
2
|
-
import { Context, Layer, Schema } from "effect";
|
|
2
|
+
import { Cause, Context, Effect, Layer, Schema } from "effect";
|
|
3
3
|
import puppeteer, {
|
|
4
4
|
type Browser,
|
|
5
5
|
type ConnectionTransport,
|
|
6
6
|
} from "puppeteer-core/lib/esm/puppeteer/puppeteer-core-browser.js";
|
|
7
7
|
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
browserFailure,
|
|
10
|
+
BrowserRunFailure,
|
|
11
|
+
reportBrowserCause,
|
|
12
|
+
reportedBrowserError,
|
|
13
|
+
} from "./browser-failure.ts";
|
|
9
14
|
|
|
10
15
|
const Acquired = Schema.Struct({ sessionId: Schema.String.check(Schema.isUUID()) });
|
|
11
16
|
|
|
17
|
+
const VersionReply = Schema.fromJsonString(
|
|
18
|
+
Schema.Struct({
|
|
19
|
+
id: Schema.optionalKey(Schema.Int),
|
|
20
|
+
result: Schema.optionalKey(Schema.Unknown),
|
|
21
|
+
error: Schema.optionalKey(Schema.Unknown),
|
|
22
|
+
}),
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
const Version = Schema.Struct({
|
|
26
|
+
product: Schema.NonEmptyString,
|
|
27
|
+
protocolVersion: Schema.NonEmptyString,
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
/** Private attachment ownership is available before asynchronous SDK initialization completes. */
|
|
31
|
+
export interface BrowserRunAttachment {
|
|
32
|
+
readonly browser: Promise<Browser>;
|
|
33
|
+
/** Fence SDK dispatch/callbacks and await local socket closure; never terminate the provider. */
|
|
34
|
+
readonly retire: Effect.Effect<void, BrowserRunFailure>;
|
|
35
|
+
}
|
|
36
|
+
|
|
12
37
|
/** Native transport port shared by both scoped adapters; the Layer owns the foreign binding. */
|
|
13
38
|
export class BrowserRunBinding extends Context.Service<
|
|
14
39
|
BrowserRunBinding,
|
|
@@ -21,10 +46,38 @@ export class BrowserRunBinding extends Context.Service<
|
|
|
21
46
|
sessionId: string,
|
|
22
47
|
operation: string,
|
|
23
48
|
signal?: AbortSignal,
|
|
24
|
-
) =>
|
|
49
|
+
) => BrowserRunAttachment;
|
|
50
|
+
readonly keepAlive: (sessionId: string) => Effect.Effect<void, BrowserRunFailure>;
|
|
25
51
|
}
|
|
26
52
|
>()("@effect-agent/platform-cloudflare/internal/BrowserRunBinding") {
|
|
27
53
|
static layer(browser: Pick<BrowserRun, "fetch">) {
|
|
54
|
+
const upgrade = async (sessionId: string, operation: string, signal?: AbortSignal) => {
|
|
55
|
+
const response = await browser.fetch(
|
|
56
|
+
`https://browser-rendering.cloudflare.com/v1/devtools/browser/${sessionId}`,
|
|
57
|
+
{ headers: { Upgrade: "websocket" }, ...(signal === undefined ? {} : { signal }) },
|
|
58
|
+
);
|
|
59
|
+
|
|
60
|
+
if (response.status !== 101) {
|
|
61
|
+
const failure = new BrowserRunFailure({
|
|
62
|
+
operation,
|
|
63
|
+
reason: "provider",
|
|
64
|
+
status: response.status,
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
try {
|
|
68
|
+
await response.body?.cancel();
|
|
69
|
+
} catch {
|
|
70
|
+
// Preserve the provider refusal when local response release also fails.
|
|
71
|
+
}
|
|
72
|
+
throw failure;
|
|
73
|
+
}
|
|
74
|
+
const socket = response.webSocket;
|
|
75
|
+
|
|
76
|
+
if (socket === null) throw new BrowserRunFailure({ operation, reason: "malformed" });
|
|
77
|
+
|
|
78
|
+
return socket;
|
|
79
|
+
};
|
|
80
|
+
|
|
28
81
|
return Layer.succeed(this)({
|
|
29
82
|
// One allocation path, with recording explicitly disabled for private sessions.
|
|
30
83
|
acquire: async (keepAliveMillis, operation) => {
|
|
@@ -50,83 +103,218 @@ export class BrowserRunBinding extends Context.Service<
|
|
|
50
103
|
|
|
51
104
|
return Schema.decodeUnknownSync(Acquired)(await response.json()).sessionId;
|
|
52
105
|
},
|
|
53
|
-
connect:
|
|
106
|
+
connect: (sessionId, operation, signal) => {
|
|
54
107
|
let socket: WebSocket | undefined;
|
|
108
|
+
let retired = false;
|
|
55
109
|
let closedByAbort = false;
|
|
110
|
+
let retirementFailure: BrowserRunFailure | undefined;
|
|
56
111
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
)
|
|
112
|
+
const disconnectOperation =
|
|
113
|
+
operation === "protected.connect" ? "protected.disconnect" : "interactive.disconnect";
|
|
114
|
+
|
|
115
|
+
const transport: ConnectionTransport = {
|
|
116
|
+
send: (message) => {
|
|
117
|
+
if (retired || socket === undefined)
|
|
118
|
+
throw new BrowserRunFailure({ operation, reason: "provider" });
|
|
119
|
+
socket.send(message);
|
|
120
|
+
},
|
|
121
|
+
close: () => retireNow(),
|
|
122
|
+
};
|
|
123
|
+
|
|
124
|
+
const onMessage = (event: MessageEvent) => {
|
|
125
|
+
if (!retired) transport.onmessage?.(event.data);
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
const fence = () => {
|
|
129
|
+
if (retired) return;
|
|
130
|
+
retired = true;
|
|
131
|
+
const notify = transport.onclose;
|
|
62
132
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
133
|
+
transport.onmessage = undefined;
|
|
134
|
+
transport.onclose = undefined;
|
|
135
|
+
// Notify the SDK before touching the socket: disposal must reject pending CDP calls
|
|
136
|
+
// even when the raw transport cannot close. The send fence also covers queued work.
|
|
137
|
+
try {
|
|
138
|
+
notify?.();
|
|
139
|
+
} finally {
|
|
140
|
+
socket?.removeEventListener("message", onMessage);
|
|
141
|
+
}
|
|
142
|
+
};
|
|
143
|
+
|
|
144
|
+
const retireNow = () => {
|
|
145
|
+
try {
|
|
146
|
+
fence();
|
|
147
|
+
} catch (cause) {
|
|
148
|
+
retirementFailure ??= browserFailure(disconnectOperation, cause);
|
|
149
|
+
}
|
|
150
|
+
try {
|
|
151
|
+
if (socket !== undefined && socket.readyState < WebSocket.CLOSING) socket.close();
|
|
152
|
+
} catch (cause) {
|
|
153
|
+
retirementFailure ??= browserFailure(disconnectOperation, cause);
|
|
154
|
+
}
|
|
155
|
+
if (retirementFailure !== undefined) throw retirementFailure;
|
|
156
|
+
};
|
|
157
|
+
|
|
158
|
+
const abort = () => {
|
|
159
|
+
closedByAbort = socket?.readyState === WebSocket.OPEN;
|
|
160
|
+
try {
|
|
161
|
+
retireNow();
|
|
162
|
+
} catch {
|
|
163
|
+
// The attachment owner observes this separately from the initiating failure.
|
|
164
|
+
}
|
|
165
|
+
};
|
|
166
|
+
|
|
167
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
168
|
+
|
|
169
|
+
const initialized = (async () => {
|
|
170
|
+
try {
|
|
171
|
+
signal?.throwIfAborted();
|
|
172
|
+
socket = await upgrade(sessionId, operation, signal);
|
|
173
|
+
socket.accept();
|
|
174
|
+
if (retired || signal?.aborted) {
|
|
175
|
+
// No SDK command may escape a late upgrade. Preserve a late local-close
|
|
176
|
+
// failure independently of the cancellation already returned to the owner.
|
|
177
|
+
retireNow();
|
|
178
|
+
signal?.throwIfAborted();
|
|
179
|
+
throw new BrowserRunFailure({ operation, reason: "provider" });
|
|
180
|
+
}
|
|
181
|
+
socket.addEventListener("message", onMessage);
|
|
182
|
+
socket.addEventListener(
|
|
183
|
+
"close",
|
|
184
|
+
() => {
|
|
185
|
+
try {
|
|
186
|
+
fence();
|
|
187
|
+
} catch (cause) {
|
|
188
|
+
retirementFailure ??= browserFailure(disconnectOperation, cause);
|
|
189
|
+
}
|
|
190
|
+
},
|
|
191
|
+
{ once: true },
|
|
192
|
+
);
|
|
69
193
|
|
|
194
|
+
return await puppeteer.connect({ transport });
|
|
195
|
+
} catch (cause) {
|
|
70
196
|
try {
|
|
71
|
-
|
|
197
|
+
retireNow();
|
|
72
198
|
} catch {
|
|
73
|
-
//
|
|
199
|
+
// Preserve both facts: initialization failed, and retirement may be unconfirmed.
|
|
74
200
|
}
|
|
75
|
-
|
|
201
|
+
const failure = browserFailure(operation, cause);
|
|
202
|
+
|
|
203
|
+
const localCancellation =
|
|
204
|
+
cause instanceof Error &&
|
|
205
|
+
signal?.aborted === true &&
|
|
206
|
+
(cause === signal.reason || (closedByAbort && cause.name === "TargetCloseError"));
|
|
207
|
+
|
|
208
|
+
throw localCancellation ? reportedBrowserError(failure) : failure;
|
|
209
|
+
} finally {
|
|
210
|
+
signal?.removeEventListener("abort", abort);
|
|
76
211
|
}
|
|
77
|
-
|
|
212
|
+
})();
|
|
213
|
+
|
|
214
|
+
return {
|
|
215
|
+
browser: initialized,
|
|
216
|
+
retire: Effect.callback<void, BrowserRunFailure>((resume) => {
|
|
217
|
+
const connected = socket;
|
|
218
|
+
const onClose = () => resume(Effect.void);
|
|
219
|
+
|
|
220
|
+
try {
|
|
221
|
+
retireNow();
|
|
222
|
+
if (connected === undefined || connected.readyState === WebSocket.CLOSED)
|
|
223
|
+
resume(Effect.void);
|
|
224
|
+
else connected.addEventListener("close", onClose, { once: true });
|
|
225
|
+
} catch (cause) {
|
|
226
|
+
resume(Effect.fail(browserFailure(disconnectOperation, cause)));
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
return Effect.sync(() => connected?.removeEventListener("close", onClose));
|
|
230
|
+
}),
|
|
231
|
+
};
|
|
232
|
+
},
|
|
233
|
+
keepAlive: Effect.fnUntraced(function* (sessionId: string) {
|
|
234
|
+
const operation = "protected.keepAlive";
|
|
235
|
+
const runReport = Effect.runPromiseWith(yield* Effect.context<never>());
|
|
236
|
+
|
|
237
|
+
const release = (socket: WebSocket) =>
|
|
238
|
+
Effect.sync(() => socket.close()).pipe(
|
|
239
|
+
Effect.catchCause((cause) => reportBrowserCause(operation, cause)),
|
|
240
|
+
);
|
|
241
|
+
|
|
242
|
+
const socket = yield* Effect.acquireRelease(
|
|
243
|
+
Effect.tryPromise({
|
|
244
|
+
try: async (signal) => {
|
|
245
|
+
let acquired: WebSocket | undefined;
|
|
246
|
+
|
|
247
|
+
try {
|
|
248
|
+
acquired = await upgrade(sessionId, operation, signal);
|
|
249
|
+
acquired.accept();
|
|
250
|
+
// The binding may resolve an upgrade after the Effect was interrupted.
|
|
251
|
+
signal.throwIfAborted();
|
|
78
252
|
|
|
79
|
-
|
|
80
|
-
|
|
253
|
+
return acquired;
|
|
254
|
+
} catch (cause) {
|
|
255
|
+
if (acquired !== undefined) await runReport(release(acquired));
|
|
256
|
+
if (signal.aborted && cause !== signal.reason)
|
|
257
|
+
await runReport(reportBrowserCause(operation, Cause.fail(cause)));
|
|
258
|
+
throw cause;
|
|
259
|
+
}
|
|
260
|
+
},
|
|
261
|
+
catch: (cause) => browserFailure(operation, cause),
|
|
262
|
+
}),
|
|
263
|
+
release,
|
|
264
|
+
{ interruptible: true },
|
|
265
|
+
);
|
|
81
266
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
267
|
+
yield* Effect.callback<void, BrowserRunFailure>((resume) => {
|
|
268
|
+
const finish = (result: Effect.Effect<void, BrowserRunFailure>) => {
|
|
269
|
+
removeListeners();
|
|
270
|
+
resume(result);
|
|
85
271
|
};
|
|
86
272
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
connected.addEventListener("close", () => transport.onclose?.());
|
|
91
|
-
connected.accept();
|
|
273
|
+
const fail = (reason: BrowserRunFailure["reason"]) =>
|
|
274
|
+
finish(Effect.fail(new BrowserRunFailure({ operation, reason })));
|
|
92
275
|
|
|
93
|
-
const
|
|
276
|
+
const onMessage = (event: MessageEvent) => {
|
|
94
277
|
try {
|
|
95
|
-
|
|
278
|
+
if (typeof event.data !== "string" || event.data.length > 16_384) {
|
|
279
|
+
fail("malformed");
|
|
280
|
+
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
const reply = Schema.decodeSync(VersionReply)(event.data);
|
|
284
|
+
|
|
285
|
+
if (reply.id !== 1) return;
|
|
286
|
+
if (reply.error !== undefined) {
|
|
287
|
+
fail("provider");
|
|
96
288
|
|
|
97
|
-
|
|
98
|
-
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
Schema.decodeUnknownSync(Version)(reply.result);
|
|
292
|
+
finish(Effect.void);
|
|
99
293
|
} catch {
|
|
100
|
-
|
|
294
|
+
fail("malformed");
|
|
101
295
|
}
|
|
102
296
|
};
|
|
103
297
|
|
|
104
|
-
|
|
105
|
-
try {
|
|
106
|
-
signal?.throwIfAborted();
|
|
298
|
+
const onClose = () => fail("provider");
|
|
107
299
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
300
|
+
const removeListeners = () => {
|
|
301
|
+
socket.removeEventListener("message", onMessage);
|
|
302
|
+
socket.removeEventListener("close", onClose);
|
|
303
|
+
socket.removeEventListener("error", onClose);
|
|
304
|
+
};
|
|
305
|
+
|
|
306
|
+
socket.addEventListener("message", onMessage);
|
|
307
|
+
socket.addEventListener("close", onClose);
|
|
308
|
+
socket.addEventListener("error", onClose);
|
|
113
309
|
try {
|
|
114
|
-
socket
|
|
115
|
-
} catch {
|
|
116
|
-
|
|
310
|
+
socket.send(JSON.stringify({ id: 1, method: "Browser.getVersion" }));
|
|
311
|
+
} catch (cause) {
|
|
312
|
+
finish(Effect.fail(browserFailure(operation, cause)));
|
|
117
313
|
}
|
|
118
|
-
const failure = browserFailure(operation, cause);
|
|
119
|
-
|
|
120
|
-
// A local abort can reject SDK initialization as target-closed. Genuine late
|
|
121
|
-
// provider failures still report, even when the caller's signal has aborted.
|
|
122
|
-
const localCancellation =
|
|
123
|
-
cause instanceof Error &&
|
|
124
|
-
signal?.aborted === true &&
|
|
125
|
-
(cause === signal.reason || (closedByAbort && cause.name === "TargetCloseError"));
|
|
126
314
|
|
|
127
|
-
|
|
128
|
-
}
|
|
129
|
-
},
|
|
315
|
+
return Effect.sync(removeListeners);
|
|
316
|
+
});
|
|
317
|
+
}, Effect.scoped),
|
|
130
318
|
});
|
|
131
319
|
}
|
|
132
320
|
}
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
type CDPSession,
|
|
10
10
|
} from "puppeteer-core/lib/esm/puppeteer/puppeteer-core-browser.js";
|
|
11
11
|
|
|
12
|
-
import { BrowserRunBinding } from "../internal/browser-binding.ts";
|
|
12
|
+
import { BrowserRunBinding, type BrowserRunAttachment } from "../internal/browser-binding.ts";
|
|
13
13
|
import {
|
|
14
14
|
browserFailure,
|
|
15
15
|
BrowserRunFailure,
|
|
@@ -50,6 +50,9 @@ export class BrowserRunProtectedBinding extends Context.Service<
|
|
|
50
50
|
policy: InteractiveBrowserPolicy,
|
|
51
51
|
identity?: ProtectedProviderIdentity,
|
|
52
52
|
) => Effect.Effect<ProtectedProviderSession, ProtectedBrowserError, Scope.Scope>;
|
|
53
|
+
readonly keepAlive: (
|
|
54
|
+
sessionId: Redacted.Redacted<string>,
|
|
55
|
+
) => Effect.Effect<void, ProtectedBrowserError>;
|
|
53
56
|
}
|
|
54
57
|
>()("@effect-agent/platform-cloudflare/BrowserRunProtectedBinding") {}
|
|
55
58
|
|
|
@@ -83,6 +86,7 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
83
86
|
let control: CDPSession | undefined;
|
|
84
87
|
let providerIdentity: ProtectedProviderIdentity | undefined;
|
|
85
88
|
let browser: Browser | undefined;
|
|
89
|
+
let attachment: BrowserRunAttachment | undefined;
|
|
86
90
|
let driver: ProtectedBrowserTransport | undefined;
|
|
87
91
|
let invalid = false;
|
|
88
92
|
// SDK acquisition may finish after interruption. Its late-reply callback must await cleanup,
|
|
@@ -96,28 +100,48 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
96
100
|
|
|
97
101
|
// A failed resume has not acquired the host's retained provider. Release only
|
|
98
102
|
// this connection; successful attachments and new allocations own termination.
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
Effect.as("confirmed" as const),
|
|
103
|
-
Effect.catchCause((cause) =>
|
|
104
|
-
reportBrowserCause("protected.close", cause).pipe(
|
|
105
|
-
Effect.as("unconfirmed" as const),
|
|
106
|
-
),
|
|
107
|
-
),
|
|
103
|
+
if (identity !== undefined && driver === undefined) {
|
|
104
|
+
if (attachment !== undefined)
|
|
105
|
+
yield* attachment.retire.pipe(
|
|
108
106
|
Effect.interruptible,
|
|
109
107
|
Effect.timeoutOrElse({
|
|
110
|
-
duration: "
|
|
108
|
+
duration: "1 second",
|
|
111
109
|
orElse: () =>
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
),
|
|
117
|
-
)
|
|
110
|
+
Effect.fail(
|
|
111
|
+
new BrowserRunFailure({
|
|
112
|
+
operation: "protected.disconnect",
|
|
113
|
+
reason: "timeout",
|
|
114
|
+
}),
|
|
115
|
+
),
|
|
118
116
|
}),
|
|
117
|
+
Effect.catch((error) =>
|
|
118
|
+
reportBrowserCause("protected.disconnect", Cause.fail(error)).pipe(
|
|
119
|
+
Effect.andThen(() => Effect.die(reportedBrowserError(error))),
|
|
120
|
+
),
|
|
121
|
+
),
|
|
119
122
|
);
|
|
120
123
|
|
|
124
|
+
return "unconfirmed" as const;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
const cleanup = yield* lifecycle.close(sessionId).pipe(
|
|
128
|
+
Effect.as("confirmed" as const),
|
|
129
|
+
Effect.catchCause((cause) =>
|
|
130
|
+
reportBrowserCause("protected.close", cause).pipe(Effect.as("unconfirmed" as const)),
|
|
131
|
+
),
|
|
132
|
+
Effect.interruptible,
|
|
133
|
+
Effect.timeoutOrElse({
|
|
134
|
+
duration: "10 seconds",
|
|
135
|
+
orElse: () =>
|
|
136
|
+
reportBrowserCause(
|
|
137
|
+
"protected.close",
|
|
138
|
+
Cause.fail(
|
|
139
|
+
new BrowserRunFailure({ operation: "protected.close", reason: "timeout" }),
|
|
140
|
+
),
|
|
141
|
+
).pipe(Effect.as("unconfirmed" as const)),
|
|
142
|
+
}),
|
|
143
|
+
);
|
|
144
|
+
|
|
121
145
|
// Local disconnect is not remote-closure evidence. Do it even when confirmation fails.
|
|
122
146
|
const connected = browser;
|
|
123
147
|
|
|
@@ -166,7 +190,8 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
166
190
|
}
|
|
167
191
|
// Resume only a host-persisted exact page. Never open a replacement page or context.
|
|
168
192
|
stage = "protected.connect";
|
|
169
|
-
|
|
193
|
+
attachment = binding.connect(Redacted.value(sessionId), stage, signal);
|
|
194
|
+
browser = await attachment.browser;
|
|
170
195
|
if (signal.aborted || invalid) {
|
|
171
196
|
await runCleanup(terminate);
|
|
172
197
|
throw new ProtectedTransportError({ reason: "stale-reference" });
|
|
@@ -214,32 +239,38 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
214
239
|
targetId: Redacted.make(info.targetInfo.targetId),
|
|
215
240
|
});
|
|
216
241
|
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
242
|
+
// Unrestricted passes need no attachment-local network enforcement. Leave their
|
|
243
|
+
// service workers and requests alone, including across host-owned detach/resume.
|
|
244
|
+
if (policy.network._tag !== "Unrestricted") {
|
|
245
|
+
stage = "protected.interception";
|
|
246
|
+
await page.setBypassServiceWorker(true);
|
|
247
|
+
await page.setRequestInterception(true);
|
|
248
|
+
page.on("request", (request) => {
|
|
249
|
+
let allowed = false;
|
|
250
|
+
|
|
251
|
+
try {
|
|
252
|
+
const url = new URL(request.url());
|
|
253
|
+
|
|
254
|
+
allowed =
|
|
255
|
+
policy.network._tag === "ExactHosts" &&
|
|
256
|
+
url.protocol === "https:" &&
|
|
257
|
+
!url.username &&
|
|
258
|
+
!url.password &&
|
|
259
|
+
policy.network.allowedHosts.includes(url.host);
|
|
260
|
+
} catch {
|
|
261
|
+
/* Refuse malformed destinations. */
|
|
262
|
+
}
|
|
263
|
+
void (
|
|
264
|
+
allowed && !invalid ? request.continue() : request.abort("blockedbyclient")
|
|
265
|
+
).catch(async (cause) => {
|
|
266
|
+
invalid = true;
|
|
267
|
+
driver?.invalidate();
|
|
268
|
+
await runCleanup(
|
|
269
|
+
reportBrowserCause("protected.interception", Cause.fail(cause)),
|
|
270
|
+
);
|
|
271
|
+
});
|
|
241
272
|
});
|
|
242
|
-
}
|
|
273
|
+
}
|
|
243
274
|
if (signal.aborted || invalid) {
|
|
244
275
|
await runCleanup(terminate);
|
|
245
276
|
throw new ProtectedTransportError({ reason: "stale-reference" });
|
|
@@ -264,8 +295,26 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
264
295
|
orElse: () =>
|
|
265
296
|
Effect.fail(new BrowserRunFailure({ operation: stage, reason: "timeout" })),
|
|
266
297
|
}),
|
|
267
|
-
Effect.catch((error) =>
|
|
268
|
-
|
|
298
|
+
Effect.catch((error) => {
|
|
299
|
+
if (identity !== undefined && driver === undefined)
|
|
300
|
+
return reportBrowserCause(stage, Cause.fail(error)).pipe(
|
|
301
|
+
Effect.andThen(
|
|
302
|
+
Effect.fail(
|
|
303
|
+
reportedBrowserError(
|
|
304
|
+
new ProtectedBrowserError({
|
|
305
|
+
...failure(),
|
|
306
|
+
reason: error.reason === "timeout" ? "timeout" : "provider",
|
|
307
|
+
cleanup: "not-requested",
|
|
308
|
+
}),
|
|
309
|
+
),
|
|
310
|
+
),
|
|
311
|
+
),
|
|
312
|
+
// A disposal defect stays alongside the original failure. Only a pure typed
|
|
313
|
+
// failure proves that this pre-handle attachment is safe to relinquish.
|
|
314
|
+
Effect.ensuring(close),
|
|
315
|
+
);
|
|
316
|
+
|
|
317
|
+
return reportBrowserCause(stage, Cause.fail(error)).pipe(
|
|
269
318
|
Effect.andThen(close),
|
|
270
319
|
Effect.flatMap((cleanup) =>
|
|
271
320
|
Effect.fail(
|
|
@@ -273,14 +322,13 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
273
322
|
new ProtectedBrowserError({
|
|
274
323
|
...failure(),
|
|
275
324
|
reason: error.reason === "timeout" ? "timeout" : "provider",
|
|
276
|
-
cleanup
|
|
277
|
-
identity !== undefined && driver === undefined ? "not-requested" : cleanup,
|
|
325
|
+
cleanup,
|
|
278
326
|
}),
|
|
279
327
|
),
|
|
280
328
|
),
|
|
281
329
|
),
|
|
282
|
-
)
|
|
283
|
-
),
|
|
330
|
+
);
|
|
331
|
+
}),
|
|
284
332
|
);
|
|
285
333
|
|
|
286
334
|
driver = yield* makeProtectedNativeTransport(policy).pipe(
|
|
@@ -346,7 +394,38 @@ const protectedBindingLayer = (options: { readonly browser: Pick<BrowserRun, "fe
|
|
|
346
394
|
};
|
|
347
395
|
}, Effect.withTracerEnabled(false));
|
|
348
396
|
|
|
349
|
-
|
|
397
|
+
const keepAlive = Effect.fn("BrowserRunProtectedBinding.keepAlive")(function* (
|
|
398
|
+
sessionId: Redacted.Redacted<string>,
|
|
399
|
+
) {
|
|
400
|
+
const failure = (reason: ProtectedBrowserError["reason"]) =>
|
|
401
|
+
new ProtectedBrowserError({
|
|
402
|
+
reason,
|
|
403
|
+
dispatch: "not-dispatched",
|
|
404
|
+
milestone: "none",
|
|
405
|
+
observation: "protected",
|
|
406
|
+
cleanup: "not-requested",
|
|
407
|
+
});
|
|
408
|
+
|
|
409
|
+
const id = yield* Schema.decodeEffect(ProtectedProviderIdentity.fields.sessionId)(
|
|
410
|
+
sessionId,
|
|
411
|
+
).pipe(Effect.mapError(() => failure("denied")));
|
|
412
|
+
|
|
413
|
+
yield* binding.keepAlive(Redacted.value(id)).pipe(
|
|
414
|
+
Effect.timeoutOrElse({
|
|
415
|
+
duration: "10 seconds",
|
|
416
|
+
orElse: () =>
|
|
417
|
+
Effect.fail(
|
|
418
|
+
new BrowserRunFailure({ operation: "protected.keepAlive", reason: "timeout" }),
|
|
419
|
+
),
|
|
420
|
+
}),
|
|
421
|
+
Effect.tapError((error) => reportBrowserCause("protected.keepAlive", Cause.fail(error))),
|
|
422
|
+
Effect.mapError((error) =>
|
|
423
|
+
reportedBrowserError(failure(error.reason === "timeout" ? "timeout" : "provider")),
|
|
424
|
+
),
|
|
425
|
+
);
|
|
426
|
+
}, Effect.withTracerEnabled(false));
|
|
427
|
+
|
|
428
|
+
return { open, keepAlive };
|
|
350
429
|
}),
|
|
351
430
|
).pipe(Layer.provide(BrowserRunBinding.layer(options.browser)));
|
|
352
431
|
|