@webex/plugin-meetings 3.8.1-web-workers-keepalive.1 → 3.9.0-next.1

package/dist/locus-info/index.js

@@ -11,7 +11,6 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/array/is-array"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
@@ -69,7 +68,6 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "aclUrl", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "baseSequence", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "created", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "deltaParticipants", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "identities", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "membership", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "participants", void 0);
@@ -115,6 +113,7 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
       var _this2 = this;
       var isDelta;
       var url;
+      var meetingDestroyed = false;
       if (this.locusParser.workingCopy.syncUrl) {
         url = this.locusParser.workingCopy.syncUrl;
         isDelta = true;
@@ -139,27 +138,43 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
             code: e.code
           });
           isDelta = false;
-          return meeting.meetingRequest.getLocusDTO({
-            url: meeting.locusUrl
-          }).catch(function (err) {
-            _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting');
-            _this2.webex.meetings.destroy(meeting, _constants.MEETING_REMOVED_REASON.LOCUS_DTO_SYNC_FAILED);
-            throw err;
-          });
+
+          // Locus sometimes returns 403, for example if meeting has ended, no point trying the fallback to full sync in that case
+          if (e.statusCode !== 403) {
+            return meeting.meetingRequest.getLocusDTO({
+              url: meeting.locusUrl
+            }).catch(function (err) {
+              _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting');
+              _this2.webex.meetings.destroy(meeting, _constants.MEETING_REMOVED_REASON.LOCUS_DTO_SYNC_FAILED);
+              meetingDestroyed = true;
+              throw err;
+            });
+          }
+          _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> got 403 from Locus, skipping fallback to full sync, destroying the meeting');
+        } else {
+          _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting');
         }
-        _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> fallback full sync failed, destroying the meeting');
         _this2.webex.meetings.destroy(meeting, _constants.MEETING_REMOVED_REASON.LOCUS_DTO_SYNC_FAILED);
+        meetingDestroyed = true;
         throw e;
       }).then(function (res) {
+        if ((0, _lodash.isEmpty)(res.body)) {
+          if (isDelta) {
+            _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> received empty body from syncUrl, so we already have latest Locus DTO');
+          } else {
+            _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> received empty body from full DTO sync request');
+          }
+          return;
+        }
         if (isDelta) {
-          if (!(0, _lodash.isEmpty)(res.body)) {
+          if (res.body.baseSequence) {
             meeting.locusInfo.handleLocusDelta(res.body, meeting);
-          } else {
-            _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> received empty body from syncUrl, so we already have latest Locus DTO');
+            return;
           }
-        } else {
-          meeting.locusInfo.onFullLocus(res.body);
+          // in some cases Locus might return us full DTO even when we asked for a delta
+          _loggerProxy.default.logger.info('Locus-info:index#doLocusSync --> got full DTO when we asked for delta');
         }
+        meeting.locusInfo.onFullLocus(res.body);
       }).catch(function (e) {
         _loggerProxy.default.logger.info("Locus-info:index#doLocusSync --> getLocusDTO succeeded but failed to handle result, locus parser will resume but not all data may be synced (".concat(e.toString(), ")"));
         _metrics.default.sendBehavioralMetric(_constants2.default.LOCUS_SYNC_HANDLING_FAILED, {
@@ -171,9 +186,11 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
           code: e.code
         });
       }).finally(function () {
-        // Notify parser to resume processing delta events.
-        // Any deltas in the queue that have now been superseded by this sync will simply be ignored
-        _this2.locusParser.resume();
+        if (!meetingDestroyed) {
+          // Notify parser to resume processing delta events.
+          // Any deltas in the queue that have now been superseded by this sync will simply be ignored
+          _this2.locusParser.resume();
+        }
       });
     }
 
@@ -263,16 +280,6 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
        * @property {Object} person - Contains person data.
        */
 
-      /**
-       * Stored participant changes between the last event and the current event.
-       * All previously stored events are overwritten between events.
-       *
-       * @instance
-       * @type {Array<DeltaParticipant>}
-       * @private
-       * @member LocusInfo
-       */
-      this.deltaParticipants = [];
       this.updateLocusCache(locus);
       // above section only updates the locusInfo object
       // The below section makes sure it updates the locusInfo as well as updates the meeting object
@@ -377,7 +384,6 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
         _loggerProxy.default.logger.info("Locus-info:index#onFullLocus --> ignoring old full locus DTO, eventType=".concat(eventType));
         return;
       }
