fcr-ui-scene 3.5.0 → 3.6.0

package/lib/ui-manager.js

@@ -1,11 +1,50 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/esnext.function.metadata.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");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DefaultSceneUIManager = void 0;
+exports.FcrUIManager = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -14,26 +53,64 @@ var _logger = require("agora-foundation/lib/logger");
 var _devicePretest = require("./modules/device-pretest");
 var _store = require("./modules/device-pretest/store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _parameters = require("./utilities/parameters");
+var _parameters2 = require("./utilities/parameters");
 var _offscreenPulling = require("./modules/offscreen-pulling");
 var _mainScene = require("./scenes/main-scene");
 var _waitingScene = require("./scenes/waiting-scene");
 var _loading = _interopRequireDefault(require("agora-ui-foundation/lib/components/loading"));
+var _mobx = require("mobx");
+var _mobxReact = require("mobx-react");
 var _jsxRuntime = require("react/jsx-runtime");
-var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/function () {
-  // @internal
-
-  function DefaultSceneUIManager(_sceneConfig, _coreConfig, _engine) {
-    (0, _classCallCheck2["default"])(this, DefaultSceneUIManager);
+var _FcrUIManager;
+var _initProto, _init_isLoading;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+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)]; } }; }
+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); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var _A = /*#__PURE__*/new WeakMap();
+var FcrUIManager = exports.FcrUIManager = /*#__PURE__*/function () {
+  function FcrUIManager(_sceneConfig, _engine, _dom, _parameters) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUIManager);
     // @internal
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
+    _classPrivateFieldInitSpec(this, _A, _init_isLoading(this, false));
     this._sceneConfig = _sceneConfig;
-    this._coreConfig = _coreConfig;
     this._engine = _engine;
+    this._dom = _dom;
+    this._parameters = _parameters;
+    _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(_mobxReact.Observer, {
+      children: function children() {
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: [_this.isLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "fcr-connecting-loading",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading["default"], {})
+          }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            ref: function ref(_ref) {
+              return _this._containerDom = _ref;
+            }
+          })]
+        });
+      }
+    }), _dom);
   }
-  return (0, _createClass2["default"])(DefaultSceneUIManager, [{
+  return (0, _createClass2["default"])(FcrUIManager, [{
+    key: "isLoading",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
     key: "renderDevicePretestUi",
-    value: function renderDevicePretestUi(dom, deviceProvider, onJoin, _onExit) {
+    value: function renderDevicePretestUi(deviceProvider, onJoin, _onExit) {
       var pretestStore = new _store.FcrPretestStore({
         deviceProvider: deviceProvider
       });
@@ -60,30 +137,30 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
             }
           })
         })
-      }), dom);
+      }), this._containerDom);
     }
   }, {
     key: "renderPullingUi",
-    value: function renderPullingUi(dom, roomControl) {
-      var coreConfig = this._coreConfig;
+    value: function renderPullingUi(roomControl) {
+      var _this2 = this;
       var offscreenPullingUIModule = new _offscreenPulling.OffscreenPullingUIModule({
         streamControl: roomControl.getStreamControl(),
         userControl: roomControl.getUserControl(),
-        pullingCount: (0, _parameters.getRobotPullingCount)(coreConfig.parameters),
-        pullingStreamType: (0, _parameters.getRobotPullingStreamType)(coreConfig.parameters)
+        pullingCount: (0, _parameters2.getRobotPullingCount)(this._parameters),
+        pullingStreamType: (0, _parameters2.getRobotPullingStreamType)(this._parameters)
       });
       _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         children: "Offscreen pulling mode"
-      }), dom);
+      }), this._containerDom);
       return function () {
-        _reactDom["default"].unmountComponentAtNode(dom);
+        _reactDom["default"].unmountComponentAtNode(_this2._containerDom);
         roomControl.leave();
         offscreenPullingUIModule.release();
       };
     }
   }, {
     key: "renderMainSceneUI",
-    value: function renderMainSceneUI(dom, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
+    value: function renderMainSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
       var scene = new _mainScene.FcrMainUIScene({
         engine: this._engine,
         eventProvider: eventProvider,
@@ -101,16 +178,16 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
         widgetProvider: widgetProvider
       });
       scene.nodeWillActive();
-      scene.mount(dom);
+      scene.mount(this._containerDom);
       return function () {
-        scene.unmount(dom);
+        // scene.unmount(dom);
         scene.nodeWillInactive();
-        roomProvider.leaveRoom();
+        roomProvider.release();
       };
     }
   }, {
     key: "renderWaitingSceneUI",
-    value: function renderWaitingSceneUI(dom, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
+    value: function renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
       var scene = new _waitingScene.FcrWaitingUIScene({
         engine: this._engine,
         eventProvider: eventProvider,
@@ -125,18 +202,30 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
         widgetProvider: widgetProvider
       });
       scene.nodeWillActive();
-      scene.mount(dom);
+      scene.mount(this._containerDom);
       return function () {
-        scene.unmount(dom);
+        // scene.unmount(dom);
         scene.nodeWillInactive();
         // roomProvider.waitingRoomControl?.leave();
-        roomProvider.leaveRoom();
+        roomProvider.release();
       };
     }
   }, {
     key: "renderLoading",
-    value: function renderLoading(dom) {
-      _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(_loading["default"], {}), dom);
+    value: function renderLoading(isLoading) {
+      this.isLoading = isLoading;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      _reactDom["default"].unmountComponentAtNode(this._containerDom);
+      _reactDom["default"].unmountComponentAtNode(this._dom);
     }
   }]);
