Merge pull request #295 from feedhenry/update-sync-js

fix indexdb issue with sync

Author: Wei Li

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog - FeedHenry Javascript SDK
+## 3.1.1 - 2019-11-08
+### Change
+- Upgrade version of fh-sync-js from 1.4.0 to 1.4.2
+- Update lawnchair changes from [email protected]
 
 ## 3.1.0 - 2019-04-15
 ### Change

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "fh-js-sdk",
-  "version": "3.0.4",
+  "version": "3.1.1",
   "homepage": "https://github.com/feedhenry/fh-js-sdk",
   "authors": [
     "[email protected]"

libs/lawnchair/lawnchairIndexDbAdapter.js

@@ -12,7 +12,7 @@ Lawnchair.adapter('indexed-db', (function(){
 
   return {
     valid: function () { return !!getIDB(); },
-
+    
     close: function () {
       if (this.db) {
         this.db.close();
@@ -30,7 +30,16 @@ Lawnchair.adapter('indexed-db', (function(){
       //FEEDHENRY CHANGE TO ALLOW ERROR CALLBACK
       if(options && 'function' === typeof options.fail) fail = options.fail
       //END CHANGE
+      
+      var to = setTimeout(function(){
+        if (request.readyState != 'done') {
+          console.error('opendb request is still not ready. current readyState: ' + request.readyState + '. Returning error.');
+          return fail(new Error('OPEN_DB_ERROR'));
+        }
+      }, 2000);
+
       request.onupgradeneeded = function (event) {
+        clearTimeout(to);
         self.store = request.result.createObjectStore("teststore", { autoIncrement: true });
         for (var i = 0; i < self.waiting.length; i++) {
           self.waiting[i].call(self);
@@ -40,6 +49,7 @@ Lawnchair.adapter('indexed-db', (function(){
       };
 
       request.onsuccess = function (event) {
+        clearTimeout(to);
         self.db = request.result;
 
         if (self.db.version != "2.0") {
@@ -71,7 +81,11 @@ Lawnchair.adapter('indexed-db', (function(){
         }
       };
 
-      request.onerror = fail;
+      request.onerror = function(){
+        clearTimeout(to);
+        var error = request.error;
+        fail(error);
+      };
     },
 
     save:function(obj, callback) {