files.com 1.0.304 → 1.0.306

package/_VERSION

@@ -1 +1 @@
-1.0.304
+1.0.306

package/lib/Api.js

@@ -17,7 +17,8 @@ var _Files = _interopRequireDefault(require("./Files"));
 var errors = _interopRequireWildcard(require("./Errors"));
 var _Logger = _interopRequireDefault(require("./Logger"));
 var _utils = require("./utils");
-var _excluded = ["timeoutSecs"];
+var _excluded = ["timeoutSecs"],
+  _excluded2 = ["getAgentForUrl"];
 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; }
@@ -86,19 +87,20 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
   (0, _classCallCheck2.default)(this, Api);
 });
 (0, _defineProperty2.default)(Api, "_sendVerbatim", /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(path, verb, options) {
-    var isExternal, baseUrl, url, agent, response, headers, contentType, data, normalizedResponse;
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(path, verb, optionsRaw) {
+    var _ref4, getAgentForUrl, options, 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:
+          _ref4 = optionsRaw || {}, getAgentForUrl = _ref4.getAgentForUrl, options = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
           isExternal = /^[a-zA-Z]+:\/\//.test(path);
           baseUrl = _Files.default.getBaseUrl();
           if (!(!isExternal && !baseUrl)) {
-            _context2.next = 4;
+            _context2.next = 5;
             break;
           }
           throw new errors.ConfigurationError('Base URL has not been set - use Files.setBaseUrl() to set it');
-        case 4:
+        case 5:
           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({
@@ -108,15 +110,15 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
               'X-FilesAPI-Key': '<redacted>'
             })
           }));
-          _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;
+          _context2.prev = 8;
+          agent = (getAgentForUrl === null || getAgentForUrl === void 0 ? void 0 : getAgentForUrl(url)) || (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 = 12;
           return fetchWithRetry(url, _objectSpread({
             agent: agent,
             method: verb,
             timeoutSecs: _Files.default.getNetworkTimeout()
           }, options));
-        case 11:
+        case 12:
           response = _context2.sent;
           headers = Object.fromEntries(response.headers.entries());
           _Logger.default.debug("Status: ".concat(response.status, " ").concat(response.statusText));
@@ -126,40 +128,40 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
           }
           contentType = headers['content-type'] || '';
           if (!contentType.includes('application/json')) {
-            _context2.next = 22;
+            _context2.next = 23;
             break;
           }
-          _context2.next = 19;
+          _context2.next = 20;
           return response.json();
-        case 19:
+        case 20:
           data = _context2.sent;
-          _context2.next = 35;
+          _context2.next = 36;
           break;
-        case 22:
+        case 23:
           if (!contentType.includes('text/')) {
-            _context2.next = 28;
+            _context2.next = 29;
             break;
           }
-          _context2.next = 25;
+          _context2.next = 26;
           return response.text();
-        case 25:
+        case 26:
           data = _context2.sent;
-          _context2.next = 35;
+          _context2.next = 36;
           break;
-        case 28:
+        case 29:
           if (!contentType.includes('multipart/form-data')) {
-            _context2.next = 34;
+            _context2.next = 35;
             break;
           }
-          _context2.next = 31;
+          _context2.next = 32;
           return response.formData();
-        case 31:
+        case 32:
           data = _context2.sent;
-          _context2.next = 35;
+          _context2.next = 36;
           break;
-        case 34:
-          data = response.body;
         case 35:
+          data = response.body;
+        case 36:
           normalizedResponse = {
             status: response.status,
             reason: response.statusText,
@@ -167,42 +169,39 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
             data: data
           };
           if (response.ok) {
-            _context2.next = 38;
+            _context2.next = 39;
             break;
           }
           throw {
             response: normalizedResponse
           };
-        case 38:
+        case 39:
           return _context2.abrupt("return", normalizedResponse);
