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

package/dist/server.cjs.development.js

@@ -605,8 +605,8 @@ function getDbHost(cfg) {
   }
   if (process.env.NILEDB_POSTGRES_URL) {
     var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
-    logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.host);
-    return pgUrl.host;
+    logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.hostname);
+    return pgUrl.hostname;
   }
   if (process.env.NILEDB_HOST) {
     logger && info(logger + "[NILEDB_HOST] " + process.env.NILEDB_HOST);
@@ -737,14 +737,22 @@ var Config = /*#__PURE__*/function () {
                     config: config
                   })
                 }
+              })["catch"](function () {
+                error("Unable to auto-configure. is " + url + " available?");
               });
             case 19:
               res = _context.sent;
+              if (res) {
+                _context.next = 22;
+                break;
+              }
+              return _context.abrupt("return", _this);
+            case 22:
               possibleError = res.clone();
-              _context.prev = 21;
-              _context.next = 24;
+              _context.prev = 23;
+              _context.next = 26;
               return res.json();
-            case 24:
+            case 26:
               json = _context.sent;
               if (res.status === 404) {
                 info('is the configured databaseName correct?');
@@ -756,44 +764,44 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 37;
+              _context.next = 39;
               break;
-            case 29:
-              _context.prev = 29;
-              _context.t0 = _context["catch"](21);
-              _context.next = 33;
+            case 31:
+              _context.prev = 31;
+              _context.t0 = _context["catch"](23);
+              _context.next = 35;
               return possibleError.text();
-            case 33:
+            case 35:
               message = _context.sent;
               debug('Unable to auto-configure');
               error(message);
               database = {
                 message: message
               };
-            case 37:
+            case 39:
               info('[fetched database]', database);
               if (!('message' in database)) {
-                _context.next = 46;
+                _context.next = 48;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 45;
+                _context.next = 47;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occurred');
-            case 45:
+            case 47:
               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:
+            case 48:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
                 basePath = basePath || apiHost;
                 _this.databaseId = id;
                 _this.databaseName = name;
                 dburl = new URL(dbHost);
-                configuredHost = dburl.host;
+                configuredHost = dburl.hostname;
               }
-            case 47:
+            case 49:
               _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',
@@ -813,11 +821,11 @@ var Config = /*#__PURE__*/function () {
                 api: _this.api
               });
               return _context.abrupt("return", _this);
-            case 51:
+            case 53:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[21, 29]]);
+        }, _callee, null, [[23, 31]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
@@ -1012,7 +1020,7 @@ var NileDatabase = /*#__PURE__*/function () {
       remaining = _objectWithoutPropertiesLoose(poolConfig, _excluded$1);
     config.db = poolConfig;
     this.config = config;
-    debug(JSON.stringify(this.config.db));
+    debug("Connection pool config " + JSON.stringify(this.config.db));
     this.pool = createProxyForPool(new pg.Pool(remaining), this.config);
     if (typeof afterCreate === 'function') {
       warn('Providing an pool configuration will stop automatic tenant context setting.');
@@ -1025,7 +1033,7 @@ var NileDatabase = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              debug('pool connected');
+              debug("pool connected " + _this.id);
               _this.startTimeout();
               afterCreate = makeAfterCreate(config, _this.id + "-" + _this.timer);
               afterCreate(client, function (err) {
@@ -1058,6 +1066,13 @@ var NileDatabase = /*#__PURE__*/function () {
       });
       evictPool(_this.id);
     });
+    this.pool.on('release', function (destroy) {
+      if (destroy) {
+        clearTimeout(_this.timer);
+        evictPool(_this.id);
+        debug("destroying pool " + _this.id);
+      }
+    });
   }
   var _proto = NileDatabase.prototype;
   _proto.startTimeout = function startTimeout() {
@@ -1112,12 +1127,6 @@ function makeAfterCreate(config, id) {
       }
       // in this example we use pg driver's connection API
       conn.query(query.join(';'), function (err) {
-        if (query.length === 1) {
-          debug("connection context set: tenantId=" + config.tenantId);
-        }
-        if (query.length === 2) {
-          debug("connection context set: tenantId=" + config.tenantId + " userId=" + config.userId);
-        }
         if (err) {
           error('query connection failed', {
             cause: err.cause,
@@ -1126,6 +1135,13 @@ function makeAfterCreate(config, id) {
             name: err.name,
             id: id
           });
+        } else {
+          if (query.length === 1) {
+            debug("connection context set: tenantId=" + config.tenantId);
+          }
+          if (query.length === 2) {
+            debug("connection context set: tenantId=" + config.tenantId + " userId=" + config.userId);
+          }
         }
         done(err, conn);
       });
@@ -1249,8 +1265,7 @@ function request(_x, _x2, _x3) {
 }
 function _request() {
   _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, _init, config) {
-    var _params$method;
-    var _Logger, info, error, request, init, requestUrl, updatedHeaders, params, _init$body, res, loggingRes;
+    var _Logger, info, error, request, init, requestUrl, updatedHeaders, params, _init$body, _params$method, res, loggingRes;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1268,7 +1283,8 @@ function _request() {
             // @ts-expect-error - its there
             params.duplex = 'half';
           }
-          _context.next = 10;
+          _context.prev = 8;
+          _context.next = 11;
           return fetch(url, _extends({}, params))["catch"](function (e) {
             error('An error has occurred in the fetch', {
               message: e.message,
@@ -1278,16 +1294,16 @@ function _request() {
               status: 500
             });
           });
-        case 10:
+        case 11:
           res = _context.sent;
           loggingRes = typeof (res == null ? void 0 : res.clone) === 'function' ? res == null ? void 0 : res.clone() : null;
           _context.t0 = info;
           _context.t1 = "[" + ((_params$method = params.method) != null ? _params$method : 'GET') + "] " + url;
           _context.t2 = res == null ? void 0 : res.status;
           _context.t3 = res == null ? void 0 : res.statusText;
-          _context.next = 18;
+          _context.next = 19;
           return loggingRes == null ? void 0 : loggingRes.text();
-        case 18:
+        case 19:
           _context.t4 = _context.sent;
           _context.t5 = {
             status: _context.t2,
@@ -1296,11 +1312,23 @@ function _request() {
           };
           (0, _context.t0)(_context.t1, _context.t5);
           return _context.abrupt("return", res);
-        case 22:
+        case 25:
+          _context.prev = 25;
+          _context.t6 = _context["catch"](8);
+          if (_context.t6 instanceof Error) {
+            error('An error has occurred in the fetch', {
+              message: _context.t6.message,
+              stack: _context.t6.stack
+            });
+          }
+          return _context.abrupt("return", new Response('An unexpected (most likely configuration) problem has occurred', {
+            status: 500
+          }));
+        case 29:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[8, 25]]);
   }));
   return _request.apply(this, arguments);
 }
