3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-27 16:37:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Adapt exporter app to deployment related chages.

Browse source
This commit is contained in:
Andrey Antukh 2020-07-02 10:40:58 +02:00
parent b8526c6e3b
commit f8881b3c72
4 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
exporter/src/app/browser.cljs
View file

@ -54,7 +54,9 @@
:incognito (.-CONCURRENCY_CONTEXT ^js ppc/Cluster) :incognito (.-CONCURRENCY_CONTEXT ^js ppc/Cluster)
:page (.-CONCURRENCY_PAGE ^js ppc/Cluster)) :page (.-CONCURRENCY_PAGE ^js ppc/Cluster))
opts #js {:concurrency ccst opts #js {:concurrency ccst
:maxConcurrency concurrency}] :maxConcurrency concurrency
:puppeteerOptions #js {:args #js ["--no-sandbox"
"--explicitly-allowed-ports=6000"]}}]
(.launch ^js ppc/Cluster opts)))) (.launch ^js ppc/Cluster opts))))
(defn stop! (defn stop!

2
exporter/src/app/config.cljs
View file

@ -17,4 +17,4 @@
(js/Object.keys env))))) (js/Object.keys env)))))
(defonce config (defonce config
{:domain (:app-domain env "localhost:3449")}) {:public-uri (:app-public-uri env "http://localhost:3449")})

6
exporter/src/app/http.cljs
View file

@ -3,7 +3,8 @@
[promesa.core :as p] [promesa.core :as p]
[lambdaisland.glogi :as log] [lambdaisland.glogi :as log]
[app.browser :as bwr] [app.browser :as bwr]
[app.http.screenshot :refer [bitmap-handler]] [app.http.screenshot :refer [bitmap-handler
page-handler]]
[app.util.transit :as t] [app.util.transit :as t]
[reitit.core :as r] [reitit.core :as r]
[cuerdas.core :as str] [cuerdas.core :as str]
@ -90,7 +91,8 @@
(def routes (def routes
[["/export" [["/export"
["/bitmap" {:handler bitmap-handler}]]]) ["/bitmap" {:handler bitmap-handler}]
["/page" {:handler page-handler}]]])
(defn- router-handler (defn- router-handler
[router] [router]

35
exporter/src/app/http/screenshot.cljs
View file

@ -2,10 +2,13 @@
(:require (:require
[app.browser :as bwr] [app.browser :as bwr]
[app.config :as cfg] [app.config :as cfg]
[lambdaisland.glogi :as log]
[cljs.spec.alpha :as s] [cljs.spec.alpha :as s]
[promesa.core :as p] [promesa.core :as p]
[uxbox.common.exceptions :as exc :include-macros true] [uxbox.common.exceptions :as exc :include-macros true]
[uxbox.common.spec :as us])) [uxbox.common.spec :as us])
(:import
goog.Uri))
(defn- load-and-screenshot (defn- load-and-screenshot
[page url cookie] [page url cookie]
@ -15,19 +18,24 @@
(bwr/navigate! page url) (bwr/navigate! page url)
(bwr/sleep page 500) (bwr/sleep page 500)
(.evaluate page (js* "() => document.body.style.background = 'transparent'")) (.evaluate page (js* "() => document.body.style.background = 'transparent'"))
;; (.screenshot ^js page #js {:omitBackground true :fullPage true})
(p/let [dom (.$ page "#screenshot")] (p/let [dom (.$ page "#screenshot")]
(.screenshot ^js dom #js {:omitBackground true})))) (.screenshot ^js dom #js {:omitBackground true}))))
(defn- take-screenshot (defn- take-screenshot
[browser {:keys [page-id object-id token]}] [browser {:keys [page-id object-id token]}]
(letfn [(on-browser [page] (letfn [(on-browser [page]
(let [url (str "http://" (:domain cfg/config) (let [path (str "/render-object/" page-id "/" object-id)
"/#/render-object/" uri (doto (Uri. (:public-uri cfg/config))
page-id "/" object-id) (.setPath "/")
cookie {:domain (:domain cfg/config) (.setFragment path))
cookie {:domain (str (.getDomain uri)
":"
(.getPort uri))
:key "auth-token" :key "auth-token"
:value token}] :value token}]
(load-and-screenshot page url cookie)))] (log/info :uri (.toString uri))
(load-and-screenshot page (.toString uri) cookie)))]
(bwr/exec! browser on-browser))) (bwr/exec! browser on-browser)))
(s/def ::page-id ::us/uuid) (s/def ::page-id ::us/uuid)
@ -48,3 +56,18 @@
:headers {"content-type" "image/png" :headers {"content-type" "image/png"
"content-length" (alength result)}}))))) "content-length" (alength result)}})))))
(defn page-handler
[{:keys [params browser] :as request}]
(letfn [(screenshot [page uri]
(p/do!
(bwr/emulate! page {:viewport [1920 1080]})
(bwr/navigate! page uri)
(bwr/sleep page 500)
;; (.evaluate page (js* "() => document.body.style.background = 'transparent'"))
(.screenshot ^js page #js {:omitBackground false})))]
(p/let [uri (get-in params [:query :uri])
sht (bwr/exec! browser #(screenshot % uri))]
{:status 200
:body sht
:headers {"content-type" "image/png"
"content-length" (alength sht)}})))