From 571c3e04c40c924be05824049c0ddca04b36208a Mon Sep 17 00:00:00 2001
From: Julien Neuhart <j.neuhart@thecodingmachine.com>
Date: Fri, 1 Feb 2019 09:40:16 +0100
Subject: [PATCH] adding form field web fonts timeout

---
 build/docs/content/02-html.md    |  3 +++
 docs/index.html                  |  3 +++
 internal/app/api/html.go         |  5 +++++
 internal/app/api/markdown.go     |  5 +++++
 internal/app/api/resource.go     | 32 +++++++++++++++++++++++---------
 internal/app/api/url.go          |  5 +++++
 internal/pkg/printer/html.go     | 29 +++++++++++++++--------------
 internal/pkg/printer/markdown.go | 24 +++++++++++++-----------
 pkg/client.go                    | 20 +++++++++++---------
 pkg/html.go                      |  5 +++++
 pkg/markdown.go                  |  5 +++++
 pkg/url.go                       |  5 +++++
 12 files changed, 98 insertions(+), 43 deletions(-)

diff --git a/build/docs/content/02-html.md b/build/docs/content/02-html.md
index ba270429..a43fd34a 100644
--- a/build/docs/content/02-html.md
+++ b/build/docs/content/02-html.md
@@ -187,6 +187,9 @@ You may also use *remote* paths for Google fonts, images and so on.
 > If you want to install fonts directly in the Gotenberg Docker image,
 > see to the [fonts section](#fonts).
 
+> For web fonts, there is a timeout of 500ms by default. You may update
+> this value thanks to the form field `webFontsTimeout`.
+
 ### cURL
 
 ```bash
diff --git a/docs/index.html b/docs/index.html
index 076b579d..513e8a2f 100755
--- a/docs/index.html
+++ b/docs/index.html
@@ -363,6 +363,9 @@ are on the same level as the <code>index.html</code> file.</p>
 <blockquote>
 <p>If you want to install fonts directly in the Gotenberg Docker image,
 see to the <a href="#fonts">fonts section</a>.</p>
+
+<p>For web fonts, there is a timeout of 500ms by default. You may update
+this value thanks to the form field <code>webFontsTimeout</code>.</p>
 </blockquote>
 
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="html.assets.c_url" href="#html.assets.c_url">
diff --git a/internal/app/api/html.go b/internal/app/api/html.go
index 48a37e85..369d0de5 100644
--- a/internal/app/api/html.go
+++ b/internal/app/api/html.go
@@ -47,5 +47,10 @@ func convertHTML(c echo.Context) error {
 		return hijackErr(err, r)
 	}
 	p.Landscape = landscape
+	chromeWebFontsTimeout, err := r.webFontsTimeout()
+	if err != nil {
+		return hijackErr(err, r)
+	}
+	p.WebFontsTimeout = chromeWebFontsTimeout
 	return print(c, p, r)
 }
diff --git a/internal/app/api/markdown.go b/internal/app/api/markdown.go
index d34211b4..f6336406 100644
--- a/internal/app/api/markdown.go
+++ b/internal/app/api/markdown.go
@@ -46,5 +46,10 @@ func convertMarkdown(c echo.Context) error {
 		return hijackErr(err, r)
 	}
 	p.Landscape = landscape
+	chromeWebFontsTimeout, err := r.webFontsTimeout()
+	if err != nil {
+		return hijackErr(err, r)
+	}
+	p.WebFontsTimeout = chromeWebFontsTimeout
 	return print(c, p, r)
 }
diff --git a/internal/app/api/resource.go b/internal/app/api/resource.go
index 1beadd02..6e83dc81 100644
--- a/internal/app/api/resource.go
+++ b/internal/app/api/resource.go
@@ -13,15 +13,16 @@ import (
 )
 
 const (
-	remoteURL    string = "remoteURL"
-	webhookURL   string = "webhookURL"
-	paperWidth   string = "paperWidth"
-	paperHeight  string = "paperHeight"
-	marginTop    string = "marginTop"
-	marginBottom string = "marginBottom"
-	marginLeft   string = "marginLeft"
-	marginRight  string = "marginRight"
-	landscape    string = "landscape"
+	remoteURL       string = "remoteURL"
+	webhookURL      string = "webhookURL"
+	paperWidth      string = "paperWidth"
+	paperHeight     string = "paperHeight"
+	marginTop       string = "marginTop"
+	marginBottom    string = "marginBottom"
+	marginLeft      string = "marginLeft"
+	marginRight     string = "marginRight"
+	landscape       string = "landscape"
+	webFontsTimeout string = "webFontsTimeout"
 )
 
 // resource facilitates storing and accessing
@@ -42,6 +43,7 @@ func newResource(c echo.Context) (*resource, error) {
 	v[marginLeft] = c.FormValue(marginLeft)
 	v[marginRight] = c.FormValue(marginRight)
 	v[landscape] = c.FormValue(landscape)
+	v[webFontsTimeout] = c.FormValue(webFontsTimeout)
 	dirPath, err := rand.Get()
 	if err != nil {
 		return nil, err
@@ -190,5 +192,17 @@ func (r *resource) remoteURL() (string, error) {
 	return r.values[remoteURL], nil
 }
 
+func (r *resource) webFontsTimeout() (int64, error) {
+	webFontsTimeoutStr := r.values[webFontsTimeout]
+	if webFontsTimeoutStr == "" {
+		return 500, nil
+	}
+	timeout, err := strconv.ParseInt(webFontsTimeoutStr, 10, 64)
+	if err != nil {
+		return 500, fmt.Errorf("web fonts timeout: %v", err)
+	}
+	return timeout, nil
+}
+
 func (r *resource) webhookURL() string { return r.values[webhookURL] }
 func (r *resource) removeAll() error   { return os.RemoveAll(r.dirPath) }
diff --git a/internal/app/api/url.go b/internal/app/api/url.go
index dc205859..ffb3de48 100644
--- a/internal/app/api/url.go
+++ b/internal/app/api/url.go
@@ -47,5 +47,10 @@ func convertURL(c echo.Context) error {
 		return hijackErr(err, r)
 	}
 	p.Landscape = landscape
+	chromeWebFontsTimeout, err := r.webFontsTimeout()
+	if err != nil {
+		return hijackErr(err, r)
+	}
+	p.WebFontsTimeout = chromeWebFontsTimeout
 	return print(c, p, r)
 }
diff --git a/internal/pkg/printer/html.go b/internal/pkg/printer/html.go
index f9e703a7..68dc814a 100644
--- a/internal/pkg/printer/html.go
+++ b/internal/pkg/printer/html.go
@@ -18,17 +18,18 @@ import (
 
 // HTML facilitates HTML to PDF conversion.
 type HTML struct {
-	Context      context.Context
-	URL          string
-	HeaderHTML   string
-	FooterHTML   string
-	PaperWidth   float64
-	PaperHeight  float64
-	MarginTop    float64
-	MarginBottom float64
-	MarginLeft   float64
-	MarginRight  float64
-	Landscape    bool
+	Context         context.Context
+	URL             string
+	HeaderHTML      string
+	FooterHTML      string
+	PaperWidth      float64
+	PaperHeight     float64
+	MarginTop       float64
+	MarginBottom    float64
+	MarginLeft      float64
+	MarginRight     float64
+	Landscape       bool
+	WebFontsTimeout int64
 }
 
 const defaultHeaderFooterHTML string = "<html><head></head><body></body></html>"
@@ -103,12 +104,12 @@ func (html *HTML) Print(destination string) error {
 		return fmt.Errorf("waiting for page loading: %v", err)
 	}
 	// inject a script to make sure web fonts are loaded.
-	script := `new Promise((resolve, reject) => {
+	script := fmt.Sprintf(`new Promise((resolve, reject) => {
 		document.fonts.ready.then(function () {
 			resolve('fonts loaded');
 		});
-		setTimeout(resolve.bind(resolve, 'timeout'), 500);
-	});`
+		setTimeout(resolve.bind(resolve, 'timeout'), %d);
+	});`, html.WebFontsTimeout)
 	scriptArg := runtime.NewEvaluateArgs(script).SetAwaitPromise(true)
 	returnObj, _ := c.Runtime.Evaluate(html.Context, scriptArg)
 	if returnObj.ExceptionDetails != nil {
diff --git a/internal/pkg/printer/markdown.go b/internal/pkg/printer/markdown.go
index 7ec57179..81bfe984 100644
--- a/internal/pkg/printer/markdown.go
+++ b/internal/pkg/printer/markdown.go
@@ -15,17 +15,18 @@ import (
 
 // Markdown facilitates Markdown to PDF conversion.
 type Markdown struct {
-	Context      context.Context
-	TemplatePath string
-	HeaderHTML   string
-	FooterHTML   string
-	PaperWidth   float64
-	PaperHeight  float64
-	MarginTop    float64
-	MarginBottom float64
-	MarginLeft   float64
-	MarginRight  float64
-	Landscape    bool
+	Context         context.Context
+	TemplatePath    string
+	HeaderHTML      string
+	FooterHTML      string
+	PaperWidth      float64
+	PaperHeight     float64
+	MarginTop       float64
+	MarginBottom    float64
+	MarginLeft      float64
+	MarginRight     float64
+	Landscape       bool
+	WebFontsTimeout int64
 
 	html *HTML
 }
@@ -52,6 +53,7 @@ func (md *Markdown) Print(destination string) error {
 	md.html.MarginLeft = md.MarginLeft
 	md.html.MarginRight = md.MarginRight
 	md.html.Landscape = md.Landscape
+	md.html.WebFontsTimeout = md.WebFontsTimeout
 	tmpl, err := template.
 		New(filepath.Base(md.TemplatePath)).
 		Funcs(template.FuncMap{"toHTML": toHTML}).
diff --git a/pkg/client.go b/pkg/client.go
index 69b2e95a..e4117878 100644
--- a/pkg/client.go
+++ b/pkg/client.go
@@ -13,15 +13,16 @@ import (
 )
 
 const (
-	remoteURL    string = "remoteURL"
-	webhookURL   string = "webhookURL"
-	paperWidth   string = "paperWidth"
-	paperHeight  string = "paperHeight"
-	marginTop    string = "marginTop"
-	marginBottom string = "marginBottom"
-	marginLeft   string = "marginLeft"
-	marginRight  string = "marginRight"
-	landscape    string = "landscape"
+	remoteURL       string = "remoteURL"
+	webhookURL      string = "webhookURL"
+	paperWidth      string = "paperWidth"
+	paperHeight     string = "paperHeight"
+	marginTop       string = "marginTop"
+	marginBottom    string = "marginBottom"
+	marginLeft      string = "marginLeft"
+	marginRight     string = "marginRight"
+	landscape       string = "landscape"
+	webFontsTimeout string = "webFontsTimeout"
 )
 
 var (
@@ -75,6 +76,7 @@ type ChromeRequest interface {
 	SetPaperSize(size [2]float64)
 	SetMargins(margins [4]float64)
 	SetLandscape(isLandscape bool)
+	SetWebFontsTimeout(timeout int64)
 }
 
 // UnoconvRequest is a type for sending
diff --git a/pkg/html.go b/pkg/html.go
index 9dfa6d13..39686ab0 100644
--- a/pkg/html.go
+++ b/pkg/html.go
@@ -78,6 +78,11 @@ func (html *HTMLRequest) SetLandscape(isLandscape bool) {
 	html.values[landscape] = strconv.FormatBool(isLandscape)
 }
 
+// SetWebFontsTimeout sets webFontsTimeout form field.
+func (html *HTMLRequest) SetWebFontsTimeout(timeout int64) {
+	html.values[webFontsTimeout] = strconv.FormatInt(timeout, 10)
+}
+
 func (html *HTMLRequest) getPostURL() string {
 	return "/convert/html"
 }
diff --git a/pkg/markdown.go b/pkg/markdown.go
index f999b83d..3ef045d0 100644
--- a/pkg/markdown.go
+++ b/pkg/markdown.go
@@ -88,6 +88,11 @@ func (markdown *MarkdownRequest) SetLandscape(isLandscape bool) {
 	markdown.values[landscape] = strconv.FormatBool(isLandscape)
 }
 
+// SetWebFontsTimeout sets webFontsTimeout form field.
+func (markdown *MarkdownRequest) SetWebFontsTimeout(timeout int64) {
+	markdown.values[webFontsTimeout] = strconv.FormatInt(timeout, 10)
+}
+
 func (markdown *MarkdownRequest) getPostURL() string {
 	return "/convert/markdown"
 }
diff --git a/pkg/url.go b/pkg/url.go
index ca426f44..9d15f780 100644
--- a/pkg/url.go
+++ b/pkg/url.go
@@ -63,6 +63,11 @@ func (url *URLRequest) SetLandscape(isLandscape bool) {
 	url.values[landscape] = strconv.FormatBool(isLandscape)
 }
 
+// SetWebFontsTimeout sets webFontsTimeout form field.
+func (url *URLRequest) SetWebFontsTimeout(timeout int64) {
+	url.values[webFontsTimeout] = strconv.FormatInt(timeout, 10)
+}
+
 func (url *URLRequest) getPostURL() string {
 	return "/convert/url"
 }