@@ -1493,8 +1521,8 @@ 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 _Logger, debug, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, response, _opts$method, _opts$method2, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
+    var _config$api, _config$api2;
+    var _Logger, debug, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, _response$status, response, _opts$method, _opts$method2, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1532,7 +1560,8 @@ function _fetch2() {
         case 14:
           useableUrl = url.replace('{tenantId}', encodeURIComponent(String(tenantId))).replace('{userId}', encodeURIComponent(String(userId)));
           debug("[fetch] " + useableUrl);
-          _context.next = 18;
+          _context.prev = 16;
+          _context.next = 19;
           return fetch(useableUrl, _extends({}, opts, {
             headers: basicHeaders
           }))["catch"](function (e) {
@@ -1541,111 +1570,111 @@ function _fetch2() {
               stack: e.stack
             });
           });
-        case 18:
+        case 19:
           response = _context.sent;
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 41;
+            _context.next = 42;
             break;
           }
           if (!(typeof response.clone === 'function')) {
-            _context.next = 40;
+            _context.next = 41;
             break;
           }
-          _context.prev = 21;
+          _context.prev = 22;
           _context.t0 = debug;
           _context.t1 = "[fetch][response][" + ((_opts$method = opts == null ? void 0 : opts.method) != null ? _opts$method : 'GET') + "] " + response.status + " " + useableUrl;
-          _context.next = 26;
+          _context.next = 27;
           return response.clone().json();
-        case 26:
+        case 27:
           _context.t2 = _context.sent;
           _context.t3 = {
             body: _context.t2
           };
           (0, _context.t0)(_context.t1, _context.t3);
-          _context.next = 40;
+          _context.next = 41;
           break;
-        case 31:
-          _context.prev = 31;
-          _context.t4 = _context["catch"](21);
+        case 32:
+          _context.prev = 32;
+          _context.t4 = _context["catch"](22);
           _context.t5 = debug;
           _context.t6 = "[fetch][response][" + ((_opts$method2 = opts == null ? void 0 : opts.method) != null ? _opts$method2 : 'GET') + "] " + response.status + " " + useableUrl;
-          _context.next = 37;
+          _context.next = 38;
           return response.clone().text();
-        case 37:
+        case 38:
           _context.t7 = _context.sent;
           _context.t8 = {
             body: _context.t7
           };
           (0, _context.t5)(_context.t6, _context.t8);
-        case 40:
-          return _context.abrupt("return", response);
         case 41:
+          return _context.abrupt("return", response);
+        case 42:
           if (!((response == null ? void 0 : response.status) === 404)) {
-            _context.next = 43;
+            _context.next = 44;
             break;
           }
           return _context.abrupt("return", new ResponseError('Not found', {
             status: 404
           }));
-        case 43:
+        case 44:
           if (!((response == null ? void 0 : response.status) === 401)) {
-            _context.next = 45;
+            _context.next = 46;
             break;
           }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 45:
+        case 46:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 47;
+            _context.next = 48;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 47:
+        case 48:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 49;
-          _context.next = 52;
+          _context.prev = 50;
+          _context.next = 53;
           return response == null ? void 0 : response.json();
-        case 52:
+        case 53:
           res = _context.sent;
-          _context.next = 63;
+          _context.next = 64;
           break;
