agora-rte-sdk 3.7.0 → 3.7.2

package/lib/core/processor/message-handler.d.ts

@@ -27,7 +27,7 @@ export declare class AgoraRteMessageHandle {
         onRemoteUsersRemoved: (removedUsers: AgoraRteSequenceMessageOutUser[], removedStreamsData: AgoraRteMediaStreamInfo[]) => void;
         onLocalUserRemoved: (user: AgoraRteSequenceMessageOutUser) => void;
         onLocalUserAdded: (user: AgoraRteSequenceMessageInUser) => void;
-        onUserSubscribe: (subscribeUsers: AgoraRteUserInfo[], operator: AgoraRteUserInfo, cause?: import("./type").AgoraRteOperatCause) => void;
+        onUserSubscribe: (subscribeUsers: AgoraRteUserInfo[], addedStreamsData: AgoraRteMediaStreamInfo[], operator: AgoraRteUserInfo, cause?: import("./type").AgoraRteOperatCause) => void;
         onUserUnsubscribe: (unsubscribeUsers: AgoraRteUserInfo[], removedStreamsData: AgoraRteMediaStreamInfo[], operator: AgoraRteUserInfo, cause?: import("./type").AgoraRteOperatCause) => void;
         onUserCountUpdated: (total: number) => void;
         onUserPropertyUpdated: (userUuid: string, userProperties: Record<string, unknown>, operator: AgoraRteUserInfo, cause?: import("./type").AgoraRteOperatCause) => void;

package/lib/core/processor/message-handler.js

@@ -437,6 +437,7 @@ var AgoraRteMessageHandle = exports.AgoraRteMessageHandle = /*#__PURE__*/functio
         cause = data.cause;
       var subscribeUsersData = [];
       var unsubscribeUsersData = [];
+      var addedStreamsData = [];
       var removedStreamsData = [];
       users.forEach(function (u) {
         var user;
@@ -452,6 +453,9 @@ var AgoraRteMessageHandle = exports.AgoraRteMessageHandle = /*#__PURE__*/functio
             streams = _u$streams === void 0 ? [] : _u$streams;
           streams.forEach(function (streamData) {
             var stream = _struct.AgoraRteMediaStream.fromData(streamData, user);
+            if (!_this4._dataStore.findStream(stream.streamId)) {
+              addedStreamsData.push(stream);
+            }
             _this4._dataStore.setStream(stream.streamId, stream);
           });
           subscribeUsersData.push(user);
@@ -474,7 +478,7 @@ var AgoraRteMessageHandle = exports.AgoraRteMessageHandle = /*#__PURE__*/functio
         }
       });
       if (subscribeUsersData.length > 0) {
-        this.observable.notifyObservers('onUserSubscribe', subscribeUsersData,
+        this.observable.notifyObservers('onUserSubscribe', subscribeUsersData, addedStreamsData,
         // FIXME: get real connector
         _type2.AgoraRteUser.fromSeqData(_objectSpread({}, operator)), cause);
       }
@@ -605,7 +609,9 @@ var AgoraRteMessageHandle = exports.AgoraRteMessageHandle = /*#__PURE__*/functio
         var user = this._dataStore.findUser(currentUserOnline.userUuid);
         if (user && user.userRole !== currentUserOnline.role) {
           user.userRole = currentUserOnline.role;
-          this.observable.notifyObservers('onUserSubscribe', [user], _type2.AgoraRteUser.fromSeqData(currentUserOnline));
+          var users = [user];
+          var streams = [];
+          this.observable.notifyObservers('onUserSubscribe', users, streams, _type2.AgoraRteUser.fromSeqData(currentUserOnline));
         }
         this.observable.notifyObservers('onLocalUserAdded', currentUserOnline);
       }

package/lib/core/processor/type.d.ts

@@ -136,7 +136,7 @@ export type AgoraRteMessageHandlerObserver = Partial<{
     onRemoteUsersRemoved: (removedUsers: AgoraRteSequenceMessageOutUser[], removedStreamsData: AgoraRteMediaStreamInfo[]) => void;
     onLocalUserRemoved: (user: AgoraRteSequenceMessageOutUser) => void;
     onLocalUserAdded: (user: AgoraRteSequenceMessageInUser) => void;
-    onUserSubscribe: (subscribeUsers: AgoraRteUserInfo[], operator: AgoraRteUserInfo, cause?: AgoraRteOperatCause) => void;
+    onUserSubscribe: (subscribeUsers: AgoraRteUserInfo[], addedStreamsData: AgoraRteMediaStreamInfo[], operator: AgoraRteUserInfo, cause?: AgoraRteOperatCause) => void;
     onUserUnsubscribe: (unsubscribeUsers: AgoraRteUserInfo[], removedStreamsData: AgoraRteMediaStreamInfo[], operator: AgoraRteUserInfo, cause?: AgoraRteOperatCause) => void;
     onUserCountUpdated: (total: number) => void;
     onUserPropertyUpdated: (userUuid: string, userProperties: Record<string, unknown>, operator: AgoraRteUserInfo, cause?: AgoraRteOperatCause) => void;

package/lib/core/scene/index.js

@@ -1209,7 +1209,7 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
             cause: cause
           });
         },
