@niledatabase/server 1.0.0 → 2.1.0

package/dist/server.esm.js

@@ -1,7 +1,9 @@
+import syncFetch from 'sync-fetch';
+import 'dotenv/config';
 import isEmpty from 'lodash-es/isEmpty';
 import isObject from 'lodash-es/isObject';
 import { decodeJwt } from 'jose';
-import knex from 'knex';
+import { Pool } from 'pg';
 
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
@@ -391,6 +393,18 @@ function _setPrototypeOf(o, p) {
   };
   return _setPrototypeOf(o, p);
 }
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+  return target;
+}
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
   if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -423,6 +437,189 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
+function Logger(config) {
+  for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    params[_key - 1] = arguments[_key];
+  }
+  return {
+    info: function info() {
+      if (config != null && config.debug) {
+        var _console;
+        for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+          args[_key2] = arguments[_key2];
+        }
+        // eslint-disable-next-line no-console
+        (_console = console).info.apply(_console, ['[niledb]'].concat(params, args));
+      }
+    },
+    warn: function warn() {
+      if (config != null && config.debug) {
+        var _console2;
+        for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+          args[_key3] = arguments[_key3];
+        }
+        // eslint-disable-next-line no-console
+        (_console2 = console).warn.apply(_console2, ['[niledb]'].concat(params, args));
+      }
+    },
+    error: function error() {
+      if (config != null && config.debug) {
+        var _console3;
+        for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+          args[_key4] = arguments[_key4];
+        }
+        // eslint-disable-next-line no-console
+        (_console3 = console).error.apply(_console3, ['[niledb]', '[ERROR]'].concat(params, args));
+      }
+    }
+  };
+}
+
+var getDatbaseId = function getDatbaseId(cfg) {
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger = Logger(config, '[databaseId]'),
+    info = _Logger.info;
+  if (config != null && config.databaseId) {
+    logger && info(logger, 'config', config.databaseId);
+    return String(config == null ? void 0 : config.databaseId);
+  }
+  logger && info(logger, 'env', process.env.NILEDB_ID);
+  return process.env.NILEDB_ID;
+};
+var getUsername = function getUsername(cfg) {
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger2 = Logger(config, '[username]'),
+    info = _Logger2.info;
+  if (config != null && config.user) {
+    logger && info(logger, 'config', config.user);
+    return String(config == null ? void 0 : config.user);
+  }
+  logger && info(logger, '.env', process.env.NILEDB_USER);
+  return process.env.NILEDB_USER;
+};
+var getPassword = function getPassword(cfg) {
+  var config = cfg.config,
+    logger = cfg.logger;
+  var log = logProtector(logger);
+  var _Logger3 = Logger(config, '[password]'),
+    info = _Logger3.info;
+  if (config != null && config.password) {
+    log && info(logger, 'config', config.password);
+    return String(config.password);
+  }
+  log && info(logger, '.env', process.env.NILEDB_PASSWORD);
+  return process.env.NILEDB_PASSWORD;
+};
+var getInfoBearer = function getInfoBearer(cfg) {
+  return getUsername(cfg) + ":" + getPassword(cfg);
+};
+var getToken = function getToken(cfg) {
+  var _config$api;
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger4 = Logger(config, '[token]'),
+    info = _Logger4.info;
+  if (config != null && (_config$api = config.api) != null && _config$api.token) {
+    var _config$api2, _config$api3;
+    logger && info(logger, 'config', (_config$api2 = config.api) == null ? void 0 : _config$api2.token);
+    return String((_config$api3 = config.api) == null ? void 0 : _config$api3.token);
+  }
+  if (process.env.NILEDB_TOKEN) {
+    logger && info(logger, '.env', process.env.NILEDB_TOKEN);
+    return process.env.NILEDB_TOKEN;
+  }
+  return undefined;
+};
+var getDatabaseName = function getDatabaseName(cfg) {
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger5 = Logger(config, '[databaseName]'),
+    info = _Logger5.info;
+  if (config != null && config.databaseName) {
+    logger && info(logger, 'config', config.databaseName);
+    return String(config.databaseName);
+  }
+  if (process.env.NILEDB_NAME) {
+    logger && info(logger, 'config', process.env.NILEDB_NAME);
+    return process.env.NILEDB_NAME;
+  }
+  return null;
+};
+var getTenantId = function getTenantId(cfg) {
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger6 = Logger(config, '[tenantId]'),
+    info = _Logger6.info;
+  if (config != null && config.tenantId) {
+    logger && info(logger, 'config', config.tenantId);
+    return config.tenantId;
+  }
+  if (process.env.NILEDB_TENANT) {
+    logger && info(logger, '.env', process.env.NILEDB_TENANT);
+    return process.env.NILEDB_TENANT;
+  }
+  return null;
+};
+var getBasePath = function getBasePath(cfg) {
+  var _config$api4;
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger7 = Logger(config, '[basePath]'),
+    info = _Logger7.info;
+  var basePath = config == null || (_config$api4 = config.api) == null ? void 0 : _config$api4.basePath;
+  if (basePath) {
+    var _config$api5;
+    logger && info(logger, 'config', config == null || (_config$api5 = config.api) == null ? void 0 : _config$api5.basePath);
+    return basePath;
+  }
+  if (process.env.NILEDB_API) {
+    logger && info(logger, '.env', process.env.NILEDB_API);
+    return "https://" + process.env.NILEDB_API;
+  }
+  logger && info(logger, 'default', process.env.NILEDB_API);
+  return 'https://api.thenile.dev';
+};
+function getDbHost(cfg) {
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger8 = Logger(config, '[db.host]'),
+    info = _Logger8.info;
+  if (config != null && config.db && config.db.host) {
+    logger && info(logger, 'config', config == null ? void 0 : config.db.host);
+    return config.db.host;
+  }
+  if (process.env.NILEDB_HOST) {
+    logger && info(logger, '.env', process.env.NILEDB_HOST);
+    return process.env.NILEDB_HOST;
+  }
+  logger && info(logger, 'default', 'db.thenile.dev');
+  return 'db.thenile.dev';
+}
+function getDbPort(cfg) {
+  var _config$db;
+  var config = cfg.config,
+    logger = cfg.logger;
+  var _Logger9 = Logger(config, '[db.port]'),
+    info = _Logger9.info;
+  if (config != null && (_config$db = config.db) != null && _config$db.port && config.db.port != null) {
+    var _config$db2;
+    logger && info(logger, 'config', config == null ? void 0 : config.db.port);
+    return Number((_config$db2 = config.db) == null ? void 0 : _config$db2.port);
+  }
+  if (process.env.NILEDB_PORT) {
+    logger && info(logger, 'config', process.env.NILEDB_PORT);
+    return Number(process.env.NILEDB_PORT);
+  }
+  logger && info(logger, 'default', 5432);
+  return 5432;
+}
+// don't let people accidentally log secrets to production
+var logProtector = function logProtector(logger) {
+  return process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ? logger : null;
+};
+
 var ApiConfig = /*#__PURE__*/function () {
   function ApiConfig(_ref) {
     var basePath = _ref.basePath,
@@ -445,39 +642,81 @@ var ApiConfig = /*#__PURE__*/function () {
     }
   }]);
 }();
