@rongcloud/plugin-rtc 5.4.4-alpha.1 → 5.4.4-alpha.2

package/dist/core/Store.d.ts

@@ -4,7 +4,7 @@ import PolarisReporter from './PolarisReporter';
 import { RCMediaService } from './service';
 import { ICDNUris } from './service/interface';
 import { RCLocalTrack } from './tracks/RCLocalTrack';
-import { RCRemoteTrack } from './tracks/RCRemoteTrack';
+import { RCRemoteAudioTrack, RCRemoteTrack, RCRemoteVideoTrack } from './tracks/RCRemoteTrack';
 import RCRTCPeerCManager from './webrtc/RCRTCPeerCManager';
 export declare const StoreEvent: {};
 export declare abstract class ReadableStore {
@@ -25,7 +25,7 @@ export declare abstract class ReadableStore {
      * 远端 track
      */
     protected _remoteTracks: {
-        [trackId: string]: RCRemoteTrack;
+        [trackId: string]: RCRemoteAudioTrack | RCRemoteVideoTrack;
     };
     /**
      * 已订阅参数
@@ -51,7 +51,7 @@ export declare abstract class ReadableStore {
     getRemoteTrack(trackId: string): RCRemoteTrack | undefined;
     getRemoteTracksByUserId(userId: string): RCRemoteTrack[];
     getRemoteTracks(): {
-        [trackId: string]: RCRemoteTrack;
+        [trackId: string]: RCRemoteAudioTrack | RCRemoteVideoTrack;
     };
     getSessionId(): string;
     getAllUserIds(): string[];

package/dist/core/command/ParseRemoteResCommand.d.ts

@@ -3,7 +3,7 @@ import { IPublishedResource } from '../interfaces';
 import { Invoker } from '../Invoker';
 import { ICDNUris } from '../service';
 import { Store } from '../Store';
-import { RCRemoteTrack } from '../tracks/RCRemoteTrack';
+import { RCRemoteAudioTrack, RCRemoteTrack, RCRemoteVideoTrack } from '../tracks/RCRemoteTrack';
 import { BaseCommand, CommandPriority } from './BaseCommand';
 import { Subhook } from './UpdateSubListCommand';
 export declare type ResourceMsgContent = {
@@ -28,8 +28,8 @@ export declare class ParseRemoteResCommand extends BaseCommand<void> {
     constructor(msgContent: ResourceMsgContent, messageType: RCRTCMessageType.PUBLISH | RCRTCMessageType.UNPUBLISH | RCRTCMessageType.MODIFY | RCRTCMessageType.TOTAL_CONTENT_RESOURCE, senderId: string, subhook: Subhook, callback: {
         onTrackPublish: (tracks: RCRemoteTrack[]) => void;
         onTrackUnublish: (tracks: RCRemoteTrack[]) => void;
-        onAudioMute: (track: RCRemoteTrack) => void;
-        onVideoMute: (track: RCRemoteTrack) => void;
+        onAudioMute: (track: RCRemoteAudioTrack) => void;
+        onVideoMute: (track: RCRemoteVideoTrack) => void;
         onCDNEnableChange: (bool: boolean) => void;
     });
     get priority(): CommandPriority;

package/dist/core/enums/RCRTCCode.d.ts

@@ -41,7 +41,7 @@ export declare enum RCRTCCode {
     /** 获取屏幕共享流失败 */
     GET_DISPLAY_MEDIA_FAILED = 53011,
     /** 权限问题导致获取媒体流被拒绝 */
-    PERMISSION_DENIED = 53012,
+    BROWSER_PERMISSION_DENIED = 53012,
     /** 创建自定义流失败 */
     CREATE_CUSTOM_TRACK_FAILED = 53013,
     /** 无效的 TAG 定义 */
@@ -81,6 +81,8 @@ export declare enum RCRTCCode {
     /** 资源没有全部发成功 */
     SOME_TRACKS_PUBLISH_FAILED = 53031,
     /** electron 中 mac 系统暂不支持屏幕共享采集声音 */
-    MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO = 53032
+    MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO = 53032,
+    /** 获取媒体资源时，无系统权限 */
+    SYSTEM_PERMISSION_DENIED = 53033
 }
 //# sourceMappingURL=RCRTCCode.d.ts.map

package/dist/core/tracks/RCRemoteTrack.d.ts

@@ -19,5 +19,11 @@ export declare class RCRemoteAudioTrack extends RCRemoteTrack {
 }
 export declare class RCRemoteVideoTrack extends RCRemoteTrack {
     constructor(tag: string, userId: string, roomId?: string);
+    private _isSubTiny;
+    __innerSetIsTinyTrack(bool: boolean): void;
+    /**
+     * 是否订阅的小流
+     */
+    isSubTiny(): boolean;
 }
 //# sourceMappingURL=RCRemoteTrack.d.ts.map

package/dist/core/tracks/RCTrack.d.ts

@@ -72,7 +72,6 @@ export declare abstract class RCTrack extends EventEmitter {
     play(element?: HTMLVideoElement, options?: {
         volume?: number;
         audioDeviceId?: string;
-        autoplay: boolean;
     }): Promise<{
         code: RCRTCCode;
     }>;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.4.4-alpha.1
- * CommitId - 62dca5e7f4d904aeefb9634071be2b9b2f37c61d
- * Tue Aug 02 2022 15:17:41 GMT+0800 (China Standard Time)
+ * RCRTC - v5.4.4-alpha.2
+ * CommitId - d4522cc8f360c18bd7c52c4ee73731d9845ffb89
+ * Wed Aug 03 2022 17:46:00 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';
@@ -50,7 +50,7 @@ declare enum RCRTCCode {
     /** 获取屏幕共享流失败 */
     GET_DISPLAY_MEDIA_FAILED = 53011,
     /** 权限问题导致获取媒体流被拒绝 */
-    PERMISSION_DENIED = 53012,
+    BROWSER_PERMISSION_DENIED = 53012,
     /** 创建自定义流失败 */
     CREATE_CUSTOM_TRACK_FAILED = 53013,
     /** 无效的 TAG 定义 */
@@ -90,7 +90,9 @@ declare enum RCRTCCode {
     /** 资源没有全部发成功 */
     SOME_TRACKS_PUBLISH_FAILED = 53031,
     /** electron 中 mac 系统暂不支持屏幕共享采集声音 */
-    MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO = 53032
+    MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO = 53032,
+    /** 获取媒体资源时，无系统权限 */
+    SYSTEM_PERMISSION_DENIED = 53033
 }
 
 /**
@@ -216,7 +218,6 @@ declare abstract class RCTrack extends EventEmitter {
     play(element?: HTMLVideoElement, options?: {
         volume?: number;
         audioDeviceId?: string;
-        autoplay: boolean;
     }): Promise<{
         code: RCRTCCode;
     }>;
@@ -411,6 +412,12 @@ declare class RCRemoteAudioTrack extends RCRemoteTrack {
 }
 declare class RCRemoteVideoTrack extends RCRemoteTrack {
     constructor(tag: string, userId: string, roomId?: string);
+    private _isSubTiny;
+    __innerSetIsTinyTrack(bool: boolean): void;
+    /**
+     * 是否订阅的小流
+     */
+    isSubTiny(): boolean;
 }
 
 /**
@@ -1422,7 +1429,7 @@ declare abstract class ReadableStore {
      * 远端 track
      */
     protected _remoteTracks: {
-        [trackId: string]: RCRemoteTrack;
+        [trackId: string]: RCRemoteAudioTrack | RCRemoteVideoTrack;
     };
     /**
      * 已订阅参数
@@ -1448,7 +1455,7 @@ declare abstract class ReadableStore {
     getRemoteTrack(trackId: string): RCRemoteTrack | undefined;
     getRemoteTracksByUserId(userId: string): RCRemoteTrack[];
     getRemoteTracks(): {
-        [trackId: string]: RCRemoteTrack;
+        [trackId: string]: RCRemoteAudioTrack | RCRemoteVideoTrack;
     };
     getSessionId(): string;
     getAllUserIds(): string[];

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.4.4-alpha.1
- * CommitId - 62dca5e7f4d904aeefb9634071be2b9b2f37c61d
- * Tue Aug 02 2022 15:17:41 GMT+0800 (China Standard Time)
+ * RCRTC - v5.4.4-alpha.2
+ * CommitId - d4522cc8f360c18bd7c52c4ee73731d9845ffb89
+ * Wed Aug 03 2022 17:46:00 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';
@@ -78,7 +78,7 @@ var RCRTCCode;
     /** 获取屏幕共享流失败 */
     RCRTCCode[RCRTCCode["GET_DISPLAY_MEDIA_FAILED"] = 53011] = "GET_DISPLAY_MEDIA_FAILED";
     /** 权限问题导致获取媒体流被拒绝 */
-    RCRTCCode[RCRTCCode["PERMISSION_DENIED"] = 53012] = "PERMISSION_DENIED";
+    RCRTCCode[RCRTCCode["BROWSER_PERMISSION_DENIED"] = 53012] = "BROWSER_PERMISSION_DENIED";
     /** 创建自定义流失败 */
     RCRTCCode[RCRTCCode["CREATE_CUSTOM_TRACK_FAILED"] = 53013] = "CREATE_CUSTOM_TRACK_FAILED";
     /** 无效的 TAG 定义 */
@@ -119,6 +119,8 @@ var RCRTCCode;
     RCRTCCode[RCRTCCode["SOME_TRACKS_PUBLISH_FAILED"] = 53031] = "SOME_TRACKS_PUBLISH_FAILED";
     /** electron 中 mac 系统暂不支持屏幕共享采集声音 */
     RCRTCCode[RCRTCCode["MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO"] = 53032] = "MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO";
+    /** 获取媒体资源时，无系统权限 */
+    RCRTCCode[RCRTCCode["SYSTEM_PERMISSION_DENIED"] = 53033] = "SYSTEM_PERMISSION_DENIED";
 })(RCRTCCode || (RCRTCCode = {}));
 
 var RCLoggerTag;
@@ -6421,8 +6423,7 @@ class RCTrack extends EventEmitter {
      * @param element 用于承载媒体流的元素标签，音频流可传空
      * @param volume 有效值为 0-100
      */
-    play(element, options = { autoplay: true }) {
-        var _a, _b;
+    play(element, options) {
         return __awaiter(this, void 0, void 0, function* () {
             logger$1.info(RCLoggerTag.L_TRACK_PLAY_T, {
                 element,
@@ -6580,46 +6581,42 @@ class RCTrack extends EventEmitter {
                     logSource: LogSource.RTC
                 });
             };
-            // 用户在 Video 标签上 设置的优化级最高，其次是选项中设置的 autoplay
-            const autoplay = ((_a = this._element) === null || _a === void 0 ? void 0 : _a.getAttribute('autoplay')) === null ? options.autoplay : (_b = this._element) === null || _b === void 0 ? void 0 : _b.autoplay;
             this._element.oncanplay = (evt) => __awaiter(this, void 0, void 0, function* () {
-                var _c, _d, _e;
+                var _a, _b, _c;
                 // 可以播放
-                logger.info(`HTMLMediaElement oncanplay -> id: ${(_c = evt.target) === null || _c === void 0 ? void 0 : _c.id}, trackId: ${this._id}`);
+                logger.info(`HTMLMediaElement oncanplay -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
                 logger$1.info(RCLoggerTag.L_TRACK_PLAY_R, {
                     status: RCLoggerStatus.INFO,
-                    msg: `HTMLMediaElement oncanplay -> id: ${(_d = evt.target) === null || _d === void 0 ? void 0 : _d.id}, trackId: ${this._id}`
+                    msg: `HTMLMediaElement oncanplay -> id: ${(_b = evt.target) === null || _b === void 0 ? void 0 : _b.id}, trackId: ${this._id}`
                 }, {
                     logSource: LogSource.RTC
                 });
-                if (autoplay) {
-                    try {
-                        (_e = this._element) === null || _e === void 0 ? void 0 : _e.play();
-                    }
-                    catch (error) {
-                        /**
-                         * 检测是否有设置音频输出设备的权限
-                         */
-                        if (error.message === 'No permission to use requested device') {
-                            logger.error(`setSinkId failed -> ${error.message}`);
-                            logger$1.error(RCLoggerTag.L_TRACK_PLAY_R, {
-                                status: RCLoggerStatus.FAILED,
-                                code: RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE,
-                                msg: 'No permission'
-                            }, {
-                                logSource: LogSource.RTC
-                            });
-                            return;
-                        }
-                        logger.error(error);
+                try {
+                    (_c = this._element) === null || _c === void 0 ? void 0 : _c.play();
+                }
+                catch (error) {
+                    /**
+                     * 检测是否有设置音频输出设备的权限
+                     */
+                    if (error.message === 'No permission to use requested device') {
+                        logger.error(`setSinkId failed -> ${error.message}`);
                         logger$1.error(RCLoggerTag.L_TRACK_PLAY_R, {
                             status: RCLoggerStatus.FAILED,
-                            code: RCRTCCode.TRACK_PLAY_ERROR,
-                            msg: 'play error'
+                            code: RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE,
+                            msg: 'No permission'
                         }, {
                             logSource: LogSource.RTC
                         });
+                        return;
                     }
+                    logger.error(error);
+                    logger$1.error(RCLoggerTag.L_TRACK_PLAY_R, {
+                        status: RCLoggerStatus.FAILED,
+                        code: RCRTCCode.TRACK_PLAY_ERROR,
+                        msg: 'play error'
+                    }, {
+                        logSource: LogSource.RTC
+                    });
                 }
             });
             this._element.onvolumechange = evt => {
@@ -6635,7 +6632,7 @@ class RCTrack extends EventEmitter {
                 });
             };
             this._element.srcObject = this._msStream;
-            this._element.autoplay = autoplay;
+            this._element.autoplay = true;
             // video 标签页面内播放
             if (isVideoTrack) {
                 this._element.playsInline = true;
@@ -7045,6 +7042,16 @@ class RCRemoteAudioTrack extends RCRemoteTrack {
 class RCRemoteVideoTrack extends RCRemoteTrack {
     constructor(tag, userId, roomId) {
         super(tag, userId, 'video', roomId);
+        this._isSubTiny = false;
+    }
+    __innerSetIsTinyTrack(bool) {
+        this._isSubTiny = bool;
+    }
+    /**
+     * 是否订阅的小流
+     */
+    isSubTiny() {
+        return this._isSubTiny;
     }
 }
 
@@ -7674,7 +7681,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.4.4-alpha.1",
+    ClientVersion: "5.4.4-alpha.2",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -7996,7 +8003,7 @@ const handleAudioLevel = (audioLevel, factor = 2) => {
         audioLevel = audioLevel / 32767;
     }
     const rate = 10 ** factor;
-    return Math.ceil(audioLevel * rate);
+    return Math.round(audioLevel * rate);
 };
 /**
  * 计算丢包率
@@ -9967,12 +9974,6 @@ class RCRTCPeerConnection extends EventEmitter {
              * 获取 report 中的 iceCandidatePair、senders、receivers 中的所有字段
              */
             const formatData = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.formatRCRTCStateReport(data);
-            logger$1.info(RCLoggerTag.L_RTC_PEER_CONNECTION_GET_STATS_DATA_O, {
-                status: RCLoggerStatus.SUCCESSED,
-                formatData
-            }, {
-                logSource: LogSource.RTC
-            });
             return formatData;
         });
     }
@@ -10272,7 +10273,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.4.4-alpha.1";
+        const rtcVersion = "5.4.4-alpha.2";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -11232,11 +11233,13 @@ class UpdateSubListCommand extends BaseCommand {
             const subSuccessTrackIds = subscribedList === null || subscribedList === void 0 ? void 0 : subscribedList.map(item => `${item.msid}_${item.mediaType}`);
             const subSuccessList = attrs.filter(item => subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId()));
             const failedList = attrs.filter(item => !(subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId())));
-            // 更新 remoteTrack.isSubscribed
+            // 更新 remoteTrack.isSubscribed、remoteTrack.isTinyTrack
             const remoteTracks = store.getRemoteTracks();
             for (const trackId in remoteTracks) {
                 const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
                 remoteTracks[trackId].__innerSetSubscribed(subed);
+                const isTinyTrack = subSuccessList.some(item => (item.track.getTrackId() === trackId && item.subTiny));
+                remoteTracks[trackId].isVideoTrack() && (remoteTracks[trackId].__innerSetIsTinyTrack(isTinyTrack));
             }
             // 更新本地订阅关系
             const sublist = store.getSubscribedList();
@@ -16980,7 +16983,10 @@ class RCMediaStreamCapture {
             }
             catch (error) {
                 if (error.message === 'Permission denied') {
-                    return { code: RCRTCCode.PERMISSION_DENIED };
+                    return { code: RCRTCCode.BROWSER_PERMISSION_DENIED };
+                }
+                if (error.message === 'Permission denied by system') {
+                    return { code: RCRTCCode.SYSTEM_PERMISSION_DENIED };
                 }
                 logger.error(`get user media failed -> ${error.message}`);
             }
@@ -18189,7 +18195,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.4-alpha.1");
+        VersionManage.add('plugin-rtc', "5.4.4-alpha.2");
         if (!VersionManage.validEngine(">=5.3.3-beem-alpha.2 || >=5.3.4")) {
             logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${">=5.3.3-beem-alpha.2 || >=5.3.4"}'.`);
             return false;
@@ -18199,7 +18205,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.4.4-alpha.1"}, Commit: ${"62dca5e7f4d904aeefb9634071be2b9b2f37c61d"}`);
+        logger.warn(`RCRTC Version: ${"5.4.4-alpha.2"}, Commit: ${"d4522cc8f360c18bd7c52c4ee73731d9845ffb89"}`);
         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.4-alpha.1
- * CommitId - 62dca5e7f4d904aeefb9634071be2b9b2f37c61d
- * Tue Aug 02 2022 15:17:41 GMT+0800 (China Standard Time)
+ * RCRTC - v5.4.4-alpha.2
+ * CommitId - d4522cc8f360c18bd7c52c4ee73731d9845ffb89
+ * Wed Aug 03 2022 17:46:00 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -81,7 +81,7 @@ exports.RCRTCCode = void 0;
     /** 获取屏幕共享流失败 */
     RCRTCCode[RCRTCCode["GET_DISPLAY_MEDIA_FAILED"] = 53011] = "GET_DISPLAY_MEDIA_FAILED";
     /** 权限问题导致获取媒体流被拒绝 */
-    RCRTCCode[RCRTCCode["PERMISSION_DENIED"] = 53012] = "PERMISSION_DENIED";
+    RCRTCCode[RCRTCCode["BROWSER_PERMISSION_DENIED"] = 53012] = "BROWSER_PERMISSION_DENIED";
     /** 创建自定义流失败 */
     RCRTCCode[RCRTCCode["CREATE_CUSTOM_TRACK_FAILED"] = 53013] = "CREATE_CUSTOM_TRACK_FAILED";
     /** 无效的 TAG 定义 */
@@ -122,6 +122,8 @@ exports.RCRTCCode = void 0;
     RCRTCCode[RCRTCCode["SOME_TRACKS_PUBLISH_FAILED"] = 53031] = "SOME_TRACKS_PUBLISH_FAILED";
     /** electron 中 mac 系统暂不支持屏幕共享采集声音 */
     RCRTCCode[RCRTCCode["MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO"] = 53032] = "MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO";
+    /** 获取媒体资源时，无系统权限 */
+    RCRTCCode[RCRTCCode["SYSTEM_PERMISSION_DENIED"] = 53033] = "SYSTEM_PERMISSION_DENIED";
 })(exports.RCRTCCode || (exports.RCRTCCode = {}));
 
 var RCLoggerTag;
@@ -6424,8 +6426,7 @@ class RCTrack extends engine.EventEmitter {
      * @param element 用于承载媒体流的元素标签，音频流可传空
      * @param volume 有效值为 0-100
      */
-    play(element, options = { autoplay: true }) {
-        var _a, _b;
+    play(element, options) {
         return __awaiter(this, void 0, void 0, function* () {
             engine.logger.info(RCLoggerTag.L_TRACK_PLAY_T, {
                 element,
@@ -6583,46 +6584,42 @@ class RCTrack extends engine.EventEmitter {
                     logSource: engine.LogSource.RTC
                 });
             };
-            // 用户在 Video 标签上 设置的优化级最高，其次是选项中设置的 autoplay
-            const autoplay = ((_a = this._element) === null || _a === void 0 ? void 0 : _a.getAttribute('autoplay')) === null ? options.autoplay : (_b = this._element) === null || _b === void 0 ? void 0 : _b.autoplay;
             this._element.oncanplay = (evt) => __awaiter(this, void 0, void 0, function* () {
-                var _c, _d, _e;
+                var _a, _b, _c;
                 // 可以播放
-                logger.info(`HTMLMediaElement oncanplay -> id: ${(_c = evt.target) === null || _c === void 0 ? void 0 : _c.id}, trackId: ${this._id}`);
+                logger.info(`HTMLMediaElement oncanplay -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
                 engine.logger.info(RCLoggerTag.L_TRACK_PLAY_R, {
                     status: RCLoggerStatus.INFO,
-                    msg: `HTMLMediaElement oncanplay -> id: ${(_d = evt.target) === null || _d === void 0 ? void 0 : _d.id}, trackId: ${this._id}`
+                    msg: `HTMLMediaElement oncanplay -> id: ${(_b = evt.target) === null || _b === void 0 ? void 0 : _b.id}, trackId: ${this._id}`
                 }, {
                     logSource: engine.LogSource.RTC
                 });
-                if (autoplay) {
-                    try {
-                        (_e = this._element) === null || _e === void 0 ? void 0 : _e.play();
-                    }
-                    catch (error) {
-                        /**
-                         * 检测是否有设置音频输出设备的权限
-                         */
-                        if (error.message === 'No permission to use requested device') {
-                            logger.error(`setSinkId failed -> ${error.message}`);
-                            engine.logger.error(RCLoggerTag.L_TRACK_PLAY_R, {
-                                status: RCLoggerStatus.FAILED,
-                                code: exports.RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE,
-                                msg: 'No permission'
-                            }, {
-                                logSource: engine.LogSource.RTC
-                            });
-                            return;
-                        }
-                        logger.error(error);
+                try {
+                    (_c = this._element) === null || _c === void 0 ? void 0 : _c.play();
+                }
+                catch (error) {
+                    /**
+                     * 检测是否有设置音频输出设备的权限
+                     */
+                    if (error.message === 'No permission to use requested device') {
+                        logger.error(`setSinkId failed -> ${error.message}`);
                         engine.logger.error(RCLoggerTag.L_TRACK_PLAY_R, {
                             status: RCLoggerStatus.FAILED,
-                            code: exports.RCRTCCode.TRACK_PLAY_ERROR,
-                            msg: 'play error'
+                            code: exports.RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE,
+                            msg: 'No permission'
                         }, {
                             logSource: engine.LogSource.RTC
                         });
+                        return;
                     }
+                    logger.error(error);
+                    engine.logger.error(RCLoggerTag.L_TRACK_PLAY_R, {
+                        status: RCLoggerStatus.FAILED,
+                        code: exports.RCRTCCode.TRACK_PLAY_ERROR,
+                        msg: 'play error'
+                    }, {
+                        logSource: engine.LogSource.RTC
+                    });
                 }
             });
             this._element.onvolumechange = evt => {
@@ -6638,7 +6635,7 @@ class RCTrack extends engine.EventEmitter {
                 });
             };
             this._element.srcObject = this._msStream;
-            this._element.autoplay = autoplay;
+            this._element.autoplay = true;
             // video 标签页面内播放
             if (isVideoTrack) {
                 this._element.playsInline = true;
@@ -7048,6 +7045,16 @@ class RCRemoteAudioTrack extends RCRemoteTrack {
 class RCRemoteVideoTrack extends RCRemoteTrack {
     constructor(tag, userId, roomId) {
         super(tag, userId, 'video', roomId);
+        this._isSubTiny = false;
+    }
+    __innerSetIsTinyTrack(bool) {
+        this._isSubTiny = bool;
+    }
+    /**
+     * 是否订阅的小流
+     */
+    isSubTiny() {
+        return this._isSubTiny;
     }
 }
 
@@ -7677,7 +7684,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.4.4-alpha.1",
+    ClientVersion: "5.4.4-alpha.2",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -7999,7 +8006,7 @@ const handleAudioLevel = (audioLevel, factor = 2) => {
         audioLevel = audioLevel / 32767;
     }
     const rate = 10 ** factor;
-    return Math.ceil(audioLevel * rate);
+    return Math.round(audioLevel * rate);
 };
 /**
  * 计算丢包率
@@ -9970,12 +9977,6 @@ class RCRTCPeerConnection extends engine.EventEmitter {
              * 获取 report 中的 iceCandidatePair、senders、receivers 中的所有字段
              */
             const formatData = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.formatRCRTCStateReport(data);
-            engine.logger.info(RCLoggerTag.L_RTC_PEER_CONNECTION_GET_STATS_DATA_O, {
-                status: RCLoggerStatus.SUCCESSED,
-                formatData
-            }, {
-                logSource: engine.LogSource.RTC
-            });
             return formatData;
         });
     }
@@ -10275,7 +10276,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.4.4-alpha.1";
+        const rtcVersion = "5.4.4-alpha.2";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -11235,11 +11236,13 @@ class UpdateSubListCommand extends BaseCommand {
             const subSuccessTrackIds = subscribedList === null || subscribedList === void 0 ? void 0 : subscribedList.map(item => `${item.msid}_${item.mediaType}`);
             const subSuccessList = attrs.filter(item => subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId()));
             const failedList = attrs.filter(item => !(subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId())));
-            // 更新 remoteTrack.isSubscribed
+            // 更新 remoteTrack.isSubscribed、remoteTrack.isTinyTrack
             const remoteTracks = store.getRemoteTracks();
             for (const trackId in remoteTracks) {
                 const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
                 remoteTracks[trackId].__innerSetSubscribed(subed);
+                const isTinyTrack = subSuccessList.some(item => (item.track.getTrackId() === trackId && item.subTiny));
+                remoteTracks[trackId].isVideoTrack() && (remoteTracks[trackId].__innerSetIsTinyTrack(isTinyTrack));
             }
             // 更新本地订阅关系
             const sublist = store.getSubscribedList();
@@ -16983,7 +16986,10 @@ class RCMediaStreamCapture {
             }
             catch (error) {
                 if (error.message === 'Permission denied') {
-                    return { code: exports.RCRTCCode.PERMISSION_DENIED };
+                    return { code: exports.RCRTCCode.BROWSER_PERMISSION_DENIED };
+                }
+                if (error.message === 'Permission denied by system') {
+                    return { code: exports.RCRTCCode.SYSTEM_PERMISSION_DENIED };
                 }
                 logger.error(`get user media failed -> ${error.message}`);
             }
@@ -18192,7 +18198,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.4-alpha.1");
+        engine.VersionManage.add('plugin-rtc', "5.4.4-alpha.2");
         if (!engine.VersionManage.validEngine(">=5.3.3-beem-alpha.2 || >=5.3.4")) {
             logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${">=5.3.3-beem-alpha.2 || >=5.3.4"}'.`);
             return false;
@@ -18202,7 +18208,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.4.4-alpha.1"}, Commit: ${"62dca5e7f4d904aeefb9634071be2b9b2f37c61d"}`);
+        logger.warn(`RCRTC Version: ${"5.4.4-alpha.2"}, Commit: ${"d4522cc8f360c18bd7c52c4ee73731d9845ffb89"}`);
         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.4-alpha.1
- * CommitId - 62dca5e7f4d904aeefb9634071be2b9b2f37c61d
- * Tue Aug 02 2022 15:17:41 GMT+0800 (China Standard Time)
+ * RCRTC - v5.4.4-alpha.2
+ * CommitId - d4522cc8f360c18bd7c52c4ee73731d9845ffb89
+ * Wed Aug 03 2022 17:46:00 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -81,7 +81,7 @@
         /** 获取屏幕共享流失败 */
         RCRTCCode[RCRTCCode["GET_DISPLAY_MEDIA_FAILED"] = 53011] = "GET_DISPLAY_MEDIA_FAILED";
         /** 权限问题导致获取媒体流被拒绝 */
-        RCRTCCode[RCRTCCode["PERMISSION_DENIED"] = 53012] = "PERMISSION_DENIED";
+        RCRTCCode[RCRTCCode["BROWSER_PERMISSION_DENIED"] = 53012] = "BROWSER_PERMISSION_DENIED";
         /** 创建自定义流失败 */
         RCRTCCode[RCRTCCode["CREATE_CUSTOM_TRACK_FAILED"] = 53013] = "CREATE_CUSTOM_TRACK_FAILED";
         /** 无效的 TAG 定义 */
@@ -122,6 +122,8 @@
         RCRTCCode[RCRTCCode["SOME_TRACKS_PUBLISH_FAILED"] = 53031] = "SOME_TRACKS_PUBLISH_FAILED";
         /** electron 中 mac 系统暂不支持屏幕共享采集声音 */
         RCRTCCode[RCRTCCode["MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO"] = 53032] = "MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO";
+        /** 获取媒体资源时，无系统权限 */
+        RCRTCCode[RCRTCCode["SYSTEM_PERMISSION_DENIED"] = 53033] = "SYSTEM_PERMISSION_DENIED";
     })(exports.RCRTCCode || (exports.RCRTCCode = {}));
 
     var RCLoggerTag;
@@ -6424,8 +6426,7 @@
          * @param element 用于承载媒体流的元素标签，音频流可传空
          * @param volume 有效值为 0-100
          */
-        play(element, options = { autoplay: true }) {
-            var _a, _b;
+        play(element, options) {
             return __awaiter(this, void 0, void 0, function* () {
                 engine.logger.info(RCLoggerTag.L_TRACK_PLAY_T, {
                     element,
@@ -6583,46 +6584,42 @@
                         logSource: engine.LogSource.RTC
                     });
                 };
-                // 用户在 Video 标签上 设置的优化级最高，其次是选项中设置的 autoplay
-                const autoplay = ((_a = this._element) === null || _a === void 0 ? void 0 : _a.getAttribute('autoplay')) === null ? options.autoplay : (_b = this._element) === null || _b === void 0 ? void 0 : _b.autoplay;
                 this._element.oncanplay = (evt) => __awaiter(this, void 0, void 0, function* () {
-                    var _c, _d, _e;
+                    var _a, _b, _c;
                     // 可以播放
-                    logger.info(`HTMLMediaElement oncanplay -> id: ${(_c = evt.target) === null || _c === void 0 ? void 0 : _c.id}, trackId: ${this._id}`);
+                    logger.info(`HTMLMediaElement oncanplay -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
                     engine.logger.info(RCLoggerTag.L_TRACK_PLAY_R, {
                         status: RCLoggerStatus.INFO,
-                        msg: `HTMLMediaElement oncanplay -> id: ${(_d = evt.target) === null || _d === void 0 ? void 0 : _d.id}, trackId: ${this._id}`
+                        msg: `HTMLMediaElement oncanplay -> id: ${(_b = evt.target) === null || _b === void 0 ? void 0 : _b.id}, trackId: ${this._id}`
                     }, {
                         logSource: engine.LogSource.RTC
                     });
-                    if (autoplay) {
-                        try {
-                            (_e = this._element) === null || _e === void 0 ? void 0 : _e.play();
-                        }
-                        catch (error) {
-                            /**
-                             * 检测是否有设置音频输出设备的权限
-                             */
-                            if (error.message === 'No permission to use requested device') {
-                                logger.error(`setSinkId failed -> ${error.message}`);
-                                engine.logger.error(RCLoggerTag.L_TRACK_PLAY_R, {
-                                    status: RCLoggerStatus.FAILED,
-                                    code: exports.RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE,
-                                    msg: 'No permission'
-                                }, {
-                                    logSource: engine.LogSource.RTC
-                                });
-                                return;
-                            }
-                            logger.error(error);
+                    try {
+                        (_c = this._element) === null || _c === void 0 ? void 0 : _c.play();
+                    }
+                    catch (error) {
+                        /**
+                         * 检测是否有设置音频输出设备的权限
+                         */
+                        if (error.message === 'No permission to use requested device') {
+                            logger.error(`setSinkId failed -> ${error.message}`);
                             engine.logger.error(RCLoggerTag.L_TRACK_PLAY_R, {
                                 status: RCLoggerStatus.FAILED,
-                                code: exports.RCRTCCode.TRACK_PLAY_ERROR,
-                                msg: 'play error'
+                                code: exports.RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE,
+                                msg: 'No permission'
                             }, {
                                 logSource: engine.LogSource.RTC
                             });
+                            return;
                         }
+                        logger.error(error);
+                        engine.logger.error(RCLoggerTag.L_TRACK_PLAY_R, {
+                            status: RCLoggerStatus.FAILED,
+                            code: exports.RCRTCCode.TRACK_PLAY_ERROR,
+                            msg: 'play error'
+                        }, {
+                            logSource: engine.LogSource.RTC
+                        });
                     }
                 });
                 this._element.onvolumechange = evt => {
@@ -6638,7 +6635,7 @@
                     });
                 };
                 this._element.srcObject = this._msStream;
-                this._element.autoplay = autoplay;
+                this._element.autoplay = true;
                 // video 标签页面内播放
                 if (isVideoTrack) {
                     this._element.playsInline = true;
@@ -7048,6 +7045,16 @@
     class RCRemoteVideoTrack extends RCRemoteTrack {
         constructor(tag, userId, roomId) {
             super(tag, userId, 'video', roomId);
+            this._isSubTiny = false;
+        }
+        __innerSetIsTinyTrack(bool) {
+            this._isSubTiny = bool;
+        }
+        /**
+         * 是否订阅的小流
+         */
+        isSubTiny() {
+            return this._isSubTiny;
         }
     }
 
@@ -7677,7 +7684,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.4.4-alpha.1",
+        ClientVersion: "5.4.4-alpha.2",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -7999,7 +8006,7 @@
             audioLevel = audioLevel / 32767;
         }
         const rate = 10 ** factor;
-        return Math.ceil(audioLevel * rate);
+        return Math.round(audioLevel * rate);
     };
     /**
      * 计算丢包率
@@ -9970,12 +9977,6 @@
                  * 获取 report 中的 iceCandidatePair、senders、receivers 中的所有字段
                  */
                 const formatData = (_b = this.reportParser) === null || _b === void 0 ? void 0 : _b.formatRCRTCStateReport(data);
-                engine.logger.info(RCLoggerTag.L_RTC_PEER_CONNECTION_GET_STATS_DATA_O, {
-                    status: RCLoggerStatus.SUCCESSED,
-                    formatData
-                }, {
-                    logSource: engine.LogSource.RTC
-                });
                 return formatData;
             });
         }
@@ -10275,7 +10276,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.4.4-alpha.1";
+            const rtcVersion = "5.4.4-alpha.2";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -11235,11 +11236,13 @@
                 const subSuccessTrackIds = subscribedList === null || subscribedList === void 0 ? void 0 : subscribedList.map(item => `${item.msid}_${item.mediaType}`);
                 const subSuccessList = attrs.filter(item => subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId()));
                 const failedList = attrs.filter(item => !(subSuccessTrackIds === null || subSuccessTrackIds === void 0 ? void 0 : subSuccessTrackIds.includes(item.track.getTrackId())));
-                // 更新 remoteTrack.isSubscribed
+                // 更新 remoteTrack.isSubscribed、remoteTrack.isTinyTrack
                 const remoteTracks = store.getRemoteTracks();
                 for (const trackId in remoteTracks) {
                     const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
                     remoteTracks[trackId].__innerSetSubscribed(subed);
+                    const isTinyTrack = subSuccessList.some(item => (item.track.getTrackId() === trackId && item.subTiny));
+                    remoteTracks[trackId].isVideoTrack() && (remoteTracks[trackId].__innerSetIsTinyTrack(isTinyTrack));
                 }
                 // 更新本地订阅关系
                 const sublist = store.getSubscribedList();
@@ -16983,7 +16986,10 @@
                 }
                 catch (error) {
                     if (error.message === 'Permission denied') {
-                        return { code: exports.RCRTCCode.PERMISSION_DENIED };
+                        return { code: exports.RCRTCCode.BROWSER_PERMISSION_DENIED };
+                    }
+                    if (error.message === 'Permission denied by system') {
+                        return { code: exports.RCRTCCode.SYSTEM_PERMISSION_DENIED };
                     }
                     logger.error(`get user media failed -> ${error.message}`);
                 }
@@ -18192,7 +18198,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.4-alpha.1");
+            engine.VersionManage.add('plugin-rtc', "5.4.4-alpha.2");
             if (!engine.VersionManage.validEngine(">=5.3.3-beem-alpha.2 || >=5.3.4")) {
                 logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${">=5.3.3-beem-alpha.2 || >=5.3.4"}'.`);
                 return false;
@@ -18202,7 +18208,7 @@
         setup(context, runtime, options = {}) {
             logger.setLogLevel(options.logLevel);
             logger.setLogStdout(options.logStdout);
-            logger.warn(`RCRTC Version: ${"5.4.4-alpha.1"}, Commit: ${"62dca5e7f4d904aeefb9634071be2b9b2f37c61d"}`);
+            logger.warn(`RCRTC Version: ${"5.4.4-alpha.2"}, Commit: ${"d4522cc8f360c18bd7c52c4ee73731d9845ffb89"}`);
             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.4-alpha.1",
+  "version": "5.4.4-alpha.2",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": ">=5.3.3-beem-alpha.2 || >=5.3.4"
   },
-  "__commit__": "62dca5e7f4d904aeefb9634071be2b9b2f37c61d"
+  "__commit__": "d4522cc8f360c18bd7c52c4ee73731d9845ffb89"
 }