@rongcloud/plugin-rtc 5.1.10-enterprise.2 → 5.1.10-enterprise.3

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.1.10-enterprise.2
- * CommitId - 5b9b0aef08a0933ff4adc82569d6903422b7a232
- * Thu Jun 23 2022 21:44:53 GMT+0800 (China Standard Time)
+ * RCRTC - v5.1.10-enterprise.3
+ * CommitId - 9409ef61818cd46a57e67dcba7e66eaba0dc05a6
+ * Mon Jul 25 2022 18:28:32 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, LogLevel, RTCMode, IRuntime, RTCPluginContext, IServerRTCRoomEntry, IJoinRTCRoomData, IReceivedMessage, KVString, ErrorCode, IPluginGenerator } from '@rongcloud/engine';
@@ -218,6 +218,7 @@ declare abstract class RCTrack extends EventEmitter {
      */
     play(element?: HTMLVideoElement, options?: {
         volume?: number;
+        autoplay: boolean;
     }): Promise<{
         code: RCRTCCode;
     }>;

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.1.10-enterprise.2
- * CommitId - 5b9b0aef08a0933ff4adc82569d6903422b7a232
- * Thu Jun 23 2022 21:44:53 GMT+0800 (China Standard Time)
+ * RCRTC - v5.1.10-enterprise.3
+ * CommitId - 9409ef61818cd46a57e67dcba7e66eaba0dc05a6
+ * Mon Jul 25 2022 18:28:32 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, RTCIdentityChangeType } from '@rongcloud/engine';
@@ -5756,7 +5756,8 @@ class RCTrack extends EventEmitter {
      * @param element 用于承载媒体流的元素标签，音频流可传空
      * @param volume 有效值为 0-100
      */
-    play(element, options) {
+    play(element, options = { autoplay: true }) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._msTrack) {
                 logger.warn(`the track is not ready to play -> id: ${this._id}`);
@@ -5818,10 +5819,20 @@ class RCTrack extends EventEmitter {
                 // 中止
                 logger.info(`HTMLMediaElement onabort -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
             };
+            // 用户在 Video 标签上 设置的优化级最高，其次是选项中设置的 autoplay
+            const autoplay = ((_a = this._element) === null || _a === void 0 ? void 0 : _a.autoplay) || options.autoplay;
             this._element.oncanplay = evt => {
-                var _a;
+                var _a, _b;
                 // 可以播放
                 logger.info(`HTMLMediaElement oncanplay -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
+                if (autoplay) {
+                    try {
+                        (_b = this._element) === null || _b === void 0 ? void 0 : _b.play();
+                    }
+                    catch (error) {
+                        logger.error(error);
+                    }
+                }
             };
             this._element.onvolumechange = evt => {
                 var _a;
@@ -5830,7 +5841,7 @@ class RCTrack extends EventEmitter {
                 logger.info(`HTMLMediaElement onvolumechange -> volume: ${volume}, trackId: ${this._id}`);
             };
             this._element.srcObject = this._msStream;
-            this._element.autoplay = true;
+            this._element.autoplay = autoplay;
             // video 标签页面内播放
             if (isVideoTrack) {
                 this._element.playsInline = true;
@@ -5841,13 +5852,6 @@ class RCTrack extends EventEmitter {
             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;
             }
-            try {
-                this._element.play();
-            }
-            catch (error) {
-                logger.error(error);
-                return { code: RCRTCCode.TRACK_PLAY_ERROR };
-            }
             return { code: RCRTCCode.SUCCESS };
         });
     }
@@ -8237,7 +8241,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.1.10-enterprise.2";
+        const rtcVersion = "5.1.10-enterprise.3";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -10457,7 +10461,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.1.10-enterprise.2",
+    ClientVersion: "5.1.10-enterprise.3",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12375,7 +12379,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.1.10-enterprise.2"}, Commit: ${"5b9b0aef08a0933ff4adc82569d6903422b7a232"}`);
+        logger.warn(`RCRTC Version: ${"5.1.10-enterprise.3"}, Commit: ${"9409ef61818cd46a57e67dcba7e66eaba0dc05a6"}`);
         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.1.10-enterprise.2
- * CommitId - 5b9b0aef08a0933ff4adc82569d6903422b7a232
- * Thu Jun 23 2022 21:44:53 GMT+0800 (China Standard Time)
+ * RCRTC - v5.1.10-enterprise.3
+ * CommitId - 9409ef61818cd46a57e67dcba7e66eaba0dc05a6
+ * Mon Jul 25 2022 18:28:32 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -5760,7 +5760,8 @@ class RCTrack extends engine.EventEmitter {
      * @param element 用于承载媒体流的元素标签，音频流可传空
      * @param volume 有效值为 0-100
      */
-    play(element, options) {
+    play(element, options = { autoplay: true }) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._msTrack) {
                 logger.warn(`the track is not ready to play -> id: ${this._id}`);
@@ -5822,10 +5823,20 @@ class RCTrack extends engine.EventEmitter {
                 // 中止
                 logger.info(`HTMLMediaElement onabort -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
             };
+            // 用户在 Video 标签上 设置的优化级最高，其次是选项中设置的 autoplay
+            const autoplay = ((_a = this._element) === null || _a === void 0 ? void 0 : _a.autoplay) || options.autoplay;
             this._element.oncanplay = evt => {
-                var _a;
+                var _a, _b;
                 // 可以播放
                 logger.info(`HTMLMediaElement oncanplay -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
+                if (autoplay) {
+                    try {
+                        (_b = this._element) === null || _b === void 0 ? void 0 : _b.play();
+                    }
+                    catch (error) {
+                        logger.error(error);
+                    }
+                }
             };
             this._element.onvolumechange = evt => {
                 var _a;
@@ -5834,7 +5845,7 @@ class RCTrack extends engine.EventEmitter {
                 logger.info(`HTMLMediaElement onvolumechange -> volume: ${volume}, trackId: ${this._id}`);
             };
             this._element.srcObject = this._msStream;
-            this._element.autoplay = true;
+            this._element.autoplay = autoplay;
             // video 标签页面内播放
             if (isVideoTrack) {
                 this._element.playsInline = true;
@@ -5845,13 +5856,6 @@ class RCTrack extends engine.EventEmitter {
             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;
             }
-            try {
-                this._element.play();
-            }
-            catch (error) {
-                logger.error(error);
-                return { code: exports.RCRTCCode.TRACK_PLAY_ERROR };
-            }
             return { code: exports.RCRTCCode.SUCCESS };
         });
     }
@@ -8241,7 +8245,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.1.10-enterprise.2";
+        const rtcVersion = "5.1.10-enterprise.3";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -10461,7 +10465,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.1.10-enterprise.2",
+    ClientVersion: "5.1.10-enterprise.3",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -12379,7 +12383,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.1.10-enterprise.2"}, Commit: ${"5b9b0aef08a0933ff4adc82569d6903422b7a232"}`);
+        logger.warn(`RCRTC Version: ${"5.1.10-enterprise.3"}, Commit: ${"9409ef61818cd46a57e67dcba7e66eaba0dc05a6"}`);
         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.1.10-enterprise.2
- * CommitId - 5b9b0aef08a0933ff4adc82569d6903422b7a232
- * Thu Jun 23 2022 21:44:53 GMT+0800 (China Standard Time)
+ * RCRTC - v5.1.10-enterprise.3
+ * CommitId - 9409ef61818cd46a57e67dcba7e66eaba0dc05a6
+ * Mon Jul 25 2022 18:28:32 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -5760,7 +5760,8 @@
          * @param element 用于承载媒体流的元素标签，音频流可传空
          * @param volume 有效值为 0-100
          */
-        play(element, options) {
+        play(element, options = { autoplay: true }) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 if (!this._msTrack) {
                     logger.warn(`the track is not ready to play -> id: ${this._id}`);
@@ -5822,10 +5823,20 @@
                     // 中止
                     logger.info(`HTMLMediaElement onabort -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
                 };
+                // 用户在 Video 标签上 设置的优化级最高，其次是选项中设置的 autoplay
+                const autoplay = ((_a = this._element) === null || _a === void 0 ? void 0 : _a.autoplay) || options.autoplay;
                 this._element.oncanplay = evt => {
-                    var _a;
+                    var _a, _b;
                     // 可以播放
                     logger.info(`HTMLMediaElement oncanplay -> id: ${(_a = evt.target) === null || _a === void 0 ? void 0 : _a.id}, trackId: ${this._id}`);
+                    if (autoplay) {
+                        try {
+                            (_b = this._element) === null || _b === void 0 ? void 0 : _b.play();
+                        }
+                        catch (error) {
+                            logger.error(error);
+                        }
+                    }
                 };
                 this._element.onvolumechange = evt => {
                     var _a;
@@ -5834,7 +5845,7 @@
                     logger.info(`HTMLMediaElement onvolumechange -> volume: ${volume}, trackId: ${this._id}`);
                 };
                 this._element.srcObject = this._msStream;
-                this._element.autoplay = true;
+                this._element.autoplay = autoplay;
                 // video 标签页面内播放
                 if (isVideoTrack) {
                     this._element.playsInline = true;
@@ -5845,13 +5856,6 @@
                 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;
                 }
-                try {
-                    this._element.play();
-                }
-                catch (error) {
-                    logger.error(error);
-                    return { code: exports.RCRTCCode.TRACK_PLAY_ERROR };
-                }
                 return { code: exports.RCRTCCode.SUCCESS };
             });
         }
@@ -8241,7 +8245,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.1.10-enterprise.2";
+            const rtcVersion = "5.1.10-enterprise.3";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -10461,7 +10465,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.1.10-enterprise.2",
+        ClientVersion: "5.1.10-enterprise.3",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -12379,7 +12383,7 @@
         setup(context, runtime, options = {}) {
             logger.setLogLevel(options.logLevel);
             logger.setLogStdout(options.logStdout);
-            logger.warn(`RCRTC Version: ${"5.1.10-enterprise.2"}, Commit: ${"5b9b0aef08a0933ff4adc82569d6903422b7a232"}`);
+            logger.warn(`RCRTC Version: ${"5.1.10-enterprise.3"}, Commit: ${"9409ef61818cd46a57e67dcba7e66eaba0dc05a6"}`);
             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.1.10-enterprise.2",
+  "version": "5.1.10-enterprise.3",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "4.5.5-enterprise.1"
   },
-  "__commit__": "5b9b0aef08a0933ff4adc82569d6903422b7a232"
+  "__commit__": "9409ef61818cd46a57e67dcba7e66eaba0dc05a6"
 }