@niledatabase/server 1.0.0-alpha.199 → 1.0.0-alpha.201

package/dist/server.cjs.development.js

@@ -2,12 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var isEmpty = _interopDefault(require('lodash/isEmpty'));
-var isObject = _interopDefault(require('lodash/isObject'));
+var isEmpty = require('lodash/isEmpty');
+var isObject = require('lodash/isObject');
 var jose = require('jose');
-var knex = _interopDefault(require('knex'));
+var knex = require('knex');
 
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
@@ -117,7 +115,7 @@ function _regeneratorRuntime() {
   function makeInvokeMethod(e, r, n) {
     var o = h;
     return function (i, a) {
-      if (o === f) throw new Error("Generator is already running");
+      if (o === f) throw Error("Generator is already running");
       if (o === s) {
         if ("throw" === i) throw a;
         return {
@@ -259,7 +257,7 @@ function _regeneratorRuntime() {
           } else if (c) {
             if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
           } else {
-            if (!u) throw new Error("try statement without catch or finally");
+            if (!u) throw Error("try statement without catch or finally");
             if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
           }
         }
@@ -299,7 +297,7 @@ function _regeneratorRuntime() {
           return o;
         }
       }
-      throw new Error("illegal catch attempt");
+      throw Error("illegal catch attempt");
     },
     delegateYield: function (e, r, n) {
       return this.delegate = {
@@ -310,6 +308,20 @@ function _regeneratorRuntime() {
     }
   }, e;
 }
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -383,12 +395,6 @@ function _setPrototypeOf(o, p) {
   };
   return _setPrototypeOf(o, p);
 }
-function _assertThisInitialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self;
-}
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
   if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -420,31 +426,20 @@ 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 _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
