fcr-core 3.7.8 → 3.7.9-alpha

package/lib/room-router/index.js

@@ -1,11 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -26,10 +22,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrRoomRouterImpl = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../imports");
 var _roomControlFactory = require("../room-control/room-control-factory");
 var _type = require("../room-control/type");
@@ -40,10 +32,7 @@ var _retryHelpers = require("../utilities/retry-helpers");
 var _logger = require("../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../utilities/validate-params"));
 var _type2 = require("./type");
-var _FcrRoomRouterImpl;
-let _initProto, _initDecs, _joinRoomDecs, _ref;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+let _initProto, _initDecs, _joinRoomDecs;
 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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -52,30 +41,34 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_initDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger");
+
 class FcrRoomRouterImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;
+  }
+  [(_initDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _joinRoomDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrRoomJoinOptionsSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrRoomRouterImpl'
+  }));
+  _abortController = null;
+  _observable = new _imports.AgoraObservable();
+  _roomControlObservable = {
+    onRoomRouteSwitched: async event => {
+      this._nextRoomRoute = event.targetRouting;
+      this._observable.notifyObservers('onRoomRouteSwitched', this._nextRoomRoute);
+      this.roomControl.removeObserver(this._roomControlObservable);
+      this._roomControl = null;
+    }
+  };
+  _roomControl = null;
+  _nextRoomRoute = {
+    roomId: '',
+    roomType: _type.FcrRoomType.Mainroom,
+    isJoined: false
+  };
+
+  // 接口中新增一个bypass字段，在第一次调用joinRoom的时候不传，在后续收到房间切换后的joinRoom时传true
+  _bypass = undefined;
   constructor(_rteEngine, _apiService, _config, _chatConnection, _sharedCache, roomId) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrRoomRouterImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_abortController", null);
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_roomControlObservable", {
-      onRoomRouteSwitched: async event => {
-        this._nextRoomRoute = event.targetRouting;
-        this._observable.notifyObservers('onRoomRouteSwitched', this._nextRoomRoute);
-        this.roomControl.removeObserver(this._roomControlObservable);
-        this._roomControl = null;
-      }
-    });
-    (0, _defineProperty2.default)(this, "_roomControl", null);
-    (0, _defineProperty2.default)(this, "_nextRoomRoute", {
-      roomId: '',
-      roomType: _type.FcrRoomType.Mainroom,
-      isJoined: false
-    });
-    // 接口中新增一个bypass字段，在第一次调用joinRoom的时候不传，在后续收到房间切换后的joinRoom时传true
-    (0, _defineProperty2.default)(this, "_bypass", undefined);
     this._rteEngine = _rteEngine;
     this._apiService = _apiService;
     this._config = _config;
@@ -108,10 +101,9 @@ class FcrRoomRouterImpl {
     }
   }
   async leaveRoom() {
-    var _this$_abortControlle, _this$_roomControl;
-    (_this$_abortControlle = this._abortController) === null || _this$_abortControlle === void 0 || _this$_abortControlle.abort();
+    this._abortController?.abort();
     this._abortController = null;
-    (_this$_roomControl = this._roomControl) === null || _this$_roomControl === void 0 || _this$_roomControl.leave();
+    this._roomControl?.leave();
     this._roomControl = null;
   }
 
@@ -133,12 +125,11 @@ class FcrRoomRouterImpl {
     const abortController = this._abortController;
     return (0, _imports.retryAttempt)(() => this._performSingleJoinAttempt(options), [], {
       retriesMax: _type2.ROOM_ROUTER_CONSTANTS.MAX_JOIN_ATTEMPTS
-    }).fail(async _ref2 => {
-      let {
-        error,
-        timeFn: waitBeforeRetry,
-        currentRetry: attemptCount
-      } = _ref2;
+    }).fail(async ({
+      error,
+      timeFn: waitBeforeRetry,
+      currentRetry: attemptCount
+    }) => {
       return (0, _joinHelper.handleJoinRetryFailure)(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, () => {
         this._throwIfAborted(abortController);
       }, 'join room via router');
@@ -191,14 +182,15 @@ class FcrRoomRouterImpl {
     } = roomResponse;
     const abortController = this._abortController;
     const roomControl = this._createRoomControl(data);
-    abortController === null || abortController === void 0 || abortController.signal.addEventListener('abort', () => {
+    abortController?.signal.addEventListener('abort', () => {
       roomControl.leave();
     });
-    await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
+    await roomControl.join({
+      ...options,
       snapshot: data,
       timestamp: ts,
       createStreamConfigs: options.createStreamConfigs
-    }));
+    });
     return roomControl;
   }
 
@@ -226,8 +218,8 @@ class FcrRoomRouterImpl {
    * @private
    */
   _handleJoinRoomError(error) {
-    this.logger.error("Failed to join the room: ".concat(error.message));
-    const fcrError = (0, _error.generateFcrCoreClientErrorNew)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, "join room failed: ".concat(error.message));
+    this.logger.error(`Failed to join the room: ${error.message}`);
+    const fcrError = (0, _error.generateFcrCoreClientErrorNew)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `join room failed: ${error.message}`);
     this._observable.notifyObservers('onErrorOccurred', fcrError);
   }
 
@@ -252,7 +244,7 @@ class FcrRoomRouterImpl {
     });
   }
   _throwIfAborted(abortController) {
-    if (abortController !== null && abortController !== void 0 && abortController.signal.aborted) {
+    if (abortController?.signal.aborted) {
       throw new Error('Join room attempt aborted');
     }
   }
@@ -263,6 +255,4 @@ class FcrRoomRouterImpl {
     this._observable.removeObserver(observer);
   }
 }
-exports.FcrRoomRouterImpl = FcrRoomRouterImpl;
-_FcrRoomRouterImpl = FcrRoomRouterImpl;
-[_initProto] = _applyDecs(_FcrRoomRouterImpl, [[_initDecs, 2, "_init"], [_joinRoomDecs, 2, "joinRoom"], [_imports.trace, 2, "leaveRoom"]], []).e;
+exports.FcrRoomRouterImpl = FcrRoomRouterImpl;