fix canelation

converter/converter.go

@@ -2,6 +2,7 @@ package converter
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -19,12 +20,19 @@ type Converter struct {
 	chromePath  string
 	ctx         context.Context
 	cancel      context.CancelFunc
+	allocCancel context.CancelFunc
+	progress    func(progress int)
 }
 
 // NewConverter starts a new converter instance with a chrome headless shell executable
-func NewConverter(chromePath string) *Converter {
+func NewConverter(chromePath string) (*Converter, error) {
+	var err error
+
 	c := &Converter{chromePath: chromePath}
-	chromePath = c.getChromePath()
+	chromePath, err = c.getChromePath()
+	if err != nil {
+		return nil, err
+	}
 
 	opts := append(chromedp.DefaultExecAllocatorOptions[:],
 		chromedp.ExecPath(chromePath),
@@ -33,15 +41,25 @@ func NewConverter(chromePath string) *Converter {
 		chromedp.DisableGPU,
 	)
 
+	opts = append(opts, platformOptions())
+
 	var allocCtx context.Context
 	allocCtx, c.cancel = chromedp.NewExecAllocator(context.Background(), opts...)
-	c.ctx, c.cancel = chromedp.NewContext(allocCtx)
-	return c
+	c.ctx, c.allocCancel = chromedp.NewContext(allocCtx)
+	return c, nil
+}
+
+func (c *Converter) SetProgressCallback(cb func(progress int)) {
+	c.progress = cb
 }
 
 // Convert converts all given input files
 func (c *Converter) Convert(files ...models.File) error {
-	for _, f := range files {
+	for i, f := range files {
+		if c.progress != nil {
+			c.progress(i + 1)
+		}
+
 		if f.Input == "" || filepath.Ext(f.Input) != ".html" {
 			return fmt.Errorf("no .html input file path provided: %s", f.Input)
 		} else if f.Output == "" || filepath.Ext(f.Output) != ".pdf" {
@@ -64,11 +82,11 @@ func (c *Converter) Convert(files ...models.File) error {
 
 		htmlURL.WriteString(filepath.ToSlash(absPath))
 
-		c.ctx, c.cancel = context.WithTimeout(c.ctx, 60*time.Second)
-		defer c.cancel()
+		ctx, cancel := context.WithTimeout(c.ctx, 60*time.Second)
+		defer cancel()
 
 		var pdfData []byte
-		err = chromedp.Run(c.ctx,
+		err = chromedp.Run(ctx,
 			chromedp.Navigate(htmlURL.String()),
 			chromedp.WaitReady("body", chromedp.ByQuery),
 			chromedp.ActionFunc(func(ctx context.Context) error {
@@ -84,23 +102,45 @@ func (c *Converter) Convert(files ...models.File) error {
 				return nil
 			}),
 		)
+
 		if err != nil {
+			c.cancel()
 			return err
 		}
 
 		// Save PDF to file
 		if err := os.WriteFile(f.Output, pdfData, 0644); err != nil {
+			c.cancel()
 			return err
 		}
 	}
+	c.cancel()
 	return nil
 }
 
+func (c *Converter) Close() {
+	if c.cancel != nil {
+		c.cancel()
+	}
+}
+
 // getChromePath checks for system Chrome, else falls back to bundled headless shell
-func (c *Converter) getChromePath() string {
+func (c *Converter) getChromePath() (string, error) {
+
+	chromeExec := "chrome-headless-shell"
+	if runtime.GOOS == "windows" {
+		chromeExec += ".exe"
+	}
+
+	path := filepath.Join(c.chromePath, chromeExec)
+	if _, err := os.Stat(path); err == nil {
+		return path, nil
+	}
+
 	// Candidate paths for system Chrome
 	candidates := []string{}
 
+	// Fallback:
 	switch runtime.GOOS {
 	case "windows":
 		candidates = []string{
@@ -124,14 +164,9 @@ func (c *Converter) getChromePath() string {
 	// Check system paths first
 	for _, path := range candidates {
 		if _, err := os.Stat(path); err == nil {
-			return path
+			return path, nil
 		}
 	}
 
-	// Fallback: use bundled headless shell
-	chromeExec := "chrome-headless-shell"
-	if runtime.GOOS == "windows" {
-		chromeExec += ".exe"
-	}
-	return filepath.Join(c.chromePath, chromeExec)
+	return "", errors.New("chrome path not found")
 }

converter/hideOthers.go

@@ -0,0 +1,10 @@
+//go:build !windows
+
+package converter
+
+import "github.com/chromedp/chromedp"
+
+func platformOptions() chromedp.ExecAllocatorOption {
+	// Returns a no-op option for Mac/Linux
+	return chromedp.NoSandbox
+}

converter/hideWindows.go

@@ -0,0 +1,20 @@
+//go:build windows
+
+package converter
+
+import (
+	"os/exec"
+	"syscall"
+
+	"github.com/chromedp/chromedp"
+)
+
+func platformOptions() chromedp.ExecAllocatorOption {
+	return chromedp.ModifyCmdFunc(func(cmd *exec.Cmd) {
+		if cmd.SysProcAttr == nil {
+			cmd.SysProcAttr = &syscall.SysProcAttr{}
+		}
+		cmd.SysProcAttr.HideWindow = true
+		cmd.SysProcAttr.CreationFlags = 0x08000000 // CREATE_NO_WINDOW
+	})
+}

html2pdf.go

@@ -11,11 +11,14 @@ func Convert(chromePath, inputFile, outputFile string) error {
 		Input:  inputFile,
 		Output: outputFile,
 	}
-	c := converter.NewConverter(chromePath)
+	c, err := converter.NewConverter(chromePath)
+	if err != nil {
+		return err
+	}
 	return c.Convert(input)
 }
 
 // NewConverterInstance start new chrome headless shell instance
-func NewConverterInstance(chromePath string) *converter.Converter {
+func NewConverterInstance(chromePath string) (*converter.Converter, error) {
 	return converter.NewConverter(chromePath)
 }

html2pdf_test.go

@@ -1,12 +1,14 @@
 package html2pdf
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
 	"gitea.tecamino.com/paadi/html2pdf/converter"
+	"gitea.tecamino.com/paadi/html2pdf/models"
 )
 
 func TestConvert(t *testing.T) {
@@ -27,20 +29,27 @@ func TestConvertFiles(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var input []converter.File
+	var input []models.File
 	for _, f := range files {
 		ext := filepath.Ext(f.Name())
 		if ext != ".html" {
 			continue
 		}
 
-		input = append(input, converter.File{
+		input = append(input, models.File{
 			Input:  filepath.Join(rootPath, f.Name()),
 			Output: strings.Replace(f.Name(), ext, ".pdf", 1),
 		})
 	}
 
-	c := converter.NewConverter("./assets")
+	c, err := converter.NewConverter("assets/chrome-headless-shell/win64")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	c.SetProgressCallback(func(progress int) {
+		fmt.Println(progress)
+	})
 
 	if err := c.Convert(input...); err != nil {
 		t.Fatal(err)