@niledatabase/server 3.0.0-alpha.20 → 3.0.0-alpha.21

package/dist/db/NileInstance.d.ts

@@ -9,5 +9,6 @@ declare class NileDatabase {
     timer: NodeJS.Timeout | undefined;
     constructor(config: Config, id: string);
     startTimeout(): void;
+    shutdown(): void;
 }
 export default NileDatabase;

package/dist/server.cjs.development.js

@@ -426,6 +426,11 @@ var baseLogger = function baseLogger(config) {
         console.info("[niledb][DEBUG]" + params.join('') + " " + message, meta ? "\n" + JSON.stringify(meta, null, 2) : '');
       }
     },
+    debug: function debug(message, meta) {
+      if (config != null && config.debug) {
+        console.debug("[niledb][DEBUG]" + params.join('') + " " + message, meta ? "\n" + JSON.stringify(meta, null, 2) : '');
+      }
+    },
     warn: function warn(message, meta) {
       if (config != null && config.debug) {
         console.warn(yellow + "[niledb][WARN]" + reset + params.join('') + " " + message, JSON.stringify(meta, null, 2));
@@ -437,18 +442,20 @@ var baseLogger = function baseLogger(config) {
   };
 };
 function Logger(config) {
-  var _config$logger$info, _config$logger, _config$logger$warn, _config$logger2, _config$logger$error, _config$logger3;
+  var _config$logger$info, _config$logger, _config$logger$debug, _config$logger2, _config$logger$warn, _config$logger3, _config$logger$error, _config$logger4;
   for (var _len2 = arguments.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
     params[_key2 - 1] = arguments[_key2];
   }
   var base = baseLogger(config, params);
   var info = (_config$logger$info = config == null || (_config$logger = config.logger) == null ? void 0 : _config$logger.info) != null ? _config$logger$info : base.info;
-  var warn = (_config$logger$warn = config == null || (_config$logger2 = config.logger) == null ? void 0 : _config$logger2.warn) != null ? _config$logger$warn : base.warn;
-  var error = (_config$logger$error = config == null || (_config$logger3 = config.logger) == null ? void 0 : _config$logger3.error) != null ? _config$logger$error : base.error;
+  var debug = (_config$logger$debug = config == null || (_config$logger2 = config.logger) == null ? void 0 : _config$logger2.debug) != null ? _config$logger$debug : base.debug;
+  var warn = (_config$logger$warn = config == null || (_config$logger3 = config.logger) == null ? void 0 : _config$logger3.warn) != null ? _config$logger$warn : base.warn;
+  var error = (_config$logger$error = config == null || (_config$logger4 = config.logger) == null ? void 0 : _config$logger4.error) != null ? _config$logger$error : base.error;
   return {
     info: info,
     warn: warn,
-    error: error
+    error: error,
+    debug: debug
   };
 }
 
@@ -667,6 +674,7 @@ var Config = /*#__PURE__*/function () {
     this.databaseName = void 0;
     this.routePrefix = void 0;
     this.routes = void 0;
+    this.logger = void 0;
     this.debug = void 0;
     this.db = void 0;
     this.api = void 0;
@@ -675,11 +683,11 @@ var Config = /*#__PURE__*/function () {
     this.configure = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
         var _config$db, _config$api$cookieKey2, _config$api2;
-        var _Logger, info, error, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, _config$api$cookieKey, _config$api, cp, databaseName, url, res, database, possibleError, json, message, _database, apiHost, dbHost, name, id, dburl;
+        var _Logger, info, error, debug, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, _config$api$cookieKey, _config$api, cp, databaseName, url, res, database, possibleError, json, message, _database, apiHost, dbHost, name, id, dburl;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _Logger = Logger(config, '[init]'), info = _Logger.info, error = _Logger.error;
+              _Logger = Logger(config, '[init]'), info = _Logger.info, error = _Logger.error, debug = _Logger.debug;
               envVarConfig = {
                 config: config
               };
@@ -748,7 +756,7 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 36;
+              _context.next = 37;
               break;
             case 29:
               _context.prev = 29;
@@ -757,25 +765,26 @@ var Config = /*#__PURE__*/function () {
               return possibleError.text();
             case 33:
               message = _context.sent;
+              debug('Unable to auto-configure');
               error(message);
               database = {
                 message: message
               };
-            case 36:
+            case 37:
               info('[fetched database]', database);
               if (!('message' in database)) {
-                _context.next = 45;
+                _context.next = 46;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 44;
+                _context.next = 45;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occurred');
-            case 44:
-              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 45:
+              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 46:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
                 basePath = basePath || apiHost;
@@ -784,7 +793,7 @@ var Config = /*#__PURE__*/function () {
                 dburl = new URL(dbHost);
                 configuredHost = dburl.host;
               }
-            case 46:
+            case 47:
               _this.api = new ApiConfig({
                 basePath: basePath,
                 cookieKey: (_config$api$cookieKey2 = config == null || (_config$api2 = config.api) == null ? void 0 : _config$api2.cookieKey) != null ? _config$api$cookieKey2 : 'token',
@@ -804,7 +813,7 @@ var Config = /*#__PURE__*/function () {
                 api: _this.api
               });
               return _context.abrupt("return", _this);
-            case 50:
+            case 51:
             case "end":
               return _context.stop();
           }
@@ -819,6 +828,7 @@ var Config = /*#__PURE__*/function () {
       logger: logger
     };
     this.user = getUsername(_envVarConfig);
+    this.logger = _config == null ? void 0 : _config.logger;
     this.password = getPassword(_envVarConfig);
     {
       if (!this.user) {
@@ -990,7 +1000,8 @@ var NileDatabase = /*#__PURE__*/function () {
     this.timer = void 0;
     var _Logger = Logger(config, '[NileInstance]'),
       warn = _Logger.warn,
-      info = _Logger.info;
+      info = _Logger.info,
+      debug = _Logger.debug;
     this.id = id;
     var poolConfig = _extends({
       min: 0,
@@ -1001,7 +1012,7 @@ var NileDatabase = /*#__PURE__*/function () {
       remaining = _objectWithoutPropertiesLoose(poolConfig, _excluded$1);
     config.db = poolConfig;
     this.config = config;
-    info(JSON.stringify(this.config.db));
+    debug(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.');
@@ -1014,12 +1025,14 @@ var NileDatabase = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              info('pool connected');
-              afterCreate = makeAfterCreate(config);
+              debug('pool connected');
+              _this.startTimeout();
+              afterCreate = makeAfterCreate(config, _this.id + "-" + _this.timer);
               afterCreate(client, function (err) {
                 var _Logger2 = Logger(config, '[after create callback]'),
                   error = _Logger2.error;
                 if (err) {
+                  clearTimeout(_this.timer);
                   error('after create failed', {
                     message: err.message,
                     stack: err.stack
@@ -1027,7 +1040,6 @@ var NileDatabase = /*#__PURE__*/function () {
                   evictPool(_this.id);
                 }
               });
-              _this.startTimeout();
             case 4:
             case "end":
               return _context.stop();
@@ -1038,62 +1050,57 @@ var NileDatabase = /*#__PURE__*/function () {
         return _ref.apply(this, arguments);
       };
     }());
-    this.pool.on('error', /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(err) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              info('pool failed', {
-                message: err.message,
-                stack: err.stack
-              });
-              if (_this.timer) {
-                clearTimeout(_this.timer);
-              }
-              evictPool(_this.id);
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x2) {
-        return _ref2.apply(this, arguments);
-      };
-    }());
+    this.pool.on('error', function (err) {
+      clearTimeout(_this.timer);
+      info("pool " + _this.id + " failed", {
+        message: err.message,
+        stack: err.stack
+      });
+      evictPool(_this.id);
+    });
   }
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
     var _this2 = this,
       _Number2;
     var _Logger3 = Logger(this.config, '[NileInstance]'),
-      info = _Logger3.info;
+      debug = _Logger3.debug;
     if (this.timer) {
       clearTimeout(this.timer);
     }
     this.timer = setTimeout(function () {
       var _Number;
-      info("Pool reached idleTimeoutMillis. " + _this2.id + " evicted after " + ((_Number = Number(_this2.config.db.idleTimeoutMillis)) != null ? _Number : 30000) + "ms");
+      debug("Pool reached idleTimeoutMillis. " + _this2.id + " evicted after " + ((_Number = Number(_this2.config.db.idleTimeoutMillis)) != null ? _Number : 30000) + "ms");
       _this2.pool.end(function () {
+        clearTimeout(_this2.timer);
         evictPool(_this2.id);
-        info("Pool end called for " + _this2.id);
-        // something odd going on here. Without the callback, pool.end() is flakey
       });
     }, (_Number2 = Number(this.config.db.idleTimeoutMillis)) != null ? _Number2 : 30000);
   };
+  _proto.shutdown = function shutdown() {
+    var _this3 = this;
+    var _Logger4 = Logger(this.config, '[NileInstance]'),
+      debug = _Logger4.debug;
+    debug("attempting to shut down " + this.id);
+    clearTimeout(this.timer);
+    this.pool.end(function () {
+      debug(_this3.id + " has been shut down");
+    });
+  };
   return NileDatabase;
 }();
-function makeAfterCreate(config) {
-  var _Logger4 = Logger(config, '[afterCreate]'),
-    warn = _Logger4.warn,
-    info = _Logger4.info;
+function makeAfterCreate(config, id) {
+  var _Logger5 = Logger(config, '[afterCreate]'),
+    error = _Logger5.error,
+    warn = _Logger5.warn,
+    debug = _Logger5.debug;
   return function (conn, done) {
-    conn.on('error', function errorHandler(error) {
-      warn('Connection was terminated by server', {
-        message: error.message,
-        stack: error.stack
+    conn.on('error', function errorHandler(e) {
+      error("Connection " + id + " was terminated by server", {
+        message: e.message,
+        stack: e.stack
       });
-      done(error, conn);
+      done(e, conn);
     });
     if (config.tenantId) {
       var query = ["SET nile.tenant_id = '" + config.tenantId + "'"];
@@ -1106,10 +1113,19 @@ function makeAfterCreate(config) {
       // in this example we use pg driver's connection API
       conn.query(query.join(';'), function (err) {
         if (query.length === 1) {
-          info("[tenant id] " + config.tenantId);
+          debug("connection context set: tenantId=" + config.tenantId);
         }
         if (query.length === 2) {
-          info("[user id] " + config.userId);
+          debug("connection context set: tenantId=" + config.tenantId + " userId=" + config.userId);
+        }
+        if (err) {
+          error('query connection failed', {
+            cause: err.cause,
+            stack: err.stack,
+            message: err.message,
+            name: err.name,
+            id: id
+          });
         }
         done(err, conn);
       });
@@ -1131,6 +1147,8 @@ var DBManager = /*#__PURE__*/function () {
           warn = _Logger.warn;
         if (id && _this.connections.has(id)) {
           info("Removing " + id + " from db connection pool.");
+          var connection = _this.connections.get(id);
+          connection == null || connection.shutdown();
           _this.connections["delete"](id);
         } else {
           warn("missed eviction of " + id);
@@ -3239,7 +3257,7 @@ var appRoutes = function appRoutes(prefix) {
 };
 
 // url host does not matter, we only match on the 1st leg by path
-var ORIGIN = 'http://localhost';
+var ORIGIN = 'https://us-west-2.api.dev.thenile.dev';
 /**
  * a helper function to log in server side.
  */
@@ -3251,7 +3269,7 @@ function serverAuth(config, handlers) {
   return /*#__PURE__*/function () {
     var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _providers, _exec;
-      var email, password, sessionUrl, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _ref2, credentials, csrfCookie, signInUrl, postReq, loginRes, authCookie, _ref3, token;
+      var email, password, sessionUrl, baseHeaders, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _ref2, credentials, csrfCookie, signInUrl, postReq, loginRes, authCookie, _ref3, token;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -3262,102 +3280,101 @@ function serverAuth(config, handlers) {
             }
             throw new Error('Server side login requires a user email and password.');
           case 3:
-            info("Obtaining providers for " + email);
             sessionUrl = new URL("" + ORIGIN + routes.PROVIDERS);
-            sessionReq = new Request(sessionUrl, {
-              method: 'GET',
-              headers: new Headers({
-                host: sessionUrl.host
-              })
-            });
-            _context.next = 8;
+            baseHeaders = {
+              host: sessionUrl.host,
+              'niledb-origin': ORIGIN
+            };
+            info("Obtaining providers for " + email);
+            sessionReq = new Request(sessionUrl, _extends({
+              method: 'GET'
+            }, baseHeaders));
+            _context.next = 9;
             return handlers.POST(sessionReq);
-          case 8:
+          case 9:
             sessionRes = _context.sent;
             if (!((sessionRes == null ? void 0 : sessionRes.status) === 404)) {
-              _context.next = 11;
+              _context.next = 12;
               break;
             }
             throw new Error('Unable to login, cannot find region api.');
-          case 11:
-            _context.prev = 11;
-            _context.next = 14;
+          case 12:
+            _context.prev = 12;
+            _context.next = 15;
             return sessionRes == null ? void 0 : sessionRes.json();
-          case 14:
+          case 15:
             providers = _context.sent;
-            _context.next = 21;
+            _context.next = 22;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](11);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](12);
             info(sessionUrl, {
               sessionRes: sessionRes
             });
             error(_context.t0);
-          case 21:
+          case 22:
             info('Obtaining csrf');
             csrf = new URL("" + ORIGIN + routes.CSRF);
             csrfReq = new Request(csrf, {
               method: 'GET',
-              headers: new Headers({
-                host: sessionUrl.host
-              })
+              headers: new Headers(_extends({}, baseHeaders))
             });
-            _context.next = 26;
+            _context.next = 27;
             return handlers.POST(csrfReq);
-          case 26:
+          case 27:
             csrfRes = _context.sent;
-            _context.prev = 27;
-            _context.next = 30;
+            _context.prev = 28;
+            _context.next = 31;
             return csrfRes == null ? void 0 : csrfRes.json();
-          case 30:
+          case 31:
             _context.t1 = _yield$csrfRes$json = _context.sent;
             if (!(_context.t1 != null)) {
-              _context.next = 35;
+              _context.next = 36;
               break;
             }
             _context.t2 = _yield$csrfRes$json;
-            _context.next = 36;
+            _context.next = 37;
             break;
-          case 35:
-            _context.t2 = {};
           case 36:
+            _context.t2 = {};
+          case 37:
             json = _context.t2;
             csrfToken = json == null ? void 0 : json.csrfToken;
-            _context.next = 44;
+            _context.next = 45;
             break;
-          case 40:
-            _context.prev = 40;
-            _context.t3 = _context["catch"](27);
+          case 41:
+            _context.prev = 41;
+            _context.t3 = _context["catch"](28);
             info(sessionUrl, {
               csrfRes: csrfRes
             });
             error(_context.t3, {
               csrfRes: csrfRes
             });
-          case 44:
+          case 45:
             _ref2 = (_providers = providers) != null ? _providers : {}, credentials = _ref2.credentials;
             csrfCookie = csrfRes == null ? void 0 : csrfRes.headers.get('set-cookie');
             if (credentials) {
-              _context.next = 48;
+              _context.next = 49;
               break;
             }
             throw new Error('Unable to obtain credential provider. Aborting server side login.');
-          case 48:
+          case 49:
             signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
-              _context.next = 51;
+              _context.next = 52;
               break;
             }
             throw new Error('Unable to authenticate REST');
-          case 51:
+          case 52:
             info("Attempting sign in with email " + email);
             postReq = new Request(signInUrl, {
               method: 'POST',
-              headers: new Headers({
+              headers: new Headers(_extends({
                 'content-type': 'application/json',
                 cookie: csrfCookie
-              }),
+              }, baseHeaders)),
               body: JSON.stringify({
                 email: email,
                 password: password,
@@ -3365,36 +3382,36 @@ function serverAuth(config, handlers) {
                 callbackUrl: credentials.callbackUrl
               })
             });
-            _context.next = 55;
+            _context.next = 56;
             return handlers.POST(postReq);
-          case 55:
+          case 56:
             loginRes = _context.sent;
             authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
             if (authCookie) {
-              _context.next = 59;
+              _context.next = 60;
               break;
             }
             throw new Error('authentication failed');
-          case 59:
-            _ref3 = (_exec = /(nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
+          case 60:
+            _ref3 = (_exec = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
             if (token) {
-              _context.next = 62;
+              _context.next = 63;
               break;
             }
             throw new Error('Server login failed');
-          case 62:
+          case 63:
             info('Server login successful', {
               authCookie: authCookie,
               csrfCookie: csrfCookie
             });
-            return _context.abrupt("return", new Headers({
+            return _context.abrupt("return", new Headers(_extends({
               cookie: [token, csrfCookie].join('; ')
-            }));
-          case 64:
+            }, baseHeaders)));
+          case 65:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[11, 17], [27, 40]]);
+      }, _callee, null, [[12, 18], [28, 41]]);
     }));
     function login(_x) {
       return _login.apply(this, arguments);