agora-rte-sdk 3.10.1-rc.2 → 3.10.2

package/lib/core/rtc/publish-pool.js

@@ -55,7 +55,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _imports = require("../../imports");
 var _constant = require("../../constant");
 var _AgoraRtcStreamPublishPool;
-var _initProto, _publishAudioDecs, _updateVideoSourceDecs, _updateAudioSourceDecs, _unpublishVideoDecs, _unpublishAudioDecs, _ref;
+var _initProto, _publishVideoDecs, _publishAudioDecs, _updateVideoSourceDecs, _updateAudioSourceDecs, _unpublishVideoDecs, _unpublishAudioDecs, _ref;
 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; }
@@ -64,7 +64,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-_ref = (_publishAudioDecs = (0, _imports.trace)(['token', 'streamId', 'sourceId', 'type', 'state']), _updateVideoSourceDecs = (0, _imports.trace)(['sourceId', 'type', 'state']), _updateAudioSourceDecs = (0, _imports.trace)(['sourceId', 'type', 'state']), _unpublishVideoDecs = (0, _imports.trace)(['streamId', 'type']), _unpublishAudioDecs = (0, _imports.trace)(['streamId', 'type']), "observable");
+_ref = (_publishVideoDecs = (0, _imports.trace)(['token', 'streamId', 'sourceId', 'type', 'state']), _publishAudioDecs = (0, _imports.trace)(['token', 'streamId', 'sourceId', 'type', 'state']), _updateVideoSourceDecs = (0, _imports.trace)(['sourceId', 'type', 'state']), _updateAudioSourceDecs = (0, _imports.trace)(['sourceId', 'type', 'state']), _unpublishVideoDecs = (0, _imports.trace)(['streamId', 'type']), _unpublishAudioDecs = (0, _imports.trace)(['streamId', 'type']), "observable");
 var AgoraRtcStreamPublishPool = exports.AgoraRtcStreamPublishPool = /*#__PURE__*/function () {
   function AgoraRtcStreamPublishPool() {
     (0, _classCallCheck2["default"])(this, AgoraRtcStreamPublishPool);
@@ -293,7 +293,7 @@ var AgoraRtcStreamPublishPool = exports.AgoraRtcStreamPublishPool = /*#__PURE__*
   }]);
 }();
 _AgoraRtcStreamPublishPool = AgoraRtcStreamPublishPool;
-var _applyDecs$e = _applyDecs(_AgoraRtcStreamPublishPool, [[_publishAudioDecs, 2, "publishAudio"], [_updateVideoSourceDecs, 2, "updateVideoSource"], [_updateAudioSourceDecs, 2, "updateAudioSource"], [_unpublishVideoDecs, 2, "unpublishVideo"], [_unpublishAudioDecs, 2, "unpublishAudio"]], []).e;
+var _applyDecs$e = _applyDecs(_AgoraRtcStreamPublishPool, [[_publishVideoDecs, 2, "publishVideo"], [_publishAudioDecs, 2, "publishAudio"], [_updateVideoSourceDecs, 2, "updateVideoSource"], [_updateAudioSourceDecs, 2, "updateAudioSource"], [_unpublishVideoDecs, 2, "unpublishVideo"], [_unpublishAudioDecs, 2, "unpublishAudio"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/plugin/rtc/electron/camera-preview-task-manager.d.ts

@@ -11,7 +11,7 @@ export declare class CameraPreviewTaskManager {
      * 执行指定 sourceId（deviceId）对应的所有 task
      * 用于多摄像头场景下，只执行特定设备的 preview task
      */
-    executeTasksBySourceId(sourceId: string): void;
+    executeTasksBySourceId(sourceId: string): Boolean;
     getTaskOptions(view: HTMLElement): VideoRenderParams | undefined;
     deleteTask(view: HTMLElement): void;
     clearAllTasks(): void;

package/lib/plugin/rtc/electron/camera-preview-task-manager.js

@@ -109,7 +109,7 @@ var CameraPreviewTaskManager = exports.CameraPreviewTaskManager = /*#__PURE__*/f
     key: "executeTasksBySourceId",
     value: function executeTasksBySourceId(sourceId) {
       if (this.taskMap.size === 0) {
-        return;
+        return false;
       }
       var executed = [];
       var _iterator2 = _createForOfIteratorHelper(this.taskMap),
@@ -133,6 +133,7 @@ var CameraPreviewTaskManager = exports.CameraPreviewTaskManager = /*#__PURE__*/f
         var view = _executed[_i];
         this.taskMap["delete"](view);
       }
+      return true;
     }
   }, {
     key: "getTaskOptions",

package/lib/plugin/rtc/electron/client.js

@@ -410,6 +410,9 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
         sourceManager: this.sourceManager,
         canvasTagPool: this.canvasTagPool
       };
