@niledatabase/server 2.2.0-alpha.3 → 2.2.1-alpha.0

package/dist/db/PoolProxy.d.ts

@@ -0,0 +1,3 @@
+import { Pool } from 'pg';
+import { Config } from '../utils/Config';
+export declare function createProxyForPool(pool: Pool, config: Config): Pool;

package/dist/server.cjs.development.js

@@ -456,7 +456,7 @@ function Logger(config) {
       }
     },
     warn: function warn() {
-      {
+      if (config != null && config.debug) {
         var _console2;
         for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
           args[_key3] = arguments[_key3];
@@ -466,14 +466,12 @@ function Logger(config) {
       }
     },
     error: function error() {
-      if (config != null && config.debug) {
-        var _console3;
-        for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-          args[_key4] = arguments[_key4];
-        }
-        // eslint-disable-next-line no-console
-        (_console3 = console).error.apply(_console3, ['[niledb]', '[ERROR]'].concat(params, args));
+      var _console3;
+      for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+        args[_key4] = arguments[_key4];
       }
+      // eslint-disable-next-line no-console
+      (_console3 = console).error.apply(_console3, ['[niledb]', '[ERROR]'].concat(params, args));
     }
   };
 }
@@ -539,7 +537,6 @@ var getDatabaseName = function getDatabaseName(cfg) {
   var config = cfg.config,
     logger = cfg.logger;
   var _Logger5 = Logger(config, '[databaseName]'),
-    warn = _Logger5.warn,
     info = _Logger5.info;
   if (config != null && config.databaseName) {
     logger && info(logger, 'config', config.databaseName);
@@ -549,7 +546,6 @@ var getDatabaseName = function getDatabaseName(cfg) {
     logger && info(logger, 'config', process.env.NILEDB_NAME);
     return process.env.NILEDB_NAME;
   }
-  warn(logger, 'config', 'No database has been set. Set NILEDB_NAME in .env or call `nile.init()`');
   return null;
 };
 var getTenantId = function getTenantId(cfg) {
@@ -664,16 +660,23 @@ var Config = /*#__PURE__*/function () {
     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;
+        var envVarConfig, host, _Logger, info, error, basePath, 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);
+              _Logger = Logger(config, '[init]'), info = _Logger.info, error = _Logger.error;
+              if (!(host && _this.databaseName && _this.databaseId)) {
+                _context.next = 6;
+                break;
+              }
+              info('Alreaady configured, aborting fetch');
+              return _context.abrupt("return", _this);
+            case 6:
+              basePath = getBasePath(envVarConfig);
               port = getDbPort(envVarConfig);
               databaseName = getDatabaseName({
                 config: config,
@@ -684,7 +687,7 @@ var Config = /*#__PURE__*/function () {
                 url.searchParams.set('databaseName', databaseName);
               }
               info(url.href);
-              _context.next = 11;
+              _context.next = 14;
               return fetch(url, {
                 headers: {
                   Authorization: "Bearer " + getInfoBearer({
@@ -692,13 +695,13 @@ var Config = /*#__PURE__*/function () {
                   })
                 }
               });
-            case 11:
+            case 14:
               res = _context.sent;
               possibleError = res.clone();
-              _context.prev = 13;
-              _context.next = 16;
+              _context.prev = 16;
+              _context.next = 19;
               return res.json();
-            case 16:
+            case 19:
               json = _context.sent;
               if (res.status === 404) {
                 info('is the configured databaseName correct?');
@@ -710,49 +713,44 @@ var Config = /*#__PURE__*/function () {
               } else {
                 database = json;
               }
-              _context.next = 28;
+              _context.next = 31;
               break;
-            case 21:
-              _context.prev = 21;
-              _context.t0 = _context["catch"](13);
-              _context.next = 25;
+            case 24:
+              _context.prev = 24;
+              _context.t0 = _context["catch"](16);
+              _context.next = 28;
               return possibleError.text();
-            case 25:
+            case 28:
               message = _context.sent;
               error(message);
               database = {
                 message: message
               };
-            case 28:
-              if (!(!host || !_this.databaseName || !_this.databaseId)) {
-                _context.next = 39;
-                break;
-              }
+            case 31:
               info('[fetched database]', database);
               if (!('message' in database)) {
-                _context.next = 38;
+                _context.next = 40;
                 break;
               }
               if (!('statusCode' in database)) {
-                _context.next = 37;
+                _context.next = 39;
                 break;
               }
               error(database);
               throw new Error('HTTP error has occured');
-            case 37:
+            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 38:
+            case 40:
               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 39:
+            case 41:
               _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,11 +767,11 @@ var Config = /*#__PURE__*/function () {
               }, typeof (config == null ? void 0 : config.db) === 'object' ? config.db : {});
               info('[config set]', _this);
               return _context.abrupt("return", _this);
-            case 43:
+            case 45:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[13, 21]]);
+        }, _callee, null, [[16, 24]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
@@ -803,9 +801,11 @@ var Config = /*#__PURE__*/function () {
       user: this.user,
       password: this.password,
       host: _host,
-      port: _port,
-      database: this.databaseName
+      port: _port
     }, typeof (_config == null ? void 0 : _config.db) === 'object' ? _config.db : {});
+    if (this.databaseName) {
+      this.db.database = this.databaseName;
+    }
   }
   return _createClass(Config, [{
     key: "tenantId",
@@ -1787,6 +1787,34 @@ var Tenants = /*#__PURE__*/function (_Config) {
   }]);
 }(Config);
 
+function createProxyForPool(pool, config) {
+  var _Logger = Logger(config, '[pool]'),
+    info = _Logger.info,
+    error = _Logger.error;
+  return new Proxy(pool, {
+    get: function get(target, property) {
+      if (property === 'query') {
+        if (!config.user || !config.password) {
+          error('Cannot connect to the database. User and/or password are missing. Generate them at https://console.thenile.dev');
+        } else if (!config.db.database) {
+          error('Database id is missing from the config. Either call `nile.init()` when you create the NileDB server or set NILEDB_ID in your .env');
+        }
+        var caller = target[property];
+        return function query() {
+          for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+            args[_key] = arguments[_key];
+          }
+          info.apply(void 0, args);
+          // @ts-expect-error - not mine
+          var called = caller.apply(this, args);
+          return called;
+        };
+      }
+      return target[property];
+    }
+  });
+}
+
 var _excluded = ["afterCreate"];
 var NileDatabase = /*#__PURE__*/function () {
   function NileDatabase(config, id) {
@@ -1811,7 +1839,7 @@ var NileDatabase = /*#__PURE__*/function () {
     config.db = poolConfig;
     this.config = config;
     info(this.config);
-    this.pool = new pg.Pool(remaining);
+    this.pool = createProxyForPool(new pg.Pool(remaining), this.config);
     if (typeof afterCreate === 'function') {
       warn('Providing an pool configuration will stop automatic tenant context setting.');
     }
@@ -2116,5 +2144,7 @@ var Server = /*#__PURE__*/function () {
   }]);
 }();
 
+module.exports = Server;
+
 exports.default = Server;
 //# sourceMappingURL=server.cjs.development.js.map