@atlaskit/collab-provider 9.12.0 → 9.12.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @atlaskit/collab-provider
2
2
 
3
+ ## 9.12.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [`aeb5c9a01e8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/aeb5c9a01e8) - Delete adf-schema from AFE and rely on npm package for adf-schema
8
+ - [`4b4dcfe0bba`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4b4dcfe0bba) - Delete adf-schema, use published version
9
+
10
+ ## 9.12.1
11
+
12
+ ### Patch Changes
13
+
14
+ - [`41f00a65fed`](https://bitbucket.org/atlassian/atlassian-frontend/commits/41f00a65fed) - Add ClientId for CatchUp
15
+
3
16
  ## 9.12.0
4
17
 
5
18
  ### Minor Changes
@@ -14,8 +14,8 @@ var _const = require("../helpers/const");
14
14
  var _versionWrapper = require("../version-wrapper");
15
15
  var _singleton = require("../connectivity/singleton");
16
16
  var _errorTypes = require("../errors/error-types");
17
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
18
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
17
+ 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; }
18
+ 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; }
19
19
  var EVENT_SUBJECT = 'collab';
20
20
  var COLLAB_SERVICE = /*#__PURE__*/function (COLLAB_SERVICE) {
21
21
  COLLAB_SERVICE["NCS"] = "ncs";
@@ -29,8 +29,8 @@ var _featureFlags = require("./feature-flags");
29
29
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
30
30
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
31
31
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
32
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
33
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
32
+ 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; }
33
+ 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; }
34
34
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
35
35
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
36
36
  var logger = (0, _utils.createLogger)('Channel', 'green');
@@ -199,7 +199,7 @@ var Channel = /*#__PURE__*/function (_Emitter) {
199
199
  }
200
200
  });
201
201
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchCatchup", /*#__PURE__*/function () {
202
- var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(fromVersion) {
202
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(fromVersion, clientId) {
203
203
  var _ref2, _this$token, _yield$utils$requestS, doc, version, stepMaps, metadata, errorNotFound, errorCatchup;
204
204
  return _regenerator.default.wrap(function _callee$(_context) {
205
205
  while (1) switch (_context.prev = _context.next) {
@@ -209,7 +209,8 @@ var Channel = /*#__PURE__*/function (_Emitter) {
209
209
  _context.t1 = _this.config;
210
210
  _context.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/catchup");
211
211
  _context.t3 = {
212
- version: fromVersion
212
+ version: fromVersion,
213
+ clientId: clientId
213
214
  };
214
215
  _context.t4 = _objectSpread;
215
216
  _context.t5 = _objectSpread;
@@ -328,7 +329,7 @@ var Channel = /*#__PURE__*/function (_Emitter) {
328
329
  }
329
330
  }, _callee, null, [[0, 47]]);
330
331
  }));
331
- return function (_x) {
332
+ return function (_x, _x2) {
332
333
  return _ref.apply(this, arguments);
333
334
  };
334
335
  }());
@@ -434,7 +435,7 @@ var Channel = /*#__PURE__*/function (_Emitter) {
434
435
  }
435
436
  }, _callee2, null, [[0, 44]]);
436
437
  }));
437
- return function (_x2) {
438
+ return function (_x3) {
438
439
  return _ref3.apply(this, arguments);
439
440
  };
440
441
  }());
@@ -583,7 +584,7 @@ var Channel = /*#__PURE__*/function (_Emitter) {
583
584
  }
584
585
  }, _callee3, null, [[6, 14]]);
585
586
  }));
586
- return function auth(_x3) {
587
+ return function auth(_x4) {
587
588
  return _ref5.apply(this, arguments);
588
589
  };
589
590
  }();
@@ -680,7 +681,7 @@ var Channel = /*#__PURE__*/function (_Emitter) {
680
681
  }
681
682
  }, _callee4);
682
683
  }));
683
- return function (_x4) {
684
+ return function (_x5) {
684
685
  return _ref8.apply(this, arguments);
685
686
  };
686
687
  }());
