agora-rte-sdk 3.4.1 → 3.4.2

package/lib/core/engine/ap-detector.d.ts

@@ -1,7 +1,6 @@
 import { AgoraRteError } from '../utilities/error';
 export interface AgoraRtcAccessPointConfig {
     serverList: string[];
-    verifyDomainName?: string;
 }
 export interface AgoraWebRtcAccessPointConfig extends AgoraRtcAccessPointConfig {
     serverDomain?: string;
@@ -20,7 +19,7 @@ export interface AgoraWebRtcAccessPointConfig extends AgoraRtcAccessPointConfig
     };
 }
 export interface AgoraElectronRtcAccessPointConfig extends AgoraRtcAccessPointConfig {
-    verifyDomainName: string;
+    verifyDomainName?: string;
 }
 export interface AgoraRteApDetectorObserver {
     onDetectionSuccess?(): void;
@@ -28,9 +27,7 @@ export interface AgoraRteApDetectorObserver {
 }
 export interface AgoraRteApDetector {
     readonly finished: boolean;
-    _internalRtcConfig: AgoraRtcAccessPointConfig | undefined;
-    _externalRtcConfig: AgoraRtcAccessPointConfig | undefined;
-    init(internalRtcConfig: AgoraRtcAccessPointConfig | undefined, externalRtcConfig: AgoraRtcAccessPointConfig | undefined): void;
+    init(internalRtcConfig?: AgoraRtcAccessPointConfig, externalRtcConfig?: AgoraRtcAccessPointConfig): void;
     /**
      * 是否需要探测
      */
@@ -60,18 +57,22 @@ export interface AgoraRteApDetector {
      */
     removeObserver(observer: AgoraRteApDetectorObserver): AgoraRteError | void;
 }
+export declare const isIP: (ip: string) => boolean;
+export declare const isDomainName: (str: string) => boolean;
+export declare const transformUrlToRequestUrl: (url: string, isElectron: boolean, isMock: boolean) => string;
 export declare class AgoraRteApDetectorImpl implements AgoraRteApDetector {
     finished: boolean;
-    _internalRtcConfig: AgoraRtcAccessPointConfig | undefined;
-    _externalRtcConfig: AgoraRtcAccessPointConfig | undefined;
+    private _minCount;
+    private _internalRtcConfig?;
+    private _externalRtcConfig?;
     private detectWorkMap;
     private _apDetectorObserver;
     private _rawObjGroups;
-    constructor(internalRtcConfig: AgoraRtcAccessPointConfig | undefined, externalRtcConfig: AgoraRtcAccessPointConfig | undefined);
+    private availableRtcAccessPointConfig;
+    constructor(internalRtcConfig: AgoraRtcAccessPointConfig, externalRtcConfig: AgoraRtcAccessPointConfig);
     init(internalRtcConfig: AgoraRtcAccessPointConfig | undefined, externalRtcConfig: AgoraRtcAccessPointConfig | undefined): void;
     get hasDetectingTask(): boolean;
     private _getDetectWorkMapRawVal;
-    private _transformUrlToRequestUrl;
     private _fetchWithTimeoutAndCheck;
     private _runTasksWithConcurrency;
     start(): void;

package/lib/core/engine/ap-detector.js

@@ -3,15 +3,23 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.iterator.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AgoraRteApDetectorImpl = void 0;
+exports.transformUrlToRequestUrl = exports.isIP = exports.isDomainName = exports.AgoraRteApDetectorImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -34,6 +42,7 @@ require("core-js/modules/es.promise.all-settled.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.string.replace.js");
 require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -41,30 +50,61 @@ require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _imports = require("../../imports");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var NEED_DETECT_MAX_IP_COUNT = 5;
+// const NEED_DETECT_MAX_IP_COUNT = 5;
 var DEFAULT_FETCH_URL_TIMEOUT = 300;
 var isMock = false;
 // 用于判断是否是IP地址，简单的正则表达式判断示例，可根据实际完善
-var isIP = function isIP(ip) {
+var isIP = exports.isIP = function isIP(ip) {
   var ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
   return ipRegex.test(ip);
 };
 
 // 判断是否为域名的函数
-var isDomainName = function isDomainName(str) {
+var isDomainName = exports.isDomainName = function isDomainName(str) {
   var domainRegex = /^(?!:\/\/)(?=^.{1,253}$)([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
   return domainRegex.test(str);
 };
+
+// 移除url的前缀 http/https
+var removeHttpPrefix = function removeHttpPrefix(url) {
+  // 定义一个正则表达式，用于匹配以 http:// 或 https:// 开头的字符串
+  var regex = /^https?:\/\//;
+  // 使用 replace 方法替换匹配到的前缀为空字符串
+  return url.replace(regex, '');
+};
+var transformUrlToRequestUrl = exports.transformUrlToRequestUrl = function transformUrlToRequestUrl(url, isElectron, isMock) {
+  var pureUrl = removeHttpPrefix(url);
+  if (isMock) {
+    return "http://".concat(pureUrl);
+  } else if (isElectron) {
+    return "https://".concat(pureUrl);
+  } else {
+    if (isIP(pureUrl)) {
+      var modifiedIp = pureUrl.split('.').join('-') + '.rtctest.com';
+      var getUrl = "https://".concat(modifiedIp);
+      return getUrl;
+    } else if (isDomainName(pureUrl)) {
+      return "https://".concat(pureUrl);
+    }
+    return '';
+  }
+};
 var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/function () {
   function AgoraRteApDetectorImpl(internalRtcConfig, externalRtcConfig) {
     (0, _classCallCheck2["default"])(this, AgoraRteApDetectorImpl);
     (0, _defineProperty2["default"])(this, "finished", false);
+    (0, _defineProperty2["default"])(this, "_minCount", 5);
     (0, _defineProperty2["default"])(this, "detectWorkMap", this._getDetectWorkMapRawVal());
     (0, _defineProperty2["default"])(this, "_apDetectorObserver", new _imports.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_rawObjGroups", []);
+    (0, _defineProperty2["default"])(this, "availableRtcAccessPointConfig", {
+      serverList: []
+    });
     this.init(internalRtcConfig, externalRtcConfig);
   }
   return (0, _createClass2["default"])(AgoraRteApDetectorImpl, [{
@@ -92,24 +132,6 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
       };
       return newMap;
     }
-  }, {
-    key: "_transformUrlToRequestUrl",
-    value: function _transformUrlToRequestUrl(url) {
-      if (isMock) {
-        return "http://".concat(url);
-      } else if ((0, _imports.isElectron)()) {
-        return "https://".concat(url);
-      } else {
-        if (isIP(url)) {
-          var modifiedIp = url.split('.').join('-') + '.rtctest.com';
-          var getUrl = "https://".concat(modifiedIp);
-          return getUrl;
-        } else if (isDomainName(url)) {
-          return "https://".concat(url);
-        }
-        return '';
-      }
-    }
 
     // 请求 url，300ms 内返回 HTTP 状态 为 200 且包体为 hello 表示成功，其他情况均为失败
   }, {
@@ -166,7 +188,7 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
               urlObjs = [];
               for (i = 0; i < rawUrls.length; i++) {
                 rawUrl = rawUrls[i];
-                requestUrl = this._transformUrlToRequestUrl(rawUrl);
+                requestUrl = transformUrlToRequestUrl(rawUrl, (0, _imports.isElectron)(), isMock);
                 if (requestUrl) {
                   urlObjs.push({
                     rawUrl: rawUrl,
@@ -263,7 +285,6 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
       }
       var internalIpList = (_this$_internalRtcCon = (_this$_internalRtcCon2 = this._internalRtcConfig) === null || _this$_internalRtcCon2 === void 0 ? void 0 : _this$_internalRtcCon2.serverList) !== null && _this$_internalRtcCon !== void 0 ? _this$_internalRtcCon : [];
       var externalIpList = (_this$_externalRtcCon = (_this$_externalRtcCon2 = this._externalRtcConfig) === null || _this$_externalRtcCon2 === void 0 ? void 0 : _this$_externalRtcCon2.serverList) !== null && _this$_externalRtcCon !== void 0 ? _this$_externalRtcCon : [];
-      var maxConcurrency = 5;
       (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
         var _this2$detectWorkMap$;
         var resUrls, internalResultIpList, _resUrls;
@@ -277,13 +298,12 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
                 break;
               }
               _context4.next = 4;
-              return _this2._runTasksWithConcurrency(internalIpList, maxConcurrency);
+              return _this2._runTasksWithConcurrency(internalIpList, _this2._minCount);
             case 4:
               resUrls = _context4.sent;
-              _this2.detectWorkMap.internal.result = {
-                serverList: resUrls,
-                verifyDomainName: _this2._internalRtcConfig.verifyDomainName
-              };
+              _this2.detectWorkMap.internal.result = _objectSpread(_objectSpread({}, _this2._internalRtcConfig), {}, {
+                serverList: resUrls
+              });
             case 6:
               internalResultIpList = ((_this2$detectWorkMap$ = _this2.detectWorkMap.internal) === null || _this2$detectWorkMap$ === void 0 || (_this2$detectWorkMap$ = _this2$detectWorkMap$.result) === null || _this2$detectWorkMap$ === void 0 ? void 0 : _this2$detectWorkMap$.serverList) || []; // 如果传入了外部IP的合法配置 并且 内网配置结果的ipList未有合格项
               if (!(_this2._externalRtcConfig && externalIpList.length > 0 && internalResultIpList.length == 0)) {
@@ -291,13 +311,12 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
                 break;
               }
               _context4.next = 10;
-              return _this2._runTasksWithConcurrency(externalIpList, maxConcurrency);
+              return _this2._runTasksWithConcurrency(externalIpList, _this2._minCount);
             case 10:
               _resUrls = _context4.sent;
-              _this2.detectWorkMap.external.result = {
-                serverList: _resUrls,
-                verifyDomainName: _this2._externalRtcConfig.verifyDomainName
-              };
+              _this2.detectWorkMap.external.result = _objectSpread(_objectSpread({}, _this2._externalRtcConfig), {}, {
+                serverList: _resUrls
+              });
             case 12:
               _this2.detectWorkMap.isDetecting = false;
               _this2._checkResultAndNotifyResult();
@@ -312,7 +331,7 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
     key: "_checkResultAndNotifyResult",
     value: function _checkResultAndNotifyResult() {
       var cfg = this.getAvailableRtcAccessPointConfig();
-      if (!cfg) {
+      if (!cfg || cfg.serverList.length === 0) {
         this._apDetectorObserver.notifyObservers('onDetectionFailure');
       } else {
         this._apDetectorObserver.notifyObservers('onDetectionSuccess');
@@ -323,11 +342,28 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
   }, {
     key: "isDetectRequired",
     value: function isDetectRequired() {
-      if (this._internalRtcConfig || this._externalRtcConfig) {
+      if (this._internalRtcConfig || this._externalRtcConfig || !isMock) {
         var _this$_internalRtcCon3, _this$_internalRtcCon4, _this$_externalRtcCon3, _this$_externalRtcCon4;
         var internalLen = (_this$_internalRtcCon3 = (_this$_internalRtcCon4 = this._internalRtcConfig) === null || _this$_internalRtcCon4 === void 0 ? void 0 : _this$_internalRtcCon4.serverList.length) !== null && _this$_internalRtcCon3 !== void 0 ? _this$_internalRtcCon3 : 0;
         var externalLen = (_this$_externalRtcCon3 = (_this$_externalRtcCon4 = this._externalRtcConfig) === null || _this$_externalRtcCon4 === void 0 ? void 0 : _this$_externalRtcCon4.serverList.length) !== null && _this$_externalRtcCon3 !== void 0 ? _this$_externalRtcCon3 : 0;
-        return internalLen >= NEED_DETECT_MAX_IP_COUNT || externalLen >= NEED_DETECT_MAX_IP_COUNT;
+        if (internalLen === 0 && externalLen === 0) {
+          return false;
+        }
+        if (internalLen === 0 || externalLen === 0) {
+          var _notZeroRtcConfig$ser;
+          var notZeroRtcConfig = internalLen === 0 ? this._externalRtcConfig : this._internalRtcConfig;
+          var notZeroRtcConfigServerListLen = (_notZeroRtcConfig$ser = notZeroRtcConfig === null || notZeroRtcConfig === void 0 ? void 0 : notZeroRtcConfig.serverList.length) !== null && _notZeroRtcConfig$ser !== void 0 ? _notZeroRtcConfig$ser : 0;
+          if (notZeroRtcConfigServerListLen < this._minCount) {
+            this.availableRtcAccessPointConfig = _objectSpread({
+              serverList: (notZeroRtcConfig === null || notZeroRtcConfig === void 0 ? void 0 : notZeroRtcConfig.serverList) || []
+            }, notZeroRtcConfig);
+            return false;
+          } else {
+            return true;
+          }
+        } else {
+          return true;
+        }
       }
       return false;
     }
@@ -336,6 +372,9 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
     value: function stop() {
       this._rawObjGroups = [];
       this.detectWorkMap = this._getDetectWorkMapRawVal();
+      this.availableRtcAccessPointConfig = {
+        serverList: []
+      };
     }
   }, {
     key: "isFinished",
@@ -346,16 +385,18 @@ var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/funct
     key: "getAvailableRtcAccessPointConfig",
     value: function getAvailableRtcAccessPointConfig() {
       if (!this.isDetectRequired() || this.isFinished()) {
-        return this._internalRtcConfig || this._externalRtcConfig || null;
+        return this.availableRtcAccessPointConfig;
       }
       var res = null;
       var internalResult = this.detectWorkMap.internal.result;
       if (internalResult && Array.isArray(internalResult.serverList) && internalResult.serverList.length > 0) {
         res = internalResult;
+        this.availableRtcAccessPointConfig = res;
       }
       var externalResult = this.detectWorkMap.external.result;
       if (!res && externalResult && Array.isArray(externalResult.serverList) && externalResult.serverList.length > 0) {
         res = externalResult;
+        this.availableRtcAccessPointConfig = res;
       }
       return res;
     }

package/lib/core/engine/index.js

@@ -198,7 +198,8 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
       this._rtcClient.sourceManager.addObserver({
         onCameraStateUpdated: rteScene.onCameraVideoStateUpdated,
         onMicrophoneStateUpdated: rteScene.onMicrophoneAudioStateUpdated,
-        onLoopbackStateUpdated: rteScene.onLoopbackAudioStateUpdated
+        onLoopbackStateUpdated: rteScene.onLoopbackAudioStateUpdated,
+        onScreenCaptureStateUpdated: rteScene.onScreenCaptureVideoStateUpdated
       });
       return rteScene;
     }
@@ -242,11 +243,20 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
   }, {
     key: "setParameters",
     value: function setParameters(parameters) {
+      var _this = this;
       try {
         var _ref = parameters,
-          rtc = _ref.rtc;
+          rtc = _ref.rtc,
+          rtm = _ref.rtm;
         if (rtc) {
-          this._rtcClient.setParameters(rtc);
+          rtc.forEach(function (param) {
+            _this._rtcClient.setParameters(param);
+          });
+        }
+        if (rtm) {
+          rtm.forEach(function (param) {
+            _this._rtmClient.setParameters(param);
+          });
         }
       } catch (e) {
         this.logger.warn('[AgoraRteEngine] setParameters failed', e);
@@ -303,7 +313,7 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
   }, {
     key: "_handlePeerMessageReceived",
     value: function _handlePeerMessageReceived(userId, message) {
-      var _this = this;
+      var _this2 = this;
       var _ref2 = JSON.parse(message),
         list = _ref2.list;
       list.forEach(function (_ref3) {
@@ -313,7 +323,7 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
           payload = _ref3$data.payload,
           fromUser = _ref3$data.fromUser;
         if (cmd === _type3.AgoraRtePeerMessageCmd.FLEXIBLE) {
-          _this._observable.notifyObservers('onPeerMessageReceived', {
+          _this2._observable.notifyObservers('onPeerMessageReceived', {
             payload: payload,
             timestamp: ts,
             senderId: fromUser.userUuid

package/lib/core/media/index.d.ts

@@ -1,6 +1,5 @@
 import { AgoraRtcAudioOutputRouting, AgoraRtcCapability, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo } from '../rtc/type';
 import { AgoraRteCameraVideoTrack } from './camera';
-import { AgoraRteAudioEffectEnhancer, AgoraRteVideoEffectEnhancer } from './effect-enhancer';
 import { AgoraRteLoopbackAudioTrack } from './loopback';
 import { AgoraRteMicrophoneAudioTrack } from './microphone';
 import { AgoraRteScreenVideoTrack } from './screen';
@@ -79,7 +78,7 @@ export interface AgoraRteMediaControl {
      * Enable/Disable speaker playback.
      * @param enable Whether to enable speaker playback.
      */
-    setEnableSpeaker(enable: boolean): number;
+    setEnableSpeaker(enable: boolean): void;
     /**
      * Get the current audio output routing of the SDK
      */
@@ -113,14 +112,6 @@ export interface AgoraRteMediaControl {
      * Get the volume of the selected speaker
      */
     getSelectedSpeakerVolume(): number;
-    /**
-     * Get the audio effect enhancer
-     */
-    getAudioEffectEnhancer(): AgoraRteAudioEffectEnhancer;
-    /**
-     * Get the video effect enhancer
-     */
-    getVideoEffectEnhancer(): AgoraRteVideoEffectEnhancer;
     /**
      * Check loopback device status
      * @returns 0 if the loopback device is available; otherwise,
@@ -128,6 +119,16 @@ export interface AgoraRteMediaControl {
      * 2 if not installed/activated
      */
     checkLoopbackDevice(): Promise<number>;
+    /**
+     * Follow the system speaker
+     * @param follow
+     */
+    followSystemSpeaker(follow: boolean): void;
+    /**
+     * Follow the system microphone
+     * @param follow
+     */
+    followSystemMicrophone(follow: boolean): void;
     /**
      * Adds an observer to be notified of media device events.
      * @param observer The observer to add.

package/lib/core/media/index.js

@@ -3,6 +3,8 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
@@ -20,8 +22,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AgoraRteMediaControlImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.map.js");
@@ -127,6 +127,16 @@ var AgoraRteMediaControlImpl = exports.AgoraRteMediaControlImpl = /*#__PURE__*/f
     this._rtcClient.addObserver(this._rtcClientObserver);
   }
   return (0, _createClass2["default"])(AgoraRteMediaControlImpl, [{
+    key: "followSystemSpeaker",
+    value: function followSystemSpeaker(follow) {
+      this._rtcClient.followSystemSpeaker(follow);
+    }
+  }, {
+    key: "followSystemMicrophone",
+    value: function followSystemMicrophone(follow) {
+      this._rtcClient.followSystemMicrophone(follow);
+    }
+  }, {
     key: "setSelectedSpeaker",
     value: function setSelectedSpeaker(deviceId) {
       this._rtcClient.setSelectedSpeaker(deviceId);
@@ -141,16 +151,6 @@ var AgoraRteMediaControlImpl = exports.AgoraRteMediaControlImpl = /*#__PURE__*/f
     value: function getSelectedSpeakerVolume() {
       return this._rtcClient.getSelectedSpeakerVolume();
     }
-  }, {
-    key: "getAudioEffectEnhancer",
-    value: function getAudioEffectEnhancer() {
-      throw new Error('Method not implemented.');
-    }
-  }, {
-    key: "getVideoEffectEnhancer",
-    value: function getVideoEffectEnhancer() {
-      throw new Error('Method not implemented.');
-    }
   }, {
     key: "getAudioOutputRouting",
     value: function getAudioOutputRouting() {
@@ -159,7 +159,7 @@ var AgoraRteMediaControlImpl = exports.AgoraRteMediaControlImpl = /*#__PURE__*/f
   }, {
     key: "setEnableSpeaker",
     value: function setEnableSpeaker(enable) {
-      return this._rtcClient.setEnableSpeaker(enable);
+      this._rtcClient.setEnableSpeaker(enable);
     }
   }, {
     key: "getCameraVideoTrack",
@@ -272,7 +272,7 @@ var AgoraRteMediaControlImpl = exports.AgoraRteMediaControlImpl = /*#__PURE__*/f
   }]);
 }();
 _AgoraRteMediaControlImpl = AgoraRteMediaControlImpl;
-var _applyDecs$e = _applyDecs(_AgoraRteMediaControlImpl, [[_logger.trace, 2, "setSelectedSpeaker"], [_logger.trace, 2, "setSelectedSpeakerVolume"], [_logger.trace, 2, "setEnableSpeaker"], [_logger.trace, 2, "startSpeakerTest"], [_logger.trace, 2, "stopSpeakerTest"], [_logger.trace, 2, "adjustAudioOutputVolume"], [_logger.trace, 2, "release"], [_logger.trace, 2, "checkLoopbackDevice"]], []).e;
+var _applyDecs$e = _applyDecs(_AgoraRteMediaControlImpl, [[_logger.trace, 2, "followSystemSpeaker"], [_logger.trace, 2, "followSystemMicrophone"], [_logger.trace, 2, "setSelectedSpeaker"], [_logger.trace, 2, "setSelectedSpeakerVolume"], [_logger.trace, 2, "setEnableSpeaker"], [_logger.trace, 2, "startSpeakerTest"], [_logger.trace, 2, "stopSpeakerTest"], [_logger.trace, 2, "adjustAudioOutputVolume"], [_logger.trace, 2, "release"], [_logger.trace, 2, "checkLoopbackDevice"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/core/rtc/canvas.d.ts

@@ -1,10 +1,23 @@
+import { Logger } from '../../imports';
 import { AgoraRteRenderView } from '../../type';
-import { AgoraRtcRenderMode, AgoraRtcRenderResultType, AgoraRtcRenderSourceType } from './type';
+import { AgoraRtcConnection, AgoraRtcRenderMode, AgoraRtcRenderResultType, AgoraRtcRenderSourceType } from './type';
 export declare abstract class AgoraRtcCanvasHelper {
+    logger: Logger;
     canvasMap: Map<AgoraRteRenderView, string>;
-    abstract bind(canvasAddress: unknown, renderSourceId: string, type: AgoraRtcRenderSourceType): AgoraRtcRenderResultType;
-    abstract unbind(canvasAddress: unknown): number;
+    abstract bind(canvasAddress: AgoraRteRenderView, renderSourceId: string, type: AgoraRtcRenderSourceType): AgoraRtcRenderResultType;
+    abstract unbind(canvasAddress: AgoraRteRenderView): number;
     abstract unbindAll(renderSourceId: string, type: AgoraRtcRenderSourceType): number;
+    canvasTagPool: Map<AgoraRteRenderView, AgoraRtcCanvasTag>;
+    abstract getTagWithCanvasId(canvasAddress: AgoraRteRenderView): AgoraRtcCanvasTag | undefined;
+    abstract addTagWithCanvasId(canvasAddress: AgoraRteRenderView, sourceId: string, canvas: AgoraRtcVideoCanvas, connection?: AgoraRtcConnection): void;
+    abstract ifNeedStopRenderCanvas(canvasAddress: AgoraRteRenderView): void;
+    abstract stopRenderOnAllCanvasWithSourceId(sourceId: string): void;
+}
+export declare class AgoraRtcCanvasTag {
+    canvas: AgoraRtcVideoCanvas;
+    sourceId: string;
+    connection?: AgoraRtcConnection;
+    constructor(canvas: AgoraRtcVideoCanvas, sourceId: string, connection?: AgoraRtcConnection);
 }
 export declare class AgoraRtcVideoCanvas {
     readonly view: unknown;

package/lib/core/rtc/canvas.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AgoraRtcVideoCanvas = exports.AgoraRtcCanvasHelper = void 0;
+exports.AgoraRtcVideoCanvas = exports.AgoraRtcCanvasTag = exports.AgoraRtcCanvasHelper = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.date.now.js");
@@ -30,10 +30,19 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _imports = require("../../imports");
 var _type = require("./type");
 var AgoraRtcCanvasHelper = exports.AgoraRtcCanvasHelper = /*#__PURE__*/(0, _createClass2["default"])(function AgoraRtcCanvasHelper() {
   (0, _classCallCheck2["default"])(this, AgoraRtcCanvasHelper);
+  (0, _defineProperty2["default"])(this, "logger", (0, _imports.getLogger)());
   (0, _defineProperty2["default"])(this, "canvasMap", new Map());
+  (0, _defineProperty2["default"])(this, "canvasTagPool", new Map());
+});
+var AgoraRtcCanvasTag = exports.AgoraRtcCanvasTag = /*#__PURE__*/(0, _createClass2["default"])(function AgoraRtcCanvasTag(canvas, sourceId, connection) {
+  (0, _classCallCheck2["default"])(this, AgoraRtcCanvasTag);
+  this.canvas = canvas;
+  this.sourceId = sourceId;
+  this.connection = connection;
 });
 var AgoraRtcVideoCanvas = exports.AgoraRtcVideoCanvas = /*#__PURE__*/function () {
   function AgoraRtcVideoCanvas(view, opts) {

package/lib/core/rtc/client.d.ts

@@ -164,4 +164,14 @@ export declare abstract class AgoraRtcClient {
      * @param config The access point configuration.
      */
     abstract setAccessPoint(config: AgoraRtcAccessPointConfig): void;
+    /**
+     * Follows the system speaker
+     * @param follow
+     */
+    abstract followSystemSpeaker(follow: boolean): number;
+    /**
+     * Follows the system microphone
+     * @param follow
+     */
+    abstract followSystemMicrophone(follow: boolean): number;
 }

package/lib/core/rtm/client.d.ts

@@ -44,4 +44,9 @@ export declare abstract class AgoraRtmClient {
      * @returns A promise that resolves when the message has been sent.
      */
     abstract sendPeerMessage(message: string, guaranteedDelivery: boolean, receiverId: string): Promise<void>;
+    /**
+     * Sets the parameters for the RTM client.
+     * @param parameters The parameters to set.
+     */
+    abstract setParameters(parameters: string): void;
 }

package/lib/core/scene/index.d.ts

@@ -6,7 +6,7 @@ import { AgoraRteStreamPlayer } from './stream-player';
 import { AgoraRteLocalUser } from './local-user';
 import { AgoraRteServiceApi } from '../services/api';
 import { AgoraObservable } from '../../imports';
-import { AgoraRtcMediaSourceState } from '../rtc/type';
+import { AgoraRtcMediaSourceState, AgoraRtcScreenCaptureType } from '../rtc/type';
 export declare class AgoraRteScene {
     protected logger: import("agora-foundation/lib/logger/type").Logger;
     protected readonly observable: AgoraObservable<Partial<{
@@ -46,13 +46,17 @@ export declare class AgoraRteScene {
     private _streamPlayer?;
     private _timestampGap;
     private _totalUserCount;
-    private _joinOptions?;
+    private _joinSuccess;
+    private _joining;
+    private _joinState;
     private _localCameraStateMap;
     private _localMicrophoneStateMap;
+    private _localScreenCaptureStateMap;
     private _localLoopbackStateMap;
     private _deviceStateSyncTimer?;
     private _messageHandlerObservers;
     private _rtmClientObserver;
+    private _deviceSyncMutex;
     private _startDeviceStateSync;
     private _stopDeviceStateSync;
     get apiService(): AgoraRteServiceApi;
@@ -193,8 +197,9 @@ export declare class AgoraRteScene {
      */
     removeObserver(observer: AgoraRteSceneObserver): void;
     onCameraVideoStateUpdated: (deviceId: string, state: AgoraRtcMediaSourceState) => void;
-    onLoopbackAudioStateUpdated: (deviceId: string, state: AgoraRtcMediaSourceState) => void;
     onMicrophoneAudioStateUpdated: (deviceId: string, state: AgoraRtcMediaSourceState, error?: Error | undefined) => void;
+    onScreenCaptureVideoStateUpdated: (deviceId: string, type: AgoraRtcScreenCaptureType, state: AgoraRtcMediaSourceState) => void;
+    onLoopbackAudioStateUpdated: (deviceId: string, state: AgoraRtcMediaSourceState) => void;
     private _joinRTMChannel;
     private _entryRoom;
     private _joinRTCChannel;
@@ -205,9 +210,11 @@ export declare class AgoraRteScene {
     private _getChannelMessageEventListeners;
     private _handleUserAdded;
     private _handleUserRemoved;
-    private _syncLocalCameraVideoState;
-    private _syncLocalLoopbackAudioState;
-    private _syncLocalMicrophoneAudioState;
+    private _getLocalCameraVideoStatePatches;
+    private _getLocalLoopbackAudioStatePatches;
+    private _getLocalMicrophoneAudioStatePatches;
+    private _getLocalScreenCaptureVideoStatePatches;
+    private _syncDeviceState;
     private _cleanup;
     private _keypathObjectToNormalObject;
     private _setRtcClientAccessPoint;