@niledatabase/server 2.4.1-alpha.0 → 2.4.2-alpha.0

package/dist/db/DBManager.d.ts

@@ -3,7 +3,10 @@ import { ServerConfig } from '../types';
 import NileDatabase from './NileInstance';
 export default class DBManager {
     connections: Map<string, NileDatabase>;
+    cleared: boolean;
     private makeId;
     constructor(config: ServerConfig);
-    getConnection(config: ServerConfig): Pool;
+    poolWatcher: (config: ServerConfig) => (id: undefined | null | string) => void;
+    getConnection: (config: ServerConfig) => Pool;
+    clear: (config: ServerConfig) => void;
 }

package/dist/server.cjs.development.js

@@ -764,7 +764,7 @@ var Config = /*#__PURE__*/function () {
               error(database);
               throw new Error('HTTP error has occured');
             case 41:
-              throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
+              throw new Error('Unable to auto-configure. Please remove NILEDB_NAME, NILEDB_API_URL, NILEDB_POSTGRES_URL, and/or NILEDB_HOST from your environment variables.');
             case 42:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
@@ -806,9 +806,17 @@ var Config = /*#__PURE__*/function () {
       config: _config,
       logger: logger
     };
-    this.databaseId = getDatbaseId(_envVarConfig);
     this.user = getUsername(_envVarConfig);
     this.password = getPassword(_envVarConfig);
+    {
+      if (!this.user) {
+        throw new Error('User is required. Set NILEDB_USER as an environment variable or set `user` in the config options.');
+      }
+      if (!this.password) {
+        throw new Error('Password is required. Set NILEDB_PASSWORD as an environment variable or set `password` in the config options.');
+      }
+    }
+    this.databaseId = getDatbaseId(_envVarConfig);
     this.databaseName = getDatabaseName(_envVarConfig);
     this._tenantId = getTenantId(_envVarConfig);
     this.debug = Boolean(_config == null ? void 0 : _config.debug);
@@ -895,6 +903,14 @@ var Eventer = /*#__PURE__*/function () {
     // store the callback function of the subscriber
     this.events[eventName].push(callback);
   };
+  _proto.unsubscribe = function unsubscribe(eventName, callback) {
+    var toRemove = this.events[eventName].findIndex(function (cb) {
+      return cb === callback;
+    });
+    if (toRemove !== -1) {
+      this.events[eventName].splice(toRemove, 1);
+    }
+  };
   return Eventer;
 }(); // tenantId manager
 var eventer = /*#__PURE__*/new Eventer();
@@ -919,6 +935,9 @@ var watchToken = function watchToken(cb) {
 var watchEvictPool = function watchEvictPool(cb) {
   return eventer.subscribe(Events.EvictPool, cb);
 };
+var closeEvictPool = function closeEvictPool(cb) {
+  return eventer.unsubscribe(Events.EvictPool, cb);
+};
 var evictPool = function evictPool(val) {
   eventer.publish(Events.EvictPool, val);
 };
@@ -1908,7 +1927,11 @@ var NileDatabase = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               info('pool failed', e);
-            case 1:
+              if (_this.timer) {
+                clearTimeout(_this.timer);
+              }
+              evictPool(_this.id);
+            case 3:
             case "end":
               return _context2.stop();
           }