@@ -49,7 +49,7 @@ var catchup = /*#__PURE__*/function () {
49
49
  case 0:
50
50
  _context.prev = 0;
51
51
  _context.next = 3;
52
- return opt.fetchCatchup(opt.getCurrentPmVersion());
52
+ return opt.fetchCatchup(opt.getCurrentPmVersion(), opt.clientId);
53
53
  case 3:
54
54
  _yield$opt$fetchCatch = _context.sent;
55
55
  doc = _yield$opt$fetchCatch.doc;
@@ -22,8 +22,8 @@ var _catchup = require("./catchup");
22
22
  var _stepQueueState = require("./step-queue-state");
23
23
  var _featureFlags = require("../feature-flags");
24
24
  var _errorTypes = require("../errors/error-types");
25
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
26
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
25
+ 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; }
26
+ 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; }
27
27
  var CATCHUP_THROTTLE = 1 * 1000; // 1 second
28
28
 
29
29
  var noop = function noop() {};
@@ -95,7 +95,8 @@ var DocumentService = /*#__PURE__*/function () {
95
95
  applyLocalSteps: _this.applyLocalSteps,
96
96
  updateDocument: _this.updateDocument,
97
97
  updateMetadata: _this.metadataService.updateMetadata,
98
- analyticsHelper: _this.analyticsHelper
98
+ analyticsHelper: _this.analyticsHelper,
99
+ clientId: _this.clientId
99
100
  });
100
101
  case 8:
101
102
  latency = new Date().getTime() - start;
@@ -16,8 +16,8 @@ var _telepointersHelper = require("./telepointers-helper");
16
16
  var _participantsHelper = require("./participants-helper");
17
17
  var _participantsState = require("./participants-state");
18
18
  var _utils = require("../helpers/utils");
19
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
20
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
+ 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; }
20
+ 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; }
21
21
  var logger = (0, _utils.createLogger)('PresenceService', 'pink');
22
22
  var SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
23
23
 
@@ -9,8 +9,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
12
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
13
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
12
+ 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; }
13
+ 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; }
14
14
  var ParticipantsState = /*#__PURE__*/(0, _createClass2.default)(function ParticipantsState() {
15
15
  var _this = this;
16
16
  var baseParticipants = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Map();
@@ -11,8 +11,8 @@ var _throttle = _interopRequireDefault(require("lodash/throttle"));
11
11
  var _const = require("../helpers/const");
12
12
  var _types = require("../types");
13
13
  var _errorTypes = require("../errors/error-types");
14
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
15
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
14
+ 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; }
15
+ 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; }
16
16
  var SEND_STEPS_THROTTLE = 500; // 0.5 second
17
17
 
18
18
  var commitStep = function commitStep(_ref) {
@@ -11,8 +11,8 @@ var _provider = require("./provider");
11
11
  var _socket = require("socket.io-client");
12
12
  var _utils = require("./helpers/utils");
13
13
  var _config = require("./config");
14
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
15
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
14
+ 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; }
15
+ 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; }
16
16
  function createSocketIOSocket(url, auth, productInfo) {
17
17
  var _URL = new URL(url),
18
18
  pathname = _URL.pathname;
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.version = exports.nextMajorVersion = exports.name = void 0;
7
7
  var name = "@atlaskit/collab-provider";
8
8
  exports.name = name;
9
- var version = "9.12.0";
9
+ var version = "9.12.2";
10
10
  exports.version = version;
11
11
  var nextMajorVersion = function nextMajorVersion() {
12
12
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
@@ -167,7 +167,7 @@ export class Channel extends Emitter {
167
167
  this.emit('steps:added', data);
168
168
  }
169
169
  });
