* fix(browser): hot-reload profiles added after gateway start (#4841) * style: format files with oxfmt * Fix hot-reload stale config fields bug in forProfile * Fix test order-dependency in hot-reload profiles test * Fix mock reset order to prevent stale cfgProfiles * Fix config cache blocking hot-reload by clearing cache before loadConfig * test: improve hot-reload test to properly exercise config cache - Add simulated cache behavior in mock - Prime cache before mutating config - Verify stale value without clearConfigCache - Verify fresh value after hot-reload Addresses review comment about test not exercising cache * test: add hot-reload tests for browser profiles in server context. * fix(browser): optimize profile hot-reload to avoid global cache clear * fix(browser): remove unused loadConfig import * fix(test): execute resetModules before test setup * feat: implement browser server context with profile hot-reloading and tab management. * fix(browser): harden profile hot-reload and shutdown cleanup * test(browser): use toSorted in known-profile names test --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
104 lines
2.8 KiB
TypeScript
104 lines
2.8 KiB
TypeScript
import { loadConfig } from "../config/config.js";
|
|
import { createSubsystemLogger } from "../logging/subsystem.js";
|
|
import { resolveBrowserConfig, resolveProfile } from "./config.js";
|
|
import { ensureBrowserControlAuth } from "./control-auth.js";
|
|
import { ensureChromeExtensionRelayServer } from "./extension-relay.js";
|
|
import {
|
|
type BrowserServerState,
|
|
createBrowserRouteContext,
|
|
listKnownProfileNames,
|
|
} from "./server-context.js";
|
|
|
|
let state: BrowserServerState | null = null;
|
|
const log = createSubsystemLogger("browser");
|
|
const logService = log.child("service");
|
|
|
|
export function getBrowserControlState(): BrowserServerState | null {
|
|
return state;
|
|
}
|
|
|
|
export function createBrowserControlContext() {
|
|
return createBrowserRouteContext({
|
|
getState: () => state,
|
|
refreshConfigFromDisk: true,
|
|
});
|
|
}
|
|
|
|
export async function startBrowserControlServiceFromConfig(): Promise<BrowserServerState | null> {
|
|
if (state) {
|
|
return state;
|
|
}
|
|
|
|
const cfg = loadConfig();
|
|
const resolved = resolveBrowserConfig(cfg.browser, cfg);
|
|
if (!resolved.enabled) {
|
|
return null;
|
|
}
|
|
try {
|
|
const ensured = await ensureBrowserControlAuth({ cfg });
|
|
if (ensured.generatedToken) {
|
|
logService.info("No browser auth configured; generated gateway.auth.token automatically.");
|
|
}
|
|
} catch (err) {
|
|
logService.warn(`failed to auto-configure browser auth: ${String(err)}`);
|
|
}
|
|
|
|
state = {
|
|
server: null,
|
|
port: resolved.controlPort,
|
|
resolved,
|
|
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)}`);
|
|
});
|
|
}
|
|
|
|
logService.info(
|
|
`Browser control service ready (profiles=${Object.keys(resolved.profiles).length})`,
|
|
);
|
|
return state;
|
|
}
|
|
|
|
export async function stopBrowserControlService(): Promise<void> {
|
|
const current = state;
|
|
if (!current) {
|
|
return;
|
|
}
|
|
|
|
const ctx = createBrowserRouteContext({
|
|
getState: () => state,
|
|
refreshConfigFromDisk: true,
|
|
});
|
|
|
|
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).
|
|
try {
|
|
const mod = await import("./pw-ai.js");
|
|
await mod.closePlaywrightBrowserConnection();
|
|
} catch {
|
|
// ignore
|
|
}
|
|
}
|