refactor(browser): share control lifecycle helpers

This commit is contained in:
Peter Steinberger
2026-02-18 17:36:09 +00:00
parent 005e1d5fd1
commit b51166e879
4 changed files with 189 additions and 67 deletions

View File

@@ -1,13 +1,9 @@
import { loadConfig } from "../config/config.js";
import { createSubsystemLogger } from "../logging/subsystem.js";
import { resolveBrowserConfig, resolveProfile } from "./config.js";
import { resolveBrowserConfig } from "./config.js";
import { ensureBrowserControlAuth } from "./control-auth.js";
import { ensureChromeExtensionRelayServer } from "./extension-relay.js";
import {
type BrowserServerState,
createBrowserRouteContext,
listKnownProfileNames,
} from "./server-context.js";
import { type BrowserServerState, createBrowserRouteContext } from "./server-context.js";
import { ensureExtensionRelayForProfiles, stopKnownBrowserProfiles } from "./server-lifecycle.js";
let state: BrowserServerState | null = null;
const log = createSubsystemLogger("browser");
@@ -50,17 +46,10 @@ export async function startBrowserControlServiceFromConfig(): Promise<BrowserSer
profiles: new Map(),
};
// If any profile uses the Chrome extension relay, start the local relay server eagerly
// so the extension can connect before the first browser action.
for (const name of Object.keys(resolved.profiles)) {
const profile = resolveProfile(resolved, name);
if (!profile || profile.driver !== "extension") {
continue;
}
await ensureChromeExtensionRelayServer({ cdpUrl: profile.cdpUrl }).catch((err) => {
logService.warn(`Chrome extension relay init failed for profile "${name}": ${String(err)}`);
});
}
await ensureExtensionRelayForProfiles({
resolved,
onWarn: (message) => logService.warn(message),
});
logService.info(
`Browser control service ready (profiles=${Object.keys(resolved.profiles).length})`,
@@ -74,23 +63,11 @@ export async function stopBrowserControlService(): Promise<void> {
return;
}
const ctx = createBrowserRouteContext({
await stopKnownBrowserProfiles({
getState: () => state,
refreshConfigFromDisk: true,
onWarn: (message) => logService.warn(message),
});
try {
for (const name of listKnownProfileNames(current)) {
try {
await ctx.forProfile(name).stopRunningBrowser();
} catch {
// ignore
}
}
} catch (err) {
logService.warn(`openclaw browser stop failed: ${String(err)}`);
}
state = null;
// Optional: Playwright is not always available (e.g. embedded gateway builds).