@rongcloud/plugin-rtc 5.2.4-beem.10 → 5.2.4-beem.11

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.10
- * CommitId - 6db922c5bab0ba43c929ae0deae91711d5ce1406
- * Mon Jun 06 2022 15:29:07 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.11
+ * CommitId - dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb
+ * Wed Jun 29 2022 19:23:04 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.10
- * CommitId - 6db922c5bab0ba43c929ae0deae91711d5ce1406
- * Mon Jun 06 2022 15:29:07 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.11
+ * CommitId - dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb
+ * Wed Jun 29 2022 19:23:04 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';
@@ -6540,6 +6540,24 @@ const parseAudienceRoomData = (roomId, kvEntries) => {
         CDNUris: CDNUris || {}
     };
 };
+/**
+ * 修改订阅失败的资源通道方向为 inactive，返回修改后的 answer sdp
+ */
+const setAnswerSdpDirection = (failedList, answerSdp) => {
+    const answerMArr = answerSdp.split('\r\nm=');
+    failedList.forEach((item) => {
+        const mediaType = parseInt(item.track.getTrackId().split('_').pop());
+        const kind = (mediaType === RCMediaType.AUDIO_ONLY) ? 'audio' : 'video';
+        const msid = `${item.track.getUserId()}_${item.track.getTag()}`;
+        answerMArr.forEach((sdpM, i) => {
+            if (sdpM.includes(`${kind}`) && sdpM.includes(`a=msid:${msid}`)) {
+                const newSdpM = sdpM.replace('a=sendonly', 'a=inactive');
+                answerMArr.splice(i, 1, newSdpM);
+            }
+        });
+    });
+    return answerMArr.join('\r\nm=');
+};
 
 /**
  * RTC 消息类型常量
@@ -8517,7 +8535,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.10";
+        const rtcVersion = "5.2.4-beem.11";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8778,7 +8796,7 @@ class RCAbstractRoom {
     _onUserUnpublish(tracks) {
         return __awaiter(this, void 0, void 0, function* () {
             // 需要替业务层取消订阅，业务层只需关注 UI 变化
-            yield this.unsubscribe(tracks);
+            yield push(() => this.__unsubscribe(tracks));
             tracks.forEach(item => {
                 item.__innerDestroy();
                 delete this._remoteTracks[item.getTrackId()];
@@ -9033,7 +9051,7 @@ class RCAbstractRoom {
                     userIds.push(userId);
                 });
                 if (tracks.length) {
-                    yield this.unsubscribe(tracks);
+                    yield push(() => this.__unsubscribe(tracks));
                     tracks.forEach((item) => delete this._remoteTracks[item.getTrackId()]);
                 }
                 // 等待队列执行完成后清除内存数据
@@ -9797,14 +9815,19 @@ class RCAbstractRoom {
                 return { code: resultCode };
             }
             logger.info(`subscribe success: ${subTrackIds.join(',')}`);
-            const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
-            if (resCode !== RCRTCCode.SUCCESS) {
-                return { code: resCode };
-            }
             // 获取真正订阅成功的资源
             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())));
+            /**
+             * 订阅失败的资源，需把 sdp 中对应的通道方向改为 inactive
+             * 否则下次复用通道时，浏览器 peerConnection 的 ontrack 事件不会被触发
+             */
+            const answerSdp = failedList.length ? setAnswerSdpDirection(failedList, answer.sdp) : answer.sdp;
+            const resCode = yield this._pc.setRemoteAnswer(answerSdp);
+            if (resCode !== RCRTCCode.SUCCESS) {
+                return { code: resCode };
+            }
             // 更新 remoteTrack.isSubscribed
             for (const trackId in this._remoteTracks) {
                 const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
@@ -10770,7 +10793,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.10",
+    ClientVersion: "5.2.4-beem.11",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12230,6 +12253,12 @@ class RCRTCClient {
     }
     _joinRTCRoom(roomId, joinType, outerUserDatas, useMutilPeerC, roomType = RTCMode.RTC) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this._crtRoom) {
+                return { code: RCRTCCode.REPERT_JOIN_ROOM };
+            }
+            if (this._context.getConnectionStatus() !== ConnectionStatus.CONNECTED) {
+                return { code: RCRTCCode.SIGNAL_DISCONNECTED };
+            }
             if (isIllegalConnection(this._context.getNaviInfo())) {
                 return { code: RCRTCCode.PACKAGE_ENVIRONMENT_ERROR };
             }
