@niledatabase/server 2.1.2-alpha.1 → 2.2.0-alpha.0

package/README.md

@@ -7,13 +7,15 @@ Consolidates the API and DB for working with Nile.
 ### With configuration object
 
 ```ts
-import Server from '@niledatabase/server';
+import Nile from '@niledatabase/server';
 
-const nile = Server({
+const nile = new Nile({
   user: 'username',
   password: 'password',
 });
 
+await nile.init();
+
 await nile.api.createTenant({ name: 'name' });
 
 await nile.db.query('select * from todo');
@@ -27,18 +29,20 @@ NILEDB_PASSWORD=password
 ```
 
 ```ts
-import Server from '@niledatabase/server';
+import Nile from '@niledatabase/server';
+
+const nile = new Nile();
 
-const nile = Server();
+await nile.init();
 
 await nile.api.createTenant({ name: 'name' });
 
 await nile.db.query('select * from todo');
 ```
 
-## Auto-configuration
+## Initialization
 
-In addition to `user` and `password`, a fully configured SDK must also have values for `db.host`, `databaseName`, and `databaseId`. If the values are not provided in either the `.env` file or the instance configuration, the SDK will automatically phone home to configure itself. For production, it is recommended to set those values.
+In addition to `user` and `password`, a fully configured SDK must also have values for `db.host`, `databaseName`, and `databaseId`. If the values are not provided in either the `.env` file or the instance configuration, the `init()` function should be called, which will allow the SDK to automatically configure itself. For production, it is recommended to set those values.
 
 ## Configuration
 

package/dist/Server.d.ts

