Upgrade

Author: vweevers

index.js

@@ -32,28 +32,19 @@ module.exports = function (dir, opts) {
         pump(socket, client.createRpcStream({ref: socket}), socket, function () {
             if (!client.isOpen()) return;
 
-            var db = level(dir, opts);
+            var db = level(dir, opts, onopen);
 
-            db.on('error', onerror);
-            db.on('open', onopen);
-
-            function onerror (err) {
-                db.removeListener('open', onopen);
-                if (err.type === 'OpenError') {
+            function onopen (err) {
+                if (err) {
                     if (connected) return tryConnect();
-                    setTimeout(tryConnect, 100);
+                    return setTimeout(tryConnect, 100);
                 }
-            }
 
-            function onopen () {
-                db.removeListener('error', onerror);
                 fs.unlink(sockPath, function (err) {
                     if (err && err.code !== 'ENOENT') return db.emit('error', err);
                     if (!client.isOpen()) return;
 
                     var sockets = [];
-                    var down = client.db;
-
                     var server = net.createServer(function (sock) {
                         if (sock.unref) sock.unref();
                         sockets.push(sock);
@@ -62,29 +53,27 @@ module.exports = function (dir, opts) {
                         });
                     });
 
-                    client.db = db.db;
                     client.close = shutdown;
                     client.emit('leader');
-                    down.forward(db.db);
+                    client.forward(db);
 
                     server.listen(sockPath, onlistening);
 
                     function shutdown (cb) {
                         sockets.forEach(function (sock) {
                             sock.destroy();
                         });
-                        server.on('close', function () {
+                        server.close(function () {
                             db.close(cb);
                         });
-                        server.close();
                     }
 
                     function onlistening () {
                         if (server.unref) server.unref();
-                        if (down.isFlushed()) return;
+                        if (client.isFlushed()) return;
 
                         var sock = net.connect(sockPath);
-                        pump(sock, down.createRpcStream(), sock);
+                        pump(sock, client.createRpcStream(), sock);
                         client.once('flush', function () {
                             sock.destroy();
                         });

package.json

@@ -5,15 +5,15 @@
   "main": "index.js",
   "dependencies": {
     "has": "^1.0.0",
-    "level": "^1.4.0",
-    "multileveldown": "^2.1.1",
-    "pump": "^1.0.0"
+    "level": "^6.0.0",
+    "multileveldown": "^3.0.0",
+    "pump": "^3.0.0"
   },
   "devDependencies": {
-    "tape": "^3.0.0",
-    "bytewise": "~0.7.1",
+    "bytewise": "^1.1.0",
     "level-sublevel": "^6.3.11",
-    "osenv": "~0.1.0"
+    "osenv": "~0.1.0",
+    "tape": "^4.11.0"
   },
   "scripts": {
     "test": "tape test/*.js"