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

PR comments

Browse source
This commit is contained in:
Bernard Xie 2022-11-17 19:02:25 -08:00
parent 3436936349
commit 269ace1d1c
No known key found for this signature in database
GPG key ID: 3C3E0036CE0F892C
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/d2/main.go
View file

@ -122,7 +122,7 @@ func run(ctx context.Context, ms *xmain.State) (err error) {
defer func() { defer func() {
cleanupErr := pw.Cleanup() cleanupErr := pw.Cleanup()
if cleanupErr != nil { if cleanupErr != nil {
ms.Log.Error.Printf("error cleaning up png exporter: %v", cleanupErr.Error()) ms.Log.Error.Printf("error cleaning up playwright: %v", cleanupErr.Error())
} }
}() }()
} }

6
cmd/d2/watch.go
View file

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

2
lib/png/generate_png.js
View file

@ -15,7 +15,7 @@ async (imgString) => {
canvas.height = img.height; canvas.height = img.height;
const ctx = canvas.getContext("2d"); const ctx = canvas.getContext("2d");
if (!ctx) { if (!ctx) {
return ""; return new Error("could not get canvas context");
} }
ctx.drawImage(img, 0, 0, canvas.width, canvas.height); ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
return canvas.toDataURL("image/png"); return canvas.toDataURL("image/png");

14
lib/png/png.go
View file

@ -27,11 +27,11 @@ func (pw *Playwright) RestartBrowser() (newPW Playwright, err error) {
return startPlaywright(pw.PW) return startPlaywright(pw.PW)
} }
func (pw *Playwright) Cleanup() (err error) { func (pw *Playwright) Cleanup() error {
if err = pw.Browser.Close(); err != nil { if err := pw.Browser.Close(); err != nil {
return err return err
} }
if err = pw.PW.Stop(); err != nil { if err := pw.PW.Stop(); err != nil {
return err return err
} }
return nil return nil
@ -73,7 +73,7 @@ func InitPlaywright() (Playwright, error) {
cmd := exec.Command(driver.DriverBinaryLocation, "--version") cmd := exec.Command(driver.DriverBinaryLocation, "--version")
output, err := cmd.Output() output, err := cmd.Output()
if err != nil { if err != nil {
return Playwright{}, fmt.Errorf("error getting png exporter version: %v\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", err.Error()) return Playwright{}, fmt.Errorf("error getting playwright version: %w\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", err)
} }
if !bytes.Contains(output, []byte(driver.Version)) { if !bytes.Contains(output, []byte(driver.Version)) {
err = playwright.Install() err = playwright.Install()
@ -82,7 +82,7 @@ func InitPlaywright() (Playwright, error) {
} }
} }
} else { } else {
return Playwright{}, fmt.Errorf("could not install png exporter: %v\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", err.Error()) return Playwright{}, fmt.Errorf("could not access playwright binary location: %w\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", err)
} }
pw, err := playwright.Run() pw, err := playwright.Run()
@ -97,13 +97,13 @@ var genPNGScript string
func ExportPNG(ms *xmain.State, page playwright.Page, svg []byte) (outputImage []byte, err error) { func ExportPNG(ms *xmain.State, page playwright.Page, svg []byte) (outputImage []byte, err error) {
if page == nil { if page == nil {
return nil, fmt.Errorf("png exporter was not initialized properly\nplease report this issue here: https://github.com/terrastruct/d2/issues/new") return nil, fmt.Errorf("playwright was not initialized properly\nplease report this issue here: https://github.com/terrastruct/d2/issues/new")
} }
encodedSVG := base64.StdEncoding.EncodeToString(svg) encodedSVG := base64.StdEncoding.EncodeToString(svg)
pngInterface, err := page.Evaluate(genPNGScript, "data:image/svg+xml;charset=utf-8;base64,"+encodedSVG) pngInterface, err := page.Evaluate(genPNGScript, "data:image/svg+xml;charset=utf-8;base64,"+encodedSVG)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to generate png: %v\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", err.Error()) return nil, fmt.Errorf("failed to generate png: %w\nplease report this issue here: https://github.com/terrastruct/d2/issues/new", err)
} }
pngString := fmt.Sprintf("%v", pngInterface) pngString := fmt.Sprintf("%v", pngInterface)