4 Commits

Author SHA1 Message Date
Adrian Zürcher
7fec8e1101 fix orphan instances 2025-12-29 17:15:52 +01:00
Adrian Zürcher
5b20d4406c fix canelation 2025-12-29 16:48:07 +01:00
Adrian Zürcher
40f683a917 fix hid terminal on windows 2025-12-29 14:59:24 +01:00
Adrian Zürcher
ff460fffa1 add new flags 2025-12-29 12:13:12 +01:00
5 changed files with 54 additions and 38 deletions

View File

@@ -18,8 +18,10 @@ import (
// html to pdf converter structure for // html to pdf converter structure for
type Converter struct { type Converter struct {
chromePath string chromePath string
ctx context.Context allocCtx context.Context
cancel context.CancelFunc allocCancel context.CancelFunc // Cancels the whole Chrome process manager
browserCtx context.Context // The specific browser instance
browserCancel context.CancelFunc // Closes the browser
progress func(progress int) progress func(progress int)
} }
@@ -27,10 +29,6 @@ type Converter struct {
func NewConverter(chromePath string) (*Converter, error) { func NewConverter(chromePath string) (*Converter, error) {
var err error var err error
if runtime.GOOS == "windows" {
hideConsole()
}
c := &Converter{chromePath: chromePath} c := &Converter{chromePath: chromePath}
chromePath, err = c.getChromePath() chromePath, err = c.getChromePath()
if err != nil { if err != nil {
@@ -42,14 +40,21 @@ func NewConverter(chromePath string) (*Converter, error) {
chromedp.NoSandbox, chromedp.NoSandbox,
chromedp.Headless, chromedp.Headless,
chromedp.DisableGPU, chromedp.DisableGPU,
chromedp.Flag("disable-software-rasterizer", true),
chromedp.Flag("disable-dev-shm-usage", true),
chromedp.Flag("no-first-run", true),
) )
var allocCtx context.Context opts = append(opts, platformOptions())
allocCtx, c.cancel = chromedp.NewExecAllocator(context.Background(), opts...)
c.ctx, c.cancel = chromedp.NewContext(allocCtx) c.allocCtx, c.allocCancel = chromedp.NewExecAllocator(context.Background(), opts...)
c.browserCtx, c.browserCancel = chromedp.NewContext(c.allocCtx)
// 5. "Warm up" the browser to ensure the executable actually runs
// This catches "file not found" or permission errors immediately
err = chromedp.Run(c.browserCtx)
if err != nil {
c.Close() // Cleanup if start fails
return nil, fmt.Errorf("failed to start chrome: %w", err)
}
return c, nil return c, nil
} }
@@ -86,10 +91,11 @@ func (c *Converter) Convert(files ...models.File) error {
htmlURL.WriteString(filepath.ToSlash(absPath)) htmlURL.WriteString(filepath.ToSlash(absPath))
c.ctx, c.cancel = context.WithTimeout(c.ctx, 60*time.Second) taskCtx, taskCancel := chromedp.NewContext(c.browserCtx)
timeoutCtx, timeoutCancel := context.WithTimeout(taskCtx, 60*time.Second)
var pdfData []byte var pdfData []byte
err = chromedp.Run(c.ctx, err = chromedp.Run(timeoutCtx,
chromedp.Navigate(htmlURL.String()), chromedp.Navigate(htmlURL.String()),
chromedp.WaitReady("body", chromedp.ByQuery), chromedp.WaitReady("body", chromedp.ByQuery),
chromedp.ActionFunc(func(ctx context.Context) error { chromedp.ActionFunc(func(ctx context.Context) error {
@@ -106,21 +112,30 @@ func (c *Converter) Convert(files ...models.File) error {
}), }),
) )
timeoutCancel()
taskCancel()
if err != nil { if err != nil {
c.cancel()
return err return err
} }
// Save PDF to file // Save PDF to file
if err := os.WriteFile(f.Output, pdfData, 0644); err != nil { if err := os.WriteFile(f.Output, pdfData, 0644); err != nil {
c.cancel()
return err return err
} }
} }
c.cancel()
return nil return nil
} }
func (c *Converter) Close() {
// Close browser first, then allocator
if c.browserCancel != nil {
c.browserCancel()
}
if c.allocCancel != nil {
c.allocCancel()
}
}
// getChromePath checks for system Chrome, else falls back to bundled headless shell // getChromePath checks for system Chrome, else falls back to bundled headless shell
func (c *Converter) getChromePath() (string, error) { func (c *Converter) getChromePath() (string, error) {

View File

@@ -2,8 +2,9 @@
package converter package converter
// hideConsole does nothing on non-Windows systems import "github.com/chromedp/chromedp"
func hideConsole() {
// macOS and Linux don't have the same "console window" concept func platformOptions() chromedp.ExecAllocatorOption {
// that needs manual hiding at runtime like Windows. // Returns a no-op option for Mac/Linux
return chromedp.NoSandbox
} }

View File

@@ -3,21 +3,18 @@
package converter package converter
import ( import (
"os/exec"
"syscall" "syscall"
"github.com/chromedp/chromedp"
) )
var ( func platformOptions() chromedp.ExecAllocatorOption {
kernel32 = syscall.NewLazyDLL("kernel32.dll") return chromedp.ModifyCmdFunc(func(cmd *exec.Cmd) {
user32 = syscall.NewLazyDLL("user32.dll") if cmd.SysProcAttr == nil {
getConsoleWindow = kernel32.NewProc("GetConsoleWindow") cmd.SysProcAttr = &syscall.SysProcAttr{}
showWindow = user32.NewProc("ShowWindow")
)
const SW_HIDE = 0
func hideConsole() {
hwnd, _, _ := getConsoleWindow.Call()
if hwnd != 0 {
showWindow.Call(hwnd, SW_HIDE)
} }
cmd.SysProcAttr.HideWindow = true
cmd.SysProcAttr.CreationFlags = 0x08000000 // CREATE_NO_WINDOW
})
} }

View File

@@ -15,6 +15,8 @@ func Convert(chromePath, inputFile, outputFile string) error {
if err != nil { if err != nil {
return err return err
} }
defer c.Close()
return c.Convert(input) return c.Convert(input)
} }

View File

@@ -42,10 +42,11 @@ func TestConvertFiles(t *testing.T) {
}) })
} }
c, err := converter.NewConverter("./assets") c, err := converter.NewConverter("assets/chrome-headless-shell/win64")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer c.Close()
c.SetProgressCallback(func(progress int) { c.SetProgressCallback(func(progress int) {
fmt.Println(progress) fmt.Println(progress)