-      this.updateParticipantDeltas(locus.participants);
       this.scheduledMeeting = locus.meeting || null;
       this.participants = locus.participants;
       var isReplaceMembers = _controlsUtils.default.isNeedReplaceMembers(this.controls, locus.controls);
@@ -461,12 +467,12 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
       this.updateCreated(locus.created);
       this.updateFullState(locus.fullState);
       this.updateHostInfo(locus.host);
+      this.updateLocusUrl(locus.url);
       this.updateMeetingInfo(locus.info, locus.self);
       this.updateMediaShares(locus.mediaShares);
       this.updateParticipantsUrl(locus.participantsUrl);
       this.updateReplace(locus.replace);
       this.updateSelf(locus.self);
-      this.updateLocusUrl(locus.url);
       this.updateAclUrl(locus.aclUrl);
       this.updateBasequence(locus.baseSequence);
       this.updateSequence(locus.sequence);
@@ -668,58 +674,6 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
       }
     }
 
-    /**
-     * Update the deltaParticipants property of this object based on a list of
-     * provided participants.
-     *
-     * @param {Array} [participants] - The participants to update against.
-     * @returns {void}
-     */
-  }, {
-    key: "updateParticipantDeltas",
-    value: function updateParticipantDeltas() {
-      var _this4 = this;
-      var participants = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      // Used to find a participant within a participants collection.
-      var findParticipant = function findParticipant(participant, collection) {
-        return collection.find(function (item) {
-          return item.person.id === participant.person.id;
-        });
-      };
-
-      // Generates an object that indicates which state properties have changed.
-      var generateDelta = function generateDelta() {
-        var prevState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        var newState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        // Setup deltas.
-        var deltas = {
-          audioStatus: prevState.audioStatus !== newState.audioStatus,
-          videoSlidesStatus: prevState.videoSlidesStatus !== newState.videoSlidesStatus,
-          videoStatus: prevState.videoStatus !== newState.videoStatus
-        };
-
-        // Clean the object
-        (0, _keys.default)(deltas).forEach(function (key) {
-          if (deltas[key] !== true) {
-            delete deltas[key];
-          }
-        });
-        return deltas;
-      };
-      this.deltaParticipants = participants.reduce(function (collection, participant) {
-        var existingParticipant = findParticipant(participant, _this4.participants || []) || {};
-        var delta = generateDelta(existingParticipant.status, participant.status);
-        var changed = (0, _keys.default)(delta).length > 0;
-        if (changed) {
-          collection.push({
-            person: participant.person,
-            delta: delta
-          });
-        }
-        return collection;
-      }, []);
-    }
-
     /**
      * update meeting's members
      * @param {Object} participants new participants object
@@ -1175,7 +1129,7 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
     value: function updateMeetingInfo(info, self) {
       var _this$parsedLocus$sel;
       var roles = self ? _selfUtils.default.getRoles(self) : ((_this$parsedLocus$sel = this.parsedLocus.self) === null || _this$parsedLocus$sel === void 0 ? void 0 : _this$parsedLocus$sel.roles) || [];
-      if (info && !(0, _lodash.isEqual)(this.info, info) || roles.length && !(0, _lodash.isEqual)(this.roles, roles) && info) {
+      if (info && !(0, _lodash.isEqual)(this.info, info) || !(0, _lodash.isEqual)(this.roles, roles) && info) {
         var isJoined = _selfUtils.default.isJoined(self || this.parsedLocus.self);
         var parsedInfo = _infoUtils.default.getInfos(this.parsedLocus.info, info, roles, isJoined);
         if (parsedInfo.updates.isLocked) {
@@ -1637,7 +1591,7 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
   }, {
     key: "updateMainSessionLocusCache",
     value: function updateMainSessionLocusCache(mainLocus) {
-      var _this5 = this;
+      var _this4 = this;
       if (!mainLocus) {
         return;
       }
@@ -1646,7 +1600,7 @@ var LocusInfo = exports.default = /*#__PURE__*/function (_EventsScope) {
         // shallow merge and do special merge for participants
         (0, _lodash.assignWith)(this.mainSessionLocusCache, locusClone, function (objValue, srcValue, key) {
           if (key === 'participants') {
-            return _this5.mergeParticipants(objValue, srcValue);
+            return _this4.mergeParticipants(objValue, srcValue);
           }
           return srcValue || objValue;
         });