Fixing tests and bugs related to consecutiveErrors

andrewshell · Apr 3, 2023 · ff54184 · ff54184
1 parent 191998e
commit ff54184
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 860 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # cacheism
 Simple caching library 
 
+[![Node.js CI](https://github.com/andrewshell/cacheism/actions/workflows/node.js.yml/badge.svg)](https://github.com/andrewshell/cacheism/actions/workflows/node.js.yml)
+
 ## Overview
 
 The goal of cacheism is to wrap an async function with caching logic where we
@@ -72,13 +74,13 @@ Hit {
   version: 3,
   cacheName: '-internal/hoopla',
   cached: true,
-  created: 2022-04-22T21:05:14.094Z,
+  created: 2023-04-02T22:00:49.320Z,
   data: { message: 'Hoopla!' },
   error: Error: Death
-      at /Users/andrewshell/code/personal/test-cacheism/index.js:8:15
-      at Cacheism.go (/Users/andrewshell/code/personal/cacheism/lib/cacheism.js:29:30)
-      at async run (/Users/andrewshell/code/personal/test-cacheism/index.js:7:13),
-  errorTime: 2022-04-22T21:30:56.275Z,
+      at /Users/andrewshell/code/test-cacheism/index.js:9:19
+      at Cacheism.go (/Users/andrewshell/code/cacheism/lib/cacheism.js:30:30)
+      at async run (/Users/andrewshell/code/test-cacheism/index.js:7:18),
+  errorTime: 2023-04-02T22:00:49.928Z,
   consecutiveErrors: 1,
   etag: '"15-QcHvuZdyxCmLJ4zoYIPsP6pkNoM"',
   isHit: true,
@@ -100,12 +102,12 @@ Miss {
   version: 3,
   cacheName: '-internal/hoopla',
   cached: false,
-  created: 2022-04-22T21:30:56.275Z,
+  created: 2023-04-02T22:02:30.294Z,
   data: null,
   error: Error: Missing cache
-      at Cacheism.go (/Users/andrewshell/code/personal/cacheism/lib/cacheism.js:27:19)
-      at async run (/Users/andrewshell/code/personal/test-cacheism/index.js:7:18),
-  errorTime: 2022-04-22T21:30:56.275Z,
+      at Cacheism.go (/Users/andrewshell/code/cacheism/lib/cacheism.js:28:19)
+      at async run (/Users/andrewshell/code/test-cacheism/index.js:7:18),
+  errorTime: 2023-04-02T22:02:30.294Z,
   consecutiveErrors: 1,
   etag: null,
   isHit: false,

diff --git a/lib/cacheism.js b/lib/cacheism.js
@@ -22,7 +22,7 @@ Cacheism.prototype.go = async function (cacheDomain, cachePath, status, callback
 
     try {
 
-        if (status >= this.status.preferCache && hasCache) {
+        if (status >= this.status.preferCache && hasCache && existing.isHit) {
             response = existing;
         } else if (status === this.status.onlyCache) {
             throw new Error('Missing cache');
@@ -37,11 +37,15 @@ Cacheism.prototype.go = async function (cacheDomain, cachePath, status, callback
 
         if (status >= this.status.cacheOnFail && hasCache) {
             response = existing;
-            response.error = err;
+            response.error = err.toString();
             response.errorTime = new Date();
             response.consecutiveErrors++;
         } else {
-            response = new common.Miss(name, err, existing.consecutiveErrors + 1);
+            response = new common.Miss(
+                name,
+                err.toString(),
+                existing.consecutiveErrors + 1
+            );
         }
 
     }

diff --git a/lib/common.js b/lib/common.js
@@ -70,9 +70,10 @@ class Data {
             response = new Hit(this.cacheName, this.data, this.etag);
             response.cached = true;
             response.created = this.created;
+            response.consecutiveErrors = this.consecutiveErrors;
         } else {
             response = new Miss(this.cacheName, this.error, this.consecutiveErrors);
-            response.cached = true;
+            response.cached = false;
             response.created = this.created;
             response.errorTime = this.errorTime;
         }
@@ -87,7 +88,7 @@ class Data {
             cacheName: this.cacheName,
             created: this.created,
             data: this.data,
-            error: null == this.error ? null : this.error.toString(),
+            error: this.error,
             errorTime: this.errorTime,
             consecutiveErrors: this.consecutiveErrors,
             etag: this.etag,