Merge pull request #65 from pontusmelke/1.0-kill-sessions

sync after reset on session.close

Author: Zhen Li

lib/v1/driver.js

@@ -158,10 +158,9 @@ var Driver = (function () {
         // wrapper around Connection anyway, so it makes little difference.
 
         // Queue up a 'reset', to ensure the next user gets a clean
-        // session to work with. No need to flush, this will get sent
-        // along with whatever the next thing the user wants to do with
-        // this session ends up being, so we save the network round trip.
+        // session to work with.
         conn.reset();
+        conn.sync();
 
         // Return connection to the pool
         conn._release();

lib/v1/internal/connector.js

@@ -403,7 +403,19 @@ var Connection = (function () {
   }, {
     key: "reset",
     value: function reset(observer) {
-      this._queueObserver(observer);
+      this._isHandlingFailure = true;
+      var self = this;
+      var wrappedObs = {
+        onNext: observer ? observer.onNext : NO_OP,
+        onError: observer ? observer.onError : NO_OP,
+        onCompleted: function onCompleted() {
+          self._isHandlingFailure = false;
+          if (observer) {
+            observer.onCompleted();
+          }
+        }
+      };
+      this._queueObserver(wrappedObs);
       this._packer.packStruct(RESET);
       this._chunker.messageBoundary();
     }

src/v1/driver.js

@@ -118,10 +118,9 @@ class Driver {
       // wrapper around Connection anyway, so it makes little difference.
 
       // Queue up a 'reset', to ensure the next user gets a clean
-      // session to work with. No need to flush, this will get sent
-      // along with whatever the next thing the user wants to do with
-      // this session ends up being, so we save the network round trip.
+      // session to work with.
       conn.reset();
+      conn.sync();
 
       // Return connection to the pool
       conn._release();

src/v1/internal/connector.js

@@ -185,6 +185,8 @@ class Connection {
     this._unpacker.structMappers[UNBOUND_RELATIONSHIP] = _mappers.unboundRel;
     this._unpacker.structMappers[PATH] = _mappers.path;
 
+
+
     let self = this;
     // TODO: Using `onmessage` and `onerror` came from the WebSocket API,
     // it reads poorly and has several annoying drawbacks. Swap to having
@@ -341,7 +343,19 @@ class Connection {
 
   /** Queue a RESET-message to be sent to the database */
   reset( observer ) {
-    this._queueObserver(observer);
+    this._isHandlingFailure = true;
+    let self = this;
+    let wrappedObs = {
+      onNext: observer ? observer.onNext : NO_OP,
+      onError: observer ? observer.onError : NO_OP,
+      onCompleted: () => {
+        self._isHandlingFailure = false;
+        if (observer) {
+          observer.onCompleted();
+        }
+      }
+    };
+    this._queueObserver(wrappedObs);
     this._packer.packStruct( RESET );
     this._chunker.messageBoundary();
   }