🐛 Fix many issues related to exportation process

exporter/src/app/browser.cljs

@@ -7,8 +7,10 @@
 (ns app.browser
   (:require
    ["generic-pool" :as gp]
+   ["generic-pool/lib/errors" :as gpe]
    ["playwright" :as pw]
    [app.common.data :as d]
+   [app.common.exceptions :as ex]
    [app.common.logging :as l]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -17,6 +19,8 @@
 
 (l/set-level! :trace)
 
+(def TimeoutError gpe/TimeoutError)
+
 ;; --- BROWSER API
 
 (def default-timeout 30000)
@@ -117,21 +121,23 @@
 
 (defn init
   []
-  (l/info :msg "initializing browser pool")
-  (let [opts #js {:max (cf/get :exporter-browser-pool-max 5)
-                  :min (cf/get :exporter-browser-pool-min 0)
+  (let [opts #js {:max (cf/get :browser-pool-max 5)
+                  :min (cf/get :browser-pool-min 0)
                   :testOnBorrow true
                   :evictionRunIntervalMillis 5000
                   :numTestsPerEvictionRun 5
-                  :acquireTimeoutMillis 120000 ; 2min
+                  ;; :acquireTimeoutMillis 120000 ; 2min
+                  :acquireTimeoutMillis 10000 ; 10 s
                   :idleTimeoutMillis 10000}]
+
+    (l/info :hint "initializing browser pool" :opts opts)
     (reset! pool (gp/createPool browser-pool-factory opts))
     (p/resolved nil)))
 
 (defn stop
   []
   (when-let [pool (deref pool)]
-    (l/info :msg "finalizing browser pool")
+    (l/info :hint "finalizing browser pool")
     (p/do!
      (.drain ^js pool)
      (.clear ^js pool))))
@@ -140,6 +146,15 @@
   [p]
   (p/handle p (constantly nil)))
 
+(defn- translate-browser-errors
+  [cause]
+  (if (instance? TimeoutError cause)
+    (ex/raise :type :internal
+              :code :timeout
+              :hint (ex-message cause)
+              :cause cause)
+    (p/rejected cause)))
+
 (defn exec!
   [config handle]
   (letfn [(handle-browser [browser]
@@ -166,5 +181,4 @@
     (when-let [pool (deref pool)]
       (-> (p/do! (.acquire ^js pool))
           (p/then (partial on-acquire pool))
-          (p/catch (fn [cause]
-                     (p/rejected cause)))))))
+          (p/catch translate-browser-errors)))))

exporter/src/app/config.cljs

@@ -26,17 +26,16 @@
    :http-server-port 6061
    :http-server-host "localhost"
    :redis-uri "redis://redis/0"
-   :exporter-domain-whitelist #{"localhost2:3449"}})
+   :exporter-domain-whitelist #{"localhost:3449"}})
 
 (s/def ::http-server-port ::us/integer)
 (s/def ::http-server-host ::us/string)
 (s/def ::public-uri ::us/uri)
 (s/def ::tenant ::us/string)
 (s/def ::host ::us/string)
-
-(s/def ::exporter-domain-whitelist ::us/set-of-str)
-(s/def ::exporter-browser-pool-max ::us/integer)
-(s/def ::exporter-browser-pool-min ::us/integer)
+(s/def ::domain-white-list ::us/set-of-str)
+(s/def ::browser-pool-max ::us/integer)
+(s/def ::browser-pool-min ::us/integer)
 
 (s/def ::config
   (s/keys :opt-un [::public-uri
@@ -44,9 +43,9 @@
                    ::tenant
                    ::http-server-port
                    ::http-server-host
-                   ::exporter-browser-pool-max
-                   ::exporter-browser-pool-min
-                   ::exporter-domain-whitelist]))
+                   ::browser-pool-max
+                   ::browser-pool-min
+                   ::domain-whitelist]))
 
 (defn- read-env
   [prefix]

exporter/src/app/handlers.cljs

@@ -21,7 +21,7 @@
    [promesa.core :as p]
    [reitit.core :as r]))
 
-(l/set-level! :info)
+(l/set-level! :debug)
 
 (defn on-error
   [error exchange]
@@ -52,8 +52,10 @@
           (assoc :response/headers {"content-type" "application/transit+json"}))
 
       :else
-      (do
-        (l/error :msg "Unexpected error" :cause error)
+      (let [data {:type :server-error
+                  :hint (ex-message error)
+                  :data data}]
+        (l/error :hint "unexpected internal error" :cause error)
         (-> exchange
             (assoc :response/status 500)
             (assoc :response/body (t/encode data))
@@ -77,7 +79,7 @@
 
 (defn validate-uri!
   [uri]
-  (let [white-list (cf/get :exporter-domain-whitelist #{})
+  (let [white-list (cf/get :domain-white-list #{})
         default    (cf/get :public-uri)]
     (when-not (or (contains? white-list (u/get-domain uri))
                   (= (u/get-domain default) (u/get-domain uri)))
@@ -88,6 +90,7 @@
 (defn handler
   [{:keys [:request/params] :as exchange}]
   (let [{:keys [cmd uri] :as params} (us/conform ::params params)]
+    (l/debug :hint "process-request" :cmd cmd)
     (some-> uri validate-uri!)
     (case cmd
       :get-resource  (resources/handler exchange)

exporter/src/app/http.cljs

@@ -159,10 +159,10 @@
         server  (create-server handler)
         port    (cf/get :http-server-port 6061)]
     (.listen server port)
-    (l/info :msg "welcome to penpot"
+    (l/info :hint "welcome to penpot"
             :module "exporter"
             :version (:full @cf/version))
-    (l/info :msg "starting http server" :port port)
+    (l/info :hint "starting http server" :port port)
     (reset! instance server)))
 
 (defn stop
@@ -170,6 +170,6 @@
   (if-let [server @instance]
     (p/create (fn [resolve]
                 (.close server (fn []
-                                 (l/info :msg "shutdown http server")
+                                 (l/info :hint "shutdown http server")
                                  (resolve)))))
     (p/resolved nil)))

exporter/src/app/renderer/bitmap.cljs

@@ -58,23 +58,15 @@
 (s/def ::object-id ::us/uuid)
 (s/def ::scale ::us/number)
 (s/def ::token ::us/string)
-(s/def ::origin ::us/string)
 (s/def ::uri ::us/uri)
 
 (s/def ::params
   (s/keys :req-un [::name ::suffix ::type ::object-id ::page-id ::scale ::token ::file-id]
-          :opt-un [::origin ::uri]))
+          :opt-un [::uri]))
 
 (defn render
   [params]
   (us/verify ::params params)
-  (when (and (:origin params)
-             (not (contains? (cf/get :origin-white-list) (:origin params))))
-    (ex/raise :type :validation
-              :code :invalid-origin
-              :hint "invalid origin"
-              :origin (:origin params)))
-
   (p/let [content (screenshot-object params)]
     {:data content
      :name (str (:name params)