Guard tests that use bookmarks with server version check

Author: lutovich

lib/v1/driver.js

@@ -1,68 +1,54 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WRITE = exports.READ = exports.Driver = undefined;
 
-var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
+var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
 
-var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
 
 var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
 
-var _get2 = require("babel-runtime/helpers/get");
+var _get2 = require('babel-runtime/helpers/get');
 
 var _get3 = _interopRequireDefault(_get2);
 
-var _inherits2 = require("babel-runtime/helpers/inherits");
+var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _promise = require("babel-runtime/core-js/promise");
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-var _createClass2 = require("babel-runtime/helpers/createClass");
+var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _session = require("./session");
+var _session = require('./session');
 
 var _session2 = _interopRequireDefault(_session);
 
-var _pool = require("./internal/pool");
+var _pool = require('./internal/pool');
 
 var _pool2 = _interopRequireDefault(_pool);
 
-var _connector = require("./internal/connector");
+var _connector = require('./internal/connector');
 
-var _streamObserver = require("./internal/stream-observer");
+var _streamObserver = require('./internal/stream-observer');
 
 var _streamObserver2 = _interopRequireDefault(_streamObserver);
 
-var _error = require("./error");
+var _error = require('./error');
+
+var _connectionProviders = require('./internal/connection-providers');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var READ = 'READ',
-    WRITE = 'WRITE';
-/**
- * A driver maintains one or more {@link Session sessions} with a remote
- * Neo4j instance. Through the {@link Session sessions} you can send statements
- * and retrieve results from the database.
- *
- * Drivers are reasonably expensive to create - you should strive to keep one
- * driver instance around per Neo4j Instance you connect to.
- *
- * @access public
- */
 /**
  * Copyright (c) 2002-2017 "Neo Technology,","
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
@@ -82,6 +68,19 @@ var READ = 'READ',
  * limitations under the License.
  */
 
