🎉 Add conditional reading to RPC

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

@@ -18,6 +18,7 @@
    [app.rpc :as-alias rpc]
    [app.rpc.climit :as climit]
    [app.rpc.doc :as-alias doc]
+   [app.rpc.helpers :as rph]
    [app.rpc.mutations.teams :as teams]
    [app.rpc.queries.profile :as profile]
    [app.tokens :as tokens]
@@ -135,10 +136,10 @@
                          {:invitation-token (:invitation-token params)}
                          profile)]
 
-        (with-meta response
-          {::rpc/transform-response (session/create-fn session (:id profile))
-           ::audit/props (audit/profile->props profile)
-           ::audit/profile-id (:id profile)})))))
+        (-> response
+            (rph/with-transform (session/create-fn session (:id profile)))
+            (vary-meta merge {::audit/props (audit/profile->props profile)
+                              ::audit/profile-id (:id profile)}))))))
 
 (s/def ::login-with-password
   (s/keys :req-un [::email ::password]

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

@@ -16,7 +16,6 @@
    [app.config :as cf]
    [app.db :as db]
    [app.media :as media]
-   [app.rpc :as-alias rpc]
    [app.rpc.commands.files :as files]
    [app.rpc.doc :as-alias doc]
    [app.rpc.queries.projects :as projects]
@@ -874,7 +873,7 @@
   {::doc/added "1.15"}
   [{:keys [pool] :as cfg} {:keys [profile-id file-id include-libraries? embed-assets?] :as params}]
   (files/check-read-permissions! pool profile-id file-id)
-  (let [resp (reify yrs/StreamableResponseBody
+  (let [body (reify yrs/StreamableResponseBody
                (-write-body-to-stream [_ _ output-stream]
                  (-> cfg
                      (assoc ::file-ids [file-id])
@@ -882,12 +881,8 @@
                      (assoc ::include-libraries? include-libraries?)
                      (export! output-stream))))]
 
-    (with-meta (sv/wrap nil)
-      {::rpc/transform-response
-       (fn [_ response]
-         (-> response
-             (assoc :body resp)
-             (assoc :headers {"content-type" "application/octet-stream"})))})))
+    (fn [_]
+      (yrs/response 200 body {"content-type" "application/octet-stream"}))))
 
 (s/def ::file ::media/upload)
 (s/def ::import-binfile

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

@@ -19,8 +19,9 @@
    [app.db.sql :as sql]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.files.thumbnails :as-alias thumbs]
+   [app.rpc.cond :as-alias cond]
    [app.rpc.doc :as-alias doc]
-   [app.rpc.helpers :as rpch]
+   [app.rpc.helpers :as rph]
    [app.rpc.permissions :as perms]
    [app.rpc.queries.projects :as projects]
    [app.rpc.queries.share-link :refer [retrieve-share-link]]
@@ -237,19 +238,30 @@
 
       file)))
 
+(defn- get-minimal-file
+  [{:keys [pool] :as cfg} id]
+  (db/get pool :file {:id id} {:columns [:id :modified-at :revn]}))
+
+(defn- get-file-etag
+  [{:keys [modified-at revn]}]
+  (str (dt/format-instant modified-at :iso) "-" revn))
+
 (s/def ::get-file
   (s/keys :req-un [::profile-id ::id]
           :opt-un [::features]))
 
 (sv/defmethod ::get-file
   "Retrieve a file by its ID. Only authenticated users."
-  {::doc/added "1.17"}
+  {::doc/added "1.17"
+   ::cond/get-object #(get-minimal-file %1 (:id %2))
+   ::cond/key-fn get-file-etag}
   [{:keys [pool] :as cfg} {:keys [profile-id id features] :as params}]
   (with-open [conn (db/open pool)]
     (let [perms (get-permissions conn profile-id id)]
       (check-read-permissions! perms)
-      (-> (get-file conn id features)
-          (assoc :permissions perms)))))
+      (let [file (-> (get-file conn id features)
+                     (assoc :permissions perms))]
+        (vary-meta file assoc ::cond/key (get-file-etag file))))))
 
 
 ;; --- COMMAND QUERY: get-file-object-thumbnails
@@ -277,7 +289,10 @@
 
 (sv/defmethod ::get-file-object-thumbnails
   "Retrieve a file object thumbnails."
-  {::doc/added "1.17"}
+  {::doc/added "1.17"
+   ::cond/get-object #(get-minimal-file %1 (:file-id %2))
+   ::cond/reuse-key? true
+   ::cond/key-fn get-file-etag}
   [{:keys [pool] :as cfg} {:keys [profile-id file-id] :as params}]
   (with-open [conn (db/open pool)]
     (check-read-permissions! conn profile-id file-id)
@@ -592,8 +607,7 @@
   (with-open [conn (db/open pool)]
     (check-read-permissions! conn profile-id file-id)
     (-> (get-file-thumbnail conn file-id revn)
-        (with-meta {::rpc/transform-response (rpch/http-cache {:max-age (* 1000 60 60)})}))))
-
+        (with-meta {::rpc/transform-response (rph/http-cache {:max-age (* 1000 60 60)})}))))
 
 
 ;; --- COMMAND QUERY: get-file-data-for-thumbnail

backend/src/app/rpc/commands/files/update.clj

@@ -19,10 +19,10 @@
    [app.loggers.audit :as audit]
    [app.metrics :as mtx]
    [app.msgbus :as mbus]
-   [app.rpc :as-alias rpc]
    [app.rpc.climit :as-alias climit]
    [app.rpc.commands.files :as files]
    [app.rpc.doc :as-alias doc]
+   [app.rpc.helpers :as rph]
    [app.util.blob :as blob]
    [app.util.objects-map :as omap]
    [app.util.pointer-map :as pmap]
@@ -135,10 +135,8 @@
     (let [cfg    (assoc cfg :conn conn)
           tpoint (dt/tpoint)]
       (-> (update-file cfg params)
-          (vary-meta assoc ::rpc/before-complete
-                     (fn []
-                       (let [elapsed (tpoint)]
-                         (l/trace :hint "update-file" :time (dt/format-duration elapsed)))))))))
+          (rph/with-defer #(let [elapsed (tpoint)]
+                             (l/trace :hint "update-file" :time (dt/format-duration elapsed))))))))
 
 (defn update-file
   [{:keys [conn metrics] :as cfg} {:keys [id profile-id changes changes-with-metadata] :as params}]