agora-rte-sdk 3.3.0 → 3.4.0

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

@@ -0,0 +1,85 @@
+import { AgoraRteError } from '../utilities/error';
+export interface AgoraRtcAccessPointConfig {
+    serverList: string[];
+    verifyDomainName?: string;
+}
+export interface AgoraWebRtcAccessPointConfig extends AgoraRtcAccessPointConfig {
+    serverDomain?: string;
+    serverPort?: number;
+    reportConfig?: {
+        hostname?: string[];
+        port?: number;
+    };
+    logConfig?: {
+        hostname?: string[];
+        port?: number;
+    };
+    cdsConfig?: {
+        hostname?: string[];
+        port?: number;
+    };
+}
+export interface AgoraElectronRtcAccessPointConfig extends AgoraRtcAccessPointConfig {
+    verifyDomainName: string;
+}
+export interface AgoraRteApDetectorObserver {
+    onDetectionSuccess?(): void;
+    onDetectionFailure?(): void;
+}
+export interface AgoraRteApDetector {
+    readonly finished: boolean;
+    _internalRtcConfig: AgoraRtcAccessPointConfig | undefined;
+    _externalRtcConfig: AgoraRtcAccessPointConfig | undefined;
+    init(internalRtcConfig: AgoraRtcAccessPointConfig | undefined, externalRtcConfig: AgoraRtcAccessPointConfig | undefined): void;
+    /**
+     * 是否需要探测
+     */
+    isDetectRequired(): boolean;
+    /**
+     * 开始探测可用IP
+     */
+    start(): void;
+    /**
+     * 停止探测可用IP
+     */
+    stop(): void;
+    /**
+     * 是否已探测完成
+     */
+    isFinished(): boolean;
+    /**
+     * 获取可用IP列表
+     */
+    getAvailableRtcAccessPointConfig(): AgoraRtcAccessPointConfig | null;
+    /**
+     * 添加成功/失败的观察器
+     */
+    addObserver(observer: AgoraRteApDetectorObserver): AgoraRteError | void;
+    /**
+     * 移除成功/失败的观察器
+     */
+    removeObserver(observer: AgoraRteApDetectorObserver): AgoraRteError | void;
+}
+export declare class AgoraRteApDetectorImpl implements AgoraRteApDetector {
+    finished: boolean;
+    _internalRtcConfig: AgoraRtcAccessPointConfig | undefined;
+    _externalRtcConfig: AgoraRtcAccessPointConfig | undefined;
+    private detectWorkMap;
+    private _apDetectorObserver;
+    private _rawObjGroups;
+    constructor(internalRtcConfig: AgoraRtcAccessPointConfig | undefined, externalRtcConfig: AgoraRtcAccessPointConfig | undefined);
+    init(internalRtcConfig: AgoraRtcAccessPointConfig | undefined, externalRtcConfig: AgoraRtcAccessPointConfig | undefined): void;
+    get hasDetectingTask(): boolean;
+    private _getDetectWorkMapRawVal;
+    private _transformUrlToRequestUrl;
+    private _fetchWithTimeoutAndCheck;
+    private _runTasksWithConcurrency;
+    start(): void;
+    private _checkResultAndNotifyResult;
+    isDetectRequired(): boolean;
+    stop(): void;
+    isFinished(): boolean;
+    getAvailableRtcAccessPointConfig(): AgoraRtcAccessPointConfig | null;
+    addObserver(observer: AgoraRteApDetectorObserver): AgoraRteError | void;
+    removeObserver(observer: AgoraRteApDetectorObserver): AgoraRteError | void;
+}

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

