@atlaskit/collab-provider 9.25.5 → 9.25.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/collab-provider
 
+## 9.25.7
+
+### Patch Changes
+
+- [#79803](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79803) [`05d755419b9f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/05d755419b9f) - NONE: remove isWebsocketFirst FF logic
+
+## 9.25.6
+
+### Patch Changes
+
+- [#79382](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79382) [`e6312788d14d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e6312788d14d) - Add CatchupV2 in collab-provider
+
 ## 9.25.5
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -327,24 +327,23 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         return _ref2.apply(this, arguments);
       };
     }());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchReconcile", /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(currentStateDoc) {
-        var reqBody, reconcileResponse, _this$analyticsHelper7;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchCatchupv2", /*#__PURE__*/function () {
+      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(fromVersion, clientId) {
+        var _yield$utils$requestS2, steps, metadata, errorNotFound, errorCatchupv2;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.prev = 0;
-              reqBody = JSON.stringify({
-                doc: currentStateDoc,
-                productId: 'ccollab',
-                reason: 'UNKNOWN' // different reason here?
-              });
               _context3.t0 = _utilServiceSupport.utils;
               _context3.t1 = _this.config;
-              _context3.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/reconcile");
-              _context3.t3 = _objectSpread;
+              _context3.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/catchupv2");
+              _context3.t3 = {
+                version: fromVersion,
+                clientId: clientId
+              };
               _context3.t4 = _objectSpread;
-              _context3.t5 = {};
+              _context3.t5 = _objectSpread;
+              _context3.t6 = {};
               if (!_this.config.permissionTokenRefresh) {
                 _context3.next = 15;
                 break;
@@ -352,54 +351,151 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
               _context3.next = 11;
               return _this.getChannelToken();
             case 11:
-              _context3.t7 = _context3.sent;
-              _context3.t6 = {
-                'x-token': _context3.t7
+              _context3.t8 = _context3.sent;
+              _context3.t7 = {
+                'x-token': _context3.t8
               };
               _context3.next = 16;
               break;
             case 15:
-              _context3.t6 = {};
+              _context3.t7 = {};
             case 16:
-              _context3.t8 = _context3.t6;
-              _context3.t9 = (0, _context3.t4)(_context3.t5, _context3.t8);
-              _context3.t10 = {};
-              _context3.t11 = {
+              _context3.t9 = _context3.t7;
+              _context3.t10 = (0, _context3.t5)(_context3.t6, _context3.t9);
+              _context3.t11 = {};
+              _context3.t12 = {
                 'x-product': (0, _utils.getProduct)(_this.config.productInfo),
-                'x-subproduct': (0, _utils.getSubProduct)(_this.config.productInfo),
-                'Content-Type': 'application/json'
+                'x-subproduct': (0, _utils.getSubProduct)(_this.config.productInfo)
               };
-              _context3.t12 = (0, _context3.t3)(_context3.t9, _context3.t10, _context3.t11);
-              _context3.t13 = reqBody;
+              _context3.t13 = (0, _context3.t4)(_context3.t10, _context3.t11, _context3.t12);
               _context3.t14 = {
-                headers: _context3.t12,
-                method: 'POST',
-                body: _context3.t13
+                headers: _context3.t13
               };
               _context3.t15 = {
                 path: _context3.t2,
+                queryParams: _context3.t3,
                 requestInit: _context3.t14
               };
-              _context3.next = 26;
+              _context3.next = 25;
               return _context3.t0.requestService.call(_context3.t0, _context3.t1, _context3.t15);
-            case 26:
-              reconcileResponse = _context3.sent;
-              return _context3.abrupt("return", reconcileResponse);
-            case 30:
-              _context3.prev = 30;
+            case 25:
+              _yield$utils$requestS2 = _context3.sent;
+              steps = _yield$utils$requestS2.steps;
+              metadata = _yield$utils$requestS2.metadata;
+              return _context3.abrupt("return", {
+                steps: steps,
+                metadata: metadata
+              });
+            case 31:
+              _context3.prev = 31;
               _context3.t16 = _context3["catch"](0);
-              (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(_context3.t16, 'Error while fetching reconciled document');
+              if (!(_context3.t16.code === 404)) {
+                _context3.next = 37;
+                break;
+              }
+              errorNotFound = {
+                message: 'The requested document is not found',
+                data: {
+                  status: _context3.t16.code,
+                  code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_NOT_FOUND
+                }
+              };
+              _this.emit('error', errorNotFound);
+              return _context3.abrupt("return", {});
+            case 37:
+              logger("Can't fetch the catchupv2", _context3.t16.message);
+              errorCatchupv2 = {
+                message: 'Cannot fetch catchupv2 from collab service',
+                data: {
+                  status: _context3.t16.status,
+                  code: _internalErrors.INTERNAL_ERROR_CODE.CATCHUP_FAILED
+                }
+              };
+              _this.emit('error', errorCatchupv2);
               throw _context3.t16;
-            case 34:
+            case 41:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[0, 30]]);
+        }, _callee3, null, [[0, 31]]);
       }));
