@atlaskit/editor-synced-block-provider 6.6.5 → 6.6.7

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-synced-block-provider
 
+## 6.6.7
+
+### Patch Changes
+
+- [`bfba4158ff047`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bfba4158ff047) -
+  Fix subscription reconnection for synced blocks when WebSocket or Relay subscriptions complete or
+  error silently
+
+## 6.6.6
+
+### Patch Changes
+
+- [`33333417b0969`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33333417b0969) -
+  Strip inline comment annotation marks from synced block content before syncing references behind
+  platform_synced_block_patch_12.
+- Updated dependencies
+
 ## 6.6.5
 
 ### Patch Changes

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

@@ -174,7 +174,7 @@ var parseSubscriptionPayload = function parseSubscriptionPayload(payload) {
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-var subscribeToBlockUpdates = exports.subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri, onData, onError) {
+var subscribeToBlockUpdates = exports.subscribeToBlockUpdates = function subscribeToBlockUpdates(blockAri, onData, onError, onComplete) {
   var client = getBlockServiceClient();
   if (!client) {
     // Return a no-op unsubscribe if client is not available (e.g., SSR)
@@ -210,7 +210,7 @@ var subscribeToBlockUpdates = exports.subscribeToBlockUpdates = function subscri
       onError === null || onError === void 0 || onError(new Error(extractGraphQLWSErrorMessage(error)));
     }),
     complete: function complete() {
-      // Subscription completed
+      onComplete === null || onComplete === void 0 || onComplete();
     }
   });
   return unsubscribe;

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

@@ -793,7 +793,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     )
   }, {
     key: "subscribeToBlockUpdates",
-    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
       var blockAri = (0, _ari.generateBlockAriFromReference)({
         cloudId: this.cloudId,
         resourceId: resourceId
@@ -829,7 +829,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             resourceId: parsedData.resourceId
           };
           onUpdate(syncBlockInstance);
-        }, onError);
+        }, onError, onComplete);
       }).catch(function (err) {
         if (cancelled) {
           return;

package/dist/cjs/providers/syncBlockProvider.js

@@ -469,9 +469,9 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
      */
   }, {
     key: "subscribeToBlockUpdates",
-    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+    value: function subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
       if (this.fetchProvider.subscribeToBlockUpdates) {
-        return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError);
+        return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete);
       }
       return undefined;
     }

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

@@ -13,6 +13,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
 var _experienceTracking = require("../utils/experienceTracking");
@@ -210,10 +211,27 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
       var providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
       if (providerData) {
-        return providerData;
+        return this.stripAnnotationMarksFromReferenceData(providerData);
       }
       return this.getFromSessionCache(resourceId);
     }
