@niledatabase/server 2.3.0-alpha.2 → 2.3.0-alpha.4

package/dist/server.cjs.development.js

@@ -619,6 +619,8 @@ var logProtector = function logProtector(logger) {
   return logger ;
 };
 
+var _excluded$1 = ["host", "port"],
+  _excluded2 = ["host", "port"];
 var ApiConfig = /*#__PURE__*/function () {
   function ApiConfig(_ref) {
     var basePath = _ref.basePath,
@@ -644,6 +646,7 @@ var ApiConfig = /*#__PURE__*/function () {
 var Config = /*#__PURE__*/function () {
   function Config(_config) {
     var _this = this,
+      _config$db2,
       _config$api$cookieKey2,
       _config$api2;
     this.user = void 0;
@@ -657,25 +660,26 @@ var Config = /*#__PURE__*/function () {
     this._userId = void 0;
     this.configure = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
-        var _config$api$cookieKey, _config$api;
-        var envVarConfig, host, _Logger, info, error, basePath, port, databaseName, url, res, database, possibleError, json, message, _database, apiHost, dbHost, name, id, dburl, apiurl;
+        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;
         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;
               envVarConfig = {
                 config: config
               };
-              host = getDbHost(envVarConfig);
-              _Logger = Logger(config, '[init]'), info = _Logger.info, error = _Logger.error;
-              if (!(host && _this.databaseName && _this.databaseId)) {
-                _context.next = 6;
+              _ref3 = (_config$db = config.db) != null ? _config$db : {}, host = _ref3.host, port = _ref3.port, dbConfig = _objectWithoutPropertiesLoose(_ref3, _excluded$1);
+              configuredHost = host != null ? host : getDbHost(envVarConfig);
+              configuredPort = port != null ? port : getDbPort(envVarConfig);
+              if (!(configuredHost && _this.databaseName && _this.databaseId)) {
+                _context.next = 8;
                 break;
               }
               info('Alreaady configured, aborting fetch');
               return _context.abrupt("return", _this);
-            case 6:
+            case 8:
               basePath = getBasePath(envVarConfig);
-              port = getDbPort(envVarConfig);
               databaseName = getDatabaseName({
                 config: config,
                 logger: 'getInfo'
@@ -685,7 +689,7 @@ var Config = /*#__PURE__*/function () {
                 url.searchParams.set('databaseName', databaseName);
               }
               info(url.href);
-              _context.next = 14;
+              _context.next = 15;
               return fetch(url, {
                 headers: {
                   Authorization: "Bearer " + getInfoBearer({
@@ -693,13 +697,13 @@ var Config = /*#__PURE__*/function () {
                   })
                 }
               });
-            case 14:
+            case 15:
               res = _context.sent;
               possibleError = res.clone();
-              _context.prev = 16;
-              _context.next = 19;
+              _context.prev = 17;
+              _context.next = 20;
               return res.json();
-            case 19:
+            case 20:
               json = _context.sent;
               if (res.status === 404) {
                 info('is the configured databaseName correct?');
@@ -711,44 +715,44 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 31;
+              _context.next = 32;
               break;
-            case 24:
-              _context.prev = 24;
-              _context.t0 = _context["catch"](16);
-              _context.next = 28;
+            case 25:
+              _context.prev = 25;
+              _context.t0 = _context["catch"](17);
+              _context.next = 29;
               return possibleError.text();
-            case 28:
+            case 29:
               message = _context.sent;
               error(message);
               database = {
                 message: message
               };
-            case 31:
+            case 32:
               info('[fetched database]', database);
               if (!('message' in database)) {
-                _context.next = 40;
+                _context.next = 41;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 39;
+                _context.next = 40;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occured');
-            case 39:
-              throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
             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:
               if (typeof database === 'object') {
                 _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
                 _this.databaseId = id;
                 _this.databaseName = name;
                 dburl = new URL(dbHost);
                 apiurl = new URL(apiHost);
-                host = dburl.host;
+                configuredHost = dburl.host;
                 basePath = apiurl.origin;
               }
-            case 41:
+            case 42:
               _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',
@@ -759,17 +763,17 @@ var Config = /*#__PURE__*/function () {
               _this.db = _extends({
                 user: _this.user,
                 password: _this.password,
-                host: host,
-                port: port,
+                host: configuredHost,
+                port: configuredPort,
                 database: _this.databaseName
-              }, typeof (config == null ? void 0 : config.db) === 'object' ? config.db : {});
+              }, dbConfig);
               info('[config set]', _this);
               return _context.abrupt("return", _this);
-            case 45:
+            case 46:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[16, 24]]);
+        }, _callee, null, [[17, 25]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
@@ -786,8 +790,12 @@ var Config = /*#__PURE__*/function () {
     this.debug = Boolean(_config == null ? void 0 : _config.debug);
     this._userId = _config == null ? void 0 : _config.userId;
     var _basePath = getBasePath(_envVarConfig);
-    var _host = getDbHost(_envVarConfig);
-    var _port = getDbPort(_envVarConfig);
+    var _ref4 = (_config$db2 = _config == null ? void 0 : _config.db) != null ? _config$db2 : {},
+      _host = _ref4.host,
+      _port = _ref4.port,
+      _dbConfig = _objectWithoutPropertiesLoose(_ref4, _excluded2);
+    var _configuredHost = _host != null ? _host : getDbHost(_envVarConfig);
+    var _configuredPort = _port != null ? _port : getDbPort(_envVarConfig);
     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',
@@ -798,9 +806,9 @@ var Config = /*#__PURE__*/function () {
     this.db = _extends({
       user: this.user,
       password: this.password,
-      host: _host,
-      port: _port
-    }, typeof (_config == null ? void 0 : _config.db) === 'object' ? _config.db : {});
+      host: _configuredHost,
+      port: _configuredPort
+    }, _dbConfig);
     if (this.databaseName) {
       this.db.database = this.databaseName;
     }