@niledatabase/server 3.0.0-alpha.34 → 3.0.0-alpha.36

package/dist/server.cjs.development.js

@@ -482,8 +482,12 @@ var getDatabaseId = function getDatabaseId(cfg) {
     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);
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      return pgUrl.pathname.substring(1);
+    } catch (e) {
+      // ok to fail
+    }
   }
   logger && info(logger + "[NILEDB_ID] " + process.env.NILEDB_ID);
   return process.env.NILEDB_ID;
@@ -546,6 +550,14 @@ var getDatabaseName = function getDatabaseName(cfg) {
     logger && info(logger + "[NILEDB_NAME] " + process.env.NILEDB_NAME);
     return process.env.NILEDB_NAME;
   }
+  if (process.env.NILEDB_POSTGRES_URL) {
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      return pgUrl.pathname.substring(1);
+    } catch (e) {
+      // ok to fail
+    }
+  }
   return null;
 };
 var getTenantId = function getTenantId(cfg) {
@@ -573,7 +585,8 @@ var getBasePath = function getBasePath(cfg) {
     logger = cfg.logger;
   var _Logger7 = Logger(config, '[basePath]'),
     warn = _Logger7.warn,
-    info = _Logger7.info;
+    info = _Logger7.info,
+    error = _Logger7.error;
   var basePath = config == null || (_config$api4 = config.api) == null ? void 0 : _config$api4.basePath;
   if (basePath) {
     logger && info(logger + "[config] " + basePath);
@@ -581,8 +594,14 @@ var getBasePath = function getBasePath(cfg) {
   }
   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.href;
+    try {
+      var apiUrl = new URL(process.env.NILEDB_API_URL);
+      return apiUrl.href;
+    } catch (e) {
+      if (e instanceof Error) {
+        error(e.stack);
+      }
+    }
   }
   warn('not set. Must run auto-configuration');
   return undefined;
@@ -617,9 +636,13 @@ function getDbHost(cfg) {
     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.hostname);
-    return pgUrl.hostname;
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      logger && info(logger + "[NILEDB_POSTGRES_URL] " + pgUrl.hostname);
+      return pgUrl.hostname;
+    } catch (e) {
+      // ok to fail
+    }
   }
   if (process.env.NILEDB_HOST) {
     logger && info(logger + "[NILEDB_HOST] " + process.env.NILEDB_HOST);
@@ -643,6 +666,16 @@ function getDbPort(cfg) {
     logger && info(logger + "[NILEDB_PORT] " + process.env.NILEDB_PORT);
     return Number(process.env.NILEDB_PORT);
   }
+  if (process.env.NILEDB_POSTGRES_URL) {
+    try {
+      var pgUrl = new URL(process.env.NILEDB_POSTGRES_URL);
+      if (pgUrl.port) {
+        return Number(pgUrl.port);
+      }
+    } catch (e) {
+      // ok to fail
+    }
+  }
   logger && info(logger + "[default] 5432");
   return 5432;
 }
