fixup

Author: ronag

lib/cache/sqlite-cache-store.js

@@ -366,14 +366,14 @@ class SqliteCacheStore {
    */
   #findValue (key, canBeExpired = false) {
     const url = this.#makeValueUrl(key)
+    const { headers, method } = key
 
     /**
      * @type {SqliteStoreValue[]}
      */
-    const values = this.#getValuesQuery.all(url, key.method)
+    const values = this.#getValuesQuery.all(url, method)
 
     if (values.length === 0) {
-      // No responses, let's just return early
       return undefined
     }
 
@@ -386,16 +386,14 @@ class SqliteCacheStore {
       let matches = true
 
       if (value.vary) {
-        if (!key.headers) {
-          // Request doesn't have headers so it can't fulfill the vary
-          //  requirements no matter what, let's return early
+        if (!headers) {
           return undefined
         }
 
-        value.vary = JSON.parse(value.vary)
+        const vary = JSON.parse(value.vary)
 
-        for (const header in value.vary) {
-          if (key.headers[header] !== value.vary[header]) {
+        for (const header in vary) {
+          if (headerValueEquals(headers[header], vary[header])) {
             matches = false
             break
           }
@@ -411,6 +409,30 @@ class SqliteCacheStore {
   }
 }
 
+/**
+ * @param {string|string[]|null|undefined} lhs
+ * @param {string|string[]|null|undefined} rhs
+ * @returns {boolean}
+ */
+function headerValueEquals (lhs, rhs) {
+  if (Array.isArray(lhs) && Array.isArray(rhs)) {
+    if (lhs.length !== rhs.length) {
+      return false
+    }
+
+    // TODO (fix): This should also match out of order?
+    for (let i = 0; i < lhs.length; i++) {
+      if (lhs[i] !== rhs[i]) {
+        return false
+      }
+    }
+
+    return true
+  }
+
+  return lhs === rhs
+}
+
 /**
  * @param {Buffer[]} buffers
  * @returns {string[]}