170
- _defineProperty(this, "fetchCatchup", async fromVersion => {
170
+ _defineProperty(this, "fetchCatchup", async (fromVersion, clientId) => {
171
171
  try {
172
172
  var _ref, _this$token;
173
173
  const {
@@ -178,7 +178,8 @@ export class Channel extends Emitter {
178
178
  } = await utils.requestService(this.config, {
179
179
  path: `document/${encodeURIComponent(this.config.documentAri)}/catchup`,
180
180
  queryParams: {
181
- version: fromVersion
181
+ version: fromVersion,
182
+ clientId: clientId
182
183
  },
183
184
  requestInit: {
184
185
  headers: {
@@ -27,7 +27,7 @@ export const catchup = async opt => {
27
27
  stepMaps: serverStepMaps,
28
28
  version: serverVersion,
29
29
  metadata
30
- } = await opt.fetchCatchup(opt.getCurrentPmVersion()));
30
+ } = await opt.fetchCatchup(opt.getCurrentPmVersion(), opt.clientId));
31
31
  } catch (error) {
32
32
  var _opt$analyticsHelper;
33
33
  (_opt$analyticsHelper = opt.analyticsHelper) === null || _opt$analyticsHelper === void 0 ? void 0 : _opt$analyticsHelper.sendErrorEvent(error, 'Error while fetching catchup from server');
@@ -69,7 +69,8 @@ export class DocumentService {
69
69
  applyLocalSteps: this.applyLocalSteps,
70
70
  updateDocument: this.updateDocument,
71
71
  updateMetadata: this.metadataService.updateMetadata,
72
- analyticsHelper: this.analyticsHelper
72
+ analyticsHelper: this.analyticsHelper,
73
+ clientId: this.clientId
73
74
  });
74
75
  const latency = new Date().getTime() - start;
75
76
  (_this$analyticsHelper = this.analyticsHelper) === null || _this$analyticsHelper === void 0 ? void 0 : _this$analyticsHelper.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
@@ -1,5 +1,5 @@
1
1
  export const name = "@atlaskit/collab-provider";
2
- export const version = "9.12.0";
2
+ export const version = "9.12.2";
3
3
  export const nextMajorVersion = () => {
4
4
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
5
5
  };
@@ -3,8 +3,8 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
3
  import _createClass from "@babel/runtime/helpers/createClass";
4
4
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
5
  import _regeneratorRuntime from "@babel/runtime/regenerator";
6
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
7
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
6
+ 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; }
7
+ 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; }
8
8
  import { EVENT_ACTION } from '../helpers/const';
9
9
  import { name as packageName, version as packageVersion } from '../version-wrapper';
10
10
  import { network } from '../connectivity/singleton';
@@ -10,8 +10,8 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
10
10
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
11
11
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
12
12
  import _regeneratorRuntime from "@babel/runtime/regenerator";
13
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
14
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
+ 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; }
14
+ 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; }
15
15
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
16
16
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
17
17
  import { utils } from '@atlaskit/util-service-support';
@@ -192,7 +192,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
192
192
  }
193
193
  });
194
194
  _defineProperty(_assertThisInitialized(_this), "fetchCatchup", /*#__PURE__*/function () {
195
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(fromVersion) {
195
+ var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(fromVersion, clientId) {
196
196
  var _ref2, _this$token, _yield$utils$requestS, doc, version, stepMaps, metadata, errorNotFound, errorCatchup;
197
197
  return _regeneratorRuntime.wrap(function _callee$(_context) {
198
198
  while (1) switch (_context.prev = _context.next) {
@@ -202,7 +202,8 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
202
202
  _context.t1 = _this.config;
203
203
  _context.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/catchup");
204
204
  _context.t3 = {
205
- version: fromVersion
205
+ version: fromVersion,
206
+ clientId: clientId
206
207
  };
207
208
  _context.t4 = _objectSpread;
208
209
  _context.t5 = _objectSpread;
@@ -321,7 +322,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
321
322
  }
322
323
  }, _callee, null, [[0, 47]]);
323
324
  }));
324
- return function (_x) {
325
+ return function (_x, _x2) {
325
326
  return _ref.apply(this, arguments);
326
327
  };
327
328
  }());
@@ -427,7 +428,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
427
428
  }
428
429
  }, _callee2, null, [[0, 44]]);
429
430
  }));
430
- return function (_x2) {
431
+ return function (_x3) {
431
432
  return _ref3.apply(this, arguments);
432
433
  };
433
434
  }());
@@ -576,7 +577,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
576
577
  }