+  }, {
+    key: "stripAnnotationMarksFromReferenceData",
+    value: function stripAnnotationMarksFromReferenceData(syncBlock) {
+      var _syncBlock$data;
+      if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') || !((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+        return syncBlock;
+      }
+      var content = (0, _utils.stripAnnotationMarksFromJSONContent)(syncBlock.data.content);
+      if (content === syncBlock.data.content) {
+        return syncBlock;
+      }
+      return _objectSpread(_objectSpread({}, syncBlock), {}, {
+        data: _objectSpread(_objectSpread({}, syncBlock.data), {}, {
+          content: content
+        })
+      });
+    }
   }, {
     key: "updateSessionCache",
     value: function updateSessionCache(resourceId) {
@@ -230,7 +248,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         if (!raw) {
           return undefined;
         }
-        return JSON.parse(raw);
+        return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
       } catch (error) {
         (0, _monitoring.logException)(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -601,14 +619,15 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
-      var resourceId = syncBlock.resourceId;
+      var sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
+      var resourceId = sanitizedSyncBlock.resourceId;
       if (resourceId) {
         var _this$dataProvider3;
-        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache((0, _defineProperty2.default)({}, resourceId, syncBlock), {
+        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache((0, _defineProperty2.default)({}, resourceId, sanitizedSyncBlock), {
           strategy: 'merge',
           source: 'network'
         });
-        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
+        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, sanitizedSyncBlock);
         this.updateSessionCache(resourceId);
       }
     }
@@ -685,12 +704,12 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "getSyncBlockURL",
     value: function getSyncBlockURL(resourceId) {
-      var _syncBlock$data;
+      var _syncBlock$data2;
       var syncBlock = this.getFromCache(resourceId);
       if (!syncBlock) {
         return undefined;
       }
-      return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
+      return (_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceURL;
     }
   }, {
     key: "getProviderFactory",

package/dist/cjs/store-manager/syncBlockSubscriptionManager.js

@@ -9,6 +9,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _errorHandling = require("../utils/errorHandling");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
 var _utils = require("../utils/utils");
@@ -36,6 +37,8 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
     // causing the cache to be deleted prematurely. We delay deletion to allow
     // the new component to subscribe and cancel the pending deletion.
     (0, _defineProperty2.default)(this, "pendingCacheDeletions", new Map());
+    (0, _defineProperty2.default)(this, "retryAttempts", new Map());
+    (0, _defineProperty2.default)(this, "pendingRetries", new Map());
     this.deps = deps;
   }
 
@@ -250,6 +253,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
       if (!(dataProvider !== null && dataProvider !== void 0 && dataProvider.subscribeToBlockUpdates)) {
         return;
       }
+      var reconnectEnabled = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12');
       var unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
         _this5.handleGraphQLUpdate(syncBlockInstance);
       }, function (error) {
@@ -258,11 +262,115 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
           location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
         });
         (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
-      });
+        if (reconnectEnabled) {
+          _this5.handleSubscriptionTerminated(resourceId);
+        }
+      }, reconnectEnabled ? function () {
+        _this5.handleSubscriptionTerminated(resourceId);
+      } : undefined);
       if (unsubscribe) {
         this.graphqlSubscriptions.set(resourceId, unsubscribe);
       }
     }
