neo4j-driver 4.4.1 → 4.4.2

package/lib/browser/neo4j-web.js

@@ -727,25 +727,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -769,11 +750,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 var bolt_protocol_v3_1 = __importDefault(require("./bolt-protocol-v3"));
-var request_message_1 = __importStar(require("./request-message"));
+var request_message_1 = __importDefault(require("./request-message"));
 var bolt_protocol_util_1 = require("./bolt-protocol-util");
 var stream_observers_1 = require("./stream-observers");
 var neo4j_driver_core_1 = require("neo4j-driver-core");
-var Bookmark = neo4j_driver_core_1.internal.bookmark.Bookmark, BOLT_PROTOCOL_V4_0 = neo4j_driver_core_1.internal.constants.BOLT_PROTOCOL_V4_0, TxConfig = neo4j_driver_core_1.internal.txConfig.TxConfig;
+var Bookmark = neo4j_driver_core_1.internal.bookmark.Bookmark, _a = neo4j_driver_core_1.internal.constants, BOLT_PROTOCOL_V4_0 = _a.BOLT_PROTOCOL_V4_0, FETCH_ALL = _a.FETCH_ALL, TxConfig = neo4j_driver_core_1.internal.txConfig.TxConfig;
 var CONTEXT = 'context';
 var DATABASE = 'database';
 var CALL_GET_ROUTING_TABLE_MULTI_DB = "CALL dbms.routing.getRoutingTable($" + CONTEXT + ", $" + DATABASE + ")";
