fix(webview): ignore load notifications from browser error documents

This commit is contained in:
Levi committed 2026-09-18 00:07:55 +08:00
1 parent 1776b05782
commit 2fd8a96c5d
4 files changed
+57 -5

No files matched your search

+4 -5
View File
@@ -369,7 +369,7 @@ func (p *pageWrapper) Close() error {
}
func (p *pageWrapper) tracef(format string, args ...any) {
if !strings.Contains(p.opts.Title, "youtube-sabr") && p.opts.Title != "WebView event contract" {
if !strings.Contains(p.opts.Title, "youtube-sabr") {
return
}
fmt.Printf("goprovider "+format+"\n", args...)
@@ -387,14 +387,12 @@ func (p *pageWrapper) waitForNavigation(timeout time.Duration, waitUntil string)
case <-timer.C:
return fmt.Errorf("webview navigation timeout")
case <-p.sameDocument:
p.tracef("goto completed via same-document notification")
return nil
case <-p.domReady:
if waitUntil == "domcontentloaded" {
return nil
}
case <-p.loads:
p.tracef("goto completed via load notification")
return nil
}
}
@@ -479,7 +477,6 @@ func (p *pageWrapper) handleCallback(payload string) error {
}
return nil
}
p.tracef("page event: event=%s load=%v url=%s sameDocument=%v", msg.Event, msg.Load, msg.URL, msg.SameDocument)
if msg.Event == "domcontentloaded" {
select {
case p.domReady <- struct{}{}:
@@ -607,6 +604,9 @@ func buildLoadNotifyScript(callbackName string) string {
callbackJSON, _ := json.Marshal(callbackName)
return fmt.Sprintf(`(() => {
if (window !== window.top) return;
// WebView2 runs init scripts in its internal error document too. Its load
// must not complete goto() before the native NavigationCompleted failure.
if (location.protocol === "chrome-error:") return;
const send = (message) => {
const cb = globalThis[%s];
if (typeof cb === "function") cb(JSON.stringify(message));
@@ -650,7 +650,6 @@ func (p *pageWrapper) failPendingLocked() {
}
func (p *pageWrapper) handleNativeEvent(event webview.Event) {
p.tracef("native event: %+v", event)
switch event.Name {
case "load-error":
p.events.Emit(enginewebview.Event{Name: "load-error", Data: map[string]any{"url": event.URL, "message": event.Message}})