@@ -0,0 +1,373 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.iterator.js");
+require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.regexp.to-string.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AgoraRteApDetectorImpl = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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.iterator.js");
+require("core-js/modules/es.array.join.js");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.promise.js");
+require("core-js/modules/es.promise.all-settled.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _imports = require("../../imports");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var NEED_DETECT_MAX_IP_COUNT = 5;
+var DEFAULT_FETCH_URL_TIMEOUT = 300;
+var isMock = false;
+// 用于判断是否是IP地址，简单的正则表达式判断示例，可根据实际完善
+var isIP = function isIP(ip) {
+  var ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+  return ipRegex.test(ip);
+};
+
+// 判断是否为域名的函数
+var isDomainName = function isDomainName(str) {
+  var domainRegex = /^(?!:\/\/)(?=^.{1,253}$)([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+  return domainRegex.test(str);
+};
+var AgoraRteApDetectorImpl = exports.AgoraRteApDetectorImpl = /*#__PURE__*/function () {
+  function AgoraRteApDetectorImpl(internalRtcConfig, externalRtcConfig) {
+    (0, _classCallCheck2["default"])(this, AgoraRteApDetectorImpl);
+    (0, _defineProperty2["default"])(this, "finished", false);
+    (0, _defineProperty2["default"])(this, "detectWorkMap", this._getDetectWorkMapRawVal());
+    (0, _defineProperty2["default"])(this, "_apDetectorObserver", new _imports.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_rawObjGroups", []);
+    this.init(internalRtcConfig, externalRtcConfig);
+  }
+  return (0, _createClass2["default"])(AgoraRteApDetectorImpl, [{
+    key: "init",
+    value: function init(internalRtcConfig, externalRtcConfig) {
+      this._internalRtcConfig = internalRtcConfig;
+      this._externalRtcConfig = externalRtcConfig;
+    }
+  }, {
+    key: "hasDetectingTask",
+    get: function get() {
+      return this.detectWorkMap.isDetecting;
+    }
+  }, {
+    key: "_getDetectWorkMapRawVal",
+    value: function _getDetectWorkMapRawVal() {
+      var newMap = {
+        internal: {
+          result: null
+        },
+        external: {
+          result: null
+        },
+        isDetecting: false
+      };
+      return newMap;
+    }
+  }, {
+    key: "_transformUrlToRequestUrl",
+    value: function _transformUrlToRequestUrl(url) {
+      if (isMock) {
+        return "http://".concat(url);
+      } else if ((0, _imports.isElectron)()) {
+        return "https://".concat(url);
+      } else {
+        if (isIP(url)) {
+          var modifiedIp = url.split('.').join('-') + '.rtctest.com';
+          var getUrl = "https://".concat(modifiedIp);
+          return getUrl;
+        } else if (isDomainName(url)) {
+          return "https://".concat(url);
+        }
+        return '';
+      }
+    }
+
+    // 请求 url，300ms 内返回 HTTP 状态 为 200 且包体为 hello 表示成功，其他情况均为失败
+  }, {
+    key: "_fetchWithTimeoutAndCheck",
+    value: function _fetchWithTimeoutAndCheck(urlObj, customTimeout) {
+      return new Promise(function (resolve, reject) {
+        (0, _imports.fetch)(urlObj.requestUrl, {
+          timeout: customTimeout,
+          method: 'GET'
+        }).then(/*#__PURE__*/function () {
+          var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(response) {
+            var data;
+            return _regenerator["default"].wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (response.status === 200) {
+                    data = response.data;
+                    if (data === 'hello') {
+                      resolve(urlObj.rawUrl);
+                    } else {
+                      reject(new Error('response content not hello'));
+                    }
+                  } else {
+                    reject(new Error("response code not 200, but: ".concat(response.status)));
+                  }
+                case 1:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+          return function (_x) {
+            return _ref.apply(this, arguments);
+          };
+        }())["catch"](function (error) {
+          if (error.name === 'AbortError') {
+            reject(new Error('request timeout'));
+          } else {
+            reject(error);
+          }
+        });
+      });
+    }
+  }, {
+    key: "_runTasksWithConcurrency",
+    value: function () {
+      var _runTasksWithConcurrency2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(rawUrls, maxConcurrency) {
+        var _this = this;
+        var urlObjs, i, rawUrl, requestUrl, rawObjGroups, _i, allResults, processGroups;
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              // 用于存放分组后的原始链接组
+              urlObjs = [];
+              for (i = 0; i < rawUrls.length; i++) {
+                rawUrl = rawUrls[i];
+                requestUrl = this._transformUrlToRequestUrl(rawUrl);
+                if (requestUrl) {
+                  urlObjs.push({
+                    rawUrl: rawUrl,
+                    requestUrl: requestUrl
+                  });
+                }
+              }
+              rawObjGroups = [];
+              for (_i = 0; _i < urlObjs.length; _i += maxConcurrency) {
+                rawObjGroups.push(urlObjs.slice(_i, _i + maxConcurrency));
+              }
+              this._rawObjGroups = rawObjGroups;
+              allResults = []; // 依次处理每个请求组
+              processGroups = /*#__PURE__*/function () {
+                var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+                  var _iterator, _step, group, groupPromises, groupPromiseResults, resolvedResults, finalResults;
+                  return _regenerator["default"].wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        // 用于存放所有组请求结果的数组
+                        _iterator = _createForOfIteratorHelper(_this._rawObjGroups);
+                        _context2.prev = 1;
+                        _iterator.s();
+                      case 3:
+                        if ((_step = _iterator.n()).done) {
+                          _context2.next = 14;
+                          break;
+                        }
+                        group = _step.value;
+                        // 将一组请求的Promise对象收集起来
+                        groupPromises = group.map(function (urlObj) {
+                          return _this._fetchWithTimeoutAndCheck(urlObj, DEFAULT_FETCH_URL_TIMEOUT);
+                        });
+                        _context2.next = 8;
+                        return Promise.allSettled(groupPromises);
+                      case 8:
+                        groupPromiseResults = _context2.sent;
+                        resolvedResults = groupPromiseResults.filter(function (result) {
+                          return result.status === 'fulfilled';
+                        });
+                        finalResults = resolvedResults.map(function (result) {
+                          return result.value;
+                        });
+                        allResults.push.apply(allResults, (0, _toConsumableArray2["default"])(finalResults));
+                      case 12:
+                        _context2.next = 3;
+                        break;
+                      case 14:
+                        _context2.next = 19;
+                        break;
+                      case 16:
+                        _context2.prev = 16;
+                        _context2.t0 = _context2["catch"](1);
+                        _iterator.e(_context2.t0);
+                      case 19:
+                        _context2.prev = 19;
+                        _iterator.f();
+                        return _context2.finish(19);
+                      case 22:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2, null, [[1, 16, 19, 22]]);
+                }));
+                return function processGroups() {
+                  return _ref2.apply(this, arguments);
+                };
+              }();
+              _context3.next = 9;
+              return processGroups();
+            case 9:
+              return _context3.abrupt("return", allResults);
+            case 10:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function _runTasksWithConcurrency(_x2, _x3) {
+        return _runTasksWithConcurrency2.apply(this, arguments);
+      }
+      return _runTasksWithConcurrency;
+    }()
+  }, {
+    key: "start",
+    value: function start() {
+      var _this$_internalRtcCon,
+        _this$_internalRtcCon2,
+        _this$_externalRtcCon,
+        _this$_externalRtcCon2,
+        _this2 = this;
+      if (this.finished || this.hasDetectingTask) {
+        return;
+      }
+      var internalIpList = (_this$_internalRtcCon = (_this$_internalRtcCon2 = this._internalRtcConfig) === null || _this$_internalRtcCon2 === void 0 ? void 0 : _this$_internalRtcCon2.serverList) !== null && _this$_internalRtcCon !== void 0 ? _this$_internalRtcCon : [];
+      var externalIpList = (_this$_externalRtcCon = (_this$_externalRtcCon2 = this._externalRtcConfig) === null || _this$_externalRtcCon2 === void 0 ? void 0 : _this$_externalRtcCon2.serverList) !== null && _this$_externalRtcCon !== void 0 ? _this$_externalRtcCon : [];
+      var maxConcurrency = 5;
+      (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+        var _this2$detectWorkMap$;
+        var resUrls, internalResultIpList, _resUrls;
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              // 如果传入了内部IP的合法配置
+              _this2.detectWorkMap.isDetecting = true;
+              if (!(_this2._internalRtcConfig && internalIpList.length > 0)) {
+                _context4.next = 6;
+                break;
+              }
+              _context4.next = 4;
+              return _this2._runTasksWithConcurrency(internalIpList, maxConcurrency);
+            case 4:
+              resUrls = _context4.sent;
+              _this2.detectWorkMap.internal.result = {
+                serverList: resUrls,
+                verifyDomainName: _this2._internalRtcConfig.verifyDomainName
+              };
+            case 6:
+              internalResultIpList = ((_this2$detectWorkMap$ = _this2.detectWorkMap.internal) === null || _this2$detectWorkMap$ === void 0 || (_this2$detectWorkMap$ = _this2$detectWorkMap$.result) === null || _this2$detectWorkMap$ === void 0 ? void 0 : _this2$detectWorkMap$.serverList) || []; // 如果传入了外部IP的合法配置 并且 内网配置结果的ipList未有合格项
+              if (!(_this2._externalRtcConfig && externalIpList.length > 0 && internalResultIpList.length == 0)) {
+                _context4.next = 12;
+                break;
+              }
+              _context4.next = 10;
+              return _this2._runTasksWithConcurrency(externalIpList, maxConcurrency);
+            case 10:
+              _resUrls = _context4.sent;
+              _this2.detectWorkMap.external.result = {
+                serverList: _resUrls,
+                verifyDomainName: _this2._externalRtcConfig.verifyDomainName
+              };
+            case 12:
+              _this2.detectWorkMap.isDetecting = false;
+              _this2._checkResultAndNotifyResult();
+            case 14:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }))();
+    }
+  }, {
+    key: "_checkResultAndNotifyResult",
+    value: function _checkResultAndNotifyResult() {
+      var cfg = this.getAvailableRtcAccessPointConfig();
+      if (!cfg) {
+        this._apDetectorObserver.notifyObservers('onDetectionFailure');
+      } else {
+        this._apDetectorObserver.notifyObservers('onDetectionSuccess');
+      }
+      this.detectWorkMap.isDetecting = false;
+      this.finished = true;
+    }
+  }, {
+    key: "isDetectRequired",
+    value: function isDetectRequired() {
+      if (this._internalRtcConfig || this._externalRtcConfig) {
+        var _this$_internalRtcCon3, _this$_internalRtcCon4, _this$_externalRtcCon3, _this$_externalRtcCon4;
+        var internalLen = (_this$_internalRtcCon3 = (_this$_internalRtcCon4 = this._internalRtcConfig) === null || _this$_internalRtcCon4 === void 0 ? void 0 : _this$_internalRtcCon4.serverList.length) !== null && _this$_internalRtcCon3 !== void 0 ? _this$_internalRtcCon3 : 0;
+        var externalLen = (_this$_externalRtcCon3 = (_this$_externalRtcCon4 = this._externalRtcConfig) === null || _this$_externalRtcCon4 === void 0 ? void 0 : _this$_externalRtcCon4.serverList.length) !== null && _this$_externalRtcCon3 !== void 0 ? _this$_externalRtcCon3 : 0;
+        return internalLen >= NEED_DETECT_MAX_IP_COUNT || externalLen >= NEED_DETECT_MAX_IP_COUNT;
+      }
+      return false;
+    }
+  }, {
+    key: "stop",
+    value: function stop() {
+      this._rawObjGroups = [];
+      this.detectWorkMap = this._getDetectWorkMapRawVal();
+    }
+  }, {
+    key: "isFinished",
+    value: function isFinished() {
+      return this.finished;
+    }
+  }, {
+    key: "getAvailableRtcAccessPointConfig",
+    value: function getAvailableRtcAccessPointConfig() {
+      if (!this.isDetectRequired() || this.isFinished()) {
+        return this._internalRtcConfig || this._externalRtcConfig || null;
+      }
+      var res = null;
+      var internalResult = this.detectWorkMap.internal.result;
+      if (internalResult && Array.isArray(internalResult.serverList) && internalResult.serverList.length > 0) {
+        res = internalResult;
+      }
+      var externalResult = this.detectWorkMap.external.result;
+      if (!res && externalResult && Array.isArray(externalResult.serverList) && externalResult.serverList.length > 0) {
+        res = externalResult;
+      }
+      return res;
+    }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._apDetectorObserver.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._apDetectorObserver.removeObserver(observer);
+    }
+  }]);
+}();

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

