files.com 1.0.295 → 1.0.296

package/_VERSION

@@ -1 +1 @@
-1.0.295
+1.0.296

package/lib/Api.js

@@ -7,92 +7,192 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _axios = _interopRequireDefault(require("axios"));
-var _axiosRetry = _interopRequireDefault(require("axios-retry"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _Files = _interopRequireDefault(require("./Files"));
 var errors = _interopRequireWildcard(require("./Errors"));
 var _Logger = _interopRequireDefault(require("./Logger"));
 var _utils = require("./utils");
+var _excluded = ["timeoutSecs"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _fetchWithTimeout = function _fetchWithTimeout(url) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    timeoutSecs = _ref.timeoutSecs,
+    options = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return timeoutSecs <= 0 ? (0, _crossFetch.default)(url, options) : Promise.race([(0, _crossFetch.default)(url, options), new Promise(function (_, reject) {
+    setTimeout(function () {
+      return reject(new errors.FilesError('Request timed out'));
+    }, timeoutSecs * 1000);
+  })]);
+};
+var fetchWithRetry = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, options) {
+    var retries,
+      maxRetries,
+      minRetryDelaySecs,
+      maxRetryDelaySecs,
+      nextRetries,
+      delaySecs,
+      _args = arguments;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          retries = _args.length > 2 && _args[2] !== undefined ? _args[2] : 0;
+          maxRetries = _Files.default.getMaxNetworkRetries();
+          minRetryDelaySecs = _Files.default.getMinNetworkRetryDelay();
+          maxRetryDelaySecs = _Files.default.getMaxNetworkRetryDelay();
+          _context.prev = 4;
+          _context.next = 7;
+          return _fetchWithTimeout(url, options);
+        case 7:
+          return _context.abrupt("return", _context.sent);
+        case 10:
+          _context.prev = 10;
+          _context.t0 = _context["catch"](4);
+          _Logger.default.info("Request #".concat(retries + 1, " failed: ").concat(_context.t0.message));
+          if (!(retries >= maxRetries)) {
+            _context.next = 17;
+            break;
+          }
+          throw _context.t0;
+        case 17:
+          nextRetries = retries + 1;
+          _Logger.default.info("Retrying request (retry ".concat(nextRetries, " of ").concat(maxRetries, ")"));
+          delaySecs = Math.min(minRetryDelaySecs * Math.pow(2, retries), maxRetryDelaySecs); // exponential backoff
+          _context.next = 22;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, delaySecs * 1000);
+          });
+        case 22:
+          return _context.abrupt("return", fetchWithRetry(url, options, nextRetries));
+        case 23:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[4, 10]]);
+  }));
+  return function fetchWithRetry(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
   (0, _classCallCheck2.default)(this, Api);
 });
