code review, fixes

nodejs · Dec 18, 2024 · 4e0b4b0 · 4e0b4b0
1 parent 01fc302
commit 4e0b4b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/update-cache-tests.yml b/.github/workflows/update-cache-tests.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
-      - name: Update WPT
+      - name: Update Cache Tests
         run: |
           rm -rf test/fixtures/cache-tests && mkdir test/fixtures/cache-tests &&
 

diff --git a/lib/handler/cache-handler.js b/lib/handler/cache-handler.js
@@ -15,6 +15,8 @@ const HEURISTICALLY_CACHEABLE_STATUS_CODES = [
   200, 203, 204, 206, 300, 301, 308, 404, 405, 410, 414, 501
 ]
 
+const MAX_RESPONSE_AGE = 2147483647000
+
 /**
  * @typedef {import('../../types/dispatcher.d.ts').default.DispatchHandler} DispatchHandler
  *
@@ -129,7 +131,7 @@ class CacheHandler {
 
     const now = Date.now()
     const resAge = resHeaders.age ? getAge(resHeaders.age) : undefined
-    if (resAge && resAge >= 2147483647000) {
+    if (resAge && resAge >= MAX_RESPONSE_AGE) {
       // Response considered stale
       return downstreamOnHeaders()
     }
@@ -144,9 +146,9 @@ class CacheHandler {
     if (staleAt === undefined || (resAge && resAge > staleAt)) {
       return downstreamOnHeaders()
     }
+
     const baseTime = resDate ? resDate.getTime() : now
     const absoluteStaleAt = staleAt + baseTime
-
     if (now >= absoluteStaleAt) {
       // Response is already stale
       return downstreamOnHeaders()
@@ -193,6 +195,10 @@ class CacheHandler {
       .on('error', function () {
         // TODO (fix): Make error somehow observable?
         handler.#writeStream = undefined
+
+        // Delete the value in case the cache store is holding onto state from
+        //  the call to createWriteStream
+        handler.#store.delete(handler.#cacheKey)
       })
       .on('close', function () {
         if (handler.#writeStream === this) {