@niledatabase/server 2.4.0-alpha.0 → 2.4.0-alpha.1

package/README.md

@@ -55,7 +55,7 @@ Configuration passed to `Server` takes precedence over `.env` vars.
 | db            | `PoolConfig` |                 | Configuration object for [pg.Pool](https://node-postgres.com/apis/pool). |
 | db.host       | `string`     | NILEDB_HOST     | Base host for DB. Defaut is `db.thenile.dev`                             |
 | api           | `object`     |                 | Configuration object for API settings.                                   |
-| api.basePath  | `string`     | NILEDB_API      | Base host for API for a specific region.                                 |
+| api.basePath  | `string`     | NILEDB_API_URL  | Base host for API for a specific region.                                 |
 | api.cookieKey | `string`     |                 | Key for API cookie. Default is `token`.                                  |
 | api.token     | `string`     | NILEDB_TOKEN    | Token for API authentication. Mostly for debugging.                      |
 | debug         | `boolean`    |                 | Flag for enabling debug logging.                                         |

package/dist/server.cjs.development.js

@@ -483,6 +483,10 @@ var getDatbaseId = function getDatbaseId(cfg) {
     logger && info(logger, 'config', config.databaseId);
     return String(config == null ? void 0 : config.databaseId);
   }
+  if (process.env.NILEDB_POSTGRES_URL) {
+    var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+    return pgUrl.pathname.substring(1);
+  }
   logger && info(logger, 'env', process.env.NILEDB_ID);
   return process.env.NILEDB_ID;
 };
@@ -495,7 +499,7 @@ var getUsername = function getUsername(cfg) {
     logger && info(logger, 'config', config.user);
     return String(config == null ? void 0 : config.user);
   }