-(0, _defineProperty2.default)(Api, "_configureAutoRetry", function () {
-  (0, _axiosRetry.default)(_axios.default, {
-    retries: _Files.default.getMaxNetworkRetries(),
-    retryDelay: function retryDelay(retries) {
-      _Logger.default.info("Retrying request (retry ".concat(retries, " of ").concat(_Files.default.getMaxNetworkRetries(), ")"));
-      return Math.min(retries * _Files.default.getMinNetworkRetryDelay() * 1000, _Files.default.getMaxNetworkRetryDelay() * 1000);
-    }
-  });
-});
 (0, _defineProperty2.default)(Api, "_sendVerbatim", /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(path, verb, options) {
-    var isExternal, baseUrl, url, response;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(path, verb, options) {
+    var isExternal, baseUrl, url, agent, response, headers, contentType, data, normalizedResponse;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           isExternal = /^[a-zA-Z]+:\/\//.test(path);
           baseUrl = _Files.default.getBaseUrl();
           if (!(!isExternal && !baseUrl)) {
-            _context.next = 4;
+            _context2.next = 4;
             break;
           }
           throw new errors.ConfigurationError('Base URL has not been set - use Files.setBaseUrl() to set it');
         case 4:
           url = isExternal ? path : "".concat(baseUrl).concat(_Files.default.getEndpointPrefix()).concat(path);
           _Logger.default.debug("Sending request: ".concat(verb, " ").concat(url));
-          _Logger.default.debug('Sending options:', _objectSpread(_objectSpread({}, options), {}, {
+          _Logger.default.debug('Sending options:', _objectSpread(_objectSpread({
+            method: verb
+          }, options), {}, {
             headers: _objectSpread(_objectSpread({}, options.headers), {}, {
               'X-FilesAPI-Key': '<redacted>'
             })
           }));
-          Api._configureAutoRetry();
-          _context.prev = 8;
-          _context.next = 11;
-          return (0, _axios.default)(_objectSpread({
+          _context2.prev = 7;
+          agent = (options === null || options === void 0 ? void 0 : options.agent) || (options === null || options === void 0 ? void 0 : options.httpsAgent) || (options === null || options === void 0 ? void 0 : options.httpAgent);
+          _context2.next = 11;
+          return fetchWithRetry(url, _objectSpread({
+            agent: agent,
             method: verb,
-            timeout: _Files.default.getNetworkTimeout() * 1000,
-            url: url
+            timeoutSecs: _Files.default.getNetworkTimeout()
           }, options));
         case 11:
-          response = _context.sent;
+          response = _context2.sent;
+          headers = Object.fromEntries(response.headers.entries());
           _Logger.default.debug("Status: ".concat(response.status, " ").concat(response.statusText));
           if (_Files.default.shouldDebugResponseHeaders()) {
             _Logger.default.debug('Response Headers: ');
-            _Logger.default.debug(response.headers);
+            _Logger.default.debug(headers);
+          }
+          contentType = headers['content-type'] || '';
+          if (!contentType.includes('application/json')) {
+            _context2.next = 22;
+            break;
+          }
+          _context2.next = 19;
+          return response.json();
+        case 19:
+          data = _context2.sent;
+          _context2.next = 35;
+          break;
+        case 22:
+          if (!contentType.includes('text/')) {
+            _context2.next = 28;
+            break;
           }
-          return _context.abrupt("return", {
+          _context2.next = 25;
+          return response.text();
+        case 25:
+          data = _context2.sent;
+          _context2.next = 35;
+          break;
+        case 28:
+          if (!contentType.includes('multipart/form-data')) {
+            _context2.next = 34;
+            break;
+          }
+          _context2.next = 31;
+          return response.formData();
+        case 31:
+          data = _context2.sent;
+          _context2.next = 35;
+          break;
+        case 34:
+          data = response.body;
+        case 35:
+          normalizedResponse = {
             status: response.status,
             reason: response.statusText,
-            headers: response.headers,
-            data: response.data
-          });
-        case 17:
-          _context.prev = 17;
-          _context.t0 = _context["catch"](8);
-          errors.handleErrorResponse(_context.t0);
-        case 20:
+            headers: headers,
+            data: data
+          };
+          if (response.ok) {
+            _context2.next = 38;
+            break;
+          }
+          throw {
+            response: normalizedResponse
+          };
+        case 38:
+          return _context2.abrupt("return", normalizedResponse);
+        case 41:
+          _context2.prev = 41;
+          _context2.t0 = _context2["catch"](7);
+          errors.handleErrorResponse(_context2.t0);
+        case 44:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[8, 17]]);
+    }, _callee2, null, [[7, 41]]);
   }));
-  return function (_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
+  return function (_x3, _x4, _x5) {
+    return _ref3.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(Api, "sendFilePart", function (externalUrl, verb, data) {
   var headers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var params = {
-    data: data
+    body: data
   };
   if (headers) {
     params.headers = headers;
@@ -100,20 +200,20 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
   return Api._sendVerbatim(externalUrl, verb, params);
 });
 (0, _defineProperty2.default)(Api, "_autoPaginate", /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(path, verb, params, options, response, metadata) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(path, verb, params, options, response, metadata) {
     var _options$autoPaginate;
-    var _response$headers, nextCursor, _ref3, autoPaginateCount, previousAutoPaginateData, nextPage, nextParams, nextMetadata;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    var _response$headers, nextCursor, _ref5, autoPaginateCount, previousAutoPaginateData, nextPage, nextParams, nextMetadata;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (!((_options$autoPaginate = options.autoPaginate) !== null && _options$autoPaginate !== void 0 ? _options$autoPaginate : _Files.default.getAutoPaginate())) {
-            _context2.next = 12;
+            _context3.next = 12;
             break;
           }
           nextCursor = response === null || response === void 0 || (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers['x-files-cursor'];
-          _ref3 = metadata || {}, autoPaginateCount = _ref3.autoPaginateCount, previousAutoPaginateData = _ref3.previousAutoPaginateData;
+          _ref5 = metadata || {}, autoPaginateCount = _ref5.autoPaginateCount, previousAutoPaginateData = _ref5.previousAutoPaginateData;
           if (!nextCursor) {
-            _context2.next = 10;
+            _context3.next = 10;
             break;
           }
           nextPage = (Number(params === null || params === void 0 ? void 0 : params.page) || 1) + 1;
@@ -125,30 +225,30 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
             autoPaginateCount: (autoPaginateCount || 1) + 1,
             previousAutoPaginateData: [].concat((0, _toConsumableArray2.default)(previousAutoPaginateData || []), (0, _toConsumableArray2.default)((response === null || response === void 0 ? void 0 : response.data) || []))
           };
-          return _context2.abrupt("return", Api.sendRequest(path, verb, nextParams, options, nextMetadata));
+          return _context3.abrupt("return", Api.sendRequest(path, verb, nextParams, options, nextMetadata));
         case 10:
           if (!previousAutoPaginateData) {
-            _context2.next = 12;
+            _context3.next = 12;
             break;
           }
-          return _context2.abrupt("return", _objectSpread(_objectSpread({}, response), {}, {
+          return _context3.abrupt("return", _objectSpread(_objectSpread({}, response), {}, {
             autoPaginateRequests: autoPaginateCount,
             data: [].concat((0, _toConsumableArray2.default)(previousAutoPaginateData), (0, _toConsumableArray2.default)((response === null || response === void 0 ? void 0 : response.data) || []))
           }));
         case 12:
-          return _context2.abrupt("return", response);
+          return _context3.abrupt("return", response);
         case 13:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
-  return function (_x4, _x5, _x6, _x7, _x8, _x9) {
-    return _ref2.apply(this, arguments);
+  return function (_x6, _x7, _x8, _x9, _x10, _x11) {
+    return _ref4.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(Api, "sendRequest", /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(path, verb) {
+  var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(path, verb) {
     var params,
       options,
       metadata,
@@ -162,13 +262,13 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
       hasParams,
       pairs,
       response,
-      _args3 = arguments;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+      _args4 = arguments;
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          params = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : null;
-          options = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : {};
-          metadata = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : null;
+          params = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : null;
+          options = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : {};
+          metadata = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : null;
           headers = _objectSpread(_objectSpread({
             Accept: 'application/json'
           }, options.headers), {}, {
@@ -176,26 +276,26 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
           });
           isExternal = /^[a-zA-Z]+:\/\//.test(path);
           if (isExternal) {
-            _context3.next = 17;
+            _context4.next = 17;
             break;
           }
           sessionId = options.sessionId || _Files.default.getSessionId();
           if (!sessionId) {
-            _context3.next = 11;
+            _context4.next = 11;
             break;
           }
           headers['X-FilesAPI-Auth'] = sessionId;
-          _context3.next = 17;
+          _context4.next = 17;
           break;
         case 11:
           isCreatingSession = path === '/sessions' && verb.toUpperCase() === 'POST'; // api key cannot be used when creating a session
           if (isCreatingSession) {
-            _context3.next = 17;
+            _context4.next = 17;
             break;
           }
           apiKey = options.apiKey || _Files.default.getApiKey();
           if (apiKey) {
-            _context3.next = 16;
+            _context4.next = 16;
             break;
           }
           throw new errors.ConfigurationError('API key has not been set - use Files.setApiKey() to set it');
@@ -209,41 +309,41 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
           hasParams = (0, _utils.isObject)(params) && !(0, _utils.isEmpty)(params);
           if (hasParams) {
             if (verb.toUpperCase() === 'GET') {
-              pairs = Object.entries(params).map(function (_ref5) {
-                var _ref6 = (0, _slicedToArray2.default)(_ref5, 2),
-                  key = _ref6[0],
-                  value = _ref6[1];
+              pairs = Object.entries(params).map(function (_ref7) {
+                var _ref8 = (0, _slicedToArray2.default)(_ref7, 2),
+                  key = _ref8[0],
+                  value = _ref8[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               });
               requestPath += path.includes('?') ? '&' : '?';
               requestPath += pairs.join('&');
             } else {
-              updatedOptions.data = JSON.stringify(params);
+              updatedOptions.body = JSON.stringify(params);
               headers['Content-Type'] = 'application/json';
             }
           }
           if (_Files.default.shouldDebugRequest()) {
             _Logger.default.debug('Request Options:');
             _Logger.default.debug(_objectSpread(_objectSpread({}, updatedOptions), {}, {
-              data: hasParams ? "payload keys: ".concat(Object.keys(params).join(', ')) : '(none)',
+              body: hasParams ? "payload keys: ".concat(Object.keys(params).join(', ')) : '(none)',
               headers: _objectSpread(_objectSpread({}, headers), {}, {
                 'X-FilesAPI-Key': '<redacted>'
               })
             }));
           }
-          _context3.next = 24;
+          _context4.next = 24;
           return Api._sendVerbatim(requestPath, verb, updatedOptions);
         case 24:
-          response = _context3.sent;
-          return _context3.abrupt("return", Api._autoPaginate(path, verb, params, updatedOptions, response, metadata));
+          response = _context4.sent;
+          return _context4.abrupt("return", Api._autoPaginate(path, verb, params, updatedOptions, response, metadata));
         case 26:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return function (_x10, _x11) {
-    return _ref4.apply(this, arguments);
+  return function (_x12, _x13) {
+    return _ref6.apply(this, arguments);
   };
 }());
 var _default = Api;

package/lib/Errors.js

@@ -56,14 +56,14 @@ var handleErrorResponse = function handleErrorResponse(error) {
   var message = ((_errorData = errorData) === null || _errorData === void 0 ? void 0 : _errorData.error) || (response === null || response === void 0 ? void 0 : response.statusText) || error.message;
   var code = (response === null || response === void 0 ? void 0 : response.status) || ((_errorData2 = errorData) === null || _errorData2 === void 0 ? void 0 : _errorData2['http-code']) || 0;
   if (!errorData) {
-    _Logger.default.error('FilesApiError Exception >', code, message);
+    _Logger.default.error('FilesApiError Exception:', code, message);
     throw new FilesApiError(message, code);
   }
   if (Array.isArray(errorData)) {
     errorData = errorData[0];
   }
   if (!errorData.type) {
-    _Logger.default.error('FilesApiError Exception >', code, message);
+    _Logger.default.error('FilesApiError Exception:', code, message);
     throw new FilesApiError(message, code);
   }
   var parts = errorData.type.split('/');

package/lib/isomorphic/File.node.js

@@ -24,8 +24,12 @@ var saveUrlToStream = /*#__PURE__*/function () {
             var https = require('https');
             https.get(url, function (response) {
               response.pipe(stream);
-              stream.on('finish', resolve);
+              stream.on('finish', function () {
+                stream.close();
+                resolve();
+              });
             }).on('error', function (error) {
+              stream.close();
               reject(error);
             });
           }));
@@ -80,8 +84,6 @@ var saveUrlToFile = /*#__PURE__*/function () {
           _context3.next = 3;
           return saveUrlToStream(url, stream);
         case 3:
-          stream.close();
-        case 4:
         case "end":
           return _context3.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "files.com",
-  "version": "1.0.295",
+  "version": "1.0.296",
   "description": "Files.com SDK for JavaScript",
   "keywords": [
     "files.com",
@@ -20,8 +20,7 @@
   "main": "lib/files.js",
   "dependencies": {
     "@babel/runtime": "^7.10.3",
-    "axios": "^1.4.0",
-    "axios-retry": "^3.5.0",
+    "cross-fetch": "^4.0.0",
     "readable-stream": "^4.4.0",
     "safe-buffer": "^5.2.1"
   },

package/src/Api.js

@@ -1,29 +1,45 @@
-import axios from 'axios'
-import axiosRetry from 'axios-retry'
+import fetch from 'cross-fetch'
 
 import Files from './Files'
 import * as errors from './Errors'
 import Logger from './Logger'
 import { isEmpty, isObject } from './utils'
 
-class Api {
-  static _configureAutoRetry = () => {
-    axiosRetry(
-      axios,
-      {
-        retries: Files.getMaxNetworkRetries(),
-        retryDelay: retries => {
-          Logger.info(`Retrying request (retry ${retries} of ${Files.getMaxNetworkRetries()})`)
-
-          return Math.min(
-            retries * Files.getMinNetworkRetryDelay() * 1000,
-            Files.getMaxNetworkRetryDelay() * 1000
-          )
-        },
-      }
-    )
+const _fetchWithTimeout = (url, { timeoutSecs, ...options } = {}) =>
+  timeoutSecs <= 0
+    ? fetch(url, options)
+    : Promise.race([
+        fetch(url, options),
+        new Promise((_, reject) => {
+          setTimeout(() => reject(new errors.FilesError('Request timed out')), timeoutSecs * 1000)
+        })
+      ])
+
+const fetchWithRetry = async (url, options, retries = 0) => {
+  const maxRetries = Files.getMaxNetworkRetries()
+  const minRetryDelaySecs = Files.getMinNetworkRetryDelay()
+  const maxRetryDelaySecs = Files.getMaxNetworkRetryDelay()
+
+  try {
+    return await _fetchWithTimeout(url, options)
+  } catch (error) {
+    Logger.info(`Request #${retries + 1} failed: ${error.message}`)
+
+    if (retries >= maxRetries) {
+      throw error
+    } else {
+      const nextRetries = retries + 1
+      Logger.info(`Retrying request (retry ${nextRetries} of ${maxRetries})`)
+
+      const delaySecs = Math.min(minRetryDelaySecs * 2 ** retries, maxRetryDelaySecs) // exponential backoff
+      await new Promise(resolve => setTimeout(resolve, delaySecs * 1000))
+      
+      return fetchWithRetry(url, options, nextRetries)
+    }
   }
+}
 
+class Api {
   static _sendVerbatim = async (path, verb, options) => {
     const isExternal = /^[a-zA-Z]+:\/\//.test(path)
     const baseUrl = Files.getBaseUrl()
@@ -39,6 +55,7 @@ class Api {
     Logger.debug(`Sending request: ${verb} ${url}`)
 
     Logger.debug('Sending options:', {
+      method: verb,
       ...options,
       headers: {
         ...options.headers,
@@ -46,36 +63,57 @@ class Api {
       },
     })
 
-    Api._configureAutoRetry()
-
     try {
-      const response = await axios({
+      const agent = options?.agent || options?.httpsAgent || options?.httpAgent
+
+      const response = await fetchWithRetry(url, {
+        agent,
         method: verb,
-        timeout: Files.getNetworkTimeout() * 1000,
-        url,
+        timeoutSecs: Files.getNetworkTimeout(),
         ...options,
       })
 
+      const headers = Object.fromEntries(response.headers.entries())
+
       Logger.debug(`Status: ${response.status} ${response.statusText}`)
 
       if (Files.shouldDebugResponseHeaders()) {
         Logger.debug('Response Headers: ')
-        Logger.debug(response.headers)
+        Logger.debug(headers)
+      }
+
+      const contentType = headers['content-type'] || ''
+      let data
+
+      if (contentType.includes('application/json')) {
+        data = await response.json()
+      } else if (contentType.includes('text/')) {
+        data = await response.text()
+      } else if (contentType.includes('multipart/form-data')) {
+        data = await response.formData()
+      } else {
+        data = response.body
       }
 
-      return {
+      const normalizedResponse = {
         status: response.status,
         reason: response.statusText,
-        headers: response.headers,
-        data: response.data,
+        headers,
+        data,
+      }
+
+      if (!response.ok) {
+        throw { response: normalizedResponse }
       }
+
+      return normalizedResponse
     } catch (error) {
       errors.handleErrorResponse(error)
     }
   }
 
   static sendFilePart = (externalUrl, verb, data, headers = {}) => {
-    const params = { data }
+    const params = { body: data }
 
     if (headers) {
       params.headers = headers
@@ -166,7 +204,7 @@ class Api {
         requestPath += path.includes('?') ? '&' : '?'
         requestPath += pairs.join('&')
       } else {
-        updatedOptions.data = JSON.stringify(params)
+        updatedOptions.body = JSON.stringify(params)
         headers['Content-Type'] = 'application/json'
       }
     }
@@ -175,7 +213,7 @@ class Api {
       Logger.debug('Request Options:')
       Logger.debug({
         ...updatedOptions,
-        data: hasParams
+        body: hasParams
           ? `payload keys: ${Object.keys(params).join(', ')}`
           : '(none)',
         headers: {

package/src/Errors.js

@@ -32,7 +32,7 @@ export const handleErrorResponse = error => {
   const code = response?.status || errorData?.['http-code'] || 0
 
   if (!errorData) {
-    Logger.error('FilesApiError Exception >', code, message)
+    Logger.error('FilesApiError Exception:', code, message)
     throw new FilesApiError(message, code)
   }
 
@@ -41,7 +41,7 @@ export const handleErrorResponse = error => {
   }
 
   if (!errorData.type) {
-    Logger.error('FilesApiError Exception >', code, message)
+    Logger.error('FilesApiError Exception:', code, message)
     throw new FilesApiError(message, code)
   }
 

package/src/isomorphic/File.node.js

@@ -14,9 +14,13 @@ const saveUrlToStream = async (url, stream) => new Promise((resolve, reject) =>
   https.get(url, response => {
     response.pipe(stream)
 
-    stream.on('finish', resolve)
+    stream.on('finish', () => {
+      stream.close()
+      resolve()
+    })
   })
   .on('error', error => {
+    stream.close()
     reject(error)
   })
 })
@@ -37,7 +41,6 @@ const saveUrlToString = async url => new Promise((resolve, reject) => {
 const saveUrlToFile = async (url, destinationPath) => {
   const stream = openDiskFileWriteStream(destinationPath)
   await saveUrlToStream(url, stream)
-  stream.close()
 }
 
 export {

package/test/package.json

@@ -8,7 +8,8 @@
   "dependencies": {
     "@babel/runtime": "^7.10.3",
     "files.com": "file:../",
-    "readable-stream": "^3.6.0"
+    "readable-stream": "^3.6.0",
+    "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.3",

package/test/src/index.js

@@ -1,6 +1,3 @@
-import assert from 'assert'
-// import * as errors from 'files.com/lib/Errors'
-const errors = require('files.com/lib/Errors')
 import Files from 'files.com/lib/Files'
 import Logger, { LogLevel } from 'files.com/lib/Logger'
 import ApiKey from 'files.com/lib/models/ApiKey'
@@ -9,6 +6,9 @@ import Folder from 'files.com/lib/models/Folder'
 import Session from 'files.com/lib/models/Session'
 import User from 'files.com/lib/models/User'
 import { isBrowser } from 'files.com/lib/utils'
+import invariant from 'tiny-invariant'
+
+const errors = require('files.com/lib/Errors')
 
 // name of an existing folder in your root to create/delete test files and folders
 const SDK_TEST_ROOT_FOLDER = 'sdk-test'
@@ -32,11 +32,17 @@ if (apiDomain.substr(-10) === 'staging.av') {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0
 }
 
-Files.setLogLevel(LogLevel.INFO)
+const DEBUG_MODE = false
+
+Files.setLogLevel(DEBUG_MODE ? LogLevel.DEBUG : LogLevel.INFO)
 
 Files.configureDebugging({
-  debugRequest: false,
-  debugResponseHeaders: false,
+  debugRequest: DEBUG_MODE,
+  debugResponseHeaders: DEBUG_MODE,
+})
+
+Files.configureNetwork({
+  networkTimeout: DEBUG_MODE ? 10 : 30,
 })
 
 const testSuite = async () => {
@@ -49,7 +55,7 @@ const testSuite = async () => {
 
     const firstPageItems = await Folder.listFor('/', { per_page: 1 })
 
-    assert(firstPageItems.length === 1)
+    invariant(firstPageItems.length === 1, 'First page should have 1 item')
 
     Files.configureNetwork({
       autoPaginate: true,
@@ -59,7 +65,7 @@ const testSuite = async () => {
     const allPageItems = await Folder.listFor('/', { per_page: 1 })
 
     // if auto-pagination executed, we'll have found more than just the 1 we requested
-    assert(allPageItems.length > 1)
+    invariant(allPageItems.length > 1, 'Auto-pagination should have found more than 1 item across all pages')
 
     Logger.info('***** testFolderListAutoPagination() succeeded! *****')
   }
@@ -72,18 +78,20 @@ const testSuite = async () => {
 
     const file = await File.uploadFile(destinationPath, sourceFilePath)
 
-    assert(!!file.path)
-    assert(file.display_name === displayName)
+    invariant(!!file.path, 'Uploaded file response object should have a path')
+    invariant(file.display_name === displayName, 'Uploaded file response object should have the same display_name as the file we uploaded')
 
     const foundFile = await File.find(destinationPath)
     
-    assert(foundFile.path === destinationPath)
-    assert(foundFile.display_name === displayName)
-    assert(typeof foundFile.getDownloadUri() === 'undefined')
+    invariant(foundFile.path === destinationPath, 'Found file should have the same path as the file we uploaded')
+    invariant(foundFile.display_name === displayName, 'Found file should have the same display_name as the file we uploaded')
+    invariant(typeof foundFile.getDownloadUri() === 'undefined', 'Found file should not have a download uri yet')
 
     if (!isBrowser()) {
       const downloadableFile = await foundFile.download()
-      assert(typeof downloadableFile.getDownloadUri() !== 'undefined')
+
+      invariant(downloadableFile.size > 0, 'Uploaded file should not be empty')
+      invariant(typeof downloadableFile.getDownloadUri() !== 'undefined', 'Downloadable file should have a download uri')
 
       const downloadPath = `./${displayName}`
       await downloadableFile.downloadToFile(downloadPath)
@@ -92,7 +100,8 @@ const testSuite = async () => {
       const originalBuffer = fs.readFileSync(sourceFilePath)
       const downloadedBuffer = fs.readFileSync(downloadPath)
 
-      assert(originalBuffer.equals(downloadedBuffer))
+      invariant(originalBuffer.length === downloadedBuffer.length, 'Source file length should match downloaded file length')
+      invariant(originalBuffer.equals(downloadedBuffer), 'Source file contents should match downloaded file contents')
 
       fs.unlinkSync(downloadPath)
     }
@@ -109,22 +118,22 @@ const testSuite = async () => {
     const sourceFileContents = 'The quick brown fox jumped over the lazy dogs.'
     const file = await File.uploadData(destinationPath, sourceFileContents)
 
-    assert(!!file.path)
-    assert(file.display_name === displayName)
+    invariant(!!file.path, 'Uploaded file response object should have a path')
+    invariant(file.display_name === displayName, 'Uploaded file response object should have the same display_name as the file we uploaded')
 
     const foundFile = await File.find(destinationPath)
 
-    assert(foundFile.path === destinationPath)
-    assert(foundFile.display_name === displayName)
-    assert(typeof foundFile.getDownloadUri() === 'undefined')
+    invariant(foundFile.path === destinationPath, 'Found file should have the same path as the file we uploaded')
+    invariant(foundFile.display_name === displayName, 'Found file should have the same display_name as the file we uploaded')
+    invariant(typeof foundFile.getDownloadUri() === 'undefined', 'Found file should not have a download uri yet')
 
     if (!isBrowser()) {
       const downloadableFile = await foundFile.download()
-      assert(typeof downloadableFile.getDownloadUri() !== 'undefined')
+      invariant(typeof downloadableFile.getDownloadUri() !== 'undefined', 'Downloadable file should have a download uri')
 
       const downloadedFileContents = await downloadableFile.downloadToString()
 
-      assert(sourceFileContents === downloadedFileContents)
+      invariant(sourceFileContents === downloadedFileContents, 'Source file contents should match downloaded file contents')
     }
 
     await file.delete()
@@ -141,14 +150,14 @@ const testSuite = async () => {
 
     const file = await File.uploadFile(destinationPath, sourceFilePath)
 
-    assert(!!file.path)
-    assert(file.display_name === displayName)
+    invariant(!!file.path, 'Uploaded file response object should have a path')
+    invariant(file.display_name === displayName, 'Uploaded file response object should have the same display_name as the file we uploaded')
 
     const foundFile = await File.find(destinationPath)
 
-    assert(foundFile.path === destinationPath)
-    assert(foundFile.display_name === displayName)
-    assert(typeof foundFile.getDownloadUri() === 'undefined')
+    invariant(foundFile.path === destinationPath, 'Found file should have the same path as the file we uploaded')
+    invariant(foundFile.display_name === displayName, 'Found file should have the same display_name as the file we uploaded')
+    invariant(typeof foundFile.getDownloadUri() === 'undefined', 'Found file should not have a download uri yet')
 
     await file.delete()
 
@@ -167,7 +176,7 @@ const testSuite = async () => {
 
     const session = await Session.create({ username, password })
 
-    assert(!!session.id)
+    invariant(!!session.id, 'Session should have an id')
 
     const manual = await ApiKey.list({ user_id: 0 }, { sessionId: session.id })
 
@@ -175,7 +184,7 @@ const testSuite = async () => {
 
     const auto = await ApiKey.list({ user_id: 0 })
 
-    assert(JSON.stringify(manual.attributes) === JSON.stringify(auto.attributes))
+    invariant(JSON.stringify(manual.attributes) === JSON.stringify(auto.attributes), 'Manual and auto session API key lists should match')
     
     await Session.destroy()
 
@@ -197,7 +206,7 @@ const testSuite = async () => {
       caughtInvalidCredentialsError = error instanceof errors.NotAuthenticated_InvalidCredentialsError
     }
 
-    assert(caughtInvalidCredentialsError === true)
+    invariant(caughtInvalidCredentialsError === true, 'should have caught an invalid credentials error')
 
     // restore valid api key
     Files.setApiKey(apiKey)
@@ -218,9 +227,9 @@ const testSuite = async () => {
   
     const updatedUser = await User.find(firstUser.id)
   
-    assert(updatedUser.isLoaded())
-    assert(oldName !== newName)
-    assert(updatedUser.name === newName)
+    invariant(updatedUser.isLoaded(), 'updated user should be loaded')
+    invariant(oldName !== newName, 'old name should not equal new name')
+    invariant(updatedUser.name === newName, 'updated user name should match new name')
   
     Logger.info('***** testUserListAndUpdate() succeeded! *****');
   }
@@ -229,13 +238,18 @@ const testSuite = async () => {
   // execute all tests
   //
 
-  await testFolderListAutoPagination()
-  await testUploadAndDownloadToFile()
-  await testUploadAndDownloadToString()
-  // await testUploadHugeFile() // to run this test, put a file (or symlink) at huge-file.ext
-  await testSession()
-  await testFailure()
-  await testUserListAndUpdate()
+  try {
+    await testFolderListAutoPagination()
+    await testUploadAndDownloadToFile()
+    await testUploadAndDownloadToString()
+    // await testUploadHugeFile() // to run this test, put a file (or symlink) at huge-file.ext
+    await testSession()
+    await testFailure()
+    await testUserListAndUpdate()
+  } catch (error) {
+    console.log('*** TEST SUITE FAILED ***')
+    console.error(error)
+  }
 }
 
 export default testSuite