-        case 41:
-          _context2.prev = 41;
-          _context2.t0 = _context2["catch"](7);
+        case 42:
+          _context2.prev = 42;
+          _context2.t0 = _context2["catch"](8);
           errors.handleErrorResponse(_context2.t0);
-        case 44:
+        case 45:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 41]]);
+    }, _callee2, null, [[8, 42]]);
   }));
   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 = {
+  var optionsRaw = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var options = _objectSpread(_objectSpread({}, optionsRaw), {}, {
     body: data
-  };
-  if (headers) {
-    params.headers = headers;
-  }
-  return Api._sendVerbatim(externalUrl, verb, params);
+  });
+  return Api._sendVerbatim(externalUrl, verb, options);
 });
 (0, _defineProperty2.default)(Api, "_autoPaginate", /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(path, verb, params, options, response, metadata) {
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(path, verb, params, options, response, metadata) {
     var _options$autoPaginate;
-    var _response$headers, nextCursor, _ref5, autoPaginateCount, previousAutoPaginateData, nextPage, nextParams, nextMetadata;
+    var _response$headers, nextCursor, _ref6, autoPaginateCount, previousAutoPaginateData, nextPage, nextParams, nextMetadata;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -211,7 +210,7 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
             break;
           }
           nextCursor = response === null || response === void 0 || (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers['x-files-cursor'];
-          _ref5 = metadata || {}, autoPaginateCount = _ref5.autoPaginateCount, previousAutoPaginateData = _ref5.previousAutoPaginateData;
+          _ref6 = metadata || {}, autoPaginateCount = _ref6.autoPaginateCount, previousAutoPaginateData = _ref6.previousAutoPaginateData;
           if (!nextCursor) {
             _context3.next = 10;
             break;
@@ -244,11 +243,11 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
     }, _callee3);
   }));
   return function (_x6, _x7, _x8, _x9, _x10, _x11) {
-    return _ref4.apply(this, arguments);
+    return _ref5.apply(this, arguments);
   };
 }());
 (0, _defineProperty2.default)(Api, "sendRequest", /*#__PURE__*/function () {
-  var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(path, verb) {
+  var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(path, verb) {
     var params,
       options,
       metadata,
@@ -309,10 +308,10 @@ 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 (_ref7) {
-                var _ref8 = (0, _slicedToArray2.default)(_ref7, 2),
-                  key = _ref8[0],
-                  value = _ref8[1];
+              pairs = Object.entries(params).map(function (_ref8) {
+                var _ref9 = (0, _slicedToArray2.default)(_ref8, 2),
+                  key = _ref9[0],
+                  value = _ref9[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               });
               requestPath += path.includes('?') ? '&' : '?';
@@ -343,7 +342,7 @@ var Api = /*#__PURE__*/(0, _createClass2.default)(function Api() {
     }, _callee4);
   }));
   return function (_x12, _x13) {
-    return _ref6.apply(this, arguments);
+    return _ref7.apply(this, arguments);
   };
 }());
 var _default = Api;

package/lib/models/File.js

@@ -939,7 +939,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
             });
             readableStream.on('data', /*#__PURE__*/function () {
               var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(chunk) {
-                var nextLength, excessLength, chunkBuffer, tailLength, lastChunkForPart, firstChunkForNextPart, buffer, nextFileUploadPart, upload_uri, uploadPromise;
+                var nextLength, excessLength, chunkBuffer, _options$getAgentForU, tailLength, lastChunkForPart, firstChunkForNextPart, buffer, nextFileUploadPart, upload_uri, agent, uploadPromise;
                 return _regenerator.default.wrap(function _callee15$(_context15) {
                   while (1) switch (_context15.prev = _context15.next) {
                     case 0:
@@ -948,7 +948,7 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                       excessLength = nextLength - firstFileUploadPart.partsize;
                       chunkBuffer = _safeBuffer.Buffer.from(chunk);
                       if (!(excessLength > 0)) {
-                        _context15.next = 27;
+                        _context15.next = 28;
                         break;
                       }
                       readableStream.pause();
@@ -963,52 +963,55 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                       return File._continueUpload(destinationPath, ++part, firstFileUploadPart, options);
                     case 13:
                       nextFileUploadPart = _context15.sent;
-                      upload_uri = determinePartUploadUri(nextFileUploadPart);
-                      uploadPromise = _Api.default.sendFilePart(upload_uri, 'PUT', buffer);
+                      upload_uri = determinePartUploadUri(nextFileUploadPart); // instantiate an httpsAgent dynamically if needed
+                      agent = ((_options$getAgentForU = options.getAgentForUrl) === null || _options$getAgentForU === void 0 ? void 0 : _options$getAgentForU.call(options, upload_uri)) || (options === null || options === void 0 ? void 0 : options.agent);
+                      uploadPromise = _Api.default.sendFilePart(upload_uri, 'PUT', buffer, {
+                        agent: agent
+                      });
                       if (!firstFileUploadPart.parallel_parts) {
-                        _context15.next = 20;
+                        _context15.next = 21;
                         break;
                       }
                       concurrentUploads.push(uploadPromise);
-                      _context15.next = 22;
+                      _context15.next = 23;
                       break;
-                    case 20:
-                      _context15.next = 22;
+                    case 21:
+                      _context15.next = 23;
                       return uploadPromise;
-                    case 22:
+                    case 23:
                       chunks = [firstChunkForNextPart];
                       length = firstChunkForNextPart.length;
                       readableStream.resume();
-                      _context15.next = 29;
+                      _context15.next = 30;
                       break;
-                    case 27:
+                    case 28:
                       chunks.push(chunkBuffer);
                       length += chunk.length;
-                    case 29:
-                      _context15.next = 34;
+                    case 30:
+                      _context15.next = 35;
                       break;
-                    case 31:
-                      _context15.prev = 31;
+                    case 32:
+                      _context15.prev = 32;
                       _context15.t0 = _context15["catch"](0);
                       reject(_context15.t0);
-                    case 34:
+                    case 35:
                     case "end":
                       return _context15.stop();
                   }
-                }, _callee15, null, [[0, 31]]);
+                }, _callee15, null, [[0, 32]]);
               }));
               return function (_x20) {
                 return _ref19.apply(this, arguments);
               };
             }());
             readableStream.on('end', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16() {
-              var buffer, nextFileUploadPart, upload_uri, response, createdFile;
+              var _options$getAgentForU2, buffer, nextFileUploadPart, upload_uri, agent, response, createdFile;
               return _regenerator.default.wrap(function _callee16$(_context16) {
                 while (1) switch (_context16.prev = _context16.next) {
                   case 0:
                     _context16.prev = 0;
                     if (!(chunks.length > 0)) {
-                      _context16.next = 8;
+                      _context16.next = 9;
                       break;
                     }
                     buffer = _safeBuffer.Buffer.concat(chunks);
@@ -1016,29 +1019,32 @@ var File = /*#__PURE__*/(0, _createClass2.default)(function File() {
                     return File._continueUpload(destinationPath, ++part, firstFileUploadPart, options);
                   case 5:
                     nextFileUploadPart = _context16.sent;
-                    upload_uri = determinePartUploadUri(nextFileUploadPart);
-                    concurrentUploads.push(_Api.default.sendFilePart(upload_uri, 'PUT', buffer));
-                  case 8:
-                    _context16.next = 10;
+                    upload_uri = determinePartUploadUri(nextFileUploadPart); // instantiate an httpsAgent dynamically if needed
+                    agent = ((_options$getAgentForU2 = options.getAgentForUrl) === null || _options$getAgentForU2 === void 0 ? void 0 : _options$getAgentForU2.call(options, upload_uri)) || (options === null || options === void 0 ? void 0 : options.agent);
+                    concurrentUploads.push(_Api.default.sendFilePart(upload_uri, 'PUT', buffer, {
+                      agent: agent
+                    }));
+                  case 9:
+                    _context16.next = 11;
                     return Promise.all(concurrentUploads);
-                  case 10:
-                    _context16.next = 12;
+                  case 11:
+                    _context16.next = 13;
                     return File._completeUpload(firstFileUploadPart, options);
-                  case 12:
+                  case 13:
                     response = _context16.sent;
                     createdFile = new File(response.data, options);
                     resolve(createdFile);
-                    _context16.next = 20;
+                    _context16.next = 21;
                     break;
-                  case 17:
-                    _context16.prev = 17;
+                  case 18:
+                    _context16.prev = 18;
                     _context16.t0 = _context16["catch"](0);
                     reject(_context16.t0);
-                  case 20:
+                  case 21:
                   case "end":
                     return _context16.stop();
                 }
-              }, _callee16, null, [[0, 17]]);
+              }, _callee16, null, [[0, 18]]);
             })));
           });
         case 10:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "files.com",