@@ -3588,7 +3621,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   }();
   _proto.post = /*#__PURE__*/function () {
     var _post = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, url, init) {
-      var response;
+      var response, cloned;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -3597,17 +3630,25 @@ var Requester = /*#__PURE__*/function (_Config) {
           case 2:
             response = _context3.sent;
             if (!(response && response.status >= 200 && response.status < 300)) {
-              _context3.next = 5;
+              _context3.next = 13;
               break;
             }
-            return _context3.abrupt("return", response.json());
-          case 5:
+            cloned = response.clone();
+            _context3.prev = 5;
+            _context3.next = 8;
+            return cloned.json();
+          case 8:
+            return _context3.abrupt("return", _context3.sent);
+          case 11:
+            _context3.prev = 11;
+            _context3.t0 = _context3["catch"](5);
+          case 13:
             return _context3.abrupt("return", response);
-          case 6:
+          case 14:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, this);
+      }, _callee3, this, [[5, 11]]);
     }));
     function post(_x9, _x10, _x11) {
       return _post.apply(this, arguments);
@@ -3616,7 +3657,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   }();
   _proto.get = /*#__PURE__*/function () {
     var _get = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, url, init) {
-      var response;
+      var response, cloned;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -3625,17 +3666,25 @@ var Requester = /*#__PURE__*/function (_Config) {
           case 2:
             response = _context4.sent;
             if (!(response && response.status >= 200 && response.status < 300)) {
-              _context4.next = 5;
+              _context4.next = 13;
               break;
             }
-            return _context4.abrupt("return", response.json());
-          case 5:
+            cloned = response.clone();
+            _context4.prev = 5;
+            _context4.next = 8;
+            return cloned.json();
+          case 8:
+            return _context4.abrupt("return", _context4.sent);
+          case 11:
+            _context4.prev = 11;
+            _context4.t0 = _context4["catch"](5);
+          case 13:
             return _context4.abrupt("return", response);
-          case 6:
+          case 14:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, this);
+      }, _callee4, this, [[5, 11]]);
     }));
     function get(_x12, _x13, _x14) {
       return _get.apply(this, arguments);
@@ -3644,7 +3693,7 @@ var Requester = /*#__PURE__*/function (_Config) {
   }();
   _proto.put = /*#__PURE__*/function () {
     var _put = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, url, init) {
-      var response;
+      var response, cloned;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -3653,17 +3702,25 @@ var Requester = /*#__PURE__*/function (_Config) {
           case 2:
             response = _context5.sent;
             if (!(response && response.status >= 200 && response.status < 300)) {
-              _context5.next = 5;
+              _context5.next = 13;
               break;
             }
-            return _context5.abrupt("return", response.json());
-          case 5:
+            cloned = response.clone();
+            _context5.prev = 5;
+            _context5.next = 8;
+            return cloned.json();
+          case 8:
+            return _context5.abrupt("return", _context5.sent);
+          case 11:
+            _context5.prev = 11;
+            _context5.t0 = _context5["catch"](5);
+          case 13:
             return _context5.abrupt("return", response);
-          case 6:
+          case 14:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, this);
+      }, _callee5, this, [[5, 11]]);
     }));
     function put(_x15, _x16, _x17) {
       return _put.apply(this, arguments);
@@ -3680,14 +3737,8 @@ var Requester = /*#__PURE__*/function (_Config) {
             return this.request('DELETE', url, req, init);
           case 2:
             response = _context6.sent;
-            if (!(response && response.status >= 200 && response.status < 300)) {
-              _context6.next = 5;
-              break;
-            }
-            return _context6.abrupt("return", response.json());
-          case 5:
             return _context6.abrupt("return", response);
-          case 6:
+          case 4:
           case "end":
             return _context6.stop();
         }
@@ -4003,6 +4054,55 @@ var Tenants = /*#__PURE__*/function (_Config) {
         return _ref3.apply(this, arguments);
       };
     }();
+    _this.deleteTenant = /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, init) {
+        var _requester, _init;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (typeof req === 'string') {
+                _this.tenantId = req;
+              }
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              return _context4.abrupt("return", _requester["delete"](req, _this.tenantUrl, _init));
+            case 4:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      return function (_x7, _x8) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+    _this.updateTenant = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, init) {
+        var _req, _requester, _init;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (req && 'name' in req) {
+                _req = new Request("" + _this.api.basePath + _this.tenantUrl, {
+                  body: JSON.stringify(req),
+                  method: 'PUT'
+                });
+              } else {
+                _req = req;
+              }
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              return _context5.abrupt("return", _requester.put(_req, _this.tenantUrl, _init));
+            case 4:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }));
+      return function (_x9, _x10) {
+        return _ref5.apply(this, arguments);
+      };
+    }();
     _this.headers = headers;
     return _this;
   }
@@ -4070,8 +4170,8 @@ var Users = /*#__PURE__*/function (_Config) {
         return _ref.apply(this, arguments);
       };
     }();