+
+    /**
+     * Handles subscription termination (complete or error) by cleaning up the
+     * stale entry and scheduling a reconnection with exponential backoff.
+     */
+  }, {
+    key: "handleSubscriptionTerminated",
+    value: function handleSubscriptionTerminated(resourceId) {
+      // Remove the stale subscription entry so setupSubscription won't early-return
+      this.graphqlSubscriptions.delete(resourceId);
+
+      // Guard against duplicate calls (graphql-ws can fire both error and complete)
+      if (this.pendingRetries.has(resourceId)) {
+        return;
+      }
+
+      // Only reconnect if there are still active subscribers for this resource
+      if (this.subscriptions.has(resourceId) && this.shouldUseRealTime()) {
+        this.scheduleReconnection(resourceId);
+      }
+    }
+
+    /**
+     * Schedules a reconnection attempt with exponential backoff.
+     * Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
+     * e.g. 1s, 2s, 4s, 8s, 16s
+     */
+  }, {
+    key: "scheduleReconnection",
+    value: function scheduleReconnection(resourceId) {
+      var _this$retryAttempts$g,
+        _this6 = this;
+      var attempts = (_this$retryAttempts$g = this.retryAttempts.get(resourceId)) !== null && _this$retryAttempts$g !== void 0 ? _this$retryAttempts$g : 0;
+      if (attempts >= SyncBlockSubscriptionManager.MAX_RETRY_ATTEMPTS) {
+        var _this$deps$getFireAna;
+        var errorMessage = "Subscription reconnection failed after ".concat(attempts, " attempts");
+        (0, _monitoring.logException)(new Error(errorMessage), {
+          location: 'editor-synced-block-provider/syncBlockSubscriptionManager/max-retries-exhausted'
+        });
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
+        return;
+      }
+      var delay = SyncBlockSubscriptionManager.INITIAL_RETRY_DELAY_MS * Math.pow(SyncBlockSubscriptionManager.RETRY_BACKOFF_MULTIPLIER, attempts);
+      var timer = setTimeout(function () {
+        _this6.pendingRetries.delete(resourceId);
+
+        // Only re-subscribe if still relevant
+        if (_this6.subscriptions.has(resourceId) && _this6.shouldUseRealTime()) {
+          _this6.setupSubscription(resourceId);
+
+          // Only increment if the subscription was actually established
+          // (setupSubscription may be a no-op if another code path already re-established it)
+          if (_this6.graphqlSubscriptions.has(resourceId)) {
+            _this6.retryAttempts.set(resourceId, attempts + 1);
+          }
+        } else {
+          // Conditions no longer met — clean up stale retry state
+          _this6.retryAttempts.delete(resourceId);
+        }
+      }, delay);
+      this.pendingRetries.set(resourceId, timer);
+    }
+
+    /**
+     * Resets the retry counter for a resource. Called when a successful
+     * update is received, indicating the subscription is healthy.
+     */
+  }, {
+    key: "resetRetryCount",
+    value: function resetRetryCount(resourceId) {
+      this.retryAttempts.delete(resourceId);
+    }
+  }, {
+    key: "cancelPendingRetry",
+    value: function cancelPendingRetry(resourceId) {
+      var timer = this.pendingRetries.get(resourceId);
+      if (timer) {
+        clearTimeout(timer);
+        this.pendingRetries.delete(resourceId);
+      }
+    }
+  }, {
+    key: "cancelAllPendingRetries",
+    value: function cancelAllPendingRetries() {
+      var _iterator = _createForOfIteratorHelper(this.pendingRetries.values()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var timer = _step.value;
+          clearTimeout(timer);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      this.pendingRetries.clear();
+      this.retryAttempts.clear();
+    }
   }, {
     key: "cleanupSubscription",
     value: function cleanupSubscription(resourceId) {
@@ -271,39 +379,46 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
         unsubscribe();
         this.graphqlSubscriptions.delete(resourceId);
       }
+      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
+        this.cancelPendingRetry(resourceId);
+        this.retryAttempts.delete(resourceId);
+      }
     }
   }, {
     key: "setupSubscriptionsForAllBlocks",
     value: function setupSubscriptionsForAllBlocks() {
-      var _iterator = _createForOfIteratorHelper(this.subscriptions.keys()),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(this.subscriptions.keys()),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var resourceId = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var resourceId = _step2.value;
           this.setupSubscription(resourceId);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
     }
   }, {
     key: "cleanupAll",
     value: function cleanupAll() {
-      var _iterator2 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var unsubscribe = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var unsubscribe = _step3.value;
           unsubscribe();
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       this.graphqlSubscriptions.clear();
+      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
+        this.cancelAllPendingRetries();
+      }
     }
   }, {
     key: "destroy",
@@ -315,17 +430,17 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
       this.useRealTimeSubscriptions = false;
 
       // Clear any pending cache deletions
-      var _iterator3 = _createForOfIteratorHelper(this.pendingCacheDeletions.values()),
-        _step3;
+      var _iterator4 = _createForOfIteratorHelper(this.pendingCacheDeletions.values()),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var timeout = _step3.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var timeout = _step4.value;
           clearTimeout(timeout);
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
       this.pendingCacheDeletions.clear();
     }
@@ -337,7 +452,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
   }, {
     key: "handleGraphQLUpdate",
     value: function handleGraphQLUpdate(syncBlockInstance) {
-      var _this6 = this;
+      var _this7 = this;
       if (!syncBlockInstance.resourceId) {
         return;
       }
@@ -345,18 +460,26 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
       var resolved = existing ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existing, syncBlockInstance) : syncBlockInstance;
       this.deps.updateCache(resolved);
       if (!syncBlockInstance.error) {
+        // Successful data delivery means the subscription is healthy — reset retry counter
+        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
+          this.resetRetryCount(syncBlockInstance.resourceId);
+        }
         var callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
-          var _this6$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn((0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
+          var _this7$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
+          (_this7$deps$getFireAn = _this7.deps.getFireAnalyticsEvent()) === null || _this7$deps$getFireAn === void 0 || _this7$deps$getFireAn((0, _errorHandling.fetchSuccessPayload)(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
-        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna, _syncBlockInstance$da3, _syncBlockInstance$da4;
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna2, _syncBlockInstance$da3, _syncBlockInstance$da4;
         var errorMessage = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type);
-        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2((0, _errorHandling.fetchErrorPayload)(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : (0, _utils.getSourceProductFromResourceIdSafe)(syncBlockInstance.resourceId)));
       }
     }
   }]);
