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

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/ari.js

@@ -1,17 +1,34 @@
 /* eslint-disable require-unicode-regexp */
+
+/**
+ * Generates the block ARI from the source page ARI and the source block's resource ID.
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
+ */
+export const generateBlockAri = (sourceAri, resourceId, product) => {
+  const match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error(`Invalid source ARI: ${sourceAri}`);
+  }
+  const cloudId = match[1];
+  const pageId = match[3];
+  return `ari:cloud:blocks:${cloudId}:synced-block/${product}/${pageId}/${resourceId}`;
+};
+
 /**
- * Generates a unique block ARI from a source ARI and a local ID.
- * @param sourceId - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
- * @param localId - the localId of the block node. A randomly generated UUID
- * @returns the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * 
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the reference synced block. E.G confluence-page/pageId/sourceResourceId
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export const blockResourceIdFromSourceAndLocalId = (sourceId, localId) => {
-  const match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+export const generateBlockAriFromReference = (sourceAri, resourceId) => {
+  const match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
   if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error(`Invalid source ARI: ${sourceId}`);
+    throw new Error(`Invalid source ARI: ${sourceAri}`);
   }
   const cloudId = match[1];
-  return `ari:cloud:blocks:${cloudId}:synced-block/${localId}`;
+  return `ari:cloud:blocks:${cloudId}:synced-block/${resourceId}`;
 };
 
 /**

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/index.js

@@ -9,7 +9,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 
 // clients
-export { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
+export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
 export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from './clients/confluence/ari';
 
 // providers

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

@@ -1,14 +1,26 @@
+/* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
-import { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId } from '../../clients/block-service/ari';
+import { generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { BlockError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getSyncedBlockContent, updateSyncedBlock } from '../../clients/block-service/blockService';
 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;
 };
@@ -70,13 +82,17 @@ export const fetchReferences = async documentAri => {
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 class BlockServiceADFFetchProvider {
-  // resourceId is the ARI of the block. E.G ari:cloud:blocks:site-123:synced-block/uuid-456
-  // in the content API provider, this was the concatenation of the source document's ARI and the local ID. E.G ari:cloud:confluence:site-123:page/pageId/uuid-456
+  constructor(sourceAri) {
+    this.sourceAri = sourceAri;
+  }
+
+  // resourceId of the reference synced block.
+  // the ARI must be constructed to call the block service API
   async fetchData(resourceId) {
-    const localId = getLocalIdFromBlockResourceId(resourceId);
+    const blockAri = generateBlockAriFromReference(this.sourceAri, resourceId);
     try {
       const blockContentResponse = await getSyncedBlockContent({
-        blockAri: resourceId
+        blockAri
       });
       const value = blockContentResponse.content;
       if (!value) {
@@ -91,8 +107,9 @@ class BlockServiceADFFetchProvider {
       return {
         data: {
           content: syncedBlockData,
-          resourceId,
-          blockInstanceId: localId,
+          resourceId: blockAri,
+          blockInstanceId: blockContentResponse.blockInstanceId,
+          // this was the node's localId, but has become the resourceId.
           sourceAri: blockContentResponse.sourceAri,
           product: blockContentResponse.product
         },
@@ -127,10 +144,11 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
+    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
     try {
       // Try update existing block's content
       await updateSyncedBlock({
-        blockAri: resourceId,
+        blockAri,
         content: JSON.stringify(data.content)
       });
       return {
@@ -153,9 +171,10 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
+    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
     try {
       await createSyncedBlock({
-        blockAri: resourceId,
+        blockAri,
         blockInstanceId: data.blockInstanceId,
         sourceAri: this.sourceAri,
         product: this.product,
@@ -180,9 +199,10 @@ class BlockServiceADFWriteProvider {
 
   // soft deletes the source synced block
   async deleteData(resourceId) {
+    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
     try {
       await deleteSyncedBlock({
-        blockAri: resourceId
+        blockAri
       });
       return {
         resourceId,
@@ -204,8 +224,18 @@ class BlockServiceADFWriteProvider {
       };
     }
   }
-  generateResourceId(sourceAri, localId) {
-    return blockResourceIdFromSourceAndLocalId(sourceAri, localId);
+
+  // the sourceId is the resourceId of the source synced block.
+  generateResourceIdForReference(sourceId) {
+    const match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+    if (!(match !== null && match !== void 0 && match[1])) {
+      throw new Error(`Invalid source ARI: ${this.sourceAri}`);
+    }
+    const pageId = match[3];
+    return `${this.product}/${pageId}/${sourceId}`;
+  }
+  generateResourceId() {
+    return crypto.randomUUID();
   }
 }
 
@@ -213,7 +243,7 @@ class BlockServiceADFWriteProvider {
  * Factory function to create both providers with shared configuration
  */
 const createBlockServiceAPIProviders = (sourceAri, product) => {
-  const fetchProvider = new BlockServiceADFFetchProvider();
+  const fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
   const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
   return {
     fetchProvider,

package/dist/es2019/providers/confluence/confluenceContentAPI.js

@@ -115,6 +115,7 @@ class ConfluenceADFFetchProvider {
  */
 class ConfluenceADFWriteProvider {
   constructor(config) {
+    _defineProperty(this, "product", 'confluence-page');
     _defineProperty(this, "createNewContentProperty", async (pageId, key, value, pageType) => {
       const options = {
         pageId,
@@ -271,6 +272,9 @@ class ConfluenceADFWriteProvider {
   generateResourceId(sourceId, localId) {
     return resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId);
   }
+  generateResourceIdForReference(sourceId) {
+    return sourceId;
+  }
 }
 
 /**

package/dist/es2019/providers/syncBlockProvider.js

@@ -23,6 +23,9 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     this.sourceId = sourceId;
     this.providerOptions = providerOptions;
   }
+  getProduct() {
+    return this.writeProvider.product;
+  }
 
   /**
    * Check if the node is supported by the provider
@@ -160,6 +163,9 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
   generateResourceId(sourceId, localId) {
     return this.writeProvider.generateResourceId(sourceId, localId);
   }
+  generateResourceIdForReference(sourceId) {
+    return this.writeProvider.generateResourceIdForReference(sourceId);
+  }
 
   /**
    * Get the synced block renderer provider options

package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js

@@ -22,6 +22,12 @@ export class ReferenceSyncBlockStoreManager {
     this.providerFactories = new Map();
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
+  generateResourceIdForReference(sourceId) {
+    if (!this.dataProvider) {
+      throw new Error('Data provider not set');
+    }
+    return this.dataProvider.generateResourceIdForReference(sourceId);
+  }
   updateFireAnalyticsEvent(fireAnalyticsEvent) {
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }

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/ari.js

@@ -1,17 +1,34 @@
 /* eslint-disable require-unicode-regexp */
+
+/**
+ * Generates the block ARI from the source page ARI and the source block's resource ID.
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
+ */
+export var generateBlockAri = function generateBlockAri(sourceAri, resourceId, product) {
+  var match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error("Invalid source ARI: ".concat(sourceAri));
+  }
+  var cloudId = match[1];
+  var pageId = match[3];
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(product, "/").concat(pageId, "/").concat(resourceId);
+};
+
 /**
- * Generates a unique block ARI from a source ARI and a local ID.
- * @param sourceId - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
- * @param localId - the localId of the block node. A randomly generated UUID
- * @returns the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * 
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the reference synced block. E.G confluence-page/pageId/sourceResourceId
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export var blockResourceIdFromSourceAndLocalId = function blockResourceIdFromSourceAndLocalId(sourceId, localId) {
-  var match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+export var generateBlockAriFromReference = function generateBlockAriFromReference(sourceAri, resourceId) {
+  var match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
   if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error("Invalid source ARI: ".concat(sourceId));
+    throw new Error("Invalid source ARI: ".concat(sourceAri));
   }
   var cloudId = match[1];
-  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(localId);
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(resourceId);
 };
 
 /**

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/index.js

@@ -9,7 +9,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 
 // clients
-export { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
+export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
 export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from './clients/confluence/ari';
 
 // providers