@@ -16,6 +16,7 @@ declare class Server {
     private servers;
     constructor(config?: ServerConfig);
     setConfig(cfg: Config): void;
+    init(cfg?: Config): Promise<void>;
     set databaseId(val: string | void);
     get userId(): string | undefined | null;
     set userId(userId: string | undefined | null);
@@ -31,5 +32,4 @@ declare class Server {
      */
     getInstance(config: ServerConfig): Server;
 }
-export default function Nile(config?: ServerConfig): Server;
-export {};
+export default Server;

package/dist/db/DBManager.d.ts

@@ -1,9 +1,9 @@
 import { Pool } from 'pg';
-import { Config } from '../utils/Config';
+import { ServerConfig } from '../types';
 import NileDatabase from './NileInstance';
 export default class DBManager {
     connections: Map<string, NileDatabase>;
     private makeId;
-    constructor(config: Config);
-    getConnection(config: Config): Pool;
+    constructor(config: ServerConfig);
+    getConnection(config: ServerConfig): Pool;
 }

package/dist/server.cjs.development.js

@@ -647,8 +647,10 @@ var ApiConfig = /*#__PURE__*/function () {
   }]);
 }();
 var Config = /*#__PURE__*/function () {
-  function Config(config, allowPhoneHome) {
-    var _config$api$cookieKey, _config$api;
+  function Config(_config) {
+    var _this = this,
+      _config$api$cookieKey2,
+      _config$api2;
     this.user = void 0;
     this.password = void 0;
     this.databaseId = void 0;
@@ -658,69 +660,138 @@ var Config = /*#__PURE__*/function () {
     this.api = void 0;
     this._tenantId = void 0;
     this._userId = void 0;
-    var _Logger = Logger(config, '[config]'),
-      info = _Logger.info,
-      error = _Logger.error;
-    var envVarConfig = {
-      config: config
-    };
-    if (allowPhoneHome) {
-      envVarConfig.logger = '[config]';
-    }
-    this.databaseId = getDatbaseId(envVarConfig);
-    this.user = getUsername(envVarConfig);
-    this.password = getPassword(envVarConfig);
-    this.databaseName = getDatabaseName(envVarConfig);
-    this._tenantId = getTenantId(envVarConfig);
-    this.debug = Boolean(config == null ? void 0 : config.debug);
-    var basePath = getBasePath(envVarConfig);
-    var host = getDbHost(envVarConfig);
-    var port = getDbPort(envVarConfig);
-    this._userId = config == null ? void 0 : config.userId;
-    if (allowPhoneHome && (!host || !this.databaseName || !this.databaseId)) {
-      var database = getInfo(config);
-      info('[fetched database]', database);
-      {
-        if ('message' in database) {
-          if ('statusCode' in database) {
-            error(database);
-            throw new Error('HTTP error has occured');
-          } else {
-            throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
+    this.configure = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
+        var _config$api$cookieKey, _config$api;
+        var _Logger, info, error, envVarConfig, basePath, host, port, 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
+              };
+              basePath = getBasePath(envVarConfig);
+              host = getDbHost(envVarConfig);
+              port = getDbPort(envVarConfig);
+              databaseName = getDatabaseName({
+                config: config,
+                logger: 'getInfo'
+              });
+              url = new URL(basePath + "/databases/configure");
+              if (databaseName) {
+                url.searchParams.set('databaseName', databaseName);
+              }
+              info(url.href);
+              res = syncFetch(url, {
+                headers: {
+                  Authorization: "Bearer " + getInfoBearer({
+                    config: config
+                  })
+                }
+              });
+              possibleError = res.clone();
+              try {
+                json = res.json();
+                if (res.status === 404) {
+                  info('is the configured databaseName correct?');
+                }
+                if (json.status && json.status !== 'READY') {
+                  database = {
+                    message: 'Database is not ready yet'
+                  };
+                } else {
+                  database = json;
+                }
+              } catch (e) {
+                message = possibleError.text();
+                error(message);
+                database = {
+                  message: message
+                };
+              }
+              if (!(!host || !_this.databaseName || !_this.databaseId)) {
+                _context.next = 23;
+                break;
+              }
+              info('[fetched database]', database);
+              if (!('message' in database)) {
+                _context.next = 22;
+                break;
+              }
+              if (!('statusCode' in database)) {
+                _context.next = 21;
+                break;
+              }
+              error(database);
+              throw new Error('HTTP error has occured');
+            case 21:
+              throw new Error('Unable to auto-configure. Please set or remove NILEDB_API, NILEDB_NAME, and NILEDB_HOST in your .env file.');
+            case 22:
+              if (typeof database === 'object') {
+                _database = database, apiHost = _database.apiHost, dbHost = _database.dbHost, name = _database.name, id = _database.id;
+                _this.databaseId = id;
+                _this.databaseName = name;
+                // gotta do something dumb here
+                dburl = new URL(dbHost);
+                apiurl = new URL(apiHost);
+                host = dburl.host;
+                basePath = apiurl.origin;
+              }
+            case 23:
+              _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',
+                token: getToken({
+                  config: config
+                })
+              });
+              _this.db = _extends({
+                user: _this.user,
+                password: _this.password,
+                host: host,
+                port: port,
+                database: _this.databaseName
+              }, typeof (config == null ? void 0 : config.db) === 'object' ? config.db : {});
+              info('[config set]', _this);
+              return _context.abrupt("return", _this);
+            case 27:
+            case "end":
+              return _context.stop();
           }
-        }
-        if (typeof database === 'object') {
-          var apiHost = database.apiHost,
-            dbHost = database.dbHost,
-            name = database.name,
-            id = database.id;
-          this.databaseId = id;
-          this.databaseName = name;
-          // gotta do something dumb here
-          var dburl = new URL(dbHost);
-          var apiurl = new URL(apiHost);
-          host = dburl.host;
-          basePath = apiurl.origin;
-        }
-      }
-    }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    var _envVarConfig = {
+      config: _config
+    };
+    this.databaseId = getDatbaseId(_envVarConfig);
+    this.user = getUsername(_envVarConfig);
+    this.password = getPassword(_envVarConfig);
+    this.databaseName = getDatabaseName(_envVarConfig);
+    this._tenantId = getTenantId(_envVarConfig);
+    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);
     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',
+      basePath: _basePath,
+      cookieKey: (_config$api$cookieKey2 = _config == null || (_config$api2 = _config.api) == null ? void 0 : _config$api2.cookieKey) != null ? _config$api$cookieKey2 : 'token',
       token: getToken({
-        config: config
+        config: _config
       })
     });
     this.db = _extends({
       user: this.user,
       password: this.password,
-      host: host,
-      port: port,
+      host: _host,
+      port: _port,
       database: this.databaseName
-    }, typeof (config == null ? void 0 : config.db) === 'object' ? config.db : {});
-    if (allowPhoneHome) {
-      info(this);
-    }
+    }, typeof (_config == null ? void 0 : _config.db) === 'object' ? _config.db : {});
   }
   return _createClass(Config, [{
     key: "tenantId",
@@ -740,49 +811,6 @@ var Config = /*#__PURE__*/function () {
     }
   }]);
 }();
