agora-rte-sdk 2.8.21 → 2.8.40

package/lib/core/rtc/adapter/web/client.js

@@ -15,8 +15,6 @@ require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.object.set-prototype-of.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.array.reverse.js");
-require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.weak-map.delete-all.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -62,7 +60,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _agoraRtcSdkNg = _interopRequireWildcard(require("agora-rtc-sdk-ng"));
+var _agoraRtcSdkNg = _interopRequireDefault(require("agora-rtc-sdk-ng"));
 var _events = require("../../../utils/events");
 var _stats = require("./stats");
 var _thread2 = require("./thread");
@@ -74,8 +72,6 @@ var _log = require("../../../decorator/log");
 var _lodash = require("lodash");
 var _decorator = require("../../../decorator");
 var _dec, _class, _class3;
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -85,8 +81,7 @@ var AgoraRteWebClientBase = (_dec = _log.Log.attach({
 }), _dec(_class = /*#__PURE__*/function (_AGEventEmitter) {
   (0, _inherits2["default"])(AgoraRteWebClientBase, _AGEventEmitter);
   var _super = _createSuper(AgoraRteWebClientBase);
-  function AgoraRteWebClientBase(channelName, configs, base, connectionType) {
-    var _ref;
+  function AgoraRteWebClientBase(channelName, configs, base, connectionType, audioRawDataDispatcher) {
     var _this;
     (0, _classCallCheck2["default"])(this, AgoraRteWebClientBase);
     _this = _super.call(this);
@@ -94,9 +89,10 @@ var AgoraRteWebClientBase = (_dec = _log.Log.attach({
     _this._client = void 0;
     _this._base = void 0;
     _this.configs = void 0;
-    _this._connectionState = _type.AGRtcState.Idle;
     _this.channelName = void 0;
     _this.connectionType = void 0;
+    _this._audioRawDataDispatcher = void 0;
+    _this._connectionState = _type.AGRtcState.Idle;
     _this._networkStats = new _stats.RtcNetworkQualityWeb();
     _this._recentLocalPacketStats = [];
     _this._recentRemotePacketStats = [];
@@ -104,6 +100,7 @@ var AgoraRteWebClientBase = (_dec = _log.Log.attach({
     _this.configs = configs;
     _this._base = base;
     _this.connectionType = connectionType;
+    _this._audioRawDataDispatcher = audioRawDataDispatcher;
     _agoraRtcSdkNg["default"].setArea({
       areaCode: [_this._rtcRegion()]
     });
@@ -118,8 +115,10 @@ var AgoraRteWebClientBase = (_dec = _log.Log.attach({
       codec: _this.configs.codec,
       mode: _this.configs.mode
     });
-    var defaultRemoteVideoStreamType = (_ref = _configs.AgoraRteEngineConfig.shared.rtcConfigs.defaultRemoteVideoStreamType) !== null && _ref !== void 0 ? _ref : _agoraRtcSdkNg.RemoteStreamType.HIGH_STREAM;
-    _this._client.setRemoteDefaultVideoStreamType(defaultRemoteVideoStreamType);
+    var defaultRemoteVideoStreamType = _configs.AgoraRteEngineConfig.shared.rtcConfigs.defaultRemoteVideoStreamType;
+    if (typeof defaultRemoteVideoStreamType !== 'undefined') {
+      _this._client.setRemoteDefaultVideoStreamType(defaultRemoteVideoStreamType);
+    }
 
     // set encryption if needed
     var rtcConfigs = _configs.AgoraRteEngineConfig.shared.rtcConfigs;
@@ -341,10 +340,10 @@ exports.AgoraRteWebClientBase = AgoraRteWebClientBase;
 var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClientBas) {
   (0, _inherits2["default"])(AgoraRteWebClientMain, _AgoraRteWebClientBas);
   var _super2 = _createSuper(AgoraRteWebClientMain);
-  function AgoraRteWebClientMain(channelName, configs, base, connectionType) {
+  function AgoraRteWebClientMain(channelName, configs, base, connectionType, audioRawDataDispatcher) {
     var _this2;
     (0, _classCallCheck2["default"])(this, AgoraRteWebClientMain);
-    _this2 = _super2.call(this, channelName, configs, base, connectionType);
+    _this2 = _super2.call(this, channelName, configs, base, connectionType, audioRawDataDispatcher);
     _this2._remoteRtcUsers = new Map();
     _this2._muteRemoteVideo = new Map();
     _this2._muteRemoteAudio = new Map();
@@ -353,7 +352,6 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
     _this2._subscribeVideoThreads = new Map();
     _this2._subscribeAudioThreads = new Map();
     _this2._publishThread = new _thread2.AgoraRtePublishThreadMain(_this2._client, configs);
-
     //publish thread needs to wait till join channel
     _this2._publishThread.runnable = false;
     var throttledVolumeIndicator = (0, _lodash.throttle)(_this2._notifyStreamVolumes, 500);
@@ -366,7 +364,7 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
           muteMap: _this2._muteRemoteVideo,
           mediaType: 'video',
           canvasMap: _this2.base.remoteCanvas
-        });
+        }, audioRawDataDispatcher);
         _this2._subscribeVideoThreads.set(streamUuid, thread);
         thread.runnable = _this2.ready;
       } else {
@@ -374,7 +372,7 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
           channelName: _this2.channelName,
           muteMap: _this2._muteRemoteAudio,
           mediaType: 'audio'
-        });
+        }, audioRawDataDispatcher);
         _thread.on('audio-volume-indication', function (volume) {
           _this2._audioVolumes.set(streamUuid, volume);
           throttledVolumeIndicator();
@@ -387,34 +385,36 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
     _this2._client.on('user-unpublished', function (user) {
       if (!user.hasAudio && !user.hasVideo) {
         // if user has no video/audio, take him out
-        var userId = "".concat(user.uid);
-        _this2._remoteRtcUsers["delete"](userId);
-        var videoThread = _this2._subscribeVideoThreads.get(userId);
-        var audioThread = _this2._subscribeAudioThreads.get(userId);
+        var streamUuid = "".concat(user.uid);
+        _this2._remoteRtcUsers["delete"](streamUuid);
+        var videoThread = _this2._subscribeVideoThreads.get(streamUuid);
+        var audioThread = _this2._subscribeAudioThreads.get(streamUuid);
         if (videoThread) {
           videoThread.stop();
-          _this2._subscribeVideoThreads["delete"](userId);
+          _this2._subscribeVideoThreads["delete"](streamUuid);
         }
         if (audioThread) {
+          audioRawDataDispatcher.dispatch('AudioTrackUnsubscribed', audioThread.streamUuid, channelName);
           audioThread.stop();
-          _this2._audioVolumes["delete"](userId);
-          _this2._subscribeAudioThreads["delete"](userId);
+          _this2._audioVolumes["delete"](streamUuid);
+          _this2._subscribeAudioThreads["delete"](streamUuid);
         }
       }
     });
     _this2._client.on('user-left', function (user) {
-      var userId = "".concat(user.uid);
-      _this2._remoteRtcUsers["delete"](userId);
-      var videoThread = _this2._subscribeVideoThreads.get(userId);
-      var audioThread = _this2._subscribeAudioThreads.get(userId);
+      var streamUuid = "".concat(user.uid);
+      _this2._remoteRtcUsers["delete"](streamUuid);
+      var videoThread = _this2._subscribeVideoThreads.get(streamUuid);
+      var audioThread = _this2._subscribeAudioThreads.get(streamUuid);
       if (videoThread) {
         videoThread.stop();
-        _this2._subscribeVideoThreads["delete"](userId);
+        _this2._subscribeVideoThreads["delete"](streamUuid);
       }
       if (audioThread) {
+        audioRawDataDispatcher.dispatch('AudioTrackUnsubscribed', streamUuid, channelName);
         audioThread.stop();
-        _this2._audioVolumes["delete"](userId);
-        _this2._subscribeAudioThreads["delete"](userId);
+        _this2._audioVolumes["delete"](streamUuid);
+        _this2._subscribeAudioThreads["delete"](streamUuid);
       }
     });
     return _this2;
@@ -562,8 +562,8 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
                 _context3.next = 11;
                 return this._client.massSubscribe(users);
               case 11:
-                subList = _context3.sent.map(function (_ref2) {
-                  var user = _ref2.user;
+                subList = _context3.sent.map(function (_ref) {
+                  var user = _ref.user;
                   return "".concat(user.uid);
                 });
                 subList.forEach(function (streamUuid) {
@@ -611,6 +611,7 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
     key: "leave",
     value: function () {
       var _leave2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this4 = this;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -625,6 +626,7 @@ var AgoraRteWebClientMain = (_class3 = /*#__PURE__*/function (_AgoraRteWebClient
                 });
                 this._subscribeVideoThreads.clear();
                 this._subscribeAudioThreads.forEach(function (thread) {
+                  _this4._audioRawDataDispatcher.dispatch('AudioTrackUnsubscribed', thread.streamUuid, _this4.channelName);
                   thread.stop();
                 });
                 this._subscribeAudioThreads.clear();
@@ -648,16 +650,16 @@ exports.AgoraRteWebClientMain = AgoraRteWebClientMain;
 var AgoraRteWebClientSub = /*#__PURE__*/function (_AgoraRteWebClientBas2) {
   (0, _inherits2["default"])(AgoraRteWebClientSub, _AgoraRteWebClientBas2);
   var _super3 = _createSuper(AgoraRteWebClientSub);
-  function AgoraRteWebClientSub(channelName, configs, base, connectionType) {
-    var _this4;
+  function AgoraRteWebClientSub(channelName, configs, base, connectionType, audioRawDataDispatcher) {
+    var _this5;
     (0, _classCallCheck2["default"])(this, AgoraRteWebClientSub);
-    _this4 = _super3.call(this, channelName, configs, base, connectionType);
-    _this4._publishThread = void 0;
-    _this4._publishThread = new _thread2.AgoraRtePublishThreadSub(_this4._client, configs);
+    _this5 = _super3.call(this, channelName, configs, base, connectionType, audioRawDataDispatcher);
+    _this5._publishThread = void 0;
+    _this5._publishThread = new _thread2.AgoraRtePublishThreadSub(_this5._client, configs);
 
     //publish thread needs to wait till join channel
-    _this4._publishThread.runnable = false;
-    return _this4;
+    _this5._publishThread.runnable = false;
+    return _this5;
   }
   (0, _createClass2["default"])(AgoraRteWebClientSub, [{
     key: "muteLocalVideo",

package/lib/core/rtc/adapter/web/device.d.ts

@@ -22,7 +22,6 @@ export declare class RtcAudioDeviceManagerWeb extends RtcAudioDeviceManagerBase
     private _playbackDeviceIds;
     constructor(adapter: RtcAdapterWeb, noDevicePermission?: boolean);
     onLocalAudioPlaybackTestVolumeChanged(cb: LocalAudioPlaybackVolumeIndicatorEvent): number;
-    onAudioFrame(cb: (buffer: ArrayBuffer) => void): number;
     onLocalAudioTrackStateChanged(cb: LocalAudioTrackStateEvent): number;
     onLocalAudioVolume(cb: (volume: number) => void): number;
     onLocalRecordingDeviceListChanged(cb: (addNewDevice: boolean, newDevices: AGRtcDeviceInfo[], allDevices: AGRtcDeviceInfo[]) => void): number;

package/lib/core/rtc/adapter/web/device.js

@@ -214,11 +214,6 @@ var RtcAudioDeviceManagerWeb = /*#__PURE__*/function (_RtcAudioDeviceManage) {
     value: function onLocalAudioPlaybackTestVolumeChanged(cb) {
       return this.adapter.onLocalAudioPlaybackTestVolumeChanged(cb);
     }
-  }, {
-    key: "onAudioFrame",
-    value: function onAudioFrame(cb) {
-      return this.adapter.onAudioFrame(cb);
-    }
   }, {
     key: "onLocalAudioTrackStateChanged",
     value: function onLocalAudioTrackStateChanged(cb) {

package/lib/core/rtc/adapter/web/dispatcher.d.ts

@@ -0,0 +1,61 @@
+import { ILocalAudioTrack, IRemoteAudioTrack } from 'agora-rtc-sdk-ng';
+import { Logger } from '../../../logger';
+import { AgoraRteAudioRawDataConfig, AgoraRteAudioRawDataObserver, AgoraRteAudioRawDataPosition, AgoraRteAudioRawData } from '../../../media/type';
+declare type CallbackRawDataRecorded = (rawData: AgoraRteAudioRawData) => void;
+declare type CallbackRawDataBeforeMixed = (rawData: AgoraRteAudioRawData, streamUuid: string, channelName: string) => void;
+declare type CallbackObserverChanged = (position: AgoraRteAudioRawDataPosition) => void;
+declare type CallbackMicrophoneTrackCreated = (track: ILocalAudioTrack) => void;
+declare type CallbackAudioTrackSubscribed = (track: IRemoteAudioTrack, streamUuid: string, channelName: string) => void;
+declare type CallbackMicrophoneTrackDestroyed = () => void;
+declare type CallbackAudioTrackUnsubscribed = (streamUuid: string, channelName: string) => void;
+declare type CallbackStart = () => void;
+declare type CallbackStop = () => void;
+export declare class AGAudioRawDataDispatcher {
+    logger: Logger;
+    private static DEFAULT_FRAME_SIZE;
+    private _microphoneTrackRawDataObservers;
+    private _audioTrackRawDataObservers;
+    private _eventBus;
+    private _configs;
+    private _state;
+    setConfig(config: AgoraRteAudioRawDataConfig, position: AgoraRteAudioRawDataPosition): void;
+    get isStarted(): boolean;
+    get microphoneTrackRawDataConfig(): AgoraRteAudioRawDataConfig;
+    get audioTrackRawDataConfig(): AgoraRteAudioRawDataConfig;
+    get hasMicrophoneRawDataObservers(): boolean;
+    get hasAudioTrackRawDataObservers(): boolean;
+    private _callbackAudioRawRecorded;
+    private _callbackAudioRawBeforeMixed;
+    start(): void;
+    stop(): void;
+    dispatch(event: 'AudioRawDataRecored', ...params: Parameters<CallbackRawDataRecorded>): void;
+    dispatch(event: 'AudioRawDataBeforeMixed', ...params: Parameters<CallbackRawDataBeforeMixed>): void;
+    dispatch(event: 'ObserverChanged', ...params: Parameters<CallbackObserverChanged>): void;
+    dispatch(event: 'MicrophoneTrackCreated', ...params: Parameters<CallbackMicrophoneTrackCreated>): void;
+    dispatch(event: 'AudioTrackSubscribed', ...params: Parameters<CallbackAudioTrackSubscribed>): void;
+    dispatch(event: 'MicrophoneTrackDestroyed', ...params: Parameters<CallbackMicrophoneTrackDestroyed>): void;
+    dispatch(event: 'AudioTrackUnsubscribed', ...params: Parameters<CallbackAudioTrackUnsubscribed>): void;
+    dispatch(event: 'Start', ...params: Parameters<CallbackStart>): void;
+    dispatch(event: 'Stop', ...params: Parameters<CallbackStop>): void;
+    register(event: 'AudioRawDataRecored', callback: CallbackRawDataRecorded): void;
+    register(event: 'AudioRawDataBeforeMixed', callback: CallbackRawDataBeforeMixed): void;
+    register(event: 'ObserverChanged', callback: CallbackObserverChanged): void;
+    register(event: 'MicrophoneTrackCreated', callback: CallbackMicrophoneTrackCreated): void;
+    register(event: 'AudioTrackSubscribed', callback: CallbackAudioTrackSubscribed): void;
+    register(event: 'MicrophoneTrackDestroyed', callback: CallbackMicrophoneTrackDestroyed): void;
+    register(event: 'AudioTrackUnsubscribed', callback: CallbackAudioTrackUnsubscribed): void;
+    register(event: 'Start', callback: CallbackStart): void;
+    register(event: 'Stop', callback: CallbackStop): void;
+    unregister(event: 'AudioRawDataRecored', callback: CallbackRawDataRecorded): void;
+    unregister(event: 'AudioRawDataBeforeMixed', callback: CallbackRawDataBeforeMixed): void;
+    unregister(event: 'ObserverChanged', callback: CallbackObserverChanged): void;
+    unregister(event: 'MicrophoneTrackCreated', callback: CallbackMicrophoneTrackCreated): void;
+    unregister(event: 'AudioTrackSubscribed', callback: CallbackAudioTrackSubscribed): void;
+    unregister(event: 'MicrophoneTrackDestroyed', callback: CallbackMicrophoneTrackDestroyed): void;
+    unregister(event: 'AudioTrackUnsubscribed', callback: CallbackAudioTrackUnsubscribed): void;
+    unregister(event: 'Start', callback: CallbackStart): void;
+    unregister(event: 'Stop', callback: CallbackStop): void;
+    addAudioRawDataObserver(observer: AgoraRteAudioRawDataObserver, position: AgoraRteAudioRawDataPosition): void;
+    removeAudioRawDataObserver(observer: AgoraRteAudioRawDataObserver, position: AgoraRteAudioRawDataPosition): void;
+}
+export {};

package/lib/core/rtc/adapter/web/dispatcher.js

@@ -0,0 +1,166 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AGAudioRawDataDispatcher = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.set.js");
+require("core-js/modules/es.string.iterator.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.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.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.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.js");
+require("core-js/modules/esnext.set.union.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
+var _events = require("../../../utils/events");
+var _decorator = require("../../../decorator");
+var _type = require("../../../media/type");
+var _dec, _dec2, _dec3, _dec4, _class, _class2, _class3;
+var AGAudioRawDataDispatcher = (_dec = _decorator.Log.attach({
+  proxyMethods: false
+}), _dec2 = _decorator.Log.trace, _dec3 = _decorator.Log.trace, _dec4 = _decorator.Log.trace, _dec(_class = (_class2 = (_class3 = /*#__PURE__*/function () {
+  function AGAudioRawDataDispatcher() {
+    (0, _classCallCheck2["default"])(this, AGAudioRawDataDispatcher);
+    this.logger = void 0;
+    this._microphoneTrackRawDataObservers = new Set();
+    this._audioTrackRawDataObservers = new Set();
+    this._eventBus = new _events.AGEventEmitter();
+    this._configs = {};
+    this._state = 0;
+  }
+  (0, _createClass2["default"])(AGAudioRawDataDispatcher, [{
+    key: "setConfig",
+    value: function setConfig(config, position) {
+      this._configs[position] = config;
+    }
+  }, {
+    key: "isStarted",
+    get: function get() {
+      return this._state === 1;
+    }
+  }, {
+    key: "microphoneTrackRawDataConfig",
+    get: function get() {
+      var _this$_configs$AgoraR;
+      return (_this$_configs$AgoraR = this._configs[_type.AgoraRteAudioRawDataPosition.record]) !== null && _this$_configs$AgoraR !== void 0 ? _this$_configs$AgoraR : {
+        frameSize: AGAudioRawDataDispatcher.DEFAULT_FRAME_SIZE
+      };
+    }
+  }, {
+    key: "audioTrackRawDataConfig",
+    get: function get() {
+      var _this$_configs$AgoraR2;
+      return (_this$_configs$AgoraR2 = this._configs[_type.AgoraRteAudioRawDataPosition.beforeMixed]) !== null && _this$_configs$AgoraR2 !== void 0 ? _this$_configs$AgoraR2 : {
+        frameSize: AGAudioRawDataDispatcher.DEFAULT_FRAME_SIZE
+      };
+    }
+  }, {
+    key: "hasMicrophoneRawDataObservers",
+    get: function get() {
+      return !!this._microphoneTrackRawDataObservers.size;
+    }
+  }, {
+    key: "hasAudioTrackRawDataObservers",
+    get: function get() {
+      return !!this._audioTrackRawDataObservers.size;
+    }
+  }, {
+    key: "_callbackAudioRawRecorded",
+    value: function _callbackAudioRawRecorded(rawData) {
+      this._microphoneTrackRawDataObservers.forEach(function (observer) {
+        observer(rawData);
+      });
+    }
+  }, {
+    key: "_callbackAudioRawBeforeMixed",
+    value: function _callbackAudioRawBeforeMixed(rawData, channelName, streamUuid) {
+      this._audioTrackRawDataObservers.forEach(function (observer) {
+        observer(rawData, channelName, streamUuid);
+      });
+    }
+  }, {
+    key: "start",
+    value: function start() {
+      this._state = 1;
+      this.register('AudioRawDataBeforeMixed', this._callbackAudioRawBeforeMixed);
+      this.register('AudioRawDataRecored', this._callbackAudioRawRecorded);
+      this.dispatch('Start');
+    }
+  }, {
+    key: "stop",
+    value: function stop() {
+      this._state = 0;
+      this.unregister('AudioRawDataBeforeMixed', this._callbackAudioRawBeforeMixed);
+      this.unregister('AudioRawDataRecored', this._callbackAudioRawRecorded);
+      this.dispatch('Stop');
+    }
+  }, {
+    key: "dispatch",
+    value: function dispatch(event) {
+      if (this.isStarted) {
+        var _this$_eventBus;
+        for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          params[_key - 1] = arguments[_key];
+        }
+        this.logger.debug("event: ".concat(event, ", params:"), params);
+        (_this$_eventBus = this._eventBus).emit.apply(_this$_eventBus, [event].concat(params));
+      }
+    }
+  }, {
+    key: "register",
+    value: function register(event, callback) {
+      this._eventBus.on(event, callback);
+    }
+  }, {
+    key: "unregister",
+    value: function unregister(event, callback) {
+      this._eventBus.off(event, callback);
+    }
+  }, {
+    key: "addAudioRawDataObserver",
+    value: function addAudioRawDataObserver(observer, position) {
+      if (position === _type.AgoraRteAudioRawDataPosition.record) {
+        this._microphoneTrackRawDataObservers.add(observer.onAudioRawDataRecored);
+      }
+      if (position === _type.AgoraRteAudioRawDataPosition.beforeMixed) {
+        this._audioTrackRawDataObservers.add(observer.onAudioRawDataBeforeMixed);
+      }
+      this.dispatch('ObserverChanged', position);
+    }
+  }, {
+    key: "removeAudioRawDataObserver",
+    value: function removeAudioRawDataObserver(observer, position) {
+      if (position === _type.AgoraRteAudioRawDataPosition.record) {
+        this._microphoneTrackRawDataObservers["delete"](observer.onAudioRawDataRecored);
+      }
+      if (position === _type.AgoraRteAudioRawDataPosition.beforeMixed) {
+        this._audioTrackRawDataObservers["delete"](observer.onAudioRawDataBeforeMixed);
+      }
+      this.dispatch('ObserverChanged', position);
+    }
+  }]);
+  return AGAudioRawDataDispatcher;
+}(), _class3.DEFAULT_FRAME_SIZE = 1024, _class3), ((0, _applyDecoratedDescriptor2["default"])(_class2.prototype, "setConfig", [_dec2], Object.getOwnPropertyDescriptor(_class2.prototype, "setConfig"), _class2.prototype), (0, _applyDecoratedDescriptor2["default"])(_class2.prototype, "_callbackAudioRawRecorded", [_decorator.bound], Object.getOwnPropertyDescriptor(_class2.prototype, "_callbackAudioRawRecorded"), _class2.prototype), (0, _applyDecoratedDescriptor2["default"])(_class2.prototype, "_callbackAudioRawBeforeMixed", [_decorator.bound], Object.getOwnPropertyDescriptor(_class2.prototype, "_callbackAudioRawBeforeMixed"), _class2.prototype), (0, _applyDecoratedDescriptor2["default"])(_class2.prototype, "start", [_dec3], Object.getOwnPropertyDescriptor(_class2.prototype, "start"), _class2.prototype), (0, _applyDecoratedDescriptor2["default"])(_class2.prototype, "stop", [_dec4], Object.getOwnPropertyDescriptor(_class2.prototype, "stop"), _class2.prototype)), _class2)) || _class);
+exports.AGAudioRawDataDispatcher = AGAudioRawDataDispatcher;

package/lib/core/rtc/adapter/web/index.d.ts

@@ -1,16 +1,18 @@
 import { LocalVideoTrackStateEvent, LocalAudioTrackStateEvent, LocalAudioPlaybackVolumeIndicatorEvent } from '../base';
 import { RtcAdapterBase, RtcAudioDeviceManagerBase, RtcChannelAdapterBase, RtcVideoDeviceManagerBase } from '../base';
-import { AudienceLatencyLevelType, RemoteStreamType, SDK_CODEC, SDK_MODE } from 'agora-rtc-sdk-ng';
+import { AudienceLatencyLevelType, SDK_CODEC, SDK_MODE } from 'agora-rtc-sdk-ng';
 import { AgoraRteCameraThread, AgoraRteMicrophoneThread, AgoraRteScreenShareThread } from './thread';
 import { AgoraRtcVideoCanvas } from '../../canvas';
 import { AgoraRteVideoSourceType } from '../../../media/track';
 import { AgoraRteWebClientMain, AgoraRteWebClientSub } from './client';
 import { AGRtcConnectionType } from '../../channel';
-import { AGScreenShareDevice, AGAudioRawDataConfig, AGNetworkStats, AGRtcState, AGLowStreamParameter, AGBeautyEffect } from '../../type';
+import { AGScreenShareDevice, AGNetworkStats, AGRtcState, AGLowStreamParameter, AGBeautyEffect, AGRemoteVideoStreamType } from '../../type';
 import { AgoraLatencyLevel } from '../../../../configs';
 import { AGChannelProfile } from '../../../../type';
 import { IBaseProcessor } from 'agora-rte-extension';
 import { Logger } from '../../../logger';
+import { AGAudioRawDataDispatcher } from './dispatcher';
+import { AgoraRteAudioRawDataConfig, AgoraRteAudioRawDataObserver, AgoraRteAudioRawDataPosition } from '../../../media/type';
 export interface RtcAdapterWebConfig {
     codec: SDK_CODEC;
     mode: SDK_MODE;
@@ -21,11 +23,12 @@ export declare class RtcAdapterWeb extends RtcAdapterBase {
     private _channels;
     private _vdm;
     private _adm;
+    private _audioRawDataDispatcher;
+    private _audioPlayer;
     readonly cameraThread: AgoraRteCameraThread;
     readonly micThread: AgoraRteMicrophoneThread;
     readonly screenThread: AgoraRteScreenShareThread;
     readonly remoteCanvas: Map<string, AgoraRtcVideoCanvas>;
-    private _audioPlayer;
     static defaultConfigs: RtcAdapterWebConfig;
     private _configs?;
     get configs(): {
@@ -62,11 +65,12 @@ export declare class RtcAdapterWeb extends RtcAdapterBase {
     onLocalAudioTrackStateChanged(cb: LocalAudioTrackStateEvent): number;
     onLocalScreenShareTrackStateChanged(cb: LocalVideoTrackStateEvent): number;
     onLocalAudioVolume(cb: (volume: number) => void): number;
-    onAudioFrame(cb: (buffer: ArrayBuffer) => void): number;
     setBeautyEffectOptions(enable: boolean, options: AGBeautyEffect): number;
     setAudioFrameCallback(): number;
     stopAudioFrameCallback(): number;
-    setAudioRawDataConfig(config: AGAudioRawDataConfig): number;
+    addAudioRawDataObserver(observer: AgoraRteAudioRawDataObserver, position: AgoraRteAudioRawDataPosition): number;
+    removeAudioRawDataObserver(observer: AgoraRteAudioRawDataObserver, position: AgoraRteAudioRawDataPosition): number;
+    setAudioRawDataConfig(config: AgoraRteAudioRawDataConfig, position: AgoraRteAudioRawDataPosition): number;
     hasScreenSharePermission(): boolean;
     takeSnapshot(_channel: string, _streamUuid: number, _filePath: string): Promise<never>;
     getCurrentFrameData(channelName: string, streamUuid: string, isLocal: boolean): ImageData;
@@ -83,7 +87,7 @@ export declare class RtcChannelAdapterWeb extends RtcChannelAdapterBase {
     readonly main: AgoraRteWebClientMain;
     readonly sub: AgoraRteWebClientSub;
     channelName: string;
-    constructor(channelName: string, configs: RtcAdapterWebConfig, base: RtcAdapterBase);
+    constructor(channelName: string, configs: RtcAdapterWebConfig, base: RtcAdapterBase, audioRawDataDispatcher: AGAudioRawDataDispatcher);
     getSessionId(): any;
     private client;
     setLatencyLevel(level: AgoraLatencyLevel): void;
@@ -92,7 +96,7 @@ export declare class RtcChannelAdapterWeb extends RtcChannelAdapterBase {
     leave(connectionType?: AGRtcConnectionType): Promise<void>;
     enableDualStream(enable: boolean, connectionType: AGRtcConnectionType): Promise<void>;
     setLowStreamParameter(streamParameter: AGLowStreamParameter, connectionType: AGRtcConnectionType): number;
-    setRemoteVideoStreamType(streamUuid: string, streamType: RemoteStreamType, connectionType: AGRtcConnectionType): Promise<void>;
+    setRemoteVideoStreamType(streamUuid: string, streamType: AGRemoteVideoStreamType, connectionType: AGRtcConnectionType): Promise<void>;
     muteLocalVideo(mute: boolean, connectionType: AGRtcConnectionType): number;
     muteLocalAudio(mute: boolean, connectionType: AGRtcConnectionType): number;
     muteLocalScreenShare(mute: boolean, connectionType: AGRtcConnectionType): number;