-var niledatabase_url = 'thenile.dev';
 var Config = /*#__PURE__*/function () {
-  function Config(_config) {
-    var _config$api$basePath, _config$api, _config$api$cookieKey, _config$api2, _config$api3, _config$db, _config$db2, _config$db3, _config$db4, _config$db5;
-    this.database = void 0;
-    this.workspace = void 0;
+  function Config(config, allowPhoneHome) {
+    var _config$api$cookieKey, _config$api;
+    this.user = void 0;
+    this.password = void 0;
+    this.databaseId = void 0;
+    this.databaseName = void 0;
+    this.debug = void 0;
     this.db = void 0;
     this.api = void 0;
     this._tenantId = void 0;
     this._userId = void 0;
-    // always provided
-    this.database = String(_config == null ? void 0 : _config.database);
-    this.workspace = String(_config == null ? void 0 : _config.workspace);
-    // set the context
-    this._tenantId = _config == null ? void 0 : _config.tenantId;
-    this._userId = _config == null ? void 0 : _config.userId;
-    // api config
+    var _Logger = Logger(config, '[config]'),
+      info = _Logger.info,
+      error = _Logger.error;
+    var envVarConfig = {
+      config: config
+    };
+    if (allowPhoneHome) {
+      envVarConfig.logger = '[config]';
+    }
+    this.databaseId = getDatbaseId(envVarConfig);
+    this.user = getUsername(envVarConfig);
+    this.password = getPassword(envVarConfig);
+    this.databaseName = getDatabaseName(envVarConfig);
+    this._tenantId = getTenantId(envVarConfig);
+    this.debug = Boolean(config == null ? void 0 : config.debug);
+    var basePath = getBasePath(envVarConfig);
+    var host = getDbHost(envVarConfig);
+    var port = getDbPort(envVarConfig);
+    this._userId = config == null ? void 0 : config.userId;
+    if (allowPhoneHome && (!host || !this.databaseName || !this.databaseId)) {
+      var database = getInfo(config);
+      info('[fetched database]', database);
+      if (process.env.NODE_ENV !== 'TEST') {
+        if ('message' in database) {
+          if ('statusCode' in database) {
+            error(database);
+            throw new Error('HTTP error has occured');
+          } else {
+            throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
+          }
+        }
+        if (typeof database === 'object') {
+          var apiHost = database.apiHost,
+            dbHost = database.dbHost,
+            name = database.name,
+            id = database.id;
+          this.databaseId = id;
+          this.databaseName = name;
+          // gotta do something dumb here
+          var dburl = new URL(dbHost);
+          var apiurl = new URL(apiHost);
+          host = dburl.host;
+          basePath = apiurl.origin;
+        }
+      }
+    }
     this.api = new ApiConfig({
-      basePath: (_config$api$basePath = _config == null || (_config$api = _config.api) == null ? void 0 : _config$api.basePath) != null ? _config$api$basePath : "https://api." + niledatabase_url,
-      cookieKey: (_config$api$cookieKey = _config == null || (_config$api2 = _config.api) == null ? void 0 : _config$api2.cookieKey) != null ? _config$api$cookieKey : 'token',
-      token: _config == null || (_config$api3 = _config.api) == null ? void 0 : _config$api3.token
+      basePath: basePath,
+      cookieKey: (_config$api$cookieKey = config == null || (_config$api = config.api) == null ? void 0 : _config$api.cookieKey) != null ? _config$api$cookieKey : 'token',
+      token: getToken({
+        config: config
+      })
     });
-    // db config
-    var host = _config != null && _config.db && _config.db.connection && typeof ((_config$db = _config.db) == null ? void 0 : _config$db.connection) !== 'string' && 'host' in _config.db.connection ? String(_config.db.connection.host) : "db." + niledatabase_url;
-    var port = _config != null && (_config$db2 = _config.db) != null && _config$db2.connection && typeof ((_config$db3 = _config.db) == null ? void 0 : _config$db3.connection) !== 'string' && 'port' in _config.db.connection ? Number((_config$db4 = _config.db) == null || (_config$db4 = _config$db4.connection) == null ? void 0 : _config$db4.port) : 5432;
-    var connection = _extends({
+    this.db = _extends({
+      user: this.user,
+      password: this.password,
       host: host,
       port: port,
-      database: _config == null ? void 0 : _config.database
-    }, typeof (_config == null || (_config$db5 = _config.db) == null ? void 0 : _config$db5.connection) === 'object' ? _config.db.connection : {});
-    this.db = _extends({}, _config == null ? void 0 : _config.db, {
-      connection: connection
-    });
+      database: this.databaseName
+    }, typeof (config == null ? void 0 : config.db) === 'object' ? config.db : {});
+    if (allowPhoneHome) {
+      info(this);
+    }
   }
   return _createClass(Config, [{
     key: "tenantId",
@@ -497,6 +736,49 @@ var Config = /*#__PURE__*/function () {
     }
   }]);
 }();
+function getInfo(config) {
+  var basePath = getBasePath({
+    config: config
+  });
+  var databaseName = getDatabaseName({
+    config: config,
+    logger: 'getInfo'
+  });
+  var url = new URL(basePath + "/databases/configure");
+  if (databaseName) {
+    url.searchParams.set('databaseName', databaseName);
+  }
+  var _Logger2 = Logger(config, '[getInfo]'),
+    info = _Logger2.info,
+    error = _Logger2.error;
+  info(url.href);
+  var res = syncFetch(url, {
+    headers: {
+      Authorization: "Bearer " + getInfoBearer({
+        config: config
+      })
+    }
+  });
+  var possibleError = res.clone();
+  try {
+    var json = res.json();
+    if (res.status === 404) {
+      info('is the configured databaseName correct?');
+    }
+    if (json.status && json.status !== 'READY') {
+      return {
+        message: 'Database is not ready yet'
+      };
+    }
+    return json;
+  } catch (e) {
+    var message = possibleError.text();
+    error(message);
+    return {
+      message: message
+    };
+  }
+}
 
 var ResponseError = function ResponseError(body, init) {
   this.response = void 0;
@@ -614,10 +896,11 @@ function _fetch(_x, _x2, _x3) {
 function _fetch2() {
   _fetch2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, path, opts) {
     var _config$api, _config$api2, _response$status;
-    var url, cookieKey, headers, basicHeaders, authHeader, _config$api3, token, _config$api4, tenantId, userId, useableUrl, response, res, _res, message, _res2, _res2$errors, _message;
+    var _Logger, info, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, response, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          _Logger = Logger(config, '[server]'), info = _Logger.info, error = _Logger.error;
           url = "" + ((_config$api = config.api) == null ? void 0 : _config$api.basePath) + path;
           cookieKey = (_config$api2 = config.api) == null ? void 0 : _config$api2.cookieKey;
           headers = new Headers(opts == null ? void 0 : opts.headers);
@@ -628,8 +911,12 @@ function _fetch2() {
             token = getTokenFromCookie(headers, cookieKey);
             if (token) {
               basicHeaders.set('Authorization', "Bearer " + token);
-            } else if ((_config$api3 = config.api) != null && _config$api3.token) {
-              basicHeaders.set('Authorization', "Bearer " + ((_config$api4 = config.api) == null ? void 0 : _config$api4.token));
+            } else if (getToken({
+              config: config
+            })) {
+              basicHeaders.set('Authorization', "Bearer " + getToken({
+                config: config
+              }));
             }
           }
           tenantId = getTenantFromHttp(headers, config);
@@ -637,66 +924,105 @@ function _fetch2() {
           userId = getUserFromHttp(headers, config);
           updateUserId(userId);
           if (!(url.includes('{tenantId}') && !tenantId)) {
-            _context.next = 13;
+            _context.next = 14;
             break;
           }
           return _context.abrupt("return", new ResponseError('tenantId is not set for request', {
             status: 400
           }));
-        case 13:
+        case 14:
           useableUrl = url.replace('{tenantId}', encodeURIComponent(String(tenantId))).replace('{userId}', encodeURIComponent(String(userId)));
-          _context.next = 16;
+          info('[fetch]', useableUrl);
+          _context.next = 18;
           return fetch(useableUrl, _extends({}, opts, {
             headers: basicHeaders
           }))["catch"](function (e) {
-            // eslint-disable-next-line no-console
-            console.log(e);
+            error('[fetch]', '[response]', e);
           });
-        case 16:
+        case 18:
           response = _context.sent;
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 19;
+            _context.next = 27;
+            break;
+          }
+          if (!(typeof response.clone === 'function')) {
+            _context.next = 26;
             break;
           }
+          _context.t0 = info;
+          _context.next = 24;
+          return response.clone().json();
+        case 24:
+          _context.t1 = _context.sent;
+          (0, _context.t0)('[fetch]', '[response]', _context.t1);
+        case 26:
           return _context.abrupt("return", response);
-        case 19:
-          _context.prev = 19;
-          _context.next = 22;
+        case 27:
+          errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
+          msg = '';
+          _context.prev = 29;
+          _context.next = 32;
           return response == null ? void 0 : response.json();
-        case 22:
+        case 32:
           res = _context.sent;
-          _context.next = 27;
+          _context.next = 43;
           break;
-        case 25:
-          _context.prev = 25;
-          _context.t0 = _context["catch"](19);
-        case 27:
+        case 35:
+          _context.prev = 35;
+          _context.t2 = _context["catch"](29);
+          if (!errorHandler) {
+            _context.next = 42;
+            break;
+          }
+          _context.next = 40;
+          return errorHandler.text();
+        case 40:
+          msg = _context.sent;
+          if (msg) {
+            error('[fetch]', '[response]', "[status: " + errorHandler.status + "]", msg);
+          }
+        case 42:
+          if (!msg) {
+            error('[fetch]', '[response]', _context.t2);
+          }
+        case 43:
+          if (!msg) {
+            _context.next = 45;
+            break;
+          }
+          return _context.abrupt("return", new ResponseError(msg, {
+            status: errorHandler == null ? void 0 : errorHandler.status
+          }));
+        case 45:
           if (!(res && 'message' in res)) {
-            _context.next = 30;
+            _context.next = 49;
             break;
           }
           _res = res, message = _res.message;
+          error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", message);
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 30:
+        case 49:
           if (!(res && 'errors' in res)) {
-            _context.next = 33;
+            _context.next = 53;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
+          error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", _message);
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 33:
+        case 53:
+          error('[fetch]', '[response]', "[status: " + (errorHandler == null ? void 0 : errorHandler.status) + "]", 'UNHANDLED ERROR');
           return _context.abrupt("return", new ResponseError(null, {
             status: (_response$status = response == null ? void 0 : response.status) != null ? _response$status : 500
           }));
-        case 34:
+        case 55:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[19, 25]]);
+    }, _callee, null, [[29, 35]]);
   }));
   return _fetch2.apply(this, arguments);
 }
