@webex/web-client-media-engine 1.42.0 → 2.0.0

package/dist/esm/index.js

@@ -5266,6 +5266,31 @@ function getRecommendedMaxBitrateForFrameSize(requestedMaxFs) {
     return maxFrameSizeToMaxBitrateMap.get(expectedHeight);
 }
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
 var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 var logger$2 = {exports: {}};
@@ -5558,6 +5583,34 @@ Logger$1.useDefaults({
         messages.unshift(`[${context.name}] `);
     },
 });
+function isValidActiveSpeakerInfo(msg) {
+    const maybeActiveSpeakerInfo = msg;
+    return Boolean('priority' in maybeActiveSpeakerInfo &&
+        'crossPriorityDuplication' in maybeActiveSpeakerInfo &&
+        'crossPolicyDuplication' in maybeActiveSpeakerInfo &&
+        'preferLiveVideo' in maybeActiveSpeakerInfo);
+}
+function areNamedMediaGroupArraysEqual(left, right) {
+    if (left === undefined || right === undefined) {
+        return left === right;
+    }
+    if (left.length !== right.length) {
+        return false;
+    }
+    for (let i = 0; i < left.length; i += 1) {
+        if (left[i] !== right[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+function areActiveSpeakerInfosEqual(left, right) {
+    return (left.priority === right.priority &&
+        left.crossPriorityDuplication === right.crossPriorityDuplication &&
+        left.crossPolicyDuplication === right.crossPolicyDuplication &&
+        left.preferLiveVideo === right.preferLiveVideo &&
+        areNamedMediaGroupArraysEqual(left.namedMediaGroups, right.namedMediaGroups));
+}
 function isValidActiveSpeakerNotificationMsg(msg) {
     const maybeActiveSpeakerNotificationMsg = msg;
     return Boolean(maybeActiveSpeakerNotificationMsg.seqNum && maybeActiveSpeakerNotificationMsg.csis);
@@ -5582,11 +5635,13 @@ class HomerMsg {
 
 var JmpMsgType;
 (function (JmpMsgType) {
-    JmpMsgType["Scr"] = "scr";
-    JmpMsgType["ScrAck"] = "scrAck";
+    JmpMsgType["MediaRequest"] = "mediaRequest";
+    JmpMsgType["MediaRequestAck"] = "mediaRequestAck";
+    JmpMsgType["MediaRequestStatus"] = "mediaRequestStatus";
+    JmpMsgType["MediaRequestStatusAck"] = "mediaRequestStatusAck";
+    JmpMsgType["SourceAdvertisement"] = "sourceAdvertisement";
+    JmpMsgType["SourceAdvertisementAck"] = "sourceAdvertisementAck";
     JmpMsgType["ActiveSpeakerNotification"] = "activeSpeakerNotification";
-    JmpMsgType["SourceIndication"] = "sourceIndication";
-    JmpMsgType["SourceIndicationAck"] = "sourceIndicationAck";
 })(JmpMsgType || (JmpMsgType = {}));
 class JmpMsg {
     constructor(mediaFamily, mediaContent, payload) {
@@ -5610,61 +5665,117 @@ function isValidJmpMsg(msg) {
         isValidJmpMsgPayload(maybeJmpMsg.payload));
 }
 
-class JmpScrAckMsg {
-    constructor(scrSeqNum) {
-        this.scrSeqNum = scrSeqNum;
+class MediaRequestMsg {
+    constructor(seqNum, requests) {
+        this.seqNum = seqNum;
+        this.requests = requests;
     }
     toString() {
-        return `JmpScrAckMsg(seqNum=${this.scrSeqNum})`;
+        return `JmpMediaMsg(seqNum=${this.seqNum}, requests=[${this.requests}])`;
     }
 }
-function isValidJmpScrAckMsg(msg) {
-    const maybeJmpScrAckMsg = msg;
-    return Boolean(maybeJmpScrAckMsg.scrSeqNum);
+function isValidMediaRequestMsg(msg) {
+    const maybeMediaRequestMsg = msg;
+    return Boolean(maybeMediaRequestMsg.seqNum && maybeMediaRequestMsg.requests);
 }
 
-class JmpScrMsg {
-    constructor(seqNum, requests) {
-        this.seqNum = seqNum;
-        this.requests = requests;
+class MediaRequestAckMsg {
+    constructor(mediaRequestSeqNum) {
+        this.mediaRequestSeqNum = mediaRequestSeqNum;
     }
     toString() {
-        return `JmpScrMsg(seqNum=${this.seqNum}, requests=[${this.requests}])`;
+        return `MediaRequestAckMsg(seqNum=${this.mediaRequestSeqNum})`;
     }
 }
-function isValidJmpScrMsg(msg) {
-    const maybeJmpScrMsg = msg;
-    return Boolean(maybeJmpScrMsg.seqNum && maybeJmpScrMsg.requests);
+function isValidMediaRequestAckMsg(msg) {
+    const maybeMediaRequestAckMsg = msg;
+    return Boolean(maybeMediaRequestAckMsg.mediaRequestSeqNum);
 }
 
-class JmpScrRequest {
-    constructor(policy, policySpecificInfo, ids, maxPayloadBitsPerSecond, codecInfos = []) {
-        this.policy = policy;
-        this.policySpecificInfo = policySpecificInfo;
-        this.ids = ids;
-        this.maxPayloadBitsPerSecond = maxPayloadBitsPerSecond;
-        this.codecInfos = codecInfos;
+function isValidStreamId(obj) {
+    const maybeStreamId = obj;
+    if (maybeStreamId.mid && maybeStreamId.ssrc) {
+        return false;
     }
-    toString() {
-        return `Request(policy=${this.policy}, info=${this.policySpecificInfo}, ids=[${this.ids}], maxPayloadBitsPerSecond=[${this.maxPayloadBitsPerSecond}], codecInfos=[${this.codecInfos}])`;
+    return Boolean(maybeStreamId.mid) || Boolean(maybeStreamId.ssrc);
+}
+function compareStreamIds(id1, id2) {
+    const keys1 = Object.keys(id1);
+    const keys2 = Object.keys(id2);
+    if (keys1.length !== keys2.length) {
+        return false;
+    }
+    return keys1.every((key) => id1[key] === id2[key]);
+}
+
+function isValidStreamInfo(obj) {
+    const maybeStreamInfo = obj;
+    return Boolean(maybeStreamInfo.id &&
+        isValidStreamId(maybeStreamInfo.id) &&
+        ['no source', 'invalid source', 'live', 'avatar', 'bandwidth disabled'].includes(maybeStreamInfo.state));
+}
+class MediaRequestStatusMsg {
+    constructor(seqNum, streamStates) {
+        this.seqNum = seqNum;
+        this.streamStates = streamStates;
     }
 }
-function isValidReceiverSelectedInfo(msg) {
-    const maybeReceiverSelectedInfo = msg;
-    return Boolean(maybeReceiverSelectedInfo.csi);
+function isValidMediaRequestStatusMsg(msg) {
+    const maybeMediaRequestStatusMsg = msg;
+    return (Boolean(maybeMediaRequestStatusMsg.seqNum) &&
+        maybeMediaRequestStatusMsg.streamStates &&
+        maybeMediaRequestStatusMsg.streamStates.every((streamInfo) => isValidStreamInfo(streamInfo)));
+}
+function compareStreamStateArrays(streamStates1, streamStates2) {
+    var _a, _b;
+    if (streamStates1.length !== streamStates2.length) {
+        return false;
+    }
+    for (let i = 0; i < streamStates1.length; i += 1) {
+        if (!compareStreamIds(streamStates1[i].id, streamStates2[i].id)) {
+            return false;
+        }
+        if (streamStates1[i].state !== streamStates2[i].state) {
+            return false;
+        }
+        if (((_a = streamStates1[i]) === null || _a === void 0 ? void 0 : _a.csi) !== ((_b = streamStates2[i]) === null || _b === void 0 ? void 0 : _b.csi)) {
+            return false;
+        }
+    }
+    return true;
 }
 
-class SourceIndicationAckMsg {
-    constructor(sourceIndicationSeqNum) {
-        this.sourceIndicationSeqNum = sourceIndicationSeqNum;
+class MediaRequestStatusAckMsg {
+    constructor(mediaRequestStatusSeqNum) {
+        this.mediaRequestStatusSeqNum = mediaRequestStatusSeqNum;
     }
     toString() {
-        return `SourceIndicationAckMsg(sourceIndicationSeqNum=${this.sourceIndicationSeqNum})`;
+        return `MediaRequestStatusAckMsg(seqNum=${this.mediaRequestStatusSeqNum})`;
     }
 }
-function isValidSourceIndicationAckMsg(msg) {
-    const maybeSourceIndicationAckMsg = msg;
-    return Boolean(maybeSourceIndicationAckMsg.sourceIndicationSeqNum);
+function isValidMediaRequestStatusAckMsg(msg) {
+    const maybeMediaRequestStatusAckMsg = msg;
+    return Boolean(maybeMediaRequestStatusAckMsg.mediaRequestStatusSeqNum);
+}
+function areH264CodecsEqual(left, right) {
+    if (left === undefined || right === undefined) {
+        return left === right;
+    }
+    return (left.maxFs === right.maxFs &&
+        left.maxFps === right.maxFps &&
+        left.maxMbps === right.maxMbps &&
+        left.maxWidth === right.maxWidth &&
+        left.maxHeight === right.maxHeight);
+}
+function areCodecInfosEqual(left, right) {
+    return left.payloadType === right.payloadType && areH264CodecsEqual(left.h264, right.h264);
+}
+function isValidReceiverSelectedInfo(msg) {
+    const maybeReceiverSelectedInfo = msg;
+    return Boolean(maybeReceiverSelectedInfo.csi);
+}
+function areReceiverSelectedInfosEqual(left, right) {
+    return left.csi === right.csi;
 }
 
 var MediaFamily;
@@ -5730,53 +5841,104 @@ function getMediaContent(mediaType) {
 }
 const truthyOrZero = (value) => value === 0 || value;
 
-function isValidStreamId(obj) {
-    const maybeSourceId = obj;
-    if (maybeSourceId.mid && maybeSourceId.ssrc) {
-        return false;
-    }
-    return Boolean(maybeSourceId.mid) || Boolean(maybeSourceId.ssrc);
-}
-function compareStreamIds(id1, id2) {
-    const keys1 = Object.keys(id1);
-    const keys2 = Object.keys(id2);
-    if (keys1.length !== keys2.length) {
-        return false;
-    }
-    return keys1.every((key) => id1[key] === id2[key]);
-}
-
-class SourceIndicationMsg {
-    constructor(seqNum, numTotalSources, numLiveSources, sources, videoContentHint) {
+class SourceAdvertisementMsg {
+    constructor(seqNum, numTotalSources, numLiveSources, namedMediaGroups, videoContentHint) {
         this.seqNum = seqNum;
         this.numTotalSources = numTotalSources;
         this.numLiveSources = numLiveSources;
-        this.sources = sources;
+        this.namedMediaGroups = namedMediaGroups;
         this.videoContentHint = videoContentHint;
     }
-    sourcesToString() {
-        return this.sources
-            .map((source) => `Source(id=${source.id} state=${source.state} ${source.csi ? `csi=${source.csi}` : ''})`)
-            .join(', ');
+    toString() {
+        return `SourceAdvertisement(seqNum=${this.seqNum}, numTotalSources=${this.numTotalSources}, numLiveSources=${this.numLiveSources}, namedMediaGroups=${this.namedMediaGroups}, videoContentHint=${this.videoContentHint}`;
+    }
+}
+function isValidSourceAdvertisementMsg(msg) {
+    const maybeSourceAdvertisementMsg = msg;
+    return Boolean(maybeSourceAdvertisementMsg.seqNum &&
+        truthyOrZero(maybeSourceAdvertisementMsg.numTotalSources) &&
+        truthyOrZero(maybeSourceAdvertisementMsg.numLiveSources));
+}
+
+class SourceAdvertisementAckMsg {
+    constructor(sourceAdvertisementSeqNum) {
+        this.sourceAdvertisementSeqNum = sourceAdvertisementSeqNum;
     }
     toString() {
-        return `SourceIndication(seqNum=${this.seqNum} numTotalSources=${this.numTotalSources} numLiveSources=${this.numLiveSources} sources=[${this.sourcesToString()}])`;
+        return `SourceAdvertisementAckMsg(sourceAdvertisementSeqNum=${this.sourceAdvertisementSeqNum})`;
     }
 }
-function isValidSource(obj) {
-    const maybeSource = obj;
-    return Boolean(maybeSource.id &&
-        isValidStreamId(maybeSource.id) &&
-        ['no source', 'invalid source', 'live', 'avatar', 'bandwidth disabled'].includes(maybeSource.state));
+function isValidSourceAdvertisementAckMsg(msg) {
+    const maybeSourceAdvertisementAckMsg = msg;
+    return Boolean(maybeSourceAdvertisementAckMsg.sourceAdvertisementSeqNum);
+}
+
+class StreamRequest {
+    constructor(policy, policySpecificInfo, ids, maxPayloadBitsPerSecond, codecInfos = []) {
+        this.policy = policy;
+        this.policySpecificInfo = policySpecificInfo;
+        this.ids = ids;
+        this.maxPayloadBitsPerSecond = maxPayloadBitsPerSecond;
+        this.codecInfos = codecInfos;
+    }
+    toString() {
+        return `Request(policy=${this.policy}, info=${this.policySpecificInfo}, ids=[${this.ids}], maxPayloadBitsPerSecond=[${this.maxPayloadBitsPerSecond}], codecInfos=[${this.codecInfos}])`;
+    }
 }
-function isValidSourceIndicationMsg(msg) {
-    var _a;
-    const maybeSourceIndicationMsg = msg;
-    return Boolean(maybeSourceIndicationMsg.seqNum &&
-        truthyOrZero(maybeSourceIndicationMsg.numTotalSources) &&
-        truthyOrZero(maybeSourceIndicationMsg.numLiveSources) &&
-        maybeSourceIndicationMsg.sources &&
-        ((_a = maybeSourceIndicationMsg.sources) === null || _a === void 0 ? void 0 : _a.every((source) => isValidSource(source))));
+function arePolicySpecificInfosEqual(left, right) {
+    if (isValidActiveSpeakerInfo(left)) {
+        if (!isValidActiveSpeakerInfo(right)) {
+            return false;
+        }
+        return areActiveSpeakerInfosEqual(left, right);
+    }
+    if (isValidReceiverSelectedInfo(left)) {
+        if (!isValidReceiverSelectedInfo(right)) {
+            return false;
+        }
+        return areReceiverSelectedInfosEqual(left, right);
+    }
+    throw new Error('Invalid PolicySpecificInfo');
+}
+function areCodecInfoArraysEqual(left, right) {
+    if (left.length !== right.length) {
+        return false;
+    }
+    for (let i = 0; i < left.length; i += 1) {
+        if (!areCodecInfosEqual(left[i], right[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+function areStreamIdArraysEqual(left, right) {
+    if (left.length !== right.length) {
+        return false;
+    }
+    for (let i = 0; i < left.length; i += 1) {
+        if (!compareStreamIds(left[i], right[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+function areStreamRequestsEqual(left, right) {
+    if (left.policy !== right.policy) {
+        return false;
+    }
+    if (!arePolicySpecificInfosEqual(left.policySpecificInfo, right.policySpecificInfo)) {
+        return false;
+    }
+    if (!areStreamIdArraysEqual(left.ids, right.ids)) {
+        return false;
+    }
+    if (left.maxPayloadBitsPerSecond !== right.maxPayloadBitsPerSecond) {
+        return false;
+    }
+    if (!areCodecInfoArraysEqual(left.codecInfos, right.codecInfos)) {
+        return false;
+    }
+    return true;
 }
 
 class RetransmitHandler {
@@ -5813,19 +5975,32 @@ class RetransmitHandler {
 
 var JmpSessionEvents;
 (function (JmpSessionEvents) {
-    JmpSessionEvents["SourceIndication"] = "source-indication";
     JmpSessionEvents["ActiveSpeaker"] = "active-speaker";
-    JmpSessionEvents["ScrRequestReceived"] = "scr-request-received";
+    JmpSessionEvents["MediaRequestReceived"] = "media-request-received";
+    JmpSessionEvents["MediaRequestStatusReceived"] = "media-request-status-received";
+    JmpSessionEvents["SourceAdvertisementReceived"] = "source-advertisement-received";
 })(JmpSessionEvents || (JmpSessionEvents = {}));
+function areStreamRequestArraysEqual(left, right) {
+    if (left.length !== right.length) {
+        return false;
+    }
+    for (let i = 0; i < left.length; i += 1) {
+        if (!areStreamRequestsEqual(left[i], right[i])) {
+            return false;
+        }
+    }
+    return true;
+}
 class JmpSession extends EventEmitter$3 {
     constructor(mediaFamily, mediaContent, maxNumRetransmits = 3, retransmitIntervalMs = 250) {
         super();
-        this.currScrSeqNum = 1;
-        this.currSourceIndicationSeqNum = 1;
+        this.currMediaRequestSeqNum = 1;
+        this.currSourceAdvertisementSeqNum = 1;
+        this.currMediaRequestStatusSeqNum = 1;
         this.txCallback = undefined;
-        this.lastSentScr = undefined;
-        this.lastSentScrAck = undefined;
-        this.lastReceivedScr = undefined;
+        this.lastSentMediaRequest = undefined;
+        this.lastSentMediaRequestAck = undefined;
+        this.lastReceivedMediaRequest = undefined;
         this.mediaFamily = mediaFamily;
         this.mediaContent = mediaContent;
         this.logger = Logger$1.get(`JmpSession ${this.mediaFamily}-${this.mediaContent}`);
@@ -5837,82 +6012,63 @@ class JmpSession extends EventEmitter$3 {
     }
     sendRequests(requests) {
         var _a;
-        const jmpScr = new JmpScrMsg(this.currScrSeqNum++, requests);
-        const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
-            msgType: JmpMsgType.Scr,
-            payload: jmpScr,
-        });
-        this.sendJmpMsg(jmpMsg);
-        (_a = this.lastSentScr) === null || _a === void 0 ? void 0 : _a.cancel();
-        this.lastSentScr = new RetransmitHandler(jmpScr, this.maxNumRetransmits, this.retransmitIntervalMs, (msg) => this.sendJmpScr(msg), (expiredJmpMsg) => {
-            this.logger.warn(`Retransmits for message expired: ${expiredJmpMsg}`);
+        const mediaRequestMsg = new MediaRequestMsg(this.currMediaRequestSeqNum, requests);
+        if (!this.lastSentMediaRequest ||
+            !areStreamRequestArraysEqual(this.lastSentMediaRequest.msg.requests, requests)) {
+            this.sendJmpMsg(JmpMsgType.MediaRequest, mediaRequestMsg);
+            (_a = this.lastSentMediaRequest) === null || _a === void 0 ? void 0 : _a.cancel();
+            this.lastSentMediaRequest = new RetransmitHandler(mediaRequestMsg, this.maxNumRetransmits, this.retransmitIntervalMs, () => this.sendJmpMsg(JmpMsgType.MediaRequest, mediaRequestMsg), (expiredJmpMsg) => {
+                this.logger.warn(`Retransmits for message expired: ${expiredJmpMsg}`);
+            });
+            this.currMediaRequestSeqNum++;
+        }
+    }
+    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.sendJmpMsg(JmpMsgType.SourceAdvertisement, sourceAdvertisementMsg), (expiredMsg) => {
+            this.logger.warn(`Retransmits for message expired: `, expiredMsg);
         });
     }
-    updateSourceIndication(numTotalSources, numLiveSources, sources, videoContentHint) {
-        var _a;
-        const filteredSources = sources.filter((source) => {
+    sendMediaRequestStatus(streamStates) {
+        var _a, _b;
+        const filteredStreamStates = streamStates.filter((streamState) => {
             var _a;
-            return (_a = this.lastReceivedScr) === null || _a === void 0 ? void 0 : _a.requests.some((req) => req.ids.find((streamId) => compareStreamIds(streamId, source.id)));
-        });
-        const sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources, videoContentHint);
-        const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
-            msgType: JmpMsgType.SourceIndication,
-            payload: sourceIndicationMsg,
-        });
-        this.sendJmpMsg(jmpMsg);
-        (_a = this.lastSentSourceIndication) === null || _a === void 0 ? void 0 : _a.cancel();
-        this.lastSentSourceIndication = new RetransmitHandler(sourceIndicationMsg, this.maxNumRetransmits, this.retransmitIntervalMs, (msg) => this.sendSourceIndication(msg), (expiredMsg) => {
-            this.logger.warn(`Retransmits for message expired:`, expiredMsg);
+            return (_a = this.lastReceivedMediaRequest) === null || _a === void 0 ? void 0 : _a.requests.some((req) => req.ids.find((streamId) => compareStreamIds(streamId, streamState.id)));
         });
+        const mediaRequestStatus = new MediaRequestStatusMsg(this.currMediaRequestStatusSeqNum, filteredStreamStates);
+        if (!((_a = this.lastSentMediaRequestStatus) === null || _a === void 0 ? void 0 : _a.msg.streamStates) ||
+            !compareStreamStateArrays(filteredStreamStates, this.lastSentMediaRequestStatus.msg.streamStates)) {
+            this.sendJmpMsg(JmpMsgType.MediaRequestStatus, mediaRequestStatus);
+            (_b = this.lastSentMediaRequestStatus) === null || _b === void 0 ? void 0 : _b.cancel();
+            this.lastSentMediaRequestStatus = new RetransmitHandler(mediaRequestStatus, this.maxNumRetransmits, this.retransmitIntervalMs, () => this.sendJmpMsg(JmpMsgType.MediaRequestStatus, mediaRequestStatus), (expiredMsg) => {
+                this.logger.warn(`Retransmits for message expired: `, expiredMsg);
+            });
+            this.currMediaRequestStatusSeqNum++;
+        }
     }
     receive(jmpMsg) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (jmpMsg.mediaContent !== this.mediaContent || jmpMsg.mediaFamily !== this.mediaFamily) {
             this.logger.error(`JmpMsg ${jmpMsg} sent to incorrect JmpSession`);
             return;
         }
         this.logger.debug(`Received JmpMsg`, jmpMsg);
         const { payload } = jmpMsg;
-        if (payload.msgType === JmpMsgType.Scr) {
-            const jmpScr = payload.payload;
-            if (!isValidJmpScrMsg(jmpScr)) {
-                this.logger.error(`Received invalid SCR:`, jmpScr);
+        if (payload.msgType === JmpMsgType.MediaRequest) {
+            const mediaRequestMsg = payload.payload;
+            if (!isValidMediaRequestMsg(mediaRequestMsg)) {
+                this.logger.error(`Received invalid MediaRequest:`, mediaRequestMsg);
                 return;
             }
-            if (this.lastReceivedScr && jmpScr.seqNum < ((_a = this.lastReceivedScr) === null || _a === void 0 ? void 0 : _a.seqNum)) {
-                this.logger.info(`Received old SCR, ignoring`);
-            }
-            else if (this.lastReceivedScr && jmpScr.seqNum === this.lastReceivedScr.seqNum) {
-                if (this.lastSentScrAck) {
-                    this.logger.info(`Received duplicate SCR, re-sending ACK`);
-                    this.sendJmpScrAck(this.lastSentScrAck);
-                }
-                else {
-                    this.logger.warn(`Received duplicate SCR, but there was no ACK previously sent`);
-                }
-            }
-            else {
-                this.logger.info(`Received new SCR, sending ACK`);
-                const jmpScrAck = new JmpScrAckMsg(jmpScr.seqNum);
-                this.lastReceivedScr = jmpScr;
-                this.lastSentScrAck = jmpScrAck;
-                this.sendJmpScrAck(jmpScrAck);
-                this.emit(JmpSessionEvents.ScrRequestReceived, jmpScr);
-            }
+            this.handleIncomingMediaRequest(mediaRequestMsg);
         }
-        else if (payload.msgType === JmpMsgType.ScrAck) {
-            const jmpScrAck = payload.payload;
-            if (!isValidJmpScrAckMsg(jmpScrAck)) {
-                this.logger.error(`Received invalid SCR ACK:`, jmpScrAck);
+        else if (payload.msgType === JmpMsgType.MediaRequestAck) {
+            const mediaRequestAckMsg = payload.payload;
+            if (!isValidMediaRequestAckMsg(mediaRequestAckMsg)) {
+                this.logger.error(`Received invalid MediaRequest ACK:`, mediaRequestAckMsg);
                 return;
             }
-            if (jmpScrAck.scrSeqNum === ((_c = (_b = this.lastSentScr) === null || _b === void 0 ? void 0 : _b.msg) === null || _c === void 0 ? void 0 : _c.seqNum)) {
-                this.logger.info(`Received ACK for last sent SCR`);
-                (_d = this.lastSentScr) === null || _d === void 0 ? void 0 : _d.cancel();
-            }
-            else {
-                this.logger.info(`Received ACK for old SCR`);
-            }
+            this.handleIncomingMediaRequestAck(mediaRequestAckMsg);
         }
         else if (payload.msgType === JmpMsgType.ActiveSpeakerNotification) {
             const activeSpeakerNotification = payload.payload;
@@ -5920,51 +6076,39 @@ class JmpSession extends EventEmitter$3 {
                 this.logger.info(`Received invalid Active Speaker Notification:`, activeSpeakerNotification);
                 return;
             }
-            this.logger.debug(`Received Active Speaker Notification:`, activeSpeakerNotification);
-            this.emit(JmpSessionEvents.ActiveSpeaker, activeSpeakerNotification);
+            this.handleIncomingActiveSpeakerNotification(activeSpeakerNotification);
         }
-        else if (payload.msgType === JmpMsgType.SourceIndication) {
-            const sourceIndication = payload.payload;
-            if (!isValidSourceIndicationMsg(sourceIndication)) {
-                this.logger.error(`Received invalid Source Indication:`, sourceIndication);
+        else if (payload.msgType === JmpMsgType.SourceAdvertisement) {
+            const sourceAdvertisement = payload.payload;
+            if (!isValidSourceAdvertisementMsg(sourceAdvertisement)) {
+                this.logger.error(`Received invalid SourceAdvertisementMsg: `, sourceAdvertisement);
                 return;
             }
-            if (this.lastReceivedSourceIndication &&
-                sourceIndication.seqNum < ((_e = this.lastReceivedSourceIndication) === null || _e === void 0 ? void 0 : _e.seqNum)) {
-                this.logger.info(`Received old Source Indication, ignoring`);
-            }
-            else if (this.lastReceivedSourceIndication &&
-                sourceIndication.seqNum === this.lastReceivedSourceIndication.seqNum) {
-                if (this.lastSentSourceIndicationAck) {
-                    this.logger.info(`Received duplicate Source Indication, re-sending ACK`);
-                    this.sendSourceIndicationAck(this.lastSentSourceIndicationAck);
-                }
-                else {
-                    this.logger.warn(`Received duplicate Source Indication, but there was no ACK previously sent`);
-                }
-            }
-            else {
-                this.logger.info(`Received new Source Indication, sending ACK`);
-                const sourceIndicationAck = new SourceIndicationAckMsg(sourceIndication.seqNum);
-                this.lastReceivedSourceIndication = sourceIndication;
-                this.lastSentSourceIndicationAck = sourceIndicationAck;
-                this.sendSourceIndicationAck(sourceIndicationAck);
-                this.emit(JmpSessionEvents.SourceIndication, sourceIndication);
-            }
+            this.handleIncomingSourceAdvertisement(sourceAdvertisement);
         }
-        else if (payload.msgType === JmpMsgType.SourceIndicationAck) {
-            const sourceIndicationAck = payload.payload;
-            if (!isValidSourceIndicationAckMsg(sourceIndicationAck)) {
-                this.logger.error(`Received invalid SCR ACK:`, sourceIndicationAck);
+        else if (payload.msgType === JmpMsgType.SourceAdvertisementAck) {
+            const sourceAdvertisementAck = payload.payload;
+            if (!isValidSourceAdvertisementAckMsg(sourceAdvertisementAck)) {
+                this.logger.error(`Received invalid SourceAdvertisementAckMsg: `, sourceAdvertisementAck);
                 return;
             }
-            if (sourceIndicationAck.sourceIndicationSeqNum === ((_g = (_f = this.lastSentSourceIndication) === null || _f === void 0 ? void 0 : _f.msg) === null || _g === void 0 ? void 0 : _g.seqNum)) {
-                this.logger.info(`Received ACK for last sent SCR`);
-                (_h = this.lastSentSourceIndication) === null || _h === void 0 ? void 0 : _h.cancel();
+            this.handleIncomingSourceAdvertisementAck(sourceAdvertisementAck);
+        }
+        else if (payload.msgType === JmpMsgType.MediaRequestStatus) {
+            const mediaRequestStatus = payload.payload;
+            if (!isValidMediaRequestStatusMsg(mediaRequestStatus)) {
+                this.logger.error(`Received invalid MediaRequestStatusMsg: `, mediaRequestStatus);
+                return;
             }
-            else {
-                this.logger.info(`Received ACK for old SCR`);
+            this.handleIncomingMediaRequestStatus(mediaRequestStatus);
+        }
+        else if (payload.msgType === JmpMsgType.MediaRequestStatusAck) {
+            const mediaRequestStatusAck = payload.payload;
+            if (!isValidMediaRequestStatusAckMsg(mediaRequestStatusAck)) {
+                this.logger.error(`Received invalid MediaRequestStatusAckMsg: `, mediaRequestStatusAck);
+                return;
             }
+            this.handleIncomingMediaRequestStatusAck(mediaRequestStatusAck);
         }
         else {
             this.logger.error(`Received unknown JmpMsg`);
@@ -5976,79 +6120,126 @@ class JmpSession extends EventEmitter$3 {
     close() {
         var _a;
         this.logger.info(`closing`);
-        (_a = this.lastSentScr) === null || _a === void 0 ? void 0 : _a.cancel();
+        (_a = this.lastSentMediaRequest) === null || _a === void 0 ? void 0 : _a.cancel();
     }
-    sendSourceIndicationAck(sourceIndicationAck) {
+    sendJmpMsg(msgType, payload) {
+        var _a;
         const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
-            msgType: JmpMsgType.SourceIndicationAck,
-            payload: sourceIndicationAck,
+            msgType,
+            payload,
         });
-        this.sendJmpMsg(jmpMsg);
+        const homerMsg = new HomerMsg(HomerMsgType.Multistream, jmpMsg);
+        (_a = this.txCallback) === null || _a === void 0 ? void 0 : _a.call(this, JSON.stringify(homerMsg));
     }
-    sendSourceIndication(sourceIndication) {
-        const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
-            msgType: JmpMsgType.SourceIndication,
-            payload: sourceIndication,
-        });
-        this.sendJmpMsg(jmpMsg);
+    handleIncomingMediaRequest(mediaRequestMsg) {
+        var _a;
+        if (this.lastReceivedMediaRequest &&
+            mediaRequestMsg.seqNum < ((_a = this.lastReceivedMediaRequest) === null || _a === void 0 ? void 0 : _a.seqNum)) {
+            this.logger.info(`Received old MediaRequest, ignoring`);
+        }
+        else if (this.lastReceivedMediaRequest &&
+            mediaRequestMsg.seqNum === this.lastReceivedMediaRequest.seqNum) {
+            if (this.lastSentMediaRequestAck) {
+                this.logger.info(`Received duplicate MediaRequest, re-sending ACK`);
+                this.sendJmpMsg(JmpMsgType.MediaRequestAck, this.lastSentMediaRequestAck);
+            }
+            else {
+                this.logger.warn(`Received duplicate MediaRequest, but there was no ACK previously sent`);
+            }
+        }
+        else {
+            this.logger.info(`Received new MediaRequest, sending ACK`);
+            const mediaRequestAck = new MediaRequestAckMsg(mediaRequestMsg.seqNum);
+            this.lastReceivedMediaRequest = mediaRequestMsg;
+            this.lastSentMediaRequestAck = mediaRequestAck;
+            this.sendJmpMsg(JmpMsgType.MediaRequestAck, mediaRequestAck);
+            this.emit(JmpSessionEvents.MediaRequestReceived, mediaRequestMsg);
+        }
     }
-    sendJmpScrAck(jmpScrAck) {
-        const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
-            msgType: JmpMsgType.ScrAck,
-            payload: jmpScrAck,
-        });
-        this.sendJmpMsg(jmpMsg);
+    handleIncomingMediaRequestAck(mediaRequestAckMsg) {
+        var _a, _b, _c;
+        if (mediaRequestAckMsg.mediaRequestSeqNum === ((_b = (_a = this.lastSentMediaRequest) === null || _a === void 0 ? void 0 : _a.msg) === null || _b === void 0 ? void 0 : _b.seqNum)) {
+            this.logger.info(`Received ACK for last sent MediaRequest`);
+            (_c = this.lastSentMediaRequest) === null || _c === void 0 ? void 0 : _c.cancel();
+        }
+        else {
+            this.logger.info(`Received ACK for old MediaRequest`);
+        }
     }
-    sendJmpScr(jmpScr) {
-        const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
-            msgType: JmpMsgType.Scr,
-            payload: jmpScr,
-        });
-        this.sendJmpMsg(jmpMsg);
+    handleIncomingActiveSpeakerNotification(activeSpeakerNotification) {
+        this.logger.debug(`Received Active Speaker Notification:`, activeSpeakerNotification);
+        this.emit(JmpSessionEvents.ActiveSpeaker, activeSpeakerNotification);
     }
-    sendJmpMsg(msg) {
-        var _a;
-        const homerMsg = new HomerMsg(HomerMsgType.Multistream, msg);
-        (_a = this.txCallback) === null || _a === void 0 ? void 0 : _a.call(this, JSON.stringify(homerMsg));
+    handleIncomingSourceAdvertisement(sourceAdvertisement) {
+        if (this.lastReceivedSourceAdvertisement &&
+            sourceAdvertisement.seqNum < this.lastReceivedSourceAdvertisement.seqNum) {
+            this.logger.info(`Received old SourceAdvertisement, ignoring`);
+        }
+        else if (this.lastReceivedSourceAdvertisement &&
+            sourceAdvertisement.seqNum === this.lastReceivedSourceAdvertisement.seqNum) {
+            if (this.lastSentSourceAdvertisementAck) {
+                this.logger.info(`Received duplicate SourceAdvertisement, re-sending ACK`);
+                this.sendJmpMsg(JmpMsgType.SourceAdvertisementAck, this.lastSentSourceAdvertisementAck);
+            }
+            else {
+                this.logger.warn(`Received duplicate SourceAdvertisement, but there was no ACK previously sent`);
+            }
+        }
+        else {
+            this.logger.info(`Received new SourceAdvertisement, sending ACK`);
+            const sourceAdvertisementAck = new SourceAdvertisementAckMsg(sourceAdvertisement.seqNum);
+            this.lastReceivedSourceAdvertisement = sourceAdvertisement;
+            this.lastSentSourceAdvertisementAck = sourceAdvertisementAck;
+            this.sendJmpMsg(JmpMsgType.SourceAdvertisementAck, sourceAdvertisementAck);
+            this.emit(JmpSessionEvents.SourceAdvertisementReceived, sourceAdvertisement);
+        }
     }
-}
-
-class MediaRequest {
-    constructor(policy, policySpecificInfo, receiveSlots, maxPayloadBitsPerSecond, codecInfos = []) {
-        this.policy = policy;
-        this.policySpecificInfo = policySpecificInfo;
-        this.receiveSlots = receiveSlots;
-        this.maxPayloadBitsPerSecond = maxPayloadBitsPerSecond;
-        this.codecInfos = codecInfos;
+    handleIncomingSourceAdvertisementAck(sourceAdvertisementAck) {
+        var _a, _b, _c;
+        if (sourceAdvertisementAck.sourceAdvertisementSeqNum ===
+            ((_b = (_a = this.lastSentSourceAdvertisement) === null || _a === void 0 ? void 0 : _a.msg) === null || _b === void 0 ? void 0 : _b.seqNum)) {
+            this.logger.info(`Received ACK for last sent SourceAdvertisement`);
+            (_c = this.lastSentSourceAdvertisement) === null || _c === void 0 ? void 0 : _c.cancel();
+        }
+        else {
+            this.logger.info(`Received ACK for old SourceAdvertisement`);
+        }
     }
-    _toJmpScrRequest() {
-        return new JmpScrRequest(this.policy, this.policySpecificInfo, this.receiveSlots.map((rs) => rs.id), this.maxPayloadBitsPerSecond, this.codecInfos);
+    handleIncomingMediaRequestStatus(mediaRequestStatus) {
+        if (this.lastReceivedMediaRequestStatus &&
+            mediaRequestStatus.seqNum < this.lastReceivedMediaRequestStatus.seqNum) {
+            this.logger.info(`Received old MediaRequestStatus, ignoring`);
+        }
+        else if (this.lastReceivedMediaRequestStatus &&
+            mediaRequestStatus.seqNum === this.lastReceivedMediaRequestStatus.seqNum) {
+            if (this.lastSentMediaRequestStatusAck) {
+                this.logger.info(`Received duplicate MediaRequestStatus, re-sending ACK`);
+                this.sendJmpMsg(JmpMsgType.MediaRequestStatusAck, this.lastSentMediaRequestStatusAck);
+            }
+            else {
+                this.logger.warn(`Received duplicate MediaRequestStatus, but there was no ACK previously sent`);
+            }
+        }
+        else {
+            this.logger.info(`Received new MediaRequestStatus, sending ACK`);
+            const mediaRequestStatusAck = new MediaRequestStatusAckMsg(mediaRequestStatus.seqNum);
+            this.lastReceivedMediaRequestStatus = mediaRequestStatus;
+            this.lastSentMediaRequestStatusAck = mediaRequestStatusAck;
+            this.sendJmpMsg(JmpMsgType.MediaRequestStatusAck, mediaRequestStatusAck);
+            this.emit(JmpSessionEvents.MediaRequestStatusReceived, mediaRequestStatus);
+        }
+    }
+    handleIncomingMediaRequestStatusAck(mediaRequestStatusAck) {
+        var _a, _b, _c;
+        if (mediaRequestStatusAck.mediaRequestStatusSeqNum ===
+            ((_b = (_a = this.lastSentMediaRequestStatus) === null || _a === void 0 ? void 0 : _a.msg) === null || _b === void 0 ? void 0 : _b.seqNum)) {
+            this.logger.info(`Received ACK for last sent MediaRequestStatus`);
+            (_c = this.lastSentMediaRequestStatus) === null || _c === void 0 ? void 0 : _c.cancel();
+        }
+        else {
+            this.logger.info(`Received ACK for old MediaRequestStatus`);
+        }
     }
-}
-
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
 }
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -12017,17 +12208,23 @@ class ReceiveOnlyTransceiver extends Transceiver {
 ReceiveOnlyTransceiver.rid = '1';
 
 class JmpLine extends Line {
+    constructor(versions) {
+        super();
+        this.versions = versions;
+    }
     static fromSdpLine(line) {
         if (!JmpLine.regex.test(line)) {
             return undefined;
         }
-        return new JmpLine();
+        const tokens = line.match(JmpLine.regex);
+        const versions = tokens[1].split(',').filter((v) => v.length);
+        return new JmpLine(versions);
     }
     toSdpLine() {
-        return `a=jmp`;
+        return `a=jmp:${this.versions.join(',')}`;
     }
 }
-JmpLine.regex = /^jmp$/;
+JmpLine.regex = /^jmp:((?:v\d+,?)+)/;
 class JmpStreamIdModeLine extends Line {
     constructor(streamIdMode) {
         super();
@@ -12211,7 +12408,7 @@ function injectJmpAttributes(parsedSdp, csiMap, streamSignalingMode) {
         .filter((mLine) => mLine.direction === 'sendrecv' || mLine.direction === 'inactive')
         .forEach((mLine) => {
         if (!mLine.otherLines.find((line) => line instanceof JmpLine)) {
-            mLine.addLine(new JmpLine());
+            mLine.addLine(new JmpLine(['v1']));
         }
         if (!mLine.otherLines.find((line) => line instanceof JmpSourceLine)) {
             const mediaType = getMediaTypeForMline(mLine);
@@ -13081,83 +13278,37 @@ class MultistreamConnection extends EventEmitter {
             logger.info(`Sending JMP message: ${msg}`);
             this.dataChannel.send(msg);
         });
-        if (getMediaFamily(mediaType) === MediaFamily.Video) {
-            let prevNumTotalSources = 0;
-            let prevNumLiveSources = 0;
-            jmpSession.on(JmpSessionEvents.SourceIndication, (data) => {
-                data.sources.forEach((s) => {
-                    const receiveSlot = this.getReceiveSlotById(s.id);
-                    if (!receiveSlot) {
-                        logger.warn(`Got source indication for unknown receive slot: ${s.id}`);
-                        return;
-                    }
-                    receiveSlot._updateSource(s.state, s.csi);
-                });
-                if (data.numTotalSources !== prevNumTotalSources ||
-                    data.numLiveSources !== prevNumLiveSources) {
-                    prevNumTotalSources = data.numTotalSources;
-                    prevNumLiveSources = data.numLiveSources;
-                    this.emit(MultistreamConnectionEventNames.VideoSourceCountUpdate, data.numTotalSources, data.numLiveSources, getMediaContent(mediaType));
-                }
-            });
-            jmpSession.on(JmpSessionEvents.ScrRequestReceived, (data) => {
-                this.sendSourceWarnings(mediaType, data.requests);
-                this.updateRequestedStreams(mediaType, data.requests);
-            });
-        }
-        if (getMediaFamily(mediaType) === MediaFamily.Audio) {
-            let prevNumTotalSources = 0;
-            let prevNumLiveSources = 0;
-            jmpSession.on(JmpSessionEvents.SourceIndication, (data) => {
-                data.sources.forEach((s) => {
-                    const receiveSlot = this.getReceiveSlotById(s.id);
-                    if (!receiveSlot) {
-                        logger.warn(`Got source indication for unknown receive slot: ${s.id}`);
-                        return;
-                    }
-                    receiveSlot._updateSource(s.state, s.csi);
-                });
-                if (data.numTotalSources !== prevNumTotalSources ||
-                    data.numLiveSources !== prevNumLiveSources) {
-                    prevNumTotalSources = data.numTotalSources;
-                    prevNumLiveSources = data.numLiveSources;
-                    this.emit(MultistreamConnectionEventNames.AudioSourceCountUpdate, data.numTotalSources, data.numLiveSources, getMediaContent(mediaType));
+        let prevNumTotalSources = 0;
+        let prevNumLiveSources = 0;
+        jmpSession.on(JmpSessionEvents.SourceAdvertisementReceived, (data) => {
+            if (data.numTotalSources !== prevNumTotalSources ||
+                data.numLiveSources !== prevNumLiveSources) {
+                prevNumTotalSources = data.numTotalSources;
+                prevNumLiveSources = data.numLiveSources;
+                const eventName = getMediaFamily(mediaType) === MediaFamily.Video
+                    ? MultistreamConnectionEventNames.VideoSourceCountUpdate
+                    : MultistreamConnectionEventNames.AudioSourceCountUpdate;
+                this.emit(eventName, data.numTotalSources, data.numLiveSources, getMediaContent(mediaType));
+            }
+        });
+        jmpSession.on(JmpSessionEvents.MediaRequestStatusReceived, (data) => {
+            data.streamStates.forEach((s) => {
+                const receiveSlot = this.getReceiveSlotById(s.id);
+                if (!receiveSlot) {
+                    logger.warn(`Got MediaRequestStatus for unknown receive slot: ${s.id}`);
+                    return;
                 }
+                receiveSlot._updateSource(s.state, s.csi);
             });
-            jmpSession.on(JmpSessionEvents.ActiveSpeaker, (data) => this.emit(MultistreamConnectionEventNames.ActiveSpeakerNotification, data));
-            jmpSession.on(JmpSessionEvents.ScrRequestReceived, (data) => {
-                this.updateRequestedStreams(mediaType, data.requests);
-            });
-        }
-        this.jmpSessions.set(mediaType, jmpSession);
-    }
-    sendSourceWarnings(mediaType, requests) {
-        var _a;
-        if (getMediaFamily(mediaType) === MediaFamily.Video) {
-            const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
-            const signaler = this.streamSignalerManager.getEgressStreamSignalerOrThrow(sendTransceiver.mid);
-            const activeSimulcastLayerNumber = ((_a = sendTransceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.getNumActiveSimulcastLayers()) || 0;
-            const sourceWarnings = [];
-            requests.forEach(({ ids, policySpecificInfo }) => {
-                ids.forEach((id) => {
-                    if (isValidReceiverSelectedInfo(policySpecificInfo) &&
-                        sendTransceiver.csi !== policySpecificInfo.csi) {
-                        sourceWarnings.push({ id, state: 'invalid source', csi: policySpecificInfo.csi });
-                    }
-                    else if (!signaler.getSenderIds().some((validId) => compareStreamIds(id, validId))) {
-                        sourceWarnings.push({ id, state: 'invalid source', csi: sendTransceiver.csi });
-                    }
-                    else if (signaler.getEncodingIndexForStreamId(id) >= activeSimulcastLayerNumber) {
-                        sourceWarnings.push({ id, state: 'no source', csi: sendTransceiver.csi });
-                    }
-                });
-            });
-            if (sourceWarnings.length > 0) {
-                const { publishedTrack } = sendTransceiver;
-                const live = !!publishedTrack && publishedTrack.published && !publishedTrack.muted;
-                this.sendSourceIndication(mediaType, +live, sourceWarnings);
+        });
+        jmpSession.on(JmpSessionEvents.MediaRequestReceived, (data) => {
+            if (getMediaFamily(mediaType) === MediaFamily.Video) {
+                this.sendMediaRequestStatus(mediaType);
             }
-        }
+            this.updateRequestedStreams(mediaType, data.requests);
+        });
+        jmpSession.on(JmpSessionEvents.ActiveSpeaker, (data) => this.emit(MultistreamConnectionEventNames.ActiveSpeakerNotification, data));
+        this.jmpSessions.set(mediaType, jmpSession);
     }
     updateRequestedStreams(mediaType, requests) {
         const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
@@ -13177,7 +13328,7 @@ class MultistreamConnection extends EventEmitter {
                 return;
             }
             if (sendTransceiver.csi !== policySpecificInfo.csi) {
-                logger.warn('csi in the scr request does not match');
+                logger.warn('csi in the StreamRequest does not match');
                 return;
             }
             const id = ids[0];
@@ -13213,7 +13364,7 @@ class MultistreamConnection extends EventEmitter {
         dataChannel.onopen = (e) => {
             logger.info('DataChannel opened: ', e);
             [...this.sendTransceivers.keys()].forEach((mediaType) => {
-                this.maybeSendSourceIndication(mediaType);
+                this.sendSourceAdvertisement(mediaType);
             });
             logger.info(`Flushing pending JMP task queue`);
             this.pendingJmpTasks.forEach((t) => t());
@@ -13262,33 +13413,51 @@ class MultistreamConnection extends EventEmitter {
         });
         this.pc.close();
     }
-    maybeSendSourceIndication(mediaType) {
+    sendMediaRequestStatus(mediaType) {
         var _a;
+        if (getMediaFamily(mediaType) !== MediaFamily.Video) {
+            return;
+        }
+        const streamStates = this.getVideoStreamStates(mediaType);
+        if (streamStates === null) {
+            logger.debug(`Empty streamStates, not sending MediaRequestStatus`);
+            return;
+        }
+        const task = () => {
+            var _a;
+            (_a = this.jmpSessions.get(mediaType)) === null || _a === void 0 ? void 0 : _a.sendMediaRequestStatus(streamStates);
+        };
+        if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
+            task();
+        }
+        else {
+            this.pendingJmpTasks.push(task);
+        }
+    }
+    sendSourceAdvertisement(mediaType) {
+        var _a, _b;
         const transceiver = this.getSendTransceiverOrThrow(mediaType);
         const numLiveSources = ((_a = transceiver.publishedTrack) === null || _a === void 0 ? void 0 : _a.muted) === false ? 1 : 0;
+        let task;
         if (getMediaFamily(mediaType) === MediaFamily.Video) {
-            const sources = this.getVideoSources(mediaType);
+            const sources = this.getVideoStreamStates(mediaType);
             if (sources === null) {
                 return;
             }
-            let webRtcVideoContentHint;
+            let contentHint;
             if (transceiver.publishedTrack instanceof LocalDisplayTrack) {
-                webRtcVideoContentHint = transceiver.publishedTrack.videoContentHint;
+                contentHint = transceiver.publishedTrack.videoContentHint;
             }
-            this.sendSourceIndication(mediaType, numLiveSources, sources, webRtcVideoContentHintToJmpVideoContentHint(webRtcVideoContentHint));
+            task = () => {
+                var _a;
+                (_a = this.jmpSessions
+                    .get(mediaType)) === null || _a === void 0 ? void 0 : _a.sendSourceAdvertisement(1, numLiveSources, [], webRtcVideoContentHintToJmpVideoContentHint(contentHint));
+            };
         }
         else {
-            this.sendSourceIndication(mediaType, numLiveSources);
+            task = () => { var _a; return (_a = this.jmpSessions.get(mediaType)) === null || _a === void 0 ? void 0 : _a.sendSourceAdvertisement(1, numLiveSources); };
         }
-    }
-    sendSourceIndication(mediaType, numLiveSources, sources = [], videoContentHint = undefined) {
-        var _a;
-        const task = () => {
-            var _a;
-            (_a = this.jmpSessions
-                .get(mediaType)) === null || _a === void 0 ? void 0 : _a.updateSourceIndication(1, numLiveSources, sources, videoContentHint);
-        };
-        if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
+        if (((_b = this.dataChannel) === null || _b === void 0 ? void 0 : _b.readyState) === 'open') {
             task();
         }
         else {
@@ -13331,23 +13500,32 @@ class MultistreamConnection extends EventEmitter {
         });
     }
     addTrackListeners(mediaType, track) {
-        const onTrackResolutionChange = () => this.maybeSendSourceIndication(mediaType);
+        const onTrackResolutionChange = () => {
+            this.sendMediaRequestStatus(mediaType);
+        };
         track.on(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
-        const onTrackMute = () => this.maybeSendSourceIndication(mediaType);
+        const onTrackMute = () => {
+            this.sendSourceAdvertisement(mediaType);
+            this.sendMediaRequestStatus(mediaType);
+        };
         track.on(LocalTrack.Events.Muted, onTrackMute);
         const onTrackPublish = (event) => {
             if (!event.isPublished) {
                 track.off(LocalTrack.Events.Muted, onTrackMute);
                 track.off(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
                 track.off(LocalTrack.Events.TrackConstraintsChange, onTrackResolutionChange);
+                if (!track.muted) {
+                    this.sendSourceAdvertisement(mediaType);
+                    this.sendMediaRequestStatus(mediaType);
+                }
             }
-            if (!track.muted) {
-                this.maybeSendSourceIndication(mediaType);
+            else if (!track.muted) {
+                this.sendSourceAdvertisement(mediaType);
             }
         };
         track.on(LocalTrack.Events.PublishedStateUpdate, onTrackPublish);
     }
-    getVideoSources(mediaType) {
+    getVideoStreamStates(mediaType) {
         var _a, _b, _c;
         const sendTransceiver = this.getSendTransceiverOrThrow(mediaType);
         const signaler = this.streamSignalerManager.getEgressStreamSignaler(sendTransceiver.mid);
@@ -13365,7 +13543,7 @@ class MultistreamConnection extends EventEmitter {
             else if (muted) {
                 state = 'avatar';
             }
-            else if (activeSimulcastLayerNumber <= signaler.getEncodingIndexForStreamId(id)) {
+            else if (activeSimulcastLayerNumber < signaler.getEncodingIndexForStreamId(id)) {
                 state = 'no source';
             }
             else {
@@ -13619,7 +13797,7 @@ class MultistreamConnection extends EventEmitter {
             }
         });
     }
-    requestMedia(mediaType, mediaRequests) {
+    requestMedia(mediaType, streamRequests) {
         var _a;
         const task = () => {
             var _a;
@@ -13628,20 +13806,13 @@ class MultistreamConnection extends EventEmitter {
                 logger.error(`Unable to find jmp session for ${mediaType}`);
                 return;
             }
-            const requestedReceiveSlotIds = [];
-            mediaRequests.forEach((mr) => mr.receiveSlots.forEach((rs) => {
-                if (!rs.id) {
-                    logger.error(`Running subscribe task, but ReceiveSlot ID is missing!`);
-                    return;
-                }
-                requestedReceiveSlotIds.push(rs.id);
-            }));
+            const requestedReceiveSlotIds = streamRequests.flatMap((sr) => sr.ids);
             (_a = this.recvTransceivers.get(mediaType)) === null || _a === void 0 ? void 0 : _a.forEach((transceiver) => {
                 if (!requestedReceiveSlotIds.some((id) => compareStreamIds(id, transceiver.receiveSlot.id))) {
                     transceiver.receiveSlot._updateSource('no source', undefined);
                 }
             });
-            jmpSession.sendRequests(mediaRequests.map((mr) => mr._toJmpScrRequest()));
+            jmpSession.sendRequests(streamRequests);
         };
         if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
             task();
@@ -13760,5 +13931,5 @@ class MultistreamConnection extends EventEmitter {
     }
 }
 
-export { ConnectionState, Logger$1 as JMPLogger, LocalCameraTrack, LocalDisplayTrack, LocalMicrophoneTrack, LocalTrack, LocalTrackEvents, Logger, MediaCodecMimeType, MediaRequest, MediaStreamTrackKind, MultistreamConnection, MultistreamConnectionEventNames, PeerConnection, ReceiveSlot, ReceiveSlotEvents, RecommendedOpusBitrates, SendOnlyTransceiver, WcmeError, compareReceiveSlotIds, createCameraTrack, createDisplayTrack, createMicrophoneTrack, getAudioInputDevices, getAudioOutputDevices, getDevices, getLogLevel, getRecommendedMaxBitrateForFrameSize, getVideoInputDevices, logger, setLogHandler, setLogLevel, setOnDeviceChangeHandler };
+export { ConnectionState, Logger$1 as JMPLogger, LocalCameraTrack, LocalDisplayTrack, LocalMicrophoneTrack, LocalTrack, LocalTrackEvents, Logger, MediaCodecMimeType, MediaStreamTrackKind, MultistreamConnection, MultistreamConnectionEventNames, PeerConnection, ReceiveSlot, ReceiveSlotEvents, RecommendedOpusBitrates, SendOnlyTransceiver, StreamRequest, WcmeError, compareReceiveSlotIds, createCameraTrack, createDisplayTrack, createMicrophoneTrack, getAudioInputDevices, getAudioOutputDevices, getDevices, getLogLevel, getRecommendedMaxBitrateForFrameSize, getVideoInputDevices, logger, setLogHandler, setLogLevel, setOnDeviceChangeHandler };
 //# sourceMappingURL=index.js.map