Skip to content

Commit 31b6453

Browse files
committed
feat: Improve logging of error cases
Some errors were not logged, e.g., script errors by script tags.
1 parent 9836b26 commit 31b6453

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

dom/event/event_target.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (e *eventTarget) dispatchEvent(event *Event, capture bool) {
177177
)
178178
if l.Capture == capture {
179179
if err := l.Handler.HandleEvent(event); err != nil {
180-
e.handleError(err)
180+
e.handleError(event, err)
181181
}
182182
if l.Once {
183183
listeners = slices.Delete(listeners, i, i+1)
@@ -188,11 +188,11 @@ func (e *eventTarget) dispatchEvent(event *Event, capture bool) {
188188
}
189189
}
190190

191-
func (e *eventTarget) handleError(err error) {
191+
func (e *eventTarget) handleError(event *Event, err error) {
192192
log.Error(e.logger(),
193193
"eventTarget.dispatchEvent: Error occurred in event handler",
194-
"error",
195-
err.Error(),
194+
"type", event.Type,
195+
"error", err.Error(),
196196
)
197197
e.dispatchError(err)
198198
}

html/html_script_element.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ func NewHTMLScriptElement(ownerDocument HTMLDocument) HTMLElement {
2020

2121
func (e *htmlScriptElement) Connected() {
2222
var script = ""
23-
if src, hasSrc := e.GetAttribute("src"); !hasSrc {
23+
src, hasSrc := e.GetAttribute("src")
24+
if !hasSrc {
2425
script = e.TextContent()
2526
} else {
2627
window, _ := e.htmlDocument.getWindow().(*window)
@@ -39,7 +40,10 @@ func (e *htmlScriptElement) Connected() {
3940
script = string(buf.Bytes())
4041

4142
}
42-
e.window().Run(script)
43+
if err := e.window().Run(script); err != nil {
44+
log.Error(e.Logger(), "Script error", "src", src)
45+
}
46+
4347
}
4448

4549
func (e *htmlScriptElement) AppendChild(n dom.Node) (dom.Node, error) {

0 commit comments

Comments
 (0)