@atlaskit/editor-synced-block-provider 2.12.2 → 2.12.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.12.3
+
+### Patch Changes
+
+- [`707c3960baedb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/707c3960baedb) -
+  EDITOR-1923 retry api requests on rate limited for sync block provider
+- Updated dependencies
+
 ## 2.12.2
 
 ### Patch Changes

package/dist/cjs/clients/block-service/blockService.js

@@ -13,6 +13,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _retry = require("../../utils/retry");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var isBlockContentResponse = exports.isBlockContentResponse = function isBlockContentResponse(response) {
@@ -69,7 +70,7 @@ var getReferenceSyncedBlocks = exports.getReferenceSyncedBlocks = /*#__PURE__*/f
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/document/reference/").concat(encodeURIComponent(documentAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/document/reference/").concat(encodeURIComponent(documentAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -119,7 +120,7 @@ var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/functio
         case 0:
           blockAri = _ref2.blockAri;
           _context2.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -153,7 +154,7 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref4.blockAri;
           _context3.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'DELETE',
             headers: COMMON_HEADERS
           });
@@ -182,7 +183,7 @@ var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref6.blockAri, content = _ref6.content;
           _context4.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'PUT',
             headers: COMMON_HEADERS,
             body: JSON.stringify({
@@ -214,7 +215,7 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref8.blockAri, blockInstanceId = _ref8.blockInstanceId, sourceAri = _ref8.sourceAri, product = _ref8.product, content = _ref8.content;
           _context5.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block"), {
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block"), {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify({

package/dist/cjs/clients/confluence/contentProperty.js

@@ -8,6 +8,7 @@ exports.updateContentProperty = exports.getContentProperty = exports.deleteConte
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _retry = require("../../utils/retry");
 var _ari = require("./ari");
 var _utils = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -95,7 +96,7 @@ var getContentProperty = exports.getContentProperty = /*#__PURE__*/function () {
             }
           };
           _context.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
@@ -204,7 +205,7 @@ var createContentProperty = exports.createContentProperty = /*#__PURE__*/functio
             }
           };
           _context3.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
@@ -254,7 +255,7 @@ var deleteContentProperty = exports.deleteContentProperty = /*#__PURE__*/functio
             }
           };
           _context4.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)

package/dist/cjs/clients/confluence/sourceInfo.js

@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _errorHandling = require("../../utils/errorHandling");
+var _retry = require("../../utils/retry");
 var _ari = require("./ari");
 var _utils = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -43,7 +44,7 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
             }
           };
           _context.next = 3;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)

package/dist/cjs/common/types.js

@@ -8,6 +8,11 @@ var SyncBlockError = exports.SyncBlockError = /*#__PURE__*/function (SyncBlockEr
   SyncBlockError["Errored"] = "errored";
   SyncBlockError["NotFound"] = "not_found";
   SyncBlockError["Forbidden"] = "forbidden";
+  SyncBlockError["InvalidRequest"] = "invalid_request";
+  SyncBlockError["RateLimited"] = "rate_limited";
+  SyncBlockError["Conflict"] = "conflict";
+  // attempt to create block that already exists
+  SyncBlockError["ServerError"] = "server_error";
   SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
   return SyncBlockError;
 }({});

package/dist/cjs/providers/block-service/blockServiceAPI.js

@@ -17,10 +17,21 @@ var _types = require("../../common/types");
 var _errorHandling = require("../../utils/errorHandling");
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
+    case 400:
+    case 401:
+      return _types.SyncBlockError.InvalidRequest;
     case 403:
       return _types.SyncBlockError.Forbidden;
     case 404:
       return _types.SyncBlockError.NotFound;
+    case 409:
+      return _types.SyncBlockError.Conflict;
+    case 429:
+      return _types.SyncBlockError.RateLimited;
+    case 500:
+    case 503:
+    case 504:
+      return _types.SyncBlockError.ServerError;
   }
   return _types.SyncBlockError.Errored;
 };

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -26,10 +26,10 @@ var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resol
     return newResult;
   } else if (!newResult.data) {
     // return the old result if there was an error, e.g. network error, but not if not found or forbidden
-    if (newResult.error === _types.SyncBlockError.Errored) {
-      return oldResult;
-    } else {
+    if (newResult.error === _types.SyncBlockError.NotFound || newResult.error === _types.SyncBlockError.Forbidden) {
       return newResult;
+    } else {
+      return oldResult;
     }
   }
 

package/dist/cjs/utils/retry.js

@@ -0,0 +1,66 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchWithRetry = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var parseRetryAfter = function parseRetryAfter(retryAfter) {
+  var newDelay;
+
+  // retryAfter can either be in ms or HTTP date
+  var parsedRetryAfter = parseInt(retryAfter);
+  if (!isNaN(parsedRetryAfter)) {
+    newDelay = parsedRetryAfter * 1000;
+  } else {
+    var retryDate = new Date(retryAfter);
+    var delayFromDate = retryDate.getTime() - Date.now();
+    if (delayFromDate > 0) {
+      newDelay = delayFromDate;
+    }
+  }
+  return newDelay;
+};
+var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, options) {
+    var retriesRemaining,
+      delay,
+      response,
+      shouldRetry,
+      retryAfter,
+      _args = arguments;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          retriesRemaining = _args.length > 2 && _args[2] !== undefined ? _args[2] : 3;
+          delay = _args.length > 3 && _args[3] !== undefined ? _args[3] : 1000;
+          _context.next = 4;
+          return fetch(url, options);
+        case 4:
+          response = _context.sent;
+          shouldRetry = !response.ok && response.status === 429 && retriesRemaining > 1;
+          if (shouldRetry) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return", response);
+        case 8:
+          retryAfter = response.headers.get('Retry-After');
+          _context.next = 11;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, retryAfter ? parseRetryAfter(retryAfter) : delay);
+          });
+        case 11:
+          return _context.abrupt("return", _fetchWithRetry(url, options, retriesRemaining - 1, delay * 2));
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function fetchWithRetry(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/dist/es2019/clients/block-service/blockService.js

@@ -1,3 +1,4 @@
+import { fetchWithRetry } from '../../utils/retry';
 export const isBlockContentResponse = response => {
   const content = response.content;
   return typeof content === 'string';
@@ -46,7 +47,7 @@ export const isBlockContentResponse = response => {
  * Check https://block-service.dev.atl-paas.net/ for latest API documentation.
  */
 export const getReferenceSyncedBlocks = async documentAri => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/document/reference/${encodeURIComponent(documentAri)}`, {
+  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/document/reference/${encodeURIComponent(documentAri)}`, {
     method: 'GET',
     headers: COMMON_HEADERS
   });
@@ -69,7 +70,7 @@ export class BlockError extends Error {
 export const getSyncedBlockContent = async ({
   blockAri
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
+  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
     method: 'GET',
     headers: COMMON_HEADERS
   });
@@ -81,7 +82,7 @@ export const getSyncedBlockContent = async ({
 export const deleteSyncedBlock = async ({
   blockAri
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
+  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
     method: 'DELETE',
     headers: COMMON_HEADERS
   });
@@ -93,7 +94,7 @@ export const updateSyncedBlock = async ({
   blockAri,
   content
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
+  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
     method: 'PUT',
     headers: COMMON_HEADERS,
     body: JSON.stringify({
@@ -111,7 +112,7 @@ export const createSyncedBlock = async ({
   product,
   content
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block`, {
+  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block`, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify({

package/dist/es2019/clients/confluence/contentProperty.js

@@ -1,3 +1,4 @@
+import { fetchWithRetry } from '../../utils/retry';
 import { getConfluencePageAri } from './ari';
 import { isBlogPageType } from './utils';
 const COMMON_HEADERS = {
@@ -151,7 +152,7 @@ export const getContentProperty = async ({
       keys: [key]
     }
   };
-  const response = await fetch(GRAPHQL_ENDPOINT, {
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
     headers: {
       ...COMMON_HEADERS,
@@ -237,7 +238,7 @@ export const createContentProperty = async ({
       }
     }
   };
-  const response = await fetch(GRAPHQL_ENDPOINT, {
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
     headers: {
       ...COMMON_HEADERS,
@@ -272,7 +273,7 @@ export const deleteContentProperty = async ({
       }
     }
   };
-  const response = await fetch(GRAPHQL_ENDPOINT, {
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
     headers: {
       ...COMMON_HEADERS,

package/dist/es2019/clients/confluence/sourceInfo.js

@@ -2,6 +2,7 @@
 
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { getSourceInfoErrorPayload } from '../../utils/errorHandling';
+import { fetchWithRetry } from '../../utils/retry';
 import { getPageIdAndTypeFromConfluencePageAri } from './ari';
 import { isBlogPageType } from './utils';
 const COMMON_HEADERS = {
@@ -41,7 +42,7 @@ const getConfluenceSourceInfo = async ari => {
       id: ari
     }
   };
-  const response = await fetch(GRAPHQL_ENDPOINT, {
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
     headers: {
       ...COMMON_HEADERS,

package/dist/es2019/common/types.js

@@ -2,6 +2,11 @@ export let SyncBlockError = /*#__PURE__*/function (SyncBlockError) {
   SyncBlockError["Errored"] = "errored";
   SyncBlockError["NotFound"] = "not_found";
   SyncBlockError["Forbidden"] = "forbidden";
+  SyncBlockError["InvalidRequest"] = "invalid_request";
+  SyncBlockError["RateLimited"] = "rate_limited";
+  SyncBlockError["Conflict"] = "conflict";
+  // attempt to create block that already exists
+  SyncBlockError["ServerError"] = "server_error";
   SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
   return SyncBlockError;
 }({});

package/dist/es2019/providers/block-service/blockServiceAPI.js

@@ -5,10 +5,21 @@ import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 const mapBlockError = error => {
   switch (error.status) {
+    case 400:
+    case 401:
+      return SyncBlockError.InvalidRequest;
     case 403:
       return SyncBlockError.Forbidden;
     case 404:
       return SyncBlockError.NotFound;
+    case 409:
+      return SyncBlockError.Conflict;
+    case 429:
+      return SyncBlockError.RateLimited;
+    case 500:
+    case 503:
+    case 504:
+      return SyncBlockError.ServerError;
   }
   return SyncBlockError.Errored;
 };

package/dist/es2019/utils/resolveSyncBlockInstance.js

@@ -16,10 +16,10 @@ export const resolveSyncBlockInstance = (oldResult, newResult) => {
     return newResult;
   } else if (!newResult.data) {
     // return the old result if there was an error, e.g. network error, but not if not found or forbidden
-    if (newResult.error === SyncBlockError.Errored) {
-      return oldResult;
-    } else {
+    if (newResult.error === SyncBlockError.NotFound || newResult.error === SyncBlockError.Forbidden) {
       return newResult;
+    } else {
+      return oldResult;
     }
   }
 

package/dist/es2019/utils/retry.js

@@ -0,0 +1,26 @@
+const parseRetryAfter = retryAfter => {
+  let newDelay;
+
+  // retryAfter can either be in ms or HTTP date
+  const parsedRetryAfter = parseInt(retryAfter);
+  if (!isNaN(parsedRetryAfter)) {
+    newDelay = parsedRetryAfter * 1000;
+  } else {
+    const retryDate = new Date(retryAfter);
+    const delayFromDate = retryDate.getTime() - Date.now();
+    if (delayFromDate > 0) {
+      newDelay = delayFromDate;
+    }
+  }
+  return newDelay;
+};
+export const fetchWithRetry = async (url, options, retriesRemaining = 3, delay = 1000) => {
+  const response = await fetch(url, options);
+  const shouldRetry = !response.ok && response.status === 429 && retriesRemaining > 1;
+  if (!shouldRetry) {
+    return response;
+  }
+  const retryAfter = response.headers.get('Retry-After');
+  await new Promise(resolve => setTimeout(resolve, retryAfter ? parseRetryAfter(retryAfter) : delay));
+  return fetchWithRetry(url, options, retriesRemaining - 1, delay * 2);
+};

package/dist/esm/clients/block-service/blockService.js

@@ -8,6 +8,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { fetchWithRetry } from '../../utils/retry';
 export var isBlockContentResponse = function isBlockContentResponse(response) {
   var content = response.content;
   return typeof content === 'string';
@@ -62,7 +63,7 @@ export var getReferenceSyncedBlocks = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/document/reference/").concat(encodeURIComponent(documentAri)), {
+          return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/document/reference/").concat(encodeURIComponent(documentAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -112,7 +113,7 @@ export var getSyncedBlockContent = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref2.blockAri;
           _context2.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -146,7 +147,7 @@ export var deleteSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref4.blockAri;
           _context3.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'DELETE',
             headers: COMMON_HEADERS
           });
@@ -175,7 +176,7 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref6.blockAri, content = _ref6.content;
           _context4.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'PUT',
             headers: COMMON_HEADERS,
             body: JSON.stringify({
@@ -207,7 +208,7 @@ export var createSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref8.blockAri, blockInstanceId = _ref8.blockInstanceId, sourceAri = _ref8.sourceAri, product = _ref8.product, content = _ref8.content;
           _context5.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block"), {
+          return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block"), {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify({

package/dist/esm/clients/confluence/contentProperty.js

@@ -3,6 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { fetchWithRetry } from '../../utils/retry';
 import { getConfluencePageAri } from './ari';
 import { isBlogPageType } from './utils';
 var COMMON_HEADERS = {
@@ -88,7 +89,7 @@ export var getContentProperty = /*#__PURE__*/function () {
             }
           };
           _context.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return fetchWithRetry(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
@@ -197,7 +198,7 @@ export var createContentProperty = /*#__PURE__*/function () {
             }
           };
           _context3.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return fetchWithRetry(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
@@ -247,7 +248,7 @@ export var deleteContentProperty = /*#__PURE__*/function () {
             }
           };
           _context4.next = 6;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return fetchWithRetry(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)

package/dist/esm/clients/confluence/sourceInfo.js

@@ -7,6 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { getSourceInfoErrorPayload } from '../../utils/errorHandling';
+import { fetchWithRetry } from '../../utils/retry';
 import { getPageIdAndTypeFromConfluencePageAri } from './ari';
 import { isBlogPageType } from './utils';
 var COMMON_HEADERS = {
@@ -38,7 +39,7 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
             }
           };
           _context.next = 3;
-          return fetch(GRAPHQL_ENDPOINT, {
+          return fetchWithRetry(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)

package/dist/esm/common/types.js

@@ -2,6 +2,11 @@ export var SyncBlockError = /*#__PURE__*/function (SyncBlockError) {
   SyncBlockError["Errored"] = "errored";
   SyncBlockError["NotFound"] = "not_found";
   SyncBlockError["Forbidden"] = "forbidden";
+  SyncBlockError["InvalidRequest"] = "invalid_request";
+  SyncBlockError["RateLimited"] = "rate_limited";
+  SyncBlockError["Conflict"] = "conflict";
+  // attempt to create block that already exists
+  SyncBlockError["ServerError"] = "server_error";
   SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
   return SyncBlockError;
 }({});

package/dist/esm/providers/block-service/blockServiceAPI.js

@@ -10,10 +10,21 @@ import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
+    case 400:
+    case 401:
+      return SyncBlockError.InvalidRequest;
     case 403:
       return SyncBlockError.Forbidden;
     case 404:
       return SyncBlockError.NotFound;
+    case 409:
+      return SyncBlockError.Conflict;
+    case 429:
+      return SyncBlockError.RateLimited;
+    case 500:
+    case 503:
+    case 504:
+      return SyncBlockError.ServerError;
   }
   return SyncBlockError.Errored;
 };

package/dist/esm/utils/resolveSyncBlockInstance.js

@@ -19,10 +19,10 @@ export var resolveSyncBlockInstance = function resolveSyncBlockInstance(oldResul
     return newResult;
   } else if (!newResult.data) {
     // return the old result if there was an error, e.g. network error, but not if not found or forbidden
-    if (newResult.error === SyncBlockError.Errored) {
-      return oldResult;
-    } else {
+    if (newResult.error === SyncBlockError.NotFound || newResult.error === SyncBlockError.Forbidden) {
       return newResult;
+    } else {
+      return oldResult;
     }
   }
 

package/dist/esm/utils/retry.js

@@ -0,0 +1,60 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+var parseRetryAfter = function parseRetryAfter(retryAfter) {
+  var newDelay;
+
+  // retryAfter can either be in ms or HTTP date
+  var parsedRetryAfter = parseInt(retryAfter);
+  if (!isNaN(parsedRetryAfter)) {
+    newDelay = parsedRetryAfter * 1000;
+  } else {
+    var retryDate = new Date(retryAfter);
+    var delayFromDate = retryDate.getTime() - Date.now();
+    if (delayFromDate > 0) {
+      newDelay = delayFromDate;
+    }
+  }
+  return newDelay;
+};
+var _fetchWithRetry = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, options) {
+    var retriesRemaining,
+      delay,
+      response,
+      shouldRetry,
+      retryAfter,
+      _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          retriesRemaining = _args.length > 2 && _args[2] !== undefined ? _args[2] : 3;
+          delay = _args.length > 3 && _args[3] !== undefined ? _args[3] : 1000;
+          _context.next = 4;
+          return fetch(url, options);
+        case 4:
+          response = _context.sent;
+          shouldRetry = !response.ok && response.status === 429 && retriesRemaining > 1;
+          if (shouldRetry) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return", response);
+        case 8:
+          retryAfter = response.headers.get('Retry-After');
+          _context.next = 11;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, retryAfter ? parseRetryAfter(retryAfter) : delay);
+          });
+        case 11:
+          return _context.abrupt("return", _fetchWithRetry(url, options, retriesRemaining - 1, delay * 2));
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function fetchWithRetry(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export { _fetchWithRetry as fetchWithRetry };

package/dist/types/common/types.d.ts

@@ -16,6 +16,10 @@ export declare enum SyncBlockError {
     Errored = "errored",
     NotFound = "not_found",
     Forbidden = "forbidden",
+    InvalidRequest = "invalid_request",
+    RateLimited = "rate_limited",
+    Conflict = "conflict",// attempt to create block that already exists
+    ServerError = "server_error",
     InvalidContent = "invalid_content"
 }
 export interface SyncBlockData {

package/dist/types/utils/retry.d.ts

@@ -0,0 +1 @@
+export declare const fetchWithRetry: (url: string, options: RequestInit, retriesRemaining?: number, delay?: number) => Promise<Response>;

package/dist/types-ts4.5/common/types.d.ts

@@ -16,6 +16,10 @@ export declare enum SyncBlockError {
     Errored = "errored",
     NotFound = "not_found",
     Forbidden = "forbidden",
+    InvalidRequest = "invalid_request",
+    RateLimited = "rate_limited",
+    Conflict = "conflict",// attempt to create block that already exists
+    ServerError = "server_error",
     InvalidContent = "invalid_content"
 }
 export interface SyncBlockData {

package/dist/types-ts4.5/utils/retry.d.ts

@@ -0,0 +1 @@
+export declare const fetchWithRetry: (url: string, options: RequestInit, retriesRemaining?: number, delay?: number) => Promise<Response>;

package/package.json

@@ -34,7 +34,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.38.0",
+		"@atlaskit/editor-common": "^110.39.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -77,7 +77,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.12.2",
+	"version": "2.12.3",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",