Merge pull request #183 from bookchin/master

v1.2.6

lib/network/index.js

@@ -158,17 +158,23 @@ Network.prototype._enterOverlay = function(callback) {
 
   function _trySeeds() {
     async.detectSeries(self._options.seeds, function(uri, next) {
-      self._logger.info('attemting to join network via %s', uri);
+      self._logger.info('attempting to join network via %s', uri);
       self.connect(uri, function(err) {
         if (err) {
           self._logger.warn('failed to connect to seed %s', uri);
+          next(false);
         } else {
           self._logger.info('connected to the storj network via %s', uri);
+          next(true);
         }
-
-        next(null, !err);
       });
-    }, callback);
+    }, function(result) {
+      if (!result) {
+        return callback(new Error('Failed to join the network'));
+      }
+
+      callback(null);
+    });
   }
 
   if (this._options.seeds.length) {
@@ -599,12 +605,12 @@ Network.prototype._findTunnel = function(neighbors, callback) {
     self._logger.info('requesting tunnelers from neighbor');
     self._transport.send(neighbor, message, function(err, resp) {
       if (err) {
-        return callback(null, false);
+        return callback(false);
       }
 
       tunnelers = tunnelers.concat(resp.result.tunnels);
 
-      callback(null, true);
+      callback(true);
     });
   }, function() {
     if (!tunnelers.length) {

lib/network/protocol.js

@@ -327,7 +327,7 @@ Protocol.prototype._askNeighborsForTunnels = function(relayers, callback) {
       }
     }), function(err, response) {
       if (err || !Array.isArray(response.result.tunnels)) {
-        return done(null, false);
+        return done(false);
       }
 
       if (response.result.tunnels && response.result.tunnels.length) {
@@ -338,10 +338,10 @@ Protocol.prototype._askNeighborsForTunnels = function(relayers, callback) {
             );
           }
         });
-        return done(null, true);
+        return done(true);
       }
 
-      done(null, false);
+      done(false);
     });
   }
 

lib/tunnel/gateway.js

@@ -161,12 +161,17 @@ TunnelGateway.prototype.open = function(callback) {
 
   if (callback) {
     this.once('open', callback);
+    this.once('error', callback);
   }
 
-  this._server.listen(this._port, function() {
+  this._websock.on('error', this._handleError.bind(this));
+
+  this._server.on('listening', function() {
     self._websock.on('connection', self._handleDataChannel.bind(self));
     self._onGatewayOpen();
   });
+
+  this._server.listen(this._port);
 };
 
 /**
@@ -258,6 +263,14 @@ TunnelGateway.prototype._handleDataChannel = function(socket) {
   });
 };
 
+/**
+ * Bubbles error events
+ * @private
+ */
+TunnelGateway.prototype._handleError = function() {
+  this.emit('error', new Error('Failed to open tunnel gateway'));
+};
+
 /**
  * Fired when server begins listening
  * @private

lib/tunnel/server.js

@@ -112,6 +112,7 @@ TunnelServer.prototype.createGateway = function(callback) {
     callback(null, gateway);
   });
 
+  gateway.on('error', callback);
   gateway.open();
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "storj",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "implementation of the storj protocol for node.js and the browser",
   "main": "index.js",
   "directories": {
@@ -62,7 +62,7 @@
     "ip": "^1.1.2",
     "jsen": "^0.6.0",
     "json-stable-stringify": "^1.0.1",
-    "kad": "^1.5.12",
+    "kad": "^1.5.13",
     "kad-quasar": "^0.1.3",
     "leveldown": "^1.4.6",
     "levelup": "^1.3.1",

test/tunnel/gateway.unit.js

@@ -155,6 +155,19 @@ describe('TunnelGateway', function() {
       after(gw.close.bind(gw));
     });
 
+    it('should emit an error if no callback is supplied', function(done) {
+      var gw = new TunnelGateway();
+      var _listen = sinon.stub(gw._server, 'listen', function() {
+        gw._server.emit('error', new Error('EADDRINUSE'));
+      });
+      gw.on('error', function(err) {
+        _listen.restore();
+        expect(err.message).to.equal('Failed to open tunnel gateway');
+        done();
+      });
+      gw.open();
+    });
+
   });
 
   describe('#close', function() {