@webex/web-client-media-engine 3.11.6 → 3.11.7

package/dist/cjs/index.js

@@ -340,12 +340,12 @@ Logger$2.useDefaults({
     },
 });
 
-var DeviceKind;
+var DeviceKind$1;
 (function (DeviceKind) {
     DeviceKind["AudioInput"] = "audioinput";
     DeviceKind["AudioOutput"] = "audiooutput";
     DeviceKind["VideoInput"] = "videoinput";
-})(DeviceKind || (DeviceKind = {}));
+})(DeviceKind$1 || (DeviceKind$1 = {}));
 /**
  * Prompts the user for permission to use a media input which produces a MediaStream with tracks
  * containing the requested types of media.
@@ -404,10 +404,10 @@ function setOnDeviceChangeHandler$1(handler) {
 function checkNavigatorPermissions(deviceKinds) {
     return __awaiter$2(this, void 0, void 0, function* () {
         const permissionRequests = [];
-        if (deviceKinds.includes(DeviceKind.VideoInput)) {
+        if (deviceKinds.includes(DeviceKind$1.VideoInput)) {
             permissionRequests.push(navigator.permissions.query({ name: 'camera' }));
         }
-        if (deviceKinds.includes(DeviceKind.AudioInput)) {
+        if (deviceKinds.includes(DeviceKind$1.AudioInput)) {
             permissionRequests.push(navigator.permissions.query({ name: 'microphone' }));
         }
         return Promise.all(permissionRequests);
@@ -455,8 +455,8 @@ function ensureDevicePermissions(deviceKinds, callback) {
             const hasDevicePermissions = yield checkDevicePermissions(deviceKinds);
             if (!hasDevicePermissions) {
                 const stream = yield getUserMedia({
-                    audio: deviceKinds.includes(DeviceKind.AudioInput),
-                    video: deviceKinds.includes(DeviceKind.VideoInput),
+                    audio: deviceKinds.includes(DeviceKind$1.AudioInput),
+                    video: deviceKinds.includes(DeviceKind$1.VideoInput),
                 });
                 // Callback is here to call a function while an active capture exists, so that the browser
                 // (Firefox) will allow the user to access device information.
@@ -477,7 +477,7 @@ function ensureDevicePermissions(deviceKinds, callback) {
 
 var media = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    get DeviceKind () { return DeviceKind; },
+    get DeviceKind () { return DeviceKind$1; },
     getUserMedia: getUserMedia,
     getDisplayMedia: getDisplayMedia,
     enumerateDevices: enumerateDevices,
@@ -614,7 +614,7 @@ function getDevices(deviceKind) {
     return __awaiter$2(this, void 0, void 0, function* () {
         let devices;
         try {
-            devices = yield ensureDevicePermissions([DeviceKind.AudioInput, DeviceKind.VideoInput], enumerateDevices);
+            devices = yield ensureDevicePermissions([DeviceKind$1.AudioInput, DeviceKind$1.VideoInput], enumerateDevices);
         }
         catch (error) {
             throw new WebrtcCoreError(exports.WebrtcCoreErrorType.DEVICE_PERMISSION_DENIED, 'Failed to ensure device permissions');
@@ -629,7 +629,7 @@ function getDevices(deviceKind) {
  */
 function getAudioInputDevices() {
     return __awaiter$2(this, void 0, void 0, function* () {
-        return getDevices(DeviceKind.AudioInput);
+        return getDevices(DeviceKind$1.AudioInput);
     });
 }
 /**
@@ -639,7 +639,7 @@ function getAudioInputDevices() {
  */
 function getAudioOutputDevices() {
     return __awaiter$2(this, void 0, void 0, function* () {
-        return getDevices(DeviceKind.AudioOutput);
+        return getDevices(DeviceKind$1.AudioOutput);
     });
 }
 /**
@@ -649,7 +649,7 @@ function getAudioOutputDevices() {
  */
 function getVideoInputDevices() {
     return __awaiter$2(this, void 0, void 0, function* () {
-        return getDevices(DeviceKind.VideoInput);
+        return getDevices(DeviceKind$1.VideoInput);
     });
 }
 /**
@@ -6595,6 +6595,27 @@ function isValidSourceAdvertisementMsg(msg) {
     return Boolean(maybeSourceAdvertisementMsg.seqNum &&
         truthyOrZero(maybeSourceAdvertisementMsg.numTotalSources) &&
         truthyOrZero(maybeSourceAdvertisementMsg.numLiveSources));
+}
+function compareNamedMediaGroupArrays(namedMediaGroups1, namedMediaGroups2) {
+    var _a, _b;
+    if (namedMediaGroups1.length !== namedMediaGroups2.length) {
+        return false;
+    }
+    for (let i = 0; i < namedMediaGroups1.length; i += 1) {
+        if (namedMediaGroups1[i].type !== namedMediaGroups2[i].type) {
+            return false;
+        }
+        if (((_a = namedMediaGroups1[i]) === null || _a === void 0 ? void 0 : _a.value) !== ((_b = namedMediaGroups2[i]) === null || _b === void 0 ? void 0 : _b.value)) {
+            return false;
+        }
+    }
+    return true;
+}
+function compareSourceAdvertisementMsgs(sourceAdvertisementMsg1, sourceAdvertisementMsg2) {
+    return (sourceAdvertisementMsg1.numLiveSources === sourceAdvertisementMsg2.numLiveSources &&
+        sourceAdvertisementMsg1.numTotalSources === sourceAdvertisementMsg2.numTotalSources &&
+        compareNamedMediaGroupArrays(sourceAdvertisementMsg1.namedMediaGroups || [], sourceAdvertisementMsg2.namedMediaGroups || []) &&
+        sourceAdvertisementMsg1.videoContentHint === sourceAdvertisementMsg2.videoContentHint);
 }
 
 class SourceAdvertisementAckMsg {
@@ -6751,14 +6772,23 @@ class JmpSession extends events$3.EventEmitter {
         }
     }
     sendSourceAdvertisement(numTotalSources, numLiveSources, namedMediaGroups, videoContentHint) {
-        const sourceAdvertisementMsg = new SourceAdvertisementMsg(this.currSourceAdvertisementSeqNum++, numTotalSources, numLiveSources, namedMediaGroups, videoContentHint);
-        this.sendJmpMsg(JmpMsgType.SourceAdvertisement, sourceAdvertisementMsg);
-        this.lastSentSourceAdvertisement = new RetransmitHandler(sourceAdvertisementMsg, this.maxNumRetransmits, this.retransmitIntervalMs, () => {
-            this.logger.info(`Retransmitting previously sent SourceAdvertisement...`);
+        var _a;
+        const sourceAdvertisementMsg = new SourceAdvertisementMsg(this.currSourceAdvertisementSeqNum, numTotalSources, numLiveSources, namedMediaGroups, videoContentHint);
+        if (!this.lastSentSourceAdvertisement ||
+            !compareSourceAdvertisementMsgs(this.lastSentSourceAdvertisement.msg, sourceAdvertisementMsg)) {
             this.sendJmpMsg(JmpMsgType.SourceAdvertisement, sourceAdvertisementMsg);
-        }, (expiredMsg) => {
-            this.logger.warn(`Retransmits for message expired: `, expiredMsg);
-        });
+            (_a = this.lastSentSourceAdvertisement) === null || _a === void 0 ? void 0 : _a.cancel();
+            this.lastSentSourceAdvertisement = new RetransmitHandler(sourceAdvertisementMsg, this.maxNumRetransmits, this.retransmitIntervalMs, () => {
+                this.logger.info(`Retransmitting previously sent SourceAdvertisement...`);
+                this.sendJmpMsg(JmpMsgType.SourceAdvertisement, sourceAdvertisementMsg);
+            }, (expiredMsg) => {
+                this.logger.warn(`Retransmits for message expired: `, expiredMsg);
+            });
+            this.currSourceAdvertisementSeqNum++;
+        }
+        else {
+            this.logger.info(`Duplicate SourceAdvertisement detected and will not be sent: `, sourceAdvertisementMsg);
+        }
     }
     sendMediaRequestStatus(streamStates) {
         var _a, _b;
@@ -6854,9 +6884,11 @@ class JmpSession extends events$3.EventEmitter {
         this.txCallback = callback;
     }
     close() {
-        var _a;
+        var _a, _b, _c;
         this.logger.info(`closing`);
         (_a = this.lastSentMediaRequest) === null || _a === void 0 ? void 0 : _a.cancel();
+        (_b = this.lastSentMediaRequestStatus) === null || _b === void 0 ? void 0 : _b.cancel();
+        (_c = this.lastSentSourceAdvertisement) === null || _c === void 0 ? void 0 : _c.cancel();
     }
     sendJmpMsg(msgType, payload) {
         var _a;
@@ -14620,6 +14652,7 @@ class MultistreamConnection extends EventEmitter$2 {
         this.recvTransceivers.forEach((recvTransceivers) => {
             recvTransceivers.forEach((t) => t.close());
         });
+        this.jmpSessions.forEach((jmpSession) => jmpSession.close());
         this.pc.close();
     }
     sendMediaRequestStatus(mediaType) {
@@ -15090,8 +15123,11 @@ class StreamRequest {
     }
 }
 
+const { DeviceKind } = media;
+
 exports.ActiveSpeakerInfo = ActiveSpeakerInfo;
 exports.CodecInfo = CodecInfo$1;
+exports.DeviceKind = DeviceKind;
 exports.H264Codec = H264Codec;
 exports.JMPLogger = Logger$1;
 exports.LocalCameraStream = LocalCameraStream;