@@ -1922,6 +1945,8 @@ var NileDatabase = /*#__PURE__*/function () {
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
     var _this2 = this;
+    var _Logger2 = Logger(this.config, '[NileInstance]'),
+      info = _Logger2.info;
     if (this.timer) {
       clearTimeout(this.timer);
     }
@@ -1929,11 +1954,14 @@ var NileDatabase = /*#__PURE__*/function () {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.next = 2;
-            return _this2.pool.end();
-          case 2:
-            evictPool(_this2.id);
+            info('Pool reached idleTimeoutMillis.', _this2.id, 'evicted after', _this2.config.db.idleTimeoutMillis, 'ms');
+            _context3.next = 3;
+            return _this2.pool.end(function () {
+              // something odd going on here. Without the callback, pool.end() is flakey
+            });
           case 3:
+            evictPool(_this2.id);
+          case 4:
           case "end":
             return _context3.stop();
         }
@@ -1943,9 +1971,9 @@ var NileDatabase = /*#__PURE__*/function () {
   return NileDatabase;
 }();
 function makeAfterCreate(config) {
-  var _Logger2 = Logger(config, '[afterCreate]'),
-    warn = _Logger2.warn,
-    info = _Logger2.info;
+  var _Logger3 = Logger(config, '[afterCreate]'),
+    warn = _Logger3.warn,
+    info = _Logger3.info;
   return function (conn, done) {
     conn.on('error', function errorHandler(error) {
       warn('Connection was terminated by server', error);
@@ -1975,21 +2003,59 @@ function makeAfterCreate(config) {
 }
 
 var DBManager = /*#__PURE__*/function () {
-  function DBManager(config) {
+  function DBManager(_config) {
     var _this = this;
     this.connections = void 0;
-    var _Logger = Logger(config, '[DBManager]'),
-      info = _Logger.info;
+    this.cleared = void 0;
+    this.poolWatcher = function (config) {
+      return function (id) {
+        var _Logger = Logger(config, '[DBManager]'),
+          info = _Logger.info;
+        if (id && _this.connections.has(id)) {
+          info('Removing', id, 'from db connection pool.');
+          _this.connections["delete"](id);
+        }
+      };
+    };
+    this.getConnection = function (config) {
+      var _Logger2 = Logger(config, '[DBManager]'),
+        info = _Logger2.info;
+      var id = _this.makeId(config.tenantId, config.userId);
+      var existing = _this.connections.get(id);
+      info('# of instances:', _this.connections.size);
+      if (existing) {
+        info('returning existing', id);
+        existing.startTimeout();
+        return existing.pool;
+      }
+      var newOne = new NileDatabase(new Config(config), id);
+      _this.connections.set(id, newOne);
+      info('created new', id);
+      info('# of instances:', _this.connections.size);
+      // resume listening to the evict pool if a connection is requested.
+      if (_this.cleared) {
+        _this.cleared = false;
+        watchEvictPool(_this.poolWatcher(config));
+      }
+      return newOne.pool;
+    };
+    this.clear = function (config) {
+      var _Logger3 = Logger(config, '[DBManager]'),
+        info = _Logger3.info;
+      info('Clearing all connections', _this.connections.size);
+      closeEvictPool(_this.poolWatcher(config));
+      _this.cleared = true;
+      _this.connections.clear();
+    };
+    var _Logger4 = Logger(_config, '[DBManager]'),
+      _info = _Logger4.info;
+    this.cleared = false;
     this.connections = new Map();
     // add the base one, so you can at least query
-    var id = this.makeId();
-    info('constructor', id);
-    this.connections.set(id, new NileDatabase(new Config(config), id));
-    watchEvictPool(function (id) {
-      if (id && _this.connections.has(id)) {
-        _this.connections["delete"](id);
-      }
-    });
+    var _id = this.makeId();
+    _info('constructor', _id);
+    this.connections.set(_id, new NileDatabase(new Config(_config), _id));
+    watchEvictPool(this.poolWatcher(_config));
   }
   var _proto = DBManager.prototype;
   _proto.makeId = function makeId(tenantId, userId) {
@@ -2001,22 +2067,6 @@ var DBManager = /*#__PURE__*/function () {
     }
     return 'base';
   };
-  _proto.getConnection = function getConnection(config) {
-    var _Logger2 = Logger(config, '[DBManager]'),
-      info = _Logger2.info;
-    var id = this.makeId(config.tenantId, config.userId);
-    var existing = this.connections.get(id);
-    info('# of instances:', this.connections.size);
-    if (existing) {
-      info('returning existing', id);
-      return existing.pool;
-    }
-    var newOne = new NileDatabase(new Config(config), id);
-    this.connections.set(id, newOne);
-    info('created new', id);
-    info('# of instances:', this.connections.size);
-    return newOne.pool;
-  };
   return DBManager;
 }();
 
@@ -2074,10 +2124,11 @@ var Server = /*#__PURE__*/function () {
           case 2:
             updatedConfig = _context.sent;
             this.setConfig(updatedConfig);
+            this.manager.clear(this.config);
             this.manager = new DBManager(this.config);
-            this.api = _init(updatedConfig);
+            this.api = _init(this.config);
             return _context.abrupt("return", this);
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }