✨ Move fressian to common module

backend/src/app/rpc/commands/binfile.clj

@@ -8,8 +8,10 @@
   (:refer-clojure :exclude [assert])
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.files.features :as ffeat]
+   [app.common.fressian :as fres]
    [app.common.logging :as l]
    [app.common.pages.migrations :as pmg]
    [app.common.spec :as us]
@@ -28,7 +30,6 @@
    [app.storage.tmp :as tmp]
    [app.tasks.file-gc]
    [app.util.blob :as blob]
-   [app.util.fressian :as fres]
    [app.util.objects-map :as omap]
    [app.util.pointer-map :as pmap]
    [app.util.services :as sv]
@@ -45,8 +46,7 @@
    java.io.DataInputStream
    java.io.DataOutputStream
    java.io.InputStream
-   java.io.OutputStream
-   java.lang.AutoCloseable))
+   java.io.OutputStream))
 
 (set! *warn-on-reflection* true)
 
@@ -296,7 +296,7 @@
 
 (defn- retrieve-file
   [pool file-id]
-  (with-open [^AutoCloseable conn (db/open pool)]
+  (dm/with-open [conn (db/open pool)]
     (binding [pmap/*load-fn* (partial files/load-pointer conn file-id)]
       (some-> (db/get* conn :file {:id file-id})
               (files/decode-row)
@@ -307,7 +307,7 @@
 
 (defn- retrieve-file-media
   [pool {:keys [data id] :as file}]
-  (with-open [^AutoCloseable conn (db/open pool)]
+  (dm/with-open [conn (db/open pool)]
     (let [ids (app.tasks.file-gc/collect-used-media data)
           ids (db/create-array conn "uuid" ids)]
 
@@ -341,7 +341,7 @@
 
 (defn- retrieve-libraries
   [pool ids]
-  (with-open [^AutoCloseable conn (db/open pool)]
+  (dm/with-open [conn (db/open pool)]
     (let [ids (db/create-array conn "uuid" ids)]
       (map :id (db/exec! pool [sql:file-libraries ids])))))
 
@@ -351,7 +351,7 @@
 
 (defn- retrieve-library-relations
   [pool ids]
-  (with-open [^AutoCloseable conn (db/open pool)]
+  (dm/with-open [conn (db/open pool)]
     (db/exec! conn [sql:file-library-rels (db/create-array conn "uuid" ids)])))
 
 (defn- create-or-update-file
@@ -616,7 +616,7 @@
     (-> data
         (update :pages-index update-vals #(update % :objects omap-wrap))
         (update :pages-index update-vals pmap-wrap)
-        (update :components update-vals #(update % :objects omap-wrap))
+        (update :components update-vals #(d/update-when % :objects omap-wrap))
         (update :components pmap-wrap))))
 
 (defmethod read-section :v1/files
@@ -834,7 +834,7 @@
         cs (volatile! nil)]
     (try
       (l/info :hint "start exportation" :export-id id)
-      (with-open [^AutoCloseable output (io/output-stream output)]
+      (dm/with-open [output (io/output-stream output)]
         (binding [*position* (atom 0)]
           (write-export! (assoc cfg ::output output))))
 
@@ -857,7 +857,7 @@
 (defn export-to-tmpfile!
   [cfg]
   (let [path (tmp/tempfile :prefix "penpot.export.")]
-    (with-open [^AutoCloseable output (io/output-stream path)]
+    (dm/with-open [output (io/output-stream path)]
       (export! cfg output)
       path)))
 
@@ -869,7 +869,7 @@
     (l/info :hint "import: started" :import-id id)
     (try
       (binding [*position* (atom 0)]
-        (with-open [^AutoCloseable input (io/input-stream input)]
+        (dm/with-open [input (io/input-stream input)]
           (read-import! (assoc cfg ::input input))))
 
       (catch Throwable cause

backend/src/app/util/blob.clj

@@ -8,9 +8,9 @@
   "A generic blob storage encoding. Mainly used for page data, page
   options and txlog payload storage."
   (:require
+   [app.common.fressian :as fres]
    [app.common.transit :as t]
-   [app.config :as cf]
-   [app.util.fressian :as fres])
+   [app.config :as cf])
   (:import
    com.github.luben.zstd.Zstd
    java.io.ByteArrayInputStream

backend/src/app/util/fressian.clj

@@ -1,325 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.util.fressian
-  (:require
-   [app.common.data :as d]
-   [app.common.geom.matrix :as gmt]
-   [app.common.geom.point :as gpt]
-   [clojure.data.fressian :as fres])
-  (:import
-   app.common.geom.matrix.Matrix
-   app.common.geom.point.Point
-   clojure.lang.Ratio
-   java.io.ByteArrayInputStream
-   java.io.ByteArrayOutputStream
-   java.time.Instant
-   java.time.OffsetDateTime
-   java.util.List
-   org.fressian.Reader
-   org.fressian.StreamingWriter
-   org.fressian.Writer
-   org.fressian.handlers.ReadHandler
-   org.fressian.handlers.WriteHandler))
-
-(set! *warn-on-reflection* true)
-
-(defn str->bytes
-  ([^String s]
-   (str->bytes s "UTF-8"))
-  ([^String s, ^String encoding]
-   (.getBytes s encoding)))
-
-;; --- LOW LEVEL FRESSIAN API
-
-(defn write-object!
-  ([^Writer w ^Object o]
-   (.writeObject w o))
-  ([^Writer w ^Object o ^Boolean cache?]
-   (.writeObject w o cache?)))
-
-(defn read-object!
-  [^Reader r]
-  (.readObject r))
-
-(defn write-tag!
-  ([^Writer w ^String n]
-   (.writeTag w n 1))
-  ([^Writer w ^String n ^long ni]
-   (.writeTag w n ni)))
-
-(defn write-bytes!
-  [^Writer w ^bytes data]
-  (.writeBytes w data))
-
-(defn write-int!
-  [^Writer w ^long val]
-  (.writeInt w val))
-
-(defn write-list!
-  [^Writer w ^List val]
-  (.writeList w val))
-
-;; --- READ AND WRITE HANDLERS
-
-(defn read-symbol
-  [r]
-  (symbol (read-object! r)
-          (read-object! r)))
-
-(defn read-keyword
-  [r]
-  (keyword (read-object! r)
-           (read-object! r)))
-
-(defn write-named
-  [tag ^Writer w s]
-  (write-tag! w tag 2)
-  (write-object! w (namespace s) true)
-  (write-object! w (name s) true))
-
-(defn write-list-like
-  [tag ^Writer w o]
-  (write-tag! w tag 1)
-  (write-list! w o))
-
-(defn begin-closed-list!
-  [^StreamingWriter w]
-  (.beginClosedList w))
-
-(defn end-list!
-  [^StreamingWriter w]
-  (.endList w))
-
-(defn write-map-like
-  "Writes a map as Fressian with the tag 'map' and all keys cached."
-  [tag ^Writer w m]
-  (write-tag! w tag 1)
-  (begin-closed-list! w)
-  (loop [items (seq m)]
-    (when-let [^clojure.lang.MapEntry item (first items)]
-      (write-object! w (.key item) true)
-      (write-object! w (.val item))
-      (recur (rest items))))
-  (end-list! w))
-
-(defn read-map-like
-  [^Reader rdr]
-  (let [kvs ^java.util.List (read-object! rdr)]
-    (if (< (.size kvs) 16)
-      (clojure.lang.PersistentArrayMap. (.toArray kvs))
-      (clojure.lang.PersistentHashMap/create (seq kvs)))))
-
-(def ^:dynamic *write-handler-lookup* nil)
-(def ^:dynamic *read-handler-lookup* nil)
-
-(def write-handlers (atom {}))
-(def read-handlers (atom {}))
-
-(defn add-handlers!
-  [& handlers]
-  (letfn [(adapt-write-handler [{:keys [name class wfn]}]
-            [class {name (reify WriteHandler
-                           (write [_ w o]
-                             (wfn name w o)))}])
-
-          (adapt-read-handler [{:keys [name rfn]}]
-            [name (reify ReadHandler
-                    (read [_ rdr _ _]
-                      (rfn rdr)))])
-
-          (merge-and-clean [m1 m2]
-            (-> (merge m1 m2)
-                (d/without-nils)))]
-
-    (let [whs (into {}
-                    (comp
-                     (filter :wfn)
-                     (map adapt-write-handler))
-                    handlers)
-          rhs (into {}
-                    (comp
-                     (filter :rfn)
-                     (map adapt-read-handler))
-                    handlers)
-          cwh (swap! write-handlers merge-and-clean whs)
-          crh (swap! read-handlers merge-and-clean rhs)]
-
-      (alter-var-root #'*write-handler-lookup* (constantly (-> cwh fres/associative-lookup fres/inheritance-lookup)))
-      (alter-var-root #'*read-handler-lookup* (constantly (-> crh fres/associative-lookup)))
-      nil)))
-
-(defn write-char
-  [n w o]
-  (write-tag! w n 1)
-  (write-int! w (int o)))
-
-(defn read-char
-  [rdr]
-  (char (read-object! rdr)))
-
-(defn write-instant
-  [n w o]
-  (write-tag! w n 1)
-  (write-int! w (.toEpochMilli ^Instant o)))
-
-(defn write-offset-date-time
-  [n w o]
-  (write-tag! w n 1)
-  (write-int! w (.toEpochMilli ^Instant (.toInstant ^OffsetDateTime o))))
-
-(defn read-instant
-  [rdr]
-  (Instant/ofEpochMilli (.readInt ^Reader rdr)))
-
-(defn write-ratio
-  [n w o]
-  (write-tag! w n 2)
-  (write-object! w (.numerator ^Ratio o))
-  (write-object! w (.denominator ^Ratio o)))
-
-(defn read-ratio
-  [rdr]
-  (Ratio. (biginteger (read-object! rdr))
-          (biginteger (read-object! rdr))))
-
-(defn write-bigint
-  [n w o]
-  (let [^BigInteger bi (if (instance? clojure.lang.BigInt o)
-                         (.toBigInteger ^clojure.lang.BigInt o)
-                         o)]
-    (write-tag! w n 1)
-    (write-bytes! w (.toByteArray bi))))
-
-(defn read-bigint
-  [rdr]
-  (let [^bytes bibytes (read-object! rdr)]
-    (bigint (BigInteger. bibytes))))
-
-(add-handlers!
- {:name "char"
-  :class Character
-  :wfn write-char
-  :rfn read-char}
-
- {:name "java/instant"
-  :class Instant
-  :wfn write-instant
-  :rfn read-instant}
-
- {:name "java/instant"
-  :class OffsetDateTime
-  :wfn write-offset-date-time
-  :rfn read-instant}
-
- ;; LEGACY
- {:name "ratio"
-  :rfn read-ratio}
-
- {:name "clj/ratio"
-  :class Ratio
-  :wfn write-ratio
-  :rfn read-ratio}
-
- {:name "clj/map"
-  :class clojure.lang.IPersistentMap
-  :wfn write-map-like
-  :rfn read-map-like}
-
- {:name "clj/keyword"
-  :class clojure.lang.Keyword
-  :wfn write-named
-  :rfn read-keyword}
-
- {:name "clj/symbol"
-  :class clojure.lang.Symbol
-  :wfn write-named
-  :rfn read-symbol}
-
- ;; LEGACY
- {:name "bigint"
-  :rfn read-bigint}
-
- {:name "clj/bigint"
-  :class clojure.lang.BigInt
-  :wfn write-bigint
-  :rfn read-bigint}
-
- {:name "clj/set"
-  :class clojure.lang.IPersistentSet
-  :wfn write-list-like
-  :rfn (comp set read-object!)}
-
- {:name "clj/vector"
-  :class clojure.lang.IPersistentVector
-  :wfn write-list-like
-  :rfn (comp vec read-object!)}
-
- {:name "clj/list"
-  ;; :class clojure.lang.IPersistentList
-  ;; :wfn write-list-like
-  :rfn #(apply list (read-object! %))}
-
- {:name "clj/seq"
-  :class clojure.lang.ISeq
-  :wfn write-list-like
-  :rfn (comp sequence read-object!)})
-
-;; --- PUBLIC API
-
-(defn reader
-  [istream]
-  (fres/create-reader istream :handlers *read-handler-lookup*))
-
-(defn writer
-  [ostream]
-  (fres/create-writer ostream :handlers *write-handler-lookup*))
-
-(defn read!
-  [reader]
-  (fres/read-object reader))
-
-(defn write!
-  [writer data]
-  (fres/write-object writer data))
-
-(defn encode
-  [data]
-  (with-open [^ByteArrayOutputStream output (ByteArrayOutputStream.)]
-    (-> (writer output)
-        (write! data))
-    (.toByteArray output)))
-
-(defn decode
-  [data]
-  (with-open [^ByteArrayInputStream input (ByteArrayInputStream. ^bytes data)]
-    (-> input reader read!)))
-
-;; --- ADDITIONAL
-
-(add-handlers!
- {:name "penpot/point"
-  :class app.common.geom.point.Point
-  :wfn (fn [n w ^Point o]
-         (write-tag! w n 1)
-         (write-list! w (List/of (.-x o) (.-y o))))
-  :rfn (fn [^Reader rdr]
-         (let [^List x (read-object! rdr)]
-           (Point. (.get x 0) (.get x 1))))}
-
- {:name "penpot/matrix"
-  :class app.common.geom.matrix.Matrix
-  :wfn (fn [^String n ^Writer w o]
-         (write-tag! w n 1)
-         (write-list! w (List/of (.-a ^Matrix o)
-                                 (.-b ^Matrix o)
-                                 (.-c ^Matrix o)
-                                 (.-d ^Matrix o)
-                                 (.-e ^Matrix o)
-                                 (.-f ^Matrix o))))
-  :rfn (fn [^Reader rdr]
-         (let [^List x (read-object! rdr)]
-           (Matrix. (.get x 0) (.get x 1) (.get x 2) (.get x 3) (.get x 4) (.get x 5))))})

backend/src/app/util/objects_map.clj

@@ -16,10 +16,9 @@
   properly from each value."
 
   (:require
-   ;; [app.common.logging :as l]
+   [app.common.fressian :as fres]
    [app.common.transit :as t]
    [app.common.uuid :as uuid]
-   [app.util.fressian :as fres]
    [clojure.core :as c])
   (:import
    clojure.lang.Counted

backend/src/app/util/pointer_map.clj

@@ -36,10 +36,10 @@
   "
 
   (:require
+   [app.common.fressian :as fres]
    [app.common.logging :as l]
    [app.common.transit :as t]
    [app.common.uuid :as uuid]
-   [app.util.fressian :as fres]
    [app.util.time :as dt]
    [clojure.core :as c])
   (:import