@niledatabase/server 3.0.0-alpha.21 → 3.0.0-alpha.23

package/dist/server.cjs.development.js

@@ -1494,16 +1494,17 @@ function _fetch(_x, _x2, _x3) {
 function _fetch2() {
   _fetch2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(config, path, opts) {
     var _config$api, _config$api2, _response$status;
-    var _Logger, info, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, response, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
+    var _Logger, debug, error, url, cookieKey, headers, basicHeaders, authHeader, token, tenantId, userId, useableUrl, response, _opts$method, _opts$method2, res, errorHandler, msg, _res, message, _res2, _res2$errors, _message;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _Logger = Logger(config, '[server]'), info = _Logger.info, error = _Logger.error;
+          _Logger = Logger(config, '[server]'), debug = _Logger.debug, error = _Logger.error;
           url = "" + ((_config$api = config.api) == null ? void 0 : _config$api.basePath) + path;
           cookieKey = (_config$api2 = config.api) == null ? void 0 : _config$api2.cookieKey;
           headers = new Headers(opts == null ? void 0 : opts.headers);
           basicHeaders = new Headers(opts == null ? void 0 : opts.headers);
           basicHeaders.set('content-type', 'application/json; charset=utf-8');
+          // this is old, but still maybe something worth keeping.
           authHeader = headers.get('Authorization');
           if (!authHeader) {
             token = getTokenFromCookie(headers, cookieKey);
@@ -1530,7 +1531,7 @@ function _fetch2() {
           }));
         case 14:
           useableUrl = url.replace('{tenantId}', encodeURIComponent(String(tenantId))).replace('{userId}', encodeURIComponent(String(userId)));
-          info("[fetch] " + useableUrl);
+          debug("[fetch] " + useableUrl);
           _context.next = 18;
           return fetch(useableUrl, _extends({}, opts, {
             headers: basicHeaders
@@ -1543,105 +1544,108 @@ function _fetch2() {
         case 18:
           response = _context.sent;
           if (!(response && response.status >= 200 && response.status < 300)) {
-            _context.next = 40;
+            _context.next = 41;
             break;
           }
           if (!(typeof response.clone === 'function')) {
-            _context.next = 39;
+            _context.next = 40;
             break;
           }
           _context.prev = 21;
-          _context.t0 = info;
-          _context.next = 25;
+          _context.t0 = debug;
+          _context.t1 = "[fetch][response][" + ((_opts$method = opts == null ? void 0 : opts.method) != null ? _opts$method : 'GET') + "] " + response.status + " " + useableUrl;
+          _context.next = 26;
           return response.clone().json();
-        case 25:
-          _context.t1 = _context.sent;
-          _context.t2 = "[fetch][response] " + _context.t1;
-          (0, _context.t0)(_context.t2);
-          _context.next = 39;
+        case 26:
+          _context.t2 = _context.sent;
+          _context.t3 = {
+            body: _context.t2
+          };
+          (0, _context.t0)(_context.t1, _context.t3);
+          _context.next = 40;
           break;
-        case 30:
-          _context.prev = 30;
-          _context.t3 = _context["catch"](21);
-          _context.t4 = info;
-          _context.next = 35;
+        case 31:
+          _context.prev = 31;
+          _context.t4 = _context["catch"](21);
+          _context.t5 = debug;
+          _context.t6 = "[fetch][response][" + ((_opts$method2 = opts == null ? void 0 : opts.method) != null ? _opts$method2 : 'GET') + "] " + response.status + " " + useableUrl;
+          _context.next = 37;
           return response.clone().text();
-        case 35:
-          _context.t5 = _context.sent;
-          _context.t6 = "[fetch][response] " + _context.t5;
-          _context.t7 = {
-            e: _context.t3
+        case 37:
+          _context.t7 = _context.sent;
+          _context.t8 = {
+            body: _context.t7
           };
-          (0, _context.t4)(_context.t6, _context.t7);
-        case 39:
-          return _context.abrupt("return", response);
+          (0, _context.t5)(_context.t6, _context.t8);
         case 40:
+          return _context.abrupt("return", response);
+        case 41:
           if (!((response == null ? void 0 : response.status) === 404)) {
-            _context.next = 42;
+            _context.next = 43;
             break;
           }
           return _context.abrupt("return", new ResponseError('Not found', {
             status: 404
           }));
-        case 42:
+        case 43:
           if (!((response == null ? void 0 : response.status) === 401)) {
-            _context.next = 44;
+            _context.next = 45;
             break;
           }
           return _context.abrupt("return", new ResponseError('Unauthorized', {
             status: 401
           }));
-        case 44:
+        case 45:
           if (!((response == null ? void 0 : response.status) === 405)) {
-            _context.next = 46;
+            _context.next = 47;
             break;
           }
           return _context.abrupt("return", new ResponseError('Method not allowed', {
             status: 405
           }));
-        case 46:
+        case 47:
           errorHandler = typeof (response == null ? void 0 : response.clone) === 'function' ? response.clone() : null;
           msg = '';
-          _context.prev = 48;
-          _context.next = 51;
+          _context.prev = 49;
+          _context.next = 52;
           return response == null ? void 0 : response.json();
-        case 51:
+        case 52:
           res = _context.sent;
-          _context.next = 62;
+          _context.next = 63;
           break;
-        case 54:
-          _context.prev = 54;
-          _context.t8 = _context["catch"](48);
+        case 55:
+          _context.prev = 55;
+          _context.t9 = _context["catch"](49);
           if (!errorHandler) {
-            _context.next = 61;
+            _context.next = 62;
             break;
           }
-          _context.next = 59;
+          _context.next = 60;
           return errorHandler.text();
-        case 59:
+        case 60:
           msg = _context.sent;
           if (msg) {
             error("[fetch][response] status: " + errorHandler.status + "]", {
               message: msg
             });
           }
-        case 61:
+        case 62:
           if (!msg) {
             error('[fetch][response]', {
-              e: _context.t8
+              e: _context.t9
             });
           }
-        case 62:
+        case 63:
           if (!msg) {
-            _context.next = 64;
+            _context.next = 65;
             break;
           }
           return _context.abrupt("return", new ResponseError(msg, {
             status: errorHandler == null ? void 0 : errorHandler.status
           }));
-        case 64:
+        case 65:
           if (!(res && 'message' in res)) {
-            _context.next = 68;
+            _context.next = 69;
             break;
           }
           _res = res, message = _res.message;
@@ -1649,9 +1653,9 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(message, {
             status: 400
           }));
-        case 68:
+        case 69:
           if (!(res && 'errors' in res)) {
-            _context.next = 72;
+            _context.next = 73;
             break;
           }
           _res2 = res, _res2$errors = _res2.errors, _message = _res2$errors[0];
@@ -1659,18 +1663,18 @@ function _fetch2() {
           return _context.abrupt("return", new ResponseError(_message, {
             status: 400
           }));
-        case 72:
+        case 73:
           error("[fetch][response] status: " + (errorHandler == null ? void 0 : errorHandler.status) + "] UNHANDLED ERROR", {
             res: res
           });
           return _context.abrupt("return", new ResponseError(null, {
             status: (_response$status = response == null ? void 0 : response.status) != null ? _response$status : 500
           }));
-        case 74:
+        case 75:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[21, 30], [48, 54]]);
+    }, _callee, null, [[21, 31], [49, 55]]);
   }));
   return _fetch2.apply(this, arguments);
 }
@@ -4074,9 +4078,8 @@ var Server = /*#__PURE__*/function () {
           case 2:
             updatedConfig = _context.sent;
             this.setConfig(updatedConfig);
-            this.api = new Api(this.config);
             return _context.abrupt("return", this);
-          case 6:
+          case 5:
           case "end":
             return _context.stop();
         }