@atlaskit/collab-provider 10.20.5 → 10.21.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/collab-provider
 
+## 10.21.1
+
+### Patch Changes
+
+- [#179865](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179865)
+  [`33dc1bfc85993`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33dc1bfc85993) -
+  ED-28407 Offline Editing: Add logic that will mark offline steps as regular steps after 6s of
+  being online. Added as a fallback incase there's issue with the offline storage plugin and it's
+  unable to handle the steps.
+
+## 10.21.0
+
+### Minor Changes
+
+- [#179240](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179240)
+  [`a5d25b58c755a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a5d25b58c755a) -
+  Support for custom authentication headers
+
 ## 10.20.5
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -636,7 +636,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           };
         }();
       }
-      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper);
+      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper, this.config.customExtraHeaders);
 
       // Due to https://github.com/socketio/socket.io-client/issues/1473,
       // reconnect no longer fired on the socket.

package/dist/cjs/document/document-service.js

@@ -79,6 +79,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "catchUpOutofSync", false);
     (0, _defineProperty2.default)(this, "hasRecovered", false);
     (0, _defineProperty2.default)(this, "numberOfStepCommitsSent", 0);
+    (0, _defineProperty2.default)(this, "timeoutExceeded", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -1001,6 +1002,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      */
     function send(tr, _oldState, newState, sendAnalyticsEvent, reason // only used for publish and draft-sync events - when called through getFinalAcknowledgedState
     ) {
+      var _this3 = this;
       var unconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
@@ -1055,12 +1057,38 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             return origin.setMeta('mergeIsLocked', true);
           }
         });
-        var offlineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
+      }
+      if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
+        var containsOfflineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
           var _tr$getMeta;
           return tr instanceof _state.Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;
         });
-        if (offlineSteps) {
+        if (containsOfflineSteps && !this.timeoutExceeded) {
+          // Only start timer if we're online and don't already have one running
+          if (this.getConnected() && !this.timeout) {
+            this.timeout = setTimeout(function () {
+              // If the timer expires and we're still online, handle the offline steps.
+              // Otherwise, clear the timer so it can restart when we're online again.
+              if (_this3.getConnected()) {
+                _this3.timeoutExceeded = true;
+                var updatedUnconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
+                updatedUnconfirmedStepsData === null || updatedUnconfirmedStepsData === void 0 || updatedUnconfirmedStepsData.origins.forEach(function (origin) {
+                  if (origin instanceof _state.Transaction && origin.getMeta('isOffline')) {
+                    origin.setMeta('isOffline', false);
+                  }
+                });
+              } else {
+                _this3.timeout = undefined;
+              }
+            }, 6000);
+          }
           return;
+        } else if (this.timeoutExceeded) {
+          this.timeoutExceeded = false;
+          if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
+          }
         }
       }