-}();
+}();
+// Reconnection with exponential backoff
+(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "INITIAL_RETRY_DELAY_MS", 1000);
+(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "RETRY_BACKOFF_MULTIPLIER", 2);
+(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS", 5);

package/dist/cjs/utils/utils.js

@@ -1,15 +1,60 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
-/* eslint-disable require-unicode-regexp  */
-
+exports.stripAnnotationMarksFromJSONContent = exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+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) { (0, _defineProperty2.default)(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; } /* eslint-disable require-unicode-regexp  */
+var _stripAnnotationMarksFromJSONContent = exports.stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
+  var strippedContent;
+  content.forEach(function (contentNode, index) {
+    var _contentNode$marks;
+    if (!contentNode) {
+      var _strippedContent;
+      (_strippedContent = strippedContent) === null || _strippedContent === void 0 || _strippedContent.push(contentNode);
+      return;
+    }
+    var hasAnnotationMark = (_contentNode$marks = contentNode.marks) === null || _contentNode$marks === void 0 ? void 0 : _contentNode$marks.some(function (mark) {
+      return mark.type === 'annotation';
+    });
+    var childContent = contentNode.content ? _stripAnnotationMarksFromJSONContent(contentNode.content) : undefined;
+    var hasContentChanged = childContent !== undefined && childContent !== contentNode.content;
+    if (!hasAnnotationMark && !hasContentChanged) {
+      var _strippedContent2;
+      (_strippedContent2 = strippedContent) === null || _strippedContent2 === void 0 || _strippedContent2.push(contentNode);
+      return;
+    }
+    if (!strippedContent) {
+      strippedContent = content.slice(0, index);
+    }
+    var strippedNode = _objectSpread({}, contentNode);
+    if (hasAnnotationMark) {
+      var _contentNode$marks2;
+      var marks = (_contentNode$marks2 = contentNode.marks) === null || _contentNode$marks2 === void 0 ? void 0 : _contentNode$marks2.filter(function (mark) {
+        return mark.type !== 'annotation';
+      });
+      if (marks && marks.length > 0) {
+        strippedNode.marks = marks;
+      } else {
+        delete strippedNode.marks;
+      }
+    }
+    if (hasContentChanged && childContent) {
+      strippedNode.content = childContent;
+    }
+    strippedContent.push(strippedNode);
+  });
+  return strippedContent !== null && strippedContent !== void 0 ? strippedContent : content;
+};
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
+  var content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: node.content.toJSON(),
+    content: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? _stripAnnotationMarksFromJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

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