@@ -12812,9 +12841,9 @@ 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.10");
-        if (!VersionManage.validEngine("4.6.0-beem.10")) {
-            logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.10"}'.`);
+        VersionManage.add('plugin-rtc', "5.2.4-beem.11");
+        if (!VersionManage.validEngine(">=4.6.0-beem.11")) {
+            logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${">=4.6.0-beem.11"}'.`);
             return false;
         }
         return true;
@@ -12822,7 +12851,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.10"}, Commit: ${"6db922c5bab0ba43c929ae0deae91711d5ce1406"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.11"}, Commit: ${"dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb"}`);
         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.10
- * CommitId - 6db922c5bab0ba43c929ae0deae91711d5ce1406
- * Mon Jun 06 2022 15:29:07 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.11
+ * CommitId - dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb
+ * Wed Jun 29 2022 19:23:04 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -6543,6 +6543,24 @@ const parseAudienceRoomData = (roomId, kvEntries) => {
         CDNUris: CDNUris || {}
     };
 };
+/**
+ * 修改订阅失败的资源通道方向为 inactive，返回修改后的 answer sdp
+ */
+const setAnswerSdpDirection = (failedList, answerSdp) => {
+    const answerMArr = answerSdp.split('\r\nm=');
+    failedList.forEach((item) => {
+        const mediaType = parseInt(item.track.getTrackId().split('_').pop());
+        const kind = (mediaType === exports.RCMediaType.AUDIO_ONLY) ? 'audio' : 'video';
+        const msid = `${item.track.getUserId()}_${item.track.getTag()}`;
+        answerMArr.forEach((sdpM, i) => {
+            if (sdpM.includes(`${kind}`) && sdpM.includes(`a=msid:${msid}`)) {
+                const newSdpM = sdpM.replace('a=sendonly', 'a=inactive');
+                answerMArr.splice(i, 1, newSdpM);
+            }
+        });
+    });
+    return answerMArr.join('\r\nm=');
+};
 
 /**
  * RTC 消息类型常量
@@ -8520,7 +8538,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.10";
+        const rtcVersion = "5.2.4-beem.11";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8781,7 +8799,7 @@ class RCAbstractRoom {
     _onUserUnpublish(tracks) {
         return __awaiter(this, void 0, void 0, function* () {
             // 需要替业务层取消订阅，业务层只需关注 UI 变化
-            yield this.unsubscribe(tracks);
+            yield push(() => this.__unsubscribe(tracks));
             tracks.forEach(item => {
                 item.__innerDestroy();
                 delete this._remoteTracks[item.getTrackId()];
@@ -9036,7 +9054,7 @@ class RCAbstractRoom {
                     userIds.push(userId);
                 });
                 if (tracks.length) {
-                    yield this.unsubscribe(tracks);
+                    yield push(() => this.__unsubscribe(tracks));
                     tracks.forEach((item) => delete this._remoteTracks[item.getTrackId()]);
                 }
                 // 等待队列执行完成后清除内存数据
@@ -9800,14 +9818,19 @@ class RCAbstractRoom {
                 return { code: resultCode };
             }
             logger.info(`subscribe success: ${subTrackIds.join(',')}`);
-            const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
-            if (resCode !== exports.RCRTCCode.SUCCESS) {
-                return { code: resCode };
-            }
             // 获取真正订阅成功的资源
             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())));
+            /**
+             * 订阅失败的资源，需把 sdp 中对应的通道方向改为 inactive
+             * 否则下次复用通道时，浏览器 peerConnection 的 ontrack 事件不会被触发
+             */
+            const answerSdp = failedList.length ? setAnswerSdpDirection(failedList, answer.sdp) : answer.sdp;
+            const resCode = yield this._pc.setRemoteAnswer(answerSdp);
+            if (resCode !== exports.RCRTCCode.SUCCESS) {
+                return { code: resCode };
+            }
             // 更新 remoteTrack.isSubscribed
             for (const trackId in this._remoteTracks) {
                 const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
@@ -10773,7 +10796,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.10",
+    ClientVersion: "5.2.4-beem.11",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12233,6 +12256,12 @@ class RCRTCClient {
     }
     _joinRTCRoom(roomId, joinType, outerUserDatas, useMutilPeerC, roomType = engine.RTCMode.RTC) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this._crtRoom) {
+                return { code: exports.RCRTCCode.REPERT_JOIN_ROOM };
+            }
+            if (this._context.getConnectionStatus() !== engine.ConnectionStatus.CONNECTED) {
+                return { code: exports.RCRTCCode.SIGNAL_DISCONNECTED };
+            }
             if (isIllegalConnection(this._context.getNaviInfo())) {
                 return { code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR };
             }
@@ -12815,9 +12844,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.2.4-beem.10");
-        if (!engine.VersionManage.validEngine("4.6.0-beem.10")) {
-            logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.10"}'.`);
+        engine.VersionManage.add('plugin-rtc', "5.2.4-beem.11");
+        if (!engine.VersionManage.validEngine(">=4.6.0-beem.11")) {
+            logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${">=4.6.0-beem.11"}'.`);
             return false;
         }
         return true;