-function getInfo(config) {
-  var basePath = getBasePath({
-    config: config
-  });
-  var databaseName = getDatabaseName({
-    config: config,
-    logger: 'getInfo'
-  });
-  var url = new URL(basePath + "/databases/configure");
-  if (databaseName) {
-    url.searchParams.set('databaseName', databaseName);
-  }
-  var _Logger2 = Logger(config, '[getInfo]'),
-    info = _Logger2.info,
-    error = _Logger2.error;
-  info(url.href);
-  var res = syncFetch(url, {
-    headers: {
-      Authorization: "Bearer " + getInfoBearer({
-        config: config
-      })
-    }
-  });
-  var possibleError = res.clone();
-  try {
-    var json = res.json();
-    if (res.status === 404) {
-      info('is the configured databaseName correct?');
-    }
-    if (json.status && json.status !== 'READY') {
-      return {
-        message: 'Database is not ready yet'
-      };
-    }
-    return json;
-  } catch (e) {
-    var message = possibleError.text();
-    error(message);
-    return {
-      message: message
-    };
-  }
-}
 
 var ResponseError = function ResponseError(body, init) {
   this.response = void 0;
@@ -1925,15 +1953,15 @@ var makeServerId = function makeServerId(config) {
   return Buffer.from(JSON.stringify(config), 'base64').toString();
 };
 
-var init = function init(config) {
+var _init = function init(config) {
   var auth = new Auth(config);
   var users = new Users(config);
   var tenants = new Tenants(config);
-  return [{
+  return {
     auth: auth,
     users: users,
     tenants: tenants
-  }];
+  };
 };
 var Server = /*#__PURE__*/function () {
   function Server(config) {
@@ -1942,11 +1970,9 @@ var Server = /*#__PURE__*/function () {
     this.api = void 0;
     this.manager = void 0;
     this.servers = void 0;
-    this.config = new Config(config, true);
+    this.config = new Config(config);
     this.servers = new Map();
-    var _init = init(this.config),
-      api = _init[0];
-    this.api = api;
+    this.api = _init(this.config);
     this.manager = new DBManager(this.config);
     watchTenantId(function (tenantId) {
       _this.tenantId = tenantId;
@@ -1960,8 +1986,32 @@ var Server = /*#__PURE__*/function () {
   }
   var _proto = Server.prototype;
   _proto.setConfig = function setConfig(cfg) {
-    this.config = new Config(cfg, false);
+    this.config = new Config(cfg);
   };
+  _proto.init = /*#__PURE__*/function () {
+    var _init2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cfg) {
+      var updatedConfig;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return this.config.configure(_extends({}, this.config, cfg));
+          case 2:
+            updatedConfig = _context.sent;
+            this.setConfig(updatedConfig);
+            this.manager = new DBManager(this.config);
+            this.api = _init(updatedConfig);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this);
+    }));
+    function init(_x) {
+      return _init2.apply(this, arguments);
+    }
+    return init;
+  }();
   /**
    * A utility function if you want to manage different NileDB instances yourself
    * returns the global Server object, an existing server that's already been configured,
@@ -1977,7 +2027,7 @@ var Server = /*#__PURE__*/function () {
     var existing = this.servers.get(serverId);
     if (existing) {
       // be sure the config is up to date
-      var updatedConfig = new Config(_config, false);
+      var updatedConfig = new Config(_config);
       existing.setConfig(updatedConfig);
       // propagage special config items
       existing.tenantId = updatedConfig.tenantId;
@@ -2050,14 +2100,7 @@ var Server = /*#__PURE__*/function () {
       return this.manager.getConnection(this.config);
     }
   }]);
-}(); // export default Server;
-function Nile(config) {
-  var server = new Server(config);
-  // server.setConfig(new Config(config as ServerConfig, false));
-  return server;
-}
-
-module.exports = Nile;
+}();
 
-exports.default = Nile;
+exports.default = Server;
 //# sourceMappingURL=server.cjs.development.js.map