Merge pull request #52 from pontusmelke/1.0-connection-errors

Better handling for connection errors in driver

Author: oskarhane

src/v1/internal/ch-node.js

@@ -91,6 +91,7 @@ const TrustStrategy = {
         onSuccess();
       }
     });
+    socket.on('error', onFailure);
     return socket;
   },
   TRUST_ON_FIRST_USE : function( opts, onSuccess, onFailure ) {
@@ -139,13 +140,16 @@ const TrustStrategy = {
         }
       });
     });
+    socket.on('error', onFailure);
     return socket;
   }
 };
 
 function connect( opts, onSuccess, onFailure=(()=>null) ) {
   if( opts.encrypted === false ) {
-    return net.connect(opts.port, opts.host, onSuccess);
+    var conn = net.connect(opts.port, opts.host, onSuccess);
+    conn.on('error', onFailure);
+    return conn;
   } else if( TrustStrategy[opts.trust]) {
     return TrustStrategy[opts.trust](opts, onSuccess, onFailure);
   } else {

src/v1/internal/ch-websocket.js

@@ -57,6 +57,13 @@ class WebSocketChannel {
     this._ws.binaryType = "arraybuffer";
 
     let self = this;
+    //All connection errors are not sent to the error handler
+    //we must also check for dirty close calls
+    this._ws.onclose = function(e) {
+        if (!e.wasClean) {
+          self._handleConnectionError();
+        }
+    };
     this._ws.onopen = function() {
       // Drain all pending messages
       let pending = self._pending;

test/v1/driver.test.js

@@ -32,4 +32,19 @@ describe('driver', function() {
     expect( session ).not.toBeNull();
     driver.close();
   });
+
+  it('should handle connection errors', function(done) {
+    // Given
+    var driver = neo4j.driver("bolt://localhoste", neo4j.auth.basic("neo4j", "neo4j"));
+
+    // Expect
+    driver.onError = function (err) {
+      //the error message is different whether in browser or node
+      expect(err.message).not.toBeNull();
+      done();
+    };
+
+    // When
+    driver.session();
+  });
 });