Merge pull request #50 from wei-lee/indexdb-open-error

Wei Li · web-flow · commit 10e532dd7752 · 2019-11-08T09:29:09.000Z
Indexdb open error
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog - fh-sync-js lib
 
+## 1.4.1 - 2019-11-07
+## Change
+- Emit an error if it takes too long to open index-db.
 
 ## 1.4.0 - 2019-04-15
 ## Change
diff --git a/example/index.html b/example/index.html
@@ -5,7 +5,7 @@
     crossorigin="anonymous"></script>
   <!-- TODO improve example to use local distribution build !-->
   <script src="../dist/fh-sync.js" type="text/javascript"></script>
-  <script src="./sync.js" type="text/javascript"></script>
+  <script src="./example/sync.js" type="text/javascript"></script>
 </head>
 <body>
 Messages will be printed to console.
diff --git a/example/sync.js b/example/sync.js
@@ -6,7 +6,7 @@ $fh.sync.init({
     "cloudUrl": "http://localhost:3000",
     "sync_frequency": 10,
     "do_console_log": true,
-    "storage_strategy": "dom"
+    "storage_strategy": "indexed-db"
 });
 
 //provide listeners for notifications.
diff --git a/libs/lawnchair/lawnchairIndexDbAdapter.js b/libs/lawnchair/lawnchairIndexDbAdapter.js
@@ -31,7 +31,16 @@ module.exports = function (Lawnchair) {
         //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);
@@ -41,6 +50,7 @@ module.exports = function (Lawnchair) {
         };
 
         request.onsuccess = function (event) {
+          clearTimeout(to);
           self.db = request.result;
 
           if (self.db.version != "2.0") {
@@ -72,7 +82,11 @@ module.exports = function (Lawnchair) {
           }
         };
 
-        request.onerror = fail;
+        request.onerror = function(){
+          clearTimeout(to);
+          var error = request.error;
+          fail(error);
+        };
       },
 
       save:function(obj, callback) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fh-sync-js",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Javascript client for fh-sync offline synchronization library",
   "main": "src/index.js",
   "types": "./fh-sync-js.d.ts",
diff --git a/src/sync-client.js b/src/sync-client.js
@@ -974,9 +974,11 @@ function newClient(id) {
     },
     
     getStorageAdapter: function (dataset_id, isSave, cb) {
-      var onFail = function(msg, err){
-        var errMsg = (isSave?'save to': 'load from' ) + ' local storage failed msg: ' + msg + ' err: ' + err;
-        self.doNotify(dataset_id, null, self.notifications.CLIENT_STORAGE_FAILED, errMsg);
+      var onFail = function(err){
+        err = err || new Error('storage error');
+        var msg = err.message || err;
+        var errMsg = (isSave?'save to': 'load from' ) + ' local storage failed msg: ' + msg;
+        self.doNotify(dataset_id, null, self.notifications.CLIENT_STORAGE_FAILED, msg);
         self.consoleLog(errMsg);
       };
      

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "fh-sync-js",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.4.1",`
`4`	`4`	`"description": "Javascript client for fh-sync offline synchronization library",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"types": "./fh-sync-js.d.ts",`