@rongcloud/plugin-rtc 5.2.4-beem.3 → 5.2.4-beem.6

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.3
- * CommitId - b51c6e49188dcadaf70257fc1d274d978d8db68e
- * Fri May 20 2022 15:05:00 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.6
+ * CommitId - 394e0005026dc17525168cd28dcaf60009b800ac
+ * Thu May 26 2022 17:01:57 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, LogLevel, RTCMode, IRuntime, RTCPluginContext, IServerRTCRoomEntry, IJoinRTCRoomData, IReceivedMessage, KVString, RTCJoinType, IRTCJoinedInfo, IPluginGenerator } from '@rongcloud/engine';
@@ -1941,7 +1941,7 @@ declare class PolarisReporter {
      * @param resourceId userId_11_1_tiny 改为 userId_11_tiny_video
      */
     private _getPolarisTrackId;
-    sendR3R4Data(data: IInnerRCRTCStateReport): void;
+    sendR3R4Data(data: IInnerRCRTCStateReport): Promise<boolean>;
     /**
      * 加入房间
      */
@@ -1972,6 +1972,7 @@ declare class RCRTCPeerConnection extends EventEmitter {
     private pubLocalTracks;
     private _reTryExchangeTimer;
     private _reportStatsTimer;
+    private _reportR3R4ToPolarisTimer;
     constructor(
     /**
      * _reTryExchange 方法
@@ -2022,6 +2023,14 @@ declare class RCRTCPeerConnection extends EventEmitter {
      * @todo
      */
     private _reportHandle;
+    /**
+     * 北极星上报 R3、R4 数据
+     */
+    private _sendR3R4Data;
+    /**
+     * 2s 给北极星上报一次 R3、R4
+     */
+    __reportR3R4ToPolaris(): Promise<void>;
     getRTCPeerConn(): RTCPeerConnection;
     destroy(): void;
     clearReTryExchangeTimer(): void;

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.3
- * CommitId - b51c6e49188dcadaf70257fc1d274d978d8db68e
- * Fri May 20 2022 15:05:00 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.6
+ * CommitId - 394e0005026dc17525168cd28dcaf60009b800ac
+ * Thu May 26 2022 17:01:57 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';
@@ -5621,6 +5621,7 @@ var RCMediaType;
     RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
 })(RCMediaType || (RCMediaType = {}));
 
+// export const RongRTCVideoBitrate: { [key: RCResolution]: BitrateConf } = {
 const RongRTCVideoBitrate = {
     [RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
     [RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -5637,23 +5638,26 @@ const RongRTCVideoBitrate = {
     [RCResolution.W1920_H1080]: { width: 1920, height: 1080, maxBitrate: 4000, minBitrate: 400 }
 };
 /**
-* 取最接近的视频分辨率配置
+* 向上取最接近的视频分辨率配置
 * @param {number} width
 * @param {number} height
 */
 const getNearestResolution = (width, height) => {
-    const area = width * height;
-    let d = Number.MAX_VALUE;
-    let conf = null;
-    for (const key in RongRTCVideoBitrate) {
-        const item = RongRTCVideoBitrate[key];
-        const d2 = Math.abs(item.width * item.height - area);
-        if (d2 < d) {
-            conf = item;
-            d = d2;
-        }
+    // 优先精准匹配
+    const conf = RongRTCVideoBitrate[`W${width}_H${height}`];
+    if (conf) {
+        return conf;
     }
-    return conf;
+    // 不规则分辨率计算最接近的配置
+    const area = width * height;
+    const confs = Object.keys(RongRTCVideoBitrate)
+        .map(key => RongRTCVideoBitrate[key])
+        // 升序
+        .sort((item, item2) => item.height * item.width - item2.width * item2.height)
+        // 过滤分辨率小于 area 的配置，避免分配带宽不足
+        .filter(item => item.height * item.width >= area);
+    // 若 confs 长度为 0 说明分辨率远大于可支持的分辨率配置，取最大配置
+    return confs[0] || RongRTCVideoBitrate.W1920_H1080;
 };
 const Multiplier = {
     10: 1,
@@ -6219,13 +6223,18 @@ const getValue = (value) => {
  * @param track
  */
 const getVideoTrackInfo = (track) => {
+    const settings = track.getSettings();
     const constraints = track.getConstraints();
     // firefox 平台不存在 getCapabilities 方法
     // const capabilities = track.getCapabilities()
     // const width = getValue(constraints.width) || getValue(capabilities.width)
     // const height = getValue(constraints.height) || getValue(capabilities.height)
     // const frameRate = getValue(constraints.frameRate) || getValue(capabilities.frameRate)
-    return { width: getValue(constraints.width), height: getValue(constraints.height), frameRate: getValue(constraints.frameRate) };
+    return {
+        width: settings.width || getValue(constraints.width),
+        height: settings.height || getValue(constraints.height),
+        frameRate: settings.frameRate || getValue(constraints.frameRate)
+    };
 };
 /**
  * 取视频流动态码率
@@ -6234,8 +6243,8 @@ const getVideoTrackInfo = (track) => {
  */
 const getDynamicBitrate = (track) => {
     const { width, height, frameRate } = getVideoTrackInfo(track);
-    // 计算动态码率以备给 answer 使用
-    const config = getNearestResolution(width, height);
+    // 计算动态码率，若 videoTrack 的分辨率读取失败，则以 640 * 480 的默认分辨率计算码率
+    const config = getNearestResolution(width || 640, height || 480);
     const multiple = getBitrateMultiple(frameRate);
     return { min: config.minBitrate * multiple, max: config.maxBitrate * multiple };
 };
@@ -6573,20 +6582,21 @@ var RCRTCPingResult;
 /**
  * rtcping 间隔
  */
-const PING_GAP = 10 * 1000;
+const PING_GAP = 5 * 1000;
 /**
  * rtcping 超时时间
  */
-const PING_TIMEOUT = 10 * 1000;
+const PING_TIMEOUT = 5 * 1000;
 /**
- * RTCPing 类，累计 1 分钟未能正确收到 Ping 值则认为 ping 失败
+ * RTCPing 类，在下发的 ping 超时时间 _offlineKickTime 内，未能 Ping 成功则认为 ping 失败
  */
 class Pinger {
-    constructor(_roomId, _roomMode, _context, _gap = PING_GAP) {
+    constructor(_roomId, _roomMode, _context, _gap = PING_GAP, _offlineKickTime = 60 * 1000) {
         this._roomId = _roomId;
         this._roomMode = _roomMode;
         this._context = _context;
         this._gap = _gap;
+        this._offlineKickTime = _offlineKickTime;
         /**
          * 记录最近一次成功的 Ping 时间戳
          */
@@ -6633,8 +6643,8 @@ class Pinger {
             }
             logger.warn(`rtcping failed -> code: ${code}`);
             (_b = this.onPingResult) === null || _b === void 0 ? void 0 : _b.call(this, RCRTCPingResult.FAIL);
-            // 超出 1 分钟未成功进行 rtcping 操作，或用户已不存在于房间内时，通知客户离线
-            if (code === 40003 || now - this._latestTimestamp > 60 * 1000) {
+            // 超出 _offlineKickTime 未 ping 成功，或用户已不存在于房间内时，通知客户离线
+            if (code === 40003 || now - this._latestTimestamp > this._offlineKickTime) {
                 this.stop();
                 (_c = this.onFailed) === null || _c === void 0 ? void 0 : _c.call(this, code === 40003);
                 return;
@@ -7658,6 +7668,7 @@ class ASdpStrategy {
         return __awaiter(this, void 0, void 0, function* () {
             // 过滤行末的空格，服务可能产生空格数据
             sdp = sdp.replace(/\s+\r\n/g, '\r\n');
+            logger.info(`set remote answer -> ${sdp}`);
             try {
                 yield this._peer.setRemoteDescription({ type: 'answer', sdp });
             }
@@ -8003,6 +8014,8 @@ class RCRTCPeerConnection extends EventEmitter {
         this._reTryExchangeTimer = null;
         // peerConnection stats 计时器
         this._reportStatsTimer = null;
+        // 上报上下行数据至北极星定时器
+        this._reportR3R4ToPolarisTimer = null;
         this._reportListener = null;
         const sdpSemantics = ASdpStrategy.getSdpSemantics();
         const peer = this._rtcPeerConn = new RTCPeerConnection({ sdpSemantics });
@@ -8072,7 +8085,6 @@ class RCRTCPeerConnection extends EventEmitter {
     }
     setRemoteAnswer(answer) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.info(`set remote answer -> ${JSON.stringify(answer)}`);
             return this._sdpStrategy.setRemoteAnswer(answer);
         });
     }
@@ -8227,23 +8239,44 @@ class RCRTCPeerConnection extends EventEmitter {
      * @todo
      */
     _reportHandle() {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const formatData = yield this._getStatsData();
             if (!formatData) {
                 return;
             }
+            /**
+             * 组装用户层抛出数据
+             */
+            const reportData = this._createRCRTCStateReport(formatData);
+            (_b = (_a = this._reportListener) === null || _a === void 0 ? void 0 : _a.onStateReport) === null || _b === void 0 ? void 0 : _b.call(_a, reportData);
+        });
+    }
+    /**
+     * 北极星上报 R3、R4 数据
+     */
+    _sendR3R4Data() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const formatData = yield this._getStatsData();
+            if (!formatData) {
+                return true;
+            }
             if (formatData.senders.length || formatData.receivers.length) {
                 /**
                  * 组装北极星上报 R3、R4 数据并发送
                  */
-                (_a = this._polarisReport) === null || _a === void 0 ? void 0 : _a.sendR3R4Data(formatData);
+                return yield ((_a = this._polarisReport) === null || _a === void 0 ? void 0 : _a.sendR3R4Data(formatData));
             }
-            /**
-             * 组装用户层抛出数据
-             */
-            const reportData = this._createRCRTCStateReport(formatData);
-            (_c = (_b = this._reportListener) === null || _b === void 0 ? void 0 : _b.onStateReport) === null || _c === void 0 ? void 0 : _c.call(_b, reportData);
+        });
+    }
+    /**
+     * 2s 给北极星上报一次 R3、R4
+     */
+    __reportR3R4ToPolaris() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._sendR3R4Data();
+            this._reportR3R4ToPolarisTimer = setTimeout(this.__reportR3R4ToPolaris.bind(this), 2000);
         });
     }
     getRTCPeerConn() {
@@ -8252,6 +8285,7 @@ class RCRTCPeerConnection extends EventEmitter {
     destroy() {
         this.clear();
         this.clearReTryExchangeTimer();
+        clearTimeout(this._reportR3R4ToPolarisTimer);
         // 停止计时
         if (this._reportStatsTimer) {
             clearInterval(this._reportStatsTimer);
@@ -8310,7 +8344,20 @@ class PolarisReporter {
         this._userRole = _userRole;
     }
     _send(report) {
-        this._context.getConnectionStatus() === ConnectionStatus.CONNECTED && this._context.setRTCState(this._roomId, report);
+        return __awaiter(this, void 0, void 0, function* () {
+            let isSuccess = false;
+            if (this._context.getConnectionStatus() !== ConnectionStatus.CONNECTED) {
+                return isSuccess;
+            }
+            const sendCode = yield this._context.setRTCState(this._roomId, report);
+            if (sendCode === ErrorCode.SUCCESS) {
+                isSuccess = true;
+            }
+            else {
+                isSuccess = false;
+            }
+            return isSuccess;
+        });
     }
     _getClientID() {
         const key = 'uuid';
@@ -8353,101 +8400,113 @@ class PolarisReporter {
         return polarisTrackId;
     }
     sendR3R4Data(data) {
-        const { iceCandidatePair, senders, receivers } = data;
-        /**
-         * 上下行 track 包含的公共字段
-         */
-        const baseData = {
-            bitrateSend: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.bitrateSend) || STAT_NONE,
-            bitrateRecv: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.bitrateRecv) || STAT_NONE,
-            networkType: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.networkType) || 'unknown',
-            rtt: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.rtt) || STAT_NONE,
-            localAddress: `${(iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.IP) || STAT_NONE}:${iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.port}`,
-            remoteAddress: `${iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.remoteIP}:${iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.remotePort}`,
-            receiveBand: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.availableIncomingBitrate) || STAT_NONE,
-            sendBand: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.availableOutgoingBitrate) || STAT_NONE,
-            packetsLost: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.totalPacketsLost) || STAT_NONE,
-            deviceId: this._context.getCurrentId()
-        };
-        let r3 = `R3\t${baseData.bitrateSend}\t-1\t-1\t-1\t${baseData.networkType}\t${baseData.rtt}\t${baseData.localAddress}\t${baseData.receiveBand}\t${baseData.sendBand}\t${baseData.packetsLost}\t${baseData.deviceId}\r`;
-        let r4 = `R4\t${baseData.bitrateRecv}\t-1\t-1\t-1\t${baseData.networkType}\t${baseData.rtt}\t${baseData.localAddress}\t${baseData.receiveBand}\t${baseData.sendBand}\t${baseData.packetsLost}\t${baseData.deviceId}\r`;
-        /**
-         * 北极星上报 sender tracks 中的字段
-         */
-        const R3TrackData = senders.map((item) => {
-            var _a;
-            const { trackId: resourceId, audioLevel, samplingRate, bitrate, packetsLostRate, frameRate, frameWidth, frameHeight, googRenderDelayMs, jitter, nackCount, pliCount, rtt, googFirsSent, encoderImplementation } = item;
-            const trackId = this._getPolarisTrackId(resourceId);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { iceCandidatePair, senders, receivers } = data;
             /**
-             * 小流需去掉 _tiny
+             * 上下行 track 包含的公共字段
              */
-            const realResourceId = this._getRealResourceId(resourceId);
-            return {
-                trackId,
-                googCodecName: encoderImplementation || String(STAT_NONE),
-                audioLevel: (audioLevel || audioLevel === 0) ? audioLevel : STAT_NONE,
-                bitrate: (bitrate || bitrate === 0) ? bitrate : STAT_NONE,
-                packetsLostRate: (packetsLostRate || packetsLostRate === 0) ? packetsLostRate : STAT_NONE,
-                frameRate: frameRate || STAT_NONE,
-                resolution: (frameWidth && frameHeight) ? `${frameWidth} * ${frameHeight}` : '' + STAT_NONE,
-                jitter: jitter || STAT_NONE,
-                nackCount: (nackCount || nackCount === 0) ? nackCount : STAT_NONE,
-                pliCount: (pliCount || pliCount === 0) ? pliCount : STAT_NONE,
-                rtt: rtt || STAT_NONE,
-                googFirsSent,
-                samplingRate,
-                googRenderDelayMs,
-                encoderImplementation: encoderImplementation || String(STAT_NONE),
-                trackState: ((_a = this._crtRTCRoom.getLocalTrack(realResourceId)) === null || _a === void 0 ? void 0 : _a.isLocalMuted()) ? TrackState.DISABLE : TrackState.ENABLE
+            const baseData = {
+                bitrateSend: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.bitrateSend) || STAT_NONE,
+                bitrateRecv: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.bitrateRecv) || STAT_NONE,
+                networkType: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.networkType) || 'unknown',
+                rtt: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.rtt) || STAT_NONE,
+                localAddress: `${(iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.IP) || STAT_NONE}:${iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.port}`,
+                remoteAddress: `${iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.remoteIP}:${iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.remotePort}`,
+                receiveBand: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.availableIncomingBitrate) || STAT_NONE,
+                sendBand: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.availableOutgoingBitrate) || STAT_NONE,
+                packetsLost: (iceCandidatePair === null || iceCandidatePair === void 0 ? void 0 : iceCandidatePair.totalPacketsLost) || STAT_NONE,
+                deviceId: this._context.getCurrentId()
             };
-        });
-        /**
-         * 北极星上报 received tracks 中的字段
-         */
-        const R4TrackData = receivers.filter(item => {
-            // unified-plan 下 inactive 的数据会继续携带 ssrc，导致无 trackId
-            return !!item.trackId;
-        }).map((item) => {
-            var _a;
-            const { trackId: resourceId, audioLevel, samplingRate, bitrate, packetsLostRate, frameRate, frameWidth, frameHeight, googRenderDelayMs, jitter, nackCount, pliCount, rtt, googFirsReceived, codecImplementationName } = item;
-            const trackId = this._getPolarisTrackId(resourceId);
+            let r3 = `R3\t${baseData.bitrateSend}\t-1\t-1\t-1\t${baseData.networkType}\t${baseData.rtt}\t${baseData.localAddress}\t${baseData.receiveBand}\t${baseData.sendBand}\t${baseData.packetsLost}\t${baseData.deviceId}\r`;
+            let r4 = `R4\t${baseData.bitrateRecv}\t-1\t-1\t-1\t${baseData.networkType}\t${baseData.rtt}\t${baseData.localAddress}\t${baseData.receiveBand}\t${baseData.sendBand}\t${baseData.packetsLost}\t${baseData.deviceId}\r`;
             /**
-             * 小流需去掉 _tiny
+             * 北极星上报 sender tracks 中的字段
              */
-            const realResourceId = this._getRealResourceId(resourceId);
-            return {
-                trackId,
-                googCodecName: codecImplementationName || String(STAT_NONE),
-                audioLevel: (audioLevel || audioLevel === 0) ? audioLevel : STAT_NONE,
-                bitrate: (bitrate || bitrate === 0) ? bitrate : STAT_NONE,
-                packetsLostRate: (packetsLostRate || packetsLostRate === 0) ? packetsLostRate : STAT_NONE,
-                frameRate: frameRate || STAT_NONE,
-                resolution: (frameWidth && frameHeight) ? `${frameWidth} * ${frameHeight}` : '' + STAT_NONE,
-                jitter: jitter || STAT_NONE,
-                nackCount: (nackCount || nackCount === 0) ? nackCount : STAT_NONE,
-                pliCount: (pliCount || pliCount === 0) ? pliCount : STAT_NONE,
-                rtt: rtt || STAT_NONE,
-                googFirsReceived,
-                samplingRate,
-                googRenderDelayMs,
-                codecImplementationName: codecImplementationName || String(STAT_NONE),
-                trackState: ((_a = this._crtRTCRoom.getRemoteTrack(realResourceId)) === null || _a === void 0 ? void 0 : _a.isLocalMuted()) ? TrackState.DISABLE : TrackState.ENABLE
-            };
+            const R3TrackData = senders.map((item) => {
+                var _a;
+                const { trackId: resourceId, audioLevel, samplingRate, bitrate, packetsLostRate, frameRate, frameWidth, frameHeight, googRenderDelayMs, jitter, nackCount, pliCount, rtt, googFirsSent, encoderImplementation } = item;
+                const trackId = this._getPolarisTrackId(resourceId);
+                /**
+                 * 小流需去掉 _tiny
+                 */
+                const realResourceId = this._getRealResourceId(resourceId);
+                return {
+                    trackId,
+                    googCodecName: encoderImplementation || String(STAT_NONE),
+                    audioLevel: (audioLevel || audioLevel === 0) ? audioLevel : STAT_NONE,
+                    bitrate: (bitrate || bitrate === 0) ? bitrate : STAT_NONE,
+                    packetsLostRate: (packetsLostRate || packetsLostRate === 0) ? packetsLostRate : STAT_NONE,
+                    frameRate: frameRate || STAT_NONE,
+                    resolution: (frameWidth && frameHeight) ? `${frameWidth} * ${frameHeight}` : '' + STAT_NONE,
+                    jitter: jitter || STAT_NONE,
+                    nackCount: (nackCount || nackCount === 0) ? nackCount : STAT_NONE,
+                    pliCount: (pliCount || pliCount === 0) ? pliCount : STAT_NONE,
+                    rtt: rtt || STAT_NONE,
+                    googFirsSent,
+                    samplingRate,
+                    googRenderDelayMs,
+                    encoderImplementation: encoderImplementation || String(STAT_NONE),
+                    trackState: ((_a = this._crtRTCRoom.getLocalTrack(realResourceId)) === null || _a === void 0 ? void 0 : _a.isLocalMuted()) ? TrackState.DISABLE : TrackState.ENABLE
+                };
+            });
+            /**
+             * 北极星上报 received tracks 中的字段
+             */
+            const R4TrackData = receivers.filter(item => {
+                // unified-plan 下 inactive 的数据会继续携带 ssrc，导致无 trackId
+                return !!item.trackId;
+            }).map((item) => {
+                var _a;
+                const { trackId: resourceId, audioLevel, samplingRate, bitrate, packetsLostRate, frameRate, frameWidth, frameHeight, googRenderDelayMs, jitter, nackCount, pliCount, rtt, googFirsReceived, codecImplementationName } = item;
+                const trackId = this._getPolarisTrackId(resourceId);
+                /**
+                 * 小流需去掉 _tiny
+                 */
+                const realResourceId = this._getRealResourceId(resourceId);
+                return {
+                    trackId,
+                    googCodecName: codecImplementationName || String(STAT_NONE),
+                    audioLevel: (audioLevel || audioLevel === 0) ? audioLevel : STAT_NONE,
+                    bitrate: (bitrate || bitrate === 0) ? bitrate : STAT_NONE,
+                    packetsLostRate: (packetsLostRate || packetsLostRate === 0) ? packetsLostRate : STAT_NONE,
+                    frameRate: frameRate || STAT_NONE,
+                    resolution: (frameWidth && frameHeight) ? `${frameWidth} * ${frameHeight}` : '' + STAT_NONE,
+                    jitter: jitter || STAT_NONE,
+                    nackCount: (nackCount || nackCount === 0) ? nackCount : STAT_NONE,
+                    pliCount: (pliCount || pliCount === 0) ? pliCount : STAT_NONE,
+                    rtt: rtt || STAT_NONE,
+                    googFirsReceived,
+                    samplingRate,
+                    googRenderDelayMs,
+                    codecImplementationName: codecImplementationName || String(STAT_NONE),
+                    trackState: ((_a = this._crtRTCRoom.getRemoteTrack(realResourceId)) === null || _a === void 0 ? void 0 : _a.isLocalMuted()) ? TrackState.DISABLE : TrackState.ENABLE
+                };
+            });
+            let senderIsSuccess = false;
+            r3 += R3TrackData.map((item) => {
+                return `${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) {
+                senderIsSuccess = yield this._send(r3 + `\r${this._userRole}`);
+            }
+            let receiverIsSuccess = false;
+            r4 += R4TrackData.map((item) => {
+                return `${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) {
+                receiverIsSuccess = yield this._send(r4 + `\r${this._userRole}`);
+            }
+            if (!senderIsSuccess && !receiverIsSuccess) {
+                return false;
+            }
+            return true;
         });
-        r3 += R3TrackData.map((item) => {
-            return `${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');
-        data.senders.length && this._send(r3 + `\r${this._userRole}`);
-        r4 += R4TrackData.map((item) => {
-            return `${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');
-        data.receivers.length && this._send(r4 + `\r${this._userRole}`);
     }
     /**
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.3";
+        const rtcVersion = "5.2.4-beem.6";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8622,14 +8681,18 @@ class RCAbstractRoom {
          * 观众升级为主播后不会收到全量 uri 消息，需直接触发人员、资源变更
          */
         isUpgrade && this._afterChangedRole(data);
+        // 服务下发的 rtcping 超时时间，单位为秒
+        const offlineKickTime = data.offlineKickTime * 1000;
         // 开始心跳，心跳失败时主动退出房间
-        this._pinger = new Pinger(_roomId, this._roomMode, _context, this._initOptions.pingGap);
+        this._pinger = new Pinger(_roomId, this._roomMode, _context, this._initOptions.pingGap, offlineKickTime);
         this._pinger.onFailed = this._kickoff.bind(this);
         this._pinger.onPingResult = this._handlePingResult.bind(this);
         this._pinger.start();
         this._polarisReport = new PolarisReporter(this._context, this._runtime, this._roomId, this);
         this._polarisReport.sendR1();
         this._pc = new RCRTCPeerConnection(this._reTryExchange.bind(this), this._polarisReport);
+        // 发送上下行数据至北极星
+        this._pc.__reportR3R4ToPolaris();
         this._pc.on(RCRTCPeerConnection.__INNER_EVENT_TRACK_READY__, this._onTrackReady, this);
         this._pc.on(RCLocalTrack.__INNER_EVENT_MUTED_CHANGE__, this._onLocalTrackMuted, this);
         this._pc.on(RCLocalTrack.__INNER_EVENT_DESTROY__, this._onLocalTrackDestroied, this);
@@ -10705,7 +10768,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.2.4-beem.3",
+    ClientVersion: "5.2.4-beem.6",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -11029,6 +11092,8 @@ class RCAudienceClient {
                 this._pc = new RCRTCPeerConnection(this._reTryExchange.bind(this));
                 this._pc.on(RCRTCPeerConnection.__INNER_EVENT_TRACK_READY__, this._onTrackReady, this);
                 this.registerReportListener(this._reportListener);
+                // 发送上下行数据至北极星
+                this._pc.__reportR3R4ToPolaris();
             }
             // 暂存，避免同步栈内并发调用，若订阅失败需清理
             this._liveUrl = liveUrl;
@@ -11213,6 +11278,8 @@ class RCAudienceLivingRoom {
             rTrack.__innerSetMediaStreamTrack(track);
             this._callAppListener('onTrackReady', rTrack);
         });
+        // 发送上下行数据至北极星
+        this._pc.__reportR3R4ToPolaris();
         // 房间主播加入|离开房间、发布|取消发布资源变更监听
         this._context.onrtcdatachange = this.singalDataChange.bind(this);
     }
@@ -12734,9 +12801,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.4-beem.3");
-        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"}'.`);
+        VersionManage.add('plugin-rtc', "5.2.4-beem.6");
+        if (!VersionManage.validEngine("4.6.0-beem.7")) {
+            logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.7"}'.`);
             return false;
         }
         return true;
@@ -12744,7 +12811,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.3"}, Commit: ${"b51c6e49188dcadaf70257fc1d274d978d8db68e"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.6"}, Commit: ${"394e0005026dc17525168cd28dcaf60009b800ac"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);