@niledatabase/server 3.0.0-alpha.39 → 3.0.0-alpha.40

package/dist/server.esm.js

@@ -463,7 +463,7 @@ function Logger(config) {
 
 var getSecureCookies = function getSecureCookies(cfg) {
   var config = cfg.config;
-  if (process.env.NILEDB_SECURECOOKIES) {
+  if (stringCheck(process.env.NILEDB_SECURECOOKIES)) {
     return Boolean(process.env.NILEDB_SECURECOOKIES);
   }
   return config == null ? void 0 : config.secureCookies;
@@ -473,19 +473,20 @@ var getDatabaseId = function getDatabaseId(cfg) {
     logger = cfg.logger;
   var _Logger = Logger(config, '[databaseId]'),
     info = _Logger.info;
-  if (config != null && config.databaseId) {
-    logger && info(logger + "[config] " + config.databaseId);
+  if (stringCheck(config == null ? void 0 : config.databaseId)) {
+    logger && info(logger + "[config] " + (config == null ? void 0 : config.databaseId));
     return String(config == null ? void 0 : config.databaseId);
   }
-  if (process.env.NILEDB_POSTGRES_URL) {
+  var dbId = stringCheck(process.env.NILEDB_API_URL);
+  if (dbId) {
     try {
-      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
-      return pgUrl.pathname.substring(1);
+      var pgUrl = new URL(dbId);
+      return pgUrl.pathname.split('/')[3];
     } catch (e) {
       // ok to fail
     }
   }
-  logger && info(logger + "[NILEDB_ID] " + process.env.NILEDB_ID);
+  logger && info(logger + "[NILEDB_ID] " + String(process.env.NILEDB_ID));
   return process.env.NILEDB_ID;
 };
 var getUsername = function getUsername(cfg) {
@@ -497,13 +498,14 @@ var getUsername = function getUsername(cfg) {
     logger && info(logger + "[config] " + config.user);
     return String(config == null ? void 0 : config.user);
   }
-  if (process.env.NILEDB_POSTGRES_URL) {
-    var url = new URL(process.env.NILEDB_POSTGRES_URL);
+  var pg = stringCheck(process.env.NILEDB_POSTGRES_URL);
+  if (pg) {
+    var url = new URL(pg);
     if (url.username) {
       return url.username;
     }
   }
-  logger && info(logger + "[NILEDB_USER] " + process.env.NILEDB_USER);
+  logger && info(logger + "[NILEDB_USER] " + String(process.env.NILEDB_USER));
   return process.env.NILEDB_USER;
 };
 var getPassword = function getPassword(cfg) {
@@ -512,17 +514,18 @@ var getPassword = function getPassword(cfg) {
   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);
+  if (stringCheck(config == null ? void 0 : config.password)) {
+    log && info(logger + "[config] " + (config == null ? void 0 : config.password));
+    return String(config == null ? void 0 : config.password);
   }
-  if (process.env.NILEDB_POSTGRES_URL) {
-    var url = new URL(process.env.NILEDB_POSTGRES_URL);
+  var pg = stringCheck(process.env.NILEDB_POSTGRES_URL);
+  if (pg) {
+    var url = new URL(pg);
     if (url.password) {
       return url.password;
     }
   }
-  logger && info(logger + "[NILEDB_PASSWORD] " + process.env.NILEDB_PASSWORD);
+  logger && info(logger + "[NILEDB_PASSWORD] " + String(process.env.NILEDB_PASSWORD));
   return process.env.NILEDB_PASSWORD;
 };
 var getInfoBearer = function getInfoBearer(cfg) {
@@ -534,12 +537,13 @@ var getToken = function getToken(cfg) {
     logger = cfg.logger;
   var _Logger4 = Logger(config, '[token]'),
     info = _Logger4.info;
-  if (config != null && (_config$api = config.api) != null && _config$api.token) {
+  if (stringCheck(config == null || (_config$api = config.api) == null ? void 0 : _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);
+    logger && info(logger + "[config] " + (config == null || (_config$api2 = config.api) == null ? void 0 : _config$api2.token));
+    return String(config == null || (_config$api3 = config.api) == null ? void 0 : _config$api3.token);
   }
-  if (process.env.NILEDB_TOKEN) {
+  var token = stringCheck(process.env.NILEDB_TOKEN);
+  if (token) {
     logger && info(logger + "[NILEDB_TOKEN] " + process.env.NILEDB_TOKEN);
     return process.env.NILEDB_TOKEN;
   }
@@ -550,11 +554,12 @@ var getDatabaseName = function getDatabaseName(cfg) {
     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 (stringCheck(config == null ? void 0 : config.databaseName)) {
+    logger && info(logger + "[config] " + (config == null ? void 0 : config.databaseName));
+    return String(config == null ? void 0 : config.databaseName);
   }
-  if (process.env.NILEDB_NAME) {
+  var name = stringCheck(process.env.NILEDB_NAME);
+  if (name) {
     logger && info(logger + "[NILEDB_NAME] " + process.env.NILEDB_NAME);
     return process.env.NILEDB_NAME;
   }
@@ -573,13 +578,13 @@ var getTenantId = function getTenantId(cfg) {
     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 (stringCheck(config == null ? void 0 : config.tenantId)) {
+    logger && info(logger + "[config] " + (config == null ? void 0 : config.tenantId));
+    return String(config == null ? void 0 : config.tenantId);
   }
-  if (process.env.NILEDB_TENANT) {
+  if (stringCheck(process.env.NILEDB_TENANT)) {
     logger && info(logger + "[NILEDB_TENANT] " + process.env.NILEDB_TENANT);
-    return process.env.NILEDB_TENANT;
+    return String(process.env.NILEDB_TENANT);
   }
   return null;
 };
@@ -596,14 +601,15 @@ var getBasePath = function getBasePath(cfg) {
     info = _Logger7.info,
     error = _Logger7.error;
   var basePath = config == null || (_config$api4 = config.api) == null ? void 0 : _config$api4.basePath;
-  if (basePath) {
+  if (stringCheck(basePath)) {
     logger && info(logger + "[config] " + basePath);
     return basePath;
   }
-  if (process.env.NILEDB_API_URL) {
+  var envUrl = stringCheck(process.env.NILEDB_API_URL);
+  if (envUrl) {
     logger && info(logger + "[NILEDB_API_URL] " + process.env.NILEDB_API_URL);
     try {
-      var apiUrl = new URL(process.env.NILEDB_API_URL);
+      var apiUrl = new URL(envUrl);
       return apiUrl.href;
     } catch (e) {
       if (e instanceof Error) {
@@ -619,14 +625,15 @@ var getControlPlane = function getControlPlane(cfg) {
     logger = cfg.logger;
   var _Logger8 = Logger(config, '[basePath]'),
     info = _Logger8.info;
-  if (config != null && config.configureUrl) {
-    logger && info(logger + "[config] " + config.configureUrl);
-    return config.configureUrl;
+  if (stringCheck(config == null ? void 0 : config.configureUrl)) {
+    logger && info(logger + "[config] " + (config == null ? void 0 : config.configureUrl));
+    return String(config == null ? void 0 : config.configureUrl);
   }
-  if (process.env.NILEDB_CONFIGURE) {
+  var autoConfigUrl = stringCheck(process.env.NILEDB_CONFIGURE);
+  if (autoConfigUrl) {
     logger && info(logger + "[NILEDB_CONFIGURE] " + process.env.NILEDB_CONFIGURE);
     // backwards compatible, but not really
-    if (!process.env.NILEDB_CONFIGURE.startsWith('http')) {
+    if (!autoConfigUrl.startsWith('http')) {
       return "https://" + process.env.NILEDB_CONFIGURE;
     }
     return process.env.NILEDB_CONFIGURE;
@@ -639,20 +646,22 @@ function getDbHost(cfg) {
     logger = cfg.logger;
   var _Logger9 = Logger(config, '[db.host]'),
     info = _Logger9.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 (stringCheck((config == null ? void 0 : config.db) && config.db.host)) {
+    var _config$db, _config$db2;
+    logger && info(logger + "[config] " + (config == null || (_config$db = config.db) == null ? void 0 : _config$db.host));
+    return String(config == null || (_config$db2 = config.db) == null ? void 0 : _config$db2.host);
   }
-  if (process.env.NILEDB_POSTGRES_URL) {
+  var pg = stringCheck(process.env.NILEDB_POSTGRES_URL);
+  if (pg) {
     try {
-      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      var pgUrl = new URL(pg);
       logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.hostname);
       return pgUrl.hostname;
     } catch (e) {
       // ok to fail
     }
   }
-  if (process.env.NILEDB_HOST) {
+  if (stringCheck(process.env.NILEDB_HOST)) {
     logger && info(logger + "[NILEDB_HOST] " + process.env.NILEDB_HOST);
     return process.env.NILEDB_HOST;
   }
@@ -660,23 +669,24 @@ function getDbHost(cfg) {
   return 'db.thenile.dev';
 }
 function getDbPort(cfg) {
-  var _config$db;
+  var _config$db3;
   var config = cfg.config,
     logger = cfg.logger;
   var _Logger10 = Logger(config, '[db.port]'),
     info = _Logger10.info;
-  if (config != null && (_config$db = config.db) != null && _config$db.port && config.db.port != null) {
-    var _config$db2;
+  if (config != null && (_config$db3 = config.db) != null && _config$db3.port && config.db.port != null) {
+    var _config$db4;
     logger && info(logger + "[config] " + (config == null ? void 0 : config.db.port));
-    return Number((_config$db2 = config.db) == null ? void 0 : _config$db2.port);
+    return Number((_config$db4 = config.db) == null ? void 0 : _config$db4.port);
   }
-  if (process.env.NILEDB_PORT) {
+  if (stringCheck(process.env.NILEDB_PORT)) {
     logger && info(logger + "[NILEDB_PORT] " + process.env.NILEDB_PORT);
     return Number(process.env.NILEDB_PORT);
   }
-  if (process.env.NILEDB_POSTGRES_URL) {
+  var pg = stringCheck(process.env.NILEDB_POSTGRES_URL);
+  if (pg) {
     try {
-      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      var pgUrl = new URL(pg);
       if (pgUrl.port) {
         return Number(pgUrl.port);
       }
@@ -691,6 +701,12 @@ function getDbPort(cfg) {
 var logProtector = function logProtector(logger) {
   return process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ? logger : null;
 };
+var stringCheck = function stringCheck(str) {
+  if (str && str !== '') {
+    return str;
+  }
+  return;
+};
 
 var _excluded$2 = ["host", "port"],
   _excluded2 = ["host", "port"];
@@ -738,7 +754,7 @@ 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, 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;
+        var _Logger, info, error, debug, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, _config$api$cookieKey, _config$api, msg, 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:
@@ -751,7 +767,7 @@ var Config = /*#__PURE__*/function () {
               configuredPort = port != null ? port : getDbPort(envVarConfig);
               basePath = getBasePath(envVarConfig);
               if (!(configuredHost && _this.databaseName && _this.databaseId && basePath)) {
-                _context.next = 12;
+                _context.next = 14;
                 break;
               }
               info('Already configured, aborting fetch');
@@ -774,7 +790,22 @@ var Config = /*#__PURE__*/function () {
                 api: _this.api
               });
               return _context.abrupt("return", _this);
-            case 12:
+            case 14:
+              msg = [];
+              if (!configuredHost) {
+                msg.push('Database host');
+              }
+              if (!_this.databaseName) {
+                msg.push('Database name');
+              }
+              if (!_this.databaseId) {
+                msg.push('Database id');
+              }
+              if (!basePath) {
+                msg.push('API URL');
+              }
+              info("[autoconfigure] " + msg.join(', ') + " " + (msg.length > 1 ? 'are' : 'is') + " missing from the config. Autoconfiguration will run.");
+            case 20:
               cp = getControlPlane(envVarConfig);
               databaseName = getDatabaseName({
                 config: config,
@@ -785,7 +816,7 @@ var Config = /*#__PURE__*/function () {
                 url.searchParams.set('databaseName', databaseName);
               }
               info("configuring from " + url.href);
-              _context.next = 19;
+              _context.next = 27;
               return fetch(url, {
                 headers: {
                   Authorization: "Bearer " + getInfoBearer({
@@ -795,19 +826,19 @@ var Config = /*#__PURE__*/function () {
               })["catch"](function () {
                 error("Unable to auto-configure. is " + url + " available?");
               });
-            case 19:
+            case 27:
               res = _context.sent;
               if (res) {
-                _context.next = 22;
+                _context.next = 30;
                 break;
               }
               return _context.abrupt("return", _this);
-            case 22:
+            case 30:
               possibleError = res.clone();
-              _context.prev = 23;
-              _context.next = 26;
+              _context.prev = 31;
+              _context.next = 34;
               return res.json();
-            case 26:
+            case 34:
               json = _context.sent;
               if (res.status === 404) {
                 info('is the configured databaseName correct?');
@@ -819,39 +850,39 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 39;
+              _context.next = 47;
               break;
-            case 31:
-              _context.prev = 31;
-              _context.t0 = _context["catch"](23);
-              _context.next = 35;
+            case 39:
+              _context.prev = 39;
+              _context.t0 = _context["catch"](31);
+              _context.next = 43;
               return possibleError.text();
-            case 35:
+            case 43:
               message = _context.sent;
               debug('Unable to auto-configure');
               error(message);
               database = {
                 message: message
               };
-            case 39:
+            case 47:
               info('[fetched database]', database);
               if (!(process.env.NODE_ENV !== 'TEST')) {
-                _context.next = 49;
+                _context.next = 57;
                 break;
               }
               if (!('message' in database)) {
-                _context.next = 48;
+                _context.next = 56;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 47;
+                _context.next = 55;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occurred');
-            case 47:
+            case 55:
               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 48:
+            case 56:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
                 basePath = basePath || apiHost;
@@ -860,7 +891,7 @@ var Config = /*#__PURE__*/function () {
                 dburl = new URL(dbHost);
                 configuredHost = dburl.hostname;
               }
-            case 49:
+            case 57:
               _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',
@@ -880,11 +911,11 @@ var Config = /*#__PURE__*/function () {
                 api: _this.api
               });
               return _context.abrupt("return", _this);
-            case 53:
+            case 61:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[23, 31]]);
+        }, _callee, null, [[31, 39]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
@@ -1644,149 +1675,160 @@ function _fetch2() {
           }))["catch"](function (e) {
             error('[fetch][response]', {
               message: e.message,
-              stack: e.stack
+              stack: e.stack,
+              debug: 'Is nile-auth running?'
             });
+            return new Error(e);
           });
         case 15:
           response = _context.sent;
+          if (!(response instanceof Error)) {
+            _context.next = 18;
+            break;
+          }
+          return _context.abrupt("return", new ResponseError('Failed to connect to database', {
+            status: 400
+          }));
+        case 18:
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 38;
+            _context.next = 40;
             break;
           }
           if (!(typeof response.clone === 'function')) {
-            _context.next = 37;
+            _context.next = 39;
             break;
           }
-          _context.prev = 18;
+          _context.prev = 20;
           _context.t0 = debug;
           _context.t1 = "[fetch][response][" + ((_opts$method = opts == null ? void 0 : opts.method) != null ? _opts$method : 'GET') + "] " + response.status + " " + useableUrl;
-          _context.next = 23;
+          _context.next = 25;
           return response.clone().json();
-        case 23:
+        case 25:
           _context.t2 = _context.sent;
           _context.t3 = {
             body: _context.t2
           };
           (0, _context.t0)(_context.t1, _context.t3);
-          _context.next = 37;
+          _context.next = 39;
           break;
-        case 28:
-          _context.prev = 28;
-          _context.t4 = _context["catch"](18);
+        case 30:
+          _context.prev = 30;
+          _context.t4 = _context["catch"](20);
           _context.t5 = debug;
           _context.t6 = "[fetch][response][" + ((_opts$method2 = opts == null ? void 0 : opts.method) != null ? _opts$method2 : 'GET') + "] " + response.status + " " + useableUrl;
-          _context.next = 34;
+          _context.next = 36;
           return response.clone().text();
-        case 34:
+        case 36:
           _context.t7 = _context.sent;
           _context.t8 = {
             body: _context.t7
           };
           (0, _context.t5)(_context.t6, _context.t8);
-        case 37:
+        case 39:
           return _context.abrupt("return", response);
-        case 38:
+        case 40:
           if (!((response == null ? void 0 : response.status) === 404)) {
-            _context.next = 40;
+            _context.next = 42;
             break;
           }
           return _context.abrupt("return", new ResponseError('Not found', {
             status: 404
           }));
-        case 40:
+        case 42:
           if (!((response == null ? void 0 : response.status) === 401)) {
-            _context.next = 42;
+            _context.next = 44;
             break;
           }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 42:
+        case 44:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 44;
+            _context.next = 46;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 44:
+        case 46:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 46;
-          _context.next = 49;
+          _context.prev = 48;
+          _context.next = 51;
           return response == null ? void 0 : response.json();
-        case 49:
+        case 51:
           res = _context.sent;
-          _context.next = 60;
+          _context.next = 63;
           break;
-        case 52:
-          _context.prev = 52;
-          _context.t9 = _context["catch"](46);
+        case 54:
+          _context.prev = 54;
+          _context.t9 = _context["catch"](48);
           if (!errorHandler) {
-            _context.next = 59;
+            _context.next = 62;
             break;
           }
-          _context.next = 57;
+          _context.next = 59;
           return errorHandler.text();
-        case 57:
+        case 59:
           msg = _context.sent;
           if (msg) {
-            error("[fetch][response] status: " + errorHandler.status + "]", {
+            error("[fetch][response][status: " + errorHandler.status + "]", {
               message: msg
             });
           }
-        case 59:
+          return _context.abrupt("return", _context.t9);
+        case 62:
           if (!msg) {
             error('[fetch][response]', {
               e: _context.t9
             });
           }
-        case 60:
+        case 63:
           if (!msg) {
-            _context.next = 62;
+            _context.next = 65;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 62:
+        case 65:
           if (!(res && 'message' in res)) {
-            _context.next = 66;
+            _context.next = 69;
             break;
           }
           _res = res, message = _res.message;
-          error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] " + message);
+          error("[fetch][response][status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] " + message);
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 66:
+        case 69:
           if (!(res && 'errors' in res)) {
-            _context.next = 70;
+            _context.next = 73;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
-          error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] " + _message);
+          error("[fetch][response] [status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] " + _message);
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 70:
-          error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] UNHANDLED ERROR", {
+        case 73:
+          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 74:
-          _context.prev = 74;
+        case 77:
+          _context.prev = 77;
           _context.t10 = _context["catch"](12);
           return _context.abrupt("return", new ResponseError('an unexpected error has occurred', {
             status: 500
           }));
-        case 77:
+        case 80:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[12, 74], [18, 28], [46, 52]]);
+    }, _callee, null, [[12, 77], [20, 30], [48, 54]]);
   }));
   return _fetch2.apply(this, arguments);
 }