@@ -11,6 +11,7 @@ export declare class AgoraRteEngine {
     private _config;
     private _rtcClient;
     private _rtmClient;
+    private _apDetector;
     private _restfulClient;
     private _apiService;
     private _httpAuthHeadersProvider;

package/lib/core/engine/index.js

@@ -57,26 +57,24 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _media = require("../media");
-var _logger = require("agora-foundation/lib/logger");
+var _imports = require("../../imports");
 var _rtc = require("../rtc");
 var _rtm = require("../rtm");
 var _clone = require("../utilities/clone");
 var _type = require("../../type");
-var _monitor = require("../monitor");
-var _client = require("../services/client");
 var _authHeaders = require("../services/auth-headers");
 var _scene = require("../scene");
 var _registry = require("./registry");
 var _plugin = require("./plugin");
 var _type2 = require("../rtm/type");
-var _observable = require("agora-foundation/lib/utilities/observable");
 var _domainHolder = require("../services/domain-holder");
-var _decorator = require("agora-foundation/lib/decorator");
-var _env = require("agora-foundation/lib/utilities/env");
 var _type3 = require("../scene/type");
 var _api = require("../services/api");
 var _parameters = require("../utilities/parameters");
 var _packageInfo = require("../utilities/package-info");
+var _restfulClient = require("../../plugin/restful-client");
+var _monitor = require("../../plugin/monitor");
+var _apDetector = require("./ap-detector");
 var _AgoraRteEngine;
 var _initProto;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -87,8 +85,8 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
   function AgoraRteEngine(config) {
     (0, _classCallCheck2["default"])(this, AgoraRteEngine);
-    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
-    (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _imports.getLogger)()));
+    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_rtmClientObserver", {
       onConnectionStateUpdated: this._handleConnectionStateUpdated.bind(this),
       onPeerMessageReceived: this._handlePeerMessageReceived.bind(this)