@@ -181,7 +181,7 @@ const parseSubscriptionPayload = payload => {
  * @param onError - Optional callback function invoked on subscription errors
  * @returns Unsubscribe function to close the subscription
  */
-export const subscribeToBlockUpdates = (blockAri, onData, onError) => {
+export const subscribeToBlockUpdates = (blockAri, onData, onError, onComplete) => {
   const client = getBlockServiceClient();
   if (!client) {
     // Return a no-op unsubscribe if client is not available (e.g., SSR)
@@ -209,7 +209,7 @@ export const subscribeToBlockUpdates = (blockAri, onData, onError) => {
       onError === null || onError === void 0 ? void 0 : onError(new Error(extractGraphQLWSErrorMessage(error)));
     },
     complete: () => {
-      // Subscription completed
+      onComplete === null || onComplete === void 0 ? void 0 : onComplete();
     }
   });
   return unsubscribe;

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

@@ -533,7 +533,7 @@ class BlockServiceADFFetchProvider {
    * @param onError - Optional callback function invoked on subscription errors
    * @returns Unsubscribe function to stop receiving updates
    */
-  subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+  subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
     const blockAri = generateBlockAriFromReference({
       cloudId: this.cloudId,
       resourceId
@@ -568,7 +568,7 @@ class BlockServiceADFFetchProvider {
           resourceId: parsedData.resourceId
         };
         onUpdate(syncBlockInstance);
-      }, onError);
+      }, onError, onComplete);
     }).catch(err => {
       if (cancelled) {
         return;

package/dist/es2019/providers/syncBlockProvider.js

@@ -313,9 +313,9 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
    * @param onError - Optional callback function invoked on subscription errors
    * @returns Unsubscribe function to stop receiving updates, or undefined if not supported
    */
-  subscribeToBlockUpdates(resourceId, onUpdate, onError) {
+  subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete) {
     if (this.fetchProvider.subscribeToBlockUpdates) {
-      return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError);
+      return this.fetchProvider.subscribeToBlockUpdates(resourceId, onUpdate, onError, onComplete);
     }
     return undefined;
   }

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

@@ -1,11 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import isEqual from 'lodash/isEqual';
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
+import { createSyncBlockNode, getSourceProductFromResourceIdSafe, stripAnnotationMarksFromJSONContent } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
 import { SyncBlockProviderFactoryManager } from './syncBlockProviderFactoryManager';
@@ -141,10 +142,27 @@ export class ReferenceSyncBlockStoreManager {
     const syncBlockNode = createSyncBlockNode('', resourceId);
     const providerData = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : (_this$dataProvider2$g = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2$g === void 0 ? void 0 : _this$dataProvider2$g.data;
     if (providerData) {
-      return providerData;
+      return this.stripAnnotationMarksFromReferenceData(providerData);
     }
     return this.getFromSessionCache(resourceId);
   }
+  stripAnnotationMarksFromReferenceData(syncBlock) {
+    var _syncBlock$data;
+    if (!fg('platform_synced_block_patch_12') || !((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+      return syncBlock;
+    }
+    const content = stripAnnotationMarksFromJSONContent(syncBlock.data.content);
+    if (content === syncBlock.data.content) {
+      return syncBlock;
+    }
+    return {
+      ...syncBlock,
+      data: {
+        ...syncBlock.data,
+        content
+      }
+    };
+  }
   updateSessionCache(resourceId) {
     const latestData = this.getFromCache(resourceId);
     if (latestData) {
@@ -157,7 +175,7 @@ export class ReferenceSyncBlockStoreManager {
       if (!raw) {
         return undefined;
       }
-      return JSON.parse(raw);
+      return this.stripAnnotationMarksFromReferenceData(JSON.parse(raw));
     } catch (error) {
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getFromSessionCache'
@@ -470,18 +488,19 @@ export class ReferenceSyncBlockStoreManager {
     }
   }
   updateCache(syncBlock) {
+    const sanitizedSyncBlock = this.stripAnnotationMarksFromReferenceData(syncBlock);
     const {
       resourceId
-    } = syncBlock;
+    } = sanitizedSyncBlock;
     if (resourceId) {
       var _this$dataProvider3;
       (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 ? void 0 : _this$dataProvider3.updateCache({
-        [resourceId]: syncBlock
+        [resourceId]: sanitizedSyncBlock
       }, {
         strategy: 'merge',
         source: 'network'
       });
-      this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
+      this._subscriptionManager.notifySubscriptionCallbacks(resourceId, sanitizedSyncBlock);
       this.updateSessionCache(resourceId);
     }
   }
@@ -542,12 +561,12 @@ export class ReferenceSyncBlockStoreManager {
    * @returns
    */
   getSyncBlockURL(resourceId) {
-    var _syncBlock$data;
+    var _syncBlock$data2;
     const syncBlock = this.getFromCache(resourceId);
     if (!syncBlock) {
       return undefined;
     }
-    return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
+    return (_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceURL;
   }
   getProviderFactory(resourceId) {
     return this._providerFactoryManager.getProviderFactory(resourceId);