+var READ = 'READ',
+    WRITE = 'WRITE';
+/**
+ * A driver maintains one or more {@link Session sessions} with a remote
+ * Neo4j instance. Through the {@link Session sessions} you can send statements
+ * and retrieve results from the database.
+ *
+ * Drivers are reasonably expensive to create - you should strive to keep one
+ * driver instance around per Neo4j Instance you connect to.
+ *
+ * @access public
+ */
+
 var Driver = function () {
   /**
    * You should not be calling this directly, instead use {@link driver}.
@@ -104,6 +103,7 @@ var Driver = function () {
     this._token = token;
     this._config = config;
     this._pool = new _pool2.default(this._createConnection.bind(this), this._destroyConnection.bind(this), Driver._validateConnection.bind(this), config.connectionPoolSize);
+    this._connectionProvider = this._createConnectionProvider(url, this._pool, this._driverOnErrorCallback.bind(this));
   }
 
   /**
@@ -114,7 +114,7 @@ var Driver = function () {
 
 
   (0, _createClass3.default)(Driver, [{
-    key: "_createConnection",
+    key: '_createConnection',
     value: function _createConnection(url, release) {
       var sessionId = this._sessionIdGenerator++;
       var conn = (0, _connector.connect)(url, this._config);
@@ -136,7 +136,7 @@ var Driver = function () {
      **/
 
   }, {
-    key: "_destroyConnection",
+    key: '_destroyConnection',
 
 
     /**
@@ -160,69 +160,43 @@ var Driver = function () {
      * it is returned to the pool, the session will be reset to a clean state and
      * made available for others to use.
      *
-     * @param {String} mode of session - optional
+     * @param {string} [mode=WRITE] the access mode of this session, allowed values are {@link READ} and {@link WRITE}.
+     * @param {string} [bookmark=null] the initial reference to some previous transaction. Value is optional and
+     * absence indicates that that the bookmark does not exist or is unknown.
      * @return {Session} new session.
      */
 
   }, {
-    key: "session",
-    value: function session(mode) {
-      var _this = this;
-
+    key: 'session',
+    value: function session(mode, bookmark) {
       var sessionMode = Driver._validateSessionMode(mode);
-      var connectionPromise = this._acquireConnection(sessionMode);
-      connectionPromise.catch(function (err) {
-        if (_this.onError && err.code === _error.SERVICE_UNAVAILABLE) {
-          _this.onError(err);
-        } else {
-          //we don't need to tell the driver about this error
-        }
-      });
-      return this._createSession(connectionPromise, this._releaseConnection(connectionPromise));
-    }
-
-    /**
-     * The returned function gets called on Session#close(), and is where we return the pooled 'connection' instance.
-     * We don't pool Session instances, to avoid users using the Session after they've called close.
-     * The `Session` object is just a thin wrapper around Connection anyway, so it makes little difference.
-     * @param {Promise} connectionPromise - promise resolved with the connection.
-     * @return {function(callback: function)} - function that releases the connection and then executes an optional callback.
-     * @protected
-     */
-
-  }, {
-    key: "_releaseConnection",
-    value: function _releaseConnection(connectionPromise) {
-      return function (userDefinedCallback) {
-        connectionPromise.then(function (conn) {
-          // Queue up a 'reset', to ensure the next user gets a clean session to work with.
-          conn.reset();
-          conn.sync();
-
-          // Return connection to the pool
-          conn._release();
-        }).catch(function (ignoredError) {});
-
-        if (userDefinedCallback) {
-          userDefinedCallback();
-        }
-      };
+      return this._createSession(sessionMode, this._connectionProvider, bookmark, this._config);
     }
   }, {
-    key: "_acquireConnection",
+    key: '_createConnectionProvider',
 
 
     //Extension point
-    value: function _acquireConnection(mode) {
-      return _promise2.default.resolve(this._pool.acquire(this._url));
+    value: function _createConnectionProvider(address, connectionPool, driverOnErrorCallback) {
+      return new _connectionProviders.DirectConnectionProvider(address, connectionPool, driverOnErrorCallback);
     }
 
     //Extension point
 
   }, {
-    key: "_createSession",
-    value: function _createSession(connectionPromise, cb) {
-      return new _session2.default(connectionPromise, cb);
+    key: '_createSession',
+    value: function _createSession(mode, connectionProvider, bookmark, config) {
+      return new _session2.default(mode, connectionProvider, bookmark, config);
+    }
+  }, {
+    key: '_driverOnErrorCallback',
+    value: function _driverOnErrorCallback(error) {
+      var userDefinedOnErrorCallback = this.onError;
+      if (userDefinedOnErrorCallback && error.code === _error.SERVICE_UNAVAILABLE) {
+        userDefinedOnErrorCallback(error);
+      } else {
+        // we don't need to tell the driver about this error
+      }
     }
 
     /**
@@ -232,7 +206,7 @@ var Driver = function () {
      */
 
   }, {
-    key: "close",
+    key: 'close',
     value: function close() {
       for (var sessionId in this._openSessions) {
         if (this._openSessions.hasOwnProperty(sessionId)) {
@@ -242,12 +216,12 @@ var Driver = function () {
       }
     }
   }], [{
-    key: "_validateConnection",
+    key: '_validateConnection',
     value: function _validateConnection(conn) {
       return conn.isOpen();
     }
   }, {
-    key: "_validateSessionMode",
+    key: '_validateSessionMode',
     value: function _validateSessionMode(rawMode) {
       var mode = rawMode || WRITE;
       if (mode !== READ && mode !== WRITE) {
@@ -268,27 +242,27 @@ var _ConnectionStreamObserver = function (_StreamObserver) {
   function _ConnectionStreamObserver(driver, conn) {
     (0, _classCallCheck3.default)(this, _ConnectionStreamObserver);
 
-    var _this2 = (0, _possibleConstructorReturn3.default)(this, (_ConnectionStreamObserver.__proto__ || (0, _getPrototypeOf2.default)(_ConnectionStreamObserver)).call(this));
+    var _this = (0, _possibleConstructorReturn3.default)(this, (_ConnectionStreamObserver.__proto__ || (0, _getPrototypeOf2.default)(_ConnectionStreamObserver)).call(this));
 
-    _this2._driver = driver;
-    _this2._conn = conn;
-    _this2._hasFailed = false;
-    return _this2;
+    _this._driver = driver;
+    _this._conn = conn;
+    _this._hasFailed = false;
+    return _this;
   }
 
   (0, _createClass3.default)(_ConnectionStreamObserver, [{
-    key: "onError",
+    key: 'onError',
     value: function onError(error) {
       if (!this._hasFailed) {
-        (0, _get3.default)(_ConnectionStreamObserver.prototype.__proto__ || (0, _getPrototypeOf2.default)(_ConnectionStreamObserver.prototype), "onError", this).call(this, error);
+        (0, _get3.default)(_ConnectionStreamObserver.prototype.__proto__ || (0, _getPrototypeOf2.default)(_ConnectionStreamObserver.prototype), 'onError', this).call(this, error);
         if (this._driver.onError) {
           this._driver.onError(error);
         }
         this._hasFailed = true;
       }
     }
   }, {
-    key: "onCompleted",
+    key: 'onCompleted',
     value: function onCompleted(message) {
       if (this._driver.onCompleted) {
         this._driver.onCompleted(message);

lib/v1/graph-types.js

@@ -48,7 +48,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var Node = function () {
   /**
    * @constructor
-   * @param {string} identity - Unique identity
+   * @param {Integer} identity - Unique identity
    * @param {Array} labels - Array for all labels
    * @param {Object} properties - Map with node properties
    */
@@ -91,9 +91,9 @@ var Node = function () {
 var Relationship = function () {
   /**
    * @constructor
-   * @param {string} identity - Unique identity
-   * @param {string} start - Identity of start Node
-   * @param {string} end - Identity of end Node
+   * @param {Integer} identity - Unique identity
+   * @param {Integer} start - Identity of start Node
+   * @param {Integer} end - Identity of end Node
    * @param {string} type - Relationship type
    * @param {Object} properties - Map with relationship properties
    */
@@ -136,7 +136,7 @@ var Relationship = function () {
 var UnboundRelationship = function () {
   /**
    * @constructor
-   * @param {string} identity - Unique identity
+   * @param {Integer} identity - Unique identity
    * @param {string} type - Relationship type
    * @param {Object} properties - Map with relationship properties
    */
@@ -150,8 +150,8 @@ var UnboundRelationship = function () {
 
   /**
    * Bind relationship
-   * @param {string} start - Indentity of start node
-   * @param {string} end - Indentity of end node
+   * @param {Integer} start - Identity of start node
+   * @param {Integer} end - Identity of end node
    * @return {Relationship} - Created relationship
    */
 
@@ -189,9 +189,9 @@ var UnboundRelationship = function () {
 var PathSegment =
 /**
  * @constructor
- * @param {string} start - Identity of start Node
- * @param {Relationship} rel - Relationship segment
- * @param {string} end - Identity of end Node
+ * @param {Node} start - start node
+ * @param {Relationship} rel - relationship that connects start and end node
+ * @param {Node} end - end node
  */
 function PathSegment(start, rel, end) {
   (0, _classCallCheck3.default)(this, PathSegment);

lib/v1/index.js

@@ -131,6 +131,16 @@ var USER_AGENT = "neo4j-javascript/" + _version2.default;
  *       // port, and this is then used to verify the host certificate does not change.
  *       // This setting has no effect unless TRUST_ON_FIRST_USE is enabled.
  *       knownHosts:"~/.neo4j/known_hosts",
+ *
+ *       // The max number of connections that are allowed idle in the pool at any time.
+ *       // Connection will be destroyed if this threshold is exceeded.
+ *       connectionPoolSize: 50,
+ *
+ *       // Specify the maximum time in milliseconds transactions are allowed to retry via
+ *       // {@link Session#readTransaction()} and {@link Session#writeTransaction()} functions. These functions
+ *       // will retry the given unit of work on `ServiceUnavailable`, `SessionExpired` and transient errors with
+ *       // exponential backoff using initial delay of 1 second. Default value is 30000 which is 30 seconds.
+ *       maxTransactionRetryTime: 30000,
  *     }
  *
  * @param {string} url The URL for the Neo4j database, for instance "bolt://localhost"