@@ -96,10 +94,10 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_pluginManager", (0, _plugin.getPluginManager)());
     (0, _domainHolder.resetSharedDomainHolder)();
     this._config = (0, _clone.cloneDeep)(config);
-    (0, _logger.setupConsoleHijack)(this.logger);
+    (0, _imports.setupConsoleHijack)(this.logger);
     this.logger.info('[AgoraRteEngine] RTE engine is created, version: ', this.getVersion());
     this._pluginManager.callInitialize(this._config);
-    if ((0, _env.isElectron)()) {
+    if ((0, _imports.isElectron)()) {
       this._rtcClient = (0, _registry.getRegistry)('electron-rtc-client');
     } else {
       this._rtcClient = (0, _registry.getRegistry)('web-rtc-client');
@@ -116,7 +114,7 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
       userId: this._config.userId,
       token: this._config.token
     });
-    this._restfulClient = new _client.AgoraRestfulClient(this._httpAuthHeadersProvider, (0, _domainHolder.getSharedDomainHolder)(this._config.rteRegion));
+    this._restfulClient = new _restfulClient.AgoraRestfulClientImpl(this._httpAuthHeadersProvider, (0, _domainHolder.getSharedDomainHolder)(this._config.rteRegion));
     this._apiService = new _api.AgoraRteServiceApi(this._restfulClient, this._config.appId, this._config.rteRegion, !(0, _parameters.isEndpointRegionDisabled)(config.parameters));
     this._monitor = new _monitor.AgoraRteMonitorImpl({
       appId: this._config.appId,
@@ -131,6 +129,9 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
     if (config.parameters) {
       this.setParameters(config.parameters);
     }
+    var externalRtcConfig = (0, _imports.isElectron)() ? (0, _parameters.getRtcExternaApConfig)(config.parameters) : (0, _parameters.getRtcWebExternaApConfig)(config.parameters);
+    var internalRtcConfig = (0, _imports.isElectron)() ? (0, _parameters.getRtcInternaApConfig)(config.parameters) : (0, _parameters.getRtcWebInternaApConfig)(config.parameters);
+    this._apDetector = new _apDetector.AgoraRteApDetectorImpl(internalRtcConfig, externalRtcConfig);
   }
   return (0, _createClass2["default"])(AgoraRteEngine, [{
     key: "login",
@@ -188,13 +189,15 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
       var rteScene = new _scene.AgoraRteScene(config.sceneId, {
         rtcClient: this._rtcClient,
         rtmClient: this._rtmClient,
+        apDetector: this._apDetector,
         apiService: this._apiService,
         appId: this._config.appId,
         region: this._config.rteRegion
       });
-      this._mediaControl.addObserver({
-        onCameraVideoStateUpdated: rteScene.onCameraVideoStateUpdated,
-        onMicrophoneAudioStateUpdated: rteScene.onMicrophoneAudioStateUpdated
+      this._rtcClient.sourceManager.addObserver({
+        onCameraStateUpdated: rteScene.onCameraVideoStateUpdated,
+        onMicrophoneStateUpdated: rteScene.onMicrophoneAudioStateUpdated,
+        onLoopbackStateUpdated: rteScene.onLoopbackAudioStateUpdated
       });
       return rteScene;
     }
@@ -253,7 +256,7 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
     value: function release() {
       this._pluginManager.callRelease();
       this._monitor.release();
-      (0, _logger.restoreConsoleHijack)();
+      (0, _imports.restoreConsoleHijack)();
     }
   }, {
     key: "addObserver",
@@ -292,6 +295,9 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
           break;
       }
       this._observable.notifyObservers('onConnectionStateUpdated', rteConnState);
+      if (rteConnState === _type.AgoraRteConnectionState.ABORTED) {
+        this.logout();
+      }
     }
   }, {
     key: "_handlePeerMessageReceived",
@@ -317,7 +323,7 @@ var AgoraRteEngine = exports.AgoraRteEngine = /*#__PURE__*/function () {
   }]);
 }();
 _AgoraRteEngine = AgoraRteEngine;
