@rongcloud/plugin-rtc 5.4.6-alpha.1 → 5.4.7-alpha.2

package/dist/index.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.4.6-alpha.1
- * CommitId - d109ea1eb1987a80bf3299b86d39859d331d65b8
- * Fri Aug 19 2022 11:59:39 GMT+0800 (中国标准时间)
+ * RCRTC - v5.4.7-alpha.2
+ * CommitId - 1826738708cea2e2c6cc7586713f2c24ab40e665
+ * Wed Aug 31 2022 18:33:00 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var engine = require('@rongcloud/engine');
 
-/******************************************************************************
+/*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -124,6 +124,8 @@ exports.RCRTCCode = void 0;
     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";
+    /** 发布时无有效资源，如 track 已被销毁 */
+    RCRTCCode[RCRTCCode["PUBLISH_TRACKS_IS_INVALID"] = 53034] = "PUBLISH_TRACKS_IS_INVALID";
 })(exports.RCRTCCode || (exports.RCRTCCode = {}));
 
 var RCLoggerTag;
@@ -297,19 +299,19 @@ var RCLoggerTag;
      */
     RCLoggerTag["L_ABSTRACT_ROOM_DELETE_ROOM_ATTRIBUTE_R"] = "L-abstract_room_delete_room_attribute_R";
     /**
-     * 房间推流的任务
+     * 房间发布资源的任务
      */
     RCLoggerTag["L_ABSTRACT_ROOM_PUBLISH_T"] = "L-abstract_room_publish-T";
     /**
-     * 房间推流的结果
+     * 房间发布资源结果
      */
     RCLoggerTag["L_ABSTRACT_ROOM_PUBLISH_R"] = "L-abstract_room_publish-R";
     /**
-     * 房间停止推流的任务
+     * 房间取消发布资源的任务
      */
     RCLoggerTag["L_ABSTRACT_ROOM_UNPUBLISH_T"] = "L-abstract_room_unpublish-T";
     /**
-     * 房间停止推流结果
+     * 房间取消发布资源结果
      */
     RCLoggerTag["L_ABSTRACT_ROOM_UNPUBLISH_R"] = "L-abstract_room_unpublish-R";
     /**
@@ -6198,6 +6200,11 @@ exports.RCResolution = void 0;
     RCResolution["W720_H480"] = "W720_H480";
     RCResolution["W1280_H720"] = "W1280_H720";
     RCResolution["W1920_H1080"] = "W1920_H1080";
+    RCResolution["W180_H180"] = "W180_H180";
+    RCResolution["W240_H180"] = "W240_H180";
+    RCResolution["W360_H360"] = "W360_H360";
+    RCResolution["W848_H480"] = "W848_H480";
+    RCResolution["W960_H720"] = "W960_H720";
 })(exports.RCResolution || (exports.RCResolution = {}));
 
 /**
@@ -6222,25 +6229,46 @@ exports.RCMediaType = void 0;
 // 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 },
+    [exports.RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 150, minBitrate: 80 },
+    [exports.RCResolution.W180_H180]: { width: 180, height: 180, maxBitrate: 200, minBitrate: 100 },
+    [exports.RCResolution.W240_H180]: { width: 240, height: 180, maxBitrate: 240, minBitrate: 120 },
+    [exports.RCResolution.W240_H240]: { width: 240, height: 240, maxBitrate: 280, minBitrate: 120 },
     [exports.RCResolution.W256_H144]: { width: 256, height: 144, maxBitrate: 240, minBitrate: 120 },
     [exports.RCResolution.W320_H180]: { width: 320, height: 180, maxBitrate: 280, minBitrate: 120 },
-    [exports.RCResolution.W240_H240]: { width: 240, height: 240, maxBitrate: 280, minBitrate: 120 },
     [exports.RCResolution.W320_H240]: { width: 320, height: 240, maxBitrate: 400, minBitrate: 120 },
+    [exports.RCResolution.W360_H360]: { width: 360, height: 360, maxBitrate: 520, minBitrate: 140 },
     [exports.RCResolution.W480_H360]: { width: 480, height: 360, maxBitrate: 650, minBitrate: 150 },
-    [exports.RCResolution.W640_H360]: { width: 640, height: 360, maxBitrate: 800, minBitrate: 180 },
     [exports.RCResolution.W480_H480]: { width: 480, height: 480, maxBitrate: 800, minBitrate: 180 },
+    [exports.RCResolution.W640_H360]: { width: 640, height: 360, maxBitrate: 800, minBitrate: 180 },
     [exports.RCResolution.W640_H480]: { width: 640, height: 480, maxBitrate: 900, minBitrate: 200 },
     [exports.RCResolution.W720_H480]: { width: 720, height: 480, maxBitrate: 1000, minBitrate: 200 },
+    [exports.RCResolution.W848_H480]: { width: 848, height: 480, maxBitrate: 1860, minBitrate: 200 },
+    [exports.RCResolution.W960_H720]: { width: 960, height: 720, maxBitrate: 2000, minBitrate: 250 },
     [exports.RCResolution.W1280_H720]: { width: 1280, height: 720, maxBitrate: 2200, minBitrate: 250 },
     [exports.RCResolution.W1920_H1080]: { width: 1920, height: 1080, maxBitrate: 4000, minBitrate: 400 }
 };
+/**
+ * 分辨率适配
+ * @param {number} resolution
+ * @returns
+ */
+const resolutionAdapter = (resolution) => {
+    const ResolutionAdapter = {
+        192: 180,
+        368: 360,
+        1088: 1080
+    };
+    return ResolutionAdapter[resolution] ? ResolutionAdapter[resolution] : resolution;
+};
 /**
 * 向上取最接近的视频分辨率配置
 * @param {number} width
 * @param {number} height
 */
 const getNearestResolution = (width, height) => {
+    // 分辨率适配
+    width = resolutionAdapter(width);
+    height = resolutionAdapter(height);
     // 优先精准匹配
     const conf = RongRTCVideoBitrate[`W${width}_H${height}`];
     if (conf) {
@@ -6406,7 +6434,7 @@ class RCTrack extends engine.EventEmitter {
         }, {
             logSource: engine.LogSource.RTC
         });
-        this._setLocalMuted(true);
+        return this._setLocalMuted(true);
     }
     /**
      * 启用
@@ -6419,7 +6447,7 @@ class RCTrack extends engine.EventEmitter {
         }, {
             logSource: engine.LogSource.RTC
         });
-        this._setLocalMuted(false);
+        return this._setLocalMuted(false);
     }
     /**
      * 本端是否已禁用该轨道数据
@@ -6614,7 +6642,10 @@ class RCTrack extends engine.EventEmitter {
                     logSource: engine.LogSource.RTC
                 });
                 try {
-                    (_c = this._element) === null || _c === void 0 ? void 0 : _c.play();
+                    yield ((_c = this._element) === null || _c === void 0 ? void 0 : _c.play());
+                    if ((options === null || options === void 0 ? void 0 : options.audioDeviceId) && !isVideoTrack) {
+                        yield this._element.setSinkId(options.audioDeviceId);
+                    }
                 }
                 catch (error) {
                     /**
@@ -6661,9 +6692,9 @@ class RCTrack extends engine.EventEmitter {
                 this._element.x5PlaysInline = true;
                 this._element.webkitPlaysInline = true;
             }
-            if ((options === null || options === void 0 ? void 0 : options.audioDeviceId) && !isVideoTrack) {
-                yield this._element.setSinkId(options.audioDeviceId);
-            }
+            // if (options?.audioDeviceId && !isVideoTrack) {
+            //   await (this._element as any).setSinkId(options.audioDeviceId)
+            // }
             // audio 标签设置音量
             if (!isVideoTrack && ((options === null || options === void 0 ? void 0 : options.volume) || (options === null || options === void 0 ? void 0 : options.volume) === 0)) {
                 this._element.volume = (options === null || options === void 0 ? void 0 : options.volume) / 100;
@@ -6716,9 +6747,9 @@ exports.RCAudioBitrate = void 0;
     RCAudioBitrate["MusicHigh"] = "MusicHigh";
 })(exports.RCAudioBitrate || (exports.RCAudioBitrate = {}));
 const getAudioBitrate = {
-    [exports.RCAudioBitrate.Music]: { max: 64000, min: 64000 },
-    [exports.RCAudioBitrate.MusicHigh]: { max: 128000, min: 128000 },
-    [exports.RCAudioBitrate.Speech]: { max: 32000, min: 32000 }
+    [exports.RCAudioBitrate.Music]: { max: 32 * 2, min: 32 * 2 },
+    [exports.RCAudioBitrate.MusicHigh]: { max: 32 * 2 * 2, min: 32 * 2 * 2 },
+    [exports.RCAudioBitrate.Speech]: { max: 32, min: 32 }
 };
 exports.RCVideoBitrate = void 0;
 (function (RCVideoBitrate) {
@@ -6882,6 +6913,10 @@ RC3AnoiseTrack.isOpen = false;
 class RCLocalTrack extends RCTrack {
     constructor(tag, userId, kind, track) {
         super(tag, userId, kind, true);
+        /**
+         * track 是否被销毁
+         */
+        this._isDestroyed = false;
         this._isPublished = false;
         this.__innerSetMediaStreamTrack(track);
         // 监听流结束事件
