neo4j-driver 4.4.8 → 5.0.0-beta01

package/lib/driver.js

@@ -67,12 +67,7 @@ var Driver = /*#__PURE__*/function (_CoreDriver) {
      * pool and made available for others to use.
      *
      * @public
-     * @param {Object} param
-     * @param {string} param.defaultAccessMode=WRITE - The access mode of this session, allowed values are {@link READ} and {@link WRITE}.
-     * @param {string|string[]} param.bookmarks - The initial reference or references to some previous transactions. Value is optional and
-     * absence indicates that the bookmarks do not exist or are unknown.
-     * @param {string} param.database - The database this session will operate on.
-     * @param {string} param.impersonatedUser - The name of the user which should be impersonated for the duration of the session.
+     * @param {SessionConfig} config
      * @returns {RxSession} new reactive session.
      */
     function rxSession() {
@@ -83,7 +78,8 @@ var Driver = /*#__PURE__*/function (_CoreDriver) {
           _ref$database = _ref.database,
           database = _ref$database === void 0 ? '' : _ref$database,
           fetchSize = _ref.fetchSize,
-          impersonatedUser = _ref.impersonatedUser;
+          impersonatedUser = _ref.impersonatedUser,
+          bookmarkManager = _ref.bookmarkManager;
 
       return new _sessionRx["default"]({
         session: this._newSession({
@@ -91,8 +87,9 @@ var Driver = /*#__PURE__*/function (_CoreDriver) {
           bookmarkOrBookmarks: bookmarks,
           database: database,
           impersonatedUser: impersonatedUser,
-          reactive: true,
-          fetchSize: validateFetchSizeValue(fetchSize, this._config.fetchSize)
+          reactive: false,
+          fetchSize: validateFetchSizeValue(fetchSize, this._config.fetchSize),
+          bookmarkManager: bookmarkManager
         }),
         config: this._config
       });

package/lib/index.js

@@ -5,23 +5,28 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.driver = driver;
-Object.defineProperty(exports, "Driver", {
+Object.defineProperty(exports, "Date", {
   enumerable: true,
   get: function get() {
-    return _driver.Driver;
+    return _neo4jDriverCore.Date;
   }
 });
-Object.defineProperty(exports, "Neo4jError", {
+Object.defineProperty(exports, "DateTime", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Neo4jError;
+    return _neo4jDriverCore.DateTime;
   }
 });
-Object.defineProperty(exports, "error", {
+Object.defineProperty(exports, "Driver", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.error;
+    return _driver.Driver;
+  }
+});
+Object.defineProperty(exports, "Duration", {
+  enumerable: true,
+  get: function get() {
+    return _neo4jDriverCore.Duration;
   }
 });
 Object.defineProperty(exports, "Integer", {
@@ -30,217 +35,243 @@ Object.defineProperty(exports, "Integer", {
     return _neo4jDriverCore.Integer;
   }
 });
-Object.defineProperty(exports, "int", {
+Object.defineProperty(exports, "LocalDateTime", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore["int"];
+    return _neo4jDriverCore.LocalDateTime;
   }
 });
-Object.defineProperty(exports, "isInt", {
+Object.defineProperty(exports, "LocalTime", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isInt;
+    return _neo4jDriverCore.LocalTime;
   }
 });
-Object.defineProperty(exports, "isPoint", {
+Object.defineProperty(exports, "ManagedTransaction", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isPoint;
+    return _neo4jDriverCore.ManagedTransaction;
   }
 });
-Object.defineProperty(exports, "Point", {
+Object.defineProperty(exports, "Neo4jError", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Point;
+    return _neo4jDriverCore.Neo4jError;
   }
 });
-Object.defineProperty(exports, "Date", {
+Object.defineProperty(exports, "Node", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Date;
+    return _neo4jDriverCore.Node;
   }
 });
-Object.defineProperty(exports, "DateTime", {
+Object.defineProperty(exports, "Notification", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.DateTime;
+    return _neo4jDriverCore.Notification;
   }
 });
-Object.defineProperty(exports, "Duration", {
+Object.defineProperty(exports, "Path", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Duration;
+    return _neo4jDriverCore.Path;
   }
 });
-Object.defineProperty(exports, "isDate", {
+Object.defineProperty(exports, "PathSegment", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isDate;
+    return _neo4jDriverCore.PathSegment;
   }
 });
-Object.defineProperty(exports, "isDateTime", {
+Object.defineProperty(exports, "Plan", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isDateTime;
+    return _neo4jDriverCore.Plan;
   }
 });
-Object.defineProperty(exports, "isDuration", {
+Object.defineProperty(exports, "Point", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isDuration;
+    return _neo4jDriverCore.Point;
   }
 });
-Object.defineProperty(exports, "isLocalDateTime", {
+Object.defineProperty(exports, "ProfiledPlan", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isLocalDateTime;
+    return _neo4jDriverCore.ProfiledPlan;
   }
 });
-Object.defineProperty(exports, "isLocalTime", {
+Object.defineProperty(exports, "QueryStatistics", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isLocalTime;
+    return _neo4jDriverCore.QueryStatistics;
   }
 });
-Object.defineProperty(exports, "isTime", {
+Object.defineProperty(exports, "Record", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.isTime;
+    return _neo4jDriverCore.Record;
   }
 });
-Object.defineProperty(exports, "LocalDateTime", {
+Object.defineProperty(exports, "Relationship", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.LocalDateTime;
+    return _neo4jDriverCore.Relationship;
   }
 });
-Object.defineProperty(exports, "LocalTime", {
+Object.defineProperty(exports, "Result", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.LocalTime;
+    return _neo4jDriverCore.Result;
   }
 });
-Object.defineProperty(exports, "Time", {
+Object.defineProperty(exports, "ResultSummary", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Time;
+    return _neo4jDriverCore.ResultSummary;
   }
 });
-Object.defineProperty(exports, "Node", {
+Object.defineProperty(exports, "RxManagedTransaction", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Node;
+    return _transactionManagedRx["default"];
   }
 });
-Object.defineProperty(exports, "Path", {
+Object.defineProperty(exports, "RxResult", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Path;
+    return _resultRx["default"];
   }
 });
-Object.defineProperty(exports, "PathSegment", {
+Object.defineProperty(exports, "RxSession", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.PathSegment;
+    return _sessionRx["default"];
   }
 });
-Object.defineProperty(exports, "Relationship", {
+Object.defineProperty(exports, "RxTransaction", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Relationship;
+    return _transactionRx["default"];
   }
 });
-Object.defineProperty(exports, "UnboundRelationship", {
+Object.defineProperty(exports, "ServerInfo", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.UnboundRelationship;
+    return _neo4jDriverCore.ServerInfo;
   }
 });
-Object.defineProperty(exports, "Record", {
+Object.defineProperty(exports, "Session", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Record;
+    return _neo4jDriverCore.Session;
   }
 });
-Object.defineProperty(exports, "ResultSummary", {
+Object.defineProperty(exports, "Time", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.ResultSummary;
+    return _neo4jDriverCore.Time;
   }
 });
-Object.defineProperty(exports, "Plan", {
+Object.defineProperty(exports, "Transaction", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Plan;
+    return _neo4jDriverCore.Transaction;
   }
 });
-Object.defineProperty(exports, "ProfiledPlan", {
+Object.defineProperty(exports, "UnboundRelationship", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.ProfiledPlan;
+    return _neo4jDriverCore.UnboundRelationship;
   }
 });
-Object.defineProperty(exports, "QueryStatistics", {
+Object.defineProperty(exports, "auth", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.QueryStatistics;
+    return _neo4jDriverCore.auth;
   }
 });
-Object.defineProperty(exports, "Notification", {
+Object.defineProperty(exports, "bookmarkManager", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Notification;
+    return _neo4jDriverCore.bookmarkManager;
   }
 });
-Object.defineProperty(exports, "ServerInfo", {
+exports["default"] = void 0;
+exports.driver = driver;
+Object.defineProperty(exports, "error", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.ServerInfo;
+    return _neo4jDriverCore.error;
   }
 });
-Object.defineProperty(exports, "Result", {
+exports.hasReachableServer = hasReachableServer;
+Object.defineProperty(exports, "int", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Result;
+    return _neo4jDriverCore["int"];
   }
 });
-Object.defineProperty(exports, "auth", {
+exports.integer = void 0;
+Object.defineProperty(exports, "isDate", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.auth;
+    return _neo4jDriverCore.isDate;
   }
 });
-Object.defineProperty(exports, "Session", {
+Object.defineProperty(exports, "isDateTime", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Session;
+    return _neo4jDriverCore.isDateTime;
   }
 });
-Object.defineProperty(exports, "Transaction", {
+Object.defineProperty(exports, "isDuration", {
   enumerable: true,
   get: function get() {
-    return _neo4jDriverCore.Transaction;
+    return _neo4jDriverCore.isDuration;
   }
 });
-Object.defineProperty(exports, "RxSession", {
+Object.defineProperty(exports, "isInt", {
   enumerable: true,
   get: function get() {
-    return _sessionRx["default"];
+    return _neo4jDriverCore.isInt;
   }
 });
-Object.defineProperty(exports, "RxTransaction", {
+Object.defineProperty(exports, "isLocalDateTime", {
   enumerable: true,
   get: function get() {
-    return _transactionRx["default"];
+    return _neo4jDriverCore.isLocalDateTime;
   }
 });
-Object.defineProperty(exports, "RxResult", {
+Object.defineProperty(exports, "isLocalTime", {
   enumerable: true,
   get: function get() {
-    return _resultRx["default"];
+    return _neo4jDriverCore.isLocalTime;
+  }
+});
+Object.defineProperty(exports, "isPoint", {
+  enumerable: true,
+  get: function get() {
+    return _neo4jDriverCore.isPoint;
+  }
+});
+Object.defineProperty(exports, "isRetryableError", {
+  enumerable: true,
+  get: function get() {
+    return _neo4jDriverCore.isRetryableError;
+  }
+});
+Object.defineProperty(exports, "isTime", {
+  enumerable: true,
+  get: function get() {
+    return _neo4jDriverCore.isTime;
   }
 });
-exports["default"] = exports.temporal = exports.spatial = exports.session = exports.types = exports.logging = exports.integer = void 0;
+exports.types = exports.temporal = exports.spatial = exports.session = exports.logging = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _driver = require("./driver");
 
@@ -254,6 +285,8 @@ var _sessionRx = _interopRequireDefault(require("./session-rx"));
 
 var _transactionRx = _interopRequireDefault(require("./transaction-rx"));
 
+var _transactionManagedRx = _interopRequireDefault(require("./transaction-managed-rx"));
+
 var _resultRx = _interopRequireDefault(require("./result-rx"));
 
 /**
@@ -276,7 +309,6 @@ var _resultRx = _interopRequireDefault(require("./result-rx"));
  */
 var _internal$util = _neo4jDriverCore.internal.util,
     ENCRYPTION_ON = _internal$util.ENCRYPTION_ON,
-    ENCRYPTION_OFF = _internal$util.ENCRYPTION_OFF,
     assertString = _internal$util.assertString,
     isEmptyObjectOrNull = _internal$util.isEmptyObjectOrNull,
     ServerAddress = _neo4jDriverCore.internal.serverAddress.ServerAddress,
@@ -341,7 +373,7 @@ var _internal$util = _neo4jDriverCore.internal.util,
  *       connectionAcquisitionTimeout: 60000, // 1 minute
  *
  *       // Specify the maximum time in milliseconds transactions are allowed to retry via
- *       // `Session#readTransaction()` and `Session#writeTransaction()` functions.
+ *       // `Session#executeRead()` and `Session#executeWrite()` 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.
@@ -511,6 +543,58 @@ function driver(url, authToken) {
     }
   }
 }
+/**
+ * Verifies if the driver can reach a server at the given url.
+ *
+ * @experimental
+ * @since 5.0.0
+ * @param {string} url The URL for the Neo4j database, for instance "neo4j://localhost" and/or "bolt://localhost"
+ * @param {object} config Configuration object. See the {@link driver}
+ * @returns {true} When the server is reachable
+ * @throws {Error} When the server is not reachable or the url is invalid
+ */
+
+
+function hasReachableServer(_x, _x2) {
+  return _hasReachableServer.apply(this, arguments);
+}
+
+function _hasReachableServer() {
+  _hasReachableServer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url, config) {
+    var nonLoggedDriver;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            nonLoggedDriver = driver(url, {
+              scheme: 'none',
+              principal: '',
+              credentials: ''
+            }, config);
+            _context.prev = 1;
+            _context.next = 4;
+            return nonLoggedDriver.getNegotiatedProtocolVersion();
+
+          case 4:
+            return _context.abrupt("return", true);
+
+          case 5:
+            _context.prev = 5;
+            _context.next = 8;
+            return nonLoggedDriver.close();
+
+          case 8:
+            return _context.finish(5);
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[1,, 5, 9]]);
+  }));
+  return _hasReachableServer.apply(this, arguments);
+}
 
 var USER_AGENT = 'neo4j-javascript/' + _version["default"];
 /**
@@ -521,7 +605,7 @@ var USER_AGENT = 'neo4j-javascript/' + _version["default"];
 
 var logging = {
   console: function (_console) {
-    function console(_x) {
+    function console(_x3) {
       return _console.apply(this, arguments);
     }
 
@@ -609,6 +693,7 @@ var temporal = {
 exports.temporal = temporal;
 var forExport = {
   driver: driver,
+  hasReachableServer: hasReachableServer,
   "int": _neo4jDriverCore["int"],
   isInt: _neo4jDriverCore.isInt,
   isPoint: _neo4jDriverCore.isPoint,
@@ -620,6 +705,7 @@ var forExport = {
   isDateTime: _neo4jDriverCore.isDateTime,
   integer: integer,
   Neo4jError: _neo4jDriverCore.Neo4jError,
+  isRetryableError: _neo4jDriverCore.isRetryableError,
   auth: _neo4jDriverCore.auth,
   logging: logging,
   types: types,
@@ -630,9 +716,11 @@ var forExport = {
   Driver: _driver.Driver,
   Session: _neo4jDriverCore.Session,
   Transaction: _neo4jDriverCore.Transaction,
+  ManagedTransaction: _neo4jDriverCore.ManagedTransaction,
   Result: _neo4jDriverCore.Result,
   RxSession: _sessionRx["default"],
   RxTransaction: _transactionRx["default"],
+  RxManagedTransaction: _transactionManagedRx["default"],
   RxResult: _resultRx["default"],
   ResultSummary: _neo4jDriverCore.ResultSummary,
   Plan: _neo4jDriverCore.Plan,
@@ -653,7 +741,8 @@ var forExport = {
   Time: _neo4jDriverCore.Time,
   Date: _neo4jDriverCore.Date,
   LocalDateTime: _neo4jDriverCore.LocalDateTime,
-  DateTime: _neo4jDriverCore.DateTime
+  DateTime: _neo4jDriverCore.DateTime,
+  bookmarkManager: _neo4jDriverCore.bookmarkManager
 };
 var _default = forExport;
 exports["default"] = _default;

package/lib/internal/retry-logic-rx.js

@@ -35,10 +35,9 @@ var _operators = require("rxjs/operators");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var Logger = _neo4jDriverCore.internal.logger.Logger,
-    canRetryOn = _neo4jDriverCore.internal.retryStrategy.canRetryOn;
-var SERVICE_UNAVAILABLE = _neo4jDriverCore.error.SERVICE_UNAVAILABLE,
-    SESSION_EXPIRED = _neo4jDriverCore.error.SESSION_EXPIRED;
+// eslint-disable-next-line no-unused-vars
+var Logger = _neo4jDriverCore.internal.logger.Logger;
+var SERVICE_UNAVAILABLE = _neo4jDriverCore.error.SERVICE_UNAVAILABLE;
 var DEFAULT_MAX_RETRY_TIME_MS = 30 * 1000; // 30 seconds
 
 var DEFAULT_INITIAL_RETRY_DELAY_MS = 1000; // 1 seconds
@@ -88,9 +87,11 @@ var RxRetryLogic = /*#__PURE__*/function () {
         var startTime = Date.now();
         var retryCount = 1;
         var delayDuration = _this._initialDelay;
-        return failedWork.pipe((0, _operators.flatMap)(function (err) {
-          if (!canRetryOn(err)) {
-            return (0, _rxjs.throwError)(err);
+        return failedWork.pipe((0, _operators.mergeMap)(function (err) {
+          if (!(0, _neo4jDriverCore.isRetriableError)(err)) {
+            return (0, _rxjs.throwError)(function () {
+              return err;
+            });
           }
 
           handledExceptions.push(err);
@@ -99,7 +100,9 @@ var RxRetryLogic = /*#__PURE__*/function () {
             var _error = (0, _neo4jDriverCore.newError)("Failed after retried for ".concat(retryCount, " times in ").concat(_this._maxRetryTimeout, " ms. Make sure that your database is online and retry again."), SERVICE_UNAVAILABLE);
 
             _error.seenErrors = handledExceptions;
-            return (0, _rxjs.throwError)(_error);
+            return (0, _rxjs.throwError)(function () {
+              return _error;
+            });
           }
 
           var nextDelayDuration = _this._computeNextDelay(delayDuration);

package/lib/internal/server-version.js

@@ -32,7 +32,7 @@ var _neo4jDriverCore = require("neo4j-driver-core");
  * limitations under the License.
  */
 var assertString = _neo4jDriverCore.internal.util.assertString;
-var SERVER_VERSION_REGEX = new RegExp('^(Neo4j/)?(\\d+)\\.(\\d+)(?:\\.)?(\\d*)(\\.|-|\\+)?([0-9A-Za-z-.]*)?$');
+var SERVER_VERSION_REGEX = /^(Neo4j\/)?(\d+)\.(\d+)(?:\.)?(\d*)(\.|-|\+)?([0-9A-Za-z-.]*)?$/;
 var NEO4J_IN_DEV_VERSION_STRING = 'Neo4j/dev';
 
 var ServerVersion = /*#__PURE__*/function () {