-var _applyDecs$e = _applyDecs(_AgoraRteEngine, [[_decorator.trace, 2, "login"], [_decorator.trace, 2, "logout"], [_decorator.trace, 2, "createScene"], [_decorator.trace, 2, "sendPeerMessage"], [_decorator.trace, 2, "setParameters"], [_decorator.trace, 2, "release"]], []).e;
+var _applyDecs$e = _applyDecs(_AgoraRteEngine, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"], [_imports.trace, 2, "createScene"], [_imports.trace, 2, "sendPeerMessage"], [_imports.trace, 2, "setParameters"], [_imports.trace, 2, "release"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/core/engine/plugin.js

@@ -43,7 +43,7 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
+var _imports = require("../../imports");
 var AgoraRtePluginManager = /*#__PURE__*/function () {
   function AgoraRtePluginManager() {
     (0, _classCallCheck2["default"])(this, AgoraRtePluginManager);
@@ -78,7 +78,7 @@ var getPluginManager = exports.getPluginManager = function getPluginManager() {
   return pluginManager;
 };
 var registerPlugin = exports.registerPlugin = function registerPlugin(plugin) {
-  var logger = (0, _logger.getLogger)();
+  var logger = (0, _imports.getLogger)();
   logger.info('Register plugin:', plugin.name);
   getPluginManager().registerPlugin(plugin);
 };

package/lib/core/media/base-track.d.ts

@@ -1,4 +1,4 @@
-import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+import { AgoraObservable } from '../../imports';
 import { AgoraRtcClient } from '../rtc';
 import { AgoraRteObservableTrack } from './type';
 export declare abstract class AgoraRteBaseTrack<T> implements AgoraRteObservableTrack<T> {

package/lib/core/media/base-track.js

@@ -9,11 +9,11 @@ exports.AgoraRteBaseTrack = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _observable = require("agora-foundation/lib/utilities/observable");
+var _imports = require("../../imports");
 var AgoraRteBaseTrack = exports.AgoraRteBaseTrack = /*#__PURE__*/function () {
   function AgoraRteBaseTrack(_rtcClient) {
     (0, _classCallCheck2["default"])(this, AgoraRteBaseTrack);
-    (0, _defineProperty2["default"])(this, "trackObservable", new _observable.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "trackObservable", new _imports.AgoraObservable());
     this._rtcClient = _rtcClient;
   }
   return (0, _createClass2["default"])(AgoraRteBaseTrack, [{

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

@@ -33,12 +33,12 @@ export interface AgoraRteCameraVideoTrack extends AgoraRteObservableTrack<AgoraR
      * @param config The configuration for the video render.
      * @param view The HTML element to render the video on.
      */
-    startPreview(config: AgoraRteVideoRenderConfig, view: HTMLElement): void;
+    startPreview(config: AgoraRteVideoRenderConfig, view: unknown): void;
     /**
      * Stops the camera preview.
      * @param view The HTML element to render the video on.
      */
-    stopPreview(view: HTMLElement): void;
+    stopPreview(view: unknown): void;
     /**
      * Starts the camera test.
      */