@@ -1040,7 +1366,7 @@ var Auth = /*#__PURE__*/function (_Config) {
     };
     _this.loginSSOUrl = function (provider) {
       var _this$tenantId;
-      return "/workspaces/" + encodeURIComponent(_this.workspace) + "/databases/" + encodeURIComponent(_this.database) + "/tenants/" + ((_this$tenantId = _this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/auth/oidc/providers/" + provider + "/login";
+      return "/databases/" + encodeURIComponent(_this.databaseId) + "/tenants/" + ((_this$tenantId = _this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/auth/oidc/providers/" + provider + "/login";
     };
     _this.signUp = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
@@ -1192,32 +1518,32 @@ var Auth = /*#__PURE__*/function (_Config) {
       } else if (param instanceof Headers) {
         tenantId = getTenantFromHttp(param, _this);
       }
-      return _this.api.basePath + "/workspaces/" + _this.workspace + "/databases/" + _this.database + "/tenants/" + tenantId + "/auth/oidc/callback";
+      return "/databases/" + _this.databaseId + "/tenants/" + tenantId + "/auth/oidc/callback";
     };
     return _this;
   }
   _inheritsLoose(Auth, _Config);
   var _proto = Auth.prototype;
   _proto.updateProviderUrl = function updateProviderUrl(providerName) {
-    return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants/" + (this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}') + "/auth/oidc/providers/" + encodeURIComponent(providerName);
+    return "/databases/" + encodeURIComponent(this.databaseId) + "/tenants/" + (this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}') + "/auth/oidc/providers/" + encodeURIComponent(providerName);
   };
   _proto.providerUrl = function providerUrl(email) {
-    return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants/auth/oidc/providers" + (email ? "?email=" + encodeURIComponent(email) : '');
+    return "/databases/" + encodeURIComponent(this.databaseId) + "/tenants/auth/oidc/providers" + (email ? "?email=" + encodeURIComponent(email) : '');
   };
   return _createClass(Auth, [{
     key: "loginUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/users/login";
+      return "/databases/" + encodeURIComponent(this.databaseId) + "/users/login";
     }
   }, {
     key: "signUpUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/users";
+      return "/databases/" + encodeURIComponent(this.databaseId) + "/users";
     }
   }, {
     key: "listTenantProvidersUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants/" + (this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}') + "/auth/oidc/providers";
+      return "/databases/" + encodeURIComponent(this.databaseId) + "/tenants/" + (this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}') + "/auth/oidc/providers";
     }
   }]);
 }(Config);
