deploy: c6f85ed

binding_call.go

@@ -34,7 +34,7 @@ func (b *bindingCallImpl) Call(f BindingCallFunction) {
 			if _, err := b.channel.Send("reject", map[string]interface{}{
 				"error": serializeError(r.(error)),
 			}); err != nil {
-				logger.Printf("could not reject BindingCall: %v\n", err)
+				logger.Error("could not reject BindingCall", "error", err)
 			}
 		}
 	}()
@@ -60,7 +60,7 @@ func (b *bindingCallImpl) Call(f BindingCallFunction) {
 		"result": serializeArgument(result),
 	})
 	if err != nil {
-		logger.Printf("could not resolve BindingCall: %v\n", err)
+		logger.Error("could not resolve BindingCall", "error", err)
 	}
 }
 

browser_context.go

@@ -589,7 +589,7 @@ func (b *browserContextImpl) onRoute(route *routeImpl) {
 				return nil, err
 			}, true)
 			if err != nil {
-				logger.Printf("could not update interception patterns: %v\n", err)
+				logger.Error("could not update interception patterns", "error", err)
 			}
 		}
 	}
@@ -742,7 +742,7 @@ func (b *browserContextImpl) onWebSocketRoute(wr WebSocketRoute) {
 		b.Unlock()
 		_, err := wr.ConnectToServer()
 		if err != nil {
-			logger.Println(err)
+			logger.Error("could not connect to WebSocket server", "error", err)
 		}
 		return
 	}

channel.go

@@ -77,7 +77,7 @@ func (c *channel) innerSendNoReply(method string, isInternal bool, options ...in
 	}, isInternal)
 	if err != nil {
 		// ignore error actively, log only for debug
-		logger.Printf("SendNoReply failed: %v\n", err)
+		logger.Error("SendNoReply failed", "error", err)
 	}
 }
 

frame.go

@@ -210,7 +210,7 @@ func (f *frameImpl) ExpectNavigation(cb func() error, options ...FrameExpectNavi
 		err, ok := ev["error"]
 		if ok {
 			// Any failed navigation results in a rejection.
-			logger.Printf("navigated to %s error: %v", ev["url"].(string), err)
+			logger.Error("navigation error", "url", ev["url"].(string), "error", err)
 			return true
 		}
 		return matcher == nil || matcher.Matches(ev["url"].(string))

har_router.go

@@ -19,7 +19,7 @@ func (r *harRouter) addContextRoute(context BrowserContext) error {
 	err := context.Route(r.urlOrPredicate, func(route Route) {
 		err := r.handle(route)
 		if err != nil {
-			logger.Println(err)
+			logger.Error("Error handling context route", "error", err)
 		}
 	})
 	if err != nil {
@@ -35,7 +35,7 @@ func (r *harRouter) addPageRoute(page Page) error {
 	err := page.Route(r.urlOrPredicate, func(route Route) {
 		err := r.handle(route)
 		if err != nil {
-			logger.Println(err)
+			logger.Error("Error handling page route", "error", err)
 		}
 	})
 	if err != nil {
@@ -84,7 +84,7 @@ func (r *harRouter) handle(route Route) error {
 			Headers: deserializeNameAndValueToMap(response.Headers),
 		})
 	case "error":
-		logger.Printf("har action error: %v\n", *response.Message)
+		logger.Error("har action error", "error", *response.Message)
 		fallthrough
 	case "noentry":
 	}

page.go

@@ -934,7 +934,7 @@ func (p *pageImpl) onRoute(route *routeImpl) {
 				return nil, err
 			}, true)
 			if err != nil {
-				logger.Printf("could not update interception patterns: %v\n", err)
+				logger.Error("could not update interception patterns", "error", err)
 			}
 		}
 	}

run.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"log/slog"
 	"net/http"
 	"os"
 	"os/exec"
@@ -15,12 +16,10 @@ import (
 	"strings"
 )
 
