@rongcloud/plugin-rtc 5.2.2-alpha.1 → 5.2.4-beem.1

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.2-alpha.1
- * CommitId - de4f9bc28bbee35d2d5f206a68144c89c098573f
- * Mon Nov 22 2021 10:51:42 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.1
+ * CommitId - d026964c6715be7805a3e5c8addd64d4008d17bd
+ * Thu May 12 2022 18:57:27 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { Logger, EventEmitter, isNumber, ErrorCode, ConnectionStatus, assert, ConversationType, RTCApiType, validate, isArray, RTCMode, isHttpUrl, isBoolean, HttpMethod, isString, notEmptyString, RTCJoinType, RTCIdentityChangeType, VersionManage } from '@rongcloud/engine';
@@ -5600,6 +5600,25 @@ var RCResolution;
     RCResolution["W1920_H1080"] = "W1920_H1080";
 })(RCResolution || (RCResolution = {}));
 
+/**
+ * 媒体资源类型
+ */
+var RCMediaType;
+(function (RCMediaType) {
+    /**
+     * 音频流
+     */
+    RCMediaType[RCMediaType["AUDIO_ONLY"] = 0] = "AUDIO_ONLY";
+    /**
+     * 视频流
+     */
+    RCMediaType[RCMediaType["VIDEO_ONLY"] = 1] = "VIDEO_ONLY";
+    /**
+     * 音视频混合流，只在 web 端存在混合流的情况
+     */
+    RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
+})(RCMediaType || (RCMediaType = {}));
+
 const RongRTCVideoBitrate = {
     [RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
     [RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -6118,6 +6137,40 @@ class RCCameraVideoTrack extends RCLocalVideoTrack {
 class RCScreenVideoTrack extends RCLocalVideoTrack {
 }
 
+class RCRemoteTrack extends RCTrack {
+    constructor(tag, userId, kind, roomId) {
+        super(tag, userId, kind, false, roomId);
+        this._isSubscribed = false;
+    }
+    /**
+     * 根据房间数据更新状态
+     * @param value
+     */
+    __innerSetRemoteMuted(bool) {
+        this._remoteMuted = bool;
+    }
+    __innerSetSubscribed(bool) {
+        this._isSubscribed = bool;
+    }
+    /**
+     * 查看是否已订阅了该远端资源
+     * @returns
+     */
+    isSubscribed() {
+        return this._isSubscribed;
+    }
+}
+class RCRemoteAudioTrack extends RCRemoteTrack {
+    constructor(tag, userId, roomId) {
+        super(tag, userId, 'audio', roomId);
+    }
+}
+class RCRemoteVideoTrack extends RCRemoteTrack {
+    constructor(tag, userId, roomId) {
+        super(tag, userId, 'video', roomId);
+    }
+}
+
 /**
  * 构建增量消息内容
  * @param objectname 消息名
@@ -6392,6 +6445,79 @@ const parseRoomData = (data) => {
     });
     return result;
 };
+/**
+ * 解析观众加房间 kv 数据
+ * 远端无人员时，kvEntries 的 key 不包含 RC_ANCHOR_LIST
+ * 远端无资源时，key 不包含 RC_RES_、RC_CDN
+ * 远端有资源、无 CDN 资源时，key 不包含 RC_CDN
+ */
+const parseAudienceRoomData = (roomId, kvEntries) => {
+    const sessionId = kvEntries.filter((kvItem) => {
+        return kvItem.key === 'RC_RTC_SESSIONID';
+    })[0].value;
+    /**
+     * 房间内远端人员
+     */
+    const remoteUserIds = kvEntries.filter((kvItem) => {
+        return kvItem.key === 'RC_ANCHOR_LIST';
+    }).map((kvItem) => JSON.parse(kvItem.value || '[]'))[0];
+    /**
+     * 远端 RTC、MUC 资源
+     */
+    const remoteRes = kvEntries.filter((kvItem) => {
+        return kvItem.key.includes('RC_RES_');
+    }).map((kvItem) => JSON.parse(kvItem.value || '{}'));
+    /**
+     * 远端 MUC 资源
+     */
+    const remoteMUCUris = remoteRes.length ? JSON.parse(remoteRes[0].mcu_uris || '[]') : [];
+    /**
+     * 远端 MUC tracks
+     */
+    const remoteMCUTracks = [];
+    remoteMUCUris.forEach((uri) => {
+        const { mediaType, tag } = uri;
+        const track = mediaType === RCMediaType.AUDIO_ONLY ? new RCRemoteAudioTrack(tag, '', roomId) : new RCRemoteVideoTrack(tag, '', roomId);
+        remoteMCUTracks.push(track);
+    });
+    /**
+     * 远端 RTC 资源
+     */
+    const remoteRTCUris = [];
+    /**
+     * 远端 RTC tracks
+     */
+    const remoteRTCTracks = [];
+    remoteRes.forEach((res) => {
+        const RTCUris = JSON.parse(res.uris || '[]');
+        remoteRTCUris.push(...RTCUris);
+        RTCUris.forEach((uri) => {
+            const { mediaType, tag, msid } = uri;
+            const userId = msid.split('_')[0];
+            const track = mediaType === RCMediaType.AUDIO_ONLY ? new RCRemoteAudioTrack(tag, userId) : new RCRemoteVideoTrack(tag, userId);
+            remoteRTCTracks.push(track);
+        });
+    });
+    /**
+     * 房间内 CDN 信息
+     */
+    const CDNUris = kvEntries.filter((kvItem) => {
+        return kvItem.key === 'RC_CDN';
+    }).map((kvItem) => {
+        const CDNUriStr = JSON.parse(kvItem.value || '[]');
+        return JSON.parse(CDNUriStr.cdn_uris)[0];
+    })[0];
+    return {
+        sessionId,
+        remoteUserIds: remoteUserIds || [],
+        remoteRTCUris,
+        remoteMUCUris,
+        remoteRTCTracks,
+        remoteMCUTracks,
+        remoteTracks: [...remoteRTCTracks, ...remoteMCUTracks],
+        CDNUris: CDNUris || {}
+    };
+};
 
 /**
  * RTC 消息类型常量
@@ -6557,7 +6683,7 @@ const handleAudioLevel = (audioLevel, factor = 2) => {
         audioLevel = audioLevel / 32767;
     }
     const rate = 10 ** factor;
-    return Math.floor(audioLevel * rate);
+    return Math.ceil(audioLevel * rate);
 };
 /**
  * 计算丢包率
@@ -6599,25 +6725,6 @@ const senderHasRemoteData = (sender) => {
     return true;
 };
 
-/**
- * 媒体资源类型
- */
-var RCMediaType;
-(function (RCMediaType) {
-    /**
-     * 音频流
-     */
-    RCMediaType[RCMediaType["AUDIO_ONLY"] = 0] = "AUDIO_ONLY";
-    /**
-     * 视频流
-     */
-    RCMediaType[RCMediaType["VIDEO_ONLY"] = 1] = "VIDEO_ONLY";
-    /**
-     * 音视频混合流，只在 web 端存在混合流的情况
-     */
-    RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
-})(RCMediaType || (RCMediaType = {}));
-
 class AbstractStatParser {
     constructor(_rtcPeerConn, _sdpSemantics) {
         this._rtcPeerConn = _rtcPeerConn;
@@ -7075,7 +7182,7 @@ class RTCReportParser$2 extends AbstractStatParser {
             }
             const { trackId } = inboundInfo;
             // inboundInfo 中取不到 audioLevel 时，需从 type 为 track 中取
-            const { audioLevel } = inboundInfo || stats[trackId];
+            const audioLevel = inboundInfo.audioLevel || stats[trackId].audioLevel;
             const resourceId = this.getResourceIdByParseSdp(inboundInfo);
             audioLevelList.push({
                 trackId: resourceId,
@@ -7488,6 +7595,7 @@ class ASdpStrategy {
      */
     static setSdpSemantics(sdpSemantics) {
         const { browser, version, supportsUnifiedPlan } = browserInfo;
+        logger.debug(`sdpSemantics, browser: ${browser}, version: ${version}, supportsUnifiedPlan: ${supportsUnifiedPlan}`);
         // 在明确不支持 unified-plan 的版本中使用 plan-b
         if (!supportsUnifiedPlan) {
             this._sdpSemantics = 'plan-b';
@@ -7764,8 +7872,12 @@ class UnifiedPlanStrategy extends ASdpStrategy {
         removeTracks.length && removeTracks.forEach(item => {
             const trackId = item.getTrackId();
             item.__innerSetMediaStreamTrack(undefined);
+            /**
+             * peerConnection ontrack 回调参数 RTCTrackEvent 对象中 streams 为 [] 时，服务端无资源，不会添加 transceiver
+             * 需兼容无 transceiver 的情况
+             */
             const transceiver = this._recvTransceiver[trackId];
-            transceiver.direction = 'inactive';
+            transceiver && (transceiver.direction = 'inactive');
         });
         const addCount = { audio: 0, video: 0 };
         addTracks.length && addTracks.forEach(item => {
@@ -7917,6 +8029,14 @@ class RCRTCPeerConnection extends EventEmitter {
         }
     }
     _onTrackReady(evt) {
+        /**
+         * signal 和 mediaServer 不同步时，signal 有资源，mediaServer 没资源，
+         * 订阅 mediaServer 不存在的资源时，对应 answer sdp 中的通道没有 ssrc，
+         * ontrack 会被触发，但 RTCTrackEvent 对象中的 streams 为 []，需兼容
+         */
+        if (!evt.streams.length) {
+            return;
+        }
         // 更新 transceiver 与 trackId 的订阅关系
         const msid = evt.streams[0].id;
         const track = evt.receiver.track;
@@ -7933,13 +8053,13 @@ class RCRTCPeerConnection extends EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             const offer = yield this._sdpStrategy.createOffer(iceRestart);
             // logger.debug(`sdpDemantics -> ${offer.semantics}`)
-            // logger.debug(`offer -> ${JSON.stringify(offer.sdp)}`)
+            logger.debug(`offer -> ${JSON.stringify(offer.sdp)}`);
             return offer;
         });
     }
     setRemoteAnswer(answer) {
         return __awaiter(this, void 0, void 0, function* () {
-            // logger.debug(`answer -> ${JSON.stringify(answer)}`)
+            logger.debug(`answer -> ${JSON.stringify(answer)}`);
             return this._sdpStrategy.setRemoteAnswer(answer);
         });
     }
@@ -8314,7 +8434,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.2-alpha.1";
+        const rtcVersion = "5.2.4-beem.1";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8336,40 +8456,6 @@ class PolarisReporter {
     }
 }
 
-class RCRemoteTrack extends RCTrack {
-    constructor(tag, userId, kind, roomId) {
-        super(tag, userId, kind, false, roomId);
-        this._isSubscribed = false;
-    }
-    /**
-     * 根据房间数据更新状态
-     * @param value
-     */
-    __innerSetRemoteMuted(bool) {
-        this._remoteMuted = bool;
-    }
-    __innerSetSubscribed(bool) {
-        this._isSubscribed = bool;
-    }
-    /**
-     * 查看是否已订阅了该远端资源
-     * @returns
-     */
-    isSubscribed() {
-        return this._isSubscribed;
-    }
-}
-class RCRemoteAudioTrack extends RCRemoteTrack {
-    constructor(tag, userId, roomId) {
-        super(tag, userId, 'audio', roomId);
-    }
-}
-class RCRemoteVideoTrack extends RCRemoteTrack {
-    constructor(tag, userId, roomId) {
-        super(tag, userId, 'video', roomId);
-    }
-}
-
 /**
  * 北极星上报 R2 参数
  */
@@ -8678,15 +8764,18 @@ class RCAbstractRoom {
         logger.warn(`onKickOff -> byServer: ${byServer}`);
         this._ntfClearRoomItem();
         this._leaveHandle(!byServer);
+        // 扩展字段，备注用户为什么被踢出房间
+        let kickExtra;
         let kickType;
         if (byServer) {
             ((content === null || content === void 0 ? void 0 : content.users) || []).forEach(item => {
                 if (item.userId === this._context.getCurrentId()) {
                     kickType = item.type;
+                    kickExtra = item.kickExtra;
                 }
             });
         }
-        this._callAppListener('onKickOff', byServer, kickType);
+        this._callAppListener('onKickOff', byServer, kickType, kickExtra);
     }
     _rtcpeerClosed() {
         this._ntfClearRoomItem();
@@ -8707,7 +8796,8 @@ class RCAbstractRoom {
                 return;
             }
             const { uris, ignore } = content;
-            if (ignore) {
+            // 内置 CDN 为自动时，先收到 cdn_uris，无 uris 时，不用再对比资源
+            if (ignore || !uris) {
                 return;
             }
             const publishedList = [];
@@ -9300,14 +9390,13 @@ class RCAbstractRoom {
                 extend: JSON.stringify({
                     resolutionInfo: this._pc.getOutboundVideoInfo()
                 }),
-                /**
-                 * 需过滤房间内不存在的资源
-                 */
                 subscribeList: subscribeList.filter((item) => {
-                    var _a;
                     const trackId = item.track.getTrackId();
                     const { userId } = parseTrackId(trackId);
-                    const isInclude = (_a = this._roomResources[userId]) === null || _a === void 0 ? void 0 : _a.filter(item => trackId === `${item.msid}_${item.mediaType}`).length;
+                    if (!this._roomResources[userId]) {
+                        return false;
+                    }
+                    const isInclude = this._roomResources[userId].filter(item => trackId === `${item.msid}_${item.mediaType}`).length;
                     return isInclude;
                 }).map(item => ({
                     simulcast: item.subTiny ? RCStreamType.TINY : RCStreamType.NORMAL,
@@ -9608,7 +9697,7 @@ class RCAbstractRoom {
             if (result.code !== RCRTCCode.SUCCESS) {
                 return { code: result.code };
             }
-            const { sdp: answer, resultCode, message } = result.data;
+            const { sdp: answer, resultCode, message, subscribedList } = result.data;
             if (resultCode !== RCRTCCode.SUCCESS) {
                 logger.error(`change subscribe list failed: ${resultCode}`);
                 return { code: resultCode };
@@ -9618,14 +9707,18 @@ class RCAbstractRoom {
             if (resCode !== RCRTCCode.SUCCESS) {
                 return { code: resCode };
             }
+            // 获取真正订阅成功的资源
+            const subSuccessTrackIds = subscribedList === null || subscribedList === void 0 ? void 0 : subscribedList.map(item => `${item.msid}_${item.mediaType}`);
+            const subSuccessList = attrs.filter(item => subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId()));
+            const failedList = attrs.filter(item => !(subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId())));
             // 更新 remoteTrack.isSubscribed
             for (const trackId in this._remoteTracks) {
-                const subed = attrs.some(item => item.track.getTrackId() === trackId);
+                const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
                 this._remoteTracks[trackId].__innerSetSubscribed(subed);
             }
             // 更新本地订阅关系
-            this._subscribedList.splice(0, this._subscribedList.length, ...attrs);
-            return { code: RCRTCCode.SUCCESS };
+            this._subscribedList.splice(0, this._subscribedList.length, ...subSuccessList);
+            return failedList.length ? { code: RCRTCCode.SUCCESS, failedList } : { code: RCRTCCode.SUCCESS };
         });
     }
     /**
@@ -10583,7 +10676,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.2.2-alpha.1",
+    ClientVersion: "5.2.4-beem.1",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -11050,14 +11143,28 @@ class RCAudienceLivingRoom {
         this._roomId = _roomId;
         this._joinResData = _joinResData;
         this._livingType = _livingType;
+        /**
+         * 主播列表
+         */
         this._roomAnchorList = [];
+        /**
+         * 合流、分流资源
+         */
         this._roomRes = {};
+        /**
+         * 主播分流资源
+         */
         this._roomAnchorRes = {};
+        /**
+         * 合流、分流 remoteTracks
+         */
         this._remoteTracks = {};
         this._appListener = null;
         this._subscribedList = [];
         this._sessionId = '';
         this._destroyed = false;
+        // 解析服务返回的 KV 数据，并赋值房间内数据
+        this._setInitData();
         this._service = new RCMediaService(this._runtime, this._context, this._initOptions.mediaServer, this._initOptions.timeout);
         // 北极星数据
         this._polarisReport = new PolarisReporter(this._context, this._runtime, this._roomId, this, PolarisRole.Audience);
@@ -11079,6 +11186,54 @@ class RCAudienceLivingRoom {
         // 房间主播加入|离开房间、发布|取消发布资源变更监听
         this._context.onrtcdatachange = this.singalDataChange.bind(this);
     }
+    /**
+     * 解析服务端返回的 KV 数据，赋值 room 内数据
+     */
+    _setInitData() {
+        const { sessionId, remoteUserIds, remoteRTCUris, remoteMUCUris, remoteTracks, CDNUris } = parseAudienceRoomData(this._roomId, this._joinResData.kvEntries);
+        /**
+         * session 赋值
+         */
+        this._sessionId = sessionId;
+        /**
+         * 主播列表赋值
+         */
+        this._roomAnchorList = remoteUserIds;
+        /**
+         * RTC、MCU tracks 赋值
+         */
+        remoteTracks.forEach((track) => {
+            this._remoteTracks[track.getTrackId()] = track;
+        });
+        /**
+         * _CDNUris 赋值
+         */
+        this._CDNUris = CDNUris;
+        /**
+         * 房间内 RTC 资源赋值
+         */
+        remoteRTCUris.forEach((uri) => {
+            const userId = uri.msid.split('_')[0];
+            if (this._roomAnchorRes[userId]) {
+                this._roomAnchorRes[userId].push(uri);
+            }
+            else {
+                this._roomAnchorRes[userId] = [uri];
+            }
+        });
+        /**
+         * 房间内 RTC、MCU 资源赋值
+         */
+        remoteMUCUris.forEach((uri) => {
+            const { mediaType, tag } = uri;
+            const trackId = [this._roomId, tag, mediaType].join('_');
+            this._roomRes[trackId] = uri;
+        });
+        remoteRTCUris.forEach((uri) => {
+            const trackId = getTrackId(uri);
+            this._roomRes[trackId] = uri;
+        });
+    }
     _assertRoomDestroyed() {
         if (this._destroyed) {
             const msg = 'This room has been destroyed. Please use `RCRTCClient.joinLivingRoomAsAudience` to catch another instance.';
@@ -11128,9 +11283,6 @@ class RCAudienceLivingRoom {
                     this._handleLeftedAnchor(leftUserIds);
                 }
             }
-            if (key === 'RC_RTC_SESSIONID') {
-                this._sessionId = value;
-            }
         });
         // 处理直播间 MCU 合流资源资源
         this._diffRoomResource(allMcuUris);
@@ -11536,7 +11688,7 @@ class RCAudienceLivingRoom {
             if (result.code !== RCRTCCode.SUCCESS) {
                 return { code: result.code };
             }
-            const { sdp: answer, resultCode, message } = result.data;
+            const { sdp: answer, resultCode, message, subscribedList } = result.data;
             if (resultCode !== RCRTCCode.SUCCESS) {
                 logger.error('change subscribe list failed:', message, resultCode);
                 return { code: resultCode };
@@ -11555,16 +11707,28 @@ class RCAudienceLivingRoom {
             if (resCode !== RCRTCCode.SUCCESS) {
                 return { code: resCode };
             }
+            // 获取真正订阅成功的资源
+            const subSuccessTrackIds = subscribedList === null || subscribedList === void 0 ? void 0 : subscribedList.map(item => `${item.msid}_${item.mediaType}`);
+            const subSuccessList = attrs.filter(item => {
+                if (item.track.isMCUTrack()) {
+                    const serverTrackInfo = this._roomRes[item.track.getTrackId()];
+                    const sdpResourceId = `${serverTrackInfo.msid}_${serverTrackInfo.mediaType}`;
+                    return subSuccessTrackIds.includes(sdpResourceId);
+                }
+                return subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId());
+            });
+            const afterReplaceTrackIds = subSuccessList === null || subSuccessList === void 0 ? void 0 : subSuccessList.map(item => `${item.track.getTrackId()}`);
+            const failedList = attrs.filter(item => !(afterReplaceTrackIds === null || afterReplaceTrackIds === void 0 ? void 0 : afterReplaceTrackIds.includes(item.track.getTrackId())));
             // 更新 remoteTrack.isSubscribed
             for (const trackId in this._remoteTracks) {
-                const subed = attrs.some(item => {
+                const subed = subSuccessList.some(item => {
                     return item.track.getTrackId() === trackId;
                 });
                 this._remoteTracks[trackId].__innerSetSubscribed(subed);
             }
             // 更新本地订阅关系
-            this._subscribedList.splice(0, this._subscribedList.length, ...attrs);
-            return { code: RCRTCCode.SUCCESS };
+            this._subscribedList.splice(0, this._subscribedList.length, ...subSuccessList);
+            return failedList.length ? { code: RCRTCCode.SUCCESS, failedList } : { code: RCRTCCode.SUCCESS };
         });
     }
     /**
@@ -11572,12 +11736,11 @@ class RCAudienceLivingRoom {
      * @param newCDNUris 新的 cdn_uris 数据
      */
     _diffCDNUris(newCDNUris) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             /**
              * CDN 资源减少: 上次 CDNUris 中有 url，变更后无 url
              */
-            if (((_a = this._CDNUris) === null || _a === void 0 ? void 0 : _a.url) && !newCDNUris.url) {
+            if (this._CDNUris.url && !newCDNUris.url) {
                 this._callAppListener('onCDNInfoDisable');
                 /**
                  * 更新内存中存储的 cdn_uris 数据
@@ -11590,22 +11753,22 @@ class RCAudienceLivingRoom {
              * 内存中无 CDNUris 或
              * 上次 CDNUris 无 url，变更后有 url
              */
-            if (!this._CDNUris || (!((_b = this._CDNUris) === null || _b === void 0 ? void 0 : _b.url) && newCDNUris.url)) {
+            if (!this._CDNUris || (!this._CDNUris.url && newCDNUris.url)) {
                 this._callAppListener('onCDNInfoEnable', {
                     resolution: `W${newCDNUris.w}_H${newCDNUris.h}`,
-                    fps: newCDNUris.fps
+                    fps: `FPS_${newCDNUris.fps}`
                 });
             }
             /**
              * CDN 资源变更: w、h、fps 其中一项变化
              */
-            const isWChange = (((_c = this._CDNUris) === null || _c === void 0 ? void 0 : _c.w) && newCDNUris.w && (((_d = this._CDNUris) === null || _d === void 0 ? void 0 : _d.w) !== newCDNUris.w));
-            const isHChange = (((_e = this._CDNUris) === null || _e === void 0 ? void 0 : _e.h) && newCDNUris.h && (((_f = this._CDNUris) === null || _f === void 0 ? void 0 : _f.h) !== newCDNUris.h));
-            const isFpsChange = (((_g = this._CDNUris) === null || _g === void 0 ? void 0 : _g.fps) && newCDNUris.fps && (((_h = this._CDNUris) === null || _h === void 0 ? void 0 : _h.fps) !== newCDNUris.fps));
+            const isWChange = (this._CDNUris.w && newCDNUris.w && (this._CDNUris.w !== newCDNUris.w));
+            const isHChange = (this._CDNUris.h && newCDNUris.h && (this._CDNUris.h !== newCDNUris.h));
+            const isFpsChange = (this._CDNUris.fps && newCDNUris.fps && (this._CDNUris.fps !== newCDNUris.fps));
             if (isWChange || isHChange || isFpsChange) {
                 this._callAppListener('onCDNInfoChange', {
                     resolution: `W${newCDNUris.w}_H${newCDNUris.h}`,
-                    fps: newCDNUris.fps
+                    fps: `FPS_${newCDNUris.fps}`
                 });
             }
             /**
@@ -11616,21 +11779,16 @@ class RCAudienceLivingRoom {
     }
     /**
      * 获取 CDN 资源对应的拉流地址
-     * 首次获取 CDNPlayUrl 时，需传入 url，
-     * 业务层调用时使用内存中 _CDNUris 的 url，无 _CDNUris 时说明观众端未赋值过 _CDNUris
+     * _CDNUris 无 url 时，说明未开启 CDN 推送
      * @returns CDNPlayUrl
      */
-    _getCDNPlayUrl(params, url) {
-        var _a, _b;
+    _getCDNPlayUrl(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { w, h, fps } = params;
             const kind = this._initOptions.pullInnerCDNProtocol || RCInnerCDNPullKind.FLV;
             const useHttps = (this._initOptions.pullInnerCDNUseHttps === RCInnerCDNPullIsHttps.NOT_HTTPS) ? RCInnerCDNPullIsHttps.NOT_HTTPS : RCInnerCDNPullIsHttps.HTTPS;
-            /**
-             * 加入房间后拉 KV 数据，数据还未返回时，同步拉 KV 获取 CDN 信息
-             */
-            if (!((_a = this._CDNUris) === null || _a === void 0 ? void 0 : _a.url) && !url) {
-                logger.error(`cdn_uris url is empty, the anchor need to start CDN, code: ${RCRTCCode.CDN_RESOURCE_IS_EMPTY}`);
+            if (!this._CDNUris.url) {
+                logger.error(`cdn_uris url is empty, the anchor need to open or push CDN, code: ${RCRTCCode.CDN_RESOURCE_IS_EMPTY}`);
                 return { code: RCRTCCode.CDN_RESOURCE_IS_EMPTY };
             }
             const headers = {
@@ -11647,7 +11805,7 @@ class RCAudienceLivingRoom {
             paramsArr.push(`kind=${kind}`);
             paramsArr.push(`is_https=${useHttps}`);
             const paramsStr = paramsArr.join('&');
-            let requestUrl = `${url || ((_b = this._CDNUris) === null || _b === void 0 ? void 0 : _b.url)}?`;
+            let requestUrl = `${this._CDNUris.url}?`;
             paramsStr && (requestUrl += paramsStr);
             const { code, res } = yield this._service.getCDNResourceInfo(headers, requestUrl);
             if (code !== RCRTCCode.SUCCESS) {
@@ -11784,12 +11942,7 @@ class RCAudienceLivingRoom {
      * @param tag 参数描述
      */
     registerRoomEventListener(listener) {
-        var _a;
         this._appListener = listener;
-        if (!listener) {
-            return;
-        }
-        ((_a = this._joinResData.kvEntries) === null || _a === void 0 ? void 0 : _a.length) && this.singalDataChange(this._joinResData.kvEntries, this._roomId);
     }
     /**
      * 音量上报
@@ -11870,6 +12023,44 @@ class RCAudienceLivingRoom {
         });
         return [...mcuTracks, ...tracks];
     }
+    /**
+     * 获取远端 RTC tracks
+     */
+    getRemoteRTCTracks() {
+        const tracks = [];
+        for (const trackId in this._remoteTracks) {
+            const track = this._remoteTracks[trackId];
+            if (!track.isMCUTrack()) {
+                tracks.push(track);
+            }
+        }
+        return tracks;
+    }
+    /**
+     * 获取远端 MCU tracks
+     */
+    getRemoteMCUTracks() {
+        const tracks = [];
+        for (const trackId in this._remoteTracks) {
+            const track = this._remoteTracks[trackId];
+            if (track.isMCUTrack()) {
+                tracks.push(track);
+            }
+        }
+        return tracks;
+    }
+    /**
+     * 获取房间内 CDN 信息
+     */
+    getCDNInfo() {
+        return this._CDNUris.w ? {
+            resolution: `W${this._CDNUris.w}_H${this._CDNUris.h}`,
+            fps: `FPS_${this._CDNUris.fps}`,
+            CDNEnable: this._CDNUris.enableInnerCDN
+        } : {
+            CDNEnable: false
+        };
+    }
 }
 
 const getTracksWithOptions = (stream, options) => {
@@ -11921,11 +12112,15 @@ class RCRTCClient {
     /**
      * 加入普通音视频房间
      * @param roomId
+     * @param joinType 多端处理方式
+     * @param outerUserDatas 业务层设置人员属性
+     * @param useMutilPeerC
+     * @param roomType 加入房间的类型 默认参数 RTCMode.RTC
      */
-    joinRTCRoom(roomId, joinType) {
-        return push(() => this._joinRTCRoom(roomId, joinType));
+    joinRTCRoom(roomId, joinType, outerUserDatas, useMutilPeerC, roomType = RTCMode.RTC) {
+        return push(() => this._joinRTCRoom(roomId, joinType, outerUserDatas, useMutilPeerC, roomType));
     }
-    _joinRTCRoom(roomId, joinType) {
+    _joinRTCRoom(roomId, joinType, outerUserDatas, useMutilPeerC, roomType = RTCMode.RTC) {
         return __awaiter(this, void 0, void 0, function* () {
             if (isIllegalConnection(this._context.getNaviInfo())) {
                 return { code: RCRTCCode.PACKAGE_ENVIRONMENT_ERROR };
@@ -11933,6 +12128,9 @@ class RCRTCClient {
             if (!validate('roomId', roomId, notEmptyString, true)) {
                 return { code: RCRTCCode.PARAMS_ERROR };
             }
+            if (!validate('roomType', roomType, (value) => RTCMode[value] !== undefined)) {
+                return { code: RCRTCCode.PARAMS_ERROR };
+            }
             if (this._crtRoom) {
                 return { code: RCRTCCode.REPERT_JOIN_ROOM };
             }
@@ -11943,8 +12141,8 @@ class RCRTCClient {
             if (!urls.length) {
                 return { code: RCRTCCode.NOT_OPEN_VIDEO_AUDIO_SERVER };
             }
-            logger.debug(`joinRoom -> roomId: ${roomId}; joinType: ${joinType || RTCJoinType.KICK}`);
-            const { code, data } = yield this._context.joinRTCRoom(roomId, RTCMode.RTC, undefined, joinType);
+            logger.debug(`joinRoom -> roomId: ${roomId}; joinType: ${joinType || RTCJoinType.KICK} roomType: ${roomType}`);
+            const { code, data } = yield this._context.joinRTCRoom(roomId, roomType, undefined, joinType);
             if (code !== ErrorCode.SUCCESS) {
                 logger.error(`joinRoom failed -> code: ${code}`);
                 const errorCode = code === RTCSignalCode.JOIN_REFUSED ? RCRTCCode.SIGNAL_JOIN_RTC_ROOM_REFUSED : code;
@@ -12375,7 +12573,14 @@ class RCRTCClient {
             logger.info(`joinLivingRoomAsAudience success, room data: ${JSON.stringify(data)}`);
             const room = new RCAudienceLivingRoom(this._context, this._runtime, this._options, roomId, data, livingType);
             this._crtAudienceLivingRoom = room;
-            return { room, code: RCRTCCode.SUCCESS };
+            return {
+                room,
+                code: RCRTCCode.SUCCESS,
+                userIds: room.getRemoteUserIds(),
+                RTCTracks: room.getRemoteRTCTracks(),
+                MCUTracks: room.getRemoteMCUTracks(),
+                CDNUris: room.getCDNInfo()
+            };
         });
     }
     /**
@@ -12446,7 +12651,14 @@ class RCRTCClient {
             this._crtRoom.__destroy(false);
             // 重置主播房间
             this._crtRoom = null;
-            return { room: crtRoom, code: RCRTCCode.SUCCESS };
+            return {
+                room: crtRoom,
+                code: RCRTCCode.SUCCESS,
+                userIds: crtRoom.getRemoteUserIds(),
+                RTCTracks: crtRoom.getRemoteRTCTracks(),
+                MCUTracks: crtRoom.getRemoteMCUTracks(),
+                CDNUris: crtRoom.getCDNInfo()
+            };
         });
     }
     /**
@@ -12492,9 +12704,9 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        VersionManage.add('plugin-rtc', "5.2.2-alpha.1");
-        if (!VersionManage.validEngine("~4.5.1")) {
-            logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"~4.5.1"}'.`);
+        VersionManage.add('plugin-rtc', "5.2.4-beem.1");
+        if (!VersionManage.validEngine("4.6.0-beem.5")) {
+            logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
             return false;
         }
         return true;
@@ -12502,7 +12714,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.2-alpha.1"}, Commit: ${"de4f9bc28bbee35d2d5f206a68144c89c098573f"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.1"}, Commit: ${"d026964c6715be7805a3e5c8addd64d4008d17bd"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);