@rongcloud/plugin-rtc 5.4.7-alpha.3 → 5.4.7-beem-enterprise.1

package/dist/index.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.4.7-alpha.3
- * CommitId - 851c4005fa6dfee3d966699f4bc260b0b6cbd7ea
- * Fri Sep 02 2022 09:48:41 GMT+0800 (China Standard Time)
+ * RCRTC - v5.4.7-beem-enterprise.1
+ * CommitId - f6d422487789e25a83b33d99ce339c2d264d3d88
+ * Wed Sep 21 2022 12:27:46 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -6477,7 +6477,8 @@ class RCTrack extends engine.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             engine.logger.info(RCLoggerTag.L_TRACK_PLAY_T, {
                 element,
-                options
+                options,
+                msg: `start play trackId: ${this._id}`
             }, {
                 logSource: engine.LogSource.RTC
             });
@@ -7352,8 +7353,12 @@ const getVideoTrackInfo = (track) => {
     const settings = track.getSettings();
     const constraints = track.getConstraints();
     return {
-        width: settings.width || getValue(constraints.width),
-        height: settings.height || getValue(constraints.height),
+        /**
+         * applyConstraints 方法应用的宽高约束不一定可以立马生效
+         * 取值优先 constraints
+         */
+        width: getValue(constraints.width) || settings.width || 0,
+        height: getValue(constraints.height) || settings.height || 0,
         frameRate: settings.frameRate || getValue(constraints.frameRate)
     };
 };