@@ -12825,7 +12854,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.10"}, Commit: ${"6db922c5bab0ba43c929ae0deae91711d5ce1406"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.11"}, Commit: ${"dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb"}`);
         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.10
- * CommitId - 6db922c5bab0ba43c929ae0deae91711d5ce1406
- * Mon Jun 06 2022 15:29:07 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.11
+ * CommitId - dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb
+ * Wed Jun 29 2022 19:23:04 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -6543,6 +6543,24 @@
             CDNUris: CDNUris || {}
         };
     };
+    /**
+     * 修改订阅失败的资源通道方向为 inactive，返回修改后的 answer sdp
+     */
+    const setAnswerSdpDirection = (failedList, answerSdp) => {
+        const answerMArr = answerSdp.split('\r\nm=');
+        failedList.forEach((item) => {
+            const mediaType = parseInt(item.track.getTrackId().split('_').pop());
+            const kind = (mediaType === exports.RCMediaType.AUDIO_ONLY) ? 'audio' : 'video';
+            const msid = `${item.track.getUserId()}_${item.track.getTag()}`;
+            answerMArr.forEach((sdpM, i) => {
+                if (sdpM.includes(`${kind}`) && sdpM.includes(`a=msid:${msid}`)) {
+                    const newSdpM = sdpM.replace('a=sendonly', 'a=inactive');
+                    answerMArr.splice(i, 1, newSdpM);
+                }
+            });
+        });
+        return answerMArr.join('\r\nm=');
+    };
 
     /**
      * RTC 消息类型常量
@@ -8520,7 +8538,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.2.4-beem.10";
+            const rtcVersion = "5.2.4-beem.11";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -8781,7 +8799,7 @@
         _onUserUnpublish(tracks) {
             return __awaiter(this, void 0, void 0, function* () {
                 // 需要替业务层取消订阅，业务层只需关注 UI 变化
-                yield this.unsubscribe(tracks);
+                yield push(() => this.__unsubscribe(tracks));
                 tracks.forEach(item => {
                     item.__innerDestroy();
                     delete this._remoteTracks[item.getTrackId()];
@@ -9036,7 +9054,7 @@
                         userIds.push(userId);
                     });
                     if (tracks.length) {
-                        yield this.unsubscribe(tracks);
+                        yield push(() => this.__unsubscribe(tracks));
                         tracks.forEach((item) => delete this._remoteTracks[item.getTrackId()]);
                     }
                     // 等待队列执行完成后清除内存数据
@@ -9800,14 +9818,19 @@
                     return { code: resultCode };
                 }
                 logger.info(`subscribe success: ${subTrackIds.join(',')}`);
-                const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
-                if (resCode !== exports.RCRTCCode.SUCCESS) {
-                    return { code: resCode };
-                }
                 // 获取真正订阅成功的资源
                 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())));
+                /**
+                 * 订阅失败的资源，需把 sdp 中对应的通道方向改为 inactive
+                 * 否则下次复用通道时，浏览器 peerConnection 的 ontrack 事件不会被触发
+                 */
+                const answerSdp = failedList.length ? setAnswerSdpDirection(failedList, answer.sdp) : answer.sdp;
+                const resCode = yield this._pc.setRemoteAnswer(answerSdp);
+                if (resCode !== exports.RCRTCCode.SUCCESS) {
+                    return { code: resCode };
+                }
                 // 更新 remoteTrack.isSubscribed
                 for (const trackId in this._remoteTracks) {
                     const subed = subSuccessList.some(item => item.track.getTrackId() === trackId);
@@ -10773,7 +10796,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.2.4-beem.10",
+        ClientVersion: "5.2.4-beem.11",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -12233,6 +12256,12 @@
         }
         _joinRTCRoom(roomId, joinType, outerUserDatas, useMutilPeerC, roomType = engine.RTCMode.RTC) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (this._crtRoom) {
+                    return { code: exports.RCRTCCode.REPERT_JOIN_ROOM };
+                }
+                if (this._context.getConnectionStatus() !== engine.ConnectionStatus.CONNECTED) {
+                    return { code: exports.RCRTCCode.SIGNAL_DISCONNECTED };
+                }
                 if (isIllegalConnection(this._context.getNaviInfo())) {
                     return { code: exports.RCRTCCode.PACKAGE_ENVIRONMENT_ERROR };
                 }
@@ -12815,9 +12844,9 @@
                 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.10");
-            if (!engine.VersionManage.validEngine("4.6.0-beem.10")) {
-                logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.10"}'.`);
+            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.11");
+            if (!engine.VersionManage.validEngine(">=4.6.0-beem.11")) {
+                logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${">=4.6.0-beem.11"}'.`);
                 return false;
             }
             return true;
@@ -12825,7 +12854,7 @@
         setup(context, runtime, options = {}) {
             logger.setLogLevel(options.logLevel);
             logger.setLogStdout(options.logStdout);
-            logger.warn(`RCRTC Version: ${"5.2.4-beem.10"}, Commit: ${"6db922c5bab0ba43c929ae0deae91711d5ce1406"}`);
+            logger.warn(`RCRTC Version: ${"5.2.4-beem.11"}, Commit: ${"dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb"}`);
             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.10",
+  "version": "5.2.4-beem.11",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -31,7 +31,7 @@
     "node": ">=10.0.0"
   },
   "peerDependencies": {
-    "@rongcloud/engine": "4.6.0-beem.10"
+    "@rongcloud/engine": ">=4.6.0-beem.11"
   },
-  "__commit__": "6db922c5bab0ba43c929ae0deae91711d5ce1406"
+  "__commit__": "dbfe1dbe0b6627aa62beb6c3d31f6b2894ccadcb"
 }