-  "version": "1.0.304",
+  "version": "1.0.306",
   "description": "Files.com SDK for JavaScript",
   "keywords": [
     "files.com",

package/src/Api.js

@@ -40,7 +40,9 @@ const fetchWithRetry = async (url, options, retries = 0) => {
 }
 
 class Api {
-  static _sendVerbatim = async (path, verb, options) => {
+  static _sendVerbatim = async (path, verb, optionsRaw) => {
+    const { getAgentForUrl, ...options } = optionsRaw || {}
+
     const isExternal = /^[a-zA-Z]+:\/\//.test(path)
     const baseUrl = Files.getBaseUrl()
 
@@ -64,7 +66,7 @@ class Api {
     })
 
     try {
-      const agent = options?.agent || options?.httpsAgent || options?.httpAgent
+      const agent = getAgentForUrl?.(url) || options?.agent || options?.httpsAgent || options?.httpAgent
 
       const response = await fetchWithRetry(url, {
         agent,
@@ -112,14 +114,13 @@ class Api {
     }
   }
 
-  static sendFilePart = (externalUrl, verb, data, headers = {}) => {
-    const params = { body: data }
-
-    if (headers) {
-      params.headers = headers
+  static sendFilePart = (externalUrl, verb, data, optionsRaw = {}) => {
+    const options = {
+      ...optionsRaw,
+      body: data,
     }
 
-    return Api._sendVerbatim(externalUrl, verb, params)
+    return Api._sendVerbatim(externalUrl, verb, options)
   }
 
   static _autoPaginate = async (path, verb, params, options, response, metadata) => {

package/src/models/File.js

@@ -121,7 +121,11 @@ class File {
               const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, firstFileUploadPart, options)
 
               const upload_uri = determinePartUploadUri(nextFileUploadPart)
-              const uploadPromise = Api.sendFilePart(upload_uri, 'PUT', buffer)
+
+              // instantiate an httpsAgent dynamically if needed
+              const agent = options.getAgentForUrl?.(upload_uri) || options?.agent
+
+              const uploadPromise = Api.sendFilePart(upload_uri, 'PUT', buffer, { agent })
 
               if (firstFileUploadPart.parallel_parts) {
                 concurrentUploads.push(uploadPromise)
@@ -149,7 +153,11 @@ class File {
               const nextFileUploadPart = await File._continueUpload(destinationPath, ++part, firstFileUploadPart, options)
 
               const upload_uri = determinePartUploadUri(nextFileUploadPart)
-              concurrentUploads.push(Api.sendFilePart(upload_uri, 'PUT', buffer))
+
+              // instantiate an httpsAgent dynamically if needed
+              const agent = options.getAgentForUrl?.(upload_uri) || options?.agent
+
+              concurrentUploads.push(Api.sendFilePart(upload_uri, 'PUT', buffer, { agent }))
             }
 
             await Promise.all(concurrentUploads)