Also catch exceptions in user callbacks for key/value streams.

nimiq · Mar 15, 2018 · ffcde0f · ffcde0f
1 parent 9ca7f30
commit ffcde0f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jungle-db",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "main": "dist/node.js",
   "private": true,
   "scripts": {

diff --git a/src/main/platform/browser/IDBBackend.js b/src/main/platform/browser/IDBBackend.js
@@ -242,10 +242,14 @@ class IDBBackend {
             openCursorRequest.onsuccess = event => {
                 const cursor = event.target.result;
                 if (cursor) {
-                    if (callback(cursor.primaryKey)) {
-                        cursor.continue();
-                    } else {
-                        resolve();
+                    try {
+                        if (callback(cursor.primaryKey)) {
+                            cursor.continue();
+                        } else {
+                            resolve();
+                        }
+                    } catch (e) {
+                        reject(e);
                     }
                 } else {
                     resolve();

diff --git a/src/main/platform/browser/PersistentIndex.js b/src/main/platform/browser/PersistentIndex.js
@@ -72,7 +72,11 @@ class PersistentIndex {
             request.onsuccess = event => {
                 const cursor = event.target.result;
                 if (cursor) {
-                    results.push(this._objectStore.decode(cursor.value, cursor.primaryKey));
+                    try {
+                        results.push(this._objectStore.decode(cursor.value, cursor.primaryKey));
+                    } catch (e) {
+                        reject(e);
+                    }
                     cursor.continue();
                 } else {
                     resolve(results);
@@ -130,7 +134,11 @@ class PersistentIndex {
                 }
                 // Only iterate until key changes.
                 if (cursor && maxKey === cursor.key) {
-                    results.push(this._objectStore.decode(cursor.value, cursor.primaryKey));
+                    try {
+                        results.push(this._objectStore.decode(cursor.value, cursor.primaryKey));
+                    } catch (e) {
+                        reject(e);
+                    }
                     cursor.continue();
                 } else {
                     resolve(results);
@@ -193,7 +201,11 @@ class PersistentIndex {
                 }
                 // Only iterate until key changes.
                 if (cursor && maxKey === cursor.key) {
-                    results.push(this._objectStore.decode(cursor.value, cursor.primaryKey));
+                    try {
+                        results.push(this._objectStore.decode(cursor.value, cursor.primaryKey));
+                    } catch (e) {
+                        reject(e);
+                    }
                     cursor.continue();
                 } else {
                     resolve(results);

diff --git a/src/main/platform/nodejs/LevelDBBackend.js b/src/main/platform/nodejs/LevelDBBackend.js
@@ -273,10 +273,14 @@ class LevelDBBackend {
             const stream = this._dbBackend.createReadStream(LevelDBTools.convertKeyRange(query, { 'values': false, 'keys': true, 'reverse': !ascending }));
             let stopped = false;
             stream.on('data', data => {
-                if (!callback(data)) {
-                    stopped = true;
-                    stream.pause();
-                    stream.destroy();
+                try {
+                    if (!callback(data)) {
+                        stopped = true;
+                        stream.pause();
+                        stream.destroy();
+                    }
+                } catch (e) {
+                    error(e);
                 }
             })
             .on('error', err => {