-}
 
 var ApiConfig = /*#__PURE__*/function () {
   function ApiConfig(_ref) {
     var basePath = _ref.basePath,
       cookieKey = _ref.cookieKey,
       token = _ref.token;
+    this.cookieKey = void 0;
+    this.basePath = void 0;
+    this._token = void 0;
     this.basePath = basePath;
     this.cookieKey = cookieKey;
     this._token = token;
   }
-  _createClass(ApiConfig, [{
+  return _createClass(ApiConfig, [{
     key: "token",
     get: function get() {
       return this._token;
@@ -453,12 +448,17 @@ var ApiConfig = /*#__PURE__*/function () {
       this._token = value;
     }
   }]);
-  return ApiConfig;
 }();
 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;
+    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);
@@ -483,7 +483,7 @@ var Config = /*#__PURE__*/function () {
       connection: connection
     });
   }
-  _createClass(Config, [{
+  return _createClass(Config, [{
     key: "tenantId",
     get: function get() {
       return this._tenantId;
@@ -500,10 +500,10 @@ var Config = /*#__PURE__*/function () {
       this._userId = value;
     }
   }]);
-  return Config;
 }();
 
 var ResponseError = function ResponseError(body, init) {
+  this.response = void 0;
   this.response = new Response(body, init);
 };
 
@@ -516,6 +516,7 @@ var Events;
 })(Events || (Events = {}));
 var Eventer = /*#__PURE__*/function () {
   function Eventer() {
+    this.events = void 0;
     this.events = {};
   }
   var _proto = Eventer.prototype;
@@ -705,7 +706,6 @@ function _fetch2() {
 }
 
 var Requester = /*#__PURE__*/function (_Config) {
-  _inheritsLoose(Requester, _Config);
   function Requester(config) {
     var _this;
     _this = _Config.call(this, config) || this;
@@ -768,6 +768,7 @@ var Requester = /*#__PURE__*/function (_Config) {
     }();
     return _this;
   }
+  _inheritsLoose(Requester, _Config);
   var _proto = Requester.prototype;
   _proto.rawRequest = /*#__PURE__*/function () {
     var _rawRequest = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(method, url, init, body) {
@@ -801,16 +802,16 @@ var Requester = /*#__PURE__*/function (_Config) {
     }
     return rawRequest;
   }()
-  /**
-   * three optios here
-   * 1) pass in headers for a server side request
-   * 2) pass in the payload that matches the api
-   * 3) pass in the request object sent by a browser
-   * @param method
-   * @param url
-   * @param req
-   * @param init
-   * @returns
+  /**
+   * three optios here
+   * 1) pass in headers for a server side request
+   * 2) pass in the payload that matches the api
+   * 3) pass in the request object sent by a browser
+   * @param method
+   * @param url
+   * @param req
+   * @param init
+   * @returns
    */
   ;
   _proto.request =
@@ -893,7 +894,6 @@ var Requester = /*#__PURE__*/function (_Config) {
 }(Config);
 
 var Auth = /*#__PURE__*/function (_Config) {
-  _inheritsLoose(Auth, _Config);
   function Auth(config) {
     var _this;
     _this = _Config.call(this, config) || this;
@@ -906,7 +906,7 @@ var Auth = /*#__PURE__*/function (_Config) {
               headers = new Headers({
                 'content-type': 'application/json'
               });
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               params = req instanceof Request ? new URL(req.url).searchParams : new URLSearchParams();
               sso = params.get('sso');
               if (!(sso === 'true')) {
@@ -1044,7 +1044,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.database) + "/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) {
@@ -1053,7 +1053,7 @@ var Auth = /*#__PURE__*/function (_Config) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               headers = new Headers();
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               _context3.next = 4;
               return _requester.post(req, _this.signUpUrl, init)["catch"](function (e) {
                 // eslint-disable-next-line no-console
@@ -1111,7 +1111,7 @@ var Auth = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               return _context4.abrupt("return", _requester.get(req, _this.listTenantProvidersUrl, init));
             case 2:
             case "end":
@@ -1129,7 +1129,7 @@ var Auth = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               providerName = 'okta';
               return _context5.abrupt("return", _requester.post(req, _this.updateProviderUrl(providerName), init));
             case 3:
@@ -1148,7 +1148,7 @@ var Auth = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               providerName = 'okta';
               return _context6.abrupt("return", _requester.put(req, _this.updateProviderUrl(providerName), init));
             case 3:
@@ -1168,7 +1168,7 @@ var Auth = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               if (!(req && 'body' in req)) {
                 _context7.next = 5;
                 break;
@@ -1194,40 +1194,39 @@ var Auth = /*#__PURE__*/function (_Config) {
       if (typeof tenantId === 'string') {
         tenantId = param;
       } else if (param instanceof Headers) {
-        tenantId = getTenantFromHttp(param, _assertThisInitialized(_this));
+        tenantId = getTenantFromHttp(param, _this);
       }
-      return _this.api.basePath + "/workspaces/" + _this.workspace + "/databases/" + _this.database + "/tenants/" + tenantId + "/auth/oidc/callback";
+      return _this.api.basePath + "/databases/" + _this.database + "/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.database) + "/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.database) + "/tenants/auth/oidc/providers" + (email ? "?email=" + encodeURIComponent(email) : '');
   };
-  _createClass(Auth, [{
+  return _createClass(Auth, [{
     key: "loginUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/users/login";
+      return "/databases/" + encodeURIComponent(this.database) + "/users/login";
     }
   }, {
     key: "signUpUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/users";
+      return "/databases/" + encodeURIComponent(this.database) + "/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.database) + "/tenants/" + (this.tenantId ? encodeURIComponent(this.tenantId) : '{tenantId}') + "/auth/oidc/providers";
     }
   }]);
-  return Auth;
 }(Config);
 
 var Users = /*#__PURE__*/function (_Config) {
-  _inheritsLoose(Users, _Config);
   function Users(config) {
     var _this;
     _this = _Config.call(this, config) || this;
@@ -1237,7 +1236,7 @@ var Users = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               _context.next = 3;
               return _requester.post(req, _this.tenantUsersUrl, init);
             case 3:
@@ -1252,15 +1251,15 @@ var Users = /*#__PURE__*/function (_Config) {
         return _ref.apply(this, arguments);
       };
     }();
-    _this.listTenantUsers = /*#__PURE__*/function () {
+    _this.listUsers = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, init) {
         var _requester;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               _context2.next = 3;
-              return _requester.get(req, _this.tenantUsersUrl, init);
+              return _requester.get(req, _this.usersUrl, init);
             case 3:
               return _context2.abrupt("return", _context2.sent);
             case 4:
@@ -1273,15 +1272,15 @@ var Users = /*#__PURE__*/function (_Config) {
         return _ref2.apply(this, arguments);
       };
     }();
-    _this.me = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
+    _this.updateUser = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(userId, req, init) {
         var _requester;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               _context3.next = 3;
-              return _requester.get(req, _this.meUrl, init);
+              return _requester.put(req, _this.usersUrl + "/" + userId, init);
             case 3:
               return _context3.abrupt("return", _context3.sent);
             case 4:
@@ -1290,29 +1289,80 @@ var Users = /*#__PURE__*/function (_Config) {
           }
         }, _callee3);
       }));
-      return function (_x5, _x6) {
+      return function (_x5, _x6, _x7) {
         return _ref3.apply(this, arguments);
       };
     }();
+    _this.listTenantUsers = /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, init) {
+        var _requester;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _requester = new Requester(_this);
+              _context4.next = 3;
+              return _requester.get(req, _this.tenantUsersUrl, init);
+            case 3:
+              return _context4.abrupt("return", _context4.sent);
+            case 4:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      return function (_x8, _x9) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+    _this.me = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, init) {
+        var _requester;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _requester = new Requester(_this);
+              _context5.next = 3;
+              return _requester.get(req, _this.meUrl, init);
+            case 3:
+              return _context5.abrupt("return", _context5.sent);
+            case 4:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }));
+      return function (_x10, _x11) {
+        return _ref5.apply(this, arguments);
+      };
+    }();
     return _this;
   }
-  _createClass(Users, [{
+  _inheritsLoose(Users, _Config);
+  return _createClass(Users, [{
+    key: "baseUrl",
+    get: function get() {
+      return "/databases/" + encodeURIComponent(this.database);
+    }
+  }, {
+    key: "usersUrl",
+    get: function get() {
+      return this.baseUrl + "/users";
+    }
+  }, {
     key: "tenantUsersUrl",
     get: function get() {
       var _this$tenantId;
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/users";
+      return this.baseUrl + "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/users";
     }
   }, {
     key: "meUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/users/me";
+      return "/databases/" + encodeURIComponent(this.database) + "/users/me";
     }
   }]);
-  return Users;
 }(Config);
 
 var Tenants = /*#__PURE__*/function (_Config) {
-  _inheritsLoose(Tenants, _Config);
   function Tenants(config) {
     var _this;
     _this = _Config.call(this, config) || this;
@@ -1322,7 +1372,7 @@ var Tenants = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               return _context.abrupt("return", _requester.post(req, _this.tenantsUrl, init));
             case 2:
             case "end":
@@ -1340,7 +1390,7 @@ var Tenants = /*#__PURE__*/function (_Config) {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _requester = new Requester(_assertThisInitialized(_this));
+              _requester = new Requester(_this);
               return _context2.abrupt("return", _requester.get(req, _this.tenantUrl, init));
             case 2:
             case "end":
@@ -1354,93 +1404,125 @@ var Tenants = /*#__PURE__*/function (_Config) {
     }();
     return _this;
   }
-  _createClass(Tenants, [{
+  _inheritsLoose(Tenants, _Config);
+  return _createClass(Tenants, [{
     key: "tenantsUrl",
     get: function get() {
-      return "/workspaces/" + encodeURIComponent(this.workspace) + "/databases/" + encodeURIComponent(this.database) + "/tenants";
+      return "/databases/" + encodeURIComponent(this.database) + "/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.database) + "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}');
     }
   }]);
-  return Tenants;
 }(Config);
 
-// doing this now, to provide flexibility later
 var NileDatabase = /*#__PURE__*/function () {
   function NileDatabase(config, id) {
     var _config$db$connection,
+      _config$db$connection2,
+      _config$db$pool,
       _this = this;
+    this.knex = void 0;
+    this.tenantId = void 0;
+    this.userId = void 0;
+    this.id = void 0;
+    this.config = void 0;
+    this.timer = void 0;
     this.id = id;
-    var poolConfig = {};
-    var afterCreate = function afterCreate(conn, done) {
-      var query = ["SET nile.tenant_id = '" + config.tenantId + "'"];
-      if (config.userId) {
-        if (!config.tenantId) {
-          // eslint-disable-next-line no-console
-          console.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) {
-        done(err, conn);
-      });
-    };
-    if (config.tenantId) {
-      var _config$db$pool;
-      if ((_config$db$pool = config.db.pool) != null && _config$db$pool.afterCreate) {
-        // eslint-disable-next-line no-console
-        console.log('Providing an pool configuration will stop automatic tenant context setting.');
-      } else if (config.db.pool) {
-        poolConfig = _extends({}, config.db.pool, {
-          afterCreate: afterCreate
-        });
-      } else if (!config.db.pool) {
-        poolConfig = {
-          afterCreate: afterCreate
-        };
-      }
-    }
+    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: (_config$db$connection = config.db.connection.database) != null ? _config$db$connection : config.database
+          database: database
         }),
         pool: poolConfig
       })
     });
-    var knexConfig = _extends({}, this.config.db, {
+    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;
+    }
     // start the timer for cleanup
     this.startTimeout();
-    this.knex = knex(knexConfig);
-    this.knex.on('query', function () {
-      _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);
+    })));
   }
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
-    var _this2 = this,
-      _this$config$db$pool$;
+    var _this2 = this;
     if (this.timer) {
       clearTimeout(this.timer);
     }