@@ -7544,7 +7549,7 @@ const isNull = (val) => {
  * 公有云连接私有云 SDK 为非法连接
  */
 const isIllegalConnection = (navi) => {
-    return navi.type === 1;
+    return !true ;
 };
 /**
  * 获取将要发布的 track 数量
@@ -7938,7 +7943,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.4.7-alpha.3",
+    ClientVersion: "5.4.7-beem-enterprise.1",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -8456,16 +8461,11 @@ class AbstractStatParser {
         });
     }
     parseRTCStatsReport(reports) {
-        const keys = reports.keys();
         const stats = {};
-        let temp = keys.next();
-        while (!temp.done) {
-            const key = temp.value;
-            const value = reports.get(key);
-            if (!/^RTCCodec_/.test(key)) {
-                stats[key] = value;
+        for (const key of reports.keys()) {
+            if (!key.includes('RTCCodec_')) {
+                stats[key] = reports.get(key);
             }
-            temp = keys.next();
         }
         return stats;
     }
@@ -9267,6 +9267,13 @@ class ASdpBuilder {
         }
         return stream;
     }
+    /**
+     * 它将 SDP 标头中的 `a=group` 行替换为 `b=AS` 和 `b=TIAS` 行
+     * @param {number} maxBitrate - 流的最大比特率。
+     */
+    setHeaderBitrate(maxBitrate) {
+        this.SDPHeader = this.SDPHeader.replace(/(\r\ns=[^\r\n]+)/ig, `$1\r\nc=IN IP4 0.0.0.0\r\nb=AS:${maxBitrate * ASdpBuilder.KBitrate}\r\nb=TIAS:${maxBitrate * ASdpBuilder.KBitrate * 850}`);
+    }
     /**
      * 它获取音频流并将它们映射到一个新数组，其中每个项目都是调用 setAudioItemBitrate 函数的结果
      * @param {IRCTrackBitrate} bitrate - 以 kbps 为单位的比特率。
@@ -9357,7 +9364,7 @@ class ASdpBuilder {
      */
     addAudioBlineAS(sdpAudioBlock, bitrate) {
         if (!/\bb=AS:\d+\b/ig.test(sdpAudioBlock)) {
-            return sdpAudioBlock.replace(/^(m=audio[^\r\n]+)/, `$1\r\nb=AS:${bitrate.max * ASdpBuilder.KBitrate}`);
+            return sdpAudioBlock.replace(/(\bc=IN[^\r\n]+)/ig, `$1\r\nb=AS:${bitrate.max * ASdpBuilder.KBitrate}\r\nb=TIAS:${bitrate.max * ASdpBuilder.KBitrate * 850}`);
         }
         return sdpAudioBlock;
     }
@@ -9455,7 +9462,7 @@ class ASdpBuilder {
     addVideoBlineAS(sdpVideoBlock, bitrate) {
         // b=AS: 定义本端带宽信息
         if (!/\bb=AS:\d+\b/ig.test(sdpVideoBlock)) {
-            return sdpVideoBlock.replace(/^(m=video[^\r\n]+)/, `$1\r\nb=AS:${bitrate.max * ASdpBuilder.KBitrate}`);
+            return sdpVideoBlock.replace(/(\bc=IN[^\r\n]+)/ig, `$1\r\nb=AS:${bitrate.max * ASdpBuilder.KBitrate}\r\nb=TIAS:${bitrate.max * ASdpBuilder.KBitrate * 850}`);
         }
         return sdpVideoBlock;
     }
@@ -9584,7 +9591,7 @@ class ASdpStrategy {
         return __awaiter(this, void 0, void 0, function* () {
             // 过滤行末的空格，服务可能产生空格数据
             sdp = ASdpBuilder.trimBlankLine(sdp);
-            engine.logger.info(`set remote answer -> ${sdp}`);
+            logger.info(`set remote answer -> ${sdp}`);
             try {
                 yield this._peer.setRemoteDescription({ type: 'answer', sdp });
             }
@@ -10221,6 +10228,10 @@ class RCRTCPeerConnection extends engine.EventEmitter {
         // 上报上下行数据至北极星定时器
         this._reportR3R4ToPolarisTimer = null;
         this._isDestroyed = false;
+        // 格式化后的质量数据
+        this._reportStatsData = null;
+        // 格式化之前的质量数据
+        this._originReportStatsData = null;
         this._reportListener = null;
         const sdpSemantics = ASdpStrategy.getSdpSemantics();
         const peer = this._rtcPeerConn = new RTCPeerConnection({ sdpSemantics });
@@ -10252,15 +10263,24 @@ class RCRTCPeerConnection extends engine.EventEmitter {
             logSource: engine.LogSource.RTC
         });
     }
+    startAutoExecute(gap = 1000) {
+        this._reportStatsTimer = setTimeout(() => {
+            this._reportHandle(gap);
+            this._reportStatsTimer = this.startAutoExecute();
+        }, gap);
+    }
+    stopAutoExecute() {
+        clearTimeout(this._reportStatsTimer);
+    }
     _onICEConnectionStateChange() {
         var _a, _b;
         logger.info(`oniceconnectionstatechange -> ${this._rtcPeerConn.iceConnectionState}, ${this._pcName}`);
         if (this._rtcPeerConn.iceConnectionState === 'connected') {
             // 开启 peerConnection stats 统计定时器
             if (this._reportStatsTimer) {
-                clearInterval(this._reportStatsTimer);
+                this.stopAutoExecute();
             }
-            this._reportStatsTimer = setInterval(this._reportHandle.bind(this), 1000);
+            this.startAutoExecute();
         }
         // ICE 连接中断后，需要尝试重新走 exchange 流程以恢复
         if (this._rtcPeerConn.iceConnectionState === 'failed' || this._rtcPeerConn.iceConnectionState === 'disconnected') {
@@ -10515,33 +10535,53 @@ class RCRTCPeerConnection extends engine.EventEmitter {
      * 获取 peerConnection stats 数据并格式化
      * @returns 返回格式化后的数据
      */
-    _getStatsData() {
-        var _a, _b;
+    _getStatsData(gap = 1000) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const reports = yield this._rtcPeerConn.getStats();
-            /**
-             * 解析 stats 数据
-             */
-            const data = (_a = this.reportParser) === null || _a === void 0 ? void 0 : _a.parseRTCStatsReport(reports);
+            let data = null;
+            if (((_a = this._originReportStatsData) === null || _a === void 0 ? void 0 : _a.timestamp) && this._originReportStatsData.timestamp > Date.now() - gap) {
+                data = this._originReportStatsData.data;
+            }
+            else {
+                const reports = yield this._rtcPeerConn.getStats();
+                /**
+                 * 解析 stats 数据
+                 */
+                data = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.parseRTCStatsReport(reports);
+                this._originReportStatsData = {
+                    data,
+                    timestamp: Date.now()
+                };
+            }
             /**
              * 获取 report 中的 iceCandidatePair、senders、receivers 中的所有字段
              */
-            const formatData = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.formatRCRTCStateReport(data);
+            const formatData = (_c = this.reportParser) === null || _c === void 0 ? void 0 : _c.formatRCRTCStateReport(data);
             return formatData;
         });
     }
-    getAudioLevelReportData() {
-        var _a, _b;
+    getAudioLevelReportData(gap = 1000) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const reports = yield this._rtcPeerConn.getStats();
-            /**
-             * 解析 stats 数据
-             */
-            const data = (_a = this.reportParser) === null || _a === void 0 ? void 0 : _a.parseRTCStatsReport(reports);
+            let data = null;
+            if (((_a = this._originReportStatsData) === null || _a === void 0 ? void 0 : _a.timestamp) && this._originReportStatsData.timestamp > Date.now() - gap) {
+                data = this._originReportStatsData.data;
+            }
+            else {
+                const reports = yield this._rtcPeerConn.getStats();
+                /**
+                 * 解析 stats 数据
+                 */
+                data = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.parseRTCStatsReport(reports);
+                this._originReportStatsData = {
+                    data,
+                    timestamp: Date.now()
+                };
+            }
             if (!data) {
                 return [];
             }
-            const audioLevelData = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.getAudioLevelList(data);
+            const audioLevelData = (_c = this.reportParser) === null || _c === void 0 ? void 0 : _c.getAudioLevelList(data);
             return audioLevelData;
         });
     }
@@ -10549,13 +10589,14 @@ class RCRTCPeerConnection extends engine.EventEmitter {
      * 通知用户质量数据、peerConnection 北极星数据上报
      * @todo
      */
-    _reportHandle() {
+    _reportHandle(gap) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const formatData = yield this._getStatsData();
+            const formatData = yield this._getStatsData(gap);
             if (!formatData) {
                 return;
             }
+            this._reportStatsData = formatData;
             /**
              * 组装用户层抛出数据
              */
@@ -10563,13 +10604,19 @@ class RCRTCPeerConnection extends engine.EventEmitter {
             (_b = (_a = this._reportListener) === null || _a === void 0 ? void 0 : _a.onStateReport) === null || _b === void 0 ? void 0 : _b.call(_a, reportData);
         });
     }
+    /**
+     * 获取缓存的本地质量数据
+     */
+    _getCacheStatsData() {
+        return this._reportStatsData;
+    }
     /**
      * 北极星上报 R3、R4 数据
      */
     _sendR3R4Data() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const formatData = yield this._getStatsData();
+            const formatData = this._getCacheStatsData();
             if (!formatData) {
                 return true;
             }
@@ -10588,7 +10635,9 @@ class RCRTCPeerConnection extends engine.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             clearTimeout(this._reportR3R4ToPolarisTimer);
             yield this._sendR3R4Data();
-            this._reportR3R4ToPolarisTimer = setTimeout(this.__reportR3R4ToPolaris.bind(this), 2000);
+            this._reportR3R4ToPolarisTimer = setTimeout(() => {
+                this.__reportR3R4ToPolaris();
+            }, 2000);
         });
     }
     getRTCPeerConn() {
@@ -10600,7 +10649,7 @@ class RCRTCPeerConnection extends engine.EventEmitter {
         clearTimeout(this._reportR3R4ToPolarisTimer);
         // 停止计时
         if (this._reportStatsTimer) {
-            clearInterval(this._reportStatsTimer);
+            this.stopAutoExecute();
             this._reportStatsTimer = null;
         }
         this.registerReportListener(null);
@@ -10827,7 +10876,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.4.7-alpha.3";
+        const rtcVersion = "5.4.7-beem-enterprise.1";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -10860,7 +10909,7 @@ class RCAudioLevelReport {
     /**
      * 通知业务端音量 > 0 的数据，数组每一项包含 track、audioLevel
      */
-    _audioLevelReport() {
+    _audioLevelReport(gap) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._audioLevelChangeHandler) {
                 return;
@@ -10872,23 +10921,31 @@ class RCAudioLevelReport {
                 if (pc.getRTCPeerConn().iceConnectionState === 'new') {
                     return;
                 }
-                const audioLevelData = yield pc.getAudioLevelReportData();
-                const list = audioLevelData.map((item) => {
+                const audioLevelData = yield pc.getAudioLevelReportData(gap);
+                audioLevelData === null || audioLevelData === void 0 ? void 0 : audioLevelData.forEach(item => {
                     const { userId } = parseTrackId(item.trackId);
                     const isLocal = this._room.getCrtUserId() === userId;
                     const track = isLocal ? this._room.getLocalTrack(item.trackId) : this._room.getRemoteTrack(item.trackId);
-                    return {
-                        track,
-                        audioLevel: item.audioLevel || 0
-                    };
-                }).filter((item) => {
-                    return item.track;
+                    if (track) {
+                        audioLevelList.push({
+                            track,
+                            audioLevel: item.audioLevel || 0
+                        });
+                    }
                 });
-                audioLevelList.push(...list);
             }
             this._audioLevelChangeHandler(audioLevelList);
         });
     }
+    startAutoExecute(gap = 1000) {
+        this._timer = setTimeout(() => {
+            this._audioLevelReport(gap);
+            this._timer = this.startAutoExecute(gap);
+        }, gap);
+    }
+    stopAutoExecute() {
+        clearTimeout(this._timer);
+    }
     onAudioLevelChange(handler, gap) {
         if (gap < 300 || gap > 1000) {
             logger.error('the valid range of onAudioLevelChange params "gap" is: > 300 && < 1000');
@@ -10899,12 +10956,12 @@ class RCAudioLevelReport {
         }
         else {
             this._audioLevelChangeHandler = handler;
-            this._timer = setInterval(this._audioLevelReport.bind(this), gap);
+            this.startAutoExecute(gap);
         }
     }
     clearAudioLevelReportTimer() {
         if (this._timer) {
-            clearInterval(this._timer);
+            this.stopAutoExecute();
             this._timer = null;
         }
     }
@@ -11650,14 +11707,7 @@ class JoinRoomCommand extends BaseCommand {
                 }, { logSource: engine.LogSource.RTC });
                 return { code: exports.RCRTCCode.SIGNAL_DISCONNECTED };
             }
-            if (isIllegalConnection(context.getNaviInfo())) {
-                engine.logger.error(logTag, {
-                    status: RCLoggerStatus.FAILED,
-                    code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR,
-                    msg: 'navi_usl error'
-                }, { logSource: engine.LogSource.RTC });
-                return { code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR };
-            }
+            if (isIllegalConnection(context.getNaviInfo())) ;
             if (!engine.validate('roomId', this.roomId, engine.notEmptyString, true)) {
                 engine.logger.error(logTag, {
                     status: RCLoggerStatus.FAILED,
@@ -12116,7 +12166,7 @@ class ParseUserStateCommand extends BaseCommand {
             users.forEach(item => {
                 const userId = item.userId;
                 if (+item.state === 0) {
-                    logger.debug(`user joined -> ${userId}`);
+                    logger.info(`user joined -> ${userId}`);
                     // 对端 im 重连之后调加入房间信令获取最新数据，服务会给本端下发“对端加入房间”的消息，本端内存已包含对端人员，所以需过滤掉
                     const resArr = store.getResourcesByUserId(userId);
                     if (!resArr) {
@@ -12125,7 +12175,7 @@ class ParseUserStateCommand extends BaseCommand {
                     store.setResourcesByUserId(userId, resArr || []);
                 }
                 else {
-                    logger.debug(`user left -> ${userId}`);
+                    logger.info(`user left -> ${userId}`);
                     item.switchRoleType ? downgrade.push(userId) : left.push(userId);
                 }
             });
@@ -12434,6 +12484,16 @@ class PublishCommand extends BaseCommand {
                 const { track: localTrack } = track instanceof RCLocalTrack ? { track } : track;
                 localTracks.push(localTrack);
             });
+            /**
+             * 将发布的视频流按从小到大进行排序
+             */
+            tracks.sort((item, nextItem) => {
+                const { track: localTrack } = item instanceof RCLocalTrack ? { track: item } : item;
+                const { max: maxBitrate } = localTrack.getBitrate();
+                const { track: nextLocalTrack } = nextItem instanceof RCLocalTrack ? { track: nextItem } : nextItem;
+                const { max: maxNextBitrate } = nextLocalTrack.getBitrate();
+                return maxBitrate - maxNextBitrate;
+            });
             /**
              * 一个 peerConnection 上行不超过 10 个
              */
@@ -13496,12 +13556,14 @@ class RCAbstractRoom extends engine.EventEmitter {
     }
     __parseInnerMessage(message) {
         const { targetId: roomId, conversationType } = message;
-        // 过滤非 RTC 消息
-        if (conversationType !== engine.ConversationType.RTC_ROOM) {
-            return false;
-        }
         // 为 RTC 消息，但不属于当前房间的不处理
         if (roomId !== this._roomId) {
+            engine.logger.warn(RCLoggerTag.L_RTC_CLIENT_MESSAGE_O, {
+                status: RCLoggerStatus.FAILED,
+                message: `roomId is different, msg roomId-> ${roomId}, this._roomId-> ${this._roomId} `
+            }, {
+                logSource: engine.LogSource.RTC
+            });
             return true;
         }
         logger.info(`recv inner msg -> message: ${JSON.stringify(message)} | roomid: ${this._roomId}`);
@@ -16754,16 +16816,7 @@ class RCAudienceClient {
                 logSource: engine.LogSource.RTC
             });
             const tracks = [];
-            if (isIllegalConnection(this._context.getNaviInfo())) {
-                engine.logger.error(RCLoggerTag.L_AUDIENCE_CLIENT_SUBSCRIBE_R, {
-                    status: RCLoggerStatus.FAILED,
-                    code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR,
-                    msg: 'navi_url error'
-                }, {
-                    logSource: engine.LogSource.RTC
-                });
-                return { code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR, tracks };
-            }
+            if (isIllegalConnection(this._context.getNaviInfo())) ;
             // 客户端主动调用 api 发请求时，清除 ice 断线重连的定时器
             !this._fromRetry && ((_a = this._pc) === null || _a === void 0 ? void 0 : _a.clearReTryExchangeTimer());
             this._fromRetry = false;
@@ -18773,7 +18826,6 @@ class RCRTCClient extends RCMediaStreamCapture {
         this._context.onmessage = this._handleMessage.bind(this);
     }
     _handleMessage(message) {
-        var _a;
         // 过滤非 RTC 消息
         if (message.conversationType !== engine.ConversationType.RTC_ROOM) {
             return false;
@@ -18785,13 +18837,22 @@ class RCRTCClient extends RCMediaStreamCapture {
                 room.__parseInnerMessage(message);
             });
         }
-        (_a = this._crtRoom) === null || _a === void 0 ? void 0 : _a.__parseInnerMessage(message);
         engine.logger.info(RCLoggerTag.L_RTC_CLIENT_MESSAGE_O, {
             status: RCLoggerStatus.SUCCESSED,
-            message: Object.assign(message, { content: '内容涉及隐私不予显示' })
+            message
         }, {
             logSource: engine.LogSource.RTC
         });
+        if (!this._crtRoom) {
+            engine.logger.warn(RCLoggerTag.L_RTC_CLIENT_MESSAGE_O, {
+                status: RCLoggerStatus.FAILED,
+                message: 'the crtRoom is empty'
+            }, {
+                logSource: engine.LogSource.RTC
+            });
+            return true;
+        }
+        this._crtRoom.__parseInnerMessage(message);
         return true;
     }
     /**
@@ -18994,16 +19055,7 @@ class RCRTCClient extends RCMediaStreamCapture {
             }, {
                 logSource: engine.LogSource.RTC
             });
-            if (isIllegalConnection(this._context.getNaviInfo())) {
-                engine.logger.error(RCLoggerTag.L_RTC_CLIENT_JOIN_LIVING_ROOM_AS_AUDIENCE_R, {
-                    status: RCLoggerStatus.FAILED,
-                    code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR,
-                    msg: 'navi_url error'
-                }, {
-                    logSource: engine.LogSource.RTC
-                });
-                return { code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR };
-            }
+            if (isIllegalConnection(this._context.getNaviInfo())) ;
             if (!(engine.validate('roomId', roomId, engine.notEmptyString, true) &&
                 engine.validate('livingType', livingType, (value) => value === exports.RCLivingType.AUDIO || value === exports.RCLivingType.VIDEO))) {
                 engine.logger.error(RCLoggerTag.L_RTC_CLIENT_JOIN_LIVING_ROOM_AS_AUDIENCE_R, {
@@ -19311,9 +19363,9 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        engine.VersionManage.add('plugin-rtc', "5.4.7-alpha.3");
-        if (!engine.VersionManage.validEngine("5.3.4 - 5.4.5")) {
-            logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"5.3.4 - 5.4.5"}'.`);
+        engine.VersionManage.add('plugin-rtc', "5.4.7-beem-enterprise.1");
+        if (!engine.VersionManage.validEngine("5.4.2-beem-enterprise.2")) {
+            logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"5.4.2-beem-enterprise.2"}'.`);
             return false;
         }
         return true;
@@ -19322,7 +19374,7 @@ const installer = {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.4.7-alpha.3"}, Commit: ${"851c4005fa6dfee3d966699f4bc260b0b6cbd7ea"}`);
+        logger.warn(`RCRTC Version: ${"5.4.7-beem-enterprise.1"}, Commit: ${"f6d422487789e25a83b33d99ce339c2d264d3d88"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);