agora-rte-sdk 2.8.21 → 2.8.30

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

@@ -75,6 +75,7 @@ var _log = require("../../../decorator/log");
 var _configs = require("../../../../configs");
 var _type = require("../../../../type");
 var _logger = require("../../../logger");
+var _dispatcher = require("./dispatcher");
 var _dec, _class, _class2, _dec2, _class3;
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -94,11 +95,12 @@ var RtcAdapterWeb = (_dec = _log.Log.attach({
     _this._channels = new Map();
     _this._vdm = new _device.RtcVideoDeviceManagerWeb((0, _assertThisInitialized2["default"])(_this), _configs.AgoraRteEngineConfig.shared.rtcConfigs.noDevicePermission);
     _this._adm = new _device.RtcAudioDeviceManagerWeb((0, _assertThisInitialized2["default"])(_this), _configs.AgoraRteEngineConfig.shared.rtcConfigs.noDevicePermission);
+    _this._audioRawDataDispatcher = new _dispatcher.AGAudioRawDataDispatcher();
+    _this._audioPlayer = new _player.AGWebAudioPlayer();
     _this.cameraThread = new _thread.AgoraRteCameraThread();
-    _this.micThread = new _thread.AgoraRteMicrophoneThread();
+    _this.micThread = new _thread.AgoraRteMicrophoneThread(_this._audioRawDataDispatcher);
     _this.screenThread = new _thread.AgoraRteScreenShareThread();
     _this.remoteCanvas = new Map();
-    _this._audioPlayer = new _player.AGWebAudioPlayer();
     _this._configs = void 0;
     _this._configs = configs;
     if (_type.AgoraRteLogLevel.DEBUG === _configs.AgoraRteEngineConfig.logLevel) {
@@ -113,6 +115,7 @@ var RtcAdapterWeb = (_dec = _log.Log.attach({
         return e.instance;
       }));
     }
+    _this._audioRawDataDispatcher.start();
     return _this;
   }
   (0, _createClass2["default"])(RtcAdapterWeb, [{
@@ -137,7 +140,7 @@ var RtcAdapterWeb = (_dec = _log.Log.attach({
     value: function createRtcChannel(channelName, base) {
       var channel = this._channels.get(channelName);
       if (!channel) {
-        channel = new RtcChannelAdapterWeb(channelName, this.configs, base);
+        channel = new RtcChannelAdapterWeb(channelName, this.configs, base, this._audioRawDataDispatcher);
         this._channels.set(channelName, channel);
       }
       return channel;
@@ -304,12 +307,6 @@ var RtcAdapterWeb = (_dec = _log.Log.attach({
       this.micThread.on(_control.AgoraMediaControlEventType.localAudioVolume, cb);
       return 0;
     }
-  }, {
-    key: "onAudioFrame",
-    value: function onAudioFrame(cb) {
-      this.micThread.on(_control.AgoraMediaControlEventType.localAudioFrame, cb);
-      return 0;
-    }
   }, {
     key: "setBeautyEffectOptions",
     value: function setBeautyEffectOptions(enable, options) {
@@ -319,19 +316,31 @@ var RtcAdapterWeb = (_dec = _log.Log.attach({
   }, {
     key: "setAudioFrameCallback",
     value: function setAudioFrameCallback() {
-      this.micThread.setAudioFrameCallback();
+      this._audioRawDataDispatcher.start();
       return 0;
     }
   }, {
     key: "stopAudioFrameCallback",
     value: function stopAudioFrameCallback() {
-      this.micThread.stopAudioFrameCallback();
+      this._audioRawDataDispatcher.stop();
+      return 0;
+    }
+  }, {
+    key: "addAudioRawDataObserver",
+    value: function addAudioRawDataObserver(observer, position) {
+      this._audioRawDataDispatcher.addAudioRawDataObserver(observer, position);
+      return 0;
+    }
+  }, {
+    key: "removeAudioRawDataObserver",
+    value: function removeAudioRawDataObserver(observer, position) {
+      this._audioRawDataDispatcher.removeAudioRawDataObserver(observer, position);
       return 0;
     }
   }, {
     key: "setAudioRawDataConfig",
-    value: function setAudioRawDataConfig(config) {
-      this.micThread.setAudioRawDataConfig(config);
+    value: function setAudioRawDataConfig(config, position) {
+      this._audioRawDataDispatcher.setConfig(config, position);
       return 0;
     }
   }, {
@@ -433,7 +442,7 @@ var RtcChannelAdapterWeb = (_dec2 = _log.Log.attach({
 }), _dec2(_class3 = /*#__PURE__*/function (_RtcChannelAdapterBas) {
   (0, _inherits2["default"])(RtcChannelAdapterWeb, _RtcChannelAdapterBas);
   var _super2 = _createSuper(RtcChannelAdapterWeb);
-  function RtcChannelAdapterWeb(channelName, configs, base) {
+  function RtcChannelAdapterWeb(channelName, configs, base, audioRawDataDispatcher) {
     var _this2;
     (0, _classCallCheck2["default"])(this, RtcChannelAdapterWeb);
     _this2 = _super2.call(this);
@@ -442,8 +451,8 @@ var RtcChannelAdapterWeb = (_dec2 = _log.Log.attach({
     _this2.sub = void 0;
     _this2.channelName = void 0;
     _this2.channelName = channelName;
-    _this2.main = new _client.AgoraRteWebClientMain(channelName, configs, base, _channel2.AGRtcConnectionType.main);
-    _this2.sub = new _client.AgoraRteWebClientSub(channelName, configs, base, _channel2.AGRtcConnectionType.sub);
+    _this2.main = new _client.AgoraRteWebClientMain(channelName, configs, base, _channel2.AGRtcConnectionType.main, audioRawDataDispatcher);
+    _this2.sub = new _client.AgoraRteWebClientSub(channelName, configs, base, _channel2.AGRtcConnectionType.sub, audioRawDataDispatcher);
     return _this2;
   }
   (0, _createClass2["default"])(RtcChannelAdapterWeb, [{

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

@@ -1,9 +1,10 @@
 import { AgoraRteThread } from '../../../utils/thread';
 import { AgoraRtcVideoCanvas } from '../../canvas';
-import { AgoraRteMediaSourceState, AGAudioRawDataConfig, AGMediaBaseTrack } from '../../type';
-import { IAgoraRTCClient, IAgoraRTCRemoteUser, ILocalAudioTrack, ILocalTrack, IRemoteAudioTrack } from 'agora-rtc-sdk-ng';
+import { AgoraRteMediaSourceState, AGMediaBaseTrack } from '../../type';
+import { IAgoraRTCClient, IAgoraRTCRemoteUser, ILocalTrack, IRemoteAudioTrack } from 'agora-rtc-sdk-ng';
 import { IBaseProcessor } from 'agora-rte-extension';
 import { RtcAdapterWebConfig } from '.';
+import { AGAudioRawDataDispatcher } from './dispatcher';
 export declare class AgoraRteMediaTrackThread extends AgoraRteThread {
     track?: AGMediaBaseTrack;
     processors: IBaseProcessor[];
@@ -23,16 +24,17 @@ export declare class AgoraRteCameraThread extends AgoraRteMediaTrackThread {
     onExecution(): Promise<void>;
 }
 export declare class AgoraRteMicrophoneThread extends AgoraRteMediaTrackThread {
-    pcmTrack?: ILocalAudioTrack;
     micEnable: boolean;
+    trackState: AgoraRteMediaSourceState;
     private _recordingDeviceId?;
     private _recordingDeviceChanged;
-    trackState: AgoraRteMediaSourceState;
     private _volumePollingTask?;
-    private _audioRawConfig;
+    private _rawDataDispatcher;
+    private _pcmTrack?;
+    constructor(rawDataDispatcher: AGAudioRawDataDispatcher);
     setMicTrackState(state: AgoraRteMediaSourceState, reason?: string): void;
     setRecordingDevice(deviceId: string): void;
-    setAudioRawDataConfig(config: AGAudioRawDataConfig): void;
+    preparePcmCallback(): void;
     setAudioFrameCallback(): Promise<void>;
     stopAudioFrameCallback(): void;
     onExecution(): Promise<void>;
@@ -106,17 +108,22 @@ export declare class AgoraRteSubscribeThread extends AgoraRteThread {
     private _volumePollingTask?;
     private _prevCanvasView;
     private _prevRenderMode;
-    get mute(): boolean;
-    get streamUuid(): string;
-    get canvas(): AgoraRtcVideoCanvas | undefined;
+    private _pcmTrack?;
+    private _rawDataDispatcher;
     constructor(client: IAgoraRTCClient, user: IAgoraRTCRemoteUser, { channelName, muteMap, canvasMap, mediaType, }: {
         channelName: string;
         muteMap: Map<string, boolean>;
         canvasMap?: Map<string, AgoraRtcVideoCanvas>;
         mediaType: 'video' | 'audio';
-    });
+    }, rawDataDispatcher: AGAudioRawDataDispatcher);
+    get mute(): boolean;
+    get streamUuid(): string;
+    get canvas(): AgoraRtcVideoCanvas | undefined;
     isTrackSubscribed(): boolean;
-    get track(): import("agora-rtc-sdk-ng").IRemoteVideoTrack | IRemoteAudioTrack | undefined;
+    get track(): IRemoteAudioTrack | import("agora-rtc-sdk-ng").IRemoteVideoTrack | undefined;
     play(): void;
+    preparePcmCallback(): void;
+    setAudioFrameCallback(): Promise<void>;
+    stopAudioFrameCallback(): void;
     onExecution(): Promise<void>;
 }