error handler for timeout

evheniy · Feb 28, 2017 · 4e26e6d · 4e26e6d
1 parent d28921a
commit 4e26e6d
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 14 deletions.
diff --git a/index.js b/index.js
@@ -19,6 +19,7 @@ module.exports = class {
                 },
                 async getCacheDate() {},
                 async updateCacheDate() {},
+                timeoutErrorHandler() {},
                 ttl: 86400, // 24 hours
             },
             config
@@ -48,25 +49,31 @@ module.exports = class {
                     const timeNow = new Date().valueOf();
                     debug('Time now: %s', timeNow);
 
-                    const time = await this.config.getCacheDate();
-                    debug('Cached time: %s', time);
+                    try {
+                        const time = await this.config.getCacheDate();
+                        debug('Cached time: %s', time);
 
-                    const timeWithTTL = ((parseInt(time, 10) || new Date().valueOf()) + parseInt(this.config.ttl, 10));
-                    debug('Time with TTL: %s', timeWithTTL);
+                        const timeWithTTL = ((parseInt(time, 10) || new Date().valueOf()) + parseInt(this.config.ttl, 10));
+                        debug('Time with TTL: %s', timeWithTTL);
 
-                    const isDateActual = timeWithTTL > new Date().valueOf();
-                    debug(isDateActual);
+                        const isDateActual = timeWithTTL > new Date().valueOf();
+                        debug(isDateActual);
 
-                    if (!isDateActual) {
+                        if (!isDateActual) {
 
-                        debug('Updating data');
-                        await this.config.setDataToCache(
-                            await this.config.getDataFromSource()
-                        );
+                            debug('Updating data');
+                            await this.config.setDataToCache(
+                                await this.config.getDataFromSource()
+                            );
 
-                        debug('Updating date');
-                        await this.config.updateCacheDate();
+                            debug('Updating date');
+                            await this.config.updateCacheDate();
+                        }
+
+                    } catch (error) {
+                        this.config.timeoutErrorHandler(error);
                     }
+
                 },
                 0
             );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "offline-first-storage",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Offline first storage",
   "main": "index.js",
   "scripts": {

diff --git a/tests/index.js b/tests/index.js
@@ -249,4 +249,115 @@ describe('Offline first storage', () => {
         expect(data).to.be.equal('test');
     });
 
+    it('should test flow with timeoutErrorHandler', async () => {
+        let isGetDataFromCache = false;
+        let isGetDataFromSource = false;
+        let isSetDataToCache = false;
+        let isGetCacheDate = false;
+        let isUpdateCacheDate = false;
+        let isTimeoutErrorHandler = false;
+
+        const timeNow = new Date().valueOf().toString(10);
+
+        await redis.set(key, 'test');
+        await redis.set(`date_${key}`, timeNow);
+
+        const ofs = new OFS({
+            async getDataFromSource() {
+                isGetDataFromSource = true;
+                return 'test';
+            },
+            async getDataFromCache() {
+                isGetDataFromCache = true;
+                return redis.get(key);
+            },
+
+            async setDataToCache(data) {
+                isSetDataToCache = true;
+                await redis.set(key, data);
+            },
+            async getCacheDate() {
+                isGetCacheDate = true;
+                return redis.get(`date_${key}`);
+            },
+            async updateCacheDate() {
+                isUpdateCacheDate = true;
+                await redis.set(`date_${key}`, timeNow);
+                throw new Error('test');
+            },
+            timeoutErrorHandler() {
+                isTimeoutErrorHandler = true;
+            },
+            ttl: 0,
+        });
+
+        const data = await ofs.getData();
+
+        await pause(100);
+
+        expect(isGetDataFromCache).is.true;
+        expect(isGetDataFromSource).is.true;
+        expect(isSetDataToCache).is.true;
+        expect(isGetCacheDate).is.true;
+        expect(isUpdateCacheDate).is.true;
+        expect(isTimeoutErrorHandler).is.true;
+
+        expect(data).to.be.equal('test');
+    });
+
+    it('should test flow with timeoutErrorHandler without time record', async () => {
+        let isGetDataFromCache = false;
+        let isGetDataFromSource = false;
+        let isSetDataToCache = false;
+        let isGetCacheDate = false;
+        let isUpdateCacheDate = false;
+        let isTimeoutErrorHandler = false;
+
+        const timeNow = new Date().valueOf().toString(10);
+
+        await redis.set(key, 'test');
+
+        const ofs = new OFS({
+            async getDataFromSource() {
+                isGetDataFromSource = true;
+                return 'test';
+            },
+            async getDataFromCache() {
+                isGetDataFromCache = true;
+                return redis.get(key);
+            },
+
+            async setDataToCache(data) {
+                isSetDataToCache = true;
+                await redis.set(key, data);
+            },
+            async getCacheDate() {
+                isGetCacheDate = true;
+                return redis.get(`date_${key}`);
+            },
+            async updateCacheDate() {
+                isUpdateCacheDate = true;
+                await redis.set(`date_${key}`, timeNow);
+                throw new Error('test');
+            },
+            timeoutErrorHandler() {
+                isTimeoutErrorHandler = true;
+            },
+            ttl: 0,
+        });
+
+        const data = await ofs.getData();
+
+        await pause(100);
+
+        expect(isGetDataFromCache).is.true;
+        expect(isGetDataFromSource).is.true;
+        expect(isSetDataToCache).is.true;
+        expect(isGetCacheDate).is.true;
+        expect(isUpdateCacheDate).is.true;
+        expect(isTimeoutErrorHandler).is.true;
+
+        expect(data).to.be.equal('test');
+    });
+
 });