-const (
-	playwrightCliVersion = "1.49.0"
-)
+const playwrightCliVersion = "1.49.0"
 
 var (
-	logger               = log.Default()
+	logger               = slog.Default()
 	playwrightCDNMirrors = []string{
 		"https://playwright.azureedge.net",
 		"https://playwright-akamai.azureedge.net",
@@ -137,7 +136,7 @@ func (d *PlaywrightDriver) DownloadDriver() error {
 		return nil
 	}
 
-	d.log(fmt.Sprintf("Downloading driver to %s", d.options.DriverDirectory))
+	d.log("Downloading driver", "path", d.options.DriverDirectory)
 
 	body, err := downloadDriver(d.getDriverURLs())
 	if err != nil {
@@ -186,9 +185,9 @@ func (d *PlaywrightDriver) DownloadDriver() error {
 	return nil
 }
 
-func (d *PlaywrightDriver) log(s string) {
+func (d *PlaywrightDriver) log(msg string, args ...any) {
 	if d.options.Verbose {
-		logger.Println(s)
+		logger.Info(msg, args...)
 	}
 }
 
@@ -236,6 +235,7 @@ type RunOptions struct {
 	Verbose  bool // default true
 	Stdout   io.Writer
 	Stderr   io.Writer
+	Logger   *slog.Logger
 }
 
 // Install does download the driver and the browsers.
@@ -295,8 +295,11 @@ func transformRunOptions(options ...*RunOptions) (*RunOptions, error) {
 	}
 	if option.Stderr == nil {
 		option.Stderr = os.Stderr
-	} else {
-		logger.SetOutput(option.Stderr)
+	} else if option.Logger == nil {
+		log.SetOutput(option.Stderr)
+	}
+	if option.Logger != nil {
+		logger = option.Logger
 	}
 	return option, nil
 }

run_test.go

@@ -1,18 +1,64 @@
 package playwright
 
 import (
+	"bufio"
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"strings"
+	"sync"
 	"testing"
 
 	"github.com/mitchellh/go-ps"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func TestRunOptionsRedirectStderr(t *testing.T) {
+	r, w := io.Pipe()
+	var output string
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		buf := bufio.NewReader(r)
+		for {
+			line, _, err := buf.ReadLine()
+			if err == io.EOF {
+				break
+			}
+			output += string(line)
+		}
+		_ = r.Close()
+	}()
+
+	driverPath := t.TempDir()
+	options := &RunOptions{
+		Stderr:          w,
+		DriverDirectory: driverPath,
+		Browsers:        []string{},
+		Verbose:         true,
+	}
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(404)
+	}))
+	defer ts.Close()
+
+	t.Setenv("PLAYWRIGHT_DOWNLOAD_HOST", ts.URL)
+	driver, err := NewDriver(options)
+	require.NoError(t, err)
+	err = driver.Install()
+	require.Error(t, err)
+	require.NoError(t, w.Close())
+	wg.Wait()
+
+	assert.Contains(t, output, "Downloading driver")
+	require.Contains(t, output, fmt.Sprintf("path=%s", driverPath))
+}
+
 func TestDriverInstall(t *testing.T) {
 	driverPath := t.TempDir()
 	driver, err := NewDriver(&RunOptions{

websocket.go

@@ -50,7 +50,7 @@ func (ws *webSocketImpl) onFrameSent(opcode float64, data string) {
 	if opcode == 2 {
 		payload, err := base64.StdEncoding.DecodeString(data)
 		if err != nil {
-			logger.Printf("could not decode WebSocket.onFrameSent payload: %v\n", err)
+			logger.Error("could not decode WebSocket.onFrameSent payload", "error", err)
 			return
 		}
 		ws.Emit("framesent", payload)
@@ -63,7 +63,7 @@ func (ws *webSocketImpl) onFrameReceived(opcode float64, data string) {
 	if opcode == 2 {
 		payload, err := base64.StdEncoding.DecodeString(data)
 		if err != nil {
-			logger.Printf("could not decode WebSocket.onFrameReceived payload: %v\n", err)
+			logger.Error("could not decode WebSocket.onFrameReceived payload", "error", err)
 			return
 		}
 		ws.Emit("framereceived", payload)