fix: remove quotes from etag (#103)

netlify · Jan 5, 2023 · e4101c0 · e4101c0
1 parent 1a2009b
commit e4101c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,6 +4,7 @@
   ],
   "ignorePatterns": "dist",
   "rules": {
-    "import/named": "off"
+    "import/named": "off",
+    "vue/valid-attribute-name": "off"
   }
 }
diff --git a/src/http.ts b/src/http.ts
@@ -90,7 +90,8 @@ export async function loadSourceImage ({ cacheDir, url, requestEtag, modifiers,
   // either an etag or a last-modified date for the source image to do so.
   let responseEtag
   if (metadata.etag || metadata.lastModified) {
-    responseEtag = etag(`${cacheKey}${metadata.etag || metadata.lastModified}${modifiers}`)
+    // etag returns a quoted string for some reason
+    responseEtag = JSON.parse(etag(`${cacheKey}${metadata.etag || metadata.lastModified}${modifiers}`))
     if (requestEtag && (requestEtag === responseEtag)) {
       return {
         response: {

diff --git a/src/index.ts b/src/index.ts
@@ -189,7 +189,7 @@ export function createIPXHandler ({
     const body =
       typeof res.body === 'string' ? res.body : res.body.toString('base64')
 
-    res.headers.etag = responseEtag || etag(body)
+    res.headers.etag = responseEtag || JSON.parse(etag(body))
     delete res.headers['Last-Modified']
 
     if (requestEtag && requestEtag === res.headers.etag) {