@webex/plugin-meetings 3.0.0-beta.65 → 3.0.0-beta.66

package/dist/breakouts/breakout.js

@@ -130,7 +130,7 @@ var Breakout = _webexCore.WebexPlugin.extend({
       sessionId: this.sessionId
     });
   },
-  version: "3.0.0-beta.65"
+  version: "3.0.0-beta.66"
 });
 var _default = Breakout;
 exports.default = _default;

package/dist/breakouts/index.js

@@ -761,7 +761,7 @@ var Breakouts = _webexCore.WebexPlugin.extend({
       body: body
     });
   },
-  version: "3.0.0-beta.65"
+  version: "3.0.0-beta.66"
 });
 var _default = Breakouts;
 exports.default = _default;

package/dist/multistream/mediaRequestManager.js

@@ -7,11 +7,13 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.MediaRequestManager = void 0;
 var _entries = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/entries"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
+var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
 var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
 var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _internalMediaCore = require("@webex/internal-media-core");
@@ -37,6 +39,7 @@ var MediaRequestManager = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "degradationPreferences", void 0);
     (0, _defineProperty2.default)(this, "sourceUpdateListener", void 0);
     (0, _defineProperty2.default)(this, "debouncedSourceUpdateListener", void 0);
+    (0, _defineProperty2.default)(this, "previousWCMEMediaRequests", []);
     this.sendMediaRequestsCallback = sendMediaRequestsCallback;
     this.counter = 0;
     this.clientRequests = {};
@@ -88,6 +91,36 @@ var MediaRequestManager = /*#__PURE__*/function () {
       }
       return clientRequests;
     }
+
+    /**
+     * Returns true if two media requests are the same, false otherwise.
+     *
+     * @param {WcmeMediaRequest} mediaRequestA - Media request A for comparison.
+     * @param {WcmeMediaRequest} mediaRequestB - Media request B for comparison.
+     * @returns {boolean} - Whether they are equal.
+     */
+    // eslint-disable-next-line class-methods-use-this
+  }, {
+    key: "isEqual",
+    value: function isEqual(mediaRequestA, mediaRequestB) {
+      return (0, _stringify.default)(mediaRequestA._toJmpScrRequest()) === (0, _stringify.default)(mediaRequestB._toJmpScrRequest());
+    }
+
+    /**
+     * Compares new media requests to previous ones and determines
+     * if they are the same.
+     *
+     * @param {WcmeMediaRequest[]} newRequests - Array with new requests.
+     * @returns {boolean} - True if they are equal, false otherwise.
+     */
+  }, {
+    key: "checkIsNewRequestsEqualToPrev",
+    value: function checkIsNewRequestsEqualToPrev(newRequests) {
+      var _this2 = this;
+      return !(0, _isEmpty2.default)(this.previousWCMEMediaRequests) && this.previousWCMEMediaRequests.length === newRequests.length && this.previousWCMEMediaRequests.every(function (req, idx) {
+        return _this2.isEqual(req, newRequests[idx]);
+      });
+    }
   }, {
     key: "sendRequests",
     value: function sendRequests() {
@@ -101,22 +134,31 @@ var MediaRequestManager = /*#__PURE__*/function () {
           return receiveSlot.wcmeReceiveSlot;
         }), maxPayloadBitsPerSecond, mr.codecInfo && [new _internalMediaCore.CodecInfo(0x80, new _internalMediaCore.H264Codec(mr.codecInfo.maxFs, mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps, mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps, mr.codecInfo.maxWidth, mr.codecInfo.maxHeight))]));
       });
