Merge pull request #44 from oskarhane/1.0-bugs

Bug fixes and config exposure

Author: pontusmelke

src/v1/driver.js

@@ -53,7 +53,8 @@ class Driver {
     this._pool = new Pool(
       this._createConnection.bind(this),
       this._destroyConnection.bind(this),
-      this._validateConnection.bind(this)
+      this._validateConnection.bind(this),
+      config.connectionPoolSize
     );
   }
 

src/v1/internal/connector.js

@@ -42,7 +42,7 @@ else {
 let
 // Signature bytes for each message type
 INIT = 0x01,            // 0000 0001 // INIT <user_agent>
-ACK_FAILURE = 0x0D,     // 0000 1101 // ACK_FAILURE
+ACK_FAILURE = 0x0E,     // 0000 1110 // ACK_FAILURE
 RESET = 0x0F,           // 0000 1111 // RESET
 RUN = 0x10,             // 0001 0000 // RUN <statement> <parameters>
 DISCARD_ALL = 0x2F,     // 0010 1111 // DISCARD *

src/v1/internal/stream-observer.js

@@ -39,6 +39,7 @@ class StreamObserver {
     this._queuedRecords = [];
     this._tail = null;
     this._error = null;
+    this._hasFailed = false;
   }
 
   /**
@@ -87,6 +88,10 @@ class StreamObserver {
    * @param {Object} error - An error object
    */
   onError(error) {
+    if(this._hasFailed) {
+      return;
+    }
+    this._hasFailed = true;
     if( this._observer ) {
       if( this._observer.onError ) {
         this._observer.onError( error );

src/v1/session.js

@@ -87,7 +87,15 @@ class Session {
    * @return
    */
   close(cb=(()=>null)) {
-    this._onClose(cb);
+    if(this._onClose) {
+      try {
+        this._onClose(cb);
+      } finally {
+        this._onClose = null;
+      }
+    } else {
+      cb();
+    }
   }
 }
 

test/v1/session.test.js

@@ -19,6 +19,7 @@
 
 var neo4j = require("../../lib/v1");
 var StatementType = require("../../lib/v1/result-summary").statementType;
+var Session = require("../../lib/v1/session");
 
 describe('session', function() {
 
@@ -35,6 +36,18 @@ describe('session', function() {
     driver.close();
   });
 
+  it('close should be idempotent ', function(){
+    // Given
+    var counter = 0;
+    var _session = new Session(null, function(){
+      counter++;
+    });
+    _session.close();
+    expect(counter).toBe(1);
+    _session.close();
+    expect(counter).toBe(1);
+  })
+
   it('should expose basic run/subscribe ', function(done) {
     // Given