🎉 Add lazy loading and storage/pointer-map support on viewer

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

@@ -116,6 +116,7 @@
         :can-edit (or is-owner is-admin can-edit)
         :can-read true
         :is-logged (some? profile-id)})))
+
   ([conn profile-id file-id share-id]
    (let [perms  (get-permissions conn profile-id file-id)
          ldata  (retrieve-share-link conn file-id share-id)]
@@ -128,6 +129,7 @@
        (some? perms) perms
        (some? ldata) {:type :share-link
                       :can-read true
+                      :pages (:pages ldata)
                       :is-logged (some? profile-id)
                       :who-comment (:who-comment ldata)
                       :who-inspect (:who-inspect ldata)}))))
@@ -212,7 +214,7 @@
 ;; QUERY COMMANDS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn- handle-file-features
+(defn handle-file-features
   [{:keys [features] :as file} client-features]
   (when (and (contains? features "components/v2")
              (not (contains? client-features "components/v2")))
@@ -244,11 +246,11 @@
         (pmg/migrate-file)
         (handle-file-features client-features))))
 
-(defn- get-minimal-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
+(defn get-file-etag
   [{:keys [modified-at revn]}]
   (str (dt/format-instant modified-at :iso) "-" revn))
 
@@ -277,18 +279,23 @@
   (some-> (db/get conn :file-data-fragment {:file-id file-id :id fragment-id})
           (update :content blob/decode)))
 
+(s/def ::share-id ::us/uuid)
 (s/def ::fragment-id ::us/uuid)
+
 (s/def ::get-file-fragment
-  (s/keys :req-un [::file-id ::fragment-id ::profile-id]))
+  (s/keys :req-un [::file-id ::fragment-id]
+          :opt-un [::share-id ::profile-id]))
 
 (sv/defmethod ::get-file-fragment
   "Retrieve a file by its ID. Only authenticated users."
-  {::doc/added "1.17"}
-  [{:keys [pool] :as cfg} {:keys [profile-id file-id fragment-id] :as params}]
+  {::doc/added "1.17"
+   :auth false}
+  [{:keys [pool] :as cfg} {:keys [profile-id file-id fragment-id share-id] :as params}]
   (with-open [conn (db/open pool)]
-    (check-read-permissions! conn profile-id file-id)
-    (-> (get-file-fragment conn file-id fragment-id)
-        (rph/with-http-cache long-cache-duration))))
+    (let [perms (get-permissions conn profile-id file-id share-id)]
+      (check-read-permissions! perms)
+      (-> (get-file-fragment conn file-id fragment-id)
+          (rph/with-http-cache long-cache-duration)))))
 
 ;; --- COMMAND QUERY: get-file-object-thumbnails
 

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

@@ -10,6 +10,7 @@
    [app.db :as db]
    [app.rpc.commands.comments :as comments]
    [app.rpc.commands.files :as files]
+   [app.rpc.cond :as-alias cond]
    [app.rpc.doc :as-alias doc]
    [app.rpc.queries.share-link :as slnk]
    [app.util.services :as sv]
@@ -23,57 +24,52 @@
 
 (defn- get-bundle
   [conn file-id profile-id features]
-  (let [file       (files/get-file conn file-id features)
-        thumbnails (files/get-object-thumbnails conn file-id)
-        project    (get-project conn (:project-id file))
-        libs       (files/get-file-libraries conn file-id features)
-        users      (comments/get-file-comments-users conn file-id profile-id)
+  (let [file    (files/get-file conn file-id features)
+        project (get-project conn (:project-id file))
+        libs    (files/get-file-libraries conn file-id features)
+        users   (comments/get-file-comments-users conn file-id profile-id)
 
-        links      (->> (db/query conn :share-link {:file-id file-id})
-                        (mapv slnk/decode-share-link-row))
+        links   (->> (db/query conn :share-link {:file-id file-id})
+                     (mapv slnk/decode-share-link-row))
 
-        fonts      (db/query conn :team-font-variant
-                             {:team-id (:team-id project)
-                              :deleted-at nil})]
-    {:file (assoc file :thumbnails thumbnails)
+        fonts   (db/query conn :team-font-variant
+                          {:team-id (:team-id project)
+                           :deleted-at nil})]
+
+    {:file file
      :users users
      :fonts fonts
      :project project
      :share-links links
      :libraries libs}))
 
+(defn- remove-not-allowed-pages
+  [data allowed]
+  (-> data
+      (update :pages (fn [pages] (filterv #(contains? allowed %) pages)))
+      (update :pages-index select-keys allowed)))
+
 (defn get-view-only-bundle
   [conn {:keys [profile-id file-id share-id features] :as params}]
-  (let [slink  (slnk/retrieve-share-link conn file-id share-id)
-        perms  (files/get-permissions conn profile-id file-id share-id)
-        thumbs (files/get-object-thumbnails conn file-id)
+  (let [perms  (files/get-permissions conn profile-id file-id share-id)
         bundle (-> (get-bundle conn file-id profile-id features)
-                   (assoc :permissions perms)
-                   (assoc-in [:file :thumbnails] thumbs))]
+                   (assoc :permissions perms))]
 
     ;; When we have neither profile nor share, we just return a not
     ;; found response to the user.
-    (when (and (not profile-id)
-               (not slink))
+    (when-not perms
       (ex/raise :type :not-found
-                :code :object-not-found))
+                :code :object-not-found
+                :hint "object not found"))
 
-    ;; When we have only profile, we need to check read permissions
-    ;; on file.
-    (when (and profile-id (not slink))
-      (files/check-read-permissions! conn profile-id file-id))
+    (update bundle :file
+            (fn [file]
+              (cond-> file
+                (= :share-link (:type perms))
+                (update :data remove-not-allowed-pages (:pages perms))
 
-    (cond-> bundle
-      (some? slink)
-      (assoc :share slink)
-
-      (and (some? slink)
-           (not (contains? (:flags slink) "view-all-pages")))
-      (update-in [:file :data] (fn [data]
-                                 (let [allowed-pages (:pages slink)]
-                                   (-> data
-                                       (update :pages (fn [pages] (filterv #(contains? allowed-pages %) pages)))
-                                       (update :pages-index (fn [index] (select-keys index allowed-pages))))))))))
+                :always
+                (update :data select-keys [:id :options :pages :pages-index]))))))
 
 (s/def ::get-view-only-bundle
   (s/keys :req-un [::files/file-id]
@@ -83,8 +79,10 @@
 
 (sv/defmethod ::get-view-only-bundle
   {:auth false
+   ::cond/get-object #(files/get-minimal-file %1 (:file-id %2))
+   ::cond/key-fn files/get-file-etag
+   ::cond/reuse-key? true
    ::doc/added "1.17"}
   [{:keys [pool]} params]
   (with-open [conn (db/open pool)]
     (get-view-only-bundle conn params)))
-

backend/src/app/srepl/main.clj

@@ -137,3 +137,8 @@
                     :id id
                     :update-fn update-file
                     :save? save?)))
+
+(defn enable-storage-features-on-file!
+  [system & {:as params}]
+  (enable-objects-map-feature-on-file! system params)
+  (enable-pointer-map-feature-on-file! system params))