neo4j-driver 5.3.0 → 5.4.0

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

@@ -1,22 +1,4 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _neo4jDriverCore = require("neo4j-driver-core");
-
-var _rxjs = require("rxjs");
-
-var _operators = require("rxjs/operators");
-
 /**
  * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
@@ -35,105 +17,75 @@ var _operators = require("rxjs/operators");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+var neo4j_driver_core_1 = require("neo4j-driver-core");
 // eslint-disable-next-line no-unused-vars
-var Logger = _neo4jDriverCore.internal.logger.Logger;
-var SERVICE_UNAVAILABLE = _neo4jDriverCore.error.SERVICE_UNAVAILABLE;
+var rxjs_1 = require("rxjs");
+var operators_1 = require("rxjs/operators");
+var 
+// eslint-disable-next-line no-unused-vars
+Logger = neo4j_driver_core_1.internal.logger.Logger;
+var SERVICE_UNAVAILABLE = neo4j_driver_core_1.error.SERVICE_UNAVAILABLE;
 var DEFAULT_MAX_RETRY_TIME_MS = 30 * 1000; // 30 seconds
-
 var DEFAULT_INITIAL_RETRY_DELAY_MS = 1000; // 1 seconds
-
 var DEFAULT_RETRY_DELAY_MULTIPLIER = 2.0;
 var DEFAULT_RETRY_DELAY_JITTER_FACTOR = 0.2;
-
-var RxRetryLogic = /*#__PURE__*/function () {
-  /**
-   *
-   * @param {Object} args
-   * @param {Logger} args.logger
-   */
-  function RxRetryLogic() {
-    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref$maxRetryTimeout = _ref.maxRetryTimeout,
-        maxRetryTimeout = _ref$maxRetryTimeout === void 0 ? DEFAULT_MAX_RETRY_TIME_MS : _ref$maxRetryTimeout,
-        _ref$initialDelay = _ref.initialDelay,
-        initialDelay = _ref$initialDelay === void 0 ? DEFAULT_INITIAL_RETRY_DELAY_MS : _ref$initialDelay,
-        _ref$delayMultiplier = _ref.delayMultiplier,
-        delayMultiplier = _ref$delayMultiplier === void 0 ? DEFAULT_RETRY_DELAY_MULTIPLIER : _ref$delayMultiplier,
-        _ref$delayJitter = _ref.delayJitter,
-        delayJitter = _ref$delayJitter === void 0 ? DEFAULT_RETRY_DELAY_JITTER_FACTOR : _ref$delayJitter,
-        _ref$logger = _ref.logger,
-        logger = _ref$logger === void 0 ? null : _ref$logger;
-
-    (0, _classCallCheck2["default"])(this, RxRetryLogic);
-    this._maxRetryTimeout = valueOrDefault(maxRetryTimeout, DEFAULT_MAX_RETRY_TIME_MS);
-    this._initialDelay = valueOrDefault(initialDelay, DEFAULT_INITIAL_RETRY_DELAY_MS);
-    this._delayMultiplier = valueOrDefault(delayMultiplier, DEFAULT_RETRY_DELAY_MULTIPLIER);
-    this._delayJitter = valueOrDefault(delayJitter, DEFAULT_RETRY_DELAY_JITTER_FACTOR);
-    this._logger = logger;
-  }
-  /**
-   *
-   * @param {Observable<Any>} work
-   */
-
-
-  (0, _createClass2["default"])(RxRetryLogic, [{
-    key: "retry",
-    value: function retry(work) {
-      var _this = this;
-
-      return work.pipe((0, _operators.retryWhen)(function (failedWork) {
-        var handledExceptions = [];
-        var startTime = Date.now();
-        var retryCount = 1;
-        var delayDuration = _this._initialDelay;
-        return failedWork.pipe((0, _operators.mergeMap)(function (err) {
-          if (!(0, _neo4jDriverCore.isRetriableError)(err)) {
-            return (0, _rxjs.throwError)(function () {
-              return err;
-            });
-          }
-
-          handledExceptions.push(err);
-
-          if (retryCount >= 2 && Date.now() - startTime >= _this._maxRetryTimeout) {
-            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)(function () {
-              return _error;
-            });
-          }
-
-          var nextDelayDuration = _this._computeNextDelay(delayDuration);
-
-          delayDuration = delayDuration * _this._delayMultiplier;
-          retryCount++;
-
-          if (_this._logger) {
-            _this._logger.warn("Transaction failed and will be retried in ".concat(nextDelayDuration));
-          }
-
-          return (0, _rxjs.of)(1).pipe((0, _operators.delay)(nextDelayDuration));
-        }));
-      }));
-    }
-  }, {
-    key: "_computeNextDelay",
-    value: function _computeNextDelay(delay) {
-      var jitter = delay * this._delayJitter;
-      return delay - jitter + 2 * jitter * Math.random();
+var RxRetryLogic = /** @class */ (function () {
+    /**
+     *
+     * @param {Object} args
+     * @param {Logger} args.logger
+     */
+    function RxRetryLogic(_a) {
+        var _b = _a === void 0 ? {} : _a, _c = _b.maxRetryTimeout, maxRetryTimeout = _c === void 0 ? DEFAULT_MAX_RETRY_TIME_MS : _c, _d = _b.initialDelay, initialDelay = _d === void 0 ? DEFAULT_INITIAL_RETRY_DELAY_MS : _d, _e = _b.delayMultiplier, delayMultiplier = _e === void 0 ? DEFAULT_RETRY_DELAY_MULTIPLIER : _e, _f = _b.delayJitter, delayJitter = _f === void 0 ? DEFAULT_RETRY_DELAY_JITTER_FACTOR : _f, _g = _b.logger, logger = _g === void 0 ? null : _g;
+        this._maxRetryTimeout = valueOrDefault(maxRetryTimeout, DEFAULT_MAX_RETRY_TIME_MS);
+        this._initialDelay = valueOrDefault(initialDelay, DEFAULT_INITIAL_RETRY_DELAY_MS);
+        this._delayMultiplier = valueOrDefault(delayMultiplier, DEFAULT_RETRY_DELAY_MULTIPLIER);
+        this._delayJitter = valueOrDefault(delayJitter, DEFAULT_RETRY_DELAY_JITTER_FACTOR);
+        this._logger = logger;
     }
-  }]);
-  return RxRetryLogic;
-}();
-
-exports["default"] = RxRetryLogic;
-
+    /**
+     *
+     * @param {Observable<Any>} work
+     */
+    RxRetryLogic.prototype.retry = function (work) {
+        var _this = this;
+        return work.pipe((0, operators_1.retryWhen)(function (failedWork) {
+            var handledExceptions = [];
+            var startTime = Date.now();
+            var retryCount = 1;
+            var delayDuration = _this._initialDelay;
+            return failedWork.pipe((0, operators_1.mergeMap)(function (err) {
+                if (!(0, neo4j_driver_core_1.isRetriableError)(err)) {
+                    return (0, rxjs_1.throwError)(function () { return err; });
+                }
+                handledExceptions.push(err);
+                if (retryCount >= 2 &&
+                    Date.now() - startTime >= _this._maxRetryTimeout) {
+                    var error_1 = (0, neo4j_driver_core_1.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_1.seenErrors = handledExceptions;
+                    return (0, rxjs_1.throwError)(function () { return error_1; });
+                }
+                var nextDelayDuration = _this._computeNextDelay(delayDuration);
+                delayDuration = delayDuration * _this._delayMultiplier;
+                retryCount++;
+                if (_this._logger) {
+                    _this._logger.warn("Transaction failed and will be retried in ".concat(nextDelayDuration));
+                }
+                return (0, rxjs_1.of)(1).pipe((0, operators_1.delay)(nextDelayDuration));
+            }));
+        }));
+    };
+    RxRetryLogic.prototype._computeNextDelay = function (delay) {
+        var jitter = delay * this._delayJitter;
+        return delay - jitter + 2 * jitter * Math.random();
+    };
+    return RxRetryLogic;
+}());
+exports.default = RxRetryLogic;
 function valueOrDefault(value, defaultValue) {
-  if (value || value === 0) {
-    return value;
-  }
-
-  return defaultValue;
+    if (value || value === 0) {
+        return value;
+    }
+    return defaultValue;
 }

package/lib/internal/server-version.js

@@ -1,18 +1,4 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.VERSION_IN_DEV = exports.VERSION_4_0_0 = exports.VERSION_3_5_0 = exports.VERSION_3_4_0 = exports.VERSION_3_2_0 = exports.ServerVersion = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _neo4jDriverCore = require("neo4j-driver-core");
-
 /**
  * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
@@ -31,125 +17,100 @@ var _neo4jDriverCore = require("neo4j-driver-core");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var assertString = _neo4jDriverCore.internal.util.assertString;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VERSION_IN_DEV = exports.VERSION_4_0_0 = exports.VERSION_3_5_0 = exports.VERSION_3_4_0 = exports.VERSION_3_2_0 = exports.ServerVersion = void 0;
+var neo4j_driver_core_1 = require("neo4j-driver-core");
+var assertString = neo4j_driver_core_1.internal.util.assertString;
 var SERVER_VERSION_REGEX = /^(Neo4j\/)?(\d+)\.(\d+)(?:\.)?(\d*)(\.|-|\+)?([0-9A-Za-z-.]*)?$/;
 var NEO4J_IN_DEV_VERSION_STRING = 'Neo4j/dev';
-
-var ServerVersion = /*#__PURE__*/function () {
-  /**
-   * @constructor
-   * @param {number} major the major version number.
-   * @param {number} minor the minor version number.
-   * @param {number} patch the patch version number.
-   * @param {string} [originalVersionString] the original version string
-   */
-  function ServerVersion(major, minor, patch, originalVersionString) {
-    (0, _classCallCheck2["default"])(this, ServerVersion);
-    this.major = major;
-    this.minor = minor;
-    this.patch = patch;
-    this._originalVersionString = originalVersionString;
-  }
-  /**
-   * Fetch server version using the given driver.
-   * @param {Driver} driver the driver to use.
-   * @return {Promise<ServerVersion>} promise resolved with a {@link ServerVersion} object or rejected with error.
-   */
-
-
-  (0, _createClass2["default"])(ServerVersion, [{
-    key: "compareTo",
-    value:
+var ServerVersion = /** @class */ (function () {
     /**
-     * Compare this version to the given one.
-     * @param {ServerVersion} other the version to compare with.
-     * @return {number} value 0 if this version is the same as the given one, value less then 0 when this version
-     * was released earlier than the given one and value greater then 0 when this version was released after
-     * than the given one.
+     * @constructor
+     * @param {number} major the major version number.
+     * @param {number} minor the minor version number.
+     * @param {number} patch the patch version number.
+     * @param {string} [originalVersionString] the original version string
      */
-    function compareTo(other) {
-      var result = compareInts(this.major, other.major);
-
-      if (result === 0) {
-        result = compareInts(this.minor, other.minor);
-
-        if (result === 0) {
-          result = compareInts(this.patch, other.patch);
-        }
-      }
-
-      return result;
+    function ServerVersion(major, minor, patch, originalVersionString) {
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        this._originalVersionString = originalVersionString;
     }
-  }, {
-    key: "toString",
-    value: function toString() {
-      if (this._originalVersionString) {
-        return this._originalVersionString;
-      }
-
-      return "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
-    }
-  }], [{
-    key: "fromDriver",
-    value: function fromDriver(driver) {
-      var session = driver.session();
-      return session.run('RETURN 1').then(function (result) {
-        return session.close().then(function () {
-          return ServerVersion.fromString(result.summary.server.version);
+    /**
+     * Fetch server version using the given driver.
+     * @param {Driver} driver the driver to use.
+     * @return {Promise<ServerVersion>} promise resolved with a {@link ServerVersion} object or rejected with error.
+     */
+    ServerVersion.fromDriver = function (driver) {
+        var session = driver.session();
+        return session
+            .run('RETURN 1')
+            .then(function (result) {
+            return session
+                .close()
+                .then(function () { return ServerVersion.fromString(result.summary.server.version); });
         });
-      });
-    }
+    };
     /**
      * Parse given string to a {@link ServerVersion} object.
      * @param {string} versionStr the string to parse.
      * @return {ServerVersion} version for the given string.
      * @throws Error if given string can't be parsed.
      */
-
-  }, {
-    key: "fromString",
-    value: function fromString(versionStr) {
-      if (!versionStr) {
-        return new ServerVersion(3, 0, 0);
-      }
-
-      assertString(versionStr, 'Neo4j version string');
-
-      if (versionStr.toLowerCase() === NEO4J_IN_DEV_VERSION_STRING.toLowerCase()) {
-        return VERSION_IN_DEV;
-      }
-
-      var version = versionStr.match(SERVER_VERSION_REGEX);
-
-      if (!version) {
-        throw new Error("Unparsable Neo4j version: ".concat(versionStr));
-      }
-
-      var major = parseIntStrict(version[2]);
-      var minor = parseIntStrict(version[3]);
-      var patch = parseIntStrict(version[4] || 0);
-      return new ServerVersion(major, minor, patch, versionStr);
-    }
-  }]);
-  return ServerVersion;
-}();
-
+    ServerVersion.fromString = function (versionStr) {
+        if (!versionStr) {
+            return new ServerVersion(3, 0, 0);
+        }
+        assertString(versionStr, 'Neo4j version string');
+        if (versionStr.toLowerCase() === NEO4J_IN_DEV_VERSION_STRING.toLowerCase()) {
+            return VERSION_IN_DEV;
+        }
+        var version = versionStr.match(SERVER_VERSION_REGEX);
+        if (!version) {
+            throw new Error("Unparsable Neo4j version: ".concat(versionStr));
+        }
+        var major = parseIntStrict(version[2]);
+        var minor = parseIntStrict(version[3]);
+        var patch = parseIntStrict(version[4] || 0);
+        return new ServerVersion(major, minor, patch, versionStr);
+    };
+    /**
+     * Compare this version to the given one.
+     * @param {ServerVersion} other the version to compare with.
+     * @return {number} value 0 if this version is the same as the given one, value less then 0 when this version
+     * was released earlier than the given one and value greater then 0 when this version was released after
+     * than the given one.
+     */
+    ServerVersion.prototype.compareTo = function (other) {
+        var result = compareInts(this.major, other.major);
+        if (result === 0) {
+            result = compareInts(this.minor, other.minor);
+            if (result === 0) {
+                result = compareInts(this.patch, other.patch);
+            }
+        }
+        return result;
+    };
+    ServerVersion.prototype.toString = function () {
+        if (this._originalVersionString) {
+            return this._originalVersionString;
+        }
+        return "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
+    };
+    return ServerVersion;
+}());
 exports.ServerVersion = ServerVersion;
-
 function parseIntStrict(str, name) {
-  var value = parseInt(str, 10);
-
-  if (!value && value !== 0) {
-    throw new Error("Unparsable number ".concat(name, ": '").concat(str, "'"));
-  }
-
-  return value;
+    var value = parseInt(str, 10);
+    if (!value && value !== 0) {
+        throw new Error("Unparsable number ".concat(name, ": '").concat(str, "'"));
+    }
+    return value;
 }
-
 function compareInts(x, y) {
-  return x < y ? -1 : x === y ? 0 : 1;
+    return x < y ? -1 : x === y ? 0 : 1;
 }
-
 var VERSION_3_2_0 = ServerVersion.fromString('Neo4j/3.2.0');
 exports.VERSION_3_2_0 = VERSION_3_2_0;
 var VERSION_3_4_0 = ServerVersion.fromString('Neo4j/3.4.0');