fix: upgrade level libs to resolve node 10 failure

License: MIT
Signed-off-by: Jacob Heun <jacobheun@gmail.com>

Author: jacobheun

.DS_Store

@@ -3,6 +3,9 @@
   "version": "0.7.0",
   "description": "Datastore implementation with level(up|down) backend",
   "main": "src/index.js",
+  "browser": {
+    "leveldown": "level-js"
+  },
   "scripts": {
     "lint": "aegir lint",
     "build": "aegir build",
@@ -39,9 +42,9 @@
   "dependencies": {
     "datastore-core": "~0.4.0",
     "interface-datastore": "~0.4.1",
-    "level-js": "^2.2.4",
-    "leveldown": "^1.9.0",
-    "levelup": "^1.3.9",
+    "level-js": "github:timkuijsten/level.js#idbunwrapper",
+    "leveldown": "^3.0.2",
+    "levelup": "^2.0.2",
     "pull-stream": "^3.6.1"
   },
   "devDependencies": {

package.json

@@ -24,10 +24,24 @@ class LevelDatastore {
   /* :: db: levelup */
 
   constructor (path /* : string */, opts /* : ?LevelOptions */) {
-    this.db = levelup(path, Object.assign({}, opts, {
-      compression: false, // same default as go
-      valueEncoding: 'binary'
-    }))
+    // Default to leveldown db
+    const database = opts && opts.db ? opts.db : require('leveldown')
+    delete opts.db
+
+    this.db = levelup(
+      database(
+        path,
+        Object.assign({}, opts, {
+          compression: false, // same default as go
+          valueEncoding: 'binary'
+        })
+      ), (err) => {
+        // Prevent an uncaught exception error on duplicate locks
+        if (err) {
+          throw err
+        }
+      }
+    )
   }
 
   open (callback /* : Callback<void> */) /* : void */ {
@@ -58,7 +72,10 @@ class LevelDatastore {
   }
 
   delete (key /* : Key */, callback /* : Callback<void> */) /* : void */ {
-    this.db.del(key.toString(), callback)
+    this.db.del(key.toString(), (err) => {
+      // Avoid level passing additional arguments to callback, we dont need them
+      callback(err)
+    })
   }
 
   close (callback /* : Callback<void> */) /* : void */ {

src/index.js

@@ -5,7 +5,9 @@
 const each = require('async/each')
 const MountStore = require('datastore-core').MountDatastore
 const Key = require('interface-datastore').Key
-const leveljs = require('level-js')
+
+// leveldown will be swapped for level-js
+const leveljs = require('leveldown')
 
 const LevelStore = require('../src')
 

test/browser.js

@@ -21,7 +21,9 @@ describe('LevelDatastore', () => {
     const dir = utils.tmpdir()
     require('interface-datastore/src/tests')({
       setup (callback) {
-        callback(null, new LevelStore(dir))
+        callback(null, new LevelStore(dir, {
+          db: require('leveldown')
+        }))
       },
       teardown (callback) {
         rimraf(dir, callback)
@@ -40,13 +42,19 @@ describe('LevelDatastore', () => {
       setup (callback) {
         callback(null, new MountStore([{
           prefix: new Key('/a'),
-          datastore: new LevelStore(dirs[0])
+          datastore: new LevelStore(dirs[0], {
+            db: require('leveldown')
+          })
         }, {
           prefix: new Key('/q'),
-          datastore: new LevelStore(dirs[1])
+          datastore: new LevelStore(dirs[1], {
+            db: require('leveldown')
+          })
         }, {
           prefix: new Key('/z'),
-          datastore: new LevelStore(dirs[2])
+          datastore: new LevelStore(dirs[2], {
+            db: require('leveldown')
+          })
         }]))
       },
       teardown (callback) {
@@ -56,7 +64,9 @@ describe('LevelDatastore', () => {
   })
 
   it.skip('interop with go', (done) => {
-    const store = new LevelStore(path.join(__dirname, 'test-repo', 'datastore'))
+    const store = new LevelStore(path.join(__dirname, 'test-repo', 'datastore'), {
+      db: require('leveldown')
+    })
 
     pull(
       store.query({}),