Update cache control

javalikescript · May 8, 2022 · 86dc4aa · 86dc4aa
1 parent 6bcda49
commit 86dc4aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/extensions/web-base/manifest.json b/extensions/web-base/manifest.json
@@ -15,7 +15,7 @@
         "default": "assets"
       },
       "cache": {
-        "title": "Cache control duration, 0 to disable",
+        "title": "Cache control duration for assets, 0 to disable",
         "type": "integer",
         "default": 86400
       },

diff --git a/extensions/web-base/web-base.lua b/extensions/web-base/web-base.lua
@@ -108,7 +108,7 @@ function extension:registerAddonExtension(ext, script)
     script = ext:getId()..'.js'
   end
   self:registerAddon(ext:getId(), {
-    handler = AddonFileHttpHandler:new(ext:getDir()):setCacheControl(configuration.cache),
+    handler = AddonFileHttpHandler:new(ext:getDir()),
     script = script or 'main.js' -- TODO change to init
   })
 end
@@ -128,7 +128,7 @@ extension:subscribeEvent('startup', function()
   local assetsHandler
   if assets:isDirectory() then
     logger:info('Using assets directory "'..assets:getPath()..'"')
-    assetsHandler = FileHttpHandler:new(assets)
+    assetsHandler = FileHttpHandler:new(assets):setCacheControl(configuration.cache)
   elseif assets:isFile() and string.find(assets:getPathName(), '%.zip$') then
     logger:info('Using assets file "'..assets:getPath()..'"')
     assetsHandler = ZipFileHttpHandler:new(assets)
@@ -139,7 +139,7 @@ extension:subscribeEvent('startup', function()
   local wwwDir = File:new(extension:getDir(), 'www')
 
   cleanup(server)
-  addContext(server, '/(.*)', FileHttpHandler:new(wwwDir, 'r', 'app.html'):setCacheControl(configuration.cache))
+  addContext(server, '/(.*)', FileHttpHandler:new(wwwDir, 'r', 'app.html'))
   addContext(server, '/static/(.*)', assetsHandler)
   addContext(server, '/addon/([^/]*)/?(.*)', HttpHandler:new(function(self, exchange)
     local name, path = exchange:getRequestArguments()