@@ -1337,7 +1663,7 @@ var Users = /*#__PURE__*/function (_Config) {
   return _createClass(Users, [{
     key: "baseUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database);
+      return "/databases/" + encodeURIComponent(this.databaseId);
     }
   }, {
     key: "usersUrl",
@@ -1353,7 +1679,7 @@ var Users = /*#__PURE__*/function (_Config) {
   }, {
     key: "meUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/users/me";
+      return "/databases/" + encodeURIComponent(this.databaseId) + "/users/me";
     }
   }]);
 }(Config);
@@ -1404,66 +1730,87 @@ var Tenants = /*#__PURE__*/function (_Config) {
   return _createClass(Tenants, [{
     key: "tenantsUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants";
+      return "/databases/" + encodeURIComponent(this.databaseId) + "/tenants";
     }
   }, {
     key: "tenantUrl",
     get: function get() {
       var _this$tenantId;
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}');
+      return "/databases/" + encodeURIComponent(this.databaseId) + "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}');
     }
   }]);
 }(Config);
 
+var _excluded = ["afterCreate"];
 var NileDatabase = /*#__PURE__*/function () {
   function NileDatabase(config, id) {
-    var _config$db$connection,
-      _config$db$connection2,
-      _config$db$pool,
-      _this = this;
-    this.knex = void 0;
+    var _this = this;
+    this.pool = void 0;
     this.tenantId = void 0;
     this.userId = void 0;
     this.id = void 0;
     this.config = void 0;
     this.timer = void 0;
+    var _Logger = Logger(config, '[NileInstance]'),
+      warn = _Logger.warn,
+      info = _Logger.info;
     this.id = id;
     var poolConfig = _extends({
       min: 0,
       max: 10,
       idleTimeoutMillis: 30000
-    }, config.db.pool);
-    var database = (_config$db$connection = (_config$db$connection2 = config.db.connection) == null ? void 0 : _config$db$connection2.database) != null ? _config$db$connection : config.database;
-    this.config = _extends({}, config, {
-      db: _extends({}, config.db, {
-        connection: _extends({}, config.db.connection, {
-          database: database
-        }),
-        pool: poolConfig
-      })
-    });
-    this.knex = knex(_extends({}, this.config.db, {
-      client: 'pg'
-    }));
-    if ((_config$db$pool = config.db.pool) != null && _config$db$pool.afterCreate) {
-      console.log('Providing an pool configuration will stop automatic tenant context setting.');
-    } else {
-      var afterCreate = makeAfterCreate(config);
-      poolConfig.afterCreate = afterCreate;
+    }, config.db);
+    var afterCreate = poolConfig.afterCreate,
+      remaining = _objectWithoutPropertiesLoose(poolConfig, _excluded);
+    config.db = poolConfig;
+    this.config = config;
+    info(this.config);
+    this.pool = new Pool(remaining);
+    if (typeof afterCreate === 'function') {
+      warn('Providing an pool configuration will stop automatic tenant context setting.');
     }
     // start the timer for cleanup
     this.startTimeout();
-    this.knex.on('query', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _this.startTimeout();
-          case 1:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })));
+    this.pool.on('connect', /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(client) {
+        var afterCreate;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              info('pool connected');
+              afterCreate = makeAfterCreate(config);
+              afterCreate(client, function (err, _client) {
+                if (err) {
+                  _client.release();
+                }
+              });
+              _this.startTimeout();
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+    this.pool.on('error', /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              info('pool failed', e);
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function (_x2) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
@@ -1471,43 +1818,48 @@ var NileDatabase = /*#__PURE__*/function () {
     if (this.timer) {
       clearTimeout(this.timer);
     }
-    this.timer = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    this.timer = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.next = 2;
-            return _this2.knex.client.pool.destroy();
+            _context3.next = 2;
+            return _this2.pool.end();
           case 2:
-            _context2.next = 4;
-            return _this2.knex.destroy();
-          case 4:
             evictPool(_this2.id);
-          case 5:
+          case 3:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
-    })), this.config.db.pool.idleTimeoutMillis);
+      }, _callee3);
+    })), this.config.db.idleTimeoutMillis);
   };
   return NileDatabase;
 }();
 function makeAfterCreate(config) {
+  var _Logger2 = Logger(config, '[afterCreate]'),
+    warn = _Logger2.warn,
+    info = _Logger2.info;
   return function (conn, done) {
     conn.on('error', function errorHandler(error) {
-      console.log('Connection was terminated by server', error);
+      warn('Connection was terminated by server', error);
       done(error, conn);
     });
     if (config.tenantId) {
       var query = ["SET nile.tenant_id = '" + config.tenantId + "'"];
       if (config.userId) {
         if (!config.tenantId) {
-          console.warn('A user id cannot be set in context without a tenant id');
+          warn('A user id cannot be set in context without a tenant id');
         }
         query.push("SET nile.user_id = '" + config.userId + "'");
       }
       // in this example we use pg driver's connection API
       conn.query(query.join(';'), function (err) {
-        console.log('tenant id and user id set', config.userId, config.tenantId);
+        if (config.tenantId) {
+          info('[tenant id]', config.tenantId);
+        }
+        if (config.userId) {
+          info('[user id]', config.userId);
+        }
         done(err, conn);
       });
     }
@@ -1519,9 +1871,12 @@ var DBManager = /*#__PURE__*/function () {
   function DBManager(config) {
     var _this = this;
     this.connections = void 0;
+    var _Logger = Logger(config, '[DBManager]'),
+      info = _Logger.info;
     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)) {
@@ -1540,13 +1895,20 @@ 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) {
-      return existing;
+      info('returning existing', id);
+      return existing.pool;
     }
-    this.connections.set(id, new NileDatabase(new Config(config), id));
-    return this.connections.get(id);
+    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;
 }();
@@ -1576,7 +1938,7 @@ var Server = /*#__PURE__*/function () {
     this.api = void 0;
     this.manager = void 0;
     this.servers = void 0;
-    this.config = new Config(config);
+    this.config = new Config(config, true);
     this.servers = new Map();
     var _init = init(this.config),
       api = _init[0];
@@ -1594,7 +1956,7 @@ var Server = /*#__PURE__*/function () {
   }
   var _proto = Server.prototype;
   _proto.setConfig = function setConfig(cfg) {
-    this.config = new Config(cfg);
+    this.config = new Config(cfg, false);
   };
   /**
    * A utility function if you want to manage different NileDB instances yourself
@@ -1611,38 +1973,26 @@ var Server = /*#__PURE__*/function () {
     var existing = this.servers.get(serverId);
     if (existing) {
       // be sure the config is up to date
-      var updatedConfig = new Config(_config);
+      var updatedConfig = new Config(_config, false);
       existing.setConfig(updatedConfig);
       // propagage special config items
       existing.tenantId = updatedConfig.tenantId;
       existing.userId = updatedConfig.userId;
       existing.token = updatedConfig.api.token;
-      existing.workspace = updatedConfig.workspace;
-      existing.database = updatedConfig.database;
+      existing.databaseId = updatedConfig.databaseId;
       return existing;
     }
     this.servers.set(serverId, new Server(_config));
     return this.servers.get(serverId);
   };
   return _createClass(Server, [{
-    key: "database",
-    set: function set(val) {
-      if (val) {
-        this.config.database = val;
-        this.config.db.connection.database = val;
-        this.api.auth.database = val;
-        this.api.users.database = val;
-        this.api.tenants.database = val;
-      }
-    }
-  }, {
-    key: "workspace",
+    key: "databaseId",
     set: function set(val) {
       if (val) {
-        this.config.workspace = val;
-        this.api.auth.workspace = val;
-        this.api.users.workspace = val;
-        this.api.tenants.workspace = val;
+        this.config.databaseId = val;
+        this.api.auth.databaseId = val;
+        this.api.users.databaseId = val;
+        this.api.tenants.databaseId = val;
       }
     }
   }, {
@@ -1651,7 +2001,7 @@ var Server = /*#__PURE__*/function () {
       return this.config.userId;
     },
     set: function set(userId) {
-      this.database = this.config.database;
+      this.databaseId = this.config.databaseId;
       this.config.userId = userId;
       if (this.api) {
         this.api.auth.userId = this.config.userId;
@@ -1665,7 +2015,7 @@ var Server = /*#__PURE__*/function () {
       return this.config.tenantId;
     },
     set: function set(tenantId) {
-      this.database = this.config.database;
+      this.databaseId = this.config.databaseId;
       this.config.tenantId = tenantId;
       if (this.api) {
         this.api.auth.tenantId = tenantId;
@@ -1693,14 +2043,13 @@ var Server = /*#__PURE__*/function () {
     key: "db",
     get: function get() {
       // only need to interact with the knex object
-      //@ts-expect-error - because that's where it is in the proxy
-      return this.manager.getConnection(this.config).knex;
+      return this.manager.getConnection(this.config);
     }
   }]);
 }(); // export default Server;
 function Nile(config) {
   var server = new Server(config);
-  server.setConfig(new Config(config));
+  // server.setConfig(new Config(config as ServerConfig, false));
   return server;
 }