Merge pull request #13 from jpodwys/localstorage-fix

Fix a localstorage quota bug

cacheModule.js

@@ -34,6 +34,7 @@ function cacheModule(config){
     refreshKeys: {}
   };
   var storageKey;
+  var interval;
 
   setupBrowserStorage();
   log(false, 'Cache-module client created with the following defaults:', {type: self.type, defaultExpiration: self.defaultExpiration, verbose: self.verbose, readOnly: self.readOnly});
@@ -164,7 +165,7 @@ function cacheModule(config){
       delete cache.db[keys];
       delete cache.expirations[keys];
       delete cache.refreshKeys[keys];
-      if(cb) cb(null, 1); 
+      if(cb) cb(null, 1);
     }
     overwriteBrowserStorage();
   }
@@ -180,6 +181,8 @@ function cacheModule(config){
     cache.refreshKeys = {};
     if(cb) cb();
     overwriteBrowserStorage();
+    if(interval) clearInterval(interval);
+    backgroundRefreshEnabled = false;
   }
 
   /**
@@ -217,8 +220,8 @@ function cacheModule(config){
       var db = cache;
       try {
         db = JSON.stringify(db);
+        store.setItem(storageKey, db);
       } catch (err) { /* Do nothing */ }
-      store.setItem(storageKey, db);
     }
   }
 
@@ -252,7 +255,7 @@ function cacheModule(config){
           throw new Error('BACKGROUND_REFRESH_INTERVAL_EXCEPTION: backgroundRefreshInterval cannot be greater than backgroundRefreshMinTtl.');
         }
       }
-      setInterval(backgroundRefresh, self.backgroundRefreshInterval);
+      interval = setInterval(backgroundRefresh, self.backgroundRefreshInterval);
     }
   }
 

package.json

@@ -1,11 +1,11 @@
 {
   "name": "cache-service-cache-module",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A cache plugin for cache-service.",
   "main": "cacheModule.js",
   "devDependencies": {
-    "mocha": "2.2.4",
     "expect": "1.6.0",
+    "mocha": "^5.2.0",
     "mock-localstorage": "0.1.3"
   },
   "scripts": {

test/server/cache-module.js

@@ -15,6 +15,10 @@ beforeEach(function(){
   cacheModule.flush();
 });
 
+after(function(){
+  cacheModule.flush();
+});
+
 describe('cacheModule Tests', function () {
   it('Getting absent key should return null', function (done) {
     cacheModule.get(key, function (err, result){
@@ -92,7 +96,7 @@ describe('cacheModule Tests', function () {
     var refresh = function(key, cb){
       cb(null, 1);
     }
-    cacheModule.set(key, value, 1, refresh, function (err, result){ 
+    cacheModule.set(key, value, 1, refresh, function (err, result){
       setTimeout(function(){
         cacheModule.get(key, function (err, response){
           expect(response).toBe(1);