neo4j-driver 5.24.0 → 5.25.0

package/lib/browser/neo4j-web.esm.js

@@ -5764,7 +5764,7 @@ var Pool$1 = /** @class */ (function () {
     };
     Pool.prototype._acquire = function (acquisitionContext, address, requireNew) {
         return __awaiter$i(this, void 0, void 0, function () {
-            var key, pool, resource_1, numConnections, resource, numConnections, resource_2;
+            var key, pool, resource_1, valid, e_1, numConnections, resource, numConnections, resource_2;
             var _this = this;
             return __generator$k(this, function (_a) {
                 switch (_a.label) {
@@ -5774,35 +5774,51 @@ var Pool$1 = /** @class */ (function () {
                         }
                         key = address.asKey();
                         pool = this._getOrInitializePoolFor(key);
-                        if (!!requireNew) return [3 /*break*/, 6];
+                        if (!!requireNew) return [3 /*break*/, 10];
                         _a.label = 1;
                     case 1:
-                        if (!(pool.length > 0)) return [3 /*break*/, 6];
+                        if (!(pool.length > 0)) return [3 /*break*/, 10];
                         resource_1 = pool.pop();
                         if (resource_1 == null) {
                             return [3 /*break*/, 1];
                         }
+                        resourceAcquired(key, this._activeResourceCounts);
                         if (this._removeIdleObserver != null) {
                             this._removeIdleObserver(resource_1);
                         }
-                        return [4 /*yield*/, this._validateOnAcquire(acquisitionContext, resource_1)];
+                        valid = false;
+                        _a.label = 2;
                     case 2:
-                        if (!_a.sent()) return [3 /*break*/, 3];
+                        _a.trys.push([2, 4, , 6]);
+                        return [4 /*yield*/, this._validateOnAcquire(acquisitionContext, resource_1)];
+                    case 3:
+                        valid = _a.sent();
+                        return [3 /*break*/, 6];
+                    case 4:
+                        e_1 = _a.sent();
+                        resourceReleased(key, this._activeResourceCounts);
+                        pool.removeInUse(resource_1);
+                        return [4 /*yield*/, this._destroy(resource_1)];
+                    case 5:
+                        _a.sent();
+                        throw e_1;
+                    case 6:
+                        if (!valid) return [3 /*break*/, 7];
                         // idle resource is valid and can be acquired
-                        resourceAcquired(key, this._activeResourceCounts);
                         if (this._log.isDebugEnabled()) {
                             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                             this._log.debug("".concat(resource_1, " acquired from the pool ").concat(key));
                         }
                         return [2 /*return*/, { resource: resource_1, pool: pool }];
-                    case 3:
+                    case 7:
+                        resourceReleased(key, this._activeResourceCounts);
                         pool.removeInUse(resource_1);
                         return [4 /*yield*/, this._destroy(resource_1)];
-                    case 4:
+                    case 8:
                         _a.sent();
-                        _a.label = 5;
-                    case 5: return [3 /*break*/, 1];
-                    case 6:
+                        _a.label = 9;
+                    case 9: return [3 /*break*/, 1];
+                    case 10:
                         // Ensure requested max pool size
                         if (this._maxSize > 0) {
                             numConnections = this.activeResourceCount(address) + this._pendingCreates[key];
@@ -5814,28 +5830,28 @@ var Pool$1 = /** @class */ (function () {
                         // there exist no idle valid resources, create a new one for acquisition
                         // Keep track of how many pending creates there are to avoid making too many connections.
                         this._pendingCreates[key] = this._pendingCreates[key] + 1;
-                        _a.label = 7;
-                    case 7:
-                        _a.trys.push([7, , 11, 12]);
+                        _a.label = 11;
+                    case 11:
+                        _a.trys.push([11, , 15, 16]);
                         numConnections = this.activeResourceCount(address) + pool.length;
-                        if (!(numConnections >= this._maxSize && requireNew)) return [3 /*break*/, 9];
+                        if (!(numConnections >= this._maxSize && requireNew)) return [3 /*break*/, 13];
                         resource_2 = pool.pop();
-                        if (!(resource_2 != null)) return [3 /*break*/, 9];
+                        if (!(resource_2 != null)) return [3 /*break*/, 13];
                         if (this._removeIdleObserver != null) {
                             this._removeIdleObserver(resource_2);
                         }
                         pool.removeInUse(resource_2);
                         return [4 /*yield*/, this._destroy(resource_2)];
-                    case 8:
+                    case 12:
                         _a.sent();
-                        _a.label = 9;
-                    case 9: return [4 /*yield*/, this._create(acquisitionContext, address, function (address, resource) { return __awaiter$i(_this, void 0, void 0, function () { return __generator$k(this, function (_a) {
+                        _a.label = 13;
+                    case 13: return [4 /*yield*/, this._create(acquisitionContext, address, function (address, resource) { return __awaiter$i(_this, void 0, void 0, function () { return __generator$k(this, function (_a) {
                             switch (_a.label) {
                                 case 0: return [4 /*yield*/, this._release(address, resource, pool)];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
                         }); }); })];
-                    case 10:
+                    case 14:
                         // Invoke callback that creates actual connection
                         resource = _a.sent();
                         pool.pushInUse(resource);
@@ -5844,11 +5860,11 @@ var Pool$1 = /** @class */ (function () {
                             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                             this._log.debug("".concat(resource, " created for the pool ").concat(key));
                         }
-                        return [3 /*break*/, 12];
-                    case 11:
+                        return [3 /*break*/, 16];
+                    case 15:
                         this._pendingCreates[key] = this._pendingCreates[key] - 1;
                         return [7 /*endfinally*/];
-                    case 12: return [2 /*return*/, { resource: resource, pool: pool }];
+                    case 16: return [2 /*return*/, { resource: resource, pool: pool }];
                 }
             });
         });
@@ -21667,7 +21683,7 @@ Object.defineProperty(version$1, "__esModule", { value: true });
 // This is set up this way to keep the version in the code in
 // sync with the npm package version, and to allow the build
 // system to control version names at packaging time.
-version$1.default = '5.24.0';
+version$1.default = '5.25.0';
 
 var lib = {};