From cf84670fc8796bfbc4bd405a00d5e6ffd9f8cb30 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Mon, 3 Aug 2020 09:53:49 +1000
Subject: [PATCH] file-server: do not cache index.html

Removes caching for index.html so JS versioning can occur by referencing
JS bundles with different filenames
---
 pkg/arvo/app/file-server.hoon | 10 ++++++++--
 pkg/arvo/lib/server.hoon      |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/arvo/app/file-server.hoon b/pkg/arvo/app/file-server.hoon
index fdcf7bfd41..1f0431d9d3 100644
--- a/pkg/arvo/app/file-server.hoon
+++ b/pkg/arvo/app/file-server.hoon
@@ -169,7 +169,7 @@
       ?~  content  [not-found:gen %.n]
       ?-  -.content.u.content
           %clay
-        =/  scry-path
+        =/  scry-path=path
           :*  (scot %p our.bowl)
               q.byk.bowl
               (scot %da now.bowl)
@@ -179,10 +179,16 @@
         =/  file  (as-octs:mimes:html .^(@ %cx scry-path))
         :_  public.u.content
         ?+  ext.req-line  not-found:gen
-            [~ %html]  (html-response:gen file)
             [~ %js]    (js-response:gen file)
             [~ %css]   (css-response:gen file)
             [~ %png]   (png-response:gen file)
+          ::
+              [~ %html]
+            %.  file
+            %*    .   html-response:gen 
+                cache  
+              !=(/app/landscape/index/html (slag 3 scry-path))
+            ==
         ==
       ::
           %glob
diff --git a/pkg/arvo/lib/server.hoon b/pkg/arvo/lib/server.hoon
index 4a0b7ded01..d51fa12c8d 100644
--- a/pkg/arvo/lib/server.hoon
+++ b/pkg/arvo/lib/server.hoon
@@ -80,9 +80,11 @@
   ++  max-1-wk  ['cache-control' 'max-age=604800']
   ::
   ++  html-response
+    =|  cache=?
     |=  =octs
     ^-  simple-payload:http
-    [[200 [['content-type' 'text/html'] max-1-wk ~]] `octs]
+    :_  `octs
+    [200 [['content-type' 'text/html'] ?:(cache [max-1-wk ~] ~)]]
   ::
   ++  js-response
     |=  =octs