@rongcloud/plugin-rtc 5.4.7-alpha.3 → 5.4.7-alpha.4

package/dist/core/webrtc/sdp/ASdpBuilder.d.ts

@@ -46,6 +46,11 @@ export default abstract class ASdpBuilder {
      * @returns SDP 标头和音频和视频流的字符串。
      */
     abstract stringify(): string;
+    /**
+     * 它将 SDP 标头中的 `a=group` 行替换为 `b=AS` 和 `b=TIAS` 行
+     * @param {number} maxBitrate - 流的最大比特率。
+     */
+    setHeaderBitrate(maxBitrate: number): void;
     /**
      * 它获取音频流并将它们映射到一个新数组，其中每个项目都是调用 setAudioItemBitrate 函数的结果
      * @param {IRCTrackBitrate} bitrate - 以 kbps 为单位的比特率。

package/dist/helper.d.ts

@@ -42,6 +42,10 @@ export declare const isValidLocation: boolean;
  * @param track
  */
 export declare const getVideoTrackInfo: (track: MediaStreamTrack) => {
+    /**
+     * applyConstraints 方法应用的宽高约束不一定可以立马生效
+     * 取值优先 constraints
+     */
     width: number;
     height: number;
     frameRate: number;

package/dist/index.d.ts

@@ -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-alpha.4
+ * CommitId - 1297531a6457c0e72d9fa276eee9a49a7b3c596e
+ * Tue Sep 13 2022 20:41:55 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, RTCMode, IRuntime, RTCPluginContext, IJoinRTCRoomData, IReceivedMessage, ErrorCode, RTCJoinType, IRTCUserData, KVString, IServerRTCRoomEntry, LogLevel, IRTCJoinedInfo, IPluginGenerator } from '@rongcloud/engine';

package/dist/index.esm.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-alpha.4
+ * CommitId - 1297531a6457c0e72d9fa276eee9a49a7b3c596e
+ * Tue Sep 13 2022 20:41:55 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { Logger, EventEmitter, logger as logger$1, LogSource, isNumber, validate, ErrorCode, HttpMethod, ConnectionStatus, RTCMode, notEmptyString, isObject as isObject$1, isString, RTCJoinType, RTCApiType, isArray, assert, ConversationType, isHttpUrl, isBoolean, isUndefined, RTCIdentityChangeType, VersionManage } from '@rongcloud/engine';
@@ -7349,8 +7349,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)
     };
 };
@@ -7935,7 +7939,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-alpha.4",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -9264,6 +9268,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 为单位的比特率。
@@ -9354,7 +9365,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;
     }
@@ -9452,7 +9463,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;
     }
@@ -10824,7 +10835,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.4.7-alpha.3";
+        const rtcVersion = "5.4.7-alpha.4";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -12431,6 +12442,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 个
              */
@@ -19308,7 +19329,7 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        VersionManage.add('plugin-rtc', "5.4.7-alpha.3");
+        VersionManage.add('plugin-rtc', "5.4.7-alpha.4");
         if (!VersionManage.validEngine("5.3.4 - 5.4.5")) {
             logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"5.3.4 - 5.4.5"}'.`);
             return false;
@@ -19319,7 +19340,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-alpha.4"}, Commit: ${"1297531a6457c0e72d9fa276eee9a49a7b3c596e"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);

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-alpha.4
+ * CommitId - 1297531a6457c0e72d9fa276eee9a49a7b3c596e
+ * Tue Sep 13 2022 20:41:55 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -7352,8 +7352,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)
     };
 };
@@ -7938,7 +7942,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-alpha.4",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -9267,6 +9271,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 +9368,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 +9466,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;
     }
@@ -10827,7 +10838,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.4.7-alpha.3";
+        const rtcVersion = "5.4.7-alpha.4";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -12434,6 +12445,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 个
              */
@@ -19311,7 +19332,7 @@ 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");
+        engine.VersionManage.add('plugin-rtc', "5.4.7-alpha.4");
         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"}'.`);
             return false;
@@ -19322,7 +19343,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-alpha.4"}, Commit: ${"1297531a6457c0e72d9fa276eee9a49a7b3c596e"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/dist/index.umd.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-alpha.4
+ * CommitId - 1297531a6457c0e72d9fa276eee9a49a7b3c596e
+ * Tue Sep 13 2022 20:41:55 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -7352,8 +7352,12 @@
         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)
         };
     };
@@ -7938,7 +7942,7 @@
         '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-alpha.4",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -9267,6 +9271,13 @@
             }
             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 +9368,7 @@
          */
         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 +9466,7 @@
         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;
         }
@@ -10827,7 +10838,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.4.7-alpha.3";
+            const rtcVersion = "5.4.7-alpha.4";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -12434,6 +12445,16 @@
                     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 个
                  */
@@ -19311,7 +19332,7 @@
                 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");
+            engine.VersionManage.add('plugin-rtc', "5.4.7-alpha.4");
             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"}'.`);
                 return false;
@@ -19322,7 +19343,7 @@
             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-alpha.4"}, Commit: ${"1297531a6457c0e72d9fa276eee9a49a7b3c596e"}`);
             logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
             logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
             logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rongcloud/plugin-rtc",
-  "version": "5.4.7-alpha.3",
+  "version": "5.4.7-alpha.4",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "5.3.4 - 5.4.5"
   },
-  "__commit__": "851c4005fa6dfee3d966699f4bc260b0b6cbd7ea"
+  "__commit__": "1297531a6457c0e72d9fa276eee9a49a7b3c596e"
 }