feat: add maxAge support to exposeFolder

davidbonnet · Aug 20, 2020 · 045b2ee · 045b2ee
1 parent e497428
commit 045b2ee
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/demo/files/page.html b/demo/files/page.html
@@ -9,8 +9,9 @@ <h1>Test page</h1>
     <p>
       This test page imports a script that prints something into the console.
     </p>
-    <img src="./photo.jpeg" />
-    <button onclick="sendJson()">Send</button>
+    <button onclick="sendJson()">Post a JSON value</button>
+    <br />
+    <img src="./photo.jpeg" width="600" />
     <form></form>
   </body>
 </html>
diff --git a/src/exposeFolder.js b/src/exposeFolder.js
@@ -9,6 +9,7 @@ import { getAcceptedEncodingList } from './getAcceptedEncodingList'
 export function exposeFolder({
   path: folderPath,
   cache = false,
+  maxAge = 1 * YEARS,
   lastModified = true,
 }) {
   return async function (request, next) {
@@ -21,7 +22,6 @@ export function exposeFolder({
     if (!isChildPath(folderPath, pathname)) {
       return next(request)
     }
-    const response = request.respond()
     let stats
     try {
       stats = await stat(pathname)
@@ -34,6 +34,10 @@ export function exposeFolder({
     if (!stats.isFile()) {
       return next(request)
     }
+    const response = request.respond()
+    if (maxAge) {
+      response.setHeader('Cache-Control', `public, max-age=${maxAge}`)
+    }
     if (lastModified && stats.mtime) {
       response.setHeader('Last-Modified', stats.mtime.toUTCString())
     }
@@ -98,3 +102,5 @@ const COMPRESSIBLE_CONTENT_TYPES = {
   'application/rss+xml': true,
   'application/atom_xml': true,
 }
+
+const YEARS = 60 * 60 * 24 * 365
diff --git a/src/session.js b/src/session.js
@@ -31,8 +31,8 @@ export function session({
         key = await generateKey()
         setCookie(response, name, key, {
           httpOnly: true,
-          maxAge,
-          expires: new Date(getNow() + maxAge * 1000),
+          maxAge: (maxAge / 1000) | 0,
+          expires: new Date(getNow() + maxAge),
           secure,
           sameSite,
           domain,
@@ -60,7 +60,7 @@ export function session({
   }
 }
 
-const DAYS = 24 * 60 * 60
+const DAYS = 24 * 60 * 60 * 1000
 
 async function defaultGenerateKey() {
   return (await randomBytes(48)).toString('hex')

diff --git a/src/tests/snapshots/exposeFolder.js.md b/src/tests/snapshots/exposeFolder.js.md
diff --git a/src/tests/snapshots/exposeFolder.js.snap b/src/tests/snapshots/exposeFolder.js.snap