-}();
+}();
+_FcrUIManager = FcrUIManager;
+var _applyDecs$e = _applyDecs(_FcrUIManager, [[_mobx.observable, 1, "isLoading"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
+_init_isLoading = _applyDecs$e2[0];
+_initProto = _applyDecs$e2[1];
+_applyDecs$e;

package/lib/ui-scene.d.ts

@@ -1,25 +1,28 @@
-import { FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneObserver, FcrUISettingConfig } from './type';
+import { FcrCoreEngine } from 'fcr-core';
+import { FcrUIDeviceSettingObserver, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneObserver as FcrUISceneObserverBase, FcrUISettingConfig } from './type';
 import { FcrRegisteredWidgetConfigs } from './modules/widget/type';
+type FcrUISceneObserver = FcrUISceneObserverBase & FcrUIDeviceSettingObserver;
 export declare class FcrUIDefaultScene {
     private _config;
     private _creatorConfig;
     private _dom;
     private _settingConfig;
     private _registeredWidgetConfigs;
-    constructor(_config: FcrUISceneConfig, _creatorConfig: FcrUISceneCreatorConfig, _dom: HTMLElement, _settingConfig: FcrUISettingConfig, _registeredWidgetConfigs: FcrRegisteredWidgetConfigs);
+    private _engine;
+    constructor(_config: FcrUISceneConfig, _creatorConfig: FcrUISceneCreatorConfig, _dom: HTMLElement, _settingConfig: FcrUISettingConfig, _registeredWidgetConfigs: FcrRegisteredWidgetConfigs, _engine: FcrCoreEngine);
     exit(): void;
     addObserver(observer: FcrUISceneObserver): void;
     removeObserver(observer: FcrUISceneObserver): void;
     launch(): void;
     private _removeLocalMeetingTimeKey;
     private _setLocalMeetingTimeKey;
-    private _resetLocalMeetingTimeKey;
     private _addObservers;
     private _joinRoom;
     private _renderSceneUI;
     private _release;
     private _disposeRoomControl;
     private _handleBeforeUnload;
-    private _downloadResources;
+    private _initSettingStore;
     private _addLogObserver;
 }
+export {};