-  logger && info(logger, '.env', process.env.NILEDB_USER);
+  logger && info(logger, 'NILEDB_USER', process.env.NILEDB_USER);
   return process.env.NILEDB_USER;
 };
 var getPassword = function getPassword(cfg) {
@@ -508,7 +512,7 @@ var getPassword = function getPassword(cfg) {
     log && info(logger, 'config', config.password);
     return String(config.password);
   }
-  log && info(logger, '.env', process.env.NILEDB_PASSWORD);
+  log && info(logger, 'NILEDB_PASSWORD', process.env.NILEDB_PASSWORD);
   return process.env.NILEDB_PASSWORD;
 };
 var getInfoBearer = function getInfoBearer(cfg) {
@@ -526,7 +530,7 @@ var getToken = function getToken(cfg) {
     return String((_config$api3 = config.api) == null ? void 0 : _config$api3.token);
   }
   if (process.env.NILEDB_TOKEN) {
-    logger && info(logger, '.env', process.env.NILEDB_TOKEN);
+    logger && info(logger, 'NILEDB_TOKEN', process.env.NILEDB_TOKEN);
     return process.env.NILEDB_TOKEN;
   }
   return undefined;
@@ -541,7 +545,7 @@ var getDatabaseName = function getDatabaseName(cfg) {
     return String(config.databaseName);
   }
   if (process.env.NILEDB_NAME) {
-    logger && info(logger, 'config', process.env.NILEDB_NAME);
+    logger && info(logger, 'NILEDB_NAME', process.env.NILEDB_NAME);
     return process.env.NILEDB_NAME;
   }
   return null;
@@ -556,7 +560,7 @@ var getTenantId = function getTenantId(cfg) {
     return config.tenantId;
   }
   if (process.env.NILEDB_TENANT) {
-    logger && info(logger, '.env', process.env.NILEDB_TENANT);
+    logger && info(logger, 'NILEDB_TENANT', process.env.NILEDB_TENANT);
     return process.env.NILEDB_TENANT;
   }
   return null;
@@ -573,24 +577,42 @@ var getBasePath = function getBasePath(cfg) {
     logger && info(logger, 'config', config == null || (_config$api5 = config.api) == null ? void 0 : _config$api5.basePath);
     return basePath;
   }
-  if (process.env.NILEDB_API) {
-    logger && info(logger, '.env', process.env.NILEDB_API);
-    return "https://" + process.env.NILEDB_API;
+  if (process.env.NILEDB_API_URL) {
+    logger && info(logger, 'NILEDB_API_URL', process.env.NILEDB_API_URL);
+    var apiUrl = new URL(process.env.NILEDB_API_URL);
+    return apiUrl.origin;
   }
-  logger && info(logger, 'default', process.env.NILEDB_API);
+  logger && info(logger, 'default', 'https://api.thenile.dev');
   return 'https://api.thenile.dev';
 };
-function getDbHost(cfg) {
+var getControlPlane = function getControlPlane(cfg) {
   var config = cfg.config,
     logger = cfg.logger;
-  var _Logger8 = Logger(config, '[db.host]'),
+  var _Logger8 = Logger(config, '[basePath]'),
     info = _Logger8.info;
+  if (process.env.NILEDB_CONFIGURE) {
+    logger && info(logger, 'NILEDB_CONFIGURE', process.env.NILEDB_CONFIGURE);
+    return "https://" + process.env.NILEDB_CONFIGURE;
+  }
+  logger && info(logger, 'default', process.env.NILEDB_CONFIGURE);
+  return 'https://api.thenile.dev';
+};
+function getDbHost(cfg) {
+  var config = cfg.config,
+    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 (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;
+  }
   if (process.env.NILEDB_HOST) {
-    logger && info(logger, '.env', process.env.NILEDB_HOST);
+    logger && info(logger, 'NILEDB_HOST', process.env.NILEDB_HOST);
     return process.env.NILEDB_HOST;
   }
   logger && info(logger, 'default', 'db.thenile.dev');
@@ -600,8 +622,8 @@ function getDbPort(cfg) {
   var _config$db;
   var config = cfg.config,
     logger = cfg.logger;
-  var _Logger9 = Logger(config, '[db.port]'),
-    info = _Logger9.info;
+  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;
     logger && info(logger, 'config', config == null ? void 0 : config.db.port);
@@ -644,7 +666,7 @@ var ApiConfig = /*#__PURE__*/function () {
   }]);
 }();
 var Config = /*#__PURE__*/function () {
-  function Config(_config) {
+  function Config(_config, logger) {
     var _this = this,
       _config$db2,
       _config$api$cookieKey2,
@@ -661,7 +683,7 @@ var Config = /*#__PURE__*/function () {
     this.configure = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
         var _config$db, _config$api$cookieKey, _config$api;
-        var _Logger, info, error, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, databaseName, url, res, database, possibleError, json, message, _database, apiHost, dbHost, name, id, dburl, apiurl;
+        var _Logger, info, error, envVarConfig, _ref3, host, port, dbConfig, configuredHost, configuredPort, basePath, cp, databaseName, url, res, database, possibleError, json, message, _database, apiHost, dbHost, name, id, dburl, apiurl;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -680,16 +702,17 @@ var Config = /*#__PURE__*/function () {
               return _context.abrupt("return", _this);
             case 8:
               basePath = getBasePath(envVarConfig);
+              cp = getControlPlane(envVarConfig);
               databaseName = getDatabaseName({
                 config: config,
                 logger: 'getInfo'
               });
-              url = new URL(basePath + "/databases/configure");
+              url = new URL(cp + "/databases/configure");
               if (databaseName) {
                 url.searchParams.set('databaseName', databaseName);
               }
               info(url.href);
-              _context.next = 15;
+              _context.next = 16;
               return fetch(url, {
                 headers: {
                   Authorization: "Bearer " + getInfoBearer({
@@ -697,13 +720,13 @@ var Config = /*#__PURE__*/function () {
                   })
                 }
               });
-            case 15:
+            case 16:
               res = _context.sent;
               possibleError = res.clone();
-              _context.prev = 17;
-              _context.next = 20;
+              _context.prev = 18;
+              _context.next = 21;
               return res.json();
-            case 20:
+            case 21:
               json = _context.sent;
               if (res.status === 404) {
                 info('is the configured databaseName correct?');
@@ -715,34 +738,34 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 32;
+              _context.next = 33;
               break;
-            case 25:
-              _context.prev = 25;
-              _context.t0 = _context["catch"](17);
-              _context.next = 29;
+            case 26:
+              _context.prev = 26;
+              _context.t0 = _context["catch"](18);
+              _context.next = 30;
               return possibleError.text();
-            case 29:
+            case 30:
               message = _context.sent;
               error(message);
               database = {
                 message: message
               };
-            case 32:
+            case 33:
               info('[fetched database]', database);
               if (!('message' in database)) {
-                _context.next = 41;
+                _context.next = 42;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 40;
+                _context.next = 41;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occured');
-            case 40:
-              throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
             case 41:
+              throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
+            case 42:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
                 _this.databaseId = id;
@@ -752,7 +775,7 @@ var Config = /*#__PURE__*/function () {
                 configuredHost = dburl.host;
                 basePath = apiurl.origin;
               }
-            case 42:
+            case 43:
               _this.api = new ApiConfig({
                 basePath: basePath,
                 cookieKey: (_config$api$cookieKey = config == null || (_config$api = config.api) == null ? void 0 : _config$api.cookieKey) != null ? _config$api$cookieKey : 'token',
@@ -769,18 +792,19 @@ var Config = /*#__PURE__*/function () {
               }, dbConfig);
               info('[config set]', _this);
               return _context.abrupt("return", _this);
-            case 46:
+            case 47:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[17, 25]]);
+        }, _callee, null, [[18, 26]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
       };
     }();
     var _envVarConfig = {
-      config: _config
+      config: _config,
+      logger: logger
     };
     this.databaseId = getDatbaseId(_envVarConfig);
     this.user = getUsername(_envVarConfig);
@@ -2021,7 +2045,7 @@ var Server = /*#__PURE__*/function () {
     this.api = void 0;
     this.manager = void 0;
     this.servers = void 0;
-    this.config = new Config(config);
+    this.config = new Config(config, '[initial config]');
     this.servers = new Map();
     this.api = _init(this.config);
     this.manager = new DBManager(this.config);