Skip to content

fix(v8engine): handle nil logger and module download errors #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denisraison wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(v8engine): handle nil logger and module download errors #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions scripting/v8engine/script_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/gost-dom/browser/internal/constants"
"github.com/gost-dom/browser/internal/entity"
"github.com/gost-dom/browser/internal/gosthttp"
"github.com/gost-dom/browser/internal/log"
"github.com/gost-dom/browser/scripting/internal/codec"
"github.com/gost-dom/browser/scripting/internal/js"
"github.com/gost-dom/browser/url"
Expand Down Expand Up @@ -183,13 +184,21 @@ func (ctx *V8ScriptContext) DownloadScript(src string) (html.Script, error) {
func (ctx *V8ScriptContext) DownloadModule(src string) (html.Script, error) {
url := html.WindowResolveHref(ctx.browsingCtx, src)
module, err := ctx.resolver.downloadAndCompile(ctx.Context(), ctx.logger(), url)
if err = module.InstantiateModule(ctx.v8ctx, &ctx.resolver); err != nil {
if err != nil {
return nil, fmt.Errorf("gost: v8engine: module download: %w", err)
}
if err := module.InstantiateModule(ctx.v8ctx, &ctx.resolver); err != nil {
return nil, fmt.Errorf("gost: v8engine: module instantiation: %w", err)
}
return V8Module{ctx, module, ctx.logger(), url}, nil
}

func (ctx *V8ScriptContext) logger() *slog.Logger { return ctx.host.logger }
func (ctx *V8ScriptContext) logger() *slog.Logger {
if ctx.host.logger == nil {
return log.Default()
}
return ctx.host.logger
}

type resolvedModule struct {
scriptID int
Expand Down