Improve performance and resolve render issues on exporter.

This commit is contained in:
Andrey Antukh 2022-01-18 16:58:00 +01:00 committed by Andrés Moya
parent fd3f304e07
commit d1e4f0de3e
5 changed files with 71 additions and 23 deletions

View file

@ -67,25 +67,21 @@
type "png"
omit-background? false}}]
(.screenshot ^js frame #js {:fullPage full-page?
:clip nil
:type (name type)
:omitBackground omit-background?})))
(defn pdf
([page] (pdf page nil))
([page {:keys [viewport omit-background? prefer-css-page-size? save-path]
:or {viewport {}
omit-background? true
prefer-css-page-size? true
save-path nil}}]
(let [viewport (d/merge default-viewport viewport)]
([page {:keys [viewport save-path]}]
(p/let [viewport (d/merge default-viewport viewport)]
(.emulateMediaType ^js page "screen")
(.pdf ^js page #js {:path save-path
:width (:width viewport)
:height (:height viewport)
:scale (:scale viewport)
:omitBackground omit-background?
:printBackground (not omit-background?)
:preferCSSPageSize prefer-css-page-size?}))))
:printBackground true
:preferCSSPageSize false}))))
(defn eval!
[frame f]
(.evaluate ^js frame f))

View file

@ -31,20 +31,26 @@
(let [path (str "/render-object/" file-id "/" page-id "/" object-id)
uri (-> (u/uri (cf/get :public-uri))
(assoc :path "/")
(assoc :query "essential=t")
(assoc :fragment path))
cookie (create-cookie uri token)]
(pdf-from page (str uri) cookie)))
(pdf-from [page uri cookie]
(l/info :uri uri)
(let [options {:cookie cookie}]
(p/do!
(bw/configure-page! page options)
(bw/navigate! page uri)
(bw/wait-for page "#screenshot")
(if save-path
(bw/pdf page {:save-path save-path})
(bw/pdf page)))))]
(p/let [options {:cookie cookie}]
(bw/configure-page! page options)
(bw/navigate! page uri)
(bw/wait-for page "#screenshot")
;; taking png screenshot before pdf, helps to make the
;; pdf rendering works as expected.
(p/let [dom (bw/select page "#screenshot")]
(bw/screenshot dom {:full-page? true}))
(if save-path
(bw/pdf page {:save-path save-path})
(bw/pdf page))))]
(bw/exec! handle)))