577
578
  }, _callee3, null, [[6, 14]]);
578
579
  }));
579
- return function auth(_x3) {
580
+ return function auth(_x4) {
580
581
  return _ref5.apply(this, arguments);
581
582
  };
582
583
  }();
@@ -673,7 +674,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
673
674
  }
674
675
  }, _callee4);
675
676
  }));
676
- return function (_x4) {
677
+ return function (_x5) {
677
678
  return _ref8.apply(this, arguments);
678
679
  };
679
680
  }());
@@ -41,7 +41,7 @@ export var catchup = /*#__PURE__*/function () {
41
41
  case 0:
42
42
  _context.prev = 0;
43
43
  _context.next = 3;
44
- return opt.fetchCatchup(opt.getCurrentPmVersion());
44
+ return opt.fetchCatchup(opt.getCurrentPmVersion(), opt.clientId);
45
45
  case 3:
46
46
  _yield$opt$fetchCatch = _context.sent;
47
47
  doc = _yield$opt$fetchCatch.doc;
@@ -2,8 +2,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
3
  import _createClass from "@babel/runtime/helpers/createClass";
4
4
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
6
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
5
+ 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; }
6
+ 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; }
7
7
  import _regeneratorRuntime from "@babel/runtime/regenerator";
8
8
  import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
9
9
  import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
@@ -88,7 +88,8 @@ export var DocumentService = /*#__PURE__*/function () {
88
88
  applyLocalSteps: _this.applyLocalSteps,
89
89
  updateDocument: _this.updateDocument,
90
90
  updateMetadata: _this.metadataService.updateMetadata,
91
- analyticsHelper: _this.analyticsHelper
91
+ analyticsHelper: _this.analyticsHelper,
92
+ clientId: _this.clientId
92
93
  });
93
94
  case 8:
94
95
  latency = new Date().getTime() - start;
@@ -3,8 +3,8 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
3
  import _createClass from "@babel/runtime/helpers/createClass";
4
4
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
5
  import _regeneratorRuntime from "@babel/runtime/regenerator";
6
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
7
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
6
+ 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; }
7
+ 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; }
8
8
  import { disconnectedReasonMapper } from '../disconnected-reason-mapper';
9
9
  import { EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
10
10
  import { telepointerFromStep } from './telepointers-helper';
@@ -2,8 +2,8 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import _createClass from "@babel/runtime/helpers/createClass";
3
3
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
4
4
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
6
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
5
+ 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; }
6
+ 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; }
7
7
  export var ParticipantsState = /*#__PURE__*/_createClass(function ParticipantsState() {
8
8
  var _this = this;
9
9
  var baseParticipants = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Map();
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
2
+ 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; }
3
+ 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; }
4
4
  import countBy from 'lodash/countBy';
5
5
  import throttle from 'lodash/throttle';
6
6
  import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
2
+ 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; }
3
+ 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; }
4
4
  import { Provider } from './provider';
5
5
  import { io } from 'socket.io-client';
6
6
  import { getProduct, getSubProduct } from './helpers/utils';
@@ -1,5 +1,5 @@
1
1
  export var name = "@atlaskit/collab-provider";
2
- export var version = "9.12.0";
2
+ export var version = "9.12.2";
3
3
  export var nextMajorVersion = function nextMajorVersion() {
4
4
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
5
5
  };
