add tests, fix flawed logic

index.js

@@ -7,10 +7,48 @@ function md5(str) {
   return crypto.createHash('md5').update(str).digest('hex');
 }
 
+class Headers {
+  constructor(rawHeaders) {
+    this.rawHeaders = rawHeaders;
+  }
+
+  * entries() {
+    for (let entry of Object.entries(this.rawHeaders)) {
+      yield entry;
+    }
+  }
+
+  * keys() {
+    for (let key of Object.keys(this.rawHeaders)) {
+      yield key;
+    }
+  }
+
+  * values() {
+    for (let value of Object.values(this.rawHeaders)) {
+      yield value;
+    }
+  }
+
+  get(name) {
+    return this.rawHeaders[name.toLowerCase()] || null;
+  }
+
+  has(name) {
+    return !!this.get(name);
+  }
+}
+
 class Response {
-  constructor(raw, cacheFilePath) {
+  constructor(raw, cacheFilePath, fromCache) {
     Object.assign(this, raw);
     this.cacheFilePath = cacheFilePath;
+    this.headers = new Headers(raw.headers);
+    this.fromCache = fromCache;
+
+    if (this.bodyBuffer.type === 'Buffer') {
+      this.bodyBuffer = Buffer.from(this.bodyBuffer);
+    }
   }
 
   text() {
@@ -33,14 +71,16 @@ class Response {
 async function createRawResponse(fetchRes) {
   const buffer = await fetchRes.buffer();
 
+  const rawHeaders = Array.from(fetchRes.headers.entries())
+    .reduce((aggregate, entry) => ({ ...aggregate, [entry[0]]: entry[1] }), {});
+
   return {
     status: fetchRes.status,
     statusText: fetchRes.statusText,
     type: fetchRes.type,
     url: fetchRes.url,
-    useFinalURL: fetchRes.useFinalURL,
     ok: fetchRes.ok,
-    headers: fetchRes.headers,
+    headers: rawHeaders,
     redirected: fetchRes.redirected,
     bodyBuffer: buffer,
   };
@@ -52,17 +92,17 @@ async function getResponse(cacheDirPath, requestArguments) {
     ? ({ ...requestInit, body: typeof requestInit.body === 'object' ? requestInit.body.toString() : requestInit.body })
     : requestInit;
 
-  const cacheHash = md5(JSON.stringify([url, requestParams, ...rest]) + bodyFunctionName);
+  const cacheHash = md5(JSON.stringify([url, requestParams, ...rest]));
   const cachedFilePath = path.join(cacheDirPath, `${cacheHash}.json`);
 
   try {
     const rawResponse = JSON.parse(await fs.promises.readFile(cachedFilePath));
-    return new Response(rawResponse);
+    return new Response(rawResponse, cachedFilePath, true);
   } catch (err) {
     const fetchResponse = await fetch(...requestArguments);
-    const rawResponse = createRawResponse(fetchResponse);
+    const rawResponse = await createRawResponse(fetchResponse);
     await fs.promises.writeFile(cachedFilePath, JSON.stringify(rawResponse));
-    return new Response(rawResponse);
+    return new Response(rawResponse, cachedFilePath, false);
   }
 }