axios 1.7.2 → 1.7.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.7.3](https://github.com/axios/axios/compare/v1.7.2...v1.7.3) (2024-08-01)
+
+
+### Bug Fixes
+
+* **adapter:** fix progress event emitting; ([#6518](https://github.com/axios/axios/issues/6518)) ([e3c76fc](https://github.com/axios/axios/commit/e3c76fc9bdd03aa4d98afaf211df943e2031453f))
+* **fetch:** fix withCredentials request config ([#6505](https://github.com/axios/axios/issues/6505)) ([85d4d0e](https://github.com/axios/axios/commit/85d4d0ea0aae91082f04e303dec46510d1b4e787))
+* **xhr:** return original config on errors from XHR adapter ([#6515](https://github.com/axios/axios/issues/6515)) ([8966ee7](https://github.com/axios/axios/commit/8966ee7ea62ecbd6cfb39a905939bcdab5cf6388))
+
+### Contributors to this release
+
+- <img src="https://avatars.githubusercontent.com/u/12586868?v&#x3D;4&amp;s&#x3D;18" alt="avatar" width="18"/> [Dmitriy Mozgovoy](https://github.com/DigitalBrainJS "+211/-159 (#6518 #6519 )")
+- <img src="https://avatars.githubusercontent.com/u/10867286?v&#x3D;4&amp;s&#x3D;18" alt="avatar" width="18"/> [Valerii Sidorenko](https://github.com/ValeraS "+3/-3 (#6515 )")
+- <img src="https://avatars.githubusercontent.com/u/8599535?v&#x3D;4&amp;s&#x3D;18" alt="avatar" width="18"/> [prianYu](https://github.com/prianyu "+2/-2 (#6505 )")
+
 ## [1.7.2](https://github.com/axios/axios/compare/v1.7.1...v1.7.2) (2024-05-21)
 
 

package/dist/axios.js

@@ -1,4 +1,4 @@
-// Axios v1.7.2 Copyright (c) 2024 Matt Zabriskie and contributors
+// Axios v1.7.3 Copyright (c) 2024 Matt Zabriskie and contributors
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1320,6 +1320,34 @@
   var isThenable = function isThenable(thing) {
     return thing && (isObject(thing) || isFunction(thing)) && isFunction(thing.then) && isFunction(thing["catch"]);
   };
+
+  // original code
+  // https://github.com/DigitalBrainJS/AxiosPromise/blob/16deab13710ec09779922131f3fa5954320f83ab/lib/utils.js#L11-L34
+
+  var _setImmediate = function (setImmediateSupported, postMessageSupported) {
+    if (setImmediateSupported) {
+      return setImmediate;
+    }
+    return postMessageSupported ? function (token, callbacks) {
+      _global.addEventListener("message", function (_ref5) {
+        var source = _ref5.source,
+          data = _ref5.data;
+        if (source === _global && data === token) {
+          callbacks.length && callbacks.shift()();
+        }
+      }, false);
+      return function (cb) {
+        callbacks.push(cb);
+        _global.postMessage(token, "*");
+      };
+    }("axios@".concat(Math.random()), []) : function (cb) {
+      return setTimeout(cb);
+    };
+  }(typeof setImmediate === 'function', isFunction(_global.postMessage));
+  var asap = typeof queueMicrotask !== 'undefined' ? queueMicrotask.bind(_global) : typeof process !== 'undefined' && process.nextTick || _setImmediate;
+
+  // *********************
+
   var utils$1 = {
     isArray: isArray,
     isArrayBuffer: isArrayBuffer,
@@ -1376,7 +1404,9 @@
     isSpecCompliantForm: isSpecCompliantForm,
     toJSONObject: toJSONObject,
     isAsyncFn: isAsyncFn,
-    isThenable: isThenable
+    isThenable: isThenable,
+    setImmediate: _setImmediate,
+    asap: asap
   };
 
   /**
@@ -2528,30 +2558,43 @@
   function throttle(fn, freq) {
     var timestamp = 0;
     var threshold = 1000 / freq;
-    var timer = null;
-    return function throttled() {
-      var _arguments = arguments;
-      var force = this === true;
+    var lastArgs;
+    var timer;
+    var invoke = function invoke(args) {
+      var now = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Date.now();
+      timestamp = now;
+      lastArgs = null;
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      fn.apply(null, args);
+    };
+    var throttled = function throttled() {
       var now = Date.now();
-      if (force || now - timestamp > threshold) {
-        if (timer) {
-          clearTimeout(timer);
-          timer = null;
-        }
-        timestamp = now;
-        return fn.apply(null, arguments);
+      var passed = now - timestamp;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
       }
-      if (!timer) {
-        timer = setTimeout(function () {
-          timer = null;
-          timestamp = Date.now();
-          return fn.apply(null, _arguments);
-        }, threshold - (now - timestamp));
+      if (passed >= threshold) {
+        invoke(args, now);
+      } else {
+        lastArgs = args;
+        if (!timer) {
+          timer = setTimeout(function () {
+            timer = null;
+            invoke(lastArgs);
+          }, threshold - passed);
+        }
       }
     };
+    var flush = function flush() {
+      return lastArgs && invoke(lastArgs);
+    };
+    return [throttled, flush];
   }
 
-  var progressEventReducer = (function (listener, isDownloadStream) {
+  var progressEventReducer = function progressEventReducer(listener, isDownloadStream) {
     var freq = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3;
     var bytesNotified = 0;
     var _speedometer = speedometer(50, 250);
@@ -2562,7 +2605,7 @@
       var rate = _speedometer(progressBytes);
       var inRange = loaded <= total;
       bytesNotified = loaded;
-      var data = {
+      var data = _defineProperty({
         loaded: loaded,
         total: total,
         progress: total ? loaded / total : undefined,
@@ -2571,11 +2614,30 @@
         estimated: rate && total && inRange ? (total - loaded) / rate : undefined,
         event: e,
         lengthComputable: total != null
-      };
-      data[isDownloadStream ? 'download' : 'upload'] = true;
+      }, isDownloadStream ? 'download' : 'upload', true);
       listener(data);
     }, freq);
-  });
+  };
+  var progressEventDecorator = function progressEventDecorator(total, throttled) {
+    var lengthComputable = total != null;
+    return [function (loaded) {
+      return throttled[0]({
+        lengthComputable: lengthComputable,
+        total: total,
+        loaded: loaded
+      });
+    }, throttled[1]];
+  };
+  var asyncDecorator = function asyncDecorator(fn) {
+    return function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return utils$1.asap(function () {
+        return fn.apply(void 0, args);
+      });
+    };
+  };
 
   var isURLSameOrigin = platform.hasStandardBrowserEnv ?
   // Standard browser envs have full support of the APIs needed to test
@@ -2861,15 +2923,18 @@
       var _config = resolveConfig(config);
       var requestData = _config.data;
       var requestHeaders = AxiosHeaders$1.from(_config.headers).normalize();
-      var responseType = _config.responseType;
+      var responseType = _config.responseType,
+        onUploadProgress = _config.onUploadProgress,
+        onDownloadProgress = _config.onDownloadProgress;
       var onCanceled;
+      var uploadThrottled, downloadThrottled;
+      var flushUpload, flushDownload;
       function done() {
-        if (_config.cancelToken) {
-          _config.cancelToken.unsubscribe(onCanceled);
-        }
-        if (_config.signal) {
-          _config.signal.removeEventListener('abort', onCanceled);
-        }
+        flushUpload && flushUpload(); // flush events
+        flushDownload && flushDownload(); // flush events
+
+        _config.cancelToken && _config.cancelToken.unsubscribe(onCanceled);
+        _config.signal && _config.signal.removeEventListener('abort', onCanceled);
       }
       var request = new XMLHttpRequest();
       request.open(_config.method.toUpperCase(), _config.url, true);
@@ -2930,7 +2995,7 @@
         if (!request) {
           return;
         }
-        reject(new AxiosError('Request aborted', AxiosError.ECONNABORTED, _config, request));
+        reject(new AxiosError('Request aborted', AxiosError.ECONNABORTED, config, request));
 
         // Clean up request
         request = null;
@@ -2940,7 +3005,7 @@
       request.onerror = function handleError() {
         // Real errors are hidden from us by the browser
         // onerror should only fire if it's a network error
-        reject(new AxiosError('Network Error', AxiosError.ERR_NETWORK, _config, request));
+        reject(new AxiosError('Network Error', AxiosError.ERR_NETWORK, config, request));
 
         // Clean up request
         request = null;
@@ -2953,7 +3018,7 @@
         if (_config.timeoutErrorMessage) {
           timeoutErrorMessage = _config.timeoutErrorMessage;
         }
-        reject(new AxiosError(timeoutErrorMessage, transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED, _config, request));
+        reject(new AxiosError(timeoutErrorMessage, transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED, config, request));
 
         // Clean up request
         request = null;
@@ -2980,13 +3045,22 @@
       }
 
       // Handle progress if needed
-      if (typeof _config.onDownloadProgress === 'function') {
-        request.addEventListener('progress', progressEventReducer(_config.onDownloadProgress, true));
+      if (onDownloadProgress) {
+        var _progressEventReducer = progressEventReducer(onDownloadProgress, true);
+        var _progressEventReducer2 = _slicedToArray(_progressEventReducer, 2);
+        downloadThrottled = _progressEventReducer2[0];
+        flushDownload = _progressEventReducer2[1];
+        request.addEventListener('progress', downloadThrottled);
       }
 
       // Not all browsers support upload events
-      if (typeof _config.onUploadProgress === 'function' && request.upload) {
-        request.upload.addEventListener('progress', progressEventReducer(_config.onUploadProgress));
+      if (onUploadProgress && request.upload) {
+        var _progressEventReducer3 = progressEventReducer(onUploadProgress);
+        var _progressEventReducer4 = _slicedToArray(_progressEventReducer3, 2);
+        uploadThrottled = _progressEventReducer4[0];
+        flushUpload = _progressEventReducer4[1];
+        request.upload.addEventListener('progress', uploadThrottled);
+        request.upload.addEventListener('loadend', flushUpload);
       }
       if (_config.cancelToken || _config.signal) {
         // Handle cancellation
@@ -3171,40 +3245,57 @@
   var trackStream = function trackStream(stream, chunkSize, onProgress, onFinish, encode) {
     var iterator = readBytes(stream, chunkSize, encode);
     var bytes = 0;
+    var done;
+    var _onFinish = function _onFinish(e) {
+      if (!done) {
+        done = true;
+        onFinish && onFinish(e);
+      }
+    };
     return new ReadableStream({
-      type: 'bytes',
       pull: function pull(controller) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          var _yield$iterator$next, done, value, len;
+          var _yield$iterator$next, _done, value, len, loadedBytes;
           return _regeneratorRuntime().wrap(function _callee2$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.next = 2;
+                _context3.prev = 0;
+                _context3.next = 3;
                 return iterator.next();
-              case 2:
+              case 3:
                 _yield$iterator$next = _context3.sent;
-                done = _yield$iterator$next.done;
+                _done = _yield$iterator$next.done;
                 value = _yield$iterator$next.value;
-                if (!done) {
-                  _context3.next = 9;
+                if (!_done) {
+                  _context3.next = 10;
                   break;
                 }
+                _onFinish();
                 controller.close();
-                onFinish();
                 return _context3.abrupt("return");
-              case 9:
+              case 10:
                 len = value.byteLength;
-                onProgress && onProgress(bytes += len);
+                if (onProgress) {
+                  loadedBytes = bytes += len;
+                  onProgress(loadedBytes);
+                }
                 controller.enqueue(new Uint8Array(value));
-              case 12:
+                _context3.next = 19;
+                break;
+              case 15:
+                _context3.prev = 15;
+                _context3.t0 = _context3["catch"](0);
+                _onFinish(_context3.t0);
+                throw _context3.t0;
+              case 19:
               case "end":
                 return _context3.stop();
             }
-          }, _callee2);
+          }, _callee2, null, [[0, 15]]);
         }))();
       },
       cancel: function cancel(reason) {
-        onFinish(reason);
+        _onFinish(reason);
         return iterator["return"]();
       }
     }, {
@@ -3212,18 +3303,6 @@
     });
   };
 
-  var fetchProgressDecorator = function fetchProgressDecorator(total, fn) {
-    var lengthComputable = total != null;
-    return function (loaded) {
-      return setTimeout(function () {
-        return fn({
-          lengthComputable: lengthComputable,
-          total: total,
-          loaded: loaded
-        });
-      });
-    };
-  };
   var isFetchSupported = typeof fetch === 'function' && typeof Request === 'function' && typeof Response === 'function';
   var isReadableStreamSupported = isFetchSupported && typeof ReadableStream === 'function';
 
@@ -3253,7 +3332,17 @@
       return _ref.apply(this, arguments);
     };
   }()));
-  var supportsRequestStream = isReadableStreamSupported && function () {
+  var test = function test(fn) {
+    try {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+      return !!fn.apply(void 0, args);
+    } catch (e) {
+      return false;
+    }
+  };
+  var supportsRequestStream = isReadableStreamSupported && test(function () {
     var duplexAccessed = false;
     var hasContentType = new Request(platform.origin, {
       body: new ReadableStream(),
@@ -3264,15 +3353,11 @@
       }
     }).headers.has('Content-Type');
     return duplexAccessed && !hasContentType;
-  }();
+  });
   var DEFAULT_CHUNK_SIZE = 64 * 1024;
-  var supportsResponseStream = isReadableStreamSupported && !!function () {
-    try {
-      return utils$1.isReadableStream(new Response('').body);
-    } catch (err) {
-      // return undefined
-    }
-  }();
+  var supportsResponseStream = isReadableStreamSupported && test(function () {
+    return utils$1.isReadableStream(new Response('').body);
+  });
   var resolvers = {
     stream: supportsResponseStream && function (res) {
       return res.body;
@@ -3313,7 +3398,7 @@
           case 7:
             return _context2.abrupt("return", _context2.sent.byteLength);
           case 8:
-            if (!utils$1.isArrayBufferView(body)) {
+            if (!(utils$1.isArrayBufferView(body) || utils$1.isArrayBuffer(body))) {
               _context2.next = 10;
               break;
             }
@@ -3360,7 +3445,7 @@
   }();
   var fetchAdapter = isFetchSupported && ( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(config) {
-      var _resolveConfig, url, method, data, signal, cancelToken, timeout, onDownloadProgress, onUploadProgress, responseType, headers, _resolveConfig$withCr, withCredentials, fetchOptions, _ref5, _ref6, composedSignal, stopTimeout, finished, request, onFinish, requestContentLength, _request, contentTypeHeader, response, isStreamResponse, options, responseContentLength, responseData;
+      var _resolveConfig, url, method, data, signal, cancelToken, timeout, onDownloadProgress, onUploadProgress, responseType, headers, _resolveConfig$withCr, withCredentials, fetchOptions, _ref5, _ref6, composedSignal, stopTimeout, finished, request, onFinish, requestContentLength, _request, contentTypeHeader, _progressEventDecorat, _progressEventDecorat2, onProgress, flush, response, isStreamResponse, options, responseContentLength, _ref7, _ref8, _onProgress, _flush, responseData;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -3398,11 +3483,12 @@
               headers.setContentType(contentTypeHeader);
             }
             if (_request.body) {
-              data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, fetchProgressDecorator(requestContentLength, progressEventReducer(onUploadProgress)), null, encodeText);
+              _progressEventDecorat = progressEventDecorator(requestContentLength, progressEventReducer(asyncDecorator(onUploadProgress))), _progressEventDecorat2 = _slicedToArray(_progressEventDecorat, 2), onProgress = _progressEventDecorat2[0], flush = _progressEventDecorat2[1];
+              data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush, encodeText);
             }
           case 15:
             if (!utils$1.isString(withCredentials)) {
-              withCredentials = withCredentials ? 'cors' : 'omit';
+              withCredentials = withCredentials ? 'include' : 'omit';
             }
             request = new Request(url, _objectSpread2(_objectSpread2({}, fetchOptions), {}, {
               signal: composedSignal,
@@ -3410,7 +3496,7 @@
               headers: headers.normalize().toJSON(),
               body: data,
               duplex: "half",
-              withCredentials: withCredentials
+              credentials: withCredentials
             }));
             _context4.next = 19;
             return fetch(request);
@@ -3423,7 +3509,11 @@
                 options[prop] = response[prop];
               });
               responseContentLength = utils$1.toFiniteNumber(response.headers.get('content-length'));
-              response = new Response(trackStream(response.body, DEFAULT_CHUNK_SIZE, onDownloadProgress && fetchProgressDecorator(responseContentLength, progressEventReducer(onDownloadProgress, true)), isStreamResponse && onFinish, encodeText), options);
+              _ref7 = onDownloadProgress && progressEventDecorator(responseContentLength, progressEventReducer(asyncDecorator(onDownloadProgress), true)) || [], _ref8 = _slicedToArray(_ref7, 2), _onProgress = _ref8[0], _flush = _ref8[1];
+              response = new Response(trackStream(response.body, DEFAULT_CHUNK_SIZE, _onProgress, function () {
+                _flush && _flush();
+                isStreamResponse && onFinish();
+              }, encodeText), options);
             }
             responseType = responseType || 'text';
             _context4.next = 25;
@@ -3586,7 +3676,7 @@
     });
   }
 
-  var VERSION = "1.7.2";
+  var VERSION = "1.7.3";
 
   var validators$1 = {};