-      this.sendMediaRequestsCallback(wcmeMediaRequests);
+
+      //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/jmp-multistream)
+      // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713
+      if (!this.checkIsNewRequestsEqualToPrev(wcmeMediaRequests)) {
+        this.sendMediaRequestsCallback(wcmeMediaRequests);
+        this.previousWCMEMediaRequests = wcmeMediaRequests;
+        _loggerProxy.default.logger.info("multistream:sendRequests --> media requests sent. ");
+      } else {
+        _loggerProxy.default.logger.info("multistream:sendRequests --> detected duplicate WCME requests, skipping them... ");
+      }
     }
   }, {
     key: "addRequest",
     value: function addRequest(mediaRequest) {
-      var _this2 = this;
+      var _this3 = this;
       var commit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       // eslint-disable-next-line no-plusplus
       var newId = "".concat(this.counter++);
       this.clientRequests[newId] = mediaRequest;
       mediaRequest.receiveSlots.forEach(function (rs) {
-        rs.on(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this2.sourceUpdateListener);
+        rs.on(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this3.sourceUpdateListener);
         rs.on(_receiveSlot.ReceiveSlotEvents.MaxFsUpdate, function (_ref3) {
           var maxFs = _ref3.maxFs;
           mediaRequest.preferredMaxFs = maxFs;
-          _this2.debouncedSourceUpdateListener();
+          _this3.debouncedSourceUpdateListener();
         });
       });
       if (commit) {
@@ -128,10 +170,10 @@ var MediaRequestManager = /*#__PURE__*/function () {
     key: "cancelRequest",
     value: function cancelRequest(requestId) {
       var _this$clientRequests$,
-        _this3 = this;
+        _this4 = this;
       var commit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       (_this$clientRequests$ = this.clientRequests[requestId]) === null || _this$clientRequests$ === void 0 ? void 0 : _this$clientRequests$.receiveSlots.forEach(function (rs) {
-        rs.off(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this3.sourceUpdateListener);
+        rs.off(_receiveSlot.ReceiveSlotEvents.SourceUpdate, _this4.sourceUpdateListener);
       });
       delete this.clientRequests[requestId];
       if (commit) {

package/dist/multistream/mediaRequestManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["CODEC_DEFAULTS","h264","maxFs","maxFps","maxMbps","DEBOUNCED_SOURCE_UPDATE_TIME","MediaRequestManager","degradationPreferences","sendMediaRequestsCallback","counter","clientRequests","sourceUpdateListener","commit","bind","debouncedSourceUpdateListener","sendRequests","maxFsLimits","getMaxFs","totalMacroblocksRequested","forEach","id","mr","codecInfo","Math","min","preferredMaxFs","i","slotsWithLiveSource","receiveSlots","filter","rs","sourceState","length","maxMacroblocksLimit","LoggerProxy","logger","warn","wcmeMediaRequests","getDegradedClientRequests","maxPayloadBitsPerSecond","push","WcmeMediaRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","WcmeCodecInfo","H264Codec","maxWidth","maxHeight","mediaRequest","newId","on","ReceiveSlotEvents","SourceUpdate","MaxFsUpdate","requestId","off"],"sources":["mediaRequestManager.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\nimport {\n  MediaRequest as WcmeMediaRequest,\n  Policy,\n  ActiveSpeakerInfo,\n  ReceiverSelectedInfo,\n  CodecInfo as WcmeCodecInfo,\n  H264Codec,\n} from '@webex/internal-media-core';\nimport {cloneDeep, debounce} from 'lodash';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nimport {ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId} from './receiveSlot';\nimport {getMaxFs} from './remoteMedia';\n\nexport interface ActiveSpeakerPolicyInfo {\n  policy: 'active-speaker';\n  priority: number;\n  crossPriorityDuplication: boolean;\n  crossPolicyDuplication: boolean;\n  preferLiveVideo: boolean;\n}\n\nexport interface ReceiverSelectedPolicyInfo {\n  policy: 'receiver-selected';\n  csi: number;\n}\n\nexport type PolicyInfo = ActiveSpeakerPolicyInfo | ReceiverSelectedPolicyInfo;\n\nexport interface H264CodecInfo {\n  codec: 'h264';\n  maxFs?: number;\n  maxFps?: number;\n  maxMbps?: number;\n  maxWidth?: number;\n  maxHeight?: number;\n}\n\nexport type CodecInfo = H264CodecInfo; // we'll add AV1 here in the future when it's available\n\nexport interface MediaRequest {\n  policyInfo: PolicyInfo;\n  receiveSlots: Array<ReceiveSlot>;\n  codecInfo?: CodecInfo;\n  preferredMaxFs?: number;\n}\n\nexport type MediaRequestId = string;\n\nconst CODEC_DEFAULTS = {\n  h264: {\n    maxFs: 8192,\n    maxFps: 3000,\n    maxMbps: 245760,\n  },\n};\n\nconst DEBOUNCED_SOURCE_UPDATE_TIME = 1000;\n\ntype DegradationPreferences = {\n  maxMacroblocksLimit: number;\n};\n\ntype SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;\n\nexport class MediaRequestManager {\n  private sendMediaRequestsCallback: SendMediaRequestsCallback;\n\n  private counter: number;\n\n  private clientRequests: {[key: MediaRequestId]: MediaRequest};\n\n  private degradationPreferences: DegradationPreferences;\n\n  private sourceUpdateListener: () => void;\n\n  private debouncedSourceUpdateListener: () => void;\n\n  constructor(\n    degradationPreferences: DegradationPreferences,\n    sendMediaRequestsCallback: SendMediaRequestsCallback\n  ) {\n    this.sendMediaRequestsCallback = sendMediaRequestsCallback;\n    this.counter = 0;\n    this.clientRequests = {};\n    this.degradationPreferences = degradationPreferences;\n    this.sourceUpdateListener = this.commit.bind(this);\n    this.debouncedSourceUpdateListener = debounce(\n      this.sourceUpdateListener,\n      DEBOUNCED_SOURCE_UPDATE_TIME\n    );\n  }\n\n  public setDegradationPreferences(degradationPreferences: DegradationPreferences) {\n    this.degradationPreferences = degradationPreferences;\n    this.sendRequests(); // re-send requests after preferences are set\n  }\n\n  private getDegradedClientRequests() {\n    const clientRequests = cloneDeep(this.clientRequests);\n    const maxFsLimits = [\n      getMaxFs('best'),\n      getMaxFs('large'),\n      getMaxFs('medium'),\n      getMaxFs('small'),\n      getMaxFs('very small'),\n      getMaxFs('thumbnail'),\n    ];\n\n    // reduce max-fs until total macroblocks is below limit\n    for (let i = 0; i < maxFsLimits.length; i += 1) {\n      let totalMacroblocksRequested = 0;\n      Object.entries(clientRequests).forEach(([id, mr]) => {\n        if (mr.codecInfo) {\n          mr.codecInfo.maxFs = Math.min(\n            mr.preferredMaxFs || CODEC_DEFAULTS.h264.maxFs,\n            mr.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs,\n            maxFsLimits[i]\n          );\n          // we only consider sources with \"live\" state\n          const slotsWithLiveSource = this.clientRequests[id].receiveSlots.filter(\n            (rs) => rs.sourceState === 'live'\n          );\n          totalMacroblocksRequested += mr.codecInfo.maxFs * slotsWithLiveSource.length;\n        }\n      });\n      if (totalMacroblocksRequested <= this.degradationPreferences.maxMacroblocksLimit) {\n        if (i !== 0) {\n          LoggerProxy.logger.warn(\n            `multistream:mediaRequestManager --> too many streams with high max-fs, frame size will be limited to ${maxFsLimits[i]}`\n          );\n        }\n        break;\n      } else if (i === maxFsLimits.length - 1) {\n        LoggerProxy.logger.warn(\n          `multistream:mediaRequestManager --> even with frame size limited to ${maxFsLimits[i]} you are still requesting too many streams, consider reducing the number of requests`\n        );\n      }\n    }\n\n    return clientRequests;\n  }\n\n  private sendRequests() {\n    const wcmeMediaRequests: WcmeMediaRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\n    const maxPayloadBitsPerSecond = 10 * 1000 * 1000;\n\n    // map all the client media requests to wcme media requests\n    Object.values(clientRequests).forEach((mr) => {\n      wcmeMediaRequests.push(\n        new WcmeMediaRequest(\n          mr.policyInfo.policy === 'active-speaker'\n            ? Policy.ActiveSpeaker\n            : Policy.ReceiverSelected,\n          mr.policyInfo.policy === 'active-speaker'\n            ? new ActiveSpeakerInfo(\n                mr.policyInfo.priority,\n                mr.policyInfo.crossPriorityDuplication,\n                mr.policyInfo.crossPolicyDuplication,\n                mr.policyInfo.preferLiveVideo\n              )\n            : new ReceiverSelectedInfo(mr.policyInfo.csi),\n          mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),\n          maxPayloadBitsPerSecond,\n          mr.codecInfo && [\n            new WcmeCodecInfo(\n              0x80,\n              new H264Codec(\n                mr.codecInfo.maxFs,\n                mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,\n                mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps,\n                mr.codecInfo.maxWidth,\n                mr.codecInfo.maxHeight\n              )\n            ),\n          ]\n        )\n      );\n    });\n\n    this.sendMediaRequestsCallback(wcmeMediaRequests);\n  }\n\n  public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {\n    // eslint-disable-next-line no-plusplus\n    const newId = `${this.counter++}`;\n\n    this.clientRequests[newId] = mediaRequest;\n\n    mediaRequest.receiveSlots.forEach((rs) => {\n      rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n      rs.on(ReceiveSlotEvents.MaxFsUpdate, ({maxFs}) => {\n        mediaRequest.preferredMaxFs = maxFs;\n        this.debouncedSourceUpdateListener();\n      });\n    });\n\n    if (commit) {\n      this.commit();\n    }\n\n    return newId;\n  }\n\n  public cancelRequest(requestId: MediaRequestId, commit = true) {\n    this.clientRequests[requestId]?.receiveSlots.forEach((rs) => {\n      rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n    });\n\n    delete this.clientRequests[requestId];\n\n    if (commit) {\n      this.commit();\n    }\n  }\n\n  public commit() {\n    return this.sendRequests();\n  }\n\n  public reset() {\n    this.clientRequests = {};\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["CODEC_DEFAULTS","h264","maxFs","maxFps","maxMbps","DEBOUNCED_SOURCE_UPDATE_TIME","MediaRequestManager","degradationPreferences","sendMediaRequestsCallback","counter","clientRequests","sourceUpdateListener","commit","bind","debouncedSourceUpdateListener","sendRequests","maxFsLimits","getMaxFs","totalMacroblocksRequested","forEach","id","mr","codecInfo","Math","min","preferredMaxFs","i","slotsWithLiveSource","receiveSlots","filter","rs","sourceState","length","maxMacroblocksLimit","LoggerProxy","logger","warn","mediaRequestA","mediaRequestB","_toJmpScrRequest","newRequests","previousWCMEMediaRequests","every","req","idx","isEqual","wcmeMediaRequests","getDegradedClientRequests","maxPayloadBitsPerSecond","push","WcmeMediaRequest","policyInfo","policy","Policy","ActiveSpeaker","ReceiverSelected","ActiveSpeakerInfo","priority","crossPriorityDuplication","crossPolicyDuplication","preferLiveVideo","ReceiverSelectedInfo","csi","map","receiveSlot","wcmeReceiveSlot","WcmeCodecInfo","H264Codec","maxWidth","maxHeight","checkIsNewRequestsEqualToPrev","info","mediaRequest","newId","on","ReceiveSlotEvents","SourceUpdate","MaxFsUpdate","requestId","off"],"sources":["mediaRequestManager.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\nimport {\n  MediaRequest as WcmeMediaRequest,\n  Policy,\n  ActiveSpeakerInfo,\n  ReceiverSelectedInfo,\n  CodecInfo as WcmeCodecInfo,\n  H264Codec,\n} from '@webex/internal-media-core';\nimport {cloneDeep, debounce, isEmpty} from 'lodash';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nimport {ReceiveSlot, ReceiveSlotEvents} from './receiveSlot';\nimport {getMaxFs} from './remoteMedia';\n\nexport interface ActiveSpeakerPolicyInfo {\n  policy: 'active-speaker';\n  priority: number;\n  crossPriorityDuplication: boolean;\n  crossPolicyDuplication: boolean;\n  preferLiveVideo: boolean;\n}\n\nexport interface ReceiverSelectedPolicyInfo {\n  policy: 'receiver-selected';\n  csi: number;\n}\n\nexport type PolicyInfo = ActiveSpeakerPolicyInfo | ReceiverSelectedPolicyInfo;\n\nexport interface H264CodecInfo {\n  codec: 'h264';\n  maxFs?: number;\n  maxFps?: number;\n  maxMbps?: number;\n  maxWidth?: number;\n  maxHeight?: number;\n}\n\nexport type CodecInfo = H264CodecInfo; // we'll add AV1 here in the future when it's available\n\nexport interface MediaRequest {\n  policyInfo: PolicyInfo;\n  receiveSlots: Array<ReceiveSlot>;\n  codecInfo?: CodecInfo;\n  preferredMaxFs?: number;\n}\n\nexport type MediaRequestId = string;\n\nconst CODEC_DEFAULTS = {\n  h264: {\n    maxFs: 8192,\n    maxFps: 3000,\n    maxMbps: 245760,\n  },\n};\n\nconst DEBOUNCED_SOURCE_UPDATE_TIME = 1000;\n\ntype DegradationPreferences = {\n  maxMacroblocksLimit: number;\n};\n\ntype SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;\n\nexport class MediaRequestManager {\n  private sendMediaRequestsCallback: SendMediaRequestsCallback;\n\n  private counter: number;\n\n  private clientRequests: {[key: MediaRequestId]: MediaRequest};\n\n  private degradationPreferences: DegradationPreferences;\n\n  private sourceUpdateListener: () => void;\n\n  private debouncedSourceUpdateListener: () => void;\n\n  private previousWCMEMediaRequests: Array<WcmeMediaRequest> = [];\n\n  constructor(\n    degradationPreferences: DegradationPreferences,\n    sendMediaRequestsCallback: SendMediaRequestsCallback\n  ) {\n    this.sendMediaRequestsCallback = sendMediaRequestsCallback;\n    this.counter = 0;\n    this.clientRequests = {};\n    this.degradationPreferences = degradationPreferences;\n    this.sourceUpdateListener = this.commit.bind(this);\n    this.debouncedSourceUpdateListener = debounce(\n      this.sourceUpdateListener,\n      DEBOUNCED_SOURCE_UPDATE_TIME\n    );\n  }\n\n  public setDegradationPreferences(degradationPreferences: DegradationPreferences) {\n    this.degradationPreferences = degradationPreferences;\n    this.sendRequests(); // re-send requests after preferences are set\n  }\n\n  private getDegradedClientRequests() {\n    const clientRequests = cloneDeep(this.clientRequests);\n    const maxFsLimits = [\n      getMaxFs('best'),\n      getMaxFs('large'),\n      getMaxFs('medium'),\n      getMaxFs('small'),\n      getMaxFs('very small'),\n      getMaxFs('thumbnail'),\n    ];\n\n    // reduce max-fs until total macroblocks is below limit\n    for (let i = 0; i < maxFsLimits.length; i += 1) {\n      let totalMacroblocksRequested = 0;\n      Object.entries(clientRequests).forEach(([id, mr]) => {\n        if (mr.codecInfo) {\n          mr.codecInfo.maxFs = Math.min(\n            mr.preferredMaxFs || CODEC_DEFAULTS.h264.maxFs,\n            mr.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs,\n            maxFsLimits[i]\n          );\n          // we only consider sources with \"live\" state\n          const slotsWithLiveSource = this.clientRequests[id].receiveSlots.filter(\n            (rs) => rs.sourceState === 'live'\n          );\n          totalMacroblocksRequested += mr.codecInfo.maxFs * slotsWithLiveSource.length;\n        }\n      });\n      if (totalMacroblocksRequested <= this.degradationPreferences.maxMacroblocksLimit) {\n        if (i !== 0) {\n          LoggerProxy.logger.warn(\n            `multistream:mediaRequestManager --> too many streams with high max-fs, frame size will be limited to ${maxFsLimits[i]}`\n          );\n        }\n        break;\n      } else if (i === maxFsLimits.length - 1) {\n        LoggerProxy.logger.warn(\n          `multistream:mediaRequestManager --> even with frame size limited to ${maxFsLimits[i]} you are still requesting too many streams, consider reducing the number of requests`\n        );\n      }\n    }\n\n    return clientRequests;\n  }\n\n  /**\n   * Returns true if two media requests are the same, false otherwise.\n   *\n   * @param {WcmeMediaRequest} mediaRequestA - Media request A for comparison.\n   * @param {WcmeMediaRequest} mediaRequestB - Media request B for comparison.\n   * @returns {boolean} - Whether they are equal.\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public isEqual(mediaRequestA: WcmeMediaRequest, mediaRequestB: WcmeMediaRequest) {\n    return (\n      JSON.stringify(mediaRequestA._toJmpScrRequest()) ===\n      JSON.stringify(mediaRequestB._toJmpScrRequest())\n    );\n  }\n\n  /**\n   * Compares new media requests to previous ones and determines\n   * if they are the same.\n   *\n   * @param {WcmeMediaRequest[]} newRequests - Array with new requests.\n   * @returns {boolean} - True if they are equal, false otherwise.\n   */\n  private checkIsNewRequestsEqualToPrev(newRequests: WcmeMediaRequest[]) {\n    return (\n      !isEmpty(this.previousWCMEMediaRequests) &&\n      this.previousWCMEMediaRequests.length === newRequests.length &&\n      this.previousWCMEMediaRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))\n    );\n  }\n\n  private sendRequests() {\n    const wcmeMediaRequests: WcmeMediaRequest[] = [];\n\n    const clientRequests = this.getDegradedClientRequests();\n    const maxPayloadBitsPerSecond = 10 * 1000 * 1000;\n\n    // map all the client media requests to wcme media requests\n    Object.values(clientRequests).forEach((mr) => {\n      wcmeMediaRequests.push(\n        new WcmeMediaRequest(\n          mr.policyInfo.policy === 'active-speaker'\n            ? Policy.ActiveSpeaker\n            : Policy.ReceiverSelected,\n          mr.policyInfo.policy === 'active-speaker'\n            ? new ActiveSpeakerInfo(\n                mr.policyInfo.priority,\n                mr.policyInfo.crossPriorityDuplication,\n                mr.policyInfo.crossPolicyDuplication,\n                mr.policyInfo.preferLiveVideo\n              )\n            : new ReceiverSelectedInfo(mr.policyInfo.csi),\n          mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),\n          maxPayloadBitsPerSecond,\n          mr.codecInfo && [\n            new WcmeCodecInfo(\n              0x80,\n              new H264Codec(\n                mr.codecInfo.maxFs,\n                mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,\n                mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps,\n                mr.codecInfo.maxWidth,\n                mr.codecInfo.maxHeight\n              )\n            ),\n          ]\n        )\n      );\n    });\n\n    //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/jmp-multistream)\n    // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713\n    if (!this.checkIsNewRequestsEqualToPrev(wcmeMediaRequests)) {\n      this.sendMediaRequestsCallback(wcmeMediaRequests);\n      this.previousWCMEMediaRequests = wcmeMediaRequests;\n      LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);\n    } else {\n      LoggerProxy.logger.info(\n        `multistream:sendRequests --> detected duplicate WCME requests, skipping them... `\n      );\n    }\n  }\n\n  public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {\n    // eslint-disable-next-line no-plusplus\n    const newId = `${this.counter++}`;\n\n    this.clientRequests[newId] = mediaRequest;\n\n    mediaRequest.receiveSlots.forEach((rs) => {\n      rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n      rs.on(ReceiveSlotEvents.MaxFsUpdate, ({maxFs}) => {\n        mediaRequest.preferredMaxFs = maxFs;\n        this.debouncedSourceUpdateListener();\n      });\n    });\n\n    if (commit) {\n      this.commit();\n    }\n\n    return newId;\n  }\n\n  public cancelRequest(requestId: MediaRequestId, commit = true) {\n    this.clientRequests[requestId]?.receiveSlots.forEach((rs) => {\n      rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);\n    });\n\n    delete this.clientRequests[requestId];\n\n    if (commit) {\n      this.commit();\n    }\n  }\n\n  public commit() {\n    return this.sendRequests();\n  }\n\n  public reset() {\n    this.clientRequests = {};\n  }\n}\n"],"mappings":"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"}

package/dist/types/multistream/mediaRequestManager.d.ts

@@ -39,9 +39,26 @@ export declare class MediaRequestManager {
     private degradationPreferences;
     private sourceUpdateListener;
     private debouncedSourceUpdateListener;
+    private previousWCMEMediaRequests;
     constructor(degradationPreferences: DegradationPreferences, sendMediaRequestsCallback: SendMediaRequestsCallback);
     setDegradationPreferences(degradationPreferences: DegradationPreferences): void;
     private getDegradedClientRequests;
+    /**
+     * Returns true if two media requests are the same, false otherwise.
+     *
+     * @param {WcmeMediaRequest} mediaRequestA - Media request A for comparison.
+     * @param {WcmeMediaRequest} mediaRequestB - Media request B for comparison.
+     * @returns {boolean} - Whether they are equal.
+     */
+    isEqual(mediaRequestA: WcmeMediaRequest, mediaRequestB: WcmeMediaRequest): boolean;
+    /**
+     * Compares new media requests to previous ones and determines
+     * if they are the same.
+     *
+     * @param {WcmeMediaRequest[]} newRequests - Array with new requests.
+     * @returns {boolean} - True if they are equal, false otherwise.
+     */
+    private checkIsNewRequestsEqualToPrev;
     private sendRequests;
     addRequest(mediaRequest: MediaRequest, commit?: boolean): MediaRequestId;
     cancelRequest(requestId: MediaRequestId, commit?: boolean): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.65",
+  "version": "3.0.0-beta.66",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.65",
-    "@webex/test-helper-chai": "3.0.0-beta.65",
-    "@webex/test-helper-mocha": "3.0.0-beta.65",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.65",
-    "@webex/test-helper-retry": "3.0.0-beta.65",
-    "@webex/test-helper-test-users": "3.0.0-beta.65",
+    "@webex/plugin-meetings": "3.0.0-beta.66",
+    "@webex/test-helper-chai": "3.0.0-beta.66",
+    "@webex/test-helper-mocha": "3.0.0-beta.66",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.66",
+    "@webex/test-helper-retry": "3.0.0-beta.66",
+    "@webex/test-helper-test-users": "3.0.0-beta.66",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,18 +46,18 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.65",
+    "@webex/common": "3.0.0-beta.66",
     "@webex/internal-media-core": "1.35.7",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.65",
-    "@webex/internal-plugin-device": "3.0.0-beta.65",
-    "@webex/internal-plugin-llm": "3.0.0-beta.65",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.65",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.65",
-    "@webex/internal-plugin-support": "3.0.0-beta.65",
-    "@webex/internal-plugin-user": "3.0.0-beta.65",
-    "@webex/plugin-people": "3.0.0-beta.65",
-    "@webex/plugin-rooms": "3.0.0-beta.65",
-    "@webex/webex-core": "3.0.0-beta.65",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.66",
+    "@webex/internal-plugin-device": "3.0.0-beta.66",
+    "@webex/internal-plugin-llm": "3.0.0-beta.66",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.66",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.66",
+    "@webex/internal-plugin-support": "3.0.0-beta.66",
+    "@webex/internal-plugin-user": "3.0.0-beta.66",
+    "@webex/plugin-people": "3.0.0-beta.66",
+    "@webex/plugin-rooms": "3.0.0-beta.66",
+    "@webex/webex-core": "3.0.0-beta.66",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/multistream/mediaRequestManager.ts

@@ -7,11 +7,11 @@ import {
   CodecInfo as WcmeCodecInfo,
   H264Codec,
 } from '@webex/internal-media-core';
-import {cloneDeep, debounce} from 'lodash';
+import {cloneDeep, debounce, isEmpty} from 'lodash';
 
 import LoggerProxy from '../common/logs/logger-proxy';
 
-import {ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId} from './receiveSlot';
+import {ReceiveSlot, ReceiveSlotEvents} from './receiveSlot';
 import {getMaxFs} from './remoteMedia';
 
 export interface ActiveSpeakerPolicyInfo {
@@ -78,6 +78,8 @@ export class MediaRequestManager {
 
   private debouncedSourceUpdateListener: () => void;
 
+  private previousWCMEMediaRequests: Array<WcmeMediaRequest> = [];
+
   constructor(
     degradationPreferences: DegradationPreferences,
     sendMediaRequestsCallback: SendMediaRequestsCallback
@@ -143,6 +145,36 @@ export class MediaRequestManager {
     return clientRequests;
   }
 
+  /**
+   * Returns true if two media requests are the same, false otherwise.
+   *
+   * @param {WcmeMediaRequest} mediaRequestA - Media request A for comparison.
+   * @param {WcmeMediaRequest} mediaRequestB - Media request B for comparison.
+   * @returns {boolean} - Whether they are equal.
+   */
+  // eslint-disable-next-line class-methods-use-this
+  public isEqual(mediaRequestA: WcmeMediaRequest, mediaRequestB: WcmeMediaRequest) {
+    return (
+      JSON.stringify(mediaRequestA._toJmpScrRequest()) ===
+      JSON.stringify(mediaRequestB._toJmpScrRequest())
+    );
+  }
+
+  /**
+   * Compares new media requests to previous ones and determines
+   * if they are the same.
+   *
+   * @param {WcmeMediaRequest[]} newRequests - Array with new requests.
+   * @returns {boolean} - True if they are equal, false otherwise.
+   */
+  private checkIsNewRequestsEqualToPrev(newRequests: WcmeMediaRequest[]) {
+    return (
+      !isEmpty(this.previousWCMEMediaRequests) &&
+      this.previousWCMEMediaRequests.length === newRequests.length &&
+      this.previousWCMEMediaRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))
+    );
+  }
+
   private sendRequests() {
     const wcmeMediaRequests: WcmeMediaRequest[] = [];
 
@@ -182,7 +214,17 @@ export class MediaRequestManager {
       );
     });
 
-    this.sendMediaRequestsCallback(wcmeMediaRequests);
+    //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/jmp-multistream)
+    // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713
+    if (!this.checkIsNewRequestsEqualToPrev(wcmeMediaRequests)) {
+      this.sendMediaRequestsCallback(wcmeMediaRequests);
+      this.previousWCMEMediaRequests = wcmeMediaRequests;
+      LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);
+    } else {
+      LoggerProxy.logger.info(
+        `multistream:sendRequests --> detected duplicate WCME requests, skipping them... `
+      );
+    }
   }
 
   public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {

package/test/unit/spec/multistream/mediaRequestManager.ts

@@ -552,28 +552,28 @@ describe('MediaRequestManager', () => {
     ]);
   });
 
-  it('clears all the requests on reset()', () => {
+  it('avoids sending duplicate requests and clears all the requests on reset()', () => {
     // send some requests and commit them one by one
-    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, true);
-    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, true);
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, false);
+    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, false);
     addActiveSpeakerRequest(
       255,
       [fakeReceiveSlots[2], fakeReceiveSlots[3], fakeReceiveSlots[4]],
       ACTIVE_SPEAKER_MAX_FS,
-      true
+      false
     );
     addActiveSpeakerRequest(
       254,
       [fakeReceiveSlots[5], fakeReceiveSlots[6], fakeReceiveSlots[7]],
       ACTIVE_SPEAKER_MAX_FS,
-      true
+      false
     );
 
-    sendMediaRequestsCallback.resetHistory();
+    // nothing should be sent out as we didn't commit the requests
+    assert.notCalled(sendMediaRequestsCallback);
 
-    // check that when calling commit() all requests are re-sent again
-    mediaRequestManager.commit();
 
+    mediaRequestManager.commit();
     checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
@@ -601,6 +601,13 @@ describe('MediaRequestManager', () => {
       },
     ]);
 
+
+    // check that when calling commit()
+    // all requests are not re-sent again (avoid duplicate requests)
+    mediaRequestManager.commit();
+
+    assert.notCalled(sendMediaRequestsCallback);
+
     // now reset everything
     mediaRequestManager.reset();
 
@@ -609,6 +616,46 @@ describe('MediaRequestManager', () => {
     checkMediaRequestsSent([]);
   });
 
+  it('makes sure to call requests correctly after reset was called and another request was added', () => {
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, false);
+
+    assert.notCalled(sendMediaRequestsCallback);
+
+
+    mediaRequestManager.commit();
+    checkMediaRequestsSent([
+      {
+        policy: 'receiver-selected',
+        csi: 1500,
+        receiveSlot: fakeWcmeSlots[0],
+        maxFs: RECEIVER_SELECTED_MAX_FS,
+      },
+    ]);
+
+    // now reset everything
+    mediaRequestManager.reset();
+
+     // calling commit now should not cause any requests to be sent out
+     mediaRequestManager.commit();
+     checkMediaRequestsSent([]);
+
+     //add new request
+    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, false);
+
+    // commit
+    mediaRequestManager.commit();
+
+    // check the new request was sent
+    checkMediaRequestsSent([
+      {
+        policy: 'receiver-selected',
+        csi: 1501,
+        receiveSlot: fakeWcmeSlots[1],
+        maxFs: RECEIVER_SELECTED_MAX_FS,
+      },
+    ])
+  })
+
   it('re-sends media requests after degradation preferences are set', () => {
     // set max macroblocks limit
     mediaRequestManager.setDegradationPreferences({maxMacroblocksLimit: 32400});