-        case 55:
-          _context.prev = 55;
-          _context.t9 = _context["catch"](49);
+        case 56:
+          _context.prev = 56;
+          _context.t9 = _context["catch"](50);
           if (!errorHandler) {
-            _context.next = 62;
+            _context.next = 63;
             break;
           }
-          _context.next = 60;
+          _context.next = 61;
           return errorHandler.text();
-        case 60:
+        case 61:
           msg = _context.sent;
           if (msg) {
             error("[fetch][response] status: " + errorHandler.status + "]", {
               message: msg
             });
           }
-        case 62:
+        case 63:
           if (!msg) {
             error('[fetch][response]', {
               e: _context.t9
             });
           }
-        case 63:
+        case 64:
           if (!msg) {
-            _context.next = 65;
+            _context.next = 66;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 65:
+        case 66:
           if (!(res && 'message' in res)) {
-            _context.next = 69;
+            _context.next = 70;
             break;
           }
           _res = res, message = _res.message;
@@ -1653,9 +1682,9 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 69:
+        case 70:
           if (!(res && 'errors' in res)) {
-            _context.next = 73;
+            _context.next = 74;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
@@ -1663,18 +1692,24 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 73:
+        case 74:
           error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] UNHANDLED ERROR", {
             res: res
           });
           return _context.abrupt("return", new ResponseError(null, {
             status: (_response$status = response == null ? void 0 : response.status) != null ? _response$status : 500
           }));
-        case 75:
+        case 78:
+          _context.prev = 78;
+          _context.t10 = _context["catch"](16);
+          return _context.abrupt("return", new ResponseError('an unexpected error has occurred', {
+            status: 500
+          }));
+        case 81:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[21, 31], [49, 55]]);
+    }, _callee, null, [[16, 78], [22, 32], [50, 56]]);
   }));
   return _fetch2.apply(this, arguments);
 }
@@ -3268,12 +3303,13 @@ var ORIGIN = 'https://us-west-2.api.dev.thenile.dev';
 function serverAuth(config, handlers) {
   var _Logger = Logger(config, '[server side login]'),
     info = _Logger.info,
-    error = _Logger.error;
+    error = _Logger.error,
+    debug = _Logger.debug;
   var routes = appRoutes(config.routePrefix);
   return /*#__PURE__*/function () {
     var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _providers, _exec;
-      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;
+      var email, password, sessionUrl, baseHeaders, sessionReq, sessionRes, providers, csrf, csrfReq, csrfRes, csrfToken, _yield$csrfRes$json, json, _ref2, credentials, csrfCookie, signInUrl, body, postReq, loginRes, authCookie, _ref3, token, headers;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -3367,51 +3403,59 @@ function serverAuth(config, handlers) {
           case 49:
             signInUrl = new URL(credentials.callbackUrl);
             if (csrfCookie) {
-              _context.next = 52;
+              _context.next = 53;
               break;
             }
-            throw new Error('Unable to authenticate REST');
-          case 52:
-            info("Attempting sign in with email " + email);
+            debug('CSRF failed', {
+              headers: csrfRes == null ? void 0 : csrfRes.headers
+            });
+            throw new Error('Unable to authenticate REST, CSRF missing.');
+          case 53:
+            info("Attempting sign in with email " + email + " " + signInUrl.href);
+            body = JSON.stringify({
+              email: email,
+              password: password,
+              csrfToken: csrfToken,
+              callbackUrl: credentials.callbackUrl
+            });
             postReq = new Request(signInUrl, {
               method: 'POST',
-              headers: new Headers(_extends({
+              headers: new Headers(_extends({}, baseHeaders, {
                 'content-type': 'application/json',
-                cookie: csrfCookie
-              }, baseHeaders)),
-              body: JSON.stringify({
-                email: email,
-                password: password,
-                csrfToken: csrfToken,
-                callbackUrl: credentials.callbackUrl
-              })
+                cookie: csrfCookie.split(',').join('; ')
+              })),
+              body: body
             });
-            _context.next = 56;
+            _context.next = 58;
             return handlers.POST(postReq);
-          case 56:
+          case 58:
             loginRes = _context.sent;
             authCookie = loginRes == null ? void 0 : loginRes.headers.get('set-cookie');
             if (authCookie) {
-              _context.next = 60;
+              _context.next = 62;
               break;
             }
             throw new Error('authentication failed');
-          case 60:
+          case 62:
             _ref3 = (_exec = /((__Secure-)?nile\.session-token=.+?);/.exec(authCookie)) != null ? _exec : [], token = _ref3[1];
             if (token) {
-              _context.next = 63;
+              _context.next = 66;
               break;
             }
+            error('Unable to obtain auth token', {
+              authCookie: authCookie
+            });
             throw new Error('Server login failed');
-          case 63:
+          case 66:
             info('Server login successful', {
               authCookie: authCookie,
               csrfCookie: csrfCookie
             });
-            return _context.abrupt("return", new Headers(_extends({
+            headers = new Headers(_extends({}, baseHeaders, {
               cookie: [token, csrfCookie].join('; ')
-            }, baseHeaders)));
-          case 65:
+            }));
+            return _context.abrupt("return", headers);
+          case 69:
           case "end":
             return _context.stop();
         }