-    _this.updateUser = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(userId, req, init) {
+    _this.createTenantUser = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -4079,7 +4179,7 @@ var Users = /*#__PURE__*/function (_Config) {
               _requester = new Requester(_this);
               _init = _this.handleHeaders(init);
               _context2.next = 4;
-              return _requester.put(req, _this.usersUrl + "/" + userId, _init);
+              return _requester.post(req, _this.tenantUsersUrl, _init);
             case 4:
               return _context2.abrupt("return", _context2.sent);
             case 5:
@@ -4088,33 +4188,42 @@ var Users = /*#__PURE__*/function (_Config) {
           }
         }, _callee2);
       }));
-      return function (_x3, _x4, _x5) {
+      return function (_x3, _x4) {
         return _ref2.apply(this, arguments);
       };
     }();
-    _this.listUsers = /*#__PURE__*/function () {
+    _this.updateUser = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, init) {
-        var _requester, _init;
+        var _req, _requester, _init;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              if (req && 'id' in req) {
+                _req = new Request("" + _this.api.basePath + _this.tenantUserUrl, {
+                  body: JSON.stringify(req),
+                  method: 'PUT'
+                });
+                _this.userId = String(req.id);
+              } else {
+                _req = req;
+              }
               _requester = new Requester(_this);
               _init = _this.handleHeaders(init);
-              _context3.next = 4;
-              return _requester.get(req, _this.tenantUsersUrl, _init);
-            case 4:
-              return _context3.abrupt("return", _context3.sent);
+              _context3.next = 5;
+              return _requester.put(_req, _this.tenantUserUrl, _init);
             case 5:
+              return _context3.abrupt("return", _context3.sent);
+            case 6:
             case "end":
               return _context3.stop();
           }
         }, _callee3);
       }));
-      return function (_x6, _x7) {
+      return function (_x5, _x6) {
         return _ref3.apply(this, arguments);
       };
     }();
-    _this.linkUser = /*#__PURE__*/function () {
+    _this.listUsers = /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, init) {
         var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -4123,7 +4232,7 @@ var Users = /*#__PURE__*/function (_Config) {
               _requester = new Requester(_this);
               _init = _this.handleHeaders(init);
               _context4.next = 4;
-              return _requester.put(req, _this.tenantUsersUrl, _init);
+              return _requester.get(req, _this.tenantUsersUrl, _init);
             case 4:
               return _context4.abrupt("return", _context4.sent);
             case 5:
@@ -4132,68 +4241,65 @@ var Users = /*#__PURE__*/function (_Config) {
           }
         }, _callee4);
       }));
-      return function (_x8, _x9) {
+      return function (_x7, _x8) {
         return _ref4.apply(this, arguments);
       };
     }();
-    _this.tenantUsersDeleteUrl = function (userId) {
-      var _this$tenantId;
-      return "/tenants/" + ((_this$tenantId = _this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/users/" + (userId != null ? userId : '{userId}');
-    };
-    _this.getUserId = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req) {
-        var body;
+    _this.linkUser = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(req, init) {
+        var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (!(req instanceof Request)) {
-                _context5.next = 6;
-                break;
-              }
-              _context5.next = 3;
-              return new Response(req == null ? void 0 : req.body).json();
-            case 3:
-              body = _context5.sent;
-              if (!body) {
-                _context5.next = 6;
-                break;
+              _requester = new Requester(_this);
+              if (typeof req === 'string') {
+                _this.userId = req;
+              } else {
+                if ('id' in req) {
+                  _this.userId = req.id;
+                }
+                if ('tenantId' in req) {
+                  _this.tenantId = req.tenantId;
+                }
               }
-              return _context5.abrupt("return", body.id);
+              _init = _this.handleHeaders(init);
+              _context5.next = 5;
+              return _requester.put(req, _this.linkUsersUrl, _init);
+            case 5:
+              return _context5.abrupt("return", _context5.sent);
             case 6:
-              if (!('id' in req)) {
-                _context5.next = 8;
-                break;
-              }
-              return _context5.abrupt("return", req.id);
-            case 8:
-              return _context5.abrupt("return", null);
-            case 9:
             case "end":
               return _context5.stop();
           }
         }, _callee5);
       }));
