mirror of
https://github.com/tiennm99/goclaw.git
synced 2026-10-13 20:14:50 +00:00
fix(browser): make Lightpanda backend usable end-to-end
Live testing surfaced three issues:
- Lightpanda numbers targets per-browser, and each conn is its own
browser, so every tab gets the same upstream targetID
("FID-0000000001"). Synthesize globally-unique "lp-N" keys for our
internal map so multi-tenant tab tracking works.
- page.Info() returns valid data once post-open then errors on
subsequent calls, which made ListTabs silently drop tabs. Cache URL
and Title at OpenTab time and read from the cache in ListTabs.
- rod.Browser.Close() calls Browser.close which Lightpanda doesn't
implement; the WS drops cleanly anyway. Swallow the error to quiet
the noisy log line.
Two Lightpanda upstream bugs are documented in docs/browser-backends.md
and exercised by TestLightpanda_KnownUpstreamGaps:
1. Accessibility.getFullAXTree returns nodeId as a JSON number
(CDP spec: string)
2. Runtime.evaluate rejects go-rod's function-apply wrapper
This commit is contained in:
4 files changed
+81
-21
No files matched your search
@@ -39,6 +39,7 @@ type Manager struct {
|
||||
refs *RefStore
|
||||
pages map[string]*rod.Page // targetID → page
|
||||
pageConns map[string]*rod.Browser // lightpanda only: targetID → dedicated CDP conn
|
||||
pageInfos map[string]TabInfo // lightpanda only: cached URL/Title (page.Info() is unreliable upstream)
|
||||
console map[string][]ConsoleMessage // targetID → console messages
|
||||
tenantCtxs map[string]*rod.Browser // chrome only: browser scope key → incognito browser context
|
||||
pageTenants map[string]string // targetID → browser scope key (for filtering)
|
||||
@@ -53,6 +54,7 @@ type Manager struct {
|
||||
cookieProvider CookieProvider
|
||||
stopReaper chan struct{} // signal to stop the reaper goroutine
|
||||
logger *slog.Logger
|
||||
nextLpTabSeq uint64 // lightpanda only: monotonic counter for synthetic tab IDs
|
||||
}
|
||||
|
||||
// Option configures a Manager.
|
||||
@@ -107,6 +109,7 @@ func New(opts ...Option) *Manager {
|
||||
refs: NewRefStore(),
|
||||
pages: make(map[string]*rod.Page),
|
||||
pageConns: make(map[string]*rod.Browser),
|
||||
pageInfos: make(map[string]TabInfo),
|
||||
console: make(map[string][]ConsoleMessage),
|
||||
tenantCtxs: make(map[string]*rod.Browser),
|
||||
pageTenants: make(map[string]string),
|
||||
@@ -154,6 +157,7 @@ func (m *Manager) isRunningLocked() bool {
|
||||
func (m *Manager) resetPageMapsLocked() {
|
||||
m.pages = make(map[string]*rod.Page)
|
||||
m.pageConns = make(map[string]*rod.Browser)
|
||||
m.pageInfos = make(map[string]TabInfo)
|
||||
m.console = make(map[string][]ConsoleMessage)
|
||||
m.pageTenants = make(map[string]string)
|
||||
m.pageLastUsed = make(map[string]time.Time)
|
||||
@@ -336,12 +340,12 @@ func (m *Manager) Stop(ctx context.Context) error {
|
||||
}
|
||||
|
||||
// Lightpanda: close every per-tab connection. Lightpanda auto-cleans the
|
||||
// browser on disconnect, so no page.Close() is required.
|
||||
// browser on disconnect, so no page.Close() is required. rod.Browser.Close
|
||||
// calls Browser.close which Lightpanda doesn't implement (UnknownMethod);
|
||||
// the WS drops regardless, so swallow the error.
|
||||
if m.backend == BackendLightpanda {
|
||||
for tid, conn := range m.pageConns {
|
||||
if err := conn.Close(); err != nil {
|
||||
m.logger.Warn("lightpanda: failed to close page conn", "targetId", tid, "error", err)
|
||||
}
|
||||
for _, conn := range m.pageConns {
|
||||
_ = conn.Close()
|
||||
}
|
||||
m.cdpURL = ""
|
||||
m.resetPageMapsLocked()
|
||||
|
||||
@@ -21,17 +21,19 @@ func (m *Manager) ListTabs(ctx context.Context) ([]TabInfo, error) {
|
||||
tenantID := tenantIDFromCtx(ctx)
|
||||
|
||||
// Lightpanda: no server-side enumeration — return what we're tracking.
|
||||
// Use the cache populated at OpenTab; page.Info() is unreliable upstream
|
||||
// after the initial call.
|
||||
if m.backend == BackendLightpanda {
|
||||
tabs := make([]TabInfo, 0, len(m.pages))
|
||||
for tid, p := range m.pages {
|
||||
for tid := range m.pages {
|
||||
if !m.pageVisibleToTenantLocked(tid, tenantID) {
|
||||
continue
|
||||
}
|
||||
info, err := p.Info()
|
||||
if err != nil || info == nil {
|
||||
if cached, ok := m.pageInfos[tid]; ok {
|
||||
tabs = append(tabs, cached)
|
||||
continue
|
||||
}
|
||||
tabs = append(tabs, TabInfo{TargetID: tid, URL: info.URL, Title: info.Title})
|
||||
tabs = append(tabs, TabInfo{TargetID: tid})
|
||||
}
|
||||
return tabs, nil
|
||||
}
|
||||
@@ -215,7 +217,12 @@ func (m *Manager) openTabLightpandaLocked(ctx context.Context, tenantID, targetU
|
||||
stopWatchdog()
|
||||
|
||||
info, _ := page.Info()
|
||||
tid := string(tgt.TargetID)
|
||||
// Lightpanda numbers targets per-browser, and each conn is its own browser,
|
||||
// so every conn's first target is "FID-0000000001". Synthesize a globally
|
||||
// unique key for our maps; the upstream targetID is only needed inside this
|
||||
// function (for createTarget / PageFromTarget).
|
||||
m.nextLpTabSeq++
|
||||
tid := fmt.Sprintf("lp-%d", m.nextLpTabSeq)
|
||||
m.pages[tid] = page
|
||||
m.pageConns[tid] = conn
|
||||
m.touchPageLocked(tid)
|
||||
@@ -224,12 +231,16 @@ func (m *Manager) openTabLightpandaLocked(ctx context.Context, tenantID, targetU
|
||||
}
|
||||
m.setupConsoleListener(page, tid)
|
||||
|
||||
tab := &TabInfo{TargetID: tid, URL: targetURL}
|
||||
tab := TabInfo{TargetID: tid, URL: targetURL}
|
||||
if info != nil {
|
||||
tab.URL = info.URL
|
||||
tab.Title = info.Title
|
||||
}
|
||||
return tab, nil
|
||||
// Cache for ListTabs — page.Info() is unreliable on Lightpanda after the
|
||||
// initial post-open call.
|
||||
m.pageInfos[tid] = tab
|
||||
tabCopy := tab
|
||||
return &tabCopy, nil
|
||||
}
|
||||
|
||||
// evictOldestIfOverLimitLocked closes the oldest idle page for a tenant if at or over maxPages.
|
||||
@@ -284,12 +295,16 @@ func (m *Manager) evictOldestIfOverLimitLocked(tenantID string) {
|
||||
// server-side (no page.Close() needed). Must be called with mu held.
|
||||
func (m *Manager) closeManagedPageLocked(targetID string) {
|
||||
if conn, ok := m.pageConns[targetID]; ok {
|
||||
// Lightpanda: rod.Browser.Close() calls Browser.close which Lightpanda
|
||||
// rejects with UnknownMethod; the WS drops anyway and Lightpanda
|
||||
// auto-cleans the browser. Swallow the error.
|
||||
_ = conn.Close()
|
||||
delete(m.pageConns, targetID)
|
||||
} else if page, ok := m.pages[targetID]; ok {
|
||||
_ = page.Close()
|
||||
}
|
||||
delete(m.pages, targetID)
|
||||
delete(m.pageInfos, targetID)
|
||||
delete(m.console, targetID)
|
||||
delete(m.pageTenants, targetID)
|
||||
delete(m.pageLastUsed, targetID)
|
||||
|
||||
Reference in new issue
Block a user