@@ -40,7 +40,7 @@ export declare class Channel extends Emitter<ChannelEvent> {
40
40
  private onReconnectError;
41
41
  private onConnect;
42
42
  private onReceiveData;
43
- fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
43
+ fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>;
44
44
  fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>;
45
45
  /**
46
46
  * Send message to the back-end service over the channel. Timestamp will be added server side.
@@ -43,7 +43,7 @@ export declare class DocumentService {
43
43
  * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
44
44
  * @param featureFlags - Feature flag config
45
45
  */
46
- constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, failedStepsBeforeCatchupOnPublish: number, enableErrorOnFailedDocumentApply: boolean, featureFlags: {
46
+ constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, failedStepsBeforeCatchupOnPublish: number, enableErrorOnFailedDocumentApply: boolean, featureFlags: {
47
47
  [key: string]: boolean;
48
48
  } | undefined);
49
49
  /**
@@ -184,13 +184,14 @@ export interface ReconcileResponse {
184
184
  }
185
185
  export interface CatchupOptions {
186
186
  getCurrentPmVersion: () => number;
187
- fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
187
+ fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>;
188
188
  filterQueue: (condition: (stepsPayload: StepsPayload) => boolean) => void;
189
189
  getUnconfirmedSteps: () => readonly Step[] | undefined;
190
190
  applyLocalSteps: (steps: Step[]) => void;
191
191
  updateDocument: ({ doc, version, metadata, reserveCursor, }: CollabInitPayload) => void;
192
192
  updateMetadata: (metadata: Metadata | undefined) => void;
193
193
  analyticsHelper: AnalyticsHelper | undefined;
194
+ clientId: number | string | undefined;
194
195
  }
195
196
  export type ProductInformation = {
196
197
  product: string;
@@ -40,7 +40,7 @@ export declare class Channel extends Emitter<ChannelEvent> {
40
40
  private onReconnectError;
41
41
  private onConnect;
42
42
  private onReceiveData;
43
- fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
43
+ fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>;
44
44
  fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>;
45
45
  /**
46
46
  * Send message to the back-end service over the channel. Timestamp will be added server side.
@@ -43,7 +43,7 @@ export declare class DocumentService {
43
43
  * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
44
44
  * @param featureFlags - Feature flag config
45
45
  */
46
- constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, failedStepsBeforeCatchupOnPublish: number, enableErrorOnFailedDocumentApply: boolean, featureFlags: {
46
+ constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>, fetchReconcile: (currentStateDoc: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, failedStepsBeforeCatchupOnPublish: number, enableErrorOnFailedDocumentApply: boolean, featureFlags: {
47
47
  [key: string]: boolean;
48
48
  } | undefined);
49
49
  /**
@@ -184,13 +184,14 @@ export interface ReconcileResponse {
184
184
  }
185
185
  export interface CatchupOptions {
186
186
  getCurrentPmVersion: () => number;
187
- fetchCatchup: (fromVersion: number) => Promise<CatchupResponse>;
187
+ fetchCatchup: (fromVersion: number, clientId: number | string | undefined) => Promise<CatchupResponse>;
188
188
  filterQueue: (condition: (stepsPayload: StepsPayload) => boolean) => void;
189
189
  getUnconfirmedSteps: () => readonly Step[] | undefined;
190
190
  applyLocalSteps: (steps: Step[]) => void;
191
191
  updateDocument: ({ doc, version, metadata, reserveCursor, }: CollabInitPayload) => void;
192
192
  updateMetadata: (metadata: Metadata | undefined) => void;
193
193
  analyticsHelper: AnalyticsHelper | undefined;
194
+ clientId: number | string | undefined;
194
195
  }
195
196
  export type ProductInformation = {
196
197
  product: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/collab-provider",
3
- "version": "9.12.0",
3
+ "version": "9.12.2",
4
4
  "description": "A provider for collaborative editing.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
36
36
  "dependencies": {
37
37
  "@atlaskit/analytics-gas-types": "^5.1.0",
38
38
  "@atlaskit/analytics-listeners": "^8.7.0",
39
- "@atlaskit/editor-common": "^74.55.0",
39
+ "@atlaskit/editor-common": "^74.58.0",
40
40
  "@atlaskit/editor-json-transformer": "^8.10.0",
41
41
  "@atlaskit/editor-prosemirror": "1.1.0",
42
42
  "@atlaskit/prosemirror-collab": "^0.2.0",
@@ -62,7 +62,7 @@
62
62
  }
63
63
  },
64
64
  "devDependencies": {
65
- "@atlaskit/adf-schema": "28.1.2",
65
+ "@atlaskit/adf-schema": "^29.1.0",
66
66
  "@atlaskit/analytics-listeners": "^8.7.0",
67
67
  "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
68
68
  "typescript": "~4.9.5"