-    this.timer = setTimeout(function () {
-      _this2.knex.destroy();
-      evictPool(_this2.id);
-    }, (_this$config$db$pool$ = this.config.db.pool.idleTimeoutMillis) != null ? _this$config$db$pool$ : 30000);
+    this.timer = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return _this2.knex.client.pool.destroy();
+          case 2:
+            _context2.next = 4;
+            return _this2.knex.destroy();
+          case 4:
+            evictPool(_this2.id);
+          case 5:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    })), this.config.db.pool.idleTimeoutMillis);
   };
   return NileDatabase;
 }();
+function makeAfterCreate(config) {
+  return function (conn, done) {
+    conn.on('error', function errorHandler(error) {
+      console.log('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');
+        }
+        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);
+        done(err, conn);
+      });
+    }
+    done(null, conn);
+  };
+}
 
 var DBManager = /*#__PURE__*/function () {
   function DBManager(config) {
     var _this = this;
+    this.connections = void 0;
     this.connections = new Map();
     // add the base one, so you can at least query
     var id = this.makeId();
@@ -1494,6 +1576,10 @@ var init = function init(config) {
 var Server = /*#__PURE__*/function () {
   function Server(config) {
     var _this = this;
+    this.config = void 0;
+    this.api = void 0;
+    this.manager = void 0;
+    this.servers = void 0;
     this.config = new Config(config);
     this.servers = new Map();
     var _init = init(this.config),
@@ -1514,10 +1600,10 @@ var Server = /*#__PURE__*/function () {
   _proto.setConfig = function setConfig(cfg) {
     this.config = new Config(cfg);
   };
-  /**
-   * A utility function if you want to manage different NileDB instances yourself
-   * returns the global Server object, an existing server that's already been configured,
-   * or a new one if the config isn't in the cache
+  /**
+   * A utility function if you want to manage different NileDB instances yourself
+   * returns the global Server object, an existing server that's already been configured,
+   * or a new one if the config isn't in the cache
    */
   _proto.getInstance = function getInstance(config) {
     var _config = _extends({}, this.config, config);
@@ -1528,12 +1614,21 @@ 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);
+      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;
       return existing;
     }
     this.servers.set(serverId, new Server(_config));
     return this.servers.get(serverId);
   };
-  _createClass(Server, [{
+  return _createClass(Server, [{
     key: "database",
     set: function set(val) {
       if (val) {
@@ -1606,7 +1701,6 @@ var Server = /*#__PURE__*/function () {
       return this.manager.getConnection(this.config).knex;
     }
   }]);
-  return Server;
 }(); // export default Server;
 function Nile(config) {
   var server = new Server(config);