@niledatabase/server 3.0.0-alpha.24 → 3.0.0-alpha.25

package/dist/server.cjs.development.js

@@ -605,8 +605,8 @@ function getDbHost(cfg) {
   }
   if (process.env.NILEDB_POSTGRES_URL) {
     var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
-    logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.host);
-    return pgUrl.host;
+    logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.hostname);
+    return pgUrl.hostname;
   }
   if (process.env.NILEDB_HOST) {
     logger && info(logger + "[NILEDB_HOST] " + process.env.NILEDB_HOST);
@@ -799,7 +799,7 @@ var Config = /*#__PURE__*/function () {
                 _this.databaseId = id;
                 _this.databaseName = name;
                 dburl = new URL(dbHost);
-                configuredHost = dburl.host;
+                configuredHost = dburl.hostname;
               }
             case 49:
               _this.api = new ApiConfig({
@@ -1020,7 +1020,7 @@ var NileDatabase = /*#__PURE__*/function () {
       remaining = _objectWithoutPropertiesLoose(poolConfig, _excluded$1);
     config.db = poolConfig;
     this.config = config;
-    debug(JSON.stringify(this.config.db));
+    debug("Connection pool config " + JSON.stringify(this.config.db));
     this.pool = createProxyForPool(new pg.Pool(remaining), this.config);
     if (typeof afterCreate === 'function') {
       warn('Providing an pool configuration will stop automatic tenant context setting.');
@@ -1033,7 +1033,7 @@ var NileDatabase = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              debug('pool connected');
+              debug("pool connected " + _this.id);
               _this.startTimeout();
               afterCreate = makeAfterCreate(config, _this.id + "-" + _this.timer);
               afterCreate(client, function (err) {
@@ -1066,6 +1066,13 @@ var NileDatabase = /*#__PURE__*/function () {
       });
       evictPool(_this.id);
     });
+    this.pool.on('release', function (destroy) {
+      if (destroy) {
+        clearTimeout(_this.timer);
+        evictPool(_this.id);
+        debug("destroying pool " + _this.id);
+      }
+    });
   }
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
@@ -1120,12 +1127,6 @@ function makeAfterCreate(config, id) {
       }
       // in this example we use pg driver's connection API
       conn.query(query.join(';'), function (err) {
-        if (query.length === 1) {
-          debug("connection context set: tenantId=" + config.tenantId);
-        }
-        if (query.length === 2) {
-          debug("connection context set: tenantId=" + config.tenantId + " userId=" + config.userId);
-        }
         if (err) {
           error('query connection failed', {
             cause: err.cause,
@@ -1134,6 +1135,13 @@ function makeAfterCreate(config, id) {
             name: err.name,
             id: id
           });
+        } else {
+          if (query.length === 1) {
+            debug("connection context set: tenantId=" + config.tenantId);
+          }
+          if (query.length === 2) {
+            debug("connection context set: tenantId=" + config.tenantId + " userId=" + config.userId);
+          }
         }
         done(err, conn);
       });