Upgrde to neo4j-driver@1.0.1

Author: oskarhane

app/components/neo4j-driver/.bower.json

@@ -37,15 +37,15 @@
     "url": "https://github.com/neo4j/neo4j-javascript-driver.git"
   },
   "homepage": "https://github.com/neo4j/neo4j-javascript-driver",
-  "version": "1.0.0",
-  "_release": "1.0.0",
+  "version": "1.0.1",
+  "_release": "1.0.1",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.0",
-    "commit": "21c4ba839f6ad8e0926cf25cab9e1e72b3c0b8d1"
+    "tag": "1.0.1",
+    "commit": "0d1c7826487d0b6b3bf9cbba19ae14fc3455f5db"
   },
   "_source": "https://github.com/neo4j/neo4j-javascript-driver.git",
-  "_target": "^1.0.0",
+  "_target": "^1.0.1",
   "_originalSource": "neo4j-driver",
   "_direct": true
 }

app/components/neo4j-driver/lib/browser/neo4j-web.js

@@ -24999,10 +24999,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();
@@ -27577,8 +27576,9 @@ var Chunker = (function (_buf$BaseBuffer) {
   }, {
     key: 'putBytes',
     value: function putBytes(position, data) {
-      // TODO: If data is larger than our chunk size or so, we're very likely better off just passing this buffer on rather than doing the copy here
-      // TODO: *however* note that we need some way to find out when the data has been written (and thus the buffer can be re-used) if we take that approach
+      // TODO: If data is larger than our chunk size or so, we're very likely better off just passing this buffer on
+      // rather than doing the copy here TODO: *however* note that we need some way to find out when the data has been
+      // written (and thus the buffer can be re-used) if we take that approach
       while (data.remaining() > 0) {
         // Ensure there is an open chunk, and that it has at least one byte of space left
         this._ensure(1);
@@ -27609,10 +27609,10 @@ var Chunker = (function (_buf$BaseBuffer) {
       return this;
     }
 
-    /** 
+    /**
      * Bolt messages are encoded in one or more chunks, and the boundary between two messages
      * is encoded as a 0-length chunk, `00 00`. This inserts such a message boundary, closing
-     * any currently open chunk as needed 
+     * any currently open chunk as needed
      */
   }, {
     key: 'messageBoundary',
@@ -28148,7 +28148,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();
     }
@@ -29027,10 +29039,10 @@ try {
         if (buffer instanceof _buf2['default'].NodeBuffer) {
           var start = buffer.position,
               end = start + length;
-          buffer.position = end;
+          buffer.position = Math.min(end, buffer.length);
           return buffer._buffer.toString('utf8', start, end);
         } else if (buffer instanceof _buf2['default'].CombinedBuffer) {
-          var out = streamDecodeCombinedBuffer(buffer._buffers, length, function (partBuffer) {
+          var out = streamDecodeCombinedBuffer(buffer, length, function (partBuffer) {
             return decoder.write(partBuffer._buffer);
           }, function () {
             return decoder.end();
@@ -29059,14 +29071,14 @@ try {
       },
       "decode": function decode(buffer, length) {
         if (buffer instanceof _buf2['default'].HeapBuffer) {
-          return decoder.decode(buffer.readView(length));
+          return decoder.decode(buffer.readView(Math.min(length, buffer.length - buffer.position)));
         } else {
           // Decoding combined buffer is complicated. For simplicity, for now,
           // we simply copy the combined buffer into a regular buffer and decode that.
           var tmpBuf = _buf2['default'].alloc(length);
           for (var i = 0; i < length; i++) {
             tmpBuf.writeUInt8(buffer.readUInt8());
-          };
+          }
           tmpBuf.reset();
           return decoder.decode(tmpBuf.readView(length));
         }
@@ -29077,20 +29089,24 @@ try {
 
 var streamDecodeCombinedBuffer = function streamDecodeCombinedBuffer(combinedBuffers, length, decodeFn, endFn) {
   var remainingBytesToRead = length;
+  var position = combinedBuffers.position;
+  combinedBuffers._updatePos(Math.min(length, combinedBuffers.length - position));
   // Reduce CombinedBuffers to a decoded string
-  var out = combinedBuffers.reduce(function (last, partBuffer) {
+  var out = combinedBuffers._buffers.reduce(function (last, partBuffer) {
     if (remainingBytesToRead <= 0) {
       return last;
-    }
-    if (partBuffer.length > remainingBytesToRead) {
-      // When we don't want the whole buffer
-      var lastSlice = partBuffer.readSlice(remainingBytesToRead);
-      partBuffer._updatePos(remainingBytesToRead);
-      remainingBytesToRead = 0;
+    } else if (position >= partBuffer.length) {
+      position -= partBuffer.length;
+      return '';
+    } else {
+      partBuffer._updatePos(position - partBuffer.position);
+      var bytesToRead = Math.min(partBuffer.length - position, remainingBytesToRead);
+      var lastSlice = partBuffer.readSlice(bytesToRead);
+      partBuffer._updatePos(bytesToRead);
+      remainingBytesToRead = Math.max(remainingBytesToRead - lastSlice.length, 0);
+      position = 0;
       return last + decodeFn(lastSlice);
     }
-    remainingBytesToRead -= partBuffer.length;
-    return last + decodeFn(partBuffer);
   }, '');
   return out + endFn();
 };

app/components/neo4j-driver/lib/browser/neo4j-web.min.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();

app/components/neo4j-driver/lib/v1/driver.js

@@ -87,8 +87,9 @@ var Chunker = (function (_buf$BaseBuffer) {
   }, {
     key: 'putBytes',
     value: function putBytes(position, data) {
-      // TODO: If data is larger than our chunk size or so, we're very likely better off just passing this buffer on rather than doing the copy here
-      // TODO: *however* note that we need some way to find out when the data has been written (and thus the buffer can be re-used) if we take that approach
+      // TODO: If data is larger than our chunk size or so, we're very likely better off just passing this buffer on
+      // rather than doing the copy here TODO: *however* note that we need some way to find out when the data has been
+      // written (and thus the buffer can be re-used) if we take that approach
       while (data.remaining() > 0) {
         // Ensure there is an open chunk, and that it has at least one byte of space left
         this._ensure(1);
@@ -119,10 +120,10 @@ var Chunker = (function (_buf$BaseBuffer) {
       return this;
     }
 
-    /** 
+    /**
      * Bolt messages are encoded in one or more chunks, and the boundary between two messages
      * is encoded as a 0-length chunk, `00 00`. This inserts such a message boundary, closing
-     * any currently open chunk as needed 
+     * any currently open chunk as needed
      */
   }, {
     key: 'messageBoundary',

app/components/neo4j-driver/lib/v1/internal/chunking.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();
     }

app/components/neo4j-driver/lib/v1/internal/connector.js

@@ -53,10 +53,10 @@ try {
         if (buffer instanceof _buf2['default'].NodeBuffer) {
           var start = buffer.position,
               end = start + length;
-          buffer.position = end;
+          buffer.position = Math.min(end, buffer.length);
           return buffer._buffer.toString('utf8', start, end);
         } else if (buffer instanceof _buf2['default'].CombinedBuffer) {
-          var out = streamDecodeCombinedBuffer(buffer._buffers, length, function (partBuffer) {
+          var out = streamDecodeCombinedBuffer(buffer, length, function (partBuffer) {
             return decoder.write(partBuffer._buffer);
           }, function () {
             return decoder.end();
@@ -85,14 +85,14 @@ try {
       },
       "decode": function decode(buffer, length) {
         if (buffer instanceof _buf2['default'].HeapBuffer) {
-          return decoder.decode(buffer.readView(length));
+          return decoder.decode(buffer.readView(Math.min(length, buffer.length - buffer.position)));
         } else {
           // Decoding combined buffer is complicated. For simplicity, for now,
           // we simply copy the combined buffer into a regular buffer and decode that.
           var tmpBuf = _buf2['default'].alloc(length);
           for (var i = 0; i < length; i++) {
             tmpBuf.writeUInt8(buffer.readUInt8());
-          };
+          }
           tmpBuf.reset();
           return decoder.decode(tmpBuf.readView(length));
         }
@@ -103,20 +103,24 @@ try {
 
 var streamDecodeCombinedBuffer = function streamDecodeCombinedBuffer(combinedBuffers, length, decodeFn, endFn) {
   var remainingBytesToRead = length;
+  var position = combinedBuffers.position;
+  combinedBuffers._updatePos(Math.min(length, combinedBuffers.length - position));
   // Reduce CombinedBuffers to a decoded string
-  var out = combinedBuffers.reduce(function (last, partBuffer) {
+  var out = combinedBuffers._buffers.reduce(function (last, partBuffer) {
     if (remainingBytesToRead <= 0) {
       return last;
-    }
-    if (partBuffer.length > remainingBytesToRead) {
-      // When we don't want the whole buffer
-      var lastSlice = partBuffer.readSlice(remainingBytesToRead);
-      partBuffer._updatePos(remainingBytesToRead);
-      remainingBytesToRead = 0;
+    } else if (position >= partBuffer.length) {
+      position -= partBuffer.length;
+      return '';
+    } else {
+      partBuffer._updatePos(position - partBuffer.position);
+      var bytesToRead = Math.min(partBuffer.length - position, remainingBytesToRead);
+      var lastSlice = partBuffer.readSlice(bytesToRead);
+      partBuffer._updatePos(bytesToRead);
+      remainingBytesToRead = Math.max(remainingBytesToRead - lastSlice.length, 0);
+      position = 0;
       return last + decodeFn(lastSlice);
     }
-    remainingBytesToRead -= partBuffer.length;
-    return last + decodeFn(partBuffer);
   }, '');
   return out + endFn();
 };