-      return function (_x3) {
+      return function (_x3, _x4) {
         return _ref3.apply(this, arguments);
       };
     }());
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchReconcile", /*#__PURE__*/function () {
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(currentStateDoc) {
+        var reqBody, reconcileResponse, _this$analyticsHelper7;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.prev = 0;
+              reqBody = JSON.stringify({
+                doc: currentStateDoc,
+                productId: 'ccollab',
+                reason: 'UNKNOWN' // different reason here?
+              });
+              _context4.t0 = _utilServiceSupport.utils;
+              _context4.t1 = _this.config;
+              _context4.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/reconcile");
+              _context4.t3 = _objectSpread;
+              _context4.t4 = _objectSpread;
+              _context4.t5 = {};
+              if (!_this.config.permissionTokenRefresh) {
+                _context4.next = 15;
+                break;
+              }
+              _context4.next = 11;
+              return _this.getChannelToken();
+            case 11:
+              _context4.t7 = _context4.sent;
+              _context4.t6 = {
+                'x-token': _context4.t7
+              };
+              _context4.next = 16;
+              break;
+            case 15:
+              _context4.t6 = {};
+            case 16:
+              _context4.t8 = _context4.t6;
+              _context4.t9 = (0, _context4.t4)(_context4.t5, _context4.t8);
+              _context4.t10 = {};
+              _context4.t11 = {
+                'x-product': (0, _utils.getProduct)(_this.config.productInfo),
+                'x-subproduct': (0, _utils.getSubProduct)(_this.config.productInfo),
+                'Content-Type': 'application/json'
+              };
+              _context4.t12 = (0, _context4.t3)(_context4.t9, _context4.t10, _context4.t11);
+              _context4.t13 = reqBody;
+              _context4.t14 = {
+                headers: _context4.t12,
+                method: 'POST',
+                body: _context4.t13
+              };
+              _context4.t15 = {
+                path: _context4.t2,
+                requestInit: _context4.t14
+              };
+              _context4.next = 26;
+              return _context4.t0.requestService.call(_context4.t0, _context4.t1, _context4.t15);
+            case 26:
+              reconcileResponse = _context4.sent;
+              return _context4.abrupt("return", reconcileResponse);
+            case 30:
+              _context4.prev = 30;
+              _context4.t16 = _context4["catch"](0);
+              (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(_context4.t16, 'Error while fetching reconciled document');
+              throw _context4.t16;
+            case 34:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, null, [[0, 30]]);
+      }));
+      return function (_x5) {
+        return _ref4.apply(this, arguments);
+      };
+    }());
     /**
      * Send message to the back-end service over the channel. Timestamp will be added server side.
      * @throws {NotInitializedError} Channel not initialized
@@ -483,10 +579,10 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       var auth;
       if (permissionTokenRefresh) {
         auth = /*#__PURE__*/function () {
-          var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(cb) {
+          var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(cb) {
             var authData, token, _data, authenticationError;
-            return _regenerator.default.wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
+            return _regenerator.default.wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   // Rebuild authData to ensure values are current
                   authData = {
@@ -495,22 +591,22 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                     // ESS-1009 Allow to opt-in into 404 response
                     need404: _this2.config.need404
                   };
-                  _context4.prev = 1;
-                  _context4.next = 4;
+                  _context5.prev = 1;
+                  _context5.next = 4;
                   return permissionTokenRefresh();
                 case 4:
-                  token = _context4.sent;
+                  token = _context5.sent;
                   if (token) {
                     authData.token = token;
                   } else {
                     authData.token = undefined;
                   }
                   cb(authData);
-                  _context4.next = 13;
+                  _context5.next = 13;
                   break;
                 case 9:
-                  _context4.prev = 9;
-                  _context4.t0 = _context4["catch"](1);
+                  _context5.prev = 9;
+                  _context5.t0 = _context5["catch"](1);
                   // Pass the error back to the consumers so they can deal with exceptional cases themselves (eg. no permissions because the page was deleted)
                   authenticationError = {
                     message: 'Insufficient editing permissions',
@@ -518,8 +614,8 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                       status: 403,
                       code: _internalErrors.INTERNAL_ERROR_CODE.TOKEN_PERMISSION_ERROR,
                       meta: {
-                        originalError: _context4.t0,
-                        reason: _context4.t0 === null || _context4.t0 === void 0 || (_data = _context4.t0.data) === null || _data === void 0 || (_data = _data.meta) === null || _data === void 0 ? void 0 : _data.reason // Should always be 'RESOURCE_DELETED' Temporary, until Confluence Cloud removes their hack
+                        originalError: _context5.t0,
+                        reason: _context5.t0 === null || _context5.t0 === void 0 || (_data = _context5.t0.data) === null || _data === void 0 || (_data = _data.meta) === null || _data === void 0 ? void 0 : _data.reason // Should always be 'RESOURCE_DELETED' Temporary, until Confluence Cloud removes their hack
                         // https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/browse/next/packages/native-collab/src/fetchCollabPermissionToken.ts#37
                       }
                     }
@@ -528,20 +624,20 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                   _this2.emit('error', authenticationError);
                 case 13:
                 case "end":
-                  return _context4.stop();
+                  return _context5.stop();
               }
-            }, _callee4, null, [[1, 9]]);
+            }, _callee5, null, [[1, 9]]);
           }));
