@atlaskit/collab-provider 10.7.2 → 10.8.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/collab-provider
 
+## 10.8.0
+
+### Minor Changes
+
+- [#117768](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/117768)
+  [`d55a8d95dd68a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d55a8d95dd68a) -
+  Add support for presenceActivity changes within collab provider. Remove unused code from original
+  presence experiment.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.7.3
+
+### Patch Changes
+
+- [#117438](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/117438)
+  [`0de6100bab361`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0de6100bab361) -
+  CEPS-219: The collab provider waits for an ACK from NCS before committing the enxt batch of steps,
+  but there is a timeout of 5s in case this ACK is lost. Since we are now intentionally increasing
+  this ack for single player sessions, this causes unwanted behvaiour if the ack is 5s or more, as
+  the provider will re-send even though an ack is in flight. We increase the window to 20s so that
+  we have a bigger window of ack delay values we can experiment with.
+
 ## 10.7.2
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -556,14 +556,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           timestamp: timestamp
         }, data));
       });
-      this.socket.on('participant:activity-ack', function (_ref7) {
-        var data = _ref7.data;
-        _this2.emit('participant:activity-ack', data);
-      });
-      this.socket.on('participant:activity-join', function (_ref8) {
-        var data = _ref8.data;
-        _this2.emit('participant:activity-join', data);
-      });
       this.socket.on('presence:joined', function (data) {
         _this2.emit('presence:joined', data);
       });
@@ -573,11 +565,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 (_ref9) {
-        var sessionId = _ref9.sessionId,
-          timestamp = _ref9.timestamp,
-          data = _ref9.data,
-          clientId = _ref9.clientId;
+      this.socket.on('participant:updated', function (_ref7) {
+        var sessionId = _ref7.sessionId,
+          timestamp = _ref7.timestamp,
+          data = _ref7.data,
+          clientId = _ref7.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -595,7 +587,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       // Ignored via go/ees005
       // eslint-disable-next-line require-await
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(reason) {
+        var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(reason) {
           var _this2$analyticsHelpe, reconnectionError;
           return _regenerator.default.wrap(function _callee6$(_context6) {
             while (1) switch (_context6.prev = _context6.next) {
@@ -628,7 +620,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           }, _callee6);
         }));
         return function (_x9) {
-          return _ref10.apply(this, arguments);
+          return _ref8.apply(this, arguments);
         };
       }());
 

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

@@ -42,6 +42,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
     var setUserId = arguments.length > 7 ? arguments[7] : undefined;
     var getAIProviderActiveIds = arguments.length > 8 ? arguments[8] : undefined;
     (0, _classCallCheck2.default)(this, ParticipantsService);
+    (0, _defineProperty2.default)(this, "sendPresenceActivityChanged", function () {
+      _this.sendPresence();
+    });
     (0, _defineProperty2.default)(this, "sendAIProviderChanged", function (payload) {
       if (payload.providerId) {
         for (var propKey in payload.permit) {
@@ -87,6 +90,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         });
       }
     });
+    (0, _defineProperty2.default)(this, "hasPresenceActivityChanged", function (previous, current) {
+      return previous.presenceActivity !== current.presenceActivity;
+    });
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -94,7 +100,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
      */
     (0, _defineProperty2.default)(this, "onParticipantUpdated", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(payload) {
-        var userId, participant, _this$analyticsHelper, isNewParticipant;
+        var userId, participant, _this$analyticsHelper, previousParticipant;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -127,18 +133,25 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
               }
               return _context.abrupt("return");
             case 14:
-              isNewParticipant = _this.participantsState.doesntHave(participant.sessionId);
+              previousParticipant = _this.participantsState.getBySessionId(participant.sessionId);
               _this.participantsState.setBySessionId(participant.sessionId, participant);
-              if (isNewParticipant) {
-                _context.next = 18;
+              if (!previousParticipant) {
+                _context.next = 19;
                 break;
               }
+              if (_this.hasPresenceActivityChanged(previousParticipant, participant)) {
+                _this.emitPresenceActivityChange({
+                  type: 'participant:activity',
+                  activity: participant.presenceActivity
+                }, 'handling participant activity changed event');
+              }
               return _context.abrupt("return");
-            case 18:
+            case 19:
+              // Only emit the joined presence event if this is a new participant
               _this.emitPresence({
                 joined: [participant]
               }, 'handling participant updated event');
-            case 19:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -322,32 +335,6 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(error, 'Error while sending presence');
       }
     });
-    /**
-     * sending new joiner's activity to existing participants
-     */
-    (0, _defineProperty2.default)(this, "onParticipantActivityJoin", function (payload) {
-      try {
-        logger('New participant joined: ', payload.activity);
-        _this.emit('activity:join', payload);
-      } catch (error) {
-        var _this$analyticsHelper8;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, "Error while sending 'activity:join'");
-      }
-    });
-    /**
-     * respond to new joiner with existing participant's activity
-     */
-    (0, _defineProperty2.default)(this, "onParticipantActivityAck", function (payload) {
-      try {
-        logger('Existing participants ack: ', payload.activity);
-        _this.emit('activity:ack', payload);
-      } catch (error) {
-        var _this$analyticsHelper9;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, "Error while sending 'activity:ack'");
-      }
-    });
     /**
      * Called when a participant joins the session.
      *
@@ -361,9 +348,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         // This expose existing users to the newly joined user
         _this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper10;
+        var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper10 = _this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, 'Error while joining presence');
       }
     });
     /**
@@ -381,9 +368,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         _this.sendPresence();
         _this.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper11;
+        var _this$analyticsHelper9;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
     /**
@@ -424,5 +411,22 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         }
       });
     }
+  }, {
+    key: "emitPresenceActivityChange",
+    value:
+    /**
+     * Wrapper function to emit with error handling and analytics
+     * @param data Data to emit
+     * @param errorMessage Error message for analytics
+     */
+    function emitPresenceActivityChange(data, errorMessage) {
+      try {
+        this.emit('presence:changed', data);
+      } catch (error) {
+        var _this$analyticsHelper10;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, "Error while ".concat(errorMessage));
+      }
+    }
   }]);
 }();

package/dist/cjs/provider/commit-step.js

@@ -16,7 +16,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var logger = (0, _utils.createLogger)('commit-step', 'black');
 var readyToCommit = exports.readyToCommit = true;
-var RESET_READYTOCOMMIT_INTERVAL_MS = exports.RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
+var RESET_READYTOCOMMIT_INTERVAL_MS = exports.RESET_READYTOCOMMIT_INTERVAL_MS = 20000;
 var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
   var broadcast = _ref.broadcast,
     steps = _ref.steps,

package/dist/cjs/provider/index.js

@@ -163,7 +163,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         _this.emit('permission', permit);
       }).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', function (payload) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
-      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', /*#__PURE__*/function () {
+      }).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', /*#__PURE__*/function () {
         var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(status) {
           var isLocked;
           return _regenerator.default.wrap(function _callee$(_context) {
@@ -206,6 +206,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         presenceActivity: _this.presenceActivity
       };
     });
+    (0, _defineProperty2.default)(_this, "setPresenceActivity", function (activity) {
+      _this.presenceActivity = activity;
+    });
     /**
      * @param {InternalError} error The error to handle
      */
@@ -555,12 +558,11 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.channel.broadcast('participant:telepointer', _objectSpread(_objectSpread({}, basePayload), {}, {
             selection: data.selection
           }), (0, _performance.shouldTelepointerBeSampled)() ? (0, _telepointersHelper.telepointerCallback)(this.config.documentAri) : undefined);
-        } else if ((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' || (data === null || data === void 0 ? void 0 : data.type) === 'activity:ack') {
-          this.channel.broadcast((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' ? 'participant:activity-join' : 'participant:activity-ack', _objectSpread(_objectSpread({}, basePayload), {}, {
-            activity: data.activity
-          }), activityCallback());
         } else if ((data === null || data === void 0 ? void 0 : data.type) === 'ai-provider:change') {
           this.participantsService.sendAIProviderChanged(_objectSpread(_objectSpread({}, basePayload), data));
+        } else if ((data === null || data === void 0 ? void 0 : data.type) === 'participant:activity') {
+          this.setPresenceActivity(data.activity);
+          this.participantsService.sendPresenceActivityChanged();
         }
       } catch (error) {
         var _this$analyticsHelper12;
@@ -696,20 +698,4 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       return this.namespaceService.getIsNamespaceLocked();
     }
   }]);
-}(_emitter.Emitter);
-/**
- * Callback for handling the broadcast response of participant activity.
- * This example assumes a simple logging mechanism. It could be expanded to handle errors or other responses.
- *
- * @param activity The activity that was broadcast.
- * @returns A function that handles the response from the broadcast operation.
- */
-function activityCallback() {
-  return function (error) {
-    if (error) {
-      // Log or handle the error. This could involve retrying the broadcast or notifying the user.
-      logger('Error broadcasting participant activity:', error);
-      return;
-    }
-  };
-}
+}(_emitter.Emitter);

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "10.7.2";
+var version = exports.version = "10.8.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/channel.js

@@ -401,16 +401,6 @@ export class Channel extends Emitter {
         ...data
       });
     });
-    this.socket.on('participant:activity-ack', ({
-      data
-    }) => {
-      this.emit('participant:activity-ack', data);
-    });
-    this.socket.on('participant:activity-join', ({
-      data
-    }) => {
-      this.emit('participant:activity-join', data);
-    });
     this.socket.on('presence:joined', data => {
       this.emit('presence:joined', data);
     });

package/dist/es2019/participants/participants-service.js

@@ -19,6 +19,9 @@ const SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
  */
 export class ParticipantsService {
   constructor(analyticsHelper, participantsState = new ParticipantsState(), emit, getUser, channelBroadcast, sendPresenceJoined, getPresenceData, setUserId, getAIProviderActiveIds) {
+    _defineProperty(this, "sendPresenceActivityChanged", () => {
+      this.sendPresence();
+    });
     _defineProperty(this, "sendAIProviderChanged", payload => {
       if (payload.providerId) {
         for (const propKey in payload.permit) {
@@ -64,6 +67,9 @@ export class ParticipantsService {
         });
       }
     });
+    _defineProperty(this, "hasPresenceActivityChanged", (previous, current) => {
+      return previous.presenceActivity !== current.presenceActivity;
+    });
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -95,11 +101,19 @@ export class ParticipantsService {
       if (!participant) {
         return;
       }
-      const isNewParticipant = this.participantsState.doesntHave(participant.sessionId);
+      const previousParticipant = this.participantsState.getBySessionId(participant.sessionId);
       this.participantsState.setBySessionId(participant.sessionId, participant);
-      if (!isNewParticipant) {
+      if (previousParticipant) {
+        if (this.hasPresenceActivityChanged(previousParticipant, participant)) {
+          this.emitPresenceActivityChange({
+            type: 'participant:activity',
+            activity: participant.presenceActivity
+          }, 'handling participant activity changed event');
+        }
         return;
       }
+
+      // Only emit the joined presence event if this is a new participant
       this.emitPresence({
         joined: [participant]
       }, 'handling participant updated event');
@@ -267,32 +281,6 @@ export class ParticipantsService {
         (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(error, 'Error while sending presence');
       }
     });
-    /**
-     * sending new joiner's activity to existing participants
-     */
-    _defineProperty(this, "onParticipantActivityJoin", payload => {
-      try {
-        logger('New participant joined: ', payload.activity);
-        this.emit('activity:join', payload);
-      } catch (error) {
-        var _this$analyticsHelper8;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(error, `Error while sending 'activity:join'`);
-      }
-    });
-    /**
-     * respond to new joiner with existing participant's activity
-     */
-    _defineProperty(this, "onParticipantActivityAck", payload => {
-      try {
-        logger('Existing participants ack: ', payload.activity);
-        this.emit('activity:ack', payload);
-      } catch (error) {
-        var _this$analyticsHelper9;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(error, `Error while sending 'activity:ack'`);
-      }
-    });
     /**
      * Called when a participant joins the session.
      *
@@ -306,9 +294,9 @@ export class ParticipantsService {
         // This expose existing users to the newly joined user
         this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper10;
+        var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(error, 'Error while joining presence');
       }
     });
     /**
@@ -326,9 +314,9 @@ export class ParticipantsService {
         this.sendPresence();
         this.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper11;
+        var _this$analyticsHelper9;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
     /**
@@ -365,4 +353,18 @@ export class ParticipantsService {
       }
     });
   }
+  /**
+   * Wrapper function to emit with error handling and analytics
+   * @param data Data to emit
+   * @param errorMessage Error message for analytics
+   */
+  emitPresenceActivityChange(data, errorMessage) {
+    try {
+      this.emit('presence:changed', data);
+    } catch (error) {
+      var _this$analyticsHelper10;
+      // We don't want to throw errors for Presence features as they tend to self-restore
+      (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(error, `Error while ${errorMessage}`);
+    }
+  }
 }

package/dist/es2019/provider/commit-step.js

@@ -6,7 +6,7 @@ import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
 const logger = createLogger('commit-step', 'black');
 export let readyToCommit = true;
-export const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
+export const RESET_READYTOCOMMIT_INTERVAL_MS = 20000;
 export const commitStepQueue = ({
   broadcast,
   steps,

package/dist/es2019/provider/index.js

@@ -141,7 +141,7 @@ export class Provider extends Emitter {
       }).on('restore', this.documentService.onRestore).on('permission', permit => {
         this.permit = Object.assign(this.permit, permit);
         this.emit('permission', permit);
-      }).on('steps:added', this.documentService.onStepsAdded).on('metadata:changed', this.metadataService.onMetadataChanged).on('participant:telepointer', payload => this.participantsService.onParticipantTelepointer(payload, this.sessionId)).on('participant:activity-join', this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', this.participantsService.onParticipantActivityAck).on('presence:joined', this.participantsService.onPresenceJoined).on('presence', this.participantsService.onPresence).on('participant:left', this.participantsService.onParticipantLeft).on('participant:updated', this.participantsService.onParticipantUpdated).on('disconnect', this.onDisconnected.bind(this)).on('error', this.onErrorHandled).on('status', async status => {
+      }).on('steps:added', this.documentService.onStepsAdded).on('metadata:changed', this.metadataService.onMetadataChanged).on('participant:telepointer', payload => this.participantsService.onParticipantTelepointer(payload, this.sessionId)).on('presence:joined', this.participantsService.onPresenceJoined).on('presence', this.participantsService.onPresence).on('participant:left', this.participantsService.onParticipantLeft).on('participant:updated', this.participantsService.onParticipantUpdated).on('disconnect', this.onDisconnected.bind(this)).on('error', this.onErrorHandled).on('status', async status => {
         await this.namespaceService.onNamespaceStatusChanged(status);
         const isLocked = this.namespaceService.getIsNamespaceLocked();
         this.emit('namespace-lock:check', {
@@ -168,6 +168,9 @@ export class Provider extends Emitter {
         presenceActivity: this.presenceActivity
       };
     });
+    _defineProperty(this, "setPresenceActivity", activity => {
+      this.presenceActivity = activity;
+    });
     /**
      * @param {InternalError} error The error to handle
      */
@@ -479,16 +482,14 @@ export class Provider extends Emitter {
           ...basePayload,
           selection: data.selection
         }, shouldTelepointerBeSampled() ? telepointerCallback(this.config.documentAri) : undefined);
-      } else if ((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' || (data === null || data === void 0 ? void 0 : data.type) === 'activity:ack') {
-        this.channel.broadcast((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' ? 'participant:activity-join' : 'participant:activity-ack', {
-          ...basePayload,
-          activity: data.activity
-        }, activityCallback());
       } else if ((data === null || data === void 0 ? void 0 : data.type) === 'ai-provider:change') {
         this.participantsService.sendAIProviderChanged({
           ...basePayload,
           ...data
         });
+      } else if ((data === null || data === void 0 ? void 0 : data.type) === 'participant:activity') {
+        this.setPresenceActivity(data.activity);
+        this.participantsService.sendPresenceActivityChanged();
       }
     } catch (error) {
       var _this$analyticsHelper14;
@@ -604,21 +605,4 @@ export class Provider extends Emitter {
   getIsNamespaceLocked() {
     return this.namespaceService.getIsNamespaceLocked();
   }
-}
-
-/**
- * Callback for handling the broadcast response of participant activity.
- * This example assumes a simple logging mechanism. It could be expanded to handle errors or other responses.
- *
- * @param activity The activity that was broadcast.
- * @returns A function that handles the response from the broadcast operation.
- */
-function activityCallback() {
-  return error => {
-    if (error) {
-      // Log or handle the error. This could involve retrying the broadcast or notifying the user.
-      logger('Error broadcasting participant activity:', error);
-      return;
-    }
-  };
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "10.7.2";
+export const version = "10.8.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/channel.js

@@ -549,14 +549,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
           timestamp: timestamp
         }, data));
       });
-      this.socket.on('participant:activity-ack', function (_ref7) {
-        var data = _ref7.data;
-        _this2.emit('participant:activity-ack', data);
-      });
-      this.socket.on('participant:activity-join', function (_ref8) {
-        var data = _ref8.data;
-        _this2.emit('participant:activity-join', data);
-      });
       this.socket.on('presence:joined', function (data) {
         _this2.emit('presence:joined', data);
       });
@@ -566,11 +558,11 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
       });
-      this.socket.on('participant:updated', function (_ref9) {
-        var sessionId = _ref9.sessionId,
-          timestamp = _ref9.timestamp,
-          data = _ref9.data,
-          clientId = _ref9.clientId;
+      this.socket.on('participant:updated', function (_ref7) {
+        var sessionId = _ref7.sessionId,
+          timestamp = _ref7.timestamp,
+          data = _ref7.data,
+          clientId = _ref7.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -588,7 +580,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       // Ignored via go/ees005
       // eslint-disable-next-line require-await
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(reason) {
+        var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(reason) {
           var _this2$analyticsHelpe, reconnectionError;
           return _regeneratorRuntime.wrap(function _callee6$(_context6) {
             while (1) switch (_context6.prev = _context6.next) {
@@ -621,7 +613,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
           }, _callee6);
         }));
         return function (_x9) {
-          return _ref10.apply(this, arguments);
+          return _ref8.apply(this, arguments);
         };
       }());
 

package/dist/esm/participants/participants-service.js

@@ -35,6 +35,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
     var setUserId = arguments.length > 7 ? arguments[7] : undefined;
     var getAIProviderActiveIds = arguments.length > 8 ? arguments[8] : undefined;
     _classCallCheck(this, ParticipantsService);
+    _defineProperty(this, "sendPresenceActivityChanged", function () {
+      _this.sendPresence();
+    });
     _defineProperty(this, "sendAIProviderChanged", function (payload) {
       if (payload.providerId) {
         for (var propKey in payload.permit) {
@@ -80,6 +83,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
         });
       }
     });
+    _defineProperty(this, "hasPresenceActivityChanged", function (previous, current) {
+      return previous.presenceActivity !== current.presenceActivity;
+    });
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -87,7 +93,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
      */
     _defineProperty(this, "onParticipantUpdated", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(payload) {
-        var userId, participant, _this$analyticsHelper, isNewParticipant;
+        var userId, participant, _this$analyticsHelper, previousParticipant;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -120,18 +126,25 @@ export var ParticipantsService = /*#__PURE__*/function () {
               }
               return _context.abrupt("return");
             case 14:
-              isNewParticipant = _this.participantsState.doesntHave(participant.sessionId);
+              previousParticipant = _this.participantsState.getBySessionId(participant.sessionId);
               _this.participantsState.setBySessionId(participant.sessionId, participant);
-              if (isNewParticipant) {
-                _context.next = 18;
+              if (!previousParticipant) {
+                _context.next = 19;
                 break;
               }
+              if (_this.hasPresenceActivityChanged(previousParticipant, participant)) {
+                _this.emitPresenceActivityChange({
+                  type: 'participant:activity',
+                  activity: participant.presenceActivity
+                }, 'handling participant activity changed event');
+              }
               return _context.abrupt("return");
-            case 18:
+            case 19:
+              // Only emit the joined presence event if this is a new participant
               _this.emitPresence({
                 joined: [participant]
               }, 'handling participant updated event');
-            case 19:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -315,32 +328,6 @@ export var ParticipantsService = /*#__PURE__*/function () {
         (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(error, 'Error while sending presence');
       }
     });
-    /**
-     * sending new joiner's activity to existing participants
-     */
-    _defineProperty(this, "onParticipantActivityJoin", function (payload) {
-      try {
-        logger('New participant joined: ', payload.activity);
-        _this.emit('activity:join', payload);
-      } catch (error) {
-        var _this$analyticsHelper8;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, "Error while sending 'activity:join'");
-      }
-    });
-    /**
-     * respond to new joiner with existing participant's activity
-     */
-    _defineProperty(this, "onParticipantActivityAck", function (payload) {
-      try {
-        logger('Existing participants ack: ', payload.activity);
-        _this.emit('activity:ack', payload);
-      } catch (error) {
-        var _this$analyticsHelper9;
-        // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, "Error while sending 'activity:ack'");
-      }
-    });
     /**
      * Called when a participant joins the session.
      *
@@ -354,9 +341,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
         // This expose existing users to the newly joined user
         _this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper10;
+        var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper10 = _this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, 'Error while joining presence');
       }
     });
     /**
@@ -374,9 +361,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
         _this.sendPresence();
         _this.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper11;
+        var _this$analyticsHelper9;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
     /**
@@ -417,5 +404,22 @@ export var ParticipantsService = /*#__PURE__*/function () {
         }
       });
     }
+  }, {
+    key: "emitPresenceActivityChange",
+    value:
+    /**
+     * Wrapper function to emit with error handling and analytics
+     * @param data Data to emit
+     * @param errorMessage Error message for analytics
+     */
+    function emitPresenceActivityChange(data, errorMessage) {
+      try {
+        this.emit('presence:changed', data);
+      } catch (error) {
+        var _this$analyticsHelper10;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, "Error while ".concat(errorMessage));
+      }
+    }
   }]);
 }();

package/dist/esm/provider/commit-step.js

@@ -9,7 +9,7 @@ import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
 var logger = createLogger('commit-step', 'black');
 export var readyToCommit = true;
-export var RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
+export var RESET_READYTOCOMMIT_INTERVAL_MS = 20000;
 export var commitStepQueue = function commitStepQueue(_ref) {
   var broadcast = _ref.broadcast,
     steps = _ref.steps,

package/dist/esm/provider/index.js

@@ -156,7 +156,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         _this.emit('permission', permit);
       }).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', function (payload) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
-      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', /*#__PURE__*/function () {
+      }).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', /*#__PURE__*/function () {
         var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(status) {
           var isLocked;
           return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -199,6 +199,9 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         presenceActivity: _this.presenceActivity
       };
     });
+    _defineProperty(_this, "setPresenceActivity", function (activity) {
+      _this.presenceActivity = activity;
+    });
     /**
      * @param {InternalError} error The error to handle
      */
@@ -548,12 +551,11 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           this.channel.broadcast('participant:telepointer', _objectSpread(_objectSpread({}, basePayload), {}, {
             selection: data.selection
           }), shouldTelepointerBeSampled() ? telepointerCallback(this.config.documentAri) : undefined);
-        } else if ((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' || (data === null || data === void 0 ? void 0 : data.type) === 'activity:ack') {
-          this.channel.broadcast((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' ? 'participant:activity-join' : 'participant:activity-ack', _objectSpread(_objectSpread({}, basePayload), {}, {
-            activity: data.activity
-          }), activityCallback());
         } else if ((data === null || data === void 0 ? void 0 : data.type) === 'ai-provider:change') {
           this.participantsService.sendAIProviderChanged(_objectSpread(_objectSpread({}, basePayload), data));
+        } else if ((data === null || data === void 0 ? void 0 : data.type) === 'participant:activity') {
+          this.setPresenceActivity(data.activity);
+          this.participantsService.sendPresenceActivityChanged();
         }
       } catch (error) {
         var _this$analyticsHelper12;
@@ -689,21 +691,4 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       return this.namespaceService.getIsNamespaceLocked();
     }
   }]);
-}(Emitter);
-
-/**
- * Callback for handling the broadcast response of participant activity.
- * This example assumes a simple logging mechanism. It could be expanded to handle errors or other responses.
- *
- * @param activity The activity that was broadcast.
- * @returns A function that handles the response from the broadcast operation.
- */
-function activityCallback() {
-  return function (error) {
-    if (error) {
-      // Log or handle the error. This could involve retrying the broadcast or notifying the user.
-      logger('Error broadcasting participant activity:', error);
-      return;
-    }
-  };
-}
+}(Emitter);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "10.7.2";
+export var version = "10.8.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export { Provider } from './provider';
 export type { CollabEventDisconnectedData, Socket } from './types';
-export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabActivityData, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, CollabNamespaceLockCheckPayload, } from '@atlaskit/editor-common/collab';
+export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabPresenceActivityChangePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, CollabNamespaceLockCheckPayload, } from '@atlaskit/editor-common/collab';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

package/dist/types/participants/participants-service.d.ts

@@ -1,6 +1,6 @@
 import type AnalyticsHelper from '../analytics/analytics-helper';
-import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload, ActivityPayload } from '../types';
-import type { CollabActivityData, CollabEventPresenceData, CollabTelepointerPayload, ProviderParticipant, StepJson, UserPermitType } from '@atlaskit/editor-common/collab';
+import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload } from '../types';
+import type { CollabEventPresenceData, CollabTelepointerPayload, CollabPresenceActivityChangePayload, ProviderParticipant, StepJson, UserPermitType } from '@atlaskit/editor-common/collab';
 import type { GetUserType } from './participants-helper';
 import { ParticipantsState } from './participants-state';
 /**
@@ -24,7 +24,8 @@ export declare class ParticipantsService {
     private getAIProviderActiveIds?;
     private participantUpdateTimeout;
     private presenceUpdateTimeout;
-    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected' | 'activity:join' | 'activity:ack', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData | CollabActivityData) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void, getAIProviderActiveIds?: (() => string[]) | undefined);
+    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected' | 'presence:changed', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData | CollabPresenceActivityChangePayload) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void, getAIProviderActiveIds?: (() => string[]) | undefined);
+    sendPresenceActivityChanged: () => void;
     sendAIProviderChanged: (payload: {
         userId: string;
         sessionId: string;
@@ -37,6 +38,7 @@ export declare class ParticipantsService {
     private sendAIProviderParticipantUpdated;
     private sendAIProviderParticipantLeft;
     private sendAIProvidersPresence;
+    private hasPresenceActivityChanged;
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -86,19 +88,17 @@ export declare class ParticipantsService {
      * @param emit Emit function from Provider
      */
     private emitTelepointer;
+    /**
+     * Wrapper function to emit with error handling and analytics
+     * @param data Data to emit
+     * @param errorMessage Error message for analytics
+     */
+    private emitPresenceActivityChange;
     /**
      * Used when the provider is disconnected or destroyed to prevent perpetual timers from continuously running
      */
     clearTimers: () => void;
     private sendPresence;
-    /**
-     * sending new joiner's activity to existing participants
-     */
-    onParticipantActivityJoin: (payload: ActivityPayload) => void;
-    /**
-     * respond to new joiner with existing participant's activity
-     */
-    onParticipantActivityAck: (payload: ActivityPayload) => void;
     /**
      * Called when a participant joins the session.
      *

package/dist/types/provider/commit-step.d.ts

@@ -4,7 +4,7 @@ import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/trans
 import type AnalyticsHelper from '../analytics/analytics-helper';
 import type { InternalError } from '../errors/internal-errors';
 export declare let readyToCommit: boolean;
-export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
+export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 20000;
 export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, forcePublish, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;
     steps: readonly ProseMirrorStep[];

package/dist/types/provider/index.d.ts

@@ -2,7 +2,7 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { Emitter } from '../emitter';
 import type { Config } from '../types';
-import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload, CollabActivityAIProviderChangedPayload, PresenceActivity } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabPresenceActivityChangePayload, CollabActivityAIProviderChangedPayload, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { Api } from '../api/api';
 import { NullApi } from '../api/null-api';
 export declare const MAX_STEP_REJECTED_ERROR = 15;
@@ -49,6 +49,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
     private initializeChannel;
     private setUserId;
     private getPresenceData;
+    private setPresenceActivity;
     /**
      * Initialisation logic, called by Jira with a dummy getState function, deprecated in favour of the setup method which allows more configuration
      * @param {Function} getState Function that returns the editor state, used to retrieve collab-edit properties and to interact with prosemirror-collab
@@ -95,7 +96,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
      * @param {CollabSendableSelection} data.selection Object representing the selected element
      * @param {string} data.sessionId Identifier identifying the session
      */
-    sendMessage(data: CollabTelepointerPayload | CollabActivityJoinPayload | CollabActivityAckPayload | CollabActivityAIProviderChangedPayload): void;
+    sendMessage(data: CollabTelepointerPayload | CollabActivityAIProviderChangedPayload | CollabPresenceActivityChangePayload): void;
     setAIProviderActiveIds(ids?: string[]): void;
     private getAIProviderActiveIds;
     private onDisconnected;

package/dist/types/types.d.ts

@@ -4,7 +4,7 @@ import type { InternalError } from './errors/internal-errors';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { GetUserType } from './participants/participants-helper';
 import type AnalyticsHelper from './analytics/analytics-helper';
-import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity, PresenceActivity } from '@atlaskit/editor-common/collab';
+import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { type CatchupEventReason } from './helpers/const';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export interface CollabEventDisconnectedData {
@@ -123,7 +123,7 @@ export type InitPayload = {
 export type BroadcastIncomingPayload = {
     sessionId?: string;
     timestamp?: number;
-    data: PresencePayload | TelepointerPayload | StepsPayload | ActivityPayload | any;
+    data: PresencePayload | TelepointerPayload | StepsPayload | any;
 };
 export type PresenceData = {
     sessionId: string;
@@ -137,11 +137,6 @@ export type PresencePayload = PresenceData & {
     timestamp: number;
     data?: Record<string, any>;
 };
-export type ActivityPayload = {
-    userId: string | undefined;
-    activity: Activity;
-    sessionId: string;
-};
 export type TelepointerPayload = PresencePayload & {
     selection: CollabSendableSelection;
 };
@@ -182,8 +177,6 @@ export type ChannelEvent = {
     'presence:joined': PresencePayload;
     presence: PresencePayload;
     'participant:left': PresencePayload;
-    'participant:activity-join': ActivityPayload;
-    'participant:activity-ack': ActivityPayload;
     'participant:telepointer': TelepointerPayload;
     'participant:updated': PresencePayload;
     'steps:commit': StepsPayload & {

package/dist/types-ts4.5/index.d.ts

@@ -1,4 +1,4 @@
 export { Provider } from './provider';
 export type { CollabEventDisconnectedData, Socket } from './types';
-export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabActivityData, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, CollabNamespaceLockCheckPayload, } from '@atlaskit/editor-common/collab';
+export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabPresenceActivityChangePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, CollabNamespaceLockCheckPayload, } from '@atlaskit/editor-common/collab';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

package/dist/types-ts4.5/participants/participants-service.d.ts

@@ -1,6 +1,6 @@
 import type AnalyticsHelper from '../analytics/analytics-helper';
-import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload, ActivityPayload } from '../types';
-import type { CollabActivityData, CollabEventPresenceData, CollabTelepointerPayload, ProviderParticipant, StepJson, UserPermitType } from '@atlaskit/editor-common/collab';
+import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload } from '../types';
+import type { CollabEventPresenceData, CollabTelepointerPayload, CollabPresenceActivityChangePayload, ProviderParticipant, StepJson, UserPermitType } from '@atlaskit/editor-common/collab';
 import type { GetUserType } from './participants-helper';
 import { ParticipantsState } from './participants-state';
 /**
@@ -24,7 +24,8 @@ export declare class ParticipantsService {
     private getAIProviderActiveIds?;
     private participantUpdateTimeout;
     private presenceUpdateTimeout;
-    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected' | 'activity:join' | 'activity:ack', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData | CollabActivityData) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void, getAIProviderActiveIds?: (() => string[]) | undefined);
+    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected' | 'presence:changed', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData | CollabPresenceActivityChangePayload) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void, getAIProviderActiveIds?: (() => string[]) | undefined);
+    sendPresenceActivityChanged: () => void;
     sendAIProviderChanged: (payload: {
         userId: string;
         sessionId: string;
@@ -37,6 +38,7 @@ export declare class ParticipantsService {
     private sendAIProviderParticipantUpdated;
     private sendAIProviderParticipantLeft;
     private sendAIProvidersPresence;
+    private hasPresenceActivityChanged;
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -86,19 +88,17 @@ export declare class ParticipantsService {
      * @param emit Emit function from Provider
      */
     private emitTelepointer;
+    /**
+     * Wrapper function to emit with error handling and analytics
+     * @param data Data to emit
+     * @param errorMessage Error message for analytics
+     */
+    private emitPresenceActivityChange;
     /**
      * Used when the provider is disconnected or destroyed to prevent perpetual timers from continuously running
      */
     clearTimers: () => void;
     private sendPresence;
-    /**
-     * sending new joiner's activity to existing participants
-     */
-    onParticipantActivityJoin: (payload: ActivityPayload) => void;
-    /**
-     * respond to new joiner with existing participant's activity
-     */
-    onParticipantActivityAck: (payload: ActivityPayload) => void;
     /**
      * Called when a participant joins the session.
      *

package/dist/types-ts4.5/provider/commit-step.d.ts

@@ -4,7 +4,7 @@ import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/trans
 import type AnalyticsHelper from '../analytics/analytics-helper';
 import type { InternalError } from '../errors/internal-errors';
 export declare let readyToCommit: boolean;
-export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
+export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 20000;
 export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, forcePublish, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;
     steps: readonly ProseMirrorStep[];

package/dist/types-ts4.5/provider/index.d.ts

@@ -2,7 +2,7 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { Emitter } from '../emitter';
 import type { Config } from '../types';
-import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload, CollabActivityAIProviderChangedPayload, PresenceActivity } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabPresenceActivityChangePayload, CollabActivityAIProviderChangedPayload, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { Api } from '../api/api';
 import { NullApi } from '../api/null-api';
 export declare const MAX_STEP_REJECTED_ERROR = 15;
@@ -49,6 +49,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
     private initializeChannel;
     private setUserId;
     private getPresenceData;
+    private setPresenceActivity;
     /**
      * Initialisation logic, called by Jira with a dummy getState function, deprecated in favour of the setup method which allows more configuration
      * @param {Function} getState Function that returns the editor state, used to retrieve collab-edit properties and to interact with prosemirror-collab
@@ -95,7 +96,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
      * @param {CollabSendableSelection} data.selection Object representing the selected element
      * @param {string} data.sessionId Identifier identifying the session
      */
-    sendMessage(data: CollabTelepointerPayload | CollabActivityJoinPayload | CollabActivityAckPayload | CollabActivityAIProviderChangedPayload): void;
+    sendMessage(data: CollabTelepointerPayload | CollabActivityAIProviderChangedPayload | CollabPresenceActivityChangePayload): void;
     setAIProviderActiveIds(ids?: string[]): void;
     private getAIProviderActiveIds;
     private onDisconnected;

package/dist/types-ts4.5/types.d.ts

@@ -4,7 +4,7 @@ import type { InternalError } from './errors/internal-errors';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { GetUserType } from './participants/participants-helper';
 import type AnalyticsHelper from './analytics/analytics-helper';
-import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity, PresenceActivity } from '@atlaskit/editor-common/collab';
+import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { type CatchupEventReason } from './helpers/const';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export interface CollabEventDisconnectedData {
@@ -123,7 +123,7 @@ export type InitPayload = {
 export type BroadcastIncomingPayload = {
     sessionId?: string;
     timestamp?: number;
-    data: PresencePayload | TelepointerPayload | StepsPayload | ActivityPayload | any;
+    data: PresencePayload | TelepointerPayload | StepsPayload | any;
 };
 export type PresenceData = {
     sessionId: string;
@@ -137,11 +137,6 @@ export type PresencePayload = PresenceData & {
     timestamp: number;
     data?: Record<string, any>;
 };
-export type ActivityPayload = {
-    userId: string | undefined;
-    activity: Activity;
-    sessionId: string;
-};
 export type TelepointerPayload = PresencePayload & {
     selection: CollabSendableSelection;
 };
@@ -182,8 +177,6 @@ export type ChannelEvent = {
     'presence:joined': PresencePayload;
     presence: PresencePayload;
     'participant:left': PresencePayload;
-    'participant:activity-join': ActivityPayload;
-    'participant:activity-ack': ActivityPayload;
     'participant:telepointer': TelepointerPayload;
     'participant:updated': PresencePayload;
     'steps:commit': StepsPayload & {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.7.2",
+	"version": "10.8.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,13 +35,13 @@
 		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^9.0.0",
-		"@atlaskit/editor-common": "^100.0.0",
+		"@atlaskit/editor-common": "^100.4.0",
 		"@atlaskit/editor-json-transformer": "^8.23.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/feature-gate-js-client": "^4.25.0",
+		"@atlaskit/feature-gate-js-client": "^4.26.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.14.0",
-		"@atlaskit/react-ufo": "^3.0.0",
+		"@atlaskit/react-ufo": "^3.1.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/util-service-support": "^6.2.0",
 		"@babel/runtime": "^7.0.0",