only use IDB cursor for everything hack if creating the cursor errors.

pubkey · Jan 19, 2021 · 01ac9e9 · 01ac9e9
1 parent 811a1be
commit 01ac9e9
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 10 deletions.
diff --git a/dist/es/methods/indexed-db.js b/dist/es/methods/indexed-db.js
@@ -125,8 +125,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/dist/lib/browser.js b/dist/lib/browser.js
@@ -758,8 +758,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/dist/lib/browser.min.js b/dist/lib/browser.min.js
diff --git a/dist/lib/methods/indexed-db.js b/dist/lib/methods/indexed-db.js
@@ -125,8 +125,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/docs/e2e.js b/docs/e2e.js
@@ -749,8 +749,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/docs/iframe.js b/docs/iframe.js
@@ -749,8 +749,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/docs/index.js b/docs/index.js
@@ -749,8 +749,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/docs/leader-iframe.js b/docs/leader-iframe.js
@@ -749,8 +749,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/docs/worker.js b/docs/worker.js
@@ -749,8 +749,21 @@ function getAllMessages(db) {
 function getMessagesHigherThan(db, lastCursorId) {
   var objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
   var ret = [];
+
+  function openCursor() {
+    // Occasionally Safari will fail on IDBKeyRange.bound, this
+    // catches that error, having it open the cursor to the first
+    // item. When it gets data it will advance to the desired key.
+    try {
+      var keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+      return objectStore.openCursor(keyRangeValue);
+    } catch (e) {
+      return objectStore.openCursor();
+    }
+  }
+
   return new Promise(function (res) {
-    objectStore.openCursor().onsuccess = function (ev) {
+    openCursor().onsuccess = function (ev) {
       var cursor = ev.target.result;
 
       if (cursor) {

diff --git a/src/methods/indexed-db.js b/src/methods/indexed-db.js
@@ -102,8 +102,21 @@ export function getAllMessages(db) {
 export function getMessagesHigherThan(db, lastCursorId) {
     const objectStore = db.transaction(OBJECT_STORE_ID).objectStore(OBJECT_STORE_ID);
     const ret = [];
+
+    function openCursor() {
+        // Occasionally Safari will fail on IDBKeyRange.bound, this
+        // catches that error, having it open the cursor to the first
+        // item. When it gets data it will advance to the desired key.
+        try {
+            const keyRangeValue = IDBKeyRange.bound(lastCursorId + 1, Infinity);
+            return objectStore.openCursor(keyRangeValue);
+        } catch (e) {
+            return objectStore.openCursor();
+        }
+    }
+
     return new Promise(res => {
-        objectStore.openCursor().onsuccess = ev => {
+        openCursor().onsuccess = ev => {
             const cursor = ev.target.result;
             if (cursor) {
                 if (cursor.value.id < lastCursorId + 1) {