@rongcloud/plugin-rtc 5.2.4-beem.4 → 5.2.4-beem.5

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.4
- * CommitId - a3cdebb13c1c9a8f31555277f185522a69f7e42f
- * Fri May 20 2022 19:05:14 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 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';

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.4
- * CommitId - a3cdebb13c1c9a8f31555277f185522a69f7e42f
- * Fri May 20 2022 19:05:14 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 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 };
 };
@@ -8447,7 +8456,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.4";
+        const rtcVersion = "5.2.4-beem.5";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -10705,7 +10714,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.4",
+    ClientVersion: "5.2.4-beem.5",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12734,7 +12743,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.2.4-beem.4");
+        VersionManage.add('plugin-rtc', "5.2.4-beem.5");
         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"}'.`);
             return false;
@@ -12744,7 +12753,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.4"}, Commit: ${"a3cdebb13c1c9a8f31555277f185522a69f7e42f"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.5"}, Commit: ${"13f398c4a680ab6054d831b2e76e51f68a677de9"}`);
         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.2.4-beem.4
- * CommitId - a3cdebb13c1c9a8f31555277f185522a69f7e42f
- * Fri May 20 2022 19:05:14 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -5624,6 +5624,7 @@ exports.RCMediaType = void 0;
     RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
 })(exports.RCMediaType || (exports.RCMediaType = {}));
 
+// export const RongRTCVideoBitrate: { [key: RCResolution]: BitrateConf } = {
 const RongRTCVideoBitrate = {
     [exports.RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
     [exports.RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -5640,23 +5641,26 @@ const RongRTCVideoBitrate = {
     [exports.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,
@@ -6222,13 +6226,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)
+    };
 };
 /**
  * 取视频流动态码率
@@ -6237,8 +6246,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 };
 };
@@ -8450,7 +8459,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.4";
+        const rtcVersion = "5.2.4-beem.5";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -10708,7 +10717,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.4",
+    ClientVersion: "5.2.4-beem.5",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12737,7 +12746,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.2.4-beem.4");
+        engine.VersionManage.add('plugin-rtc', "5.2.4-beem.5");
         if (!engine.VersionManage.validEngine("4.6.0-beem.5")) {
             logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
             return false;
@@ -12747,7 +12756,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.4"}, Commit: ${"a3cdebb13c1c9a8f31555277f185522a69f7e42f"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.5"}, Commit: ${"13f398c4a680ab6054d831b2e76e51f68a677de9"}`);
         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.2.4-beem.4
- * CommitId - a3cdebb13c1c9a8f31555277f185522a69f7e42f
- * Fri May 20 2022 19:05:14 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -5624,6 +5624,7 @@
         RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
     })(exports.RCMediaType || (exports.RCMediaType = {}));
 
+    // export const RongRTCVideoBitrate: { [key: RCResolution]: BitrateConf } = {
     const RongRTCVideoBitrate = {
         [exports.RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
         [exports.RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -5640,23 +5641,26 @@
         [exports.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,
@@ -6222,13 +6226,18 @@
      * @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)
+        };
     };
     /**
      * 取视频流动态码率
@@ -6237,8 +6246,8 @@
      */
     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 };
     };
@@ -8450,7 +8459,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.2.4-beem.4";
+            const rtcVersion = "5.2.4-beem.5";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -10708,7 +10717,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.2.4-beem.4",
+        ClientVersion: "5.2.4-beem.5",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -12737,7 +12746,7 @@
                 logger.error('Please use the https protocol or use `http://localhost` to open the page!');
                 return false;
             }
-            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.4");
+            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.5");
             if (!engine.VersionManage.validEngine("4.6.0-beem.5")) {
                 logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
                 return false;
@@ -12747,7 +12756,7 @@
         setup(context, runtime, options = {}) {
             logger.setLogLevel(options.logLevel);
             logger.setLogStdout(options.logStdout);
-            logger.warn(`RCRTC Version: ${"5.2.4-beem.4"}, Commit: ${"a3cdebb13c1c9a8f31555277f185522a69f7e42f"}`);
+            logger.warn(`RCRTC Version: ${"5.2.4-beem.5"}, Commit: ${"13f398c4a680ab6054d831b2e76e51f68a677de9"}`);
             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.2.4-beem.4",
+  "version": "5.2.4-beem.5",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "4.6.0-beem.5"
   },
-  "__commit__": "a3cdebb13c1c9a8f31555277f185522a69f7e42f"
+  "__commit__": "13f398c4a680ab6054d831b2e76e51f68a677de9"
 }