@rongcloud/plugin-rtc 5.5.5-beem → 5.5.5-beem-alpha.4

package/dist/index.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.5.5-beem
- * CommitId - b8e57d36680c1d71921cded6b91771d4dfd4f3e8
- * Fri Oct 14 2022 19:54:22 GMT+0800 (China Standard Time)
+ * RCRTC - v5.5.5-beem-alpha.4
+ * CommitId - 0c078c138d99c8962f00f41c7d9a82e1d0f13b5a
+ * Thu Oct 20 2022 17:51:40 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -861,6 +861,38 @@ var RCLoggerTag;
      * 旧版日志
      */
     RCLoggerTag["L_OLD_DAILY_RECORD_O"] = "L-old_daily_record-O";
+    /**
+     * 远端用户加入房间后的本地存储的用户资源列表
+     */
+    RCLoggerTag["L_REMOTE_USER_JOINED_RESOURCES_O"] = "L-remote_user_joined_resources-O";
+    /**
+     * 远端用户在房间中状态变化的回调
+     */
+    RCLoggerTag["L_REMOTE_USER_STATE_HANDLE_O"] = "L-remote_user_state_handle-O";
+    /**
+     * 北极星 TCP 通道发送的数据类型
+    */
+    RCLoggerTag["L_CMP_POLARIS_REPORT_TYPE_O"] = "L-cmp_polaris_report_type-O";
+    /**
+     * 北极星 TCP 通道数据发送任务
+    */
+    RCLoggerTag["L_CMP_POLARIS_REPORT_T"] = "L-cmp_polaris_report-T";
+    /**
+     * 北极星 TCP 通道数据发送结果
+    */
+    RCLoggerTag["L_CMP_POLARIS_REPORT_R"] = "L-cmp_polaris_report-R";
+    /**
+     * 北极星 HTTP 通道发送数据任务
+    */
+    RCLoggerTag["L_HTTP_POLARIS_REPORT_T"] = "L-http_polaris_report-T";
+    /**
+     * 北极星 HTTP 通道发送数据结果
+    */
+    RCLoggerTag["L_HTTP_POLARIS_REPORT_R"] = "L-http_polaris_report-R";
+    /**
+     * 北极星 HTTP 通道发送数据类型
+    */
+    RCLoggerTag["L_HTTP_POLARIS_REPORT_TYPE_O"] = "L-http_polaris_report_type-O";
 })(RCLoggerTag || (RCLoggerTag = {}));
 var RCLoggerStatus;
 (function (RCLoggerStatus) {
@@ -14655,7 +14687,7 @@ const getCommonHeader$1 = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.5.5-beem",
+    ClientVersion: "5.5.5-beem-alpha.4",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -14783,7 +14815,7 @@ class Memo {
             this._memo = new Memo();
         }
         // 方便调试使用
-        // (window as any).__memo__ = this._memo;
+        window.__memo__ = this._memo;
         return this._memo;
     }
     static destroy() {
@@ -14795,7 +14827,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.5.5-beem",
+    ClientVersion: "5.5.5-beem-alpha.4",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15312,6 +15344,20 @@ class SdpResource {
     }
 }
 
+class SourceIdMap {
+    constructor() { }
+    static getInstance() {
+        if (!this._instance) {
+            this._instance = new Map([['sourceIdForPublishMap', new Map()], ['sourceIdForSubscribeMap', new Map()]]);
+        }
+        return this._instance;
+    }
+    static destroy() {
+        this._instance = new Map([['sourceIdForPublishMap', new Map()], ['sourceIdForSubscribeMap', new Map()]]);
+    }
+}
+SourceIdMap._instance = new Map([['sourceIdForPublishMap', new Map()], ['sourceIdForSubscribeMap', new Map()]]);
+
 class AbstractStatParser {
     constructor(_rtcPeerConn, _sdpSemantics, _currentUserId) {
         this._rtcPeerConn = _rtcPeerConn;
@@ -15471,15 +15517,9 @@ class AbstractStatParser {
     }
     parseRTCStatsReport(reports) {
         const stats = {};
-        let flag = 0;
-        for (let name of reports.keys()) {
-            if (/RTCInbound/.test(name)) {
-                flag++;
-            }
-        }
         for (const key of reports.keys()) {
             // 过滤下行数据上报
-            if (!key.includes('RTCCodec_') && !(flag > 9 && key.includes('RTCInbound'))) {
+            if (!key.includes('RTCCodec_')) {
                 stats[key] = reports.get(key);
             }
         }
@@ -15508,31 +15548,21 @@ class AbstractStatParser {
      * @returns resourceId
      */
     getResourceIdByParseSdp(statInfo) {
-        var _a, _b;
         const { ssrc } = statInfo;
         const kind = statInfo.kind || statInfo.mediaType;
-        const offer = (_a = this._rtcPeerConn.currentLocalDescription) === null || _a === void 0 ? void 0 : _a.sdp;
-        const answer = (_b = this._rtcPeerConn.currentRemoteDescription) === null || _b === void 0 ? void 0 : _b.sdp;
-        let rule;
-        if (this._sdpSemantics === 'unified-plan') {
-            rule = new RegExp('a=msid:(.*?) ');
-        }
-        else {
-            rule = new RegExp(`a=ssrc:${ssrc} msid:(.*?) `);
-        }
-        const offerMArr = offer === null || offer === void 0 ? void 0 : offer.split('\r\nm=');
-        const selectOfferM = offerMArr === null || offerMArr === void 0 ? void 0 : offerMArr.filter((item) => item.includes(`a=ssrc:${ssrc}`))[0];
-        const matchOffer = selectOfferM === null || selectOfferM === void 0 ? void 0 : selectOfferM.match(rule);
-        let msid = matchOffer ? matchOffer[1] : '';
-        if (msid) {
+        const sourceIdMap = SourceIdMap.getInstance();
+        const sourceIdForPublishMap = sourceIdMap.get('sourceIdForPublishMap');
+        const sourceIdForSubscribeMap = sourceIdMap.get('sourceIdForSubscribeMap');
+        let publishRes = sourceIdForPublishMap === null || sourceIdForPublishMap === void 0 ? void 0 : sourceIdForPublishMap.get(String(ssrc));
+        if (publishRes) {
             if (kind === 'audio') {
-                return `${msid}_0`;
+                return `${publishRes}_0`;
             }
             /**
              * msid 为 userId_tag 或 userId_tag_tiny
              * 截取完 userId 之后，仅剩 tag 或 tag_tiny
              */
-            const tag = msid.replace(`${this._currentUserId}_`, '');
+            const tag = publishRes.replace(`${this._currentUserId}_`, '');
             const splitTag = tag.split('_');
             /**
              * tag 或 tag_tiny 最后一位为 tiny，且长度大于 1 时为视频小流
@@ -15541,13 +15571,10 @@ class AbstractStatParser {
                 return `${this._currentUserId}_${splitTag[0]}_1_tiny`;
             }
             // 视频大流
-            return `${msid}_1`;
+            return `${publishRes}_1`;
         }
-        const answerMArr = answer === null || answer === void 0 ? void 0 : answer.split('\r\nm=');
-        const selectAnswerM = answerMArr === null || answerMArr === void 0 ? void 0 : answerMArr.filter((item) => item.includes(`a=ssrc:${ssrc}`))[0];
-        const matchAnswer = selectAnswerM === null || selectAnswerM === void 0 ? void 0 : selectAnswerM.match(rule);
-        msid = matchAnswer ? matchAnswer[1] : '';
-        return msid ? `${msid}_${kind === 'video' ? 1 : 0}` : '';
+        let subscribeRes = sourceIdForSubscribeMap === null || sourceIdForSubscribeMap === void 0 ? void 0 : sourceIdForSubscribeMap.get(String(ssrc));
+        return subscribeRes ? `${subscribeRes}_${kind === 'video' ? 1 : 0}` : '';
     }
     /**
      * 从 offer sdp 中查找 ssrc 对应的通道是否可用
@@ -15572,6 +15599,34 @@ class AbstractStatParser {
         return !valid;
     }
 }
+/**
+ * 从sdp中解析出ssrc和msid并缓存
+ * @param sdp string
+ */
+AbstractStatParser.formatSourceIdMapFromSdp = (sdp, type) => {
+    let rule = /a=ssrc:(.*) msid:(.*?) /ig;
+    const sourceIdMap = SourceIdMap.getInstance();
+    const matchList = sdp === null || sdp === void 0 ? void 0 : sdp.match(rule);
+    if (!matchList) {
+        return;
+    }
+    if (type === 'publish') {
+        const sourceIdForPublishMap = sourceIdMap.get('sourceIdForPublishMap');
+        sourceIdForPublishMap === null || sourceIdForPublishMap === void 0 ? void 0 : sourceIdForPublishMap.clear();
+        matchList.forEach((item) => {
+            const [ssrc, msid] = item.split(' ').map((child) => child.split(':')[1]);
+            sourceIdForPublishMap === null || sourceIdForPublishMap === void 0 ? void 0 : sourceIdForPublishMap.set(ssrc, msid);
+        });
+    }
+    if (type === 'subscribe') {
+        const sourceIdForSubscribeMap = sourceIdMap.get('sourceIdForSubscribeMap');
+        sourceIdForSubscribeMap === null || sourceIdForSubscribeMap === void 0 ? void 0 : sourceIdForSubscribeMap.clear();
+        matchList.forEach((item) => {
+            const [ssrc, msid] = item.split(' ').map((child) => child.split(':')[1]);
+            sourceIdForSubscribeMap === null || sourceIdForSubscribeMap === void 0 ? void 0 : sourceIdForSubscribeMap.set(ssrc, msid);
+        });
+    }
+};
 
 /**
  * chrome 73 无 type 为 remote-inbound-rtp 的数据，上行拿不到 jetter、rtt、packetsLost 数据
@@ -17683,8 +17738,8 @@ class RCRTCPeerConnection extends engine.EventEmitter {
         return {
             timestamp,
             iceCandidatePair,
-            senders: newSenders,
-            receivers: newReceivers,
+            senders: newSenders.filter((item) => item.trackId),
+            receivers: newReceivers.filter((item) => item.trackId),
             pcName: this._pcName,
         };
     }
@@ -17964,14 +18019,15 @@ class PolarisReporter {
         this._userRole = _userRole;
     }
     _send(report) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             if (this._context.getConnectionStatus() !== engine.ConnectionStatus.CONNECTED) {
                 return RCSendCode.NOT_REPORT;
             }
-            console.log('回落 CMP 通道');
+            (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_CMP_POLARIS_REPORT_T, 'start send data by TCP');
             const rCSendCode = yield this._context.setRTCState(this._roomId, report);
             if (rCSendCode === engine.ErrorCode.SUCCESS) {
-                console.log('CMP 通道发送成功');
+                (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_CMP_POLARIS_REPORT_R, `send data success -> code: ${rCSendCode}`);
                 return RCSendCode.REPORT_SUCCESS;
             }
             return RCSendCode.REPORT_FAIL;
@@ -18018,6 +18074,7 @@ class PolarisReporter {
         return polarisTrackId;
     }
     sendR3R4Data(data) {
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const { iceCandidatePair, senders, receivers } = data;
             /**
@@ -18102,14 +18159,14 @@ class PolarisReporter {
             let senderCode = RCSendCode.REPORT_FAIL;
             r3 += R3TrackData.map((item) => `${item.trackId}\t${item.googCodecName}\t${item.audioLevel}\t${item.samplingRate}\t${item.bitrate}\t${item.packetsLostRate}\t${item.frameRate}\t${item.resolution}\t${item.googRenderDelayMs}\t${item.jitter}\t${item.nackCount}\t${item.pliCount}\t${item.rtt}\t${item.googFirsSent}\t${item.encoderImplementation}\t${item.trackState}`).join('\n');
             if (data.senders.length) {
+                (_c = (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info) === null || _c === void 0 ? void 0 : _c.call(_b, RCLoggerTag.L_CMP_POLARIS_REPORT_TYPE_O, 'send data type -> R3');
                 senderCode = yield this._send(`${r3}\r${this._userRole}`);
-                console.log('回落R3发送成功 ->', `${r3}\r${this._userRole}`);
             }
             let receiverCode = RCSendCode.REPORT_FAIL;
             r4 += R4TrackData.map((item) => `${item.trackId}\t${item.googCodecName}\t${item.audioLevel}\t${item.samplingRate}\t${item.bitrate}\t${item.packetsLostRate}\t${item.frameRate}\t${item.resolution}\t${item.googRenderDelayMs}\t${item.jitter}\t${item.nackCount}\t${item.pliCount}\t${item.rtt}\t${item.googFirsReceived}\t${item.codecImplementationName}\t${item.trackState}`).join('\n');
             if (data.receivers.length) {
+                (_f = (_e = (_d = this._context) === null || _d === void 0 ? void 0 : _d.logger) === null || _e === void 0 ? void 0 : _e.info) === null || _f === void 0 ? void 0 : _f.call(_e, RCLoggerTag.L_CMP_POLARIS_REPORT_TYPE_O, 'send data type -> R4');
                 receiverCode = yield this._send(`${r4}\r${this._userRole}`);
-                console.log('回落R4发送成功 ->', `${r4}\r${this._userRole}`);
             }
             if (senderCode !== RCSendCode.REPORT_SUCCESS && receiverCode !== RCSendCode.REPORT_SUCCESS) {
                 return RCSendCode.REPORT_FAIL;
@@ -18121,7 +18178,8 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.5.5-beem";
+        var _a, _b, _c;
+        const rtcVersion = "5.5.5-beem-alpha.4";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -18130,18 +18188,19 @@ class PolarisReporter {
         const browserVersion = browserInfo.version;
         const deviceId = this._getClientID();
         const r1 = `R1\t${rtcVersion}\t${imVersion}\t${platform}\t${pcName}\t${pcVersion}\t${browserName}\t${browserVersion}\t${deviceId}\t${this._userRole}`;
+        (_c = (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info) === null || _c === void 0 ? void 0 : _c.call(_b, RCLoggerTag.L_CMP_POLARIS_REPORT_TYPE_O, 'send data type -> R1');
         this._send(r1);
-        console.log('回落R1发送成功 ->', r1);
     }
     /**
      * RTC 和 LIVE 发布、取消发布
      * RTC 订阅、取消订阅
      */
     sendR2(action, status, trackIds) {
+        var _a, _b, _c;
         const deviceId = this._getClientID();
         const r2 = `R2\t${action}\t${status}\t${deviceId}\r${trackIds.join('\t')}\r${this._userRole}`;
+        (_c = (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info) === null || _c === void 0 ? void 0 : _c.call(_b, RCLoggerTag.L_CMP_POLARIS_REPORT_TYPE_O, 'send data type -> R2');
         this._send(r2);
-        console.log('回落R2发送成功 ->', r2);
     }
 }
 
@@ -18158,7 +18217,7 @@ class PolarisHttpReporter {
         this._polarisSignalReporter = new PolarisReporter(_context, _runtime, _roomId, _crtRTCRoom, _userRole);
     }
     _send(report, reportType) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             if (this._context.getConnectionStatus() !== engine.ConnectionStatus.CONNECTED) {
                 return RCSendCode.NOT_REPORT;
@@ -18170,19 +18229,21 @@ class PolarisHttpReporter {
             if (!logServer || !this._useHttp || !RCMediaService.jwtToken) {
                 return RCSendCode.REPORT_FAIL;
             }
+            (_c = (_b = this._context) === null || _b === void 0 ? void 0 : _b.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_T, 'start send data by http');
             const code = yield this._context.setRTCStateByHttp(logServer, this._runtime, report, reportType);
             if (code === RCSendCode.REPORT_SUCCESS) {
-                console.log('http 通道发送成功');
+                (_e = (_d = this._context) === null || _d === void 0 ? void 0 : _d.logger) === null || _e === void 0 ? void 0 : _e.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_R, `send data success -> code: ${code}`);
                 return RCSendCode.REPORT_SUCCESS;
             }
             // jwt 失效，重新请求 naviInfo
             if (code === exports.RCRTCCode.JWT_TIME_OUT) {
-                console.log('jwt 失效');
+                (_g = (_f = this._context) === null || _f === void 0 ? void 0 : _f.logger) === null || _g === void 0 ? void 0 : _g.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_R, `jwt expired -> code: ${code}`);
                 this._refetchNaviInfo();
                 return RCSendCode.REPORT_FAIL;
             }
             // 其他错误情况
             if (code === RCSendCode.REPORT_FAIL || code === RCSendCode.PB_ERROR) {
+                (_j = (_h = this._context) === null || _h === void 0 ? void 0 : _h.logger) === null || _j === void 0 ? void 0 : _j.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_R, `send data fail -> code: ${code}`);
                 this._useHttp = false;
                 return RCSendCode.REPORT_FAIL;
             }
@@ -18270,13 +18331,14 @@ class PolarisHttpReporter {
     _formatR1Data() {
         return {
             joinTime: this._context.userJoinTime || 0,
-            rtcVersion: "5.5.5-beem",
+            rtcVersion: "5.5.5-beem-alpha.4",
             imVersion: this._context.getCoreVersion(),
             platform: 'web',
             device: navigator.platform,
             os: String(STAT_NONE),
             browserName: browserInfo.browser,
             browserVersion: String(browserInfo.version),
+            receiveTime: Date.now(),
         };
     }
     _formatR2Data(params) {
@@ -18287,6 +18349,7 @@ class PolarisHttpReporter {
             rtcActionType: action,
             rtcActionStatus: status,
             trackId: trackIds,
+            receiveTime: Date.now(),
         };
     }
     _formatR3R4Data(reportType, params) {
@@ -18369,11 +18432,12 @@ class PolarisHttpReporter {
         };
     }
     sendR3R4Data(data) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             let senderCode = RCSendCode.REPORT_FAIL;
             if (data.senders.length) {
                 const r3Info = this._formatReportData(RCReportType.R3, data);
-                console.log('发送r3Info ->', r3Info);
+                (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_TYPE_O, 'send data type -> R3');
                 senderCode = yield this._send(r3Info, RCReportType.R3);
                 // 回落 R3
                 if (senderCode === RCSendCode.REPORT_FAIL) {
@@ -18383,7 +18447,7 @@ class PolarisHttpReporter {
             let receiverCode = RCSendCode.REPORT_FAIL;
             if (data.receivers.length) {
                 const r4Info = this._formatReportData(RCReportType.R4, data);
-                console.log('发送r4Info ->', r4Info);
+                (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_TYPE_O, 'send data type -> R4');
                 receiverCode = yield this._send(r4Info, RCReportType.R4);
                 // 回落 R4
                 if (receiverCode === RCSendCode.REPORT_FAIL) {
@@ -18400,14 +18464,14 @@ class PolarisHttpReporter {
      * 加入房间
      */
     sendR1() {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const r1Info = this._formatReportData(RCReportType.R1);
-            console.log('发送r1Info ->', r1Info);
+            (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_TYPE_O, 'send data type -> R1');
             const sendCode = yield this._send(r1Info, RCReportType.R1);
             // 回落 R1
             if (sendCode === RCSendCode.REPORT_FAIL) {
-                (_a = this._polarisSignalReporter) === null || _a === void 0 ? void 0 : _a.sendR1();
+                (_c = this._polarisSignalReporter) === null || _c === void 0 ? void 0 : _c.sendR1();
             }
         });
     }
@@ -18416,14 +18480,14 @@ class PolarisHttpReporter {
      * RTC 订阅、取消订阅
      */
     sendR2(action, status, trackIds) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const r2Info = this._formatReportData(RCReportType.R2, { action, status, trackIds });
-            console.log('发送r2Info ->', r2Info);
+            (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_HTTP_POLARIS_REPORT_TYPE_O, 'send data type -> R2');
             const sendCode = yield this._send(r2Info, RCReportType.R2);
             // 回落 R2
             if (sendCode === RCSendCode.REPORT_FAIL) {
-                (_a = this._polarisSignalReporter) === null || _a === void 0 ? void 0 : _a.sendR2(action, status, trackIds);
+                (_c = this._polarisSignalReporter) === null || _c === void 0 ? void 0 : _c.sendR2(action, status, trackIds);
             }
         });
     }
@@ -19784,6 +19848,8 @@ class UpdateSubscribeListCommand extends BaseCommand {
                 }
                 return { code: resCode };
             }
+            // 缓存订阅资源的ssrc和msid
+            AbstractStatParser.formatSourceIdMapFromSdp(answer.sdp, 'subscribe');
             // 连通率相关埋点-订阅日志上报
             let msas = [];
             let dateNow = Date.now();
@@ -20187,6 +20253,7 @@ function transPullDataToStateMsgCont(data) {
     };
     return content;
 }
+const isIncludeUris = (userData) => userData.some((item) => (item.key === 'uris' || item.key === 'cdn_uris'));
 /**
  * 通知拉取到的增量房间数据格式为 IRoomStatus
  * 把 IRoomStatus 转化为通用解析资源方法(ParseRemoteResCommand)需要的数据
@@ -20194,13 +20261,21 @@ function transPullDataToStateMsgCont(data) {
 function transPullDataToResMsgCont(data) {
     var _a, _b;
     const { userId, userData } = data;
+    /**
+     * PullRoomStatusEvent 为 3 时，并不全代表资源变动，
+     * 房间内设置的其他 key value，也会被拉下来，event 为 3
+     */
+    const hasUris = isIncludeUris(userData);
+    if (!hasUris) {
+        return;
+    }
     const uris = (_a = userData.filter((item) => (item.key === 'uris'))[0]) === null || _a === void 0 ? void 0 : _a.value;
     const cdnUris = (_b = userData.filter((item) => (item.key === 'cdn_uris'))[0]) === null || _b === void 0 ? void 0 : _b.value;
     return {
         userId,
         content: {
-            uris: uris && JSON.parse(uris),
-            cdn_uris: cdnUris && JSON.parse(cdnUris),
+            uris: (uris && JSON.parse(uris)),
+            cdn_uris: (cdnUris && JSON.parse(cdnUris)),
         },
     };
 }
@@ -20279,19 +20354,20 @@ class ParseUserStateCommand extends BaseCommand {
                 }
             }
             users.forEach((item) => {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e, _f;
                 const { userId } = item;
                 if (Number(item.state) === 0) {
                     (_b = (_a = store === null || store === void 0 ? void 0 : store.context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_OLD_DAILY_RECORD_O, `user joined -> ${userId}`);
                     // 对端 im 重连之后调加入房间信令获取最新数据，服务会给本端下发“对端加入房间”的消息，本端内存已包含对端人员，所以需过滤掉
                     const resArr = store.getResourcesByUserId(userId);
+                    (_d = (_c = store === null || store === void 0 ? void 0 : store.context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_REMOTE_USER_JOINED_RESOURCES_O, `resources list -> ${resArr}`);
                     if (!resArr) {
                         item.switchRoleType ? upgrade.push(userId) : joined.push(userId);
                     }
                     store.setResourcesByUserId(userId, resArr || []);
                 }
                 else {
-                    (_d = (_c = store.context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_OLD_DAILY_RECORD_O, `user left -> ${userId}`);
+                    (_f = (_e = store.context) === null || _e === void 0 ? void 0 : _e.logger) === null || _f === void 0 ? void 0 : _f.info(RCLoggerTag.L_OLD_DAILY_RECORD_O, `user left -> ${userId}`);
                     item.switchRoleType ? downgrade.push(userId) : left.push(userId);
                 }
             });
@@ -20693,6 +20769,8 @@ class PublishCommand extends BaseCommand {
             (_h = (_g = store.context) === null || _g === void 0 ? void 0 : _g.logger) === null || _h === void 0 ? void 0 : _h.info(RCLoggerTag.L_QS_PUBLISH_EXCHANGE_O, JSON.stringify({
                 identify: qualityStatusId,
             }));
+            // 缓存发布资源的ssrc和msid
+            AbstractStatParser.formatSourceIdMapFromSdp(reqBody.sdp.sdp, 'publish');
             const resp = yield new ExchangeCommand(headers, reqBody).execute(store, invoker);
             if (resp.code !== exports.RCRTCCode.SUCCESS) {
                 // 连通率相关埋点-发布资源结束
@@ -21753,14 +21831,14 @@ var PullRoomStatusEvent;
 })(PullRoomStatusEvent || (PullRoomStatusEvent = {}));
 
 class PullRTCRoomStatusCommand extends BaseCommand {
-    constructor(_roomId, _traceId, _context, _callbacks, _subhook, _stateHandle) {
+    constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener) {
         super();
         this._roomId = _roomId;
         this._traceId = _traceId;
         this._context = _context;
         this._callbacks = _callbacks;
         this._subhook = _subhook;
-        this._stateHandle = _stateHandle;
+        this._dealUserAppListener = _dealUserAppListener;
     }
     execute(store, invoker) {
         var _a, _b;
@@ -21796,15 +21874,27 @@ class PullRTCRoomStatusCommand extends BaseCommand {
             for (let index = 0; index < roomStatus.length; index++) {
                 const item = roomStatus[index];
                 if (item.event === PullRoomStatusEvent.RESOURCECHANGE) {
-                    const { content, userId } = transPullDataToResMsgCont(item);
+                    const resData = transPullDataToResMsgCont(item);
+                    /**
+                     * 无 uris 或 cdn_uris 时，无需继续执行解析资源数据
+                     */
+                    if (!resData) {
+                        continue;
+                    }
+                    const { content, userId } = resData;
                     if (userId === store.crtUserId) {
                         continue;
                     }
                     yield new ParseRemoteResCommand(content, RCRTCMessageType.TOTAL_CONTENT_RESOURCE, userId, this._subhook.bind(this), this._callbacks).execute(store, invoker);
                 }
                 else {
+                    /**
+                     * 转化拉到的房间数据为通用解析人员方法需要的格式
+                     * 处理解析完的结果
+                     */
                     const content = transPullDataToStateMsgCont(item);
-                    this._stateHandle(content);
+                    const userData = yield new ParseUserStateCommand(content, this._subhook.bind(this)).execute(store, invoker);
+                    this._dealUserAppListener(userData);
                 }
             }
             return { code };
@@ -21888,7 +21978,7 @@ class RCAbstractRoom extends engine.EventEmitter {
                 onTrackPublish: this._onTrackPublish.bind(this),
                 onTrackUnpublish: this._onTrackUnpublish.bind(this),
                 onCDNEnableChange: this._callAppListener.bind(this, 'onCDNEnableChange'),
-            }, this._subhook.bind(this), this._stateHandle.bind(this)));
+            }, this._subhook.bind(this), this._dealUserAppListener.bind(this)));
         });
     }
     __innerInit(mode, joinType, livingType, innerUserDatas, outerUserDatas) {
@@ -22128,30 +22218,40 @@ class RCAbstractRoom extends engine.EventEmitter {
      * @param content
      */
     _stateHandle(content) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { left, joined, upgrade, downgrade, } = yield this._invoker.push(new ParseUserStateCommand(content, this._subhook.bind(this)));
-            /**
-             * 通知业务层
-             * 有 onSwitchRole 监听时，按 switchRole 分“角色切换、加入房间、退出房间”抛出
-             */
-            if ((_a = this._appListener) === null || _a === void 0 ? void 0 : _a.onSwitchRole) {
-                upgrade.length && upgrade.forEach((userId) => this._callAppListener('onSwitchRole', userId, exports.RCRTCLiveRole.ANCHOR));
-                downgrade.length && downgrade.forEach((userId) => this._callAppListener('onSwitchRole', userId, exports.RCRTCLiveRole.AUDIENCE));
-                joined.length && this._callAppListener('onUserJoin', joined);
-                left.length && this._callAppListener('onUserLeave', left);
-                return;
-            }
-            const allJoined = [...joined, ...upgrade];
-            const allLeft = [...left, ...downgrade];
-            /**
-             * 通知业务层
-             * 无 onSwitchRole 监听时，统一按“加入房间、退出房间”抛出
-             */
-            allJoined.length && this._callAppListener('onUserJoin', allJoined);
-            allLeft.length && this._callAppListener('onUserLeave', allLeft);
+            const userData = yield this._invoker.push(new ParseUserStateCommand(content, this._subhook.bind(this)));
+            this._dealUserAppListener(userData);
         });
     }
+    /**
+     * 处理人员应用层事件
+     */
+    _dealUserAppListener(userData) {
+        var _a, _b, _c;
+        const { left, joined, upgrade, downgrade, } = userData;
+        (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_REMOTE_USER_STATE_HANDLE_O, JSON.stringify({
+            left, joined, upgrade, downgrade,
+        }));
+        /**
+         * 通知业务层
+         * 有 onSwitchRole 监听时，按 switchRole 分“角色切换、加入房间、退出房间”抛出
+         */
+        if ((_c = this._appListener) === null || _c === void 0 ? void 0 : _c.onSwitchRole) {
+            upgrade.length && upgrade.forEach((userId) => this._callAppListener('onSwitchRole', userId, exports.RCRTCLiveRole.ANCHOR));
+            downgrade.length && downgrade.forEach((userId) => this._callAppListener('onSwitchRole', userId, exports.RCRTCLiveRole.AUDIENCE));
+            joined.length && this._callAppListener('onUserJoin', joined);
+            left.length && this._callAppListener('onUserLeave', left);
+            return;
+        }
+        const allJoined = [...joined, ...upgrade];
+        const allLeft = [...left, ...downgrade];
+        /**
+         * 通知业务层
+         * 无 onSwitchRole 监听时，统一按“加入房间、退出房间”抛出
+         */
+        allJoined.length && this._callAppListener('onUserJoin', allJoined);
+        allLeft.length && this._callAppListener('onUserLeave', allLeft);
+    }
     /**
      * 获取房间 Id
      */
@@ -25242,6 +25342,8 @@ class RCAudienceClient {
             }));
             // 无需等待 setRemoteAnswer 完成，直接返回，避免业务层拿到 tracks 之前先获取了 onTrackReady 通知
             this._pc.setRemoteAnswer(answer.sdp);
+            // 缓存订阅资源的ssrc和msid
+            AbstractStatParser.formatSourceIdMapFromSdp(answer.sdp, 'subscribe');
             (_16 = (_15 = this._context) === null || _15 === void 0 ? void 0 : _15.logger) === null || _16 === void 0 ? void 0 : _16.info(RCLoggerTag.L_AUDIENCE_CLIENT_SUBSCRIBE_R, JSON.stringify({
                 status: RCLoggerStatus.SUCCESSED,
                 liveUrl,
@@ -27803,7 +27905,7 @@ class RCRTCClient extends RCMediaStreamCapture {
     }
     reportSDKInfo() {
         this._context.reportSDKInfo({
-            'plugin-rtc': "5.5.5-beem",
+            'plugin-rtc': "5.5.5-beem-alpha.4",
         });
     }
 }
@@ -28178,6 +28280,7 @@ message probuf {
     required string os = 6;//系统版本(手机系统版本)
     optional string browserName = 7; //浏览器名称, 没有用 -1 表示
     optional string browserVersion = 8;//浏览器版本, 没有用 -1 表示
+    optional int64 receiveTime = 9; // 发送数据的时间
   }
   message ${RTCPB.RtcPBR2Info} {
     required int64 joinTime = 1;
@@ -28185,6 +28288,7 @@ message probuf {
     required string rtcActionType = 3;//发布类型  subscribe : 订阅   publish : 发布
     required string rtcActionStatus = 4;//发布状态  begin : 开始   tend : 结束
     repeated string trackId = 5;
+    optional int64 receiveTime = 6; // 发送数据的时间
   }
   message ${RTCPB.RtcPBR3Info} {
     required ${RTCPB.RtcPBStatusInfo} info = 1;
@@ -28504,7 +28608,7 @@ class RTCContext {
                     headers: {
                         jwt: RCMediaService.jwtToken,
                     },
-                    timeout: 5 * 1000,
+                    timeout: 2 * 1000,
                 });
                 if (!res.data) {
                     throw new Error('http request fail');
@@ -28795,7 +28899,7 @@ const installer = {
             console.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        engine.VersionManage.add('plugin-rtc', "5.5.5-beem");
+        engine.VersionManage.add('plugin-rtc', "5.5.5-beem-alpha.4");
         if (!engine.VersionManage.validEngine("^5.6.0-beem")) {
             console.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.0-beem"}'.`);
             return false;
@@ -28808,8 +28912,8 @@ const installer = {
         logger.setOutputLevel(options.logLevel || engine.LogL.DEBUG);
         RTCLogger.setLogger(logger);
         logger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-            'RCRTC Version': "5.5.5-beem",
-            Commit: "b8e57d36680c1d71921cded6b91771d4dfd4f3e8",
+            'RCRTC Version': "5.5.5-beem-alpha.4",
+            Commit: "0c078c138d99c8962f00f41c7d9a82e1d0f13b5a",
             'browserInfo.browser': browserInfo.browser,
             'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
             'browserInfo.version': browserInfo.version,