@rongcloud/plugin-rtc 5.5.5-beem.2 → 5.5.5-beem.3

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.5.5-beem.2
- * CommitId - fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77
- * Thu Oct 27 2022 20:08:26 GMT+0800 (China Standard Time)
+ * RCRTC - v5.5.5-beem.3
+ * CommitId - b639b89eb82e0b55da6285514427d887456ecbd2
+ * Mon Oct 31 2022 13:25:42 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, BasicLogger, INaviInfo, RTCPluginContext, AbsCodec, IPromiseResult, ErrorCode, KVString, IRuntime, IAsyncRes, ConnectionStatus, ConversationType, ISendMsgOptions, IReceivedMessage, EnableLogL, IPluginGenerator } from '@rongcloud/engine';

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.5.5-beem.2
- * CommitId - fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77
- * Thu Oct 27 2022 20:08:26 GMT+0800 (China Standard Time)
+ * RCRTC - v5.5.5-beem.3
+ * CommitId - b639b89eb82e0b55da6285514427d887456ecbd2
+ * Mon Oct 31 2022 13:25:42 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, isNumber, validate, isObject as isObject$1, ErrorCode, HttpMethod, isArray, ConnectionStatus, notEmptyObject, notEmptyArray, notEmptyString, isString, RTCMode as RTCMode$1, assert, ConversationType, isHttpUrl, isBoolean, isUndefined, forEach, VersionManage, LogL } from '@rongcloud/engine';
@@ -14738,7 +14738,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.2",
+    ClientVersion: "5.5.5-beem.3",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15316,7 +15316,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.2",
+    ClientVersion: "5.5.5-beem.3",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15827,6 +15827,21 @@ class SourceIdMap {
 }
 SourceIdMap._instance = new Map([['sourceIdForPublishMap', new Map()], ['sourceIdForSubscribeMap', new Map()]]);
 
