🐛 Fix many issues after PR review

exporter/src/app/browser.cljs

@@ -69,13 +69,9 @@
 
 (defn pdf
   ([page] (pdf page {}))
-  ([page {:keys [width height scale save-path]
-          :or {width default-viewport-width
-               height default-viewport-height
-               scale 1}}]
+  ([page {:keys [scale save-path]
+          :or {scale 1}}]
     (.pdf ^js page #js {:path save-path
-                        :width width
-                        :height height
                         :scale scale
                         :printBackground true
                         :preferCSSPageSize true})))

exporter/src/app/handlers/resources.cljs

@@ -27,10 +27,11 @@
 (defn- get-mtype
   [type]
   (case (d/name type)
-    "zip" "application/zip"
+    "zip"  "application/zip"
+    "pdf"  "application/pdf"
+    "svg"  "image/svg+xml"
     "jpeg" "image/jpeg"
-    "png"  "image/png"
-    "pdf"  "application/pdf"))
+    "png"  "image/png"))
 
 (defn create
   "Generates ephimeral resource object."

exporter/src/app/http.cljs

@@ -65,7 +65,7 @@
 
 (defn- wrap-body-params
   [handler]
-  (let [opts #js {:limit "2mb" :encoding "utf8"}]
+  (let [opts #js {:limit "60mb" :encoding "utf8"}]
     (fn [{:keys [:request/method :request/headers request] :as exchange}]
       (let [ctype (get headers "content-type")]
         (if (= method "post")

exporter/src/app/renderer/bitmap.cljs

@@ -13,6 +13,7 @@
    [app.common.logging :as l]
    [app.common.pages :as cp]
    [app.common.spec :as us]
+   [app.common.uri :as u]
    [app.config :as cf]
    [cljs.spec.alpha :as s]
    [cuerdas.core :as str]
@@ -20,10 +21,14 @@
 
 (defn screenshot-object
   [{:keys [file-id page-id object-id token scale type uri]}]
-  (p/let [path (str "/render-object/" file-id "/" page-id "/" object-id)
-          uri  (-> (or uri (cf/get :public-uri))
-                   (assoc :path "/")
-                   (assoc :fragment path))]
+  (p/let [params {:file-id file-id
+                  :page-id page-id
+                  :object-id object-id
+                  :route "render-object"}
+
+          uri    (-> (or uri (cf/get :public-uri))
+                     (assoc :path "/render.html")
+                     (assoc :query (u/map->query-string params)))]
     (bw/exec!
      #js {:screen #js {:width bw/default-viewport-width
                        :height bw/default-viewport-height}

exporter/src/app/renderer/pdf.cljs

@@ -11,16 +11,21 @@
    [app.common.exceptions :as ex :include-macros true]
    [app.common.logging :as l]
    [app.common.spec :as us]
+   [app.common.uri :as u]
    [app.config :as cf]
    [cljs.spec.alpha :as s]
    [promesa.core :as p]))
 
 (defn pdf-from-object
   [{:keys [file-id page-id object-id token scale type save-path uri] :as params}]
-  (p/let [path (str "/render-object/" file-id "/" page-id "/" object-id)
-          uri  (-> (or uri (cf/get :public-uri))
-                   (assoc :path "/")
-                   (assoc :fragment path))]
+  (p/let [params {:file-id file-id
+                  :page-id page-id
+                  :object-id object-id
+                  :route "render-object"}
+          uri    (-> (or uri (cf/get :public-uri))
+                     (assoc :path "/render.html")
+                     (assoc :query (u/map->query-string params)))]
+
     (bw/exec!
      #js {:screen #js {:width bw/default-viewport-width
                        :height bw/default-viewport-height}
@@ -37,6 +42,7 @@
         (p/let [dom (bw/select page "#screenshot")]
           (bw/wait-for dom)
           (bw/screenshot dom {:full-page? true})
+          (bw/sleep page 2000) ; the good old fix with sleep
           (if save-path
             (bw/pdf page {:save-path save-path})
             (bw/pdf page))))))))

exporter/src/app/renderer/svg.cljs

@@ -14,6 +14,7 @@
    [app.common.logging :as l]
    [app.common.pages :as cp]
    [app.common.spec :as us]
+   [app.common.uri :as u]
    [app.config :as cf]
    [app.util.shell :as sh]
    [cljs.spec.alpha :as s]
@@ -322,30 +323,34 @@
               result))
           ]
 
-    (p/let [path (str "/render-object/" file-id "/" page-id "/" object-id "?render-texts=true")
-            uri  (-> (or uri (cf/get :public-uri))
-                     (assoc :path "/")
-                     (assoc :fragment path))]
+  (p/let [params {:file-id file-id
+                  :page-id page-id
+                  :object-id object-id
+                  :render-texts true
+                  :route "render-object"}
 
-      (bw/exec!
-       #js {:screen #js {:width bw/default-viewport-width
+          uri    (-> (or uri (cf/get :public-uri))
+                     (assoc :path "/render.html")
+                     (assoc :query (u/map->query-string params)))]
+
+    (bw/exec!
+     #js {:screen #js {:width bw/default-viewport-width
+                       :height bw/default-viewport-height}
+          :viewport #js {:width bw/default-viewport-width
                          :height bw/default-viewport-height}
-            :viewport #js {:width bw/default-viewport-width
-                           :height bw/default-viewport-height}
-            :locale "en-US"
-            :storageState #js {:cookies (bw/create-cookies uri {:token token})}
-            :deviceScaleFactor scale
-            :userAgent bw/default-user-agent}
-       (fn [page]
-         (l/info :uri uri)
-         (p/do!
-          (bw/nav! page uri)
-          (p/let [dom (bw/select page "#screenshot")]
-            (js/console.log "FFFF" dom)
-            (bw/wait-for dom)
-            (bw/sleep page 2000))
+          :locale "en-US"
+          :storageState #js {:cookies (bw/create-cookies uri {:token token})}
+          :deviceScaleFactor scale
+          :userAgent bw/default-user-agent}
+     (fn [page]
+       (l/info :uri uri)
+       (p/do!
+        (bw/nav! page uri)
+        (p/let [dom (bw/select page "#screenshot")]
+          (bw/wait-for dom)
+          (bw/sleep page 2000))
 
-          (extract page)))))))
+        (extract page)))))))
 
 (s/def ::name ::us/string)
 (s/def ::suffix ::us/string)