@@ -6896,17 +6931,22 @@ class RCLocalTrack extends RCTrack {
      * @param bool
      */
     _setLocalMuted(bool) {
-        const changed = this._localMuted !== bool;
-        super._setLocalMuted(bool);
-        // 本端流，remoteMuted 与 localMuted 始终保持一致
-        this._remoteMuted = this._localMuted;
-        // 派发事件以通知房间内其他成员
-        changed && this.emit(RCLocalTrack.__INNER_EVENT_MUTED_CHANGE__, this);
-        engine.logger.info(RCLoggerTag.L_LOCAL_TRACK_SET_LOCAL_MUTED_O, {
-            status: RCLoggerStatus.SUCCESSED,
-            bool
-        }, {
-            logSource: engine.LogSource.RTC
+        return new Promise((resolve, reject) => {
+            const changed = this._localMuted !== bool;
+            super._setLocalMuted(bool);
+            // 本端流，remoteMuted 与 localMuted 始终保持一致
+            this._remoteMuted = this._localMuted;
+            /**
+             * 派发事件以通知房间内其他成员
+             * 本端禁用资源时需等待 signal 的扩散结果
+             */
+            changed && this.emit(RCLocalTrack.__INNER_EVENT_MUTED_CHANGE__, this, resolve);
+            engine.logger.info(RCLoggerTag.L_LOCAL_TRACK_SET_LOCAL_MUTED_O, {
+                status: RCLoggerStatus.SUCCESSED,
+                bool
+            }, {
+                logSource: engine.LogSource.RTC
+            });
         });
     }
     __innerSetPublished(bool) {
@@ -6930,6 +6970,7 @@ class RCLocalTrack extends RCTrack {
     destroy() {
         var _a;
         logger.info(`track is destroyed -> trackId: ${this.getTrackId()}`);
+        this._isDestroyed = true;
         (_a = this._msTrack) === null || _a === void 0 ? void 0 : _a.stop();
         super.__innerDestroy();
         this.isAudioTrack() && super.__releaseMediaElement();
@@ -6941,6 +6982,12 @@ class RCLocalTrack extends RCTrack {
             logSource: engine.LogSource.RTC
         });
     }
+    /**
+     * 判断 track 是否被销毁
+     */
+    isDestroyed() {
+        return this._isDestroyed;
+    }
     /**
      * 为本地流设定上行码率，仅视频流有效，音频默认 15 kbps，不支持修改
      * @description 当 `max` 或 `min` 值为 `0` 时，取动态码率计算结果
@@ -6984,7 +7031,7 @@ class RCLocalTrack extends RCTrack {
         }
         else if (((_b = this._msTrack) === null || _b === void 0 ? void 0 : _b.kind) === RCTrackKind.AUDIO) {
             // 音频动态码率
-            ({ min, max } = { min: 32000, max: 32000 });
+            ({ min, max } = { min: 32, max: 32 });
         }
         if ((_c = this._bitrateInfo) === null || _c === void 0 ? void 0 : _c.max) {
             start = ((_d = this._bitrateInfo) === null || _d === void 0 ? void 0 : _d.max) * 0.7;
@@ -7156,10 +7203,15 @@ class RCLocalFileAudioTrack extends RCLocalFileTrack {
         this._stopProcess = () => { };
     }
     _setLocalMuted(bool) {
-        if (this._resource) {
-            this._resource.muted = bool;
-        }
-        super._setLocalMuted(bool);
+        const _super = Object.create(null, {
+            _setLocalMuted: { get: () => super._setLocalMuted }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._resource) {
+                this._resource.muted = bool;
+            }
+            return _super._setLocalMuted.call(this, bool);
+        });
     }
     play() {
         // 自定义文件中的声音播放只需要修改 video 标签的 muted 属性
@@ -7425,6 +7477,11 @@ const getUUID22 = () => {
  * @returns
  */
 const transResolution = (resolution) => {
+    if (RongRTCVideoBitrate[resolution]) {
+        const { width, height } = RongRTCVideoBitrate[resolution];
+        return { width, height };
+    }
+    // 保留原有逻辑，防止客户有自定义传值解析异常
     const [width, height] = resolution.split('_').map(item => {
         return parseInt(item.replace(/[^\d]/g, ''));
     });
@@ -7881,7 +7938,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.4.6-alpha.1",
+    ClientVersion: "5.4.7-alpha.2",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -9285,7 +9342,7 @@ class ASdpBuilder {
         if (!/\bmaxaveragebitrate\b/ig.test(sdpAudioBlock)) {
             const audioBitrate = [
                 '$1',
-                `maxaveragebitrate=${bitrate.max * 1024}`
+                `maxaveragebitrate=${bitrate.max * ASdpBuilder.KBitrate}`
             ];
             sdpAudioBlock = sdpAudioBlock.replace(/(\buseinbandfec=[^\r\n]+)/ig, audioBitrate.join(';'));
         }
@@ -9299,7 +9356,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 * 1024}`);
+            return sdpAudioBlock.replace(/^(m=audio[^\r\n]+)/, `$1\r\nb=AS:${bitrate.max * ASdpBuilder.KBitrate}`);
         }
         return sdpAudioBlock;
     }
@@ -9379,11 +9436,12 @@ class ASdpBuilder {
         if (!/\bx-google-max-bitrate\b/.test(sdpVideoBlock)) {
             const videoBitrate = [
                 '$1',
-                `x-google-max-bitrate=${bitrate.max * 1024}`,
-                `x-google-min-bitrate=${bitrate.min * 1024}`,
-                `x-google-start-bitrate=${bitrate.start || bitrate.max * 1024 * 0.7}`
+                `x-google-max-bitrate=${bitrate.max * ASdpBuilder.KBitrate}`,
+                `x-google-min-bitrate=${bitrate.min * ASdpBuilder.KBitrate}`,
+                `x-google-start-bitrate=${bitrate.start || bitrate.max * ASdpBuilder.KBitrate * 0.7}`
             ];
-            sdpVideoBlock = sdpVideoBlock.replace(/(\bprofile-level-id=[^\r\n]+)/ig, videoBitrate.join(';'));
+            // 42e01f 42001f 为 H264 编码
+            sdpVideoBlock = sdpVideoBlock.replace(/(\bprofile-level-id=42[e0]01f\b)/ig, videoBitrate.join(';'));
         }
         return this.addVideoBlineAS(sdpVideoBlock, bitrate);
     }
@@ -9396,7 +9454,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 * 1024}`);
+            return sdpVideoBlock.replace(/^(m=video[^\r\n]+)/, `$1\r\nb=AS:${bitrate.max * ASdpBuilder.KBitrate}`);
         }
         return sdpVideoBlock;
     }
@@ -9446,6 +9504,7 @@ class ASdpBuilder {
         return stream;
     }
 }
+ASdpBuilder.KBitrate = 1;
 
 var SdpSemantics;
 (function (SdpSemantics) {
@@ -9760,6 +9819,113 @@ class UnifiedPlanSdpBuilder extends ASdpBuilder {
     }
 }
 
+/* 它是一堆解析 SDP 字符串的静态函数 */
+class SDPUtils {
+    /* 将 SDP 拆分为多个部分。 */
+    static splitSections(blob) {
+        const parts = blob.split('\nm=');
+        return parts.map((part, index) => (index > 0 ? 'm=' + part : part).trim() + '\r\n');
+    }
+    /**
+     * 它需要一个 SDP 文本块并返回一个仅包含媒体部分的 SDP 文本数组
+     * @param {string} blob - 您要解析的 SDP 字符串。
+     * @returns 字符串数组。
+     */
+    static getMediaSections(blob) {
+        const sections = SDPUtils.splitSections(blob);
+        sections.shift();
+        return sections;
+    }
+    /* 解析 extmap 属性的 SDP 标头。 */
+    static parseExtmap(line) {
+        const parts = line.substr(9).split(' ');
+        return {
+            id: parseInt(parts[0], 10),
+            direction: parts[0].indexOf('/') > 0 ? parts[0].split('/')[1] : 'sendrecv',
+            uri: parts[1]
+        };
+    }
+    /* 将 SDP 字符串拆分为字符串数组。 */
+    static splitLines(blob) {
+        return blob.trim().split('\n').map(line => line.trim());
+    }
+    /**
+     * 它接受一个媒体部分并返回一个对象，其中包含媒体部分的种类、端口、协议和格式
+     * @param {string} mediaSection - SDP的媒体部分。
+     * @returns 具有以下属性的对象：
+     *   kind：媒体的类型（音频、视频等）
+     *   端口：端口号
+     *   协议：使用的协议
+     *   fmt：媒体的格式
+     */
+    static parseMLine(mediaSection) {
+        const lines = SDPUtils.splitLines(mediaSection);
+        const parts = lines[0].substr(2).split(' ');
+        return {
+            kind: parts[0],
+            port: parseInt(parts[1], 10),
+            protocol: parts[2],
+            fmt: parts.slice(3).join(' ')
+        };
+    }
+    static matchPrefix(blob, prefix) {
+        return SDPUtils.splitLines(blob).filter(line => line.indexOf(prefix) === 0);
+    }
+    /**
+     * 它从 SDP 媒体部分解析 msid 属性
+     * @param {string} mediaSection - SDP的媒体部分。
+     * @returns 具有两个属性的对象：流和轨道。
+     */
+    static parseMsid(mediaSection) {
+        let parts;
+        const spec = SDPUtils.matchPrefix(mediaSection, 'a=msid:');
+        if (spec.length === 1) {
+            parts = spec[0].substr(7).split(' ');
+            return { stream: parts[0], track: parts[1] };
+        }
+        const planB = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
+            .map(line => SDPUtils.parseSsrcMedia(line))
+            .filter(msidParts => msidParts.attribute === 'msid');
+        if (planB.length > 0) {
+            if (planB[0].value) {
+                parts = planB[0].value.split(' ');
+                return { stream: parts[0], track: parts[1] };
+            }
+        }
+        return { stream: '', track: '' };
+    }
+    /**
+     * 它接受一个字符串并返回一个对象
+     * @param {string} line - 我们正在解析的 SDP 行。
+     */
+    static parseSsrcMedia(line) {
+        const sp = line.indexOf(' ');
+        const parts = {
+            ssrc: parseInt(line.substr(7, sp - 7), 10)
+        };
+        const colon = line.indexOf(':', sp);
+        if (colon > -1) {
+            parts.attribute = line.substr(sp + 1, colon - sp - 1);
+            parts.value = line.substr(colon + 1);
+        }
+        else {
+            parts.attribute = line.substr(sp + 1);
+        }
+        return parts;
+    }
+    /**
+     * 它从 SDP 的媒体部分返回中间值
+     * @param {string} mediaSection - SDP的媒体部分。
+     * @returns 媒体部分的中间。
+     */
+    static getMid(mediaSection) {
+        const mid = SDPUtils.matchPrefix(mediaSection, 'a=mid:')[0];
+        if (mid) {
+            return mid.substr(6);
+        }
+    }
+}
+
 class UnifiedPlanStrategy extends ASdpStrategy {
     constructor() {
         super(...arguments);
@@ -9928,12 +10094,36 @@ class UnifiedPlanStrategy extends ASdpStrategy {
         const sdpBuilder = new UnifiedPlanSdpBuilder(sdp);
         for (const msid in this._sendTransceiver) {
             const transceiver = this._sendTransceiver[msid];
-            const { direction, mid } = transceiver;
+            const kind = (_a = transceiver.sender.track) === null || _a === void 0 ? void 0 : _a.kind;
+            let { direction, mid } = transceiver;
+            if (!mid) {
+                const sections = SDPUtils.getMediaSections(sdp);
+                sections.forEach(item => {
+                    SDPUtils.parseExtmap(item);
+                    const { kind: parseKind } = SDPUtils.parseMLine(item);
+                    let { stream } = SDPUtils.parseMsid(item);
+                    const parseMid = SDPUtils.getMid(item);
+                    if (kind === 'video') {
+                        if (/tiny$/.test(stream)) {
+                            stream = stream.replace(/tiny$/ig, '1_tiny');
+                        }
+                        else {
+                            stream = stream + '_1';
+                        }
+                    }
+                    else {
+                        stream = stream + '_0';
+                    }
+                    // getMid
+                    if (stream === msid && kind === parseKind && parseMid) {
+                        mid = parseMid;
+                    }
+                });
+            }
             if (mid) {
                 if (direction === RtpTransceiverDirection.SENDONLY) {
                     const localTrack = this._localTracks[msid];
                     const bitrate = localTrack === null || localTrack === void 0 ? void 0 : localTrack.getBitrate();
-                    const kind = (_a = transceiver.sender.track) === null || _a === void 0 ? void 0 : _a.kind;
                     if (kind === RCTrackKind.AUDIO && bitrate) {
                         sdpBuilder.setAudioBitrateWithMid(bitrate, mid);
                     }
@@ -9950,10 +10140,10 @@ class UnifiedPlanStrategy extends ASdpStrategy {
             const transceiver = this._recvTransceiver[msid];
             const { direction, mid } = transceiver;
             if (mid) {
-                if (direction === RtpTransceiverDirection.RECVONLY) {
+                if (direction === RtpTransceiverDirection.RECVONLY) ;
+                if (direction === RtpTransceiverDirection.INACTIVE) {
                     sdpBuilder.clearnSsrcWithMid(mid, RtpTransceiverDirection.RECVONLY);
                 }
-                if (direction === RtpTransceiverDirection.INACTIVE) ;
             }
         }
         return sdpBuilder.stringify();
@@ -9961,35 +10151,38 @@ class UnifiedPlanStrategy extends ASdpStrategy {
     // Answer SDP 中添加码率信息
     resetAnswerSdp(sdp) {
         var _a;
+        // return sdp
         const sdpBuilder = new UnifiedPlanSdpBuilder(sdp);
         for (const msid in this._sendTransceiver) {
+            /**
+             * 通过 Sender 获取发布出去的资源
+             * 对于已经发布出去的资源设置码率
+             */
             const transceiver = this._sendTransceiver[msid];
-            const { direction, mid } = transceiver;
+            const { mid } = transceiver;
             if (mid) {
-                if (direction === RtpTransceiverDirection.SENDONLY) {
-                    const localTrack = this._localTracks[msid];
-                    const bitrate = localTrack === null || localTrack === void 0 ? void 0 : localTrack.getBitrate();
-                    const kind = (_a = transceiver.sender.track) === null || _a === void 0 ? void 0 : _a.kind;
-                    if (kind === RCTrackKind.AUDIO && bitrate) {
-                        sdpBuilder.setAudioBitrateWithMid(bitrate, mid);
-                    }
-                    if (kind === RCTrackKind.VIDEO && bitrate) {
-                        sdpBuilder.setVideoBitrateWithMid(bitrate, mid);
-                    }
+                const localTrack = this._localTracks[msid];
+                const bitrate = localTrack === null || localTrack === void 0 ? void 0 : localTrack.getBitrate();
+                const kind = (_a = transceiver.sender.track) === null || _a === void 0 ? void 0 : _a.kind;
+                // 对于已经发布出去的资源设置码率
+                if (kind === RCTrackKind.AUDIO && bitrate) {
+                    sdpBuilder.setAudioBitrateWithMid(bitrate, mid);
                 }
-                if (direction === RtpTransceiverDirection.INACTIVE) {
-                    sdpBuilder.clearnSsrcWithMid(mid, RtpTransceiverDirection.INACTIVE);
+                if (kind === RCTrackKind.VIDEO && bitrate) {
+                    sdpBuilder.setVideoBitrateWithMid(bitrate, mid);
                 }
             }
         }
-        for (const msid in this._recvTransceiver) {
-            const transceiver = this._recvTransceiver[msid];
-            const { direction, mid } = transceiver;
-            if (mid) {
-                if (direction === RtpTransceiverDirection.RECVONLY) ;
-                if (direction === RtpTransceiverDirection.INACTIVE) ;
-            }
-        }
+        // for (const msid in this._recvTransceiver) {
+        //   const transceiver: RTCRtpTransceiver = this._recvTransceiver[msid]
+        //   const { direction, mid } = transceiver
+        //   if (mid) {
+        //     if (direction === RtpTransceiverDirection.RECVONLY) {
+        //     }
+        //     if (direction === RtpTransceiverDirection.INACTIVE) {
+        //     }
+        //   }
+        // }
         return sdpBuilder.stringify();
     }
 }
@@ -10251,13 +10444,13 @@ class RCRTCPeerConnection extends engine.EventEmitter {
     getOutboundVideoInfo() {
         return this._sdpStrategy.getOutboundVideoInfo();
     }
-    _onLocalTrackMuted(track) {
+    _onLocalTrackMuted(track, resolve) {
         // 修改已发布的小流状态
         const tinyTrack = this.getLocalTrack(`${track.getTrackId()}_tiny`);
         if (tinyTrack) {
             tinyTrack.__innerGetMediaStreamTrack().enabled = !track.isLocalMuted();
         }
-        this.emit(RCLocalTrack.__INNER_EVENT_MUTED_CHANGE__, track);
+        this.emit(RCLocalTrack.__INNER_EVENT_MUTED_CHANGE__, track, resolve);
         engine.logger.info(RCLoggerTag.L_RTC_PEER_CONNECTION_LOCAL_TRACK_MUTED_O, {
             status: RCLoggerStatus.SUCCESSED,
             trackId: track.getTrackId()
@@ -10392,6 +10585,7 @@ class RCRTCPeerConnection extends engine.EventEmitter {
      */
     __reportR3R4ToPolaris() {
         return __awaiter(this, void 0, void 0, function* () {
+            clearTimeout(this._reportR3R4ToPolarisTimer);
             yield this._sendR3R4Data();
             this._reportR3R4ToPolarisTimer = setTimeout(this.__reportR3R4ToPolaris.bind(this), 2000);
         });
@@ -10632,7 +10826,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.4.6-alpha.1";
+        const rtcVersion = "5.4.7-alpha.2";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -12392,7 +12586,7 @@ class PublishCommand extends BaseCommand {
     }
     execute(store, invoker) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tracks = this.tracks;
+            let tracks = this.tracks;
             const roomId = store.roomId;
             engine.logger.info(RCLoggerTag.L_ABSTRACT_ROOM_PUBLISH_T, {
                 trackIds: tracks.map(getTrackIdFromAttr)
@@ -12415,6 +12609,23 @@ class PublishCommand extends BaseCommand {
                 });
                 return { code: exports.RCRTCCode.PARAMS_ERROR };
             }
+            /**
+             * 过滤已被销毁的 track
+             */
+            tracks = tracks.filter((item) => {
+                const { track } = item instanceof RCLocalTrack ? { track: item } : item;
+                const isDestroyed = track.isDestroyed();
+                if (isDestroyed) {
+                    engine.logger.warn(RCLoggerTag.L_ABSTRACT_ROOM_PUBLISH_R, {
+                        status: RCLoggerStatus.FAILED,
+                        msg: `track -> ${track.getTrackId()} has beem destroyed`
+                    });
+                }
+                return !isDestroyed;
+            });
+            if (!tracks.length) {
+                return { code: exports.RCRTCCode.PUBLISH_TRACKS_IS_INVALID };
+            }
             /**
              * 给创建的所有 peerConnection 添加事件
              */
@@ -12587,6 +12798,16 @@ class UnpublishCommand extends BaseCommand {
                 pubTasks.push(this.__unpublish(store, invoker, peerCList[index], tracks));
             }
             const unpubResList = yield Promise.all(pubTasks);
+            // 如果所有资源都被发布过就不再发布消息
+            let unpublistRes = unpubResList.length;
+            unpubResList.forEach(item => {
+                if (item.code === exports.RCRTCCode.SUCCESS && !item.data) {
+                    unpublistRes = unpublistRes - 1;
+                }
+            });
+            if (unpublistRes === 0) {
+                return { code: exports.RCRTCCode.SUCCESS };
+            }
             const result = yield this._mergeUnpublishRes(store, unpubResList);
             engine.logger.info(RCLoggerTag.L_ABSTRACT_ROOM_UNPUBLISH_R, {
                 status: RCLoggerStatus.SUCCESSED,
@@ -12601,9 +12822,14 @@ class UnpublishCommand extends BaseCommand {
 }
 
 class LocalTrackMuteCommand extends BaseCommand {
-    constructor(localTrack) {
+    constructor(localTrack, 
+    /**
+     * 接收 signal 扩散状态变更的结果
+     */
+    _recvSignalResultFn) {
         super();
         this.localTrack = localTrack;
+        this._recvSignalResultFn = _recvSignalResultFn;
     }
     execute(store, invoker) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -12630,6 +12856,8 @@ class LocalTrackMuteCommand extends BaseCommand {
                 }
             }
             const code = yield store.context.setRTCTotalRes(roomId, buildPlusMessage(RCRTCMessageType.MODIFY, plusList), buildTotalURIMessageContent(publishedList), RCRTCMessageType.TOTAL_CONTENT_RESOURCE);
+            // 执行 localTrack.mute 传入的 resolve，并返回 signal 扩散的 code 码
+            this._recvSignalResultFn(code);
             if (code !== engine.ErrorCode.SUCCESS) {
                 logger.error('notice `track.enabled` change failed -> code: ' + code);
             }
@@ -13696,9 +13924,9 @@ class RCAbstractRoom extends engine.EventEmitter {
      * 本端流状态修改，需通知房间内其他成员
      * @param localTrack
      */
-    _onLocalTrackMuted(localTrack) {
+    _onLocalTrackMuted(localTrack, resolve) {
         return __awaiter(this, void 0, void 0, function* () {
-            this._invoker.push(new LocalTrackMuteCommand(localTrack));
+            this._invoker.push(new LocalTrackMuteCommand(localTrack, resolve));
         });
     }
     /**
@@ -19081,9 +19309,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.6-alpha.1");
-        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"}'.`);
+        engine.VersionManage.add('plugin-rtc', "5.4.7-alpha.2");
+        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;
         }
         return true;
@@ -19092,7 +19320,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.6-alpha.1"}, Commit: ${"d109ea1eb1987a80bf3299b86d39859d331d65b8"}`);
+        logger.warn(`RCRTC Version: ${"5.4.7-alpha.2"}, Commit: ${"1826738708cea2e2c6cc7586713f2c24ab40e665"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);