+var ReportTypes;
+(function (ReportTypes) {
+    ReportTypes["TRACK"] = "track";
+    ReportTypes["STREAM"] = "stream";
+    ReportTypes["MEDIASOURCE"] = "media-source";
+    ReportTypes["INBOUNDRTP"] = "inbound-rtp";
+    ReportTypes["OUTBOUNDRTP"] = "outbound-rtp";
+    ReportTypes["REMOTEINBOUNDRTP"] = "remote-inbound-rtp";
+    ReportTypes["PEERCONNECTION"] = "peer-connection";
+    ReportTypes["TRANSPORT"] = "transport";
+    ReportTypes["CERTIFICATE"] = "certificate";
+    ReportTypes["CANDIDATEPAIR"] = "candidate-pair";
+    ReportTypes["REMOTECANDIDATE"] = "remote-candidate";
+    ReportTypes["LOCALCANDIDATE"] = "local-candidate";
+})(ReportTypes || (ReportTypes = {}));
 class AbstractStatParser {
     constructor(_rtcPeerConn, _sdpSemantics, _currentUserId) {
         this._rtcPeerConn = _rtcPeerConn;
@@ -16067,6 +16082,38 @@ class AbstractStatParser {
         const valid = answer === null || answer === void 0 ? void 0 : answer.split('\r\nm=').some((item) => (item.includes(ssrc) && item.includes('a=inactive')));
         return !valid;
     }
+    formatStateData(stats) {
+        const init = {
+            outbound: [],
+            remoteInbound: [],
+            inbound: [],
+            transport: [],
+            connection: [],
+        };
+        return Object.values(stats).reduce((result, item) => {
+            if (item.type === ReportTypes.REMOTEINBOUNDRTP) {
+                result.remoteInbound.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.INBOUNDRTP) {
+                result.inbound.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.OUTBOUNDRTP) {
+                result.outbound.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.TRANSPORT) {
+                result.transport.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.PEERCONNECTION) {
+                result.connection.push(item);
+                return result;
+            }
+            return result;
+        }, init);
+    }
 }
 /**
  * 从sdp中解析出ssrc和msid并缓存
@@ -16102,24 +16149,23 @@ AbstractStatParser.formatSourceIdMapFromSdp = (sdp, type) => {
  */
 class RTCReportParser$2 extends AbstractStatParser {
     formatRCRTCStateReport(stats) {
+        const { outbound, remoteInbound, inbound, transport, connection, } = this.formatStateData(stats);
         const reports = {
             senders: [],
             receivers: [],
         };
         // 当次报告创建时的时间戳
-        const timestamp = Math.floor(stats.RTCPeerConnection.timestamp);
+        const timestamp = Math.floor(connection[0].timestamp);
         reports.timestamp = timestamp;
-        const keys = Object.keys(stats);
         // 总丢包数
         let totalPacketsLost = 0;
         // 上行码率总和
         let bitrateSend = 0;
         // 解析上行媒体流数据: RTCOutboundRTPVideoStream | RTCOutboundRTPAudioStream
-        const outboundKeys = keys.filter((key) => /^RTCOutboundRTP(Video|Audio)Stream_/.test(key));
-        outboundKeys.forEach((key) => {
+        // const outboundKeys = keys.filter((key) => /^RTCOutboundRTP(Video|Audio)Stream_/.test(key));
+        outbound.forEach((outboundInfo) => {
             var _a;
             // 本端输出数据
-            const outboundInfo = stats[key];
             if (this._sdpSemantics === 'unified-plan' && !this.isValidSender(outboundInfo)) {
                 return;
             }
@@ -16209,9 +16255,8 @@ class RTCReportParser$2 extends AbstractStatParser {
          * outbound-rtp 存在无 remoteId 的情况，导致取不到有效的 jitter、rtt、packetsLost，
          * 可拿到 remote-inbound-rtp 的 localId，补充 senders 中的 jitter、rtt、packetsLost 数据，重新计算丢包率
         */
-        const remoteInboundKeys = keys.filter((key) => /RTCRemoteInboundRtp(Video|Audio)Stream_/.test(key));
-        remoteInboundKeys.forEach((key) => {
-            const { localId, jitter, roundTripTime: rtt, packetsLost, } = stats[key];
+        remoteInbound.forEach((remoteInboundItem) => {
+            const { localId, jitter, roundTripTime: rtt, packetsLost, } = remoteInboundItem;
             const sender = reports.senders.filter((item) => item.id === localId)[0];
             if (sender && !senderHasRemoteData(sender)) {
                 const resourceId = this.getResourceIdByParseSdp(stats[sender.id]);
@@ -16224,9 +16269,7 @@ class RTCReportParser$2 extends AbstractStatParser {
         // 下行码率总和
         let bitrateRecv = 0;
         // 下行流数据解析
-        const inboundKeys = keys.filter((key) => /^RTCInboundRTP(Video|Audio)Stream_/.test(key));
-        inboundKeys.forEach((key) => {
-            const inboundInfo = stats[key];
+        inbound.forEach((inboundInfo) => {
             if (this._sdpSemantics === 'unified-plan' && !this.isValidReceiver(inboundInfo)) {
                 return;
             }
@@ -16275,9 +16318,8 @@ class RTCReportParser$2 extends AbstractStatParser {
             });
         });
         // 解析本端/远端 IP、Port 数据
-        const transportKey = keys.filter((key) => /^RTCTransport_/.test(key))[0];
-        if (transportKey) {
-            const rtcTransport = stats[transportKey];
+        if (transport.length > 0) {
+            const rtcTransport = transport[0];
             const { selectedCandidatePairId } = rtcTransport;
             if (selectedCandidatePairId) {
                 const iceCandidatePair = stats[selectedCandidatePairId];
@@ -16312,40 +16354,26 @@ class RTCReportParser$2 extends AbstractStatParser {
     }
     getAudioLevelList(stats) {
         const audioLevelList = [];
-        const keys = Object.keys(stats);
         // 解析上行媒体流数据: RTCOutboundRTPVideoStream | RTCOutboundRTPAudioStream
-        const outboundKeys = keys.filter((key) => /^RTCOutboundRTPAudioStream_/.test(key));
-        outboundKeys.forEach((key) => {
-            var _a, _b;
+        const { outbound, inbound } = this.formatStateData(stats);
+        const outboundList = outbound.filter((item) => (item === null || item === void 0 ? void 0 : item.kind) === 'audio');
+        outboundList.forEach((outboundInfo) => {
+            var _a;
             // 本端输出数据
-            const outboundInfo = stats[key];
             if (this._sdpSemantics === 'unified-plan' && !this.isValidSender(outboundInfo)) {
                 return;
             }
             const { mediaSourceId, trackId, kind } = outboundInfo;
-            const SingleInstance = SdpResource.getInstance();
-            const resourceIds = SingleInstance.streams;
-            let resourceId = '';
-            for (const streamId of resourceIds.keys()) {
-                const value = resourceIds.get(streamId);
-                if (value) {
-                    const tracks = (_a = stats[`RTCMediaStream_${value.msid}`]) === null || _a === void 0 ? void 0 : _a.trackIds;
-                    if (tracks && tracks.includes(outboundInfo.trackId) && kind === value.kind) {
-                        resourceId = streamId;
-                    }
-                }
-            }
-            // const resourceId = this.getResourceIdByParseSdp(outboundInfo);
-            const audioLevel = mediaSourceId && stats[mediaSourceId] ? stats[mediaSourceId].audioLevel : (((_b = stats[trackId]) === null || _b === void 0 ? void 0 : _b.audioLevel) || null);
+            const resourceId = this.getResourceIdByParseSdp(outboundInfo);
+            const audioLevel = mediaSourceId && stats[mediaSourceId] ? stats[mediaSourceId].audioLevel : (((_a = stats[trackId]) === null || _a === void 0 ? void 0 : _a.audioLevel) || null);
             audioLevelList.push({
                 trackId: resourceId,
                 audioLevel: (audioLevel || audioLevel === 0) ? handleAudioLevel(audioLevel) : null,
             });
         });
         // 下行流数据解析
-        const inboundKeys = keys.filter((key) => /^RTCInboundRTPAudioStream_/.test(key));
-        inboundKeys.forEach((key) => {
-            const inboundInfo = stats[key];
+        const inboundList = inbound.filter((item) => (item === null || item === void 0 ? void 0 : item.kind) === 'audio');
+        inboundList.forEach((inboundInfo) => {
             if (this._sdpSemantics === 'unified-plan' && !this.isValidReceiver(inboundInfo)) {
                 return;
             }
@@ -18501,7 +18529,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.5.5-beem.2";
+        const rtcVersion = "5.5.5-beem.3";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -18651,7 +18679,7 @@ class PolarisHttpReporter {
     _formatR1Data() {
         return {
             joinTime: this._context.userJoinTime || 0,
-            rtcVersion: "5.5.5-beem.2",
+            rtcVersion: "5.5.5-beem.3",
             imVersion: this._context.getCoreVersion(),
             platform: 'web',
             device: navigator.platform,
@@ -27538,7 +27566,7 @@ class RCRTCClient extends RCMediaStreamCapture {
     }
     reportSDKInfo() {
         this._context.reportSDKInfo({
-            'plugin-rtc': "5.5.5-beem.2",
+            'plugin-rtc': "5.5.5-beem.3",
         });
     }
 }
@@ -28049,7 +28077,7 @@ const encodeRtcHttp3Report = (codec, report, reportType) => {
     if ((reportType === RCReportType.R3 && r3Info)) {
         const { info } = r3Info;
         const { streams } = info;
-        let innerStreams = Array.isArray(streams) && streams.map((stream) => codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
+        let innerStreams = Array.isArray(streams) && streams.map((stream) => stream && codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
         let innerInfo = codec.encode(RTCPB.RtcPBStatusInfo, Object.assign(Object.assign({}, info), { streams: innerStreams }), true);
         let innterR3Info = codec.encode(RTCPB.RtcPBR3Info, { info: innerInfo }, true);
         return codec.encode(RTCPB.RtcPBPolaris, Object.assign(Object.assign({}, commonData), { r3Info: innterR3Info }));
@@ -28057,7 +28085,7 @@ const encodeRtcHttp3Report = (codec, report, reportType) => {
     if ((reportType === RCReportType.R4 && r4Info)) {
         const { info } = r4Info;
         const { streams } = info;
-        let innerStreams = Array.isArray(streams) && streams.map((stream) => codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
+        let innerStreams = Array.isArray(streams) && streams.map((stream) => stream && codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
         let innerInfo = codec.encode(RTCPB.RtcPBStatusInfo, Object.assign(Object.assign({}, info), { streams: innerStreams }), true);
         let innerR4Info = codec.encode(RTCPB.RtcPBR4Info, { info: innerInfo }, true);
         return codec.encode(RTCPB.RtcPBPolaris, Object.assign(Object.assign({}, commonData), { r4Info: innerR4Info }));
@@ -28525,7 +28553,7 @@ const installer = {
             console.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        VersionManage.add('plugin-rtc', "5.5.5-beem.2");
+        VersionManage.add('plugin-rtc', "5.5.5-beem.3");
         if (!VersionManage.validEngine("^5.6.2-beem.2")) {
             console.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.2-beem.2"}'.`);
             return false;
@@ -28539,8 +28567,8 @@ const installer = {
         RTCLogger.setLogger(originLogger);
         logger.setLogger(originLogger);
         originLogger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-            'RCRTC Version': "5.5.5-beem.2",
-            Commit: "fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77",
+            'RCRTC Version': "5.5.5-beem.3",
+            Commit: "b639b89eb82e0b55da6285514427d887456ecbd2",
             'browserInfo.browser': browserInfo.browser,
             'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
             'browserInfo.version': browserInfo.version,

package/dist/index.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.5.5-beem.2
- * CommitId - fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77
- * Thu Oct 27 2022 20:08:26 GMT+0800 (China Standard Time)
+ * RCRTC - v5.5.5-beem.3
+ * CommitId - b639b89eb82e0b55da6285514427d887456ecbd2
+ * Mon Oct 31 2022 13:25:42 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -14742,7 +14742,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.2",
+    ClientVersion: "5.5.5-beem.3",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15320,7 +15320,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.2",
+    ClientVersion: "5.5.5-beem.3",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15831,6 +15831,21 @@ class SourceIdMap {
 }
 SourceIdMap._instance = new Map([['sourceIdForPublishMap', new Map()], ['sourceIdForSubscribeMap', new Map()]]);
 
+var ReportTypes;
+(function (ReportTypes) {
+    ReportTypes["TRACK"] = "track";
+    ReportTypes["STREAM"] = "stream";
+    ReportTypes["MEDIASOURCE"] = "media-source";
+    ReportTypes["INBOUNDRTP"] = "inbound-rtp";
+    ReportTypes["OUTBOUNDRTP"] = "outbound-rtp";
+    ReportTypes["REMOTEINBOUNDRTP"] = "remote-inbound-rtp";
+    ReportTypes["PEERCONNECTION"] = "peer-connection";
+    ReportTypes["TRANSPORT"] = "transport";
+    ReportTypes["CERTIFICATE"] = "certificate";
+    ReportTypes["CANDIDATEPAIR"] = "candidate-pair";
+    ReportTypes["REMOTECANDIDATE"] = "remote-candidate";
+    ReportTypes["LOCALCANDIDATE"] = "local-candidate";
+})(ReportTypes || (ReportTypes = {}));
 class AbstractStatParser {
     constructor(_rtcPeerConn, _sdpSemantics, _currentUserId) {
         this._rtcPeerConn = _rtcPeerConn;
@@ -16071,6 +16086,38 @@ class AbstractStatParser {
         const valid = answer === null || answer === void 0 ? void 0 : answer.split('\r\nm=').some((item) => (item.includes(ssrc) && item.includes('a=inactive')));
         return !valid;
     }
+    formatStateData(stats) {
+        const init = {
+            outbound: [],
+            remoteInbound: [],
+            inbound: [],
+            transport: [],
+            connection: [],
+        };
+        return Object.values(stats).reduce((result, item) => {
+            if (item.type === ReportTypes.REMOTEINBOUNDRTP) {
+                result.remoteInbound.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.INBOUNDRTP) {
+                result.inbound.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.OUTBOUNDRTP) {
+                result.outbound.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.TRANSPORT) {
+                result.transport.push(item);
+                return result;
+            }
+            if (item.type === ReportTypes.PEERCONNECTION) {
+                result.connection.push(item);
+                return result;
+            }
+            return result;
+        }, init);
+    }
 }
 /**
  * 从sdp中解析出ssrc和msid并缓存
@@ -16106,24 +16153,23 @@ AbstractStatParser.formatSourceIdMapFromSdp = (sdp, type) => {
  */
 class RTCReportParser$2 extends AbstractStatParser {
     formatRCRTCStateReport(stats) {
+        const { outbound, remoteInbound, inbound, transport, connection, } = this.formatStateData(stats);
         const reports = {
             senders: [],
             receivers: [],
         };
         // 当次报告创建时的时间戳
-        const timestamp = Math.floor(stats.RTCPeerConnection.timestamp);
+        const timestamp = Math.floor(connection[0].timestamp);
         reports.timestamp = timestamp;
-        const keys = Object.keys(stats);
         // 总丢包数
         let totalPacketsLost = 0;
         // 上行码率总和
         let bitrateSend = 0;
         // 解析上行媒体流数据: RTCOutboundRTPVideoStream | RTCOutboundRTPAudioStream
-        const outboundKeys = keys.filter((key) => /^RTCOutboundRTP(Video|Audio)Stream_/.test(key));
-        outboundKeys.forEach((key) => {
+        // const outboundKeys = keys.filter((key) => /^RTCOutboundRTP(Video|Audio)Stream_/.test(key));
+        outbound.forEach((outboundInfo) => {
             var _a;
             // 本端输出数据
-            const outboundInfo = stats[key];
             if (this._sdpSemantics === 'unified-plan' && !this.isValidSender(outboundInfo)) {
                 return;
             }
@@ -16213,9 +16259,8 @@ class RTCReportParser$2 extends AbstractStatParser {
          * outbound-rtp 存在无 remoteId 的情况，导致取不到有效的 jitter、rtt、packetsLost，
          * 可拿到 remote-inbound-rtp 的 localId，补充 senders 中的 jitter、rtt、packetsLost 数据，重新计算丢包率
         */
-        const remoteInboundKeys = keys.filter((key) => /RTCRemoteInboundRtp(Video|Audio)Stream_/.test(key));
-        remoteInboundKeys.forEach((key) => {
-            const { localId, jitter, roundTripTime: rtt, packetsLost, } = stats[key];
+        remoteInbound.forEach((remoteInboundItem) => {
+            const { localId, jitter, roundTripTime: rtt, packetsLost, } = remoteInboundItem;
             const sender = reports.senders.filter((item) => item.id === localId)[0];
             if (sender && !senderHasRemoteData(sender)) {
                 const resourceId = this.getResourceIdByParseSdp(stats[sender.id]);
@@ -16228,9 +16273,7 @@ class RTCReportParser$2 extends AbstractStatParser {
         // 下行码率总和
         let bitrateRecv = 0;
         // 下行流数据解析
-        const inboundKeys = keys.filter((key) => /^RTCInboundRTP(Video|Audio)Stream_/.test(key));
-        inboundKeys.forEach((key) => {
-            const inboundInfo = stats[key];
+        inbound.forEach((inboundInfo) => {
             if (this._sdpSemantics === 'unified-plan' && !this.isValidReceiver(inboundInfo)) {
                 return;
             }
@@ -16279,9 +16322,8 @@ class RTCReportParser$2 extends AbstractStatParser {
             });
         });
         // 解析本端/远端 IP、Port 数据
-        const transportKey = keys.filter((key) => /^RTCTransport_/.test(key))[0];
-        if (transportKey) {
-            const rtcTransport = stats[transportKey];
+        if (transport.length > 0) {
+            const rtcTransport = transport[0];
             const { selectedCandidatePairId } = rtcTransport;
             if (selectedCandidatePairId) {
                 const iceCandidatePair = stats[selectedCandidatePairId];
@@ -16316,40 +16358,26 @@ class RTCReportParser$2 extends AbstractStatParser {
     }
     getAudioLevelList(stats) {
         const audioLevelList = [];
-        const keys = Object.keys(stats);
         // 解析上行媒体流数据: RTCOutboundRTPVideoStream | RTCOutboundRTPAudioStream
-        const outboundKeys = keys.filter((key) => /^RTCOutboundRTPAudioStream_/.test(key));
-        outboundKeys.forEach((key) => {
-            var _a, _b;
+        const { outbound, inbound } = this.formatStateData(stats);
+        const outboundList = outbound.filter((item) => (item === null || item === void 0 ? void 0 : item.kind) === 'audio');
+        outboundList.forEach((outboundInfo) => {
+            var _a;
             // 本端输出数据
-            const outboundInfo = stats[key];
             if (this._sdpSemantics === 'unified-plan' && !this.isValidSender(outboundInfo)) {
                 return;
             }
             const { mediaSourceId, trackId, kind } = outboundInfo;
-            const SingleInstance = SdpResource.getInstance();
-            const resourceIds = SingleInstance.streams;
-            let resourceId = '';
-            for (const streamId of resourceIds.keys()) {
-                const value = resourceIds.get(streamId);
-                if (value) {
-                    const tracks = (_a = stats[`RTCMediaStream_${value.msid}`]) === null || _a === void 0 ? void 0 : _a.trackIds;
-                    if (tracks && tracks.includes(outboundInfo.trackId) && kind === value.kind) {
-                        resourceId = streamId;
-                    }
-                }
-            }
-            // const resourceId = this.getResourceIdByParseSdp(outboundInfo);
-            const audioLevel = mediaSourceId && stats[mediaSourceId] ? stats[mediaSourceId].audioLevel : (((_b = stats[trackId]) === null || _b === void 0 ? void 0 : _b.audioLevel) || null);
+            const resourceId = this.getResourceIdByParseSdp(outboundInfo);
+            const audioLevel = mediaSourceId && stats[mediaSourceId] ? stats[mediaSourceId].audioLevel : (((_a = stats[trackId]) === null || _a === void 0 ? void 0 : _a.audioLevel) || null);
             audioLevelList.push({
                 trackId: resourceId,
                 audioLevel: (audioLevel || audioLevel === 0) ? handleAudioLevel(audioLevel) : null,
             });
         });
         // 下行流数据解析
-        const inboundKeys = keys.filter((key) => /^RTCInboundRTPAudioStream_/.test(key));
-        inboundKeys.forEach((key) => {
-            const inboundInfo = stats[key];
+        const inboundList = inbound.filter((item) => (item === null || item === void 0 ? void 0 : item.kind) === 'audio');
+        inboundList.forEach((inboundInfo) => {
             if (this._sdpSemantics === 'unified-plan' && !this.isValidReceiver(inboundInfo)) {
                 return;
             }
@@ -18505,7 +18533,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.5.5-beem.2";
+        const rtcVersion = "5.5.5-beem.3";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -18655,7 +18683,7 @@ class PolarisHttpReporter {
     _formatR1Data() {
         return {
             joinTime: this._context.userJoinTime || 0,
-            rtcVersion: "5.5.5-beem.2",
+            rtcVersion: "5.5.5-beem.3",
             imVersion: this._context.getCoreVersion(),
             platform: 'web',
             device: navigator.platform,
@@ -27542,7 +27570,7 @@ class RCRTCClient extends RCMediaStreamCapture {
     }
     reportSDKInfo() {
         this._context.reportSDKInfo({
-            'plugin-rtc': "5.5.5-beem.2",
+            'plugin-rtc': "5.5.5-beem.3",
         });
     }
 }
@@ -28053,7 +28081,7 @@ const encodeRtcHttp3Report = (codec, report, reportType) => {
     if ((reportType === RCReportType.R3 && r3Info)) {
         const { info } = r3Info;
         const { streams } = info;
-        let innerStreams = Array.isArray(streams) && streams.map((stream) => codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
+        let innerStreams = Array.isArray(streams) && streams.map((stream) => stream && codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
         let innerInfo = codec.encode(RTCPB.RtcPBStatusInfo, Object.assign(Object.assign({}, info), { streams: innerStreams }), true);
         let innterR3Info = codec.encode(RTCPB.RtcPBR3Info, { info: innerInfo }, true);
         return codec.encode(RTCPB.RtcPBPolaris, Object.assign(Object.assign({}, commonData), { r3Info: innterR3Info }));
@@ -28061,7 +28089,7 @@ const encodeRtcHttp3Report = (codec, report, reportType) => {
     if ((reportType === RCReportType.R4 && r4Info)) {
         const { info } = r4Info;
         const { streams } = info;
-        let innerStreams = Array.isArray(streams) && streams.map((stream) => codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
+        let innerStreams = Array.isArray(streams) && streams.map((stream) => stream && codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
         let innerInfo = codec.encode(RTCPB.RtcPBStatusInfo, Object.assign(Object.assign({}, info), { streams: innerStreams }), true);
         let innerR4Info = codec.encode(RTCPB.RtcPBR4Info, { info: innerInfo }, true);
         return codec.encode(RTCPB.RtcPBPolaris, Object.assign(Object.assign({}, commonData), { r4Info: innerR4Info }));
@@ -28529,7 +28557,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.2");
+        engine.VersionManage.add('plugin-rtc', "5.5.5-beem.3");
         if (!engine.VersionManage.validEngine("^5.6.2-beem.2")) {
             console.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.2-beem.2"}'.`);
             return false;
@@ -28543,8 +28571,8 @@ const installer = {
         RTCLogger.setLogger(originLogger);
         logger.setLogger(originLogger);
         originLogger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-            'RCRTC Version': "5.5.5-beem.2",
-            Commit: "fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77",
+            'RCRTC Version': "5.5.5-beem.3",
+            Commit: "b639b89eb82e0b55da6285514427d887456ecbd2",
             'browserInfo.browser': browserInfo.browser,
             'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
             'browserInfo.version': browserInfo.version,

package/dist/index.umd.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.5.5-beem.2
- * CommitId - fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77
- * Thu Oct 27 2022 20:08:26 GMT+0800 (China Standard Time)
+ * RCRTC - v5.5.5-beem.3
+ * CommitId - b639b89eb82e0b55da6285514427d887456ecbd2
+ * Mon Oct 31 2022 13:25:42 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -14742,7 +14742,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.5.5-beem.2",
+        ClientVersion: "5.5.5-beem.3",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString(),
     });
@@ -15320,7 +15320,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.5.5-beem.2",
+        ClientVersion: "5.5.5-beem.3",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString(),
     });
@@ -15831,6 +15831,21 @@
     }
     SourceIdMap._instance = new Map([['sourceIdForPublishMap', new Map()], ['sourceIdForSubscribeMap', new Map()]]);
 
+    var ReportTypes;
+    (function (ReportTypes) {
+        ReportTypes["TRACK"] = "track";
+        ReportTypes["STREAM"] = "stream";
+        ReportTypes["MEDIASOURCE"] = "media-source";
+        ReportTypes["INBOUNDRTP"] = "inbound-rtp";
+        ReportTypes["OUTBOUNDRTP"] = "outbound-rtp";
+        ReportTypes["REMOTEINBOUNDRTP"] = "remote-inbound-rtp";
+        ReportTypes["PEERCONNECTION"] = "peer-connection";
+        ReportTypes["TRANSPORT"] = "transport";
+        ReportTypes["CERTIFICATE"] = "certificate";
+        ReportTypes["CANDIDATEPAIR"] = "candidate-pair";
+        ReportTypes["REMOTECANDIDATE"] = "remote-candidate";
+        ReportTypes["LOCALCANDIDATE"] = "local-candidate";
+    })(ReportTypes || (ReportTypes = {}));
     class AbstractStatParser {
         constructor(_rtcPeerConn, _sdpSemantics, _currentUserId) {
             this._rtcPeerConn = _rtcPeerConn;
@@ -16071,6 +16086,38 @@
             const valid = answer === null || answer === void 0 ? void 0 : answer.split('\r\nm=').some((item) => (item.includes(ssrc) && item.includes('a=inactive')));
             return !valid;
         }
+        formatStateData(stats) {
+            const init = {
+                outbound: [],
+                remoteInbound: [],
+                inbound: [],
+                transport: [],
+                connection: [],
+            };
+            return Object.values(stats).reduce((result, item) => {
+                if (item.type === ReportTypes.REMOTEINBOUNDRTP) {
+                    result.remoteInbound.push(item);
+                    return result;
+                }
+                if (item.type === ReportTypes.INBOUNDRTP) {
+                    result.inbound.push(item);
+                    return result;
+                }
+                if (item.type === ReportTypes.OUTBOUNDRTP) {
+                    result.outbound.push(item);
+                    return result;
+                }
+                if (item.type === ReportTypes.TRANSPORT) {
+                    result.transport.push(item);
+                    return result;
+                }
+                if (item.type === ReportTypes.PEERCONNECTION) {
+                    result.connection.push(item);
+                    return result;
+                }
+                return result;
+            }, init);
+        }
     }
     /**
      * 从sdp中解析出ssrc和msid并缓存
@@ -16106,24 +16153,23 @@
      */
     class RTCReportParser$2 extends AbstractStatParser {
         formatRCRTCStateReport(stats) {
+            const { outbound, remoteInbound, inbound, transport, connection, } = this.formatStateData(stats);
             const reports = {
                 senders: [],
                 receivers: [],
             };
             // 当次报告创建时的时间戳
-            const timestamp = Math.floor(stats.RTCPeerConnection.timestamp);
+            const timestamp = Math.floor(connection[0].timestamp);
             reports.timestamp = timestamp;
-            const keys = Object.keys(stats);
             // 总丢包数
             let totalPacketsLost = 0;
             // 上行码率总和
             let bitrateSend = 0;
             // 解析上行媒体流数据: RTCOutboundRTPVideoStream | RTCOutboundRTPAudioStream
-            const outboundKeys = keys.filter((key) => /^RTCOutboundRTP(Video|Audio)Stream_/.test(key));
-            outboundKeys.forEach((key) => {
+            // const outboundKeys = keys.filter((key) => /^RTCOutboundRTP(Video|Audio)Stream_/.test(key));
+            outbound.forEach((outboundInfo) => {
                 var _a;
                 // 本端输出数据
-                const outboundInfo = stats[key];
                 if (this._sdpSemantics === 'unified-plan' && !this.isValidSender(outboundInfo)) {
                     return;
                 }
@@ -16213,9 +16259,8 @@
              * outbound-rtp 存在无 remoteId 的情况，导致取不到有效的 jitter、rtt、packetsLost，
              * 可拿到 remote-inbound-rtp 的 localId，补充 senders 中的 jitter、rtt、packetsLost 数据，重新计算丢包率
             */
-            const remoteInboundKeys = keys.filter((key) => /RTCRemoteInboundRtp(Video|Audio)Stream_/.test(key));
-            remoteInboundKeys.forEach((key) => {
-                const { localId, jitter, roundTripTime: rtt, packetsLost, } = stats[key];
+            remoteInbound.forEach((remoteInboundItem) => {
+                const { localId, jitter, roundTripTime: rtt, packetsLost, } = remoteInboundItem;
                 const sender = reports.senders.filter((item) => item.id === localId)[0];
                 if (sender && !senderHasRemoteData(sender)) {
                     const resourceId = this.getResourceIdByParseSdp(stats[sender.id]);
@@ -16228,9 +16273,7 @@
             // 下行码率总和
             let bitrateRecv = 0;
             // 下行流数据解析
-            const inboundKeys = keys.filter((key) => /^RTCInboundRTP(Video|Audio)Stream_/.test(key));
-            inboundKeys.forEach((key) => {
-                const inboundInfo = stats[key];
+            inbound.forEach((inboundInfo) => {
                 if (this._sdpSemantics === 'unified-plan' && !this.isValidReceiver(inboundInfo)) {
                     return;
                 }
@@ -16279,9 +16322,8 @@
                 });
             });
             // 解析本端/远端 IP、Port 数据
-            const transportKey = keys.filter((key) => /^RTCTransport_/.test(key))[0];
-            if (transportKey) {
-                const rtcTransport = stats[transportKey];
+            if (transport.length > 0) {
+                const rtcTransport = transport[0];
                 const { selectedCandidatePairId } = rtcTransport;
                 if (selectedCandidatePairId) {
                     const iceCandidatePair = stats[selectedCandidatePairId];
@@ -16316,40 +16358,26 @@
         }
         getAudioLevelList(stats) {
             const audioLevelList = [];
-            const keys = Object.keys(stats);
             // 解析上行媒体流数据: RTCOutboundRTPVideoStream | RTCOutboundRTPAudioStream
-            const outboundKeys = keys.filter((key) => /^RTCOutboundRTPAudioStream_/.test(key));
-            outboundKeys.forEach((key) => {
-                var _a, _b;
+            const { outbound, inbound } = this.formatStateData(stats);
+            const outboundList = outbound.filter((item) => (item === null || item === void 0 ? void 0 : item.kind) === 'audio');
+            outboundList.forEach((outboundInfo) => {
+                var _a;
                 // 本端输出数据
-                const outboundInfo = stats[key];
                 if (this._sdpSemantics === 'unified-plan' && !this.isValidSender(outboundInfo)) {
                     return;
                 }
                 const { mediaSourceId, trackId, kind } = outboundInfo;
-                const SingleInstance = SdpResource.getInstance();
-                const resourceIds = SingleInstance.streams;
-                let resourceId = '';
-                for (const streamId of resourceIds.keys()) {
-                    const value = resourceIds.get(streamId);
-                    if (value) {
-                        const tracks = (_a = stats[`RTCMediaStream_${value.msid}`]) === null || _a === void 0 ? void 0 : _a.trackIds;
-                        if (tracks && tracks.includes(outboundInfo.trackId) && kind === value.kind) {
-                            resourceId = streamId;
-                        }
-                    }
-                }
-                // const resourceId = this.getResourceIdByParseSdp(outboundInfo);
-                const audioLevel = mediaSourceId && stats[mediaSourceId] ? stats[mediaSourceId].audioLevel : (((_b = stats[trackId]) === null || _b === void 0 ? void 0 : _b.audioLevel) || null);
+                const resourceId = this.getResourceIdByParseSdp(outboundInfo);
+                const audioLevel = mediaSourceId && stats[mediaSourceId] ? stats[mediaSourceId].audioLevel : (((_a = stats[trackId]) === null || _a === void 0 ? void 0 : _a.audioLevel) || null);
                 audioLevelList.push({
                     trackId: resourceId,
                     audioLevel: (audioLevel || audioLevel === 0) ? handleAudioLevel(audioLevel) : null,
                 });
             });
             // 下行流数据解析
-            const inboundKeys = keys.filter((key) => /^RTCInboundRTPAudioStream_/.test(key));
-            inboundKeys.forEach((key) => {
-                const inboundInfo = stats[key];
+            const inboundList = inbound.filter((item) => (item === null || item === void 0 ? void 0 : item.kind) === 'audio');
+            inboundList.forEach((inboundInfo) => {
                 if (this._sdpSemantics === 'unified-plan' && !this.isValidReceiver(inboundInfo)) {
                     return;
                 }
@@ -18505,7 +18533,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.5.5-beem.2";
+            const rtcVersion = "5.5.5-beem.3";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -18655,7 +18683,7 @@
         _formatR1Data() {
             return {
                 joinTime: this._context.userJoinTime || 0,
-                rtcVersion: "5.5.5-beem.2",
+                rtcVersion: "5.5.5-beem.3",
                 imVersion: this._context.getCoreVersion(),
                 platform: 'web',
                 device: navigator.platform,
@@ -27542,7 +27570,7 @@
         }
         reportSDKInfo() {
             this._context.reportSDKInfo({
-                'plugin-rtc': "5.5.5-beem.2",
+                'plugin-rtc': "5.5.5-beem.3",
             });
         }
     }
@@ -28053,7 +28081,7 @@ message probuf {
         if ((reportType === RCReportType.R3 && r3Info)) {
             const { info } = r3Info;
             const { streams } = info;
-            let innerStreams = Array.isArray(streams) && streams.map((stream) => codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
+            let innerStreams = Array.isArray(streams) && streams.map((stream) => stream && codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
             let innerInfo = codec.encode(RTCPB.RtcPBStatusInfo, Object.assign(Object.assign({}, info), { streams: innerStreams }), true);
             let innterR3Info = codec.encode(RTCPB.RtcPBR3Info, { info: innerInfo }, true);
             return codec.encode(RTCPB.RtcPBPolaris, Object.assign(Object.assign({}, commonData), { r3Info: innterR3Info }));
@@ -28061,7 +28089,7 @@ message probuf {
         if ((reportType === RCReportType.R4 && r4Info)) {
             const { info } = r4Info;
             const { streams } = info;
-            let innerStreams = Array.isArray(streams) && streams.map((stream) => codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
+            let innerStreams = Array.isArray(streams) && streams.map((stream) => stream && codec.encode(RTCPB.RtcPBStreamInfo, stream, true));
             let innerInfo = codec.encode(RTCPB.RtcPBStatusInfo, Object.assign(Object.assign({}, info), { streams: innerStreams }), true);
             let innerR4Info = codec.encode(RTCPB.RtcPBR4Info, { info: innerInfo }, true);
             return codec.encode(RTCPB.RtcPBPolaris, Object.assign(Object.assign({}, commonData), { r4Info: innerR4Info }));
@@ -28529,7 +28557,7 @@ message probuf {
                 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.2");
+            engine.VersionManage.add('plugin-rtc', "5.5.5-beem.3");
             if (!engine.VersionManage.validEngine("^5.6.2-beem.2")) {
                 console.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.2-beem.2"}'.`);
                 return false;
@@ -28543,8 +28571,8 @@ message probuf {
             RTCLogger.setLogger(originLogger);
             logger.setLogger(originLogger);
             originLogger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-                'RCRTC Version': "5.5.5-beem.2",
-                Commit: "fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77",
+                'RCRTC Version': "5.5.5-beem.3",
+                Commit: "b639b89eb82e0b55da6285514427d887456ecbd2",
                 'browserInfo.browser': browserInfo.browser,
                 'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
                 'browserInfo.version': browserInfo.version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rongcloud/plugin-rtc",
-  "version": "5.5.5-beem.2",
+  "version": "5.5.5-beem.3",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "^5.6.2-beem.2"
   },
-  "__commit__": "fb1da8eadeb0d8d9871ed026c4ccb09a9f570b77"
+  "__commit__": "b639b89eb82e0b55da6285514427d887456ecbd2"
 }