Skip to content

Add replayable CDPMod refs #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
monadoid wants to merge 1 commit into from
+5,274 −53
Closed

Add replayable CDPMod refs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 39 additions & 42 deletions bridge/injector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,30 +107,44 @@ export async function injectExtensionIfNeeded({
session_id,
};
};
const discoverReadyServiceWorker = async (session_timeout_ms = 2_000) => {
const target_infos = TargetCommands["Target.getTargets"].result.parse(await send("Target.getTargets")).targetInfos;
if (trust_matched_service_worker) {
const trusted_target = target_infos.find((candidate) => serviceWorkerTargetMatches(candidate)) as
| TargetInfo
| undefined;
if (trusted_target) {
const probed = await probeTarget(trusted_target, session_timeout_ms);
if (probed) return { source: "trusted" as const, ...probed };
}
}
for (const candidate of target_infos) {
if (candidate.type !== "service_worker") continue;
if (!candidate.url.startsWith("chrome-extension://")) continue;
try {
const probed = await probeTarget(candidate as TargetInfo, session_timeout_ms);
if (probed) return { source: "discovered" as const, ...probed };
} catch {
continue;
}
}
return null;
};
const waitForReadyServiceWorker = async (timeout_ms: number) => {
const deadline = Date.now() + timeout_ms;
while (Date.now() < deadline) {
const discovered = await discoverReadyServiceWorker(Math.min(2_000, Math.max(100, deadline - Date.now())));
if (discovered) return discovered;
await sleep(100);
}
return null;
};

// 1. Discover an existing CDPMod service worker from the current CDP target
// snapshot. If no already-ready worker is visible, move on to the explicit
// injection path instead of waiting on a guessed preinstalled-extension budget.
const target_infos = TargetCommands["Target.getTargets"].result.parse(await send("Target.getTargets")).targetInfos;
if (trust_matched_service_worker) {
const trusted_target = target_infos.find((candidate) => serviceWorkerTargetMatches(candidate)) as
| TargetInfo
| undefined;
if (trusted_target) {
const probed = await probeTarget(trusted_target, 2_000);
if (probed) return { source: "trusted", ...probed };
}
}
for (const candidate of target_infos) {
if (candidate.type !== "service_worker") continue;
if (!candidate.url.startsWith("chrome-extension://")) continue;
try {
const probed = await probeTarget(candidate as TargetInfo, 2_000);
if (probed) return { source: "discovered", ...probed };
} catch {
continue;
}
}
const discovered = await discoverReadyServiceWorker();
if (discovered) return discovered;
if (require_service_worker_target) {
throw new Error(
`Required CDPMod service worker target was not visible in the current CDP target snapshot ` +
Expand All @@ -150,28 +164,8 @@ export async function injectExtensionIfNeeded({
const load_error = error instanceof Error ? error : new Error(String(error));
if (/Method not available|Method.*not.*found|wasn't found/i.test(load_error.message)) {
load_unpacked_unavailable_error = load_error;
const target_infos = TargetCommands["Target.getTargets"].result.parse(
await send("Target.getTargets"),
).targetInfos;
if (trust_matched_service_worker) {
const trusted_target = target_infos.find((candidate) => serviceWorkerTargetMatches(candidate)) as
| TargetInfo
| undefined;
if (trusted_target) {
const probed = await probeTarget(trusted_target, 2_000);
if (probed) return { source: "trusted", ...probed };
}
}
for (const candidate of target_infos) {
if (candidate.type !== "service_worker") continue;
if (!candidate.url.startsWith("chrome-extension://")) continue;
try {
const probed = await probeTarget(candidate as TargetInfo, 2_000);
if (probed) return { source: "discovered", ...probed };
} catch {
continue;
}
}
const discovered = await discoverReadyServiceWorker();
if (discovered) return discovered;
} else {
throw new Error(
`Extensions.loadUnpacked failed for ${extension_path}: ${load_error.message}\n` +
Expand Down Expand Up @@ -217,6 +211,9 @@ export async function injectExtensionIfNeeded({
// 4. Chrome's new chrome://inspect auto-connect flow exposes CDP without
// exposing Extensions.loadUnpacked. In that case, inject the same server into
// every currently running extension service worker and keep the best session.
const late_discovered = await waitForReadyServiceWorker(5_000);
if (late_discovered) return late_discovered;

const borrowed: {
target_id: string;
url: string;
Expand Down
1 change: 1 addition & 0 deletions bridge/launcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const CANDIDATE_PATHS = [

const DEFAULT_FLAGS = [
"--enable-unsafe-extension-debugging",
"--enable-extensions",
"--remote-allow-origins=*",
"--no-first-run",
"--no-default-browser-check",
Expand Down
Loading
Loading