-        onUserSubscribe: function onUserSubscribe(users, operator, cause) {
+        onUserSubscribe: function onUserSubscribe(users, addedStreams, operator, cause) {
           users.forEach(function (user) {
             _this9.logger.info("[AgoraRteScene] sceneId:".concat(_this9.sceneId, " user-updated ").concat(user.userId));
             _this9.observable.notifyObservers('onUserUpdated', _this9.sceneId, {
@@ -1218,9 +1218,16 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
               reason: _type.AgoraRteUserUpdatedReason.ROLE,
               cause: cause
             });
+            if (addedStreams.length > 0) {
+              _this9.observable.notifyObservers('onStreamsAdded', _this9.sceneId, addedStreams.map(function (s) {
+                return {
+                  modifiedStream: s
+                };
+              }));
+            }
           });
         },
-        onUserUnsubscribe: function onUserUnsubscribe(users, _, operator, cause) {
+        onUserUnsubscribe: function onUserUnsubscribe(users, removedStreams, operator, cause) {
           users.forEach(function (user) {
             _this9.logger.info("sceneId:".concat(_this9.sceneId, " user-updated ").concat(user));
             _this9.observable.notifyObservers('onUserUpdated', _this9.sceneId, {
@@ -1229,6 +1236,13 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
               reason: _type.AgoraRteUserUpdatedReason.ROLE,
               cause: cause
             });
+            if (removedStreams.length > 0) {
+              _this9.observable.notifyObservers('onStreamsRemoved', _this9.sceneId, removedStreams.map(function (s) {
+                return {
+                  modifiedStream: s
+                };
+              }));
+            }
           });
         },
         onRemoteUsersRemoved: function onRemoteUsersRemoved(users, removedStreams) {
@@ -1493,11 +1507,13 @@ var AgoraRteScene = exports.AgoraRteScene = /*#__PURE__*/function () {
   }, {
     key: "_handleRemoteUserRemoved",
     value: function _handleRemoteUserRemoved(users, removedStreams) {
-      this.observable.notifyObservers('onStreamsRemoved', this.sceneId, removedStreams.map(function (s) {
-        return {
-          modifiedStream: s
-        };
-      }));
+      if (removedStreams.length > 0) {
+        this.observable.notifyObservers('onStreamsRemoved', this.sceneId, removedStreams.map(function (s) {
+          return {
+            modifiedStream: s
+          };
+        }));
+      }
       var eventUsers = users.map(function (u) {
         return {
           userInfo: _type.AgoraRteUser.fromSeqData(u),

package/lib/plugin/rtc/electron/client.d.ts

@@ -61,4 +61,7 @@ export declare class AgoraRtcClientImpl extends AgoraRtcClient {
     private _handleVolumeIndication;
     private _handleTestVolume;
     private _stripPort;
+    private _createSystemSelectedDevicePolling;
+    private _getSystemSelectedUniqueDeviceId;
+    private _getSystemSelectedSpeaker;
 }

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

@@ -87,6 +87,8 @@ var _dowloadALD = require("./dowloadALD");
 var _logger = require("../../../core/utilities/logger");
 var _parameters2 = require("../../../core/utilities/parameters");
 var _constant = require("../../../constant");
+var _schedule = require("agora-foundation/lib/schedule");
+var _scheduler = require("agora-foundation/lib/schedule/scheduler");
 var _excluded = ["screen"];
 var _AgoraRtcClientImpl;
 var _initProto;
@@ -107,6 +109,8 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
       prefix: 'AgoraRtcClientImpl'
     })));
     // @internal
+    (0, _defineProperty2["default"])(_this, "_taskInterval", _scheduler.Duration.second(1));
+    // @internal
     (0, _defineProperty2["default"])(_this, "_mainParameters", '');
     //@internal
     (0, _defineProperty2["default"])(_this, "_speakerList", new Map());
@@ -245,7 +249,7 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
         _this._speakerList.set(device.deviceId, deviceInfo);
       }
     });
-    _this.getSystemSelectedSpeaker().then(function (deviceInfo) {
+    _this._getSystemSelectedSpeaker().then(function (deviceInfo) {
       if (deviceInfo) {
         _this._systemSelectedSpeakerDeviceId = deviceInfo.deviceId;
       }
@@ -301,77 +305,49 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
     key: "_handleAudioDeviceChanged",
     value: function () {
       var _handleAudioDeviceChanged2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(deviceId, deviceType, deviceState) {
-        var audioPlaybackDevices, oldSpeakerList, newSpeakerList, _diffMap, addedList, removedList, deviceInfoList, _deviceInfoList, deviceInfo;
+        var audioPlaybackDevices, oldSpeakerList, newSpeakerList, _diffMap, addedList, removedList, deviceInfoList, _deviceInfoList;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(deviceType === 0 /* playback devices */)) {
-                _context3.next = 4;
-                break;
-              }
-              audioPlaybackDevices = this._rtcEngine.getAudioDeviceManager().enumeratePlaybackDevices();
-              oldSpeakerList = this._speakerList;
-              newSpeakerList = new Map();
-              this._speakerList = newSpeakerList;
-              audioPlaybackDevices.forEach(function (device) {
-                if (device.deviceId && device.deviceName) {
-                  var deviceInfo = {
-                    deviceId: device.deviceId,
-                    deviceName: device.deviceName
-                  };
-                  newSpeakerList.set(device.deviceId, deviceInfo);
-                }
-              });
-              _diffMap = (0, _utils.diffMap)(oldSpeakerList, newSpeakerList), addedList = _diffMap.addedList, removedList = _diffMap.removedList;
-              if (addedList.length > 0) {
-                deviceInfoList = addedList.map(function (deviceId) {
-                  var _newSpeakerList$get;
-                  return {
-                    deviceId: deviceId,
-                    deviceName: ((_newSpeakerList$get = newSpeakerList.get(deviceId)) === null || _newSpeakerList$get === void 0 ? void 0 : _newSpeakerList$get.deviceName) || ''
-                  };
-                });
-                this.rtcClientObservable.notifyObservers('onSpeakerListAdded', deviceInfoList);
-              }
-              if (removedList.length > 0) {
-                _deviceInfoList = removedList.map(function (deviceId) {
-                  var _oldSpeakerList$get;
-                  return {
-                    deviceId: deviceId,
-                    deviceName: ((_oldSpeakerList$get = oldSpeakerList.get(deviceId)) === null || _oldSpeakerList$get === void 0 ? void 0 : _oldSpeakerList$get.deviceName) || ''
-                  };
+              if (deviceType === 0 /* playback devices */) {
+                audioPlaybackDevices = this._rtcEngine.getAudioDeviceManager().enumeratePlaybackDevices();
+                oldSpeakerList = this._speakerList;
+                newSpeakerList = new Map();
+                this._speakerList = newSpeakerList;
+                audioPlaybackDevices.forEach(function (device) {
+                  if (device.deviceId && device.deviceName) {
+                    var deviceInfo = {
+                      deviceId: device.deviceId,
+                      deviceName: device.deviceName
+                    };
+                    newSpeakerList.set(device.deviceId, deviceInfo);
+                  }
                 });
-                this.rtcClientObservable.notifyObservers('onSpeakerListRemoved', _deviceInfoList);
-              }
-              if (!([0, 1].includes(deviceState) && this._systemSpeakerChangeObservationEnabled)) {
-                _context3.next = 3;
-                break;
+                _diffMap = (0, _utils.diffMap)(oldSpeakerList, newSpeakerList), addedList = _diffMap.addedList, removedList = _diffMap.removedList;
+                if (addedList.length > 0) {
+                  deviceInfoList = addedList.map(function (deviceId) {
+                    var _newSpeakerList$get;
+                    return {
+                      deviceId: deviceId,
+                      deviceName: ((_newSpeakerList$get = newSpeakerList.get(deviceId)) === null || _newSpeakerList$get === void 0 ? void 0 : _newSpeakerList$get.deviceName) || ''
+                    };
+                  });
+                  this.rtcClientObservable.notifyObservers('onSpeakerListAdded', deviceInfoList);
+                }
+                if (removedList.length > 0) {
+                  _deviceInfoList = removedList.map(function (deviceId) {
+                    var _oldSpeakerList$get;
+                    return {
+                      deviceId: deviceId,
+                      deviceName: ((_oldSpeakerList$get = oldSpeakerList.get(deviceId)) === null || _oldSpeakerList$get === void 0 ? void 0 : _oldSpeakerList$get.deviceName) || ''
+                    };
+                  });
+                  this.rtcClientObservable.notifyObservers('onSpeakerListRemoved', _deviceInfoList);
+                }
+              } else {
+                this.logger.debug("audio device changed, deviceType: ".concat(deviceType, ","));
               }
-              _context3.next = 1;
-              return this.getSystemSelectedSpeaker();
             case 1:
-              deviceInfo = _context3.sent;
-              if (!deviceInfo) {
-                _context3.next = 2;
-                break;
-              }
-              if (this._systemSelectedSpeakerDeviceId !== deviceInfo.deviceId) {
-                this.rtcClientObservable.notifyObservers('onSystemSelectedSpeakerChanged', {
-                  deviceId: deviceInfo.deviceId,
-                  deviceName: deviceInfo.deviceName
-                });
-                this._systemSelectedSpeakerDeviceId = deviceInfo.deviceId;
-              }
-              _context3.next = 3;
-              break;
-            case 2:
-              throw new Error('deviceInfo is empty, no speaker device selected');
-            case 3:
-              _context3.next = 5;
-              break;
-            case 4:
-              this.logger.debug("audio device changed, deviceType: ".concat(deviceType, ","));
-            case 5:
             case "end":
               return _context3.stop();
           }
@@ -444,6 +420,7 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
   }, {
     key: "release",
     value: function release() {
+      var _this$_speakerTask;
       this._rtcEngine.removeListener('onError', this._handleRtcError);
       this._rtcEngine.removeListener('onAudioDeviceVolumeChanged', this._handleAudioDeviceVolumeChanged);
       this._rtcEngine.removeListener('onAudioVolumeIndication', this._handleVolumeIndication);
@@ -451,6 +428,9 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
       this._rtcEngine.removeListener('onAudioDeviceStateChanged', this._handleAudioDeviceChanged);
       this.sourceManager.release();
       this._rtcEngine.release();
+      this._systemSelectedSpeakerDeviceId = DEFAULT_SPEAKER_DEVICE_ID;
+      (_this$_speakerTask = this._speakerTask) === null || _this$_speakerTask === void 0 || _this$_speakerTask.stop();
+      this._speakerTask = undefined;
     }
   }, {
     key: "startPlayTestAudio",
@@ -499,11 +479,7 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
   }, {
     key: "getSystemSelectedSpeaker",
     value: function getSystemSelectedSpeaker() {
-      var device = this._rtcEngine.getAudioDeviceManager().getPlaybackDefaultDevice();
-      return Promise.resolve(device.deviceId && device.deviceName ? {
-        deviceId: device.deviceId,
-        deviceName: device.deviceName
-      } : undefined);
+      return this._getSystemSelectedSpeaker();
     }
   }, {
     key: "setAccessPoint",
@@ -650,8 +626,16 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
   }, {
     key: "observeSystemSelectedSpeakerChanged",
     value: function observeSystemSelectedSpeakerChanged(enable) {
-      this._systemSpeakerChangeObservationEnabled = enable;
-      if (!enable) {
+      if (enable) {
+        if (!this._speakerTask) {
+          this._speakerTask = this._createSystemSelectedDevicePolling();
+        }
+        if (this._speakerTask.isStopped) {
+          this._speakerTask.start();
+        }
+      } else {
+        var _this$_speakerTask2;
+        (_this$_speakerTask2 = this._speakerTask) === null || _this$_speakerTask2 === void 0 || _this$_speakerTask2.stop();
         this._systemSelectedSpeakerDeviceId = DEFAULT_SPEAKER_DEVICE_ID;
       }
       return _constant.AgoraRtcErrorCode.SUCCESS;
@@ -724,6 +708,87 @@ var AgoraRtcClientImpl = exports.AgoraRtcClientImpl = /*#__PURE__*/function (_Ag
     value: function _stripPort(url) {
       return url.replace(/:\d+/, '');
     }
+  }, {
+    key: "_createSystemSelectedDevicePolling",
+    value: function _createSystemSelectedDevicePolling() {
+      var _this2 = this;
+      var createExecuteTask = /*#__PURE__*/function () {
+        var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+          var currentUniqueDeviceId, oldUniqueDeviceId, deviceInfo;
+          return _regenerator["default"].wrap(function (_context6) {
+            while (1) switch (_context6.prev = _context6.next) {
+              case 0:
+                _context6.next = 1;
+                return _this2._getSystemSelectedUniqueDeviceId();
+              case 1:
+                currentUniqueDeviceId = _context6.sent;
+                oldUniqueDeviceId = _this2._systemSelectedSpeakerDeviceId;
+                if (currentUniqueDeviceId) {
+                  if (currentUniqueDeviceId !== oldUniqueDeviceId) {
+                    deviceInfo = {
+                      deviceId: currentUniqueDeviceId.split('-')[0],
+                      deviceName: currentUniqueDeviceId.split('-')[1]
+                    };
+                    _this2.rtcClientObservable.notifyObservers('onSystemSelectedSpeakerChanged', deviceInfo);
+                    _this2._systemSelectedSpeakerDeviceId = currentUniqueDeviceId;
+                  }
+                } else {
+                  _this2.logger.error('deviceInfo is empty, no device selected');
+                }
+              case 2:
+              case "end":
+                return _context6.stop();
+            }
+          }, _callee6);
+        }));
+        return function createExecuteTask() {
+          return _ref5.apply(this, arguments);
+        };
+      }();
+      return _schedule.AgoraScheduler.shared.addPollingTask(createExecuteTask, this._taskInterval, true, function () {
+        return _schedule.ActionWhenTaskFail.CONTINUE;
+      });
+    }
+  }, {
+    key: "_getSystemSelectedUniqueDeviceId",
+    value: function () {
+      var _getSystemSelectedUniqueDeviceId2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+        var deviceInfo;
+        return _regenerator["default"].wrap(function (_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              _context7.next = 1;
+              return this._getSystemSelectedSpeaker();
+            case 1:
+              deviceInfo = _context7.sent;
+              if (!deviceInfo) {
+                _context7.next = 2;
+                break;
+              }
+              return _context7.abrupt("return", "".concat(deviceInfo.deviceId, "-").concat(deviceInfo.deviceName));
+            case 2:
+              return _context7.abrupt("return", undefined);
+            case 3:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
+      function _getSystemSelectedUniqueDeviceId() {
+        return _getSystemSelectedUniqueDeviceId2.apply(this, arguments);
+      }
+      return _getSystemSelectedUniqueDeviceId;
+    }()
+  }, {
+    key: "_getSystemSelectedSpeaker",
+    value: function _getSystemSelectedSpeaker() {
+      var device = this._rtcEngine.getAudioDeviceManager().getPlaybackDefaultDevice();
+      var deviceInfo = device.deviceId && device.deviceName ? {
+        deviceId: device.deviceId,
+        deviceName: device.deviceName
+      } : undefined;
+      return Promise.resolve(deviceInfo);
+    }
   }]);
 }(_rtc.AgoraRtcClient);
 _AgoraRtcClientImpl = AgoraRtcClientImpl;

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

@@ -46,7 +46,10 @@ export declare class AgoraRtcSourceManagerImpl extends AgoraRtcSourceManager {
     adjustMicrophoneVolume(deviceId: string, volume: number): number;
     getCameraList(): Promise<AgoraRtcDeviceInfo[]>;
     getMicrophoneList(): Promise<AgoraRtcDeviceInfo[]>;
-    getSystemSelectedMicrophone(): Promise<AgoraRtcDeviceInfo>;
+    getSystemSelectedMicrophone(): Promise<{
+        deviceId: string;
+        deviceName: string;
+    } | undefined>;
     getSystemSelectedSpeaker(): AgoraRtcDeviceInfo;
     getWindowList(thumbSize?: Size, iconSize?: Size): Promise<AgoraRtcWindowInfo[]>;
     getDisplayList(thumbSize?: Size, iconSize?: Size): Promise<AgoraRtcDisplayInfo[]>;
@@ -68,4 +71,7 @@ export declare class AgoraRtcSourceManagerImpl extends AgoraRtcSourceManager {
     private _bindDeviceIdToSourceType;
     private _unbindDeviceIdToSourceType;
     private _handleVolumeIndicatorUpdated;
+    private _createSystemSelectedDevicePolling;
+    private _getSystemSelectedUniqueDeviceId;
+    private _getSystemSelectedMicrophone;
 }

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

@@ -119,6 +119,8 @@ var _loopbackMixer = require("./loopback-mixer");
 var _sourceManager = require("../../../core/rtc/source-manager");
 var _logger = require("../../../core/utilities/logger");
 var _constant = require("../../../constant");
+var _schedule = require("agora-foundation/lib/schedule");
+var _scheduler = require("agora-foundation/lib/schedule/scheduler");
 var _AgoraRtcSourceManagerImpl;
 var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -155,6 +157,8 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
     (0, _defineProperty2["default"])(_this, "_microphoneList", new Map());
     (0, _defineProperty2["default"])(_this, "_systemSelectedMicrophoneDeviceId", DEFAULT_MICROPHONE_DEVICE_ID);
     (0, _defineProperty2["default"])(_this, "_systemMicrophoneChangeObservationEnabled", true);
+    // @internal
+    (0, _defineProperty2["default"])(_this, "_taskInterval", _scheduler.Duration.second(1));
     _this._rtcEngine = _rtcEngine;
     _this._config = _config;
     _this._handleVideoDeviceChanged = _this._handleVideoDeviceChanged.bind(_this);
@@ -171,7 +175,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
     _rtcEngine.addListener('onAudioVolumeIndication', _this._handleVolumeIndicatorUpdated);
     _this._loopbackAudioMixer = new _loopbackMixer.AgoraRtcLoopbackAudioMixer(_this._rtcEngine);
     _rtcEngine.addListener('onLocalAudioStateChanged', _this._handleLocalAudioStateChanged);
-    _this.getSystemSelectedMicrophone().then(function (deviceInfo) {
+    _this._getSystemSelectedMicrophone().then(function (deviceInfo) {
       if (deviceInfo) {
         _this._systemSelectedMicrophoneDeviceId = deviceInfo.deviceId;
       }
@@ -182,6 +186,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   return (0, _createClass2["default"])(AgoraRtcSourceManagerImpl, [{
     key: "release",
     value: function release() {
+      var _this$_microphoneTask;
       this._rtcEngine.removeListener('onVideoDeviceStateChanged', this._handleVideoDeviceChanged);
       this._rtcEngine.removeListener('onAudioDeviceStateChanged', this._handleAudioDeviceChanged);
       this._rtcEngine.removeListener('onLocalVideoStateChanged', this._handleLocalVideoStateChanged);
@@ -189,6 +194,8 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       this._rtcEngine.removeListener('onAudioVolumeIndication', this._handleVolumeIndicatorUpdated);
       this._rtcEngine.removeListener('onLocalAudioStateChanged', this._handleLocalAudioStateChanged);
       this._systemSelectedMicrophoneDeviceId = DEFAULT_MICROPHONE_DEVICE_ID;
+      (_this$_microphoneTask = this._microphoneTask) === null || _this$_microphoneTask === void 0 || _this$_microphoneTask.stop();
+      this._microphoneTask = undefined;
     }
   }, {
     key: "getLoopbackDeviceId",
@@ -497,12 +504,7 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "getSystemSelectedMicrophone",
     value: function getSystemSelectedMicrophone() {
-      var device = this._rtcEngine.getAudioDeviceManager().getRecordingDefaultDevice();
-      var deviceInfo = {
-        deviceId: device.deviceId,
-        deviceName: device.deviceName
-      };
-      return Promise.resolve(deviceInfo);
+      return this._getSystemSelectedMicrophone();
     }
   }, {
     key: "getSystemSelectedSpeaker",
@@ -614,8 +616,16 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
   }, {
     key: "observeSystemSelectedMicrophoneChanged",
     value: function observeSystemSelectedMicrophoneChanged(enable) {
-      this._systemMicrophoneChangeObservationEnabled = enable;
-      if (!enable) {
+      if (enable) {
+        if (!this._microphoneTask) {
+          this._microphoneTask = this._createSystemSelectedDevicePolling();
+        }
+        if (this._microphoneTask.isStopped) {
+          this._microphoneTask.start();
+        }
+      } else {
+        var _this$_microphoneTask2;
+        (_this$_microphoneTask2 = this._microphoneTask) === null || _this$_microphoneTask2 === void 0 || _this$_microphoneTask2.stop();
         this._systemSelectedMicrophoneDeviceId = DEFAULT_MICROPHONE_DEVICE_ID;
       }
       return _constant.AgoraRtcErrorCode.SUCCESS;
@@ -705,77 +715,49 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
     key: "_handleAudioDeviceChanged",
     value: function () {
       var _handleAudioDeviceChanged2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(deviceId, deviceType, deviceState) {
-        var audioRecordingDevices, oldMicList, newMicList, _diffMap2, addedList, removedList, deviceInfoList, _deviceInfoList2, deviceInfo;
+        var audioRecordingDevices, oldMicList, newMicList, _diffMap2, addedList, removedList, deviceInfoList, _deviceInfoList2;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(deviceType === 1 /* recording devices */)) {
-                _context.next = 4;
-                break;
-              }
-              audioRecordingDevices = this._rtcEngine.getAudioDeviceManager().enumerateRecordingDevices();
-              oldMicList = this._microphoneList;
-              newMicList = new Map();
-              this._microphoneList = newMicList;
-              audioRecordingDevices.forEach(function (device) {
-                if (device.deviceId && device.deviceName) {
-                  var deviceInfo = {
-                    deviceId: device.deviceId,
-                    deviceName: device.deviceName
-                  };
-                  newMicList.set(device.deviceId, deviceInfo);
-                }
-              });
-              _diffMap2 = (0, _utils.diffMap)(oldMicList, newMicList), addedList = _diffMap2.addedList, removedList = _diffMap2.removedList;
-              if (addedList.length > 0) {
-                deviceInfoList = addedList.map(function (deviceId) {
-                  var _newMicList$get;
-                  return {
-                    deviceId: deviceId,
-                    deviceName: ((_newMicList$get = newMicList.get(deviceId)) === null || _newMicList$get === void 0 ? void 0 : _newMicList$get.deviceName) || ''
-                  };
+              if (deviceType === 1 /* recording devices */) {
+                audioRecordingDevices = this._rtcEngine.getAudioDeviceManager().enumerateRecordingDevices();
+                oldMicList = this._microphoneList;
+                newMicList = new Map();
+                this._microphoneList = newMicList;
+                audioRecordingDevices.forEach(function (device) {
+                  if (device.deviceId && device.deviceName) {
+                    var deviceInfo = {
+                      deviceId: device.deviceId,
+                      deviceName: device.deviceName
+                    };
+                    newMicList.set(device.deviceId, deviceInfo);
+                  }
                 });
-                this.observable.notifyObservers('onMicrophoneListAdded', deviceInfoList);
-              }
-              if (removedList.length > 0) {
-                _deviceInfoList2 = removedList.map(function (deviceId) {
-                  var _oldMicList$get;
-                  return {
-                    deviceId: deviceId,
-                    deviceName: ((_oldMicList$get = oldMicList.get(deviceId)) === null || _oldMicList$get === void 0 ? void 0 : _oldMicList$get.deviceName) || ''
-                  };
-                });
-                this.observable.notifyObservers('onMicrophoneListRemoved', _deviceInfoList2);
-              }
-              if (!([0, 1].includes(deviceState) && this._systemMicrophoneChangeObservationEnabled)) {
-                _context.next = 3;
-                break;
+                _diffMap2 = (0, _utils.diffMap)(oldMicList, newMicList), addedList = _diffMap2.addedList, removedList = _diffMap2.removedList;
+                if (addedList.length > 0) {
+                  deviceInfoList = addedList.map(function (deviceId) {
+                    var _newMicList$get;
+                    return {
+                      deviceId: deviceId,
+                      deviceName: ((_newMicList$get = newMicList.get(deviceId)) === null || _newMicList$get === void 0 ? void 0 : _newMicList$get.deviceName) || ''
+                    };
+                  });
+                  this.observable.notifyObservers('onMicrophoneListAdded', deviceInfoList);
+                }
+                if (removedList.length > 0) {
+                  _deviceInfoList2 = removedList.map(function (deviceId) {
+                    var _oldMicList$get;
+                    return {
+                      deviceId: deviceId,
+                      deviceName: ((_oldMicList$get = oldMicList.get(deviceId)) === null || _oldMicList$get === void 0 ? void 0 : _oldMicList$get.deviceName) || ''
+                    };
+                  });
+                  this.observable.notifyObservers('onMicrophoneListRemoved', _deviceInfoList2);
+                }
+              } else {
+                this.logger.debug("audio device changed, deviceType: ".concat(deviceType, ","));
               }
-              _context.next = 1;
-              return this.getSystemSelectedMicrophone();
             case 1:
-              deviceInfo = _context.sent;
-              if (!deviceInfo) {
-                _context.next = 2;
-                break;
-              }
-              if (deviceInfo.deviceId !== this._systemSelectedMicrophoneDeviceId) {
-                this.observable.notifyObservers('onSystemSelectedMicrophoneChanged', {
-                  deviceId: deviceInfo.deviceId,
-                  deviceName: deviceInfo.deviceName
-                });
-                this._systemSelectedMicrophoneDeviceId = deviceInfo.deviceId;
-              }
-              _context.next = 3;
-              break;
-            case 2:
-              throw new Error('deviceInfo is empty, no microphone device selected');
-            case 3:
-              _context.next = 5;
-              break;
-            case 4:
-              this.logger.debug("audio device changed, deviceType: ".concat(deviceType, ","));
-            case 5:
             case "end":
               return _context.stop();
           }
@@ -892,13 +874,31 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
       res = this._rtcEngine.stopCameraCapture((0, _utils.convertSourceIndexToSourceType)(sourceIndex));
       return res;
     }
+    // @bound
+    // private _startMicrophoneCapture(deviceId: string) {
+    //   this._currentMicrophoneDeviceId = deviceId;
+    //   this._rtcEngine.getAudioDeviceManager().setRecordingDevice(deviceId);
+    //   const status = this.microphoneDeviceStatusMapping.get(deviceId) || 0;
+
+    //   if (status > 0) {
+    //     return 0;
+    //   } else {
+    //     this.logger.info('startRecordingDeviceTest');
+    //     return this._rtcEngine
+    //       .getAudioDeviceManager()
+    //       .startRecordingDeviceTest(VOLUME_INDICATION_INTERVAL);
+    //   }
+    // }
   }, {
     key: "_startMicrophoneCapture",
     value: function _startMicrophoneCapture(deviceId) {
       this._currentMicrophoneDeviceId = deviceId;
       this._rtcEngine.getAudioDeviceManager().setRecordingDevice(deviceId);
       var status = this.microphoneDeviceStatusMapping.get(deviceId) || 0;
-      if (status > 0) {
+
+      // 检查设备是否已经在进行录音测试
+      var isAlreadyTesting = (status & _type2.AgoraElectronRtcDeviceStatusFlag.TESTING) !== 0;
+      if (isAlreadyTesting) {
         return 0;
       } else {
         return this._rtcEngine.getAudioDeviceManager().startRecordingDeviceTest(_utils.VOLUME_INDICATION_INTERVAL);
@@ -964,10 +964,91 @@ var AgoraRtcSourceManagerImpl = exports.AgoraRtcSourceManagerImpl = /*#__PURE__*
         }
       }
     }
+  }, {
+    key: "_createSystemSelectedDevicePolling",
+    value: function _createSystemSelectedDevicePolling() {
+      var _this5 = this;
+      var createExecuteTask = /*#__PURE__*/function () {
+        var _ref0 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+          var currentUniqueDeviceId, oldUniqueDeviceId, deviceInfo;
+          return _regenerator["default"].wrap(function (_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 1;
+                return _this5._getSystemSelectedUniqueDeviceId();
+              case 1:
+                currentUniqueDeviceId = _context2.sent;
+                oldUniqueDeviceId = _this5._systemSelectedMicrophoneDeviceId;
+                if (currentUniqueDeviceId) {
+                  if (currentUniqueDeviceId !== oldUniqueDeviceId) {
+                    deviceInfo = {
+                      deviceId: currentUniqueDeviceId.split('-')[0],
+                      deviceName: currentUniqueDeviceId.split('-')[1]
+                    };
+                    _this5.observable.notifyObservers('onSystemSelectedMicrophoneChanged', deviceInfo);
+                    _this5._systemSelectedMicrophoneDeviceId = currentUniqueDeviceId;
+                  }
+                } else {
+                  _this5.logger.error('deviceInfo is empty, no device selected');
+                }
+              case 2:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        return function createExecuteTask() {
+          return _ref0.apply(this, arguments);
+        };
+      }();
+      return _schedule.AgoraScheduler.shared.addPollingTask(createExecuteTask, this._taskInterval, true, function () {
+        return _schedule.ActionWhenTaskFail.CONTINUE;
+      });
+    }
+  }, {
+    key: "_getSystemSelectedUniqueDeviceId",
+    value: function () {
+      var _getSystemSelectedUniqueDeviceId2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+        var deviceInfo;
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 1;
+              return this._getSystemSelectedMicrophone();
+            case 1:
+              deviceInfo = _context3.sent;
+              if (!deviceInfo) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return", "".concat(deviceInfo.deviceId, "-").concat(deviceInfo.deviceName));
+            case 2:
+              return _context3.abrupt("return", undefined);
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function _getSystemSelectedUniqueDeviceId() {
+        return _getSystemSelectedUniqueDeviceId2.apply(this, arguments);
+      }
+      return _getSystemSelectedUniqueDeviceId;
+    }()
+  }, {
+    key: "_getSystemSelectedMicrophone",
+    value: function _getSystemSelectedMicrophone() {
+      var device = this._rtcEngine.getAudioDeviceManager().getRecordingDefaultDevice();
+      var deviceInfo = device.deviceId && device.deviceName ? {
+        deviceId: device.deviceId,
+        deviceName: device.deviceName
+      } : undefined;
+      return Promise.resolve(deviceInfo);
+    }
   }]);
 }(_sourceManager.AgoraRtcSourceManager);
 _AgoraRtcSourceManagerImpl = AgoraRtcSourceManagerImpl;
-var _applyDecs$e = _applyDecs(_AgoraRtcSourceManagerImpl, [[_decorator.trace, 2, "setCameraCaptureParams"], [_decorator.trace, 2, "openCamera"], [_decorator.trace, 2, "closeCamera"], [_decorator.trace, 2, "startCameraTest"], [_decorator.trace, 2, "stopCameraTest"], [_decorator.trace, 2, "openMicrophone"], [_decorator.trace, 2, "closeMicrophone"], [_decorator.trace, 2, "startMicrophoneTest"], [_decorator.trace, 2, "stopMicrophoneTest"], [_decorator.trace, 2, "startScreenCaptureByDisplayId"], [_decorator.trace, 2, "startScreenCaptureByWindowId"], [_decorator.trace, 2, "stopScreenCapture"], [_decorator.trace, 2, "startLoopbackRecording"], [_decorator.trace, 2, "stopLoopbackRecording"], [_decorator.trace, 2, "adjustLoopbackVolume"], [_decorator.trace, 2, "adjustMicrophoneVolume"], [_decorator.trace, 2, "getWindowList"], [_decorator.trace, 2, "getDisplayList"], [_decorator.bound, 2, "setMicrophoneKeepRecording"], [_decorator.bound, 2, "_handleVideoSourceVideoStateChanged"], [_decorator.bound, 2, "_handleLocalAudioStateChanged"], [_decorator.bound, 2, "_handleVideoDeviceChanged"], [_decorator.bound, 2, "_handleAudioDeviceChanged"], [_decorator.bound, 2, "_handleLocalVideoStateChanged"], [_decorator.bound, 2, "_handleLocalAudioError"], [_decorator.bound, 2, "_initializeDeviceList"], [_decorator.bound, 2, "_pickCurrentWindowId"], [_decorator.bound, 2, "_startCameraCapture"], [_decorator.bound, 2, "_stopCameraCapture"], [_decorator.bound, 2, "_startMicrophoneCapture"], [_decorator.bound, 2, "_stopMicrophoneCapture"], [_decorator.bound, 2, "_generateVideoSourceIndex"], [_decorator.bound, 2, "_bindDeviceIdToSourceType"], [_decorator.bound, 2, "_unbindDeviceIdToSourceType"], [_decorator.bound, 2, "_handleVolumeIndicatorUpdated"]], [], 0, void 0, _sourceManager.AgoraRtcSourceManager).e;
+var _applyDecs$e = _applyDecs(_AgoraRtcSourceManagerImpl, [[_decorator.trace, 2, "setCameraCaptureParams"], [_decorator.trace, 2, "openCamera"], [_decorator.trace, 2, "closeCamera"], [_decorator.trace, 2, "startCameraTest"], [_decorator.trace, 2, "stopCameraTest"], [_decorator.trace, 2, "openMicrophone"], [_decorator.trace, 2, "closeMicrophone"], [_decorator.trace, 2, "startMicrophoneTest"], [_decorator.trace, 2, "stopMicrophoneTest"], [_decorator.trace, 2, "startScreenCaptureByDisplayId"], [_decorator.trace, 2, "startScreenCaptureByWindowId"], [_decorator.trace, 2, "stopScreenCapture"], [_decorator.trace, 2, "startLoopbackRecording"], [_decorator.trace, 2, "stopLoopbackRecording"], [_decorator.trace, 2, "adjustLoopbackVolume"], [_decorator.trace, 2, "adjustMicrophoneVolume"], [_decorator.trace, 2, "getWindowList"], [_decorator.trace, 2, "getDisplayList"], [_decorator.bound, 2, "setMicrophoneKeepRecording"], [_decorator.bound, 2, "_handleVideoSourceVideoStateChanged"], [_decorator.bound, 2, "_handleLocalAudioStateChanged"], [_decorator.bound, 2, "_handleVideoDeviceChanged"], [_decorator.bound, 2, "_handleAudioDeviceChanged"], [_decorator.bound, 2, "_handleLocalVideoStateChanged"], [_decorator.bound, 2, "_handleLocalAudioError"], [_decorator.bound, 2, "_initializeDeviceList"], [_decorator.bound, 2, "_pickCurrentWindowId"], [_decorator.bound, 2, "_startCameraCapture"], [_decorator.bound, 2, "_stopCameraCapture"], [_decorator.bound, 2, "_stopMicrophoneCapture"], [_decorator.bound, 2, "_generateVideoSourceIndex"], [_decorator.bound, 2, "_bindDeviceIdToSourceType"], [_decorator.bound, 2, "_unbindDeviceIdToSourceType"], [_decorator.bound, 2, "_handleVolumeIndicatorUpdated"]], [], 0, void 0, _sourceManager.AgoraRtcSourceManager).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/plugin/rtc/web/client.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.filter.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
@@ -25,8 +27,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AgoraRtcWebAdapterImp = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
@@ -481,24 +481,20 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
               case 1:
                 currentUniqueDeviceId = _context.sent;
                 oldUniqueDeviceId = _this4._systemSelectedUniqueDeviceId[type];
-                if (!currentUniqueDeviceId) {
-                  _context.next = 2;
-                  break;
-                }
-                if (currentUniqueDeviceId !== oldUniqueDeviceId) {
-                  observerKey = isSpeaker ? 'onSystemSelectedSpeakerChanged' : 'onSystemSelectedMicrophoneChanged';
-                  deviceInfo = {
-                    deviceId: currentUniqueDeviceId.split('-')[0],
-                    deviceName: currentUniqueDeviceId.split('-')[1]
-                  };
-                  _this4.rtcClientObservable.notifyObservers(observerKey, deviceInfo);
-                  _this4._systemSelectedUniqueDeviceId[type] = currentUniqueDeviceId;
+                if (currentUniqueDeviceId) {
+                  if (currentUniqueDeviceId !== oldUniqueDeviceId) {
+                    observerKey = isSpeaker ? 'onSystemSelectedSpeakerChanged' : 'onSystemSelectedMicrophoneChanged';
+                    deviceInfo = {
+                      deviceId: currentUniqueDeviceId.split('-')[0],
+                      deviceName: currentUniqueDeviceId.split('-')[1]
+                    };
+                    _this4.rtcClientObservable.notifyObservers(observerKey, deviceInfo);
+                    _this4._systemSelectedUniqueDeviceId[type] = currentUniqueDeviceId;
+                  }
+                } else {
+                  _this4.logger.error('deviceInfo is empty, no device selected');
                 }
-                _context.next = 3;
-                break;
               case 2:
-                throw new Error('deviceInfo is empty, no device selected');
-              case 3:
               case "end":
                 return _context.stop();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-rte-sdk",
-  "version": "3.7.0",
+  "version": "3.7.2",
   "description": "SDK for building interactive scenarios",
   "author": "agora.io",
   "license": "ISC",
@@ -31,7 +31,7 @@
     "@types/sinon": "^17.0.2",
     "@types/ua-parser-js": "^0.7.35",
     "agora-token": "^2.0.3",
-    "agora-toolchain": "~3.7.0",
+    "agora-toolchain": "~3.7.2",
     "babel-jest": "^29.7.0",
     "core-js": "^3.33.3",
     "dotenv": "^16.3.1",
@@ -52,7 +52,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.7.0",
+    "agora-foundation": "~3.7.2",
     "agora-rtc-sdk-ng": "4.23.3",
     "agora-rtm": "2.2.2-2",
     "await-to-js": "^3.0.0",