@@ -805,7 +786,7 @@ var BoltProtocol = /** @class */ (function (_super) {
         return observer;
     };
     BoltProtocol.prototype.run = function (query, parameters, _a) {
-        var _b = _a === void 0 ? {} : _a, bookmark = _b.bookmark, txConfig = _b.txConfig, database = _b.database, impersonatedUser = _b.impersonatedUser, mode = _b.mode, beforeKeys = _b.beforeKeys, afterKeys = _b.afterKeys, beforeError = _b.beforeError, afterError = _b.afterError, beforeComplete = _b.beforeComplete, afterComplete = _b.afterComplete, _c = _b.flush, flush = _c === void 0 ? true : _c, _d = _b.reactive, reactive = _d === void 0 ? false : _d, _e = _b.fetchSize, fetchSize = _e === void 0 ? request_message_1.ALL : _e;
+        var _b = _a === void 0 ? {} : _a, bookmark = _b.bookmark, txConfig = _b.txConfig, database = _b.database, impersonatedUser = _b.impersonatedUser, mode = _b.mode, beforeKeys = _b.beforeKeys, afterKeys = _b.afterKeys, beforeError = _b.beforeError, afterError = _b.afterError, beforeComplete = _b.beforeComplete, afterComplete = _b.afterComplete, _c = _b.flush, flush = _c === void 0 ? true : _c, _d = _b.reactive, reactive = _d === void 0 ? false : _d, _e = _b.fetchSize, fetchSize = _e === void 0 ? FETCH_ALL : _e;
         var observer = new stream_observers_1.ResultStreamObserver({
             server: this._server,
             reactive: reactive,
@@ -1116,25 +1097,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -1159,9 +1121,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 var bolt_protocol_v4x3_1 = __importDefault(require("./bolt-protocol-v4x3"));
 var neo4j_driver_core_1 = require("neo4j-driver-core");
-var request_message_1 = __importStar(require("./request-message"));
+var request_message_1 = __importDefault(require("./request-message"));
 var stream_observers_1 = require("./stream-observers");
-var BOLT_PROTOCOL_V4_4 = neo4j_driver_core_1.internal.constants.BOLT_PROTOCOL_V4_4, Bookmark = neo4j_driver_core_1.internal.bookmark.Bookmark;
+var _a = neo4j_driver_core_1.internal.constants, BOLT_PROTOCOL_V4_4 = _a.BOLT_PROTOCOL_V4_4, FETCH_ALL = _a.FETCH_ALL, Bookmark = neo4j_driver_core_1.internal.bookmark.Bookmark;
 var BoltProtocol = /** @class */ (function (_super) {
     __extends(BoltProtocol, _super);
     function BoltProtocol() {
@@ -1198,7 +1160,7 @@ var BoltProtocol = /** @class */ (function (_super) {
         return observer;
     };
     BoltProtocol.prototype.run = function (query, parameters, _a) {
-        var _b = _a === void 0 ? {} : _a, bookmark = _b.bookmark, txConfig = _b.txConfig, database = _b.database, mode = _b.mode, impersonatedUser = _b.impersonatedUser, beforeKeys = _b.beforeKeys, afterKeys = _b.afterKeys, beforeError = _b.beforeError, afterError = _b.afterError, beforeComplete = _b.beforeComplete, afterComplete = _b.afterComplete, _c = _b.flush, flush = _c === void 0 ? true : _c, _d = _b.reactive, reactive = _d === void 0 ? false : _d, _e = _b.fetchSize, fetchSize = _e === void 0 ? request_message_1.ALL : _e;
+        var _b = _a === void 0 ? {} : _a, bookmark = _b.bookmark, txConfig = _b.txConfig, database = _b.database, mode = _b.mode, impersonatedUser = _b.impersonatedUser, beforeKeys = _b.beforeKeys, afterKeys = _b.afterKeys, beforeError = _b.beforeError, afterError = _b.afterError, beforeComplete = _b.beforeComplete, afterComplete = _b.afterComplete, _c = _b.flush, flush = _c === void 0 ? true : _c, _d = _b.reactive, reactive = _d === void 0 ? false : _d, _e = _b.fetchSize, fetchSize = _e === void 0 ? FETCH_ALL : _e;
         var observer = new stream_observers_1.ResultStreamObserver({
             server: this._server,
             reactive: reactive,
@@ -2205,8 +2167,8 @@ exports.ProcedureRouteObserver = exports.RouteObserver = exports.CompletedObserv
  * limitations under the License.
  */
 var neo4j_driver_core_1 = require("neo4j-driver-core");
-var request_message_1 = require("./request-message");
 var routing_table_raw_1 = __importDefault(require("./routing-table-raw"));
+var FETCH_ALL = neo4j_driver_core_1.internal.constants.FETCH_ALL;
 var PROTOCOL_ERROR = neo4j_driver_core_1.error.PROTOCOL_ERROR;
 var StreamObserver = /** @class */ (function () {
     function StreamObserver() {
@@ -2245,7 +2207,7 @@ var ResultStreamObserver = /** @class */ (function (_super) {
      * @param {function(metadata: Object): Promise|void} param.afterComplete -
      */
     function ResultStreamObserver(_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.reactive, reactive = _c === void 0 ? false : _c, moreFunction = _b.moreFunction, discardFunction = _b.discardFunction, _d = _b.fetchSize, fetchSize = _d === void 0 ? request_message_1.ALL : _d, beforeError = _b.beforeError, afterError = _b.afterError, beforeKeys = _b.beforeKeys, afterKeys = _b.afterKeys, beforeComplete = _b.beforeComplete, afterComplete = _b.afterComplete, server = _b.server;
+        var _b = _a === void 0 ? {} : _a, _c = _b.reactive, reactive = _c === void 0 ? false : _c, moreFunction = _b.moreFunction, discardFunction = _b.discardFunction, _d = _b.fetchSize, fetchSize = _d === void 0 ? FETCH_ALL : _d, beforeError = _b.beforeError, afterError = _b.afterError, beforeKeys = _b.beforeKeys, afterKeys = _b.afterKeys, beforeComplete = _b.beforeComplete, afterComplete = _b.afterComplete, server = _b.server;
         var _this = _super.call(this) || this;
         _this._fieldKeys = null;
         _this._fieldLookup = null;
@@ -2511,7 +2473,7 @@ var ResultStreamObserver = /** @class */ (function (_super) {
     };
     ResultStreamObserver.prototype._setupAuoPull = function (fetchSize) {
         this._autoPull = true;
-        if (fetchSize === request_message_1.ALL) {
+        if (fetchSize === FETCH_ALL) {
             this._lowRecordWatermark = Number.MAX_VALUE; // we shall always lower than this number to enable auto pull
             this._highRecordWatermark = Number.MAX_VALUE; // we shall never reach this number to disable auto pull
         }
@@ -2749,7 +2711,7 @@ var _states = {
     }
 };
 
-},{"./request-message":13,"./routing-table-raw":15,"neo4j-driver-core":59}],17:[function(require,module,exports){
+},{"./routing-table-raw":15,"neo4j-driver-core":59}],17:[function(require,module,exports){
 "use strict";
 /**
  * Copyright (c) "Neo4j"
@@ -8013,6 +7975,7 @@ var Pool = /** @class */ (function () {
         this._pendingCreates = {};
         this._acquireRequests = {};
         this._activeResourceCounts = {};
+        this._poolState = {};
         this._release = this._release.bind(this);
         this._log = log;
         this._closed = false;
@@ -8127,7 +8090,8 @@ var Pool = /** @class */ (function () {
     };
     Pool.prototype._acquire = function (address) {
         return __awaiter(this, void 0, void 0, function () {
-            var key, pool, resource_1, numConnections, resource;
+            var key, pool, poolState, resource_1, numConnections, resource;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8136,10 +8100,13 @@ var Pool = /** @class */ (function () {
                         }
                         key = address.asKey();
                         pool = this._pools[key];
+                        poolState = this._poolState[key];
                         if (!pool) {
                             pool = [];
+                            poolState = new PoolState();
                             this._pools[key] = pool;
                             this._pendingCreates[key] = 0;
+                            this._poolState[key] = poolState;
                         }
                         _a.label = 1;
                     case 1:
@@ -8175,7 +8142,7 @@ var Pool = /** @class */ (function () {
                         _a.label = 6;
                     case 6:
                         _a.trys.push([6, , 8, 9]);
-                        return [4 /*yield*/, this._create(address, this._release)];
+                        return [4 /*yield*/, this._create(address, function (address, resource) { return _this._release(poolState, address, resource); })];
                     case 7:
                         // Invoke callback that creates actual connection
                         resource = _a.sent();
@@ -8192,7 +8159,7 @@ var Pool = /** @class */ (function () {
             });
         });
     };
-    Pool.prototype._release = function (address, resource) {
+    Pool.prototype._release = function (poolState, address, resource) {
         return __awaiter(this, void 0, void 0, function () {
             var key, pool;
             var _this = this;
@@ -8201,7 +8168,7 @@ var Pool = /** @class */ (function () {
                     case 0:
                         key = address.asKey();
                         pool = this._pools[key];
-                        if (!pool) return [3 /*break*/, 4];
+                        if (!(pool && poolState.isActive())) return [3 /*break*/, 4];
                         if (!!this._validate(resource)) return [3 /*break*/, 2];
                         if (this._log.isDebugEnabled()) {
                             this._log.debug(resource + " destroyed and can't be released to the pool " + key + " because it is not functional");
@@ -8251,11 +8218,12 @@ var Pool = /** @class */ (function () {
     };
     Pool.prototype._purgeKey = function (key) {
         return __awaiter(this, void 0, void 0, function () {
-            var pool, resource;
+            var pool, poolState, resource;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         pool = this._pools[key] || [];
+                        poolState = this._poolState[key] || new PoolState();
                         _a.label = 1;
                     case 1:
                         if (!pool.length) return [3 /*break*/, 3];
@@ -8268,7 +8236,9 @@ var Pool = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 1];
                     case 3:
+                        poolState.close();
                         delete this._pools[key];
+                        delete this._poolState[key];
                         return [2 /*return*/];
                 }
             });
@@ -8278,6 +8248,7 @@ var Pool = /** @class */ (function () {
         var _this = this;
         var key = address.asKey();
         var requests = this._acquireRequests[key];
+        var poolState = this._poolState[key];
         if (requests) {
             var pendingRequest_1 = requests.shift(); // pop a pending acquire request
             if (pendingRequest_1) {
@@ -8294,7 +8265,7 @@ var Pool = /** @class */ (function () {
                         if (pendingRequest_1.isCompleted()) {
                             // request has been completed, most likely failed by a timeout
                             // return the acquired resource back to the pool
-                            _this._release(address, resource);
+                            _this._release(poolState, address, resource);
                         }
                         else {
                             // request is still pending and can be resolved with the newly acquired resource
@@ -8367,6 +8338,18 @@ var PendingRequest = /** @class */ (function () {
     };
     return PendingRequest;
 }());
+var PoolState = /** @class */ (function () {
+    function PoolState() {
+        this._active = true;
+    }
+    PoolState.prototype.isActive = function () {
+        return this._active;
+    };
+    PoolState.prototype.close = function () {
+        this._active = false;
+    };
+    return PoolState;
+}());
 exports.default = Pool;
 
 },{"./pool-config":48,"neo4j-driver-core":59}],50:[function(require,module,exports){
@@ -8926,6 +8909,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 var Connection = /** @class */ (function () {
     function Connection() {
+        this.id = "";
+        this.databaseId = "";
     }
     /**
      * @returns {boolean} whether this connection is in a working condition
@@ -28791,7 +28776,7 @@ var Driver = /*#__PURE__*/function (_CoreDriver) {
       return new _sessionRx["default"]({
         session: this._newSession({
           defaultAccessMode: defaultAccessMode,
-          bookmarks: bookmarks,
+          bookmarkOrBookmarks: bookmarks,
           database: database,
           impersonatedUser: impersonatedUser,
           reactive: true,