-          return function auth(_x4) {
-            return _ref4.apply(this, arguments);
+          return function auth(_x6) {
+            return _ref5.apply(this, arguments);
           };
         }();
       } else {
         auth = /*#__PURE__*/function () {
-          var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(cb) {
+          var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(cb) {
             var authData;
-            return _regenerator.default.wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
+            return _regenerator.default.wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   // Rebuild authData to ensure values are current
                   authData = {
@@ -553,12 +649,12 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                   cb(authData);
                 case 2:
                 case "end":
-                  return _context5.stop();
+                  return _context6.stop();
               }
-            }, _callee5);
+            }, _callee6);
           }));
-          return function auth(_x5) {
-            return _ref5.apply(this, arguments);
+          return function auth(_x7) {
+            return _ref6.apply(this, arguments);
           };
         }();
       }
@@ -575,9 +671,9 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('steps:added', function (data) {
         _this2.emit('steps:added', data);
       });
-      this.socket.on('participant:telepointer', function (_ref6) {
-        var timestamp = _ref6.timestamp,
-          data = _ref6.data;
+      this.socket.on('participant:telepointer', function (_ref7) {
+        var timestamp = _ref7.timestamp,
+          data = _ref7.data;
         // data is TelepointerPayload without timestamp
         _this2.emit('participant:telepointer', _objectSpread({
           timestamp: timestamp
@@ -592,11 +688,11 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
       });
-      this.socket.on('participant:updated', function (_ref7) {
-        var sessionId = _ref7.sessionId,
-          timestamp = _ref7.timestamp,
-          data = _ref7.data,
-          clientId = _ref7.clientId;
+      this.socket.on('participant:updated', function (_ref8) {
+        var sessionId = _ref8.sessionId,
+          timestamp = _ref8.timestamp,
+          data = _ref8.data,
+          clientId = _ref8.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -612,10 +708,10 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         _this2.emit('status', data);
       });
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(reason) {
+        var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(reason) {
           var _this2$analyticsHelpe, reconnectionError;
-          return _regenerator.default.wrap(function _callee6$(_context6) {
-            while (1) switch (_context6.prev = _context6.next) {
+          return _regenerator.default.wrap(function _callee7$(_context7) {
+            while (1) switch (_context7.prev = _context7.next) {
               case 0:
                 _this2.connected = false;
                 logger("disconnect reason: ".concat(reason));
@@ -640,12 +736,12 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                 }
               case 4:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
-          }, _callee6);
+          }, _callee7);
         }));
-        return function (_x6) {
-          return _ref8.apply(this, arguments);
+        return function (_x8) {
+          return _ref9.apply(this, arguments);
         };
       }());
 

package/dist/cjs/document/catchupv2.js

@@ -0,0 +1,60 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.catchupv2 = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _utils = require("../helpers/utils");
+var logger = (0, _utils.createLogger)('Catchupv2', 'red');
+var catchupv2 = exports.catchupv2 = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(opt) {
+    var steps, metadata, fromVersion, _yield$opt$fetchCatch, _opt$analyticsHelper, version, stepsPayload, _opt$analyticsHelper2;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          fromVersion = opt.getCurrentPmVersion();
+          _context.prev = 1;
+          _context.next = 4;
+          return opt.fetchCatchupv2(fromVersion, opt.clientId);
+        case 4:
+          _yield$opt$fetchCatch = _context.sent;
+          steps = _yield$opt$fetchCatch.steps;
+          metadata = _yield$opt$fetchCatch.metadata;
+          _context.next = 14;
+          break;
+        case 9:
+          _context.prev = 9;
+          _context.t0 = _context["catch"](1);
+          (_opt$analyticsHelper = opt.analyticsHelper) === null || _opt$analyticsHelper === void 0 || _opt$analyticsHelper.sendErrorEvent(_context.t0, 'Error while fetching catchupv2 from server');
+          logger("Fetch catchupv2 from server failed:", _context.t0.message);
+          throw _context.t0;
+        case 14:
+          _context.prev = 14;
+          version = fromVersion + steps.length;
+          stepsPayload = {
+            version: version,
+            steps: steps
+          };
+          opt.onStepsAdded(stepsPayload);
+          opt.updateMetadata(metadata);
+          _context.next = 26;
+          break;
+        case 21:
+          _context.prev = 21;
+          _context.t1 = _context["catch"](14);
+          (_opt$analyticsHelper2 = opt.analyticsHelper) === null || _opt$analyticsHelper2 === void 0 || _opt$analyticsHelper2.sendErrorEvent(_context.t1, 'Failed to apply catchupv2 result in the editor');
+          logger("Apply catchupv2 steps failed:", _context.t1.message);
+          throw _context.t1;
+        case 26:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 9], [14, 21]]);
+  }));
+  return function catchupv2(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();