-      return function (_x10) {
+      return function (_x9, _x10) {
         return _ref5.apply(this, arguments);
       };
     }();
     _this.unlinkUser = /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(req, init) {
-        var _requester, userId, _init;
+        var _requester, _init;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
+              if (typeof req === 'string') {
+                _this.userId = req;
+              } else {
+                if ('id' in req) {
+                  _this.userId = req.id;
+                }
+                if ('tenantId' in req) {
+                  _this.tenantId = req.tenantId;
+                }
+              }
               _requester = new Requester(_this);
-              _context6.next = 3;
-              return _this.getUserId(req);
-            case 3:
-              userId = _context6.sent;
               _init = _this.handleHeaders(init);
-              _context6.next = 7;
-              return _requester["delete"](req, _this.tenantUsersDeleteUrl(userId), _init);
-            case 7:
+              _context6.next = 5;
+              return _requester["delete"](req, _this.linkUsersUrl, _init);
+            case 5:
               return _context6.abrupt("return", _context6.sent);
-            case 8:
+            case 6:
             case "end":
               return _context6.stop();
           }
@@ -4225,6 +4331,28 @@ var Users = /*#__PURE__*/function (_Config) {
         return _ref7.apply(this, arguments);
       };
     }();
+    _this.updateMe = /*#__PURE__*/function () {
+      var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(req, init) {
+        var _requester, _init;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _requester = new Requester(_this);
+              _init = _this.handleHeaders(init);
+              _context8.next = 4;
+              return _requester.put(req, _this.meUrl, _init);
+            case 4:
+              return _context8.abrupt("return", _context8.sent);
+            case 5:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8);
+      }));
+      return function (_x15, _x16) {
+        return _ref8.apply(this, arguments);
+      };
+    }();
     _this.headers = headers;
     return _this;
   }
@@ -4253,8 +4381,20 @@ var Users = /*#__PURE__*/function (_Config) {
   }, {
     key: "tenantUsersUrl",
     get: function get() {
-      var _this$tenantId2;
-      return "/tenants/" + ((_this$tenantId2 = this.tenantId) != null ? _this$tenantId2 : '{tenantId}') + "/users";
+      var _this$tenantId;
+      return "/tenants/" + ((_this$tenantId = this.tenantId) != null ? _this$tenantId : '{tenantId}') + "/users";
+    }
+  }, {
+    key: "linkUsersUrl",
+    get: function get() {
+      var _this$tenantId2, _this$userId;
+      return "/tenants/" + ((_this$tenantId2 = this.tenantId) != null ? _this$tenantId2 : '{tenantId}') + "/users/" + ((_this$userId = this.userId) != null ? _this$userId : '{userId}') + "/link";
+    }
+  }, {
+    key: "tenantUserUrl",
+    get: function get() {
+      var _this$tenantId3, _this$userId2;
+      return "/tenants/" + ((_this$tenantId3 = this.tenantId) != null ? _this$tenantId3 : '{tenantId}') + "/users/" + ((_this$userId2 = this.userId) != null ? _this$userId2 : '{userId}');
     }
   }, {
     key: "meUrl",
@@ -4372,7 +4512,10 @@ var Server = /*#__PURE__*/function () {
     // propagate special config items
     this.tenantId = updatedConfig.tenantId;
     this.userId = updatedConfig.userId;
-    this.token = updatedConfig.api.token;
+    // if we have a token, update it, else use the one that was there
+    if (updatedConfig.api.token) {
+      this.token = updatedConfig.api.token;
+    }
     this.databaseId = updatedConfig.databaseId;
     return this;
   };