luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup png.Playwright.Init

Browse source
This commit is contained in:
Bernard Xie 2022-11-17 16:41:28 -08:00
parent e9d915f8a8
commit c2d8d17f46
No known key found for this signature in database
GPG key ID: 3C3E0036CE0F892C
2 changed files with 42 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/d2/watch.go
View file

@ -332,7 +332,11 @@ func (w *watcher) compileLoop(ctx context.Context) error {
if filepath.Ext(w.outputPath) == ".png" && !w.pw.Browser.IsConnected() {
newPW, err := w.pw.RestartBrowser()
if err != nil {
return fmt.Errorf("png exporter has disconnected")
err = fmt.Errorf("png exporter has disconnected")
w.ms.Log.Error.Print(err)
w.broadcast(&compileResult{
Err: err.Error(),
})
}
w.pw = newPW
}

82
lib/png/png.go
View file

@ -3,7 +3,6 @@ package png
import (
"bytes"
"encoding/base64"
"errors"
"fmt"
"os"
"os/exec"
@ -25,23 +24,7 @@ func (pw *Playwright) RestartBrowser() (newPW Playwright, err error) {
if err = pw.Browser.Close(); err != nil {
return Playwright{}, err
}
browser, err := pw.PW.Chromium.Launch()
if err != nil {
return Playwright{}, err
}
context, err := browser.NewContext()
if err != nil {
return Playwright{}, err
}
page, err := context.NewPage()
if err != nil {
return Playwright{}, err
}
return Playwright{
PW: pw.PW,
Browser: browser,
Page: page,
}, nil
return startPlaywright(pw.PW)
}
func (pw *Playwright) Cleanup() (err error) {
@ -54,33 +37,7 @@ func (pw *Playwright) Cleanup() (err error) {
return nil
}
func InitPlaywright() (Playwright, error) {
// check if playwright driver/browsers are installed and up to date
// https://github.com/playwright-community/playwright-go/blob/8e8f670b5fa7ba5365ae4bfc123fea4aac359763/run.go#L64.
driver, err := playwright.NewDriver(&playwright.RunOptions{})
if err != nil {
return Playwright{}, err
}
if _, err := os.Stat(driver.DriverBinaryLocation); errors.Is(err, os.ErrNotExist) {
err = playwright.Install()
if err != nil {
return Playwright{}, err
}
} else if err == nil {
cmd := exec.Command(driver.DriverBinaryLocation, "--version")
output, err := cmd.Output()
if err != nil || !bytes.Contains(output, []byte(driver.Version)) {
err = playwright.Install()
if err != nil {
return Playwright{}, err
}
}
}
pw, err := playwright.Run()
if err != nil {
return Playwright{}, err
}
func startPlaywright(pw *playwright.Playwright) (Playwright, error) {
browser, err := pw.Chromium.Launch()
if err != nil {
return Playwright{}, err
@ -100,6 +57,41 @@ func InitPlaywright() (Playwright, error) {
}, nil
}
func InitPlaywright() (Playwright, error) {
// check if playwright driver/browsers are installed and up to date
// https://github.com/playwright-community/playwright-go/blob/8e8f670b5fa7ba5365ae4bfc123fea4aac359763/run.go#L64.
driver, err := playwright.NewDriver(&playwright.RunOptions{})
if err != nil {
return Playwright{}, err
}
if _, err := os.Stat(driver.DriverBinaryLocation); os.IsNotExist(err) {
err = playwright.Install()
if err != nil {
return Playwright{}, err
}
} else if err == nil {
cmd := exec.Command(driver.DriverBinaryLocation, "--version")
output, err := cmd.Output()
if err != nil {
return Playwright{}, fmt.Errorf("could not install Playwright driver")
}
if !bytes.Contains(output, []byte(driver.Version)) {
err = playwright.Install()
if err != nil {
return Playwright{}, err
}
}
} else {
return Playwright{}, fmt.Errorf("could not install Playwright driver")
}
pw, err := playwright.Run()
if err != nil {
return Playwright{}, err
}
return startPlaywright(pw)
}
//go:embed generate_png.js
var genPNGScript string