+
+      // 在RTC SDK先调用 prview 再开采集会导致render异常。
+      // 所以需要保存在_cameraPreviewTaskManager 中，在采集开启的时候开始render
       if (this._sourceManager.isCameraCapturingByDeviceId(deviceId)) {
         return (0, _utils.startVideoRender)(videoRenderParams, this.logger);
       } else {
@@ -930,7 +933,7 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
             case 4:
               _context.prev = 4;
               _t = _context["catch"](2);
-              this.logger.error('failed to install AgoraALD for macOS');
+              this.logger.error("failed to install AgoraALD for macOS: ".concat(JSON.stringify(_t)));
             case 5:
             case "end":
               return _context.stop();

package/lib/plugin/rtc/electron/downloadALD.js

@@ -136,9 +136,14 @@ function _installAgoraALD() {
           return downloadFile(encodeURI(ALD_URL), tempZipPath);
         case 1:
           logger.info("[AgoraAld-Downloader]finished download ald zip to: ".concat(tempZipPath));
-          // temp 文件重命名为 zip
-          fs.renameSync(tempZipPath, zipPath);
-          logger.info("[AgoraAld-Downloader] rename to: ".concat(zipPath));
+          if (getSpecificFiles(zipCacheDir, zipExtensions, zipFileName).length <= 0) {
+            // temp 文件重命名为 zip
+            fs.renameSync(tempZipPath, zipPath);
+            logger.info("[AgoraAld-Downloader] rename to: ".concat(zipPath));
+          } else {
+            // 下载文件是异步的操作, 可能在下载过程中 zip 已经存在了, 这种情况不再需要将下载的文件重命名
+            logger.info("[AgoraAld-Downloader] ald zip already exists: ".concat(zipPath));
+          }
         case 2:
           zipData = fs.readFileSync(zipPath);
           logger.info('[AgoraAld-Downloader] start read zip data');

package/lib/plugin/rtc/electron/publish-pool.js

@@ -118,12 +118,12 @@ var AgoraElectronRtcStreamPublishPoolImpl = exports.AgoraElectronRtcStreamPublis
   }, {
     key: "shouldNotifyUpdate",
     value: function shouldNotifyUpdate(item) {
+      // Keep cached media options in sync even while paused so resume uses fresh state.
+      var channelMediaOptions = this._convertChannelMediaOptions(item);
+      item.mediaOptions = channelMediaOptions;
       if (this._isPaused) {
         return false;
       }
-      // Calculate new media options based on updated item state
-      var channelMediaOptions = this._convertChannelMediaOptions(item);
-      item.mediaOptions = channelMediaOptions;
       return this._checkIfNeedNotifyUpdate(channelMediaOptions, this._oldMediaOptions);
     }
   }, {

package/lib/plugin/rtc/electron/publisher.js

@@ -198,7 +198,7 @@ var AgoraRtcChannelPublisherImpl = exports.AgoraRtcChannelPublisherImpl = /*#__P
           mediaOptions.publishMicrophoneTrack = true;
         }
         var audioSourceType = item.audioSourceType && (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _type.AgoraRtcAudioSourceType.MICROPHONE, 'microphone'), _type.AgoraRtcAudioSourceType.LOOPBACK, 'loopback')[item.audioSourceType] || 'video';
-        _this.logger.info("rtcEngine updateChannelMediaOptionsEx for ".concat(audioSourceType, ", mediaOptions: ").concat(JSON.stringify(mediaOptions), ", connection: ").concat(JSON.stringify(item.connection)));
+        _this.logger.info("rtcEngine updateChannelMediaOptionsEx for ".concat(audioSourceType, ", mediaOptions: ").concat(JSON.stringify(mediaOptions), ", item.mediaOptions: ").concat(JSON.stringify(item.mediaOptions), ", connection: ").concat(JSON.stringify(item.connection)));
         _this._rtcEngine.updateChannelMediaOptionsEx(mediaOptions, item.connection);
 
         // handle microphone
@@ -537,8 +537,11 @@ var AgoraRtcChannelPublisherImpl = exports.AgoraRtcChannelPublisherImpl = /*#__P
       var isScreenStream = false;
       var highStreamConfig = this._bindStreamConfig(isScreenStream, _type.AgoraRtcStreamLayer.HIGH, this._defaultCameraHighVideoEncoderConfig);
       var lowStreamConfig = this._bindStreamConfig(isScreenStream, _type.AgoraRtcStreamLayer.LOW, this._defaultCameraLowVideoEncoderConfig);
-      this._videoStreamConfigs.set(connection.localUid.toString(), highStreamConfig);
-      this._videoStreamConfigs.set(connection.localUid.toString(), lowStreamConfig);
+      // 合并 high 和 low 的结果，只 set 一次避免后者覆盖前者造成可读性问题
+      this._videoStreamConfigs.set(connection.localUid.toString(), {
+        highVideoEncoderConfig: highStreamConfig.highVideoEncoderConfig,
+        lowVideoEncoderConfig: lowStreamConfig.lowVideoEncoderConfig
+      });
       return _constant.AgoraRtcErrorCode.SUCCESS;
     }
   }, {

package/lib/plugin/rtc/electron/source-manager.d.ts

@@ -22,7 +22,6 @@ export declare class AgoraRtcSourceManagerImpl implements AgoraRtcSourceManager
     private _enableSystemSelectedMicrophonePolling;
     private _systemSelectedMicrophonePolling;
     private _cameraPreviewTaskManager;
-    private _cameraCapturingDeviceIds;
     private _cameraCaptureParamsMapping;
     private _screenCaptureParamsMapping;
     get keepRecording(): boolean;

package/lib/plugin/rtc/electron/source-manager.js

@@ -37,6 +37,7 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.array-buffer.constructor.js");
 require("core-js/modules/es.array-buffer.slice.js");
 require("core-js/modules/es.data-view.js");
@@ -46,7 +47,6 @@ require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.parse-int.js");
 require("core-js/modules/es.promise.js");
-require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.typed-array.uint8-array.js");
@@ -87,6 +87,7 @@ require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -101,29 +102,6 @@ require("core-js/modules/esnext.map.merge.js");
 require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/esnext.set.add-all.js");
-require("core-js/modules/esnext.set.delete-all.js");
-require("core-js/modules/esnext.set.difference.v2.js");
-require("core-js/modules/esnext.set.difference.js");
-require("core-js/modules/esnext.set.every.js");
-require("core-js/modules/esnext.set.filter.js");
-require("core-js/modules/esnext.set.find.js");
-require("core-js/modules/esnext.set.intersection.v2.js");
-require("core-js/modules/esnext.set.intersection.js");
-require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
-require("core-js/modules/esnext.set.is-disjoint-from.js");
-require("core-js/modules/esnext.set.is-subset-of.v2.js");
-require("core-js/modules/esnext.set.is-subset-of.js");
-require("core-js/modules/esnext.set.is-superset-of.v2.js");
-require("core-js/modules/esnext.set.is-superset-of.js");
-require("core-js/modules/esnext.set.join.js");
-require("core-js/modules/esnext.set.map.js");
-require("core-js/modules/esnext.set.reduce.js");
-require("core-js/modules/esnext.set.some.js");
-require("core-js/modules/esnext.set.symmetric-difference.v2.js");
-require("core-js/modules/esnext.set.symmetric-difference.js");
-require("core-js/modules/esnext.set.union.v2.js");
-require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/esnext.typed-array.filter-reject.js");
 require("core-js/modules/esnext.typed-array.group-by.js");
 require("core-js/modules/esnext.typed-array.to-spliced.js");
@@ -195,8 +173,6 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
     (0, _defineProperty2["default"])(this, "enableObserveSystemSelectedMicrophoneChanged", false);
     (0, _defineProperty2["default"])(this, "_enableSystemSelectedMicrophonePolling", false);
     (0, _defineProperty2["default"])(this, "_systemSelectedMicrophonePolling", this._createSystemSelectedMicrophonePolling());
-    // 按 deviceId 维度管理摄像头采集状态，避免停止一个摄像头时影响其他摄像头的 preview
-    (0, _defineProperty2["default"])(this, "_cameraCapturingDeviceIds", new Set());
     // 摄像头捕获参数映射, key是deviceId
     (0, _defineProperty2["default"])(this, "_cameraCaptureParamsMapping", new Map());
     // 屏幕捕获参数映射, 屏幕共享需要区分屏幕和窗口，key的生成规则是deviceId_type, 例如：1_SCREEN, 1_WINDOW
@@ -222,7 +198,10 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "isCameraCapturing",
     get: function get() {
-      return this._cameraCapturingDeviceIds.size > 0;
+      var _this = this;
+      return this._cameraStateControl.sourceIdList.some(function (sourceId) {
+        return _this._cameraStateControl.getSourceCaptureEnabled(sourceId);
+      });
     }
 
     /**
@@ -231,7 +210,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "isCameraCapturingByDeviceId",
     value: function isCameraCapturingByDeviceId(deviceId) {
-      return this._cameraCapturingDeviceIds.has(deviceId);
+      return this._cameraStateControl.getSourceCaptureEnabled(deviceId);
     }
   }, {
     key: "addObserver",
@@ -256,7 +235,6 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       this._screenStateControl.release();
       this._windowStateControl.release();
       this._cameraPreviewTaskManager.release();
-      this._cameraCapturingDeviceIds.clear();
       return _constant.AgoraRtcErrorCode.SUCCESS;
     }
   }, {
@@ -350,13 +328,13 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "getWindowList",
     value: function getWindowList() {
-      var _this = this;
+      var _this2 = this;
       return new Promise(function (resolve) {
-        var windowList = _this._getFormattedScreenCaptureSourceInfo(_utils.defaultThumbSize, _utils.defaultWindowIconSize, _type2.AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeWindow);
+        var windowList = _this2._getFormattedScreenCaptureSourceInfo(_utils.defaultThumbSize, _utils.defaultWindowIconSize, _type2.AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeWindow);
         var windowIdList = windowList.map(function (win) {
           return win.id;
         });
-        var currentWindowId = _this._pickCurrentWindowId(windowIdList);
+        var currentWindowId = _this2._pickCurrentWindowId(windowIdList);
         windowList.forEach(function (win) {
           if (currentWindowId === win.id) {
             win.isCurrent = true;
@@ -368,9 +346,9 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "getDisplayList",
     value: function getDisplayList() {
-      var _this2 = this;
+      var _this3 = this;
       return new Promise(function (resolve) {
-        var displayList = _this2._getFormattedScreenCaptureSourceInfo(_utils.defaultThumbSize, _utils.defaultDisplayIconSize, _type2.AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeScreen);
+        var displayList = _this3._getFormattedScreenCaptureSourceInfo(_utils.defaultThumbSize, _utils.defaultDisplayIconSize, _type2.AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeScreen);
         resolve(displayList);
       });
     }
@@ -479,7 +457,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "setKeepAudioRecording",
     value: function setKeepAudioRecording(keepRecording) {
-      var _this3 = this;
+      var _this4 = this;
       var res = 0;
       if (keepRecording) {
         res = this._startRecordingDeviceCapture();
@@ -492,12 +470,12 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       this._microphoneStateControl.sourceIdList.forEach(function (sourceId) {
         if (res === 0) {
           if (keepRecording) {
-            _this3._microphoneStateControl.startSourceTest(sourceId);
+            _this4._microphoneStateControl.startSourceTest(sourceId);
           } else {
-            _this3._microphoneStateControl.stopSourceTest(sourceId);
+            _this4._microphoneStateControl.stopSourceTest(sourceId);
           }
         } else {
-          _this3._microphoneStateControl.occurSourceError(sourceId);
+          _this4._microphoneStateControl.occurSourceError(sourceId);
         }
       });
     }
@@ -666,7 +644,6 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       if (!sourceCaptureEnabled) {
         res = this._startCameraCapture(cameraDeviceId);
         if (res === 0) {
-          this._cameraCapturingDeviceIds.add(cameraDeviceId);
           this._cameraPreviewTaskManager.executeTasksBySourceId(cameraDeviceId);
         }
       }
@@ -691,9 +668,6 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       var res = 0;
       if (!isMediaCaptureTestingAndOpenEnabled && sourceCaptureEnabled) {
         res = this._stopCameraCapture(cameraDeviceId);
-        if (res === 0) {
-          this._cameraCapturingDeviceIds["delete"](cameraDeviceId);
-        }
       }
       if (res === 0) {
         if (isStopCameraTest) {
@@ -920,7 +894,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "_initializeDeviceList",
     value: function _initializeDeviceList() {
-      var _this4 = this;
+      var _this5 = this;
       this._cameraList = this._getCameraList();
       this._microphoneList = this._getMicrophoneList();
       var cameraList = Array.from(this._cameraList.values());
@@ -929,7 +903,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       this.observable.notifyObservers('onMicrophoneListAdded', microphoneList);
       this._getSystemSelectedUniqueDeviceId().then(function (deviceTag) {
         if (deviceTag) {
-          _this4._systemSelectedMicrophoneTag = deviceTag;
+          _this5._systemSelectedMicrophoneTag = deviceTag;
         }
       });
     }
@@ -1192,63 +1166,63 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "_createMicrophoneStateControlObserver",
     value: function _createMicrophoneStateControlObserver() {
-      var _this5 = this;
+      var _this6 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(deviceId, deviceStateEnabled) {
           var state = deviceStateEnabled ? _type.AgoraRtcMediaSourceState.OPEN : _type.AgoraRtcMediaSourceState.CLOSE;
           if (deviceStateEnabled) {
-            _this5.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
+            _this6.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
           } else {
-            _this5.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
+            _this6.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
           }
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(deviceId) {
-          _this5.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, _type.AgoraRtcMediaSourceState.ERROR);
+          _this6.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, _type.AgoraRtcMediaSourceState.ERROR);
         },
         onMicrophoneVolumeIndicationUpdated: function onMicrophoneVolumeIndicationUpdated(deviceId, volume) {
-          _this5.observable.notifyObservers('onMicrophoneVolumeIndicationUpdated', deviceId, volume);
+          _this6.observable.notifyObservers('onMicrophoneVolumeIndicationUpdated', deviceId, volume);
         }
       };
     }
   }, {
     key: "_createCameraStateControlObserver",
     value: function _createCameraStateControlObserver() {
-      var _this6 = this;
+      var _this7 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(sourceId, deviceStateEnabled) {
           var state = deviceStateEnabled ? _type.AgoraRtcMediaSourceState.OPEN : _type.AgoraRtcMediaSourceState.CLOSE;
-          _this6.observable.notifyObservers('onCameraStateUpdated', sourceId, state);
+          _this7.observable.notifyObservers('onCameraStateUpdated', sourceId, state);
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(sourceId) {
-          _this6.observable.notifyObservers('onCameraStateUpdated', sourceId, _type.AgoraRtcMediaSourceState.ERROR);
+          _this7.observable.notifyObservers('onCameraStateUpdated', sourceId, _type.AgoraRtcMediaSourceState.ERROR);
         }
       };
     }
   }, {
     key: "_createScreenStateControlObserver",
     value: function _createScreenStateControlObserver(type) {
-      var _this7 = this;
+      var _this8 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(sourceId, sourceStateEnabled) {
           var state = sourceStateEnabled ? _type.AgoraRtcMediaSourceState.OPEN : _type.AgoraRtcMediaSourceState.CLOSE;
-          _this7.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, state);
+          _this8.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, state);
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(sourceId) {
-          _this7.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, _type.AgoraRtcMediaSourceState.ERROR);
+          _this8.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, _type.AgoraRtcMediaSourceState.ERROR);
         }
       };
     }
   }, {
     key: "_createLoopbackStateControlObserver",
     value: function _createLoopbackStateControlObserver() {
-      var _this8 = this;
+      var _this9 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(sourceId, sourceStateEnabled) {
           var state = sourceStateEnabled ? _type.AgoraRtcMediaSourceState.OPEN : _type.AgoraRtcMediaSourceState.CLOSE;
-          _this8.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, state);
+          _this9.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, state);
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(sourceId) {
-          _this8.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, _type.AgoraRtcMediaSourceState.ERROR);
+          _this9.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, _type.AgoraRtcMediaSourceState.ERROR);
         }
       };
     }
@@ -1344,7 +1318,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "_updateMicrophoneDeviceList",
     value: function _updateMicrophoneDeviceList() {
-      var _this9 = this;
+      var _this0 = this;
       var audioRecordingDevices = this._audioDeviceManager.enumerateRecordingDevices();
       var oldMicList = this._microphoneList;
       var newMicList = new Map();
@@ -1361,7 +1335,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
           };
           newMicList.set(device.deviceId, deviceInfo);
           var deviceInfoString = "deviceName\uFF1A".concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceName, "  deviceId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceId, ", vendorId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.vendorId, ", productId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.productId);
-          _this9.logger.info("RecordingDevices deviceInfoString: ".concat(deviceInfoString));
+          _this0.logger.info("RecordingDevices deviceInfoString: ".concat(deviceInfoString));
         }
       });
       var _this$_getDeviceListC2 = this._getDeviceListChangedInfo({
@@ -1400,7 +1374,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "_handleScreenCaptureStateChanged",
     value: function _handleScreenCaptureStateChanged(callbackCaptureEnabled, type, isManualCloseScreenCapture) {
-      var _this0 = this;
+      var _this1 = this;
       var isScreen = type === _type.AgoraRtcScreenCaptureType.SCREEN;
       var screenStateControl = isScreen ? this._screenStateControl : this._windowStateControl;
       screenStateControl.mediaSourceIndexMapping.forEach(function (sourceIndex, sourceId) {
@@ -1412,7 +1386,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
         var isCloseSource = !callbackCaptureEnabled && sourceEnabledState;
         if (isCloseSource) {
           if (isManualCloseScreenCapture) {
-            _this0._stopScreenCaptureAndUnbindSource(sourceId, type);
+            _this1._stopScreenCaptureAndUnbindSource(sourceId, type);
           } else {
             screenStateControl.closeSource(sourceId);
             screenStateControl.unbindSourceIdToSourceIndex(sourceId);
@@ -1451,15 +1425,11 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       if (storageCaptureDisabled && callbackCaptureEnabled) {
         this.logger.info("_handleCameraVideoStateChanged stopCameraCaptureAndUnbindSource sourceId: ".concat(targetDeviceId));
         var res = this._stopCameraCapture(targetDeviceId);
-        if (res === 0) {
-          this._cameraCapturingDeviceIds["delete"](targetDeviceId);
-        }
       }
       if (storageCaptureEnabled && (isErrorState || isCloseReason)) {
         this.logger.info("_handleCameraVideoStateChanged occurSourceError sourceId: ".concat(targetDeviceId));
         this._cameraStateControl.unbindSourceIdToSourceIndex(targetDeviceId);
         this._cameraStateControl.occurSourceError(targetDeviceId);
-        this._cameraCapturingDeviceIds["delete"](targetDeviceId);
       }
     }
   }, {

package/lib-es/core/rtc/publish-pool.js

@@ -27,7 +27,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _AgoraRtcStreamPublishPool;
-var _initProto, _publishAudioDecs, _updateVideoSourceDecs, _updateAudioSourceDecs, _unpublishVideoDecs, _unpublishAudioDecs, _ref;
+var _initProto, _publishVideoDecs, _publishAudioDecs, _updateVideoSourceDecs, _updateAudioSourceDecs, _unpublishVideoDecs, _unpublishAudioDecs, _ref;
 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; }
@@ -57,7 +57,7 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 import { AgoraObservable, trace } from '../../imports';
 import { AgoraRtcErrorCode } from '../../constant';
-_ref = (_publishAudioDecs = trace(['token', 'streamId', 'sourceId', 'type', 'state']), _updateVideoSourceDecs = trace(['sourceId', 'type', 'state']), _updateAudioSourceDecs = trace(['sourceId', 'type', 'state']), _unpublishVideoDecs = trace(['streamId', 'type']), _unpublishAudioDecs = trace(['streamId', 'type']), "observable");
+_ref = (_publishVideoDecs = trace(['token', 'streamId', 'sourceId', 'type', 'state']), _publishAudioDecs = trace(['token', 'streamId', 'sourceId', 'type', 'state']), _updateVideoSourceDecs = trace(['sourceId', 'type', 'state']), _updateAudioSourceDecs = trace(['sourceId', 'type', 'state']), _unpublishVideoDecs = trace(['streamId', 'type']), _unpublishAudioDecs = trace(['streamId', 'type']), "observable");
 export var AgoraRtcStreamPublishPool = /*#__PURE__*/function () {
   function AgoraRtcStreamPublishPool() {
     _classCallCheck(this, AgoraRtcStreamPublishPool);
@@ -286,7 +286,7 @@ export var AgoraRtcStreamPublishPool = /*#__PURE__*/function () {
   }]);
 }();
 _AgoraRtcStreamPublishPool = AgoraRtcStreamPublishPool;
-var _applyDecs$e = _applyDecs(_AgoraRtcStreamPublishPool, [[_publishAudioDecs, 2, "publishAudio"], [_updateVideoSourceDecs, 2, "updateVideoSource"], [_updateAudioSourceDecs, 2, "updateAudioSource"], [_unpublishVideoDecs, 2, "unpublishVideo"], [_unpublishAudioDecs, 2, "unpublishAudio"]], []).e;
+var _applyDecs$e = _applyDecs(_AgoraRtcStreamPublishPool, [[_publishVideoDecs, 2, "publishVideo"], [_publishAudioDecs, 2, "publishAudio"], [_updateVideoSourceDecs, 2, "updateVideoSource"], [_updateAudioSourceDecs, 2, "updateAudioSource"], [_unpublishVideoDecs, 2, "unpublishVideo"], [_unpublishAudioDecs, 2, "unpublishAudio"]], []).e;
 var _applyDecs$e2 = _slicedToArray(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib-es/plugin/rtc/electron/camera-preview-task-manager.js

@@ -101,7 +101,7 @@ export var CameraPreviewTaskManager = /*#__PURE__*/function () {
     key: "executeTasksBySourceId",
     value: function executeTasksBySourceId(sourceId) {
       if (this.taskMap.size === 0) {
-        return;
+        return false;
       }
       var executed = [];
       var _iterator2 = _createForOfIteratorHelper(this.taskMap),
@@ -125,6 +125,7 @@ export var CameraPreviewTaskManager = /*#__PURE__*/function () {
         var view = _executed[_i];
         this.taskMap["delete"](view);
       }
+      return true;
     }
   }, {
     key: "getTaskOptions",

package/lib-es/plugin/rtc/electron/client.js

@@ -403,6 +403,9 @@ export var AgoraRtcClientImpl = /*#__PURE__*/function (_AgoraRtcClient) {
         sourceManager: this.sourceManager,
         canvasTagPool: this.canvasTagPool
       };
+
+      // 在RTC SDK先调用 prview 再开采集会导致render异常。
+      // 所以需要保存在_cameraPreviewTaskManager 中，在采集开启的时候开始render
       if (this._sourceManager.isCameraCapturingByDeviceId(deviceId)) {
         return startVideoRender(videoRenderParams, this.logger);
       } else {
@@ -923,7 +926,7 @@ export var AgoraRtcClientImpl = /*#__PURE__*/function (_AgoraRtcClient) {
             case 4:
               _context.prev = 4;
               _t = _context["catch"](2);
-              this.logger.error('failed to install AgoraALD for macOS');
+              this.logger.error("failed to install AgoraALD for macOS: ".concat(JSON.stringify(_t)));
             case 5:
             case "end":
               return _context.stop();

package/lib-es/plugin/rtc/electron/downloadALD.js

@@ -127,9 +127,14 @@ function _installAgoraALD() {
           return downloadFile(encodeURI(ALD_URL), tempZipPath);
         case 1:
           logger.info("[AgoraAld-Downloader]finished download ald zip to: ".concat(tempZipPath));
-          // temp 文件重命名为 zip
-          fs.renameSync(tempZipPath, zipPath);
-          logger.info("[AgoraAld-Downloader] rename to: ".concat(zipPath));
+          if (getSpecificFiles(zipCacheDir, zipExtensions, zipFileName).length <= 0) {
+            // temp 文件重命名为 zip
+            fs.renameSync(tempZipPath, zipPath);
+            logger.info("[AgoraAld-Downloader] rename to: ".concat(zipPath));
+          } else {
+            // 下载文件是异步的操作, 可能在下载过程中 zip 已经存在了, 这种情况不再需要将下载的文件重命名
+            logger.info("[AgoraAld-Downloader] ald zip already exists: ".concat(zipPath));
+          }
         case 2:
           zipData = fs.readFileSync(zipPath);
           logger.info('[AgoraAld-Downloader] start read zip data');

package/lib-es/plugin/rtc/electron/publish-pool.js

@@ -111,12 +111,12 @@ export var AgoraElectronRtcStreamPublishPoolImpl = /*#__PURE__*/function (_Agora
   }, {
     key: "shouldNotifyUpdate",
     value: function shouldNotifyUpdate(item) {
+      // Keep cached media options in sync even while paused so resume uses fresh state.
+      var channelMediaOptions = this._convertChannelMediaOptions(item);
+      item.mediaOptions = channelMediaOptions;
       if (this._isPaused) {
         return false;
       }
-      // Calculate new media options based on updated item state
-      var channelMediaOptions = this._convertChannelMediaOptions(item);
-      item.mediaOptions = channelMediaOptions;
       return this._checkIfNeedNotifyUpdate(channelMediaOptions, this._oldMediaOptions);
     }
   }, {

package/lib-es/plugin/rtc/electron/publisher.js

@@ -191,7 +191,7 @@ export var AgoraRtcChannelPublisherImpl = /*#__PURE__*/function () {
           mediaOptions.publishMicrophoneTrack = true;
         }
         var audioSourceType = item.audioSourceType && _defineProperty(_defineProperty({}, AgoraRtcAudioSourceType.MICROPHONE, 'microphone'), AgoraRtcAudioSourceType.LOOPBACK, 'loopback')[item.audioSourceType] || 'video';
-        _this.logger.info("rtcEngine updateChannelMediaOptionsEx for ".concat(audioSourceType, ", mediaOptions: ").concat(JSON.stringify(mediaOptions), ", connection: ").concat(JSON.stringify(item.connection)));
+        _this.logger.info("rtcEngine updateChannelMediaOptionsEx for ".concat(audioSourceType, ", mediaOptions: ").concat(JSON.stringify(mediaOptions), ", item.mediaOptions: ").concat(JSON.stringify(item.mediaOptions), ", connection: ").concat(JSON.stringify(item.connection)));
         _this._rtcEngine.updateChannelMediaOptionsEx(mediaOptions, item.connection);
 
         // handle microphone
@@ -530,8 +530,11 @@ export var AgoraRtcChannelPublisherImpl = /*#__PURE__*/function () {
       var isScreenStream = false;
       var highStreamConfig = this._bindStreamConfig(isScreenStream, AgoraRtcStreamLayer.HIGH, this._defaultCameraHighVideoEncoderConfig);
       var lowStreamConfig = this._bindStreamConfig(isScreenStream, AgoraRtcStreamLayer.LOW, this._defaultCameraLowVideoEncoderConfig);
-      this._videoStreamConfigs.set(connection.localUid.toString(), highStreamConfig);
-      this._videoStreamConfigs.set(connection.localUid.toString(), lowStreamConfig);
+      // 合并 high 和 low 的结果，只 set 一次避免后者覆盖前者造成可读性问题
+      this._videoStreamConfigs.set(connection.localUid.toString(), {
+        highVideoEncoderConfig: highStreamConfig.highVideoEncoderConfig,
+        lowVideoEncoderConfig: lowStreamConfig.lowVideoEncoderConfig
+      });
       return AgoraRtcErrorCode.SUCCESS;
     }
   }, {

package/lib-es/plugin/rtc/electron/source-manager.js

@@ -27,6 +27,7 @@ import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.array.map.js";
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/es.array.slice.js";
+import "core-js/modules/es.array.some.js";
 import "core-js/modules/es.array-buffer.constructor.js";
 import "core-js/modules/es.array-buffer.slice.js";
 import "core-js/modules/es.data-view.js";
@@ -47,7 +48,6 @@ import "core-js/modules/es.promise.js";
 import "core-js/modules/es.regexp.exec.js";
 import "core-js/modules/es.regexp.test.js";
 import "core-js/modules/es.regexp.to-string.js";
-import "core-js/modules/es.set.js";
 import "core-js/modules/es.string.includes.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/es.typed-array.uint8-array.js";
@@ -89,6 +89,7 @@ import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/esnext.iterator.some.js";
 import "core-js/modules/esnext.map.delete-all.js";
 import "core-js/modules/esnext.map.emplace.js";
 import "core-js/modules/esnext.map.every.js";
@@ -103,29 +104,6 @@ import "core-js/modules/esnext.map.merge.js";
 import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
-import "core-js/modules/esnext.set.add-all.js";
-import "core-js/modules/esnext.set.delete-all.js";
-import "core-js/modules/esnext.set.difference.v2.js";
-import "core-js/modules/esnext.set.difference.js";
-import "core-js/modules/esnext.set.every.js";
-import "core-js/modules/esnext.set.filter.js";
-import "core-js/modules/esnext.set.find.js";
-import "core-js/modules/esnext.set.intersection.v2.js";
-import "core-js/modules/esnext.set.intersection.js";
-import "core-js/modules/esnext.set.is-disjoint-from.v2.js";
-import "core-js/modules/esnext.set.is-disjoint-from.js";
-import "core-js/modules/esnext.set.is-subset-of.v2.js";
-import "core-js/modules/esnext.set.is-subset-of.js";
-import "core-js/modules/esnext.set.is-superset-of.v2.js";
-import "core-js/modules/esnext.set.is-superset-of.js";
-import "core-js/modules/esnext.set.join.js";
-import "core-js/modules/esnext.set.map.js";
-import "core-js/modules/esnext.set.reduce.js";
-import "core-js/modules/esnext.set.some.js";
-import "core-js/modules/esnext.set.symmetric-difference.v2.js";
-import "core-js/modules/esnext.set.symmetric-difference.js";
-import "core-js/modules/esnext.set.union.v2.js";
-import "core-js/modules/esnext.set.union.js";
 import "core-js/modules/esnext.symbol.metadata.js";
 import "core-js/modules/esnext.typed-array.filter-reject.js";
 import "core-js/modules/esnext.typed-array.group-by.js";
@@ -188,8 +166,6 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
     _defineProperty(this, "enableObserveSystemSelectedMicrophoneChanged", false);
     _defineProperty(this, "_enableSystemSelectedMicrophonePolling", false);
     _defineProperty(this, "_systemSelectedMicrophonePolling", this._createSystemSelectedMicrophonePolling());
-    // 按 deviceId 维度管理摄像头采集状态，避免停止一个摄像头时影响其他摄像头的 preview
-    _defineProperty(this, "_cameraCapturingDeviceIds", new Set());
     // 摄像头捕获参数映射, key是deviceId
     _defineProperty(this, "_cameraCaptureParamsMapping", new Map());
     // 屏幕捕获参数映射, 屏幕共享需要区分屏幕和窗口，key的生成规则是deviceId_type, 例如：1_SCREEN, 1_WINDOW
@@ -215,7 +191,10 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "isCameraCapturing",
     get: function get() {
-      return this._cameraCapturingDeviceIds.size > 0;
+      var _this = this;
+      return this._cameraStateControl.sourceIdList.some(function (sourceId) {
+        return _this._cameraStateControl.getSourceCaptureEnabled(sourceId);
+      });
     }
 
     /**
@@ -224,7 +203,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "isCameraCapturingByDeviceId",
     value: function isCameraCapturingByDeviceId(deviceId) {
-      return this._cameraCapturingDeviceIds.has(deviceId);
+      return this._cameraStateControl.getSourceCaptureEnabled(deviceId);
     }
   }, {
     key: "addObserver",
@@ -249,7 +228,6 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
       this._screenStateControl.release();
       this._windowStateControl.release();
       this._cameraPreviewTaskManager.release();
-      this._cameraCapturingDeviceIds.clear();
       return AgoraRtcErrorCode.SUCCESS;
     }
   }, {
@@ -343,13 +321,13 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "getWindowList",
     value: function getWindowList() {
-      var _this = this;
+      var _this2 = this;
       return new Promise(function (resolve) {
-        var windowList = _this._getFormattedScreenCaptureSourceInfo(defaultThumbSize, defaultWindowIconSize, AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeWindow);
+        var windowList = _this2._getFormattedScreenCaptureSourceInfo(defaultThumbSize, defaultWindowIconSize, AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeWindow);
         var windowIdList = windowList.map(function (win) {
           return win.id;
         });
-        var currentWindowId = _this._pickCurrentWindowId(windowIdList);
+        var currentWindowId = _this2._pickCurrentWindowId(windowIdList);
         windowList.forEach(function (win) {
           if (currentWindowId === win.id) {
             win.isCurrent = true;
@@ -361,9 +339,9 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "getDisplayList",
     value: function getDisplayList() {
-      var _this2 = this;
+      var _this3 = this;
       return new Promise(function (resolve) {
-        var displayList = _this2._getFormattedScreenCaptureSourceInfo(defaultThumbSize, defaultDisplayIconSize, AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeScreen);
+        var displayList = _this3._getFormattedScreenCaptureSourceInfo(defaultThumbSize, defaultDisplayIconSize, AgoraElectronScreenCaptureSourceType.ScreencapturesourcetypeScreen);
         resolve(displayList);
       });
     }
@@ -472,7 +450,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "setKeepAudioRecording",
     value: function setKeepAudioRecording(keepRecording) {
-      var _this3 = this;
+      var _this4 = this;
       var res = 0;
       if (keepRecording) {
         res = this._startRecordingDeviceCapture();
@@ -485,12 +463,12 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
       this._microphoneStateControl.sourceIdList.forEach(function (sourceId) {
         if (res === 0) {
           if (keepRecording) {
-            _this3._microphoneStateControl.startSourceTest(sourceId);
+            _this4._microphoneStateControl.startSourceTest(sourceId);
           } else {
-            _this3._microphoneStateControl.stopSourceTest(sourceId);
+            _this4._microphoneStateControl.stopSourceTest(sourceId);
           }
         } else {
-          _this3._microphoneStateControl.occurSourceError(sourceId);
+          _this4._microphoneStateControl.occurSourceError(sourceId);
         }
       });
     }
@@ -659,7 +637,6 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
       if (!sourceCaptureEnabled) {
         res = this._startCameraCapture(cameraDeviceId);
         if (res === 0) {
-          this._cameraCapturingDeviceIds.add(cameraDeviceId);
           this._cameraPreviewTaskManager.executeTasksBySourceId(cameraDeviceId);
         }
       }
@@ -684,9 +661,6 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
       var res = 0;
       if (!isMediaCaptureTestingAndOpenEnabled && sourceCaptureEnabled) {
         res = this._stopCameraCapture(cameraDeviceId);
-        if (res === 0) {
-          this._cameraCapturingDeviceIds["delete"](cameraDeviceId);
-        }
       }
       if (res === 0) {
         if (isStopCameraTest) {
@@ -913,7 +887,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "_initializeDeviceList",
     value: function _initializeDeviceList() {
-      var _this4 = this;
+      var _this5 = this;
       this._cameraList = this._getCameraList();
       this._microphoneList = this._getMicrophoneList();
       var cameraList = Array.from(this._cameraList.values());
@@ -922,7 +896,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
       this.observable.notifyObservers('onMicrophoneListAdded', microphoneList);
       this._getSystemSelectedUniqueDeviceId().then(function (deviceTag) {
         if (deviceTag) {
-          _this4._systemSelectedMicrophoneTag = deviceTag;
+          _this5._systemSelectedMicrophoneTag = deviceTag;
         }
       });
     }
@@ -1185,63 +1159,63 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "_createMicrophoneStateControlObserver",
     value: function _createMicrophoneStateControlObserver() {
-      var _this5 = this;
+      var _this6 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(deviceId, deviceStateEnabled) {
           var state = deviceStateEnabled ? AgoraRtcMediaSourceState.OPEN : AgoraRtcMediaSourceState.CLOSE;
           if (deviceStateEnabled) {
-            _this5.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
+            _this6.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
           } else {
-            _this5.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
+            _this6.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, state);
           }
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(deviceId) {
-          _this5.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, AgoraRtcMediaSourceState.ERROR);
+          _this6.observable.notifyObservers('onMicrophoneStateUpdated', deviceId, AgoraRtcMediaSourceState.ERROR);
         },
         onMicrophoneVolumeIndicationUpdated: function onMicrophoneVolumeIndicationUpdated(deviceId, volume) {
-          _this5.observable.notifyObservers('onMicrophoneVolumeIndicationUpdated', deviceId, volume);
+          _this6.observable.notifyObservers('onMicrophoneVolumeIndicationUpdated', deviceId, volume);
         }
       };
     }
   }, {
     key: "_createCameraStateControlObserver",
     value: function _createCameraStateControlObserver() {
-      var _this6 = this;
+      var _this7 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(sourceId, deviceStateEnabled) {
           var state = deviceStateEnabled ? AgoraRtcMediaSourceState.OPEN : AgoraRtcMediaSourceState.CLOSE;
-          _this6.observable.notifyObservers('onCameraStateUpdated', sourceId, state);
+          _this7.observable.notifyObservers('onCameraStateUpdated', sourceId, state);
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(sourceId) {
-          _this6.observable.notifyObservers('onCameraStateUpdated', sourceId, AgoraRtcMediaSourceState.ERROR);
+          _this7.observable.notifyObservers('onCameraStateUpdated', sourceId, AgoraRtcMediaSourceState.ERROR);
         }
       };
     }
   }, {
     key: "_createScreenStateControlObserver",
     value: function _createScreenStateControlObserver(type) {
-      var _this7 = this;
+      var _this8 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(sourceId, sourceStateEnabled) {
           var state = sourceStateEnabled ? AgoraRtcMediaSourceState.OPEN : AgoraRtcMediaSourceState.CLOSE;
-          _this7.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, state);
+          _this8.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, state);
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(sourceId) {
-          _this7.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, AgoraRtcMediaSourceState.ERROR);
+          _this8.observable.notifyObservers('onScreenCaptureStateUpdated', sourceId, type, AgoraRtcMediaSourceState.ERROR);
         }
       };
     }
   }, {
     key: "_createLoopbackStateControlObserver",
     value: function _createLoopbackStateControlObserver() {
-      var _this8 = this;
+      var _this9 = this;
       return {
         onSourceStateUpdated: function onSourceStateUpdated(sourceId, sourceStateEnabled) {
           var state = sourceStateEnabled ? AgoraRtcMediaSourceState.OPEN : AgoraRtcMediaSourceState.CLOSE;
-          _this8.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, state);
+          _this9.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, state);
         },
         onSourceErrorOccurred: function onSourceErrorOccurred(sourceId) {
-          _this8.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, AgoraRtcMediaSourceState.ERROR);
+          _this9.observable.notifyObservers('onLoopbackRecordingStateUpdated', sourceId, AgoraRtcMediaSourceState.ERROR);
         }
       };
     }
@@ -1337,7 +1311,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "_updateMicrophoneDeviceList",
     value: function _updateMicrophoneDeviceList() {
-      var _this9 = this;
+      var _this0 = this;
       var audioRecordingDevices = this._audioDeviceManager.enumerateRecordingDevices();
       var oldMicList = this._microphoneList;
       var newMicList = new Map();
@@ -1354,7 +1328,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
           };
           newMicList.set(device.deviceId, deviceInfo);
           var deviceInfoString = "deviceName\uFF1A".concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceName, "  deviceId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceId, ", vendorId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.vendorId, ", productId: ").concat(deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.productId);
-          _this9.logger.info("RecordingDevices deviceInfoString: ".concat(deviceInfoString));
+          _this0.logger.info("RecordingDevices deviceInfoString: ".concat(deviceInfoString));
         }
       });
       var _this$_getDeviceListC2 = this._getDeviceListChangedInfo({
@@ -1393,7 +1367,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
   }, {
     key: "_handleScreenCaptureStateChanged",
     value: function _handleScreenCaptureStateChanged(callbackCaptureEnabled, type, isManualCloseScreenCapture) {
-      var _this0 = this;
+      var _this1 = this;
       var isScreen = type === AgoraRtcScreenCaptureType.SCREEN;
       var screenStateControl = isScreen ? this._screenStateControl : this._windowStateControl;
       screenStateControl.mediaSourceIndexMapping.forEach(function (sourceIndex, sourceId) {
@@ -1405,7 +1379,7 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
         var isCloseSource = !callbackCaptureEnabled && sourceEnabledState;
         if (isCloseSource) {
           if (isManualCloseScreenCapture) {
-            _this0._stopScreenCaptureAndUnbindSource(sourceId, type);
+            _this1._stopScreenCaptureAndUnbindSource(sourceId, type);
           } else {
             screenStateControl.closeSource(sourceId);
             screenStateControl.unbindSourceIdToSourceIndex(sourceId);
@@ -1444,15 +1418,11 @@ export var AgoraRtcSourceManagerImpl = /*#__PURE__*/function () {
       if (storageCaptureDisabled && callbackCaptureEnabled) {
         this.logger.info("_handleCameraVideoStateChanged stopCameraCaptureAndUnbindSource sourceId: ".concat(targetDeviceId));
         var res = this._stopCameraCapture(targetDeviceId);
-        if (res === 0) {
-          this._cameraCapturingDeviceIds["delete"](targetDeviceId);
-        }
       }
       if (storageCaptureEnabled && (isErrorState || isCloseReason)) {
         this.logger.info("_handleCameraVideoStateChanged occurSourceError sourceId: ".concat(targetDeviceId));
         this._cameraStateControl.unbindSourceIdToSourceIndex(targetDeviceId);
         this._cameraStateControl.occurSourceError(targetDeviceId);
-        this._cameraCapturingDeviceIds["delete"](targetDeviceId);
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-rte-sdk",
-  "version": "3.10.1-rc.2",
+  "version": "3.10.2",
   "description": "SDK for building interactive scenarios",
   "author": "agora.io",
   "license": "ISC",
@@ -29,7 +29,7 @@
     "@types/sinon": "^17.0.2",
     "@types/ua-parser-js": "^0.7.35",
     "agora-token": "^2.0.3",
-    "agora-toolchain": "3.10.1-rc.2",
+    "agora-toolchain": "3.10.2",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",
@@ -44,7 +44,7 @@
     "agora-extension-ai-denoiser": "^1.0.0",
     "agora-extension-beauty-effect": "^1.0.1-beta",
     "agora-extension-virtual-background": "^2.1.0",
-    "agora-foundation": "3.10.1-rc.2",
+    "agora-foundation": "3.10.2",
     "agora-rtc-sdk-ng": "4.23.3",
     "agora-rtm": "2.2.2-3",
     "await-to-js": "^3.0.0",