Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More →
contentful-sdk-core
Advanced tools
contentful-sdk-core - npm Package Compare versions
Comparing version 8.1.5 to 8.2.0
@@ -15,2 +15,27 @@ import copy from 'fast-copy'; | ||
| } | ||
| function asyncGeneratorStep(n, t, e, r, o, a, c) { | ||
| try { | ||
| var i = n[a](c), | ||
| u = i.value; | ||
| } catch (n) { | ||
| return void e(n); | ||
| } | ||
| i.done ? t(u) : Promise.resolve(u).then(r, o); | ||
| } | ||
| function _asyncToGenerator(n) { | ||
| return function () { | ||
| var t = this, | ||
| e = arguments; | ||
| return new Promise(function (r, o) { | ||
| var a = n.apply(t, e); | ||
| function _next(n) { | ||
| asyncGeneratorStep(a, r, o, _next, _throw, "next", n); | ||
| } | ||
| function _throw(n) { | ||
| asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); | ||
| } | ||
| _next(void 0); | ||
| }); | ||
| }; | ||
| } | ||
| function _createForOfIteratorHelper(r, e) { | ||
@@ -135,2 +160,303 @@ var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; | ||
| } | ||
| function _regeneratorRuntime() { | ||
| _regeneratorRuntime = function () { | ||
| return e; | ||
| }; | ||
| var t, | ||
| e = {}, | ||
| r = Object.prototype, | ||
| n = r.hasOwnProperty, | ||
| o = Object.defineProperty || function (t, e, r) { | ||
| t[e] = r.value; | ||
| }, | ||
| i = "function" == typeof Symbol ? Symbol : {}, | ||
| a = i.iterator || "@@iterator", | ||
| c = i.asyncIterator || "@@asyncIterator", | ||
| u = i.toStringTag || "@@toStringTag"; | ||
| function define(t, e, r) { | ||
| return Object.defineProperty(t, e, { | ||
| value: r, | ||
| enumerable: !0, | ||
| configurable: !0, | ||
| writable: !0 | ||
| }), t[e]; | ||
| } | ||
| try { | ||
| define({}, ""); | ||
| } catch (t) { | ||
| define = function (t, e, r) { | ||
| return t[e] = r; | ||
| }; | ||
| } | ||
| function wrap(t, e, r, n) { | ||
| var i = e && e.prototype instanceof Generator ? e : Generator, | ||
| a = Object.create(i.prototype), | ||
| c = new Context(n || []); | ||
| return o(a, "_invoke", { | ||
| value: makeInvokeMethod(t, r, c) | ||
| }), a; | ||
| } | ||
| function tryCatch(t, e, r) { | ||
| try { | ||
| return { | ||
| type: "normal", | ||
| arg: t.call(e, r) | ||
| }; | ||
| } catch (t) { | ||
| return { | ||
| type: "throw", | ||
| arg: t | ||
| }; | ||
| } | ||
| } | ||
| e.wrap = wrap; | ||
| var h = "suspendedStart", | ||
| l = "suspendedYield", | ||
| f = "executing", | ||
| s = "completed", | ||
| y = {}; | ||
| function Generator() {} | ||
| function GeneratorFunction() {} | ||
| function GeneratorFunctionPrototype() {} | ||
| var p = {}; | ||
| define(p, a, function () { | ||
| return this; | ||
| }); | ||
| var d = Object.getPrototypeOf, | ||
| v = d && d(d(values([]))); | ||
| v && v !== r && n.call(v, a) && (p = v); | ||
| var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); | ||
| function defineIteratorMethods(t) { | ||
| ["next", "throw", "return"].forEach(function (e) { | ||
| define(t, e, function (t) { | ||
| return this._invoke(e, t); | ||
| }); | ||
| }); | ||
| } | ||
| function AsyncIterator(t, e) { | ||
| function invoke(r, o, i, a) { | ||
| var c = tryCatch(t[r], t, o); | ||
| if ("throw" !== c.type) { | ||
| var u = c.arg, | ||
| h = u.value; | ||
| return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { | ||
| invoke("next", t, i, a); | ||
| }, function (t) { | ||
| invoke("throw", t, i, a); | ||
| }) : e.resolve(h).then(function (t) { | ||
| u.value = t, i(u); | ||
| }, function (t) { | ||
| return invoke("throw", t, i, a); | ||
| }); | ||
| } | ||
| a(c.arg); | ||
| } | ||
| var r; | ||
| o(this, "_invoke", { | ||
| value: function (t, n) { | ||
| function callInvokeWithMethodAndArg() { | ||
| return new e(function (e, r) { | ||
| invoke(t, n, e, r); | ||
| }); | ||
| } | ||
| return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); | ||
| } | ||
| }); | ||
| } | ||
| function makeInvokeMethod(e, r, n) { | ||
| var o = h; | ||
| return function (i, a) { | ||
| if (o === f) throw Error("Generator is already running"); | ||
| if (o === s) { | ||
| if ("throw" === i) throw a; | ||
| return { | ||
| value: t, | ||
| done: !0 | ||
| }; | ||
| } | ||
| for (n.method = i, n.arg = a;;) { | ||
| var c = n.delegate; | ||
| if (c) { | ||
| var u = maybeInvokeDelegate(c, n); | ||
| if (u) { | ||
| if (u === y) continue; | ||
| return u; | ||
| } | ||
| } | ||
| if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { | ||
| if (o === h) throw o = s, n.arg; | ||
| n.dispatchException(n.arg); | ||
| } else "return" === n.method && n.abrupt("return", n.arg); | ||
| o = f; | ||
| var p = tryCatch(e, r, n); | ||
| if ("normal" === p.type) { | ||
| if (o = n.done ? s : l, p.arg === y) continue; | ||
| return { | ||
| value: p.arg, | ||
| done: n.done | ||
| }; | ||
| } | ||
| "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); | ||
| } | ||
| }; | ||
| } | ||
| function maybeInvokeDelegate(e, r) { | ||
| var n = r.method, | ||
| o = e.iterator[n]; | ||
| if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; | ||
| var i = tryCatch(o, e.iterator, r.arg); | ||
| if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; | ||
| var a = i.arg; | ||
| return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); | ||
| } | ||
| function pushTryEntry(t) { | ||
| var e = { | ||
| tryLoc: t[0] | ||
| }; | ||
| 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); | ||
| } | ||
| function resetTryEntry(t) { | ||
| var e = t.completion || {}; | ||
| e.type = "normal", delete e.arg, t.completion = e; | ||
| } | ||
| function Context(t) { | ||
| this.tryEntries = [{ | ||
| tryLoc: "root" | ||
| }], t.forEach(pushTryEntry, this), this.reset(!0); | ||
| } | ||
| function values(e) { | ||
| if (e || "" === e) { | ||
| var r = e[a]; | ||
| if (r) return r.call(e); | ||
| if ("function" == typeof e.next) return e; | ||
| if (!isNaN(e.length)) { | ||
| var o = -1, | ||
| i = function next() { | ||
| for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; | ||
| return next.value = t, next.done = !0, next; | ||
| }; | ||
| return i.next = i; | ||
| } | ||
| } | ||
| throw new TypeError(typeof e + " is not iterable"); | ||
| } | ||
| return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { | ||
| value: GeneratorFunctionPrototype, | ||
| configurable: !0 | ||
| }), o(GeneratorFunctionPrototype, "constructor", { | ||
| value: GeneratorFunction, | ||
| configurable: !0 | ||
| }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { | ||
| var e = "function" == typeof t && t.constructor; | ||
| return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); | ||
| }, e.mark = function (t) { | ||
| return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; | ||
| }, e.awrap = function (t) { | ||
| return { | ||
| __await: t | ||
| }; | ||
| }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { | ||
| return this; | ||
| }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { | ||
| void 0 === i && (i = Promise); | ||
| var a = new AsyncIterator(wrap(t, r, n, o), i); | ||
| return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { | ||
| return t.done ? t.value : a.next(); | ||
| }); | ||
| }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { | ||
| return this; | ||
| }), define(g, "toString", function () { | ||
| return "[object Generator]"; | ||
| }), e.keys = function (t) { | ||
| var e = Object(t), | ||
| r = []; | ||
| for (var n in e) r.push(n); | ||
| return r.reverse(), function next() { | ||
| for (; r.length;) { | ||
| var t = r.pop(); | ||
| if (t in e) return next.value = t, next.done = !1, next; | ||
| } | ||
| return next.done = !0, next; | ||
| }; | ||
| }, e.values = values, Context.prototype = { | ||
| constructor: Context, | ||
| reset: function (e) { | ||
| if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); | ||
| }, | ||
| stop: function () { | ||
| this.done = !0; | ||
| var t = this.tryEntries[0].completion; | ||
| if ("throw" === t.type) throw t.arg; | ||
| return this.rval; | ||
| }, | ||
| dispatchException: function (e) { | ||
| if (this.done) throw e; | ||
| var r = this; | ||
| function handle(n, o) { | ||
| return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; | ||
| } | ||
| for (var o = this.tryEntries.length - 1; o >= 0; --o) { | ||
| var i = this.tryEntries[o], | ||
| a = i.completion; | ||
| if ("root" === i.tryLoc) return handle("end"); | ||
| if (i.tryLoc <= this.prev) { | ||
| var c = n.call(i, "catchLoc"), | ||
| u = n.call(i, "finallyLoc"); | ||
| if (c && u) { | ||
| if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); | ||
| if (this.prev < i.finallyLoc) return handle(i.finallyLoc); | ||
| } else if (c) { | ||
| if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); | ||
| } else { | ||
| if (!u) throw Error("try statement without catch or finally"); | ||
| if (this.prev < i.finallyLoc) return handle(i.finallyLoc); | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| abrupt: function (t, e) { | ||
| for (var r = this.tryEntries.length - 1; r >= 0; --r) { | ||
| var o = this.tryEntries[r]; | ||
| if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { | ||
| var i = o; | ||
| break; | ||
| } | ||
| } | ||
| i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); | ||
| var a = i ? i.completion : {}; | ||
| return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); | ||
| }, | ||
| complete: function (t, e) { | ||
| if ("throw" === t.type) throw t.arg; | ||
| return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; | ||
| }, | ||
| finish: function (t) { | ||
| for (var e = this.tryEntries.length - 1; e >= 0; --e) { | ||
| var r = this.tryEntries[e]; | ||
| if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; | ||
| } | ||
| }, | ||
| catch: function (t) { | ||
| for (var e = this.tryEntries.length - 1; e >= 0; --e) { | ||
| var r = this.tryEntries[e]; | ||
| if (r.tryLoc === t) { | ||
| var n = r.completion; | ||
| if ("throw" === n.type) { | ||
| var o = n.arg; | ||
| resetTryEntry(r); | ||
| } | ||
| return o; | ||
| } | ||
| } | ||
| throw Error("illegal catch attempt"); | ||
| }, | ||
| delegateYield: function (e, r, n) { | ||
| return this.delegate = { | ||
| iterator: values(e), | ||
| resultName: r, | ||
| nextLoc: n | ||
| }, "next" === this.method && (this.arg = t), y; | ||
| } | ||
| }, e; | ||
| } | ||
| function _setPrototypeOf(t, e) { | ||
@@ -280,53 +606,81 @@ return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { | ||
| return response; | ||
| }, function (error) { | ||
| var response = error.response; | ||
| var config = error.config; | ||
| responseLogger(error); | ||
| // Do not retry if it is disabled or no request config exists (not an axios error) | ||
| if (!config || !instance.defaults.retryOnError) { | ||
| return Promise.reject(error); | ||
| } | ||
| }, /*#__PURE__*/function () { | ||
| var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(error) { | ||
| var response, config, doneAttempts, retryErrorType, wait; | ||
| return _regeneratorRuntime().wrap(function _callee$(_context) { | ||
| while (1) switch (_context.prev = _context.next) { | ||
| case 0: | ||
| response = error.response; | ||
| config = error.config; | ||
| responseLogger(error); | ||
| // Do not retry if it is disabled or no request config exists (not an axios error) | ||
| if (!(!config || !instance.defaults.retryOnError)) { | ||
| _context.next = 5; | ||
| break; | ||
| } | ||
| return _context.abrupt("return", Promise.reject(error)); | ||
| case 5: | ||
| // Retried already for max attempts | ||
| doneAttempts = config.attempts || 1; | ||
| if (!(doneAttempts > maxRetry)) { | ||
| _context.next = 9; | ||
| break; | ||
| } | ||
| error.attempts = config.attempts; | ||
| return _context.abrupt("return", Promise.reject(error)); | ||
| case 9: | ||
| retryErrorType = null; | ||
| wait = defaultWait(doneAttempts); // Errors without response did not receive anything from the server | ||
| if (!response) { | ||
| retryErrorType = 'Connection'; | ||
| } else if (response.status >= 500 && response.status < 600) { | ||
| // 5** errors are server related | ||
| retryErrorType = "Server ".concat(response.status); | ||
| } else if (response.status === 429) { | ||
| // 429 errors are exceeded rate limit exceptions | ||
| retryErrorType = 'Rate limit'; | ||
| // all headers are lowercased by axios https://github.com/mzabriskie/axios/issues/413 | ||
| if (response.headers && error.response.headers['x-contentful-ratelimit-reset']) { | ||
| wait = response.headers['x-contentful-ratelimit-reset']; | ||
| } | ||
| } | ||
| if (!retryErrorType) { | ||
| _context.next = 20; | ||
| break; | ||
| } | ||
| // convert to ms and add jitter | ||
| wait = Math.floor(wait * 1000 + Math.random() * 200 + 500); | ||
| instance.defaults.logHandler('warning', "".concat(retryErrorType, " error occurred. Waiting for ").concat(wait, " ms before retrying...")); | ||
| // Retried already for max attempts | ||
| var doneAttempts = config.attempts || 1; | ||
| if (doneAttempts > maxRetry) { | ||
| error.attempts = config.attempts; | ||
| return Promise.reject(error); | ||
| } | ||
| var retryErrorType = null; | ||
| var wait = defaultWait(doneAttempts); | ||
| // increase attempts counter | ||
| config.attempts = doneAttempts + 1; | ||
| // Errors without response did not receive anything from the server | ||
| if (!response) { | ||
| retryErrorType = 'Connection'; | ||
| } else if (response.status >= 500 && response.status < 600) { | ||
| // 5** errors are server related | ||
| retryErrorType = "Server ".concat(response.status); | ||
| } else if (response.status === 429) { | ||
| // 429 errors are exceeded rate limit exceptions | ||
| retryErrorType = 'Rate limit'; | ||
| // all headers are lowercased by axios https://github.com/mzabriskie/axios/issues/413 | ||
| if (response.headers && error.response.headers['x-contentful-ratelimit-reset']) { | ||
| wait = response.headers['x-contentful-ratelimit-reset']; | ||
| } | ||
| } | ||
| if (retryErrorType) { | ||
| // convert to ms and add jitter | ||
| wait = Math.floor(wait * 1000 + Math.random() * 200 + 500); | ||
| instance.defaults.logHandler('warning', "".concat(retryErrorType, " error occurred. Waiting for ").concat(wait, " ms before retrying...")); | ||
| /* Somehow between the interceptor and retrying the request the httpAgent/httpsAgent gets transformed from an Agent-like object | ||
| to a regular object, causing failures on retries after rate limits. Removing these properties here fixes the error, but retry | ||
| requests still use the original http/httpsAgent property */ | ||
| delete config.httpAgent; | ||
| delete config.httpsAgent; | ||
| // increase attempts counter | ||
| config.attempts = doneAttempts + 1; | ||
| /* Somehow between the interceptor and retrying the request the httpAgent/httpsAgent gets transformed from an Agent-like object | ||
| to a regular object, causing failures on retries after rate limits. Removing these properties here fixes the error, but retry | ||
| requests still use the original http/httpsAgent property */ | ||
| delete config.httpAgent; | ||
| delete config.httpsAgent; | ||
| return delay(wait).then(function () { | ||
| return instance(config); | ||
| }); | ||
| } | ||
| return Promise.reject(error); | ||
| }); | ||
| /** | ||
| * Hack to mitigate (likely) bug introduced in axios v1.7.0 where `url`, | ||
| * when using the default `xhr` adapter, is a fully qualified URL (instead of a path), | ||
| * which somehow causes the request params to be repeatedly appended | ||
| * to the final request URL upon each retry. | ||
| */ | ||
| config.url = config.url.split('?')[0]; | ||
| return _context.abrupt("return", delay(wait).then(function () { | ||
| return instance(config); | ||
| })); | ||
| case 20: | ||
| return _context.abrupt("return", Promise.reject(error)); | ||
| case 21: | ||
| case "end": | ||
| return _context.stop(); | ||
| } | ||
| }, _callee); | ||
| })); | ||
| return function (_x) { | ||
| return _ref.apply(this, arguments); | ||
| }; | ||
| }()); | ||
| } | ||
@@ -333,0 +687,0 @@ |
@@ -27,2 +27,27 @@ 'use strict'; | ||
| } | ||
| function asyncGeneratorStep(n, t, e, r, o, a, c) { | ||
| try { | ||
| var i = n[a](c), | ||
| u = i.value; | ||
| } catch (n) { | ||
| return void e(n); | ||
| } | ||
| i.done ? t(u) : Promise.resolve(u).then(r, o); | ||
| } | ||
| function _asyncToGenerator(n) { | ||
| return function () { | ||
| var t = this, | ||
| e = arguments; | ||
| return new Promise(function (r, o) { | ||
| var a = n.apply(t, e); | ||
| function _next(n) { | ||
| asyncGeneratorStep(a, r, o, _next, _throw, "next", n); | ||
| } | ||
| function _throw(n) { | ||
| asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); | ||
| } | ||
| _next(void 0); | ||
| }); | ||
| }; | ||
| } | ||
| function _createForOfIteratorHelper(r, e) { | ||
@@ -147,2 +172,303 @@ var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; | ||
| } | ||
| function _regeneratorRuntime() { | ||
| _regeneratorRuntime = function () { | ||
| return e; | ||
| }; | ||
| var t, | ||
| e = {}, | ||
| r = Object.prototype, | ||
| n = r.hasOwnProperty, | ||
| o = Object.defineProperty || function (t, e, r) { | ||
| t[e] = r.value; | ||
| }, | ||
| i = "function" == typeof Symbol ? Symbol : {}, | ||
| a = i.iterator || "@@iterator", | ||
| c = i.asyncIterator || "@@asyncIterator", | ||
| u = i.toStringTag || "@@toStringTag"; | ||
| function define(t, e, r) { | ||
| return Object.defineProperty(t, e, { | ||
| value: r, | ||
| enumerable: !0, | ||
| configurable: !0, | ||
| writable: !0 | ||
| }), t[e]; | ||
| } | ||
| try { | ||
| define({}, ""); | ||
| } catch (t) { | ||
| define = function (t, e, r) { | ||
| return t[e] = r; | ||
| }; | ||
| } | ||
| function wrap(t, e, r, n) { | ||
| var i = e && e.prototype instanceof Generator ? e : Generator, | ||
| a = Object.create(i.prototype), | ||
| c = new Context(n || []); | ||
| return o(a, "_invoke", { | ||
| value: makeInvokeMethod(t, r, c) | ||
| }), a; | ||
| } | ||
| function tryCatch(t, e, r) { | ||
| try { | ||
| return { | ||
| type: "normal", | ||
| arg: t.call(e, r) | ||
| }; | ||
| } catch (t) { | ||
| return { | ||
| type: "throw", | ||
| arg: t | ||
| }; | ||
| } | ||
| } | ||
| e.wrap = wrap; | ||
| var h = "suspendedStart", | ||
| l = "suspendedYield", | ||
| f = "executing", | ||
| s = "completed", | ||
| y = {}; | ||
| function Generator() {} | ||
| function GeneratorFunction() {} | ||
| function GeneratorFunctionPrototype() {} | ||
| var p = {}; | ||
| define(p, a, function () { | ||
| return this; | ||
| }); | ||
| var d = Object.getPrototypeOf, | ||
| v = d && d(d(values([]))); | ||
| v && v !== r && n.call(v, a) && (p = v); | ||
| var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); | ||
| function defineIteratorMethods(t) { | ||
| ["next", "throw", "return"].forEach(function (e) { | ||
| define(t, e, function (t) { | ||
| return this._invoke(e, t); | ||
| }); | ||
| }); | ||
| } | ||
| function AsyncIterator(t, e) { | ||
| function invoke(r, o, i, a) { | ||
| var c = tryCatch(t[r], t, o); | ||
| if ("throw" !== c.type) { | ||
| var u = c.arg, | ||
| h = u.value; | ||
| return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { | ||
| invoke("next", t, i, a); | ||
| }, function (t) { | ||
| invoke("throw", t, i, a); | ||
| }) : e.resolve(h).then(function (t) { | ||
| u.value = t, i(u); | ||
| }, function (t) { | ||
| return invoke("throw", t, i, a); | ||
| }); | ||
| } | ||
| a(c.arg); | ||
| } | ||
| var r; | ||
| o(this, "_invoke", { | ||
| value: function (t, n) { | ||
| function callInvokeWithMethodAndArg() { | ||
| return new e(function (e, r) { | ||
| invoke(t, n, e, r); | ||
| }); | ||
| } | ||
| return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); | ||
| } | ||
| }); | ||
| } | ||
| function makeInvokeMethod(e, r, n) { | ||
| var o = h; | ||
| return function (i, a) { | ||
| if (o === f) throw Error("Generator is already running"); | ||
| if (o === s) { | ||
| if ("throw" === i) throw a; | ||
| return { | ||
| value: t, | ||
| done: !0 | ||
| }; | ||
| } | ||
| for (n.method = i, n.arg = a;;) { | ||
| var c = n.delegate; | ||
| if (c) { | ||
| var u = maybeInvokeDelegate(c, n); | ||
| if (u) { | ||
| if (u === y) continue; | ||
| return u; | ||
| } | ||
| } | ||
| if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { | ||
| if (o === h) throw o = s, n.arg; | ||
| n.dispatchException(n.arg); | ||
| } else "return" === n.method && n.abrupt("return", n.arg); | ||
| o = f; | ||
| var p = tryCatch(e, r, n); | ||
| if ("normal" === p.type) { | ||
| if (o = n.done ? s : l, p.arg === y) continue; | ||
| return { | ||
| value: p.arg, | ||
| done: n.done | ||
| }; | ||
| } | ||
| "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); | ||
| } | ||
| }; | ||
| } | ||
| function maybeInvokeDelegate(e, r) { | ||
| var n = r.method, | ||
| o = e.iterator[n]; | ||
| if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; | ||
| var i = tryCatch(o, e.iterator, r.arg); | ||
| if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; | ||
| var a = i.arg; | ||
| return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); | ||
| } | ||
| function pushTryEntry(t) { | ||
| var e = { | ||
| tryLoc: t[0] | ||
| }; | ||
| 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); | ||
| } | ||
| function resetTryEntry(t) { | ||
| var e = t.completion || {}; | ||
| e.type = "normal", delete e.arg, t.completion = e; | ||
| } | ||
| function Context(t) { | ||
| this.tryEntries = [{ | ||
| tryLoc: "root" | ||
| }], t.forEach(pushTryEntry, this), this.reset(!0); | ||
| } | ||
| function values(e) { | ||
| if (e || "" === e) { | ||
| var r = e[a]; | ||
| if (r) return r.call(e); | ||
| if ("function" == typeof e.next) return e; | ||
| if (!isNaN(e.length)) { | ||
| var o = -1, | ||
| i = function next() { | ||
| for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; | ||
| return next.value = t, next.done = !0, next; | ||
| }; | ||
| return i.next = i; | ||
| } | ||
| } | ||
| throw new TypeError(typeof e + " is not iterable"); | ||
| } | ||
| return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { | ||
| value: GeneratorFunctionPrototype, | ||
| configurable: !0 | ||
| }), o(GeneratorFunctionPrototype, "constructor", { | ||
| value: GeneratorFunction, | ||
| configurable: !0 | ||
| }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { | ||
| var e = "function" == typeof t && t.constructor; | ||
| return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); | ||
| }, e.mark = function (t) { | ||
| return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; | ||
| }, e.awrap = function (t) { | ||
| return { | ||
| __await: t | ||
| }; | ||
| }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { | ||
| return this; | ||
| }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { | ||
| void 0 === i && (i = Promise); | ||
| var a = new AsyncIterator(wrap(t, r, n, o), i); | ||
| return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { | ||
| return t.done ? t.value : a.next(); | ||
| }); | ||
| }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { | ||
| return this; | ||
| }), define(g, "toString", function () { | ||
| return "[object Generator]"; | ||
| }), e.keys = function (t) { | ||
| var e = Object(t), | ||
| r = []; | ||
| for (var n in e) r.push(n); | ||
| return r.reverse(), function next() { | ||
| for (; r.length;) { | ||
| var t = r.pop(); | ||
| if (t in e) return next.value = t, next.done = !1, next; | ||
| } | ||
| return next.done = !0, next; | ||
| }; | ||
| }, e.values = values, Context.prototype = { | ||
| constructor: Context, | ||
| reset: function (e) { | ||
| if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); | ||
| }, | ||
| stop: function () { | ||
| this.done = !0; | ||
| var t = this.tryEntries[0].completion; | ||
| if ("throw" === t.type) throw t.arg; | ||
| return this.rval; | ||
| }, | ||
| dispatchException: function (e) { | ||
| if (this.done) throw e; | ||
| var r = this; | ||
| function handle(n, o) { | ||
| return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; | ||
| } | ||
| for (var o = this.tryEntries.length - 1; o >= 0; --o) { | ||
| var i = this.tryEntries[o], | ||
| a = i.completion; | ||
| if ("root" === i.tryLoc) return handle("end"); | ||
| if (i.tryLoc <= this.prev) { | ||
| var c = n.call(i, "catchLoc"), | ||
| u = n.call(i, "finallyLoc"); | ||
| if (c && u) { | ||
| if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); | ||
| if (this.prev < i.finallyLoc) return handle(i.finallyLoc); | ||
| } else if (c) { | ||
| if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); | ||
| } else { | ||
| if (!u) throw Error("try statement without catch or finally"); | ||
| if (this.prev < i.finallyLoc) return handle(i.finallyLoc); | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| abrupt: function (t, e) { | ||
| for (var r = this.tryEntries.length - 1; r >= 0; --r) { | ||
| var o = this.tryEntries[r]; | ||
| if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { | ||
| var i = o; | ||
| break; | ||
| } | ||
| } | ||
| i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); | ||
| var a = i ? i.completion : {}; | ||
| return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); | ||
| }, | ||
| complete: function (t, e) { | ||
| if ("throw" === t.type) throw t.arg; | ||
| return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; | ||
| }, | ||
| finish: function (t) { | ||
| for (var e = this.tryEntries.length - 1; e >= 0; --e) { | ||
| var r = this.tryEntries[e]; | ||
| if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; | ||
| } | ||
| }, | ||
| catch: function (t) { | ||
| for (var e = this.tryEntries.length - 1; e >= 0; --e) { | ||
| var r = this.tryEntries[e]; | ||
| if (r.tryLoc === t) { | ||
| var n = r.completion; | ||
| if ("throw" === n.type) { | ||
| var o = n.arg; | ||
| resetTryEntry(r); | ||
| } | ||
| return o; | ||
| } | ||
| } | ||
| throw Error("illegal catch attempt"); | ||
| }, | ||
| delegateYield: function (e, r, n) { | ||
| return this.delegate = { | ||
| iterator: values(e), | ||
| resultName: r, | ||
| nextLoc: n | ||
| }, "next" === this.method && (this.arg = t), y; | ||
| } | ||
| }, e; | ||
| } | ||
| function _setPrototypeOf(t, e) { | ||
@@ -292,53 +618,81 @@ return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { | ||
| return response; | ||
| }, function (error) { | ||
| var response = error.response; | ||
| var config = error.config; | ||
| responseLogger(error); | ||
| // Do not retry if it is disabled or no request config exists (not an axios error) | ||
| if (!config || !instance.defaults.retryOnError) { | ||
| return Promise.reject(error); | ||
| } | ||
| }, /*#__PURE__*/function () { | ||
| var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(error) { | ||
| var response, config, doneAttempts, retryErrorType, wait; | ||
| return _regeneratorRuntime().wrap(function _callee$(_context) { | ||
| while (1) switch (_context.prev = _context.next) { | ||
| case 0: | ||
| response = error.response; | ||
| config = error.config; | ||
| responseLogger(error); | ||
| // Do not retry if it is disabled or no request config exists (not an axios error) | ||
| if (!(!config || !instance.defaults.retryOnError)) { | ||
| _context.next = 5; | ||
| break; | ||
| } | ||
| return _context.abrupt("return", Promise.reject(error)); | ||
| case 5: | ||
| // Retried already for max attempts | ||
| doneAttempts = config.attempts || 1; | ||
| if (!(doneAttempts > maxRetry)) { | ||
| _context.next = 9; | ||
| break; | ||
| } | ||
| error.attempts = config.attempts; | ||
| return _context.abrupt("return", Promise.reject(error)); | ||
| case 9: | ||
| retryErrorType = null; | ||
| wait = defaultWait(doneAttempts); // Errors without response did not receive anything from the server | ||
| if (!response) { | ||
| retryErrorType = 'Connection'; | ||
| } else if (response.status >= 500 && response.status < 600) { | ||
| // 5** errors are server related | ||
| retryErrorType = "Server ".concat(response.status); | ||
| } else if (response.status === 429) { | ||
| // 429 errors are exceeded rate limit exceptions | ||
| retryErrorType = 'Rate limit'; | ||
| // all headers are lowercased by axios https://github.com/mzabriskie/axios/issues/413 | ||
| if (response.headers && error.response.headers['x-contentful-ratelimit-reset']) { | ||
| wait = response.headers['x-contentful-ratelimit-reset']; | ||
| } | ||
| } | ||
| if (!retryErrorType) { | ||
| _context.next = 20; | ||
| break; | ||
| } | ||
| // convert to ms and add jitter | ||
| wait = Math.floor(wait * 1000 + Math.random() * 200 + 500); | ||
| instance.defaults.logHandler('warning', "".concat(retryErrorType, " error occurred. Waiting for ").concat(wait, " ms before retrying...")); | ||
| // Retried already for max attempts | ||
| var doneAttempts = config.attempts || 1; | ||
| if (doneAttempts > maxRetry) { | ||
| error.attempts = config.attempts; | ||
| return Promise.reject(error); | ||
| } | ||
| var retryErrorType = null; | ||
| var wait = defaultWait(doneAttempts); | ||
| // increase attempts counter | ||
| config.attempts = doneAttempts + 1; | ||
| // Errors without response did not receive anything from the server | ||
| if (!response) { | ||
| retryErrorType = 'Connection'; | ||
| } else if (response.status >= 500 && response.status < 600) { | ||
| // 5** errors are server related | ||
| retryErrorType = "Server ".concat(response.status); | ||
| } else if (response.status === 429) { | ||
| // 429 errors are exceeded rate limit exceptions | ||
| retryErrorType = 'Rate limit'; | ||
| // all headers are lowercased by axios https://github.com/mzabriskie/axios/issues/413 | ||
| if (response.headers && error.response.headers['x-contentful-ratelimit-reset']) { | ||
| wait = response.headers['x-contentful-ratelimit-reset']; | ||
| } | ||
| } | ||
| if (retryErrorType) { | ||
| // convert to ms and add jitter | ||
| wait = Math.floor(wait * 1000 + Math.random() * 200 + 500); | ||
| instance.defaults.logHandler('warning', "".concat(retryErrorType, " error occurred. Waiting for ").concat(wait, " ms before retrying...")); | ||
| /* Somehow between the interceptor and retrying the request the httpAgent/httpsAgent gets transformed from an Agent-like object | ||
| to a regular object, causing failures on retries after rate limits. Removing these properties here fixes the error, but retry | ||
| requests still use the original http/httpsAgent property */ | ||
| delete config.httpAgent; | ||
| delete config.httpsAgent; | ||
| // increase attempts counter | ||
| config.attempts = doneAttempts + 1; | ||
| /* Somehow between the interceptor and retrying the request the httpAgent/httpsAgent gets transformed from an Agent-like object | ||
| to a regular object, causing failures on retries after rate limits. Removing these properties here fixes the error, but retry | ||
| requests still use the original http/httpsAgent property */ | ||
| delete config.httpAgent; | ||
| delete config.httpsAgent; | ||
| return delay(wait).then(function () { | ||
| return instance(config); | ||
| }); | ||
| } | ||
| return Promise.reject(error); | ||
| }); | ||
| /** | ||
| * Hack to mitigate (likely) bug introduced in axios v1.7.0 where `url`, | ||
| * when using the default `xhr` adapter, is a fully qualified URL (instead of a path), | ||
| * which somehow causes the request params to be repeatedly appended | ||
| * to the final request URL upon each retry. | ||
| */ | ||
| config.url = config.url.split('?')[0]; | ||
| return _context.abrupt("return", delay(wait).then(function () { | ||
| return instance(config); | ||
| })); | ||
| case 20: | ||
| return _context.abrupt("return", Promise.reject(error)); | ||
| case 21: | ||
| case "end": | ||
| return _context.stop(); | ||
| } | ||
| }, _callee); | ||
| })); | ||
| return function (_x) { | ||
| return _ref.apply(this, arguments); | ||
| }; | ||
| }()); | ||
| } | ||
@@ -345,0 +699,0 @@ |
| { | ||
| "name": "contentful-sdk-core", | ||
| "version": "8.1.5", | ||
| "version": "8.2.0", | ||
| "description": "Core modules for the Contentful JS SDKs", | ||
@@ -77,3 +77,3 @@ "homepage": "https://www.contentful.com/developers/docs/javascript/", | ||
| "@typescript-eslint/parser": "^5.11.0", | ||
| "axios": "^1.6.0", | ||
| "axios": "^1.7.2", | ||
| "axios-mock-adapter": "^1.20.0", | ||
@@ -80,0 +80,0 @@ "babel-eslint": "^10.1.0", |
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
- increased by38.79%
90403
- Lines of code
- increased by44.13%
2319